aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/client/ClientProxy.java29
-rw-r--r--src/main/java/common/CommonProxy.java46
-rw-r--r--src/main/java/common/TileEntities.java36
-rw-r--r--src/main/java/kekztech/KekzCore.java53
-rw-r--r--src/main/java/kekztech/ServerProxy.java7
5 files changed, 126 insertions, 45 deletions
diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java
new file mode 100644
index 0000000000..e50639b878
--- /dev/null
+++ b/src/main/java/client/ClientProxy.java
@@ -0,0 +1,29 @@
+package client;
+
+import client.renderer.TESR_SECapacitor;
+import client.renderer.TESR_SETether;
+import common.CommonProxy;
+import common.tileentities.TE_SpaceElevatorCapacitor;
+import common.tileentities.TE_SpaceElevatorTether;
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class ClientProxy extends CommonProxy {
+
+ @Override
+ public void preInit(final FMLPreInitializationEvent e) {
+ super.preInit(e);
+ // Register TESR
+ ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorTether.class, new TESR_SETether());
+ ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorCapacitor.class, new TESR_SECapacitor());
+ }
+
+ @Override
+ public void init(final FMLInitializationEvent e) {
+ super.init(e);
+ // Register Simple Block Renderers
+ //RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());
+ }
+
+}
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
new file mode 100644
index 0000000000..3341019ffc
--- /dev/null
+++ b/src/main/java/common/CommonProxy.java
@@ -0,0 +1,46 @@
+package common;
+
+import common.items.ErrorItem;
+import common.items.MetaItem_CraftingComponent;
+import common.items.MetaItem_ReactorComponent;
+import common.tileentities.*;
+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 kekztech.GuiHandler;
+import kekztech.Items;
+import kekztech.KekzCore;
+
+public class CommonProxy {
+
+ public void preInit(final FMLPreInitializationEvent e) {
+ // Items
+ ErrorItem.getInstance().registerItem();
+ MetaItem_ReactorComponent.getInstance().registerItem();
+ MetaItem_CraftingComponent.getInstance().registerItem();
+ Items.registerOreDictNames();
+ // Blocks
+ Blocks.preInit();
+ // TileEntities
+ TileEntities.preInit();
+ // TC Research
+ Researches.preInit();
+ // GUI Handler
+ NetworkRegistry.INSTANCE.registerGuiHandler(KekzCore.instance, new GuiHandler());
+ }
+
+ public void init(final FMLInitializationEvent e) {
+ // GregTech Meta TileEntities
+ TileEntities.init();
+ }
+
+ public void postInit(final FMLPostInitializationEvent e) {
+ // Recipes
+ Recipes.postInit();
+ // Research
+ Researches.postInit();
+ }
+
+}
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
new file mode 100644
index 0000000000..2e51dec473
--- /dev/null
+++ b/src/main/java/common/TileEntities.java
@@ -0,0 +1,36 @@
+package common;
+
+import common.tileentities.*;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class TileEntities {
+
+ 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;
+
+ public static void preInit() {
+ 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");
+ }
+
+ public static void init() {
+ 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");
+ }
+
+}
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 {
+
+}
generated by cgit (git 2.46.0) at 2025-03-09 23:38:29 +0000