diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -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 |
3 files changed, 11 insertions, 1 deletions
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; |