SideOnly Client for Client Packets

src/main/java/kamkeel/npcs/network/packets/client/AchievementPacket.java

@@ -2,6 +2,7 @@ package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -53,14 +54,12 @@ public final class AchievementPacket extends AbstractPacket {
         ByteBufUtils.writeString(out, this.message);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if(!ConfigClient.BannerAlerts)
             return;
 
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         boolean isNotParty = !in.readBoolean();
         String description = StatCollector.translateToLocal(ByteBufUtils.readString(in));
         String message = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/client/ChatAlertPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -41,14 +42,12 @@ public final class ChatAlertPacket extends AbstractPacket {
         ByteBufUtils.fillBuffer(out, this.objects);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if(!ConfigClient.ChatAlerts)
             return;
 
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         StringBuilder message = new StringBuilder();
         String str;
         while ((str = Server.readString(in)) != null && !str.isEmpty()) {

src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -50,11 +51,9 @@ public final class ChatBubblePacket extends AbstractPacket {
         out.writeBoolean(this.hideText);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
         if(!(entity instanceof EntityNPCInterface))
             return;

src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -36,11 +37,9 @@ public final class ConfigCommandPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         int configType = in.readInt();
         if (configType == 0) { // Font Configuration
             String font = Server.readString(in);

src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -51,11 +52,9 @@ public final class DialogPacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, this.compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         int entityID = in.readInt();
         String name = ByteBufUtils.readString(in);
         NBTTagCompound tagCompound = ByteBufUtils.readNBT(in);

src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -33,11 +34,9 @@ public final class DisableMouseInputPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         long duration = in.readLong();
         String parsedButtons = Server.readString(in);
 

src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -36,11 +37,9 @@ public final class MarkDataPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         Entity entity = player.worldObj.getEntityByID(in.readInt());
         if (!(entity instanceof EntityNPCInterface)) return;
 

src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -36,11 +37,9 @@ public final class OverlayQuestTrackingPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         try {
             NBTTagCompound nbt = Server.readNBT(in);
             ClientCacheHandler.questTrackingOverlay = new OverlayQuestTracking(Minecraft.getMinecraft());

src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java

@@ -65,11 +65,9 @@ public final class ParticlePacket extends AbstractPacket {
         ByteBufUtils.writeString(out, particle);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         spawnParticle(in);
     }
 

src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -38,11 +39,9 @@ public final class PartyDataPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         GuiScreen gui = Minecraft.getMinecraft().currentScreen;
         if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) {
             gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui();

src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -35,11 +36,9 @@ public final class PlayerUpdateSkinOverlaysPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         String playerName = Server.readString(in);
         NBTTagCompound nbt = Server.readNBT(in);
         EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(playerName);

src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -33,11 +34,9 @@ public final class QuestCompletionPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NoppesUtil.guiQuestCompletion(player, Server.readNBT(in));
     }
 }

src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -44,11 +45,9 @@ public final class RolePacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, this.compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound compound = ByteBufUtils.readNBT(in);
         Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
         if (entity instanceof EntityNPCInterface) {

src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class ScriptOverlayClosePacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         int overlayId = in.readInt();
         ClientCacheHandler.customOverlays.remove(overlayId);
     }

src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -35,11 +36,9 @@ public final class ScriptOverlayDataPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft());
         overlayCustom.setOverlayData(Server.readNBT(in));
         ClientCacheHandler.customOverlays.put(overlayCustom.overlay.getID(), overlayCustom);

src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java

@@ -46,6 +46,7 @@ public final class ScriptedParticlePacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if(CustomNpcs.side() != Side.CLIENT)

src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -35,11 +36,9 @@ public final class ScrollSelectedPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         GuiScreen gui = Minecraft.getMinecraft().currentScreen;
         if (gui instanceof IScrollData) {
             String selected = Server.readString(in);

src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class StopSoundForPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         int soundId = in.readInt();
         ScriptSoundController.Instance.stopSound(soundId);
     }

src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class StopSoundsPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         ScriptSoundController.Instance.stopAllSounds();
     }
 }

src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class SwingPlayerArmPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         Minecraft.getMinecraft().thePlayer.swingItem();
     }
 }

src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -39,11 +40,9 @@ public final class UpdateAnimationsPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound nbt = Server.readNBT(in);
         AnimationData animationData = null;
 

src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -34,11 +35,9 @@ public final class VillagerListPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         MerchantRecipeList recipes = MerchantRecipeList.func_151390_b(new PacketBuffer(in));
         ServerEventsHandler.Merchant.setRecipes(recipes);
     }

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClonerPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -41,10 +42,9 @@ public final class GuiClonerPacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
         NBTTagCompound nbt = ByteBufUtils.readNBT(in);
         NoppesUtil.openGUI(player, new GuiNpcMobSpawnerAdd(nbt));
     }

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -46,11 +47,9 @@ public final class GuiClosePacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         GuiScreen gui = Minecraft.getMinecraft().currentScreen;
         if (gui instanceof IGuiClose) {
             int closeCode = in.readInt();

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -45,11 +46,9 @@ public final class GuiDataPacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         GuiScreen gui = Minecraft.getMinecraft().currentScreen;
         if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) {
             gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui();

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -46,11 +47,9 @@ public final class GuiErrorPacket extends AbstractPacket {
         ByteBufUtils.writeNBT(out, compound);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         GuiScreen gui = Minecraft.getMinecraft().currentScreen;
         if (gui instanceof IGuiError) {
             int errorCode = in.readInt();

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiOpenPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -47,11 +48,9 @@ public final class GuiOpenPacket extends AbstractPacket {
         out.writeInt(z);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         EnumGuiType gui = EnumGuiType.values()[in.readInt()];
         int x = in.readInt();
         int y = in.readInt();

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -34,11 +35,9 @@ public final class GuiRedstonePacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound nbt = Server.readNBT(in);
         NoppesUtil.saveRedstoneBlock(player, nbt);
     }

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiTeleporterPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -31,11 +32,9 @@ public final class GuiTeleporterPacket extends AbstractPacket {
     @Override
     public void sendData(ByteBuf out) throws IOException {}
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         CustomNpcs.proxy.openGui((EntityNPCInterface)null, EnumGuiType.NpcDimensions);
     }
 }

src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -34,11 +35,9 @@ public final class GuiWaypointPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound nbt = Server.readNBT(in);
         NoppesUtil.saveWayPointBlock(player, nbt);
     }

src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -33,11 +34,9 @@ public final class IsGuiOpenPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         boolean isGuiOpen = Minecraft.getMinecraft().currentScreen != null;
         NoppesUtil.isGUIOpen(isGuiOpen);
     }

src/main/java/kamkeel/npcs/network/packets/client/gui/OpenBookPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.gui;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -36,11 +37,9 @@ public final class OpenBookPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         int x = in.readInt();
         int y = in.readInt();
         int z = in.readInt();

src/main/java/kamkeel/npcs/network/packets/client/npc/DeleteNpcPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.npc;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -40,11 +41,9 @@ public final class DeleteNpcPacket extends AbstractPacket {
         out.writeInt(this.entityId);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
         if (entity instanceof EntityNPCInterface) {
             ((EntityNPCInterface) entity).delete();

src/main/java/kamkeel/npcs/network/packets/client/npc/EditNpcPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.npc;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -40,11 +41,9 @@ public final class EditNpcPacket extends AbstractPacket {
         out.writeInt(this.entityId);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
         if (!(entity instanceof EntityNPCInterface)) {
             return;

src/main/java/kamkeel/npcs/network/packets/client/npc/UpdateNpcPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.npc;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -36,11 +37,9 @@ public final class UpdateNpcPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound compound = Server.readNBT(in);
         Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
         if (entity instanceof EntityNPCInterface) {

src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sound;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class ContinueSoundsPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         ScriptSoundController.Instance.continueAllSounds();
     }
 }

src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sound;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class PauseSoundsPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         ScriptSoundController.Instance.pauseAllSounds();
     }
 }

src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sound;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -33,11 +34,9 @@ public final class PlayMusicPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         String musicName = Server.readString(in);
         MusicController.Instance.playMusicBackground(musicName, player, Integer.MAX_VALUE);
     }

src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sound;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -33,11 +34,9 @@ public final class PlaySoundPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         String soundName = Server.readString(in);
         float x = in.readFloat();
         float y = in.readFloat();

src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sound;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -35,11 +36,9 @@ public final class PlaySoundToNoIdPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound nbt = Server.readNBT(in);
         ScriptClientSound sound = ScriptClientSound.fromScriptSound(nbt, player.worldObj);
         ScriptSoundController.Instance.playSound(sound);

src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sound;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -35,11 +36,9 @@ public final class PlaySoundToPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         int soundId = in.readInt();
         NBTTagCompound nbt = Server.readNBT(in);
         ScriptClientSound sound = ScriptClientSound.fromScriptSound(nbt, player.worldObj);

src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sync;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -34,11 +35,9 @@ public final class SyncConfigPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagCompound configNBT = Server.readNBT(in);
         SyncController.receiveConfigs(configNBT);
     }

src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sync;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -35,11 +36,9 @@ public final class SyncRecipesAddPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         NBTTagList list = Server.readNBT(in).getTagList("recipes", 10);
         if (list != null) {
             for (int i = 0; i < list.tagCount(); i++) {

src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sync;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class SyncRecipesCarpentryBenchPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         RecipeController.Instance.anvilRecipes = RecipeController.syncRecipes;
         RecipeController.syncRecipes.clear();
     }

src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sync;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -32,11 +33,9 @@ public final class SyncRecipesWorkbenchPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         RecipeController.reloadGlobalRecipes(RecipeController.syncRecipes);
         RecipeController.syncRecipes.clear();
     }

src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java

@@ -1,6 +1,7 @@
 package kamkeel.npcs.network.packets.client.sync;
 
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.network.AbstractPacket;
 import kamkeel.npcs.network.PacketChannel;
@@ -36,11 +37,9 @@ public final class SyncWeaponPacket extends AbstractPacket {
         // TODO: Send Packet
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if(CustomNpcs.side() != Side.CLIENT)
-            return;
-
         Entity entity = player.worldObj.getEntityByID(in.readInt());
         if (!(entity instanceof EntityNPCInterface)) return;