Move JEI loading to FMLLoadCompleteEvent

mezz · Oct 26, 2016 · e238a19 · e238a19
1 parent a41e7be
commit e238a19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/mezz/jei/JustEnoughItems.java b/src/main/java/mezz/jei/JustEnoughItems.java
@@ -11,7 +11,7 @@
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.network.NetworkCheckHandler;
 import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -67,7 +67,7 @@ public void init(FMLInitializationEvent event) {
 	}
 
 	@Mod.EventHandler
-	public void postInit(FMLPostInitializationEvent event) {
-		proxy.postInit(event);
+	public void loadComplete(FMLLoadCompleteEvent event) {
+		proxy.loadComplete(event);
 	}
 }
diff --git a/src/main/java/mezz/jei/ProxyCommon.java b/src/main/java/mezz/jei/ProxyCommon.java
@@ -6,6 +6,7 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
@@ -19,7 +20,7 @@ public void init(FMLInitializationEvent event) {
 
 	}
 
-	public void postInit(FMLPostInitializationEvent event) {
+	public void loadComplete(FMLLoadCompleteEvent event) {
 
 	}
 

diff --git a/src/main/java/mezz/jei/ProxyCommonClient.java b/src/main/java/mezz/jei/ProxyCommonClient.java
@@ -29,6 +29,7 @@
 import net.minecraftforge.fml.common.discovery.ASMDataTable;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLInterModComms;
+import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -94,7 +95,7 @@ public void init(FMLInitializationEvent event) {
 	}
 
 	@Override
-	public void postInit(FMLPostInitializationEvent event) {
+	public void loadComplete(FMLLoadCompleteEvent event) {
 		// Reload when resources change
 		Minecraft minecraft = Minecraft.getMinecraft();
 		IReloadableResourceManager reloadableResourceManager = (IReloadableResourceManager) minecraft.getResourceManager();
@@ -108,11 +109,11 @@ public void onResourceManagerReload(IResourceManager resourceManager) {
 		});
 
 		long jeiStartTime = System.currentTimeMillis();
-		Log.info("Beginning postInit...");
+		Log.info("Starting JEI...");
 		this.starter = new JeiStarter(this.plugins);
-		Log.info("Finished postInit in {} ms", System.currentTimeMillis() - jeiStartTime);
 
 		this.starter.start(this.plugins);
+		Log.info("Finished Starting JEI in {} ms", System.currentTimeMillis() - jeiStartTime);
 	}
 
 	@SubscribeEvent