Merge pull request #2 from GTNewHorizons/master

kekztech-0.5.6

1 files changed, 68 insertions, 105 deletions

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 7574c1f399..1aed8315ce 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -1,105 +1,68 @@
-package kekztech;

-

-import client.renderer.TESR_SECapacitor;

-import client.renderer.TESR_SETether;

-import common.Blocks;

-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.event.FMLInitializationEvent;

-import cpw.mods.fml.common.event.FMLPostInitializationEvent;

-import cpw.mods.fml.common.event.FMLPreInitializationEvent;

-import cpw.mods.fml.common.network.NetworkRegistry;

-import cpw.mods.fml.common.registry.GameRegistry;

-import items.ErrorItem;

-import items.MetaItem_CraftingComponent;

-import items.MetaItem_ReactorComponent;

-import org.apache.logging.log4j.LogManager;

-import org.apache.logging.log4j.Logger;

-

-/**

- * My GT-Meta-IDs are: 13101 - 13500

- * 

- * @author kekzdealer

- *

- */

-@Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, 

-		dependencies =

-			  "required-after:IC2;"

-			+ "required-after:gregtech;"

-			+ "required-after:tectech;"

-			+ "required-after:Thaumcraft;"

-			+ "required-after:ThaumicTinkerer;"

-			+ "after:bartworks;"

-			+ "after:dreamcraft"

-		)

-public class KekzCore {

-	

-	public static final String NAME = "KekzTech";

-	public static final String MODID = "kekztech";

-	public static final String VERSION = "0.4.5";

-

-	public static final Logger LOGGER = LogManager.getLogger(NAME);

-

-	@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;

-	

-	@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();

-	}

-	

-	@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());

-	}

-	

-	@Mod.EventHandler

-	public void postInit(FMLPostInitializationEvent event) {

-		Recipes.postInit();

-		Researches.postInit();

-	}

-}

+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;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import common.items.ErrorItem;
+import common.items.MetaItem_CraftingComponent;
+import common.items.MetaItem_ReactorComponent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * My GT-Meta-IDs are: 13101 - 13500
+ * 
+ * @author kekzdealer
+ *
+ */
+@Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, 
+		dependencies =
+			  "required-after:IC2;"
+			+ "required-after:gregtech;"
+			+ "required-after:tectech;"
+			+ "required-after:Thaumcraft;"
+			+ "required-after:ThaumicTinkerer;"
+			+ "after:bartworks;"
+			+ "after:dreamcraft"
+		)
+public class KekzCore {
+	
+	public static final String NAME = "KekzTech";
+	public static final String MODID = "kekztech";
+	public static final String VERSION = "0.5";
+
+	public static final Logger LOGGER = LogManager.getLogger(NAME);
+
+	@Mod.Instance("kekztech")
+	public static KekzCore instance;
+
+	@SidedProxy(clientSide = "client.ClientProxy", serverSide = "kekztech.ServerProxy")
+	public static CommonProxy proxy;
+
+	@Mod.EventHandler
+	public void preInit(FMLPreInitializationEvent event) {
+		proxy.preInit(event);
+	}
+	
+	@Mod.EventHandler
+	public void init(FMLInitializationEvent event) {
+		proxy.init(event);
+	}
+	
+	@Mod.EventHandler
+	public void postInit(FMLPostInitializationEvent event) {
+		proxy.postInit(event);
+	}
+}