diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeBuilder.java | 7 | ||||
-rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 1 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_PreLoad.java | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java index 851795c656..3fa8d91da0 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java +++ b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.fluids.FluidStack; +import gregtech.GT_Mod; import gregtech.api.interfaces.IGT_RecipeMap; import gregtech.api.util.extensions.ArrayExt; @@ -28,7 +29,7 @@ public class GT_RecipeBuilder { // debug mode expose problems. panic mode help you check nothing is wrong-ish without you actively monitoring private static final boolean DEBUG_MODE_NULL; - private static final boolean PANIC_MODE_NULL; + private static boolean PANIC_MODE_NULL; private static final boolean DEBUG_MODE_INVALID; private static final boolean PANIC_MODE_INVALID; private static final boolean DEBUG_MODE_COLLISION; @@ -181,6 +182,10 @@ public class GT_RecipeBuilder { } } + public static void onConfigLoad() { + PANIC_MODE_NULL |= GT_Mod.gregtechproxy.crashOnNullRecipeInput; + } + // endregion // region setter diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 3aab039c83..14cada3fa2 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -626,6 +626,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public boolean gt6Cable = true; public boolean ic2EnergySourceCompat = true; public boolean costlyCableConnection = false; + public boolean crashOnNullRecipeInput = false; /** * This enables ambient-occlusion smooth lighting on tiles diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 749cb06eda..5208c792c1 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -44,6 +44,7 @@ import gregtech.api.util.GT_Config; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_RecipeBuilder; import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineBase; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom; @@ -712,6 +713,8 @@ public class GT_PreLoad { GT_Mod.gregtechproxy.costlyCableConnection = tMainConfig .get("general", "CableConnectionRequiresSolderingMaterial", false) .getBoolean(false); + GT_Mod.gregtechproxy.crashOnNullRecipeInput = tMainConfig.get("general", "crashOnNullRecipeInput", false) + .getBoolean(false); GT_LanguageManager.i18nPlaceholder = tMainConfig .get("general", "EnablePlaceholderForMaterialNamesInLangFile", true) .getBoolean(true); @@ -805,6 +808,8 @@ public class GT_PreLoad { Arrays.asList( tMainConfig.get("general", "ctm_block_blacklist", new String[] { "team.chisel.block.BlockRoadLine" }) .getStringList())); + + GT_RecipeBuilder.onConfigLoad(); } public static void loadClientConfig() { |