Refactored into sided proxies

2 files changed, 15 insertions, 45 deletions

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 10d9281c49..49f7cfa54e 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -3,11 +3,13 @@ package kekztech;
 import client.renderer.TESR_SECapacitor;
 import client.renderer.TESR_SETether;
 import common.Blocks;
+import common.CommonProxy;
 import common.Recipes;
 import common.Researches;
 import common.tileentities.*;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -46,60 +48,21 @@ public class KekzCore {
 	@Mod.Instance("kekztech")
 	public static KekzCore instance;
 
-	public static GTMTE_SOFuelCellMK1 sofc1;
-	public static GTMTE_SOFuelCellMK2 sofc2;
-	public static GTMTE_ModularNuclearReactor mdr;
-	public static GTMTE_FluidMultiStorage fms;
-	public static GTMTE_ItemServer is;
-	public static GTMTE_LapotronicSuperCapacitor lsc;
-	public static GTMTE_SpaceElevator se;
-	
+	@SidedProxy(clientSide = "client.ClientProxy", serverSide = "kekztech.ServerProxy")
+	public static CommonProxy proxy;
+
 	@Mod.EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
-		// Items
-		ErrorItem.getInstance().registerItem();
-		MetaItem_ReactorComponent.getInstance().registerItem();
-		MetaItem_CraftingComponent.getInstance().registerItem();
-		Items.registerOreDictNames();
-		
-		Blocks.preInit();
-		
-		// Register TileEntities
-		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");
-		//GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");
-		GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");
-		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");
-		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");
-		GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
-		GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
-		
-		// Register guis
-		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());
-
-		// Register TESR
-		ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorTether.class, new TESR_SETether());
-		ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorCapacitor.class, new TESR_SECapacitor());
-
-		Researches.preInit();
+		proxy.preInit(event);
 	}
 	
 	@Mod.EventHandler
 	public void init(FMLInitializationEvent event) {
-		// Multiblock controllers
-		sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I");
-		sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");
-		mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");
-		fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T");
-		//is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");
-        lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");
-        se = new GTMTE_SpaceElevator(13107, "multimachine.spaceelevator", "Space Elevator");
-		// Register renderer
-		//RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());
+		proxy.init(event);
 	}
 	
 	@Mod.EventHandler
 	public void postInit(FMLPostInitializationEvent event) {
-		Recipes.postInit();
-		Researches.postInit();
+		proxy.postInit(event);
 	}
 }
diff --git a/src/main/java/kekztech/ServerProxy.java b/src/main/java/kekztech/ServerProxy.java
new file mode 100644
index 0000000000..0291cf687f
--- /dev/null
+++ b/src/main/java/kekztech/ServerProxy.java
@@ -0,0 +1,7 @@
+package kekztech;
+
+import common.CommonProxy;
+
+public class ServerProxy extends CommonProxy {
+
+}