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/handler/COMPAT_IntermodStaging.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 7 |
3 files changed, 16 insertions, 0 deletions
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); + } + } |