From f7395f517b9af06ec042f234f8f1f6b0665f8c6a Mon Sep 17 00:00:00 2001 From: King Lemming Date: Sun, 5 Apr 2015 19:39:15 -0400 Subject: [PATCH] Allow for duplicate Fluid Blocks. It's annoying to be sure but just as with the OreDictionary, we'll have to handle it. Signed-off-by: King Lemming --- .../net/minecraftforge/common/ForgeModContainer.java | 12 ------------ src/main/java/net/minecraftforge/fluids/Fluid.java | 11 ++--------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeModContainer.java b/src/main/java/net/minecraftforge/common/ForgeModContainer.java index 40ed8b2e64..fe9459c1c2 100644 --- a/src/main/java/net/minecraftforge/common/ForgeModContainer.java +++ b/src/main/java/net/minecraftforge/common/ForgeModContainer.java @@ -60,7 +60,6 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC public static boolean removeErroringEntities = false; public static boolean removeErroringTileEntities = false; public static boolean disableStitchedFileSaving = false; - public static boolean forceDuplicateFluidBlockCrash = true; public static boolean fullBoundingBoxLadders = false; public static double zombieSummonBaseChance = 0.1; public static int[] blendRanges = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34 }; @@ -158,17 +157,6 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC shouldSortRecipies = prop.getBoolean(shouldSortRecipies); propOrder.add(prop.getName()); - prop = config.get(Configuration.CATEGORY_GENERAL, "forceDuplicateFluidBlockCrash", true); - prop.comment = "Set this to true to force a crash if more than one block attempts to link back to the same Fluid. Enabled by default."; - prop.setLanguageKey("forge.configgui.forceDuplicateFluidBlockCrash").setRequiresMcRestart(true); - forceDuplicateFluidBlockCrash = prop.getBoolean(true); - propOrder.add(prop.getName()); - - if (!forceDuplicateFluidBlockCrash) - { - FMLLog.warning("Disabling forced crashes on duplicate Fluid Blocks - USE AT YOUR OWN RISK"); - } - prop = config.get(Configuration.CATEGORY_GENERAL, "removeErroringEntities", false); prop.comment = "Set this to true to remove any Entity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES."; prop.setLanguageKey("forge.configgui.removeErroringEntities").setRequiresWorldRestart(true); diff --git a/src/main/java/net/minecraftforge/fluids/Fluid.java b/src/main/java/net/minecraftforge/fluids/Fluid.java index 28096dda89..fed6e88664 100644 --- a/src/main/java/net/minecraftforge/fluids/Fluid.java +++ b/src/main/java/net/minecraftforge/fluids/Fluid.java @@ -120,17 +120,10 @@ public class Fluid { this.block = block; } - else if (!ForgeModContainer.forceDuplicateFluidBlockCrash) - { - FMLLog.warning("A mod has attempted to assign Block " + block + " to the Fluid '" + fluidName + "' but this Fluid has already been linked to BlockID " - + this.block + ". Configure your mods to prevent this from happening."); - } else { - FMLLog.severe("A mod has attempted to assign BlockID " + block + " to the Fluid '" + fluidName + "' but this Fluid has already been linked to BlockID " - + this.block + ". Configure your mods to prevent this from happening."); - throw new LoaderException(new RuntimeException("A mod has attempted to assign BlockID " + block + " to the Fluid '" + fluidName - + "' but this Fluid has already been linked to BlockID " + this.block + ". Configure your mods to prevent this from happening.")); + FMLLog.warning("A mod has attempted to assign Block " + block + " to the Fluid '" + fluidName + "' but this Fluid has already been linked to the Block " + + this.block + ". You may have duplicate Fluid Blocks as a result. It *may* be possible to configure your mods to avoid this."); } return this; }