diff --git a/src/main/java/dev/tilera/auracore/AuraCore.java b/src/main/java/dev/tilera/auracore/AuraCore.java index b3ea04f..dc450d6 100644 --- a/src/main/java/dev/tilera/auracore/AuraCore.java +++ b/src/main/java/dev/tilera/auracore/AuraCore.java @@ -11,6 +11,7 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent; 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 dev.tilera.auracore.api.Aspects; import dev.tilera.auracore.aura.AuraCalculationThread; import dev.tilera.auracore.aura.AuraDeleteThread; @@ -19,6 +20,14 @@ import dev.tilera.auracore.aura.AuraUpdateThread; import dev.tilera.auracore.aura.AuraWorldTicker; import dev.tilera.auracore.client.GUITicker; import dev.tilera.auracore.client.RenderEventHandler; +import dev.tilera.auracore.network.AuraDeletePacket; +import dev.tilera.auracore.network.AuraDeletePacketHandler; +import dev.tilera.auracore.network.AuraPacket; +import dev.tilera.auracore.network.AuraPacketHandler; +import dev.tilera.auracore.network.AuraTransferFXPacket; +import dev.tilera.auracore.network.AuraTransferFXPacketHandler; +import dev.tilera.auracore.network.NodeZapPacket; +import dev.tilera.auracore.network.NodeZapPacketHandler; import dev.tilera.auracore.proxy.CommonProxy; import dev.tilera.auracore.world.WorldGenerator; import net.minecraft.item.ItemStack; @@ -43,6 +52,11 @@ public class AuraCore { Config.load(); Aspects.load(); CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel("auracore"); + int pktID = 0; + AuraCore.CHANNEL.registerMessage(AuraPacketHandler.class, AuraPacket.class, pktID++, Side.CLIENT); + AuraCore.CHANNEL.registerMessage(AuraDeletePacketHandler.class, AuraDeletePacket.class, pktID++, Side.CLIENT); + AuraCore.CHANNEL.registerMessage(AuraTransferFXPacketHandler.class, AuraTransferFXPacket.class, pktID++, Side.CLIENT); + AuraCore.CHANNEL.registerMessage(NodeZapPacketHandler.class, NodeZapPacket.class, pktID++, Side.CLIENT); proxy.preInit(); MinecraftForge.EVENT_BUS.register(new EventHandler()); MinecraftForge.EVENT_BUS.register(new RenderEventHandler()); diff --git a/src/main/java/dev/tilera/auracore/network/AuraDeletePacketHandler.java b/src/main/java/dev/tilera/auracore/network/AuraDeletePacketHandler.java index 3b9c4c0..b66a698 100644 --- a/src/main/java/dev/tilera/auracore/network/AuraDeletePacketHandler.java +++ b/src/main/java/dev/tilera/auracore/network/AuraDeletePacketHandler.java @@ -3,10 +3,13 @@ package dev.tilera.auracore.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import dev.tilera.auracore.client.AuraManagerClient; public class AuraDeletePacketHandler implements IMessageHandler { + @SideOnly(Side.CLIENT) @Override public IMessage onMessage(AuraDeletePacket message, MessageContext ctx) { AuraManagerClient.auraClientList.remove(message.key); diff --git a/src/main/java/dev/tilera/auracore/network/AuraPacketHandler.java b/src/main/java/dev/tilera/auracore/network/AuraPacketHandler.java index 78d9d56..927b07c 100644 --- a/src/main/java/dev/tilera/auracore/network/AuraPacketHandler.java +++ b/src/main/java/dev/tilera/auracore/network/AuraPacketHandler.java @@ -4,6 +4,8 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import dev.tilera.auracore.client.AuraManagerClient; import dev.tilera.auracore.client.AuraManagerClient.NodeHistoryStats; import dev.tilera.auracore.client.AuraManagerClient.NodeStats; @@ -11,6 +13,7 @@ import net.minecraft.world.World; public class AuraPacketHandler implements IMessageHandler { + @SideOnly(Side.CLIENT) @Override public IMessage onMessage(AuraPacket message, MessageContext ctx) { World world = FMLClientHandler.instance().getWorldClient(); diff --git a/src/main/java/dev/tilera/auracore/network/AuraTransferFXPacketHandler.java b/src/main/java/dev/tilera/auracore/network/AuraTransferFXPacketHandler.java index 5814020..70fc4b0 100644 --- a/src/main/java/dev/tilera/auracore/network/AuraTransferFXPacketHandler.java +++ b/src/main/java/dev/tilera/auracore/network/AuraTransferFXPacketHandler.java @@ -4,6 +4,8 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import dev.tilera.auracore.client.FXSparkle; import dev.tilera.auracore.helper.Utils; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +13,7 @@ import net.minecraft.util.MathHelper; public class AuraTransferFXPacketHandler implements IMessageHandler { + @SideOnly(Side.CLIENT) @Override public IMessage onMessage(AuraTransferFXPacket message, MessageContext ctx) { EntityPlayer player = FMLClientHandler.instance().getClientPlayerEntity(); diff --git a/src/main/java/dev/tilera/auracore/network/NodeZapPacketHandler.java b/src/main/java/dev/tilera/auracore/network/NodeZapPacketHandler.java index 7017be2..1814c5a 100644 --- a/src/main/java/dev/tilera/auracore/network/NodeZapPacketHandler.java +++ b/src/main/java/dev/tilera/auracore/network/NodeZapPacketHandler.java @@ -3,6 +3,8 @@ package dev.tilera.auracore.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.world.World; @@ -10,6 +12,7 @@ import thaumcraft.client.fx.bolt.FXLightningBolt; public class NodeZapPacketHandler implements IMessageHandler { + @SideOnly(Side.CLIENT) @Override public IMessage onMessage(NodeZapPacket message, MessageContext ctx) { World world = Minecraft.getMinecraft().theWorld; diff --git a/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java b/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java index f59d2f9..ea1531a 100644 --- a/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java +++ b/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java @@ -1,31 +1,11 @@ package dev.tilera.auracore.proxy; -import cpw.mods.fml.relauncher.Side; -import dev.tilera.auracore.AuraCore; import dev.tilera.auracore.client.gui.GuiArcaneWorkbench; -import dev.tilera.auracore.network.AuraDeletePacket; -import dev.tilera.auracore.network.AuraDeletePacketHandler; -import dev.tilera.auracore.network.AuraPacket; -import dev.tilera.auracore.network.AuraPacketHandler; -import dev.tilera.auracore.network.AuraTransferFXPacket; -import dev.tilera.auracore.network.AuraTransferFXPacketHandler; -import dev.tilera.auracore.network.NodeZapPacket; -import dev.tilera.auracore.network.NodeZapPacketHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import thaumcraft.common.tiles.TileArcaneWorkbench; public class ClientProxy extends CommonProxy { - - @Override - public void preInit() { - int pktID = 0; - AuraCore.CHANNEL.registerMessage(AuraPacketHandler.class, AuraPacket.class, pktID++, Side.CLIENT); - AuraCore.CHANNEL.registerMessage(AuraDeletePacketHandler.class, AuraDeletePacket.class, pktID++, Side.CLIENT); - AuraCore.CHANNEL.registerMessage(AuraTransferFXPacketHandler.class, AuraTransferFXPacket.class, pktID++, Side.CLIENT); - AuraCore.CHANNEL.registerMessage(NodeZapPacketHandler.class, NodeZapPacket.class, pktID++, Side.CLIENT); - super.preInit(); - } @Override public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {