From 0e571cd28a0715dc0086e78a2d497ef9befc6b77 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 7 Dec 2015 19:10:55 +0100 Subject: [PATCH] add proxies --- src/main/java/storagecraft/SC.java | 34 ++++++++---------- .../java/storagecraft/proxy/ClientProxy.java | 15 ++++++++ .../java/storagecraft/proxy/CommonProxy.java | 30 ++++++++++++++++ .../java/storagecraft/proxy/ServerProxy.java | 4 +++ .../storagecraft/textures/items/cable.png | Bin 0 -> 246 bytes 5 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 src/main/java/storagecraft/proxy/ClientProxy.java create mode 100644 src/main/java/storagecraft/proxy/CommonProxy.java create mode 100644 src/main/java/storagecraft/proxy/ServerProxy.java create mode 100644 src/main/resources/assets/storagecraft/textures/items/cable.png diff --git a/src/main/java/storagecraft/SC.java b/src/main/java/storagecraft/SC.java index 5bc5d030e..c7b224e2d 100644 --- a/src/main/java/storagecraft/SC.java +++ b/src/main/java/storagecraft/SC.java @@ -1,21 +1,17 @@ package storagecraft; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; +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.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import storagecraft.network.MessageTileUpdate; -import storagecraft.render.CableRenderer; -import storagecraft.tile.TileCable; -import storagecraft.tile.TileController; +import storagecraft.proxy.CommonProxy; @Mod(modid = SC.ID, version = SC.VERSION) public class SC { @@ -28,23 +24,21 @@ public class SC { return Items.emerald; } }; + @SidedProxy(clientSide = "storagecraft.proxy.ClientProxy", serverSide = "storagecraft.proxy.ServerProxy") + public static CommonProxy PROXY; @EventHandler - public void preInit(FMLPreInitializationEvent event) { - NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); - - if (event.getSide() == Side.CLIENT) { - ClientRegistry.bindTileEntitySpecialRenderer(TileCable.class, new CableRenderer()); - } - - GameRegistry.registerTileEntity(TileController.class, "controller"); - GameRegistry.registerTileEntity(TileCable.class, "cable"); - - GameRegistry.registerBlock(SCBlocks.CONTROLLER, "controller"); - GameRegistry.registerBlock(SCBlocks.CABLE, "cable"); + public void preInit(FMLPreInitializationEvent e) { + PROXY.preInit(e); } @EventHandler - public void init(FMLInitializationEvent event) { + public void init(FMLInitializationEvent e) { + PROXY.init(e); + } + + @EventHandler + public void postInit(FMLPostInitializationEvent e) { + PROXY.postInit(e); } } diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java new file mode 100644 index 000000000..120f97ba8 --- /dev/null +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -0,0 +1,15 @@ +package storagecraft.proxy; + +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import storagecraft.render.CableRenderer; +import storagecraft.tile.TileCable; + +public class ClientProxy extends CommonProxy { + @Override + public void preInit(FMLPreInitializationEvent e) { + super.preInit(e); + + ClientRegistry.bindTileEntitySpecialRenderer(TileCable.class, new CableRenderer()); + } +} diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java new file mode 100644 index 000000000..48ecbf7b7 --- /dev/null +++ b/src/main/java/storagecraft/proxy/CommonProxy.java @@ -0,0 +1,30 @@ +package storagecraft.proxy; + +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.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import static storagecraft.SC.NETWORK; +import storagecraft.SCBlocks; +import storagecraft.network.MessageTileUpdate; +import storagecraft.tile.TileCable; +import storagecraft.tile.TileController; + +public class CommonProxy { + public void preInit(FMLPreInitializationEvent e) { + NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); + + GameRegistry.registerTileEntity(TileController.class, "controller"); + GameRegistry.registerTileEntity(TileCable.class, "cable"); + + GameRegistry.registerBlock(SCBlocks.CONTROLLER, "controller"); + GameRegistry.registerBlock(SCBlocks.CABLE, "cable"); + } + + public void init(FMLInitializationEvent e) { + } + + public void postInit(FMLPostInitializationEvent e) { + } +} diff --git a/src/main/java/storagecraft/proxy/ServerProxy.java b/src/main/java/storagecraft/proxy/ServerProxy.java new file mode 100644 index 000000000..9e987e072 --- /dev/null +++ b/src/main/java/storagecraft/proxy/ServerProxy.java @@ -0,0 +1,4 @@ +package storagecraft.proxy; + +public class ServerProxy extends CommonProxy { +} diff --git a/src/main/resources/assets/storagecraft/textures/items/cable.png b/src/main/resources/assets/storagecraft/textures/items/cable.png new file mode 100644 index 0000000000000000000000000000000000000000..a8e8dbf514063a93ec2292ab87c7a94d6f5aafcf GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3(mh=qLoEE4p1a7^pup3bIKNs!`p1KAR^h_qFRmPQ|2h5gvv>OsoM@QH zsLbrf*38bg=d#Wzp$Py5U0Fi_ literal 0 HcmV?d00001