diff options
Diffstat (limited to 'src/Java/miscutil/core/common')
| -rw-r--r-- | src/Java/miscutil/core/common/CommonProxy.java | 6 | ||||
| -rw-r--r-- | src/Java/miscutil/core/common/compat/COMPAT_IC2.java | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 499ea28eb6..ac1aa32801 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -5,6 +5,7 @@ import miscutil.core.block.ModBlocks; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.gui.ModGUI; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.handler.COMPAT_IntermodStaging; import miscutil.core.handler.events.PickaxeBlockBreakEventHandler; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; @@ -35,13 +36,15 @@ public class CommonProxy { Utils.LOG_WARNING("Development mode not set."); } AddToCreativeTab.initialiseTabs(); + //Apparently I should do this here. Might put it in Init for a test. + //Growthcraft_Handler.run(); } public void init(FMLInitializationEvent e) { //Debug Loading if (CORE.DEBUG){ DEBUG_INIT.registerHandlers(); - } + } ModItems.init(); ModBlocks.init(); MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); @@ -50,6 +53,7 @@ public class CommonProxy { COMPAT_HANDLER.registerMyModsOreDictEntries(); COMPAT_HANDLER.registerGregtechMachines(); COMPAT_HANDLER.intermodOreDictionarySupport(); + COMPAT_IntermodStaging.load(); } public void postInit(FMLPostInitializationEvent e) { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java index c0b52c5250..8b25360f1f 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java @@ -1,7 +1,6 @@ package miscutil.core.common.compat; -import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.item.UtilsItems; @@ -43,11 +42,11 @@ public class COMPAT_IC2 { RemoveRecipeQueue.add("IC2:itemCable:6"); RemoveRecipeQueue.add("IC2:itemCable:10"); RemoveRecipeQueue.add("IC2:itemCable:13"); - RemoveRecipeQueue.add(itemCropnalyzer); - RemoveRecipeQueue.add(itemSolarHelmet); + //RemoveRecipeQueue.add(itemCropnalyzer); + //RemoveRecipeQueue.add(itemSolarHelmet); - AddRecipeQueue.add(Cropnalyzer); - AddRecipeQueue.add(SolarHelmet); + //AddRecipeQueue.add(Cropnalyzer); + //AddRecipeQueue.add(SolarHelmet); } } |