From 769b7f51c217f57f6b4c9ef716bd9761f036c861 Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
Date: Tue, 20 Mar 2018 21:54:54 +1000
Subject: $ Moved Item & Block generation earlier into Pre-Init, before recipes
 are handled anywhere. $ Stopped getItemStackOfAmountFromOreDictNoBroken()
 caching invalid results, so that when they are generated, they can be cached
 later.

---
 src/Java/gtPlusPlus/core/common/CommonProxy.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/common')

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 47a5f61fdd..4d32d66ecd 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -68,6 +68,15 @@ public class CommonProxy {
 		else {
 			Logger.WARNING("Development mode not set.");
 		}
+		
+		//Moved from Init after Debug Loading.
+		//29/01/18 - Alkalus
+		//Moved earlier into PreInit, so that Items exist before they're called upon in recipes.
+		//20/03/18 - Alkalus
+		ModItems.init();
+		ModBlocks.init();
+		CI.preInit();
+		
 		AddToCreativeTab.initialiseTabs();
 		COMPAT_IntermodStaging.preInit();
 		BookHandler.run();
@@ -77,11 +86,6 @@ public class CommonProxy {
 		Logger.INFO("[Proxy] Calling Tile Entity registrator.");
 		registerTileEntities();
 		
-		//Moved from Init after Debug Loading.
-		//29/01/18 - Alkalus
-		ModItems.init();
-		ModBlocks.init();
-		CI.preInit();
 		
 		Logger.INFO("[Proxy] Calling Render registrator.");
 		registerRenderThings();
-- 
cgit