diff options
Diffstat (limited to 'src')
5 files changed, 23 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 6883ae0fdc..219117fd8f 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -164,7 +164,6 @@ public class GTplusplus implements ActionListener { if (LoadedMods.Thaumcraft) { event.registerServerCommand(new CommandDumpAspects()); } - tryPatchTurbineTextures(); } @Mod.EventHandler @@ -197,7 +196,7 @@ public class GTplusplus implements ActionListener { */ @Mod.EventHandler public void onLoadComplete(FMLLoadCompleteEvent event) { - tryPatchTurbineTextures(); + proxy.onLoadComplete(event); generateGregtechRecipeMaps(); } diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 462f08184f..bea8633a88 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -182,6 +182,10 @@ public class CommonProxy { { COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes(); } + + public void onLoadComplete(FMLLoadCompleteEvent event) { + COMPAT_IntermodStaging.onLoadComplete(event); + } public void registerNetworkStuff(){ GuiHandler.init(); diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index 35160c65cd..4b17d89070 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.handler; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; import gtPlusPlus.xmod.computronics.HANDLER_Computronics; import gtPlusPlus.xmod.forestry.HANDLER_FR; @@ -55,5 +56,9 @@ public class COMPAT_IntermodStaging { HANDLER_SC2.postInit(); } + public static void onLoadComplete(FMLLoadCompleteEvent event) { + HANDLER_GT.onLoadComplete(event); + } + } diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java index d665fc31ca..0cfda0ba6d 100644 --- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java @@ -8,6 +8,7 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; @@ -235,4 +236,10 @@ public class ClientProxy extends CommonProxy implements Runnable{ }*/ } + @Override + public void onLoadComplete(FMLLoadCompleteEvent event) { + GTplusplus.tryPatchTurbineTextures(); + super.onLoadComplete(event); + } + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 0142934186..4a30c691b0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gregtech.api.enums.Materials; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -90,12 +91,15 @@ public class HANDLER_GT { OldCircuitHandler.postInit(); } - removeCrudeTurbineRotors(); //Register some custom recipe maps for any enabled multiblocks. //MultiblockRecipeMapHandler.run(); } + public static void onLoadComplete(FMLLoadCompleteEvent event) { + removeCrudeTurbineRotors(); + } + private static int removeCrudeTurbineRotors() { int aRemoved = 0; @@ -107,6 +111,7 @@ public class HANDLER_GT { outputs: for (ItemStack aI : aG.mOutputs) { if (aI.getItem() instanceof GT_MetaGenerated_Tool_01) { int aMeta = aI.getItemDamage(); + Logger.INFO("Found assembler recipe outputting a GT Tool with a meta value of "+aMeta); if (aMeta >= 170 && aMeta <= 176) { //Found a Turbine int aCutoff = aMeta == 170 ? 75000 : (aMeta == 172 ? 150000 : (aMeta == 174 ? 225000 : 300000)); |