diff options
| -rw-r--r-- | src/Java/gtPlusPlus/GTplusplus.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/common/CommonProxy.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 11 |
5 files changed, 23 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 504e5672a3..3ea03cefc0 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -63,6 +63,9 @@ implements ActionListener disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead."); + //Tools + CORE.configSwitches.enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true, "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench."); + CORE.configSwitches.enableMultiSizeTools = config.getBoolean("enableMultiSizeTools", "gregtech", true, "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available."); //Pipes & Cables CORE.configSwitches.enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true, "Adds Custom GT Fluid Pipes."); diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 6f2c0d0023..f16beb625f 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -4,6 +4,7 @@ import static gtPlusPlus.core.lib.CORE.DEBUG; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.*; +import gtPlusPlus.core.handler.events.BlockEventHandler; import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; @@ -82,7 +83,10 @@ public class CommonProxy { ModItems.init(); ModBlocks.init(); RECIPE_CONSTANTS.initialise(); + //Prevents my Safes being destroyed. MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); + //Block Handler for all events. + MinecraftForge.EVENT_BUS.register(new BlockEventHandler()); //Compat Handling COMPAT_HANDLER.registerMyModsOreDictEntries(); diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 3514a87046..b2426ed562 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -352,7 +352,8 @@ public final class ModItems { metaItem2.registerItem(5, "Whirlygig 2", 2124867000, (short) 7, "Spin me right round.", EnumRarity.uncommon, EnumChatFormatting.RED, true); boolean gtStyleTools = LoadedMods.Gregtech; - + + if (CORE.configSwitches.enableMultiSizeTools){ Materials[] rm = Materials.values(); for (Materials m : rm){ MP_GTMATERIAL = ItemUtils.generateMultiPick(gtStyleTools, m); @@ -360,6 +361,7 @@ public final class ModItems { /*itemBaseDecidust = UtilsItems.generateDecidust(m); itemBaseCentidust = UtilsItems.generateCentidust(m);*/ } + } //EnderIO Resources if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 17dd12e02a..8ecdfa1e60 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -78,6 +78,10 @@ public class CORE { //Debug public static boolean disableEnderIOIntegration = false; + //Tools + public static boolean enableSkookumChoochers = true; + public static boolean enableMultiSizeTools = true; + //Machine Related public static boolean enableAlternativeBatteryAlloy = false; public static boolean enableThaumcraftShardUnification = false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index cd8e6245e8..1d6c97b24c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech; import gregtech.api.util.GT_Config; import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; @@ -33,8 +34,14 @@ public class HANDLER_GT { //Add Custom Pipes, Wires and Cables. GregtechConduits.run(); - new MetaGeneratedGregtechTools(); - new ProcessingToolHeadChoocher().run(); + + //Only loads if the config option is true (default: true) + if (CORE.configSwitches.enableSkookumChoochers){ + new MetaGeneratedGregtechTools(); + new ProcessingToolHeadChoocher().run(); + } + + //Generates recipes for all gregtech smelting and alloy smelting combinations. RecipeGen_BlastSmelterGT.generateRecipes(); } |