diff --git a/src/main/java/kamkeel/npcs/network/packets/client/AchievementPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/AchievementPacket.java index cec1f3b5e..253234780 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/AchievementPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ChatAlertPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ChatAlertPacket.java index 055f34f1a..b5aa7cd28 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ChatAlertPacket.java +++ b/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()) { diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java index 511dd76e3..3920bc337 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java +++ b/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; diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java index 6e41fe008..cb85e4f28 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java index 1533ccad6..c254b308d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java index 6c325f803..a94e52bb0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java index 47df043a3..86f58f0fc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java +++ b/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; diff --git a/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java index cc7dca9aa..ec7e42fa9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java +++ b/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()); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java index f59f63248..060c02cc8 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java index 8bfad94b8..6bdbc2023 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java index d8537f1a2..efdb92eab 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java index 62db8e592..951edf70a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java +++ b/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)); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java index 801a6efb3..2b088ca6f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java +++ b/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) { diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java index 7215684e7..145de9c51 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java index 7e9680584..936549389 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java index 07c60cba5..9e08af69a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java +++ b/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) diff --git a/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java index 7a5750051..d705df2de 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java index d2de64a97..1d972d0aa 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java index 07920a16c..384d04cb7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java +++ b/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(); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java index 05ba2a996..56217ae4b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java +++ b/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(); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java index 5776abd9b..57f14ce49 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java +++ b/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; diff --git a/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java index d9d437155..8f67e4fe6 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClonerPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClonerPacket.java index 3e3004f28..486a6e128 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClonerPacket.java +++ b/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)); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java index 515f7acb0..cf1c75ee9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java index cd10c94dc..1ee404bd0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java index 1f1593b00..b1620962b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiOpenPacket.java index 58aa52879..d85ac885e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiOpenPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java index b96c8a19d..1284d70e2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiTeleporterPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiTeleporterPacket.java index 2011197fb..c42bc8a89 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiTeleporterPacket.java +++ b/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); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java index 3ad029dd3..e449e7b18 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java index 6531c89a4..30be1b9fc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/OpenBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/OpenBookPacket.java index 0c5d09a6e..b8848ba1b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/OpenBookPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/npc/DeleteNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/npc/DeleteNpcPacket.java index d46d66c8b..3f841ac54 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/npc/DeleteNpcPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/npc/EditNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/npc/EditNpcPacket.java index 986f98a71..87524d037 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/npc/EditNpcPacket.java +++ b/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; diff --git a/src/main/java/kamkeel/npcs/network/packets/client/npc/UpdateNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/npc/UpdateNpcPacket.java index 69435950b..7fd6a281d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/npc/UpdateNpcPacket.java +++ b/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) { diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java index c577c945a..8c7f54a52 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java +++ b/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(); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java index e7998ca12..e80ff0970 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java +++ b/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(); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java index 85ede77bd..488f0a0db 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java index 6288417a5..bbee638d3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java index b6ca766df..a82b687e6 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java index 8643c63dd..bc364fbee 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java index bbf0aefd7..b27bc4dd9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java index cdef473ec..b3cd733f3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java +++ b/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++) { diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java index 445d85c81..d30ca5643 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java +++ b/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(); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java index 0e35a66a6..2b489d00a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java +++ b/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(); } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java index 503c219e6..9640fa422 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java +++ b/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;