1 files changed, 12 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 0808eab6b3..8140839cac 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -1,10 +1,12 @@
 package gtPlusPlus.xmod.gregtech;
 
 import gregtech.api.util.GT_Config;
+import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
+import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks;
 import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
 
@@ -12,40 +14,33 @@ public class HANDLER_GT {
 
 	public static GT_Config mMaterialProperties = null;
 
+	@SuppressWarnings("unused")
 	public static void preInit(){
 		new MetaGeneratedGregtechItems();
 		if (mMaterialProperties != null){
 			GT_Materials.init(mMaterialProperties);
 		}
 		GregtechFluidHandler.run();
-		//new Processing_Ingot1();
-		//new Processing_Plate1();
-		//new Processing_Block();
-		//new Processing_HotIngots();
 	}
 
+	@SuppressWarnings("unused")
 	public static void init(){
 
+		//Load General Blocks and set up some Basic Meta Tile Entitie states
+		Gregtech_Blocks.run();
+		
+		//Register Tile Entities
+		COMPAT_HANDLER.registerGregtechMachines();
+		
 		//Add Custom Pipes, Wires and Cables.
 		GregtechConduits.run();
 		new MetaGeneratedGregtechTools();
 		new ProcessingToolHeadChoocher().run();
-		/*if (Meta_GT_Proxy.mSortToTheEnd) {
-			new GT_ItemIterator().run();
-			Meta_GT_Proxy.registerUnificationEntries();
-			new GT_FuelLoader().run();
-		}*/
+		
 	}
 
 	public static void postInit(){
-		/*Meta_GT_Proxy.activateOreDictHandler();
-		if (Meta_GT_Proxy.mSortToTheEnd) {
-			Meta_GT_Proxy.registerUnificationEntries();
-		} else {
-			new GT_ItemIterator().run();
-			Meta_GT_Proxy.registerUnificationEntries();
-			new GT_FuelLoader().run();
-		}*/
+		
 	}
 
 }