+ Added Super Busses.

+ Added Breaker Boxes.
+ Added Super Jukebox. (framework)
+ Added King Bat. (framework)
+ Added Custom WAILA plugin. (framework)
+ Added lots of simple function calls to CI. (Recipe simplification)
% Rewrote the recipes for Wireless Chargers, they now require assembly.
% Cleaned up some old code.
$ Adjusted bug with pollution scrubbers using no durability and removing LOTS of pollution.
$ Greatly improved code base for pollution scrubbers.
$ Added pollution back to the Cyclotron.

1 files changed, 16 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 9e75cd4a16..6bced739c7 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -41,23 +41,16 @@ public class CommonProxy {
 	public static Meta_GT_Proxy GtProxy;
 	private boolean mFluidsGenerated = false;
 
-	public CommonProxy(){
-		//Should Register Gregtech Materials I've Made
+	public CommonProxy() {
+		// Should Register Gregtech Materials I've Made
 		Utils.registerEvent(this);
-		if (LoadedMods.Gregtech){
-			if (!CORE.GTNH) {
-				Logger.INFO("We're using Gregtech "+Utils.getGregtechVersionAsString());				
-			}
-			else {
-				Logger.INFO("We're using GTNH's Gregtech "+Utils.getGregtechVersionAsString());				
-			}
-			
-			Logger.INFO("Setting up our own GT_Proxy.");
-			GtProxy = new Meta_GT_Proxy();
-		}
-		else {
-			GtProxy = null;
+		if (!CORE.GTNH) {
+			Logger.INFO("We're using Gregtech " + Utils.getGregtechVersionAsString());
+		} else {
+			Logger.INFO("We're using GTNH's Gregtech " + Utils.getGregtechVersionAsString());
 		}
+		Logger.INFO("Setting up our own GT_Proxy.");
+		GtProxy = Meta_GT_Proxy.instance;
 	}
 
 	public void preInit(final FMLPreInitializationEvent e) {
@@ -108,6 +101,9 @@ public class CommonProxy {
 		//Must be done in pre-init.
 		generateMobSpawners();
 		
+		//Internal GT Proxy
+		GtProxy.preInit();
+		
 	}
 
 	public void init(final FMLInitializationEvent e) {
@@ -160,6 +156,9 @@ public class CommonProxy {
 		COMPAT_HANDLER.registerMyModsOreDictEntries();
 		COMPAT_HANDLER.intermodOreDictionarySupport();
 		COMPAT_IntermodStaging.init();
+		
+		//Internal GT Proxy
+		GtProxy.init();
 	}
 
 	public void postInit(final FMLPostInitializationEvent e) {
@@ -179,6 +178,8 @@ public class CommonProxy {
 		COMPAT_HANDLER.startLoadingGregAPIBasedRecipes();
 		COMPAT_IntermodStaging.postInit();
 		COMPAT_HANDLER.runQueuedRecipes();
+		//Internal GT Proxy
+		GtProxy.postInit();
 	}