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 2e030eb9e..6e41fe008 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java @@ -1,11 +1,13 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.ClientProxy; import noppes.npcs.config.ConfigClient; @@ -36,6 +38,9 @@ public final class ConfigCommandPacket extends AbstractPacket { @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 afd0e2162..1533ccad6 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; import noppes.npcs.entity.EntityDialogNpc; @@ -51,6 +53,9 @@ public final class DialogPacket extends AbstractPacket { @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 c2c2b4d21..6c325f803 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java @@ -1,11 +1,13 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.ClientEventHandler; @@ -33,6 +35,9 @@ public final class DisableMouseInputPacket extends AbstractPacket { @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 6d053a132..47df043a3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.controllers.data.MarkData; import noppes.npcs.entity.EntityNPCInterface; @@ -36,6 +38,9 @@ public final class MarkDataPacket extends AbstractPacket { @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 46d4c1a84..cc7dca9aa 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.OverlayQuestTracking; import noppes.npcs.client.ClientCacheHandler; @@ -36,6 +38,9 @@ public final class OverlayQuestTrackingPacket extends AbstractPacket { @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 2265eb3b3..f59f63248 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java @@ -1,15 +1,21 @@ 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; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.client.NoppesUtil; +import net.minecraft.world.World; +import noppes.npcs.CustomNpcs; +import noppes.npcs.Server; import java.io.IOException; +import java.util.Random; public final class ParticlePacket extends AbstractPacket { public static final String packetName = "Client|Particle"; @@ -61,6 +67,31 @@ public final class ParticlePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - NoppesUtil.spawnParticle(in); + if(CustomNpcs.side() != Side.CLIENT) + return; + + spawnParticle(in); + } + + @SideOnly(Side.CLIENT) + public static void spawnParticle(ByteBuf buffer) throws IOException{ + double posX = buffer.readDouble(); + double posY = buffer.readDouble(); + double posZ = buffer.readDouble(); + float height = buffer.readFloat(); + float width = buffer.readFloat(); + float yOffset = buffer.readFloat(); + + String particle = Server.readString(buffer); + World worldObj = Minecraft.getMinecraft().theWorld; + + Random rand = worldObj.rand; + if(particle.equals("heal")){ + for (int k = 0; k < 6; k++) + { + worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0); + worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0); + } + } } } 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 4243be0da..8bfad94b8 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -9,6 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.client.gui.util.GuiNPCInterface; @@ -38,6 +40,9 @@ public final class PartyDataPacket extends AbstractPacket { @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 a61e06ad5..d8537f1a2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; @@ -35,6 +37,9 @@ public final class PlayerUpdateSkinOverlaysPacket extends AbstractPacket { @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 ab1928890..62db8e592 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java @@ -1,11 +1,13 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; @@ -33,6 +35,9 @@ public final class QuestCompletionPacket extends AbstractPacket { @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 1fa8fcb2f..801a6efb3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; import noppes.npcs.entity.EntityNPCInterface; @@ -44,6 +46,9 @@ public final class RolePacket extends AbstractPacket { @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 3181e3749..7215684e7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java @@ -1,11 +1,13 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.ClientCacheHandler; import java.io.IOException; @@ -32,6 +34,9 @@ public final class ScriptOverlayClosePacket extends AbstractPacket { @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 a3979c5fb..7e9680584 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.ClientCacheHandler; @@ -35,6 +37,9 @@ public final class ScriptOverlayDataPacket extends AbstractPacket { @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 d8d2c1878..07c60cba5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java @@ -1,14 +1,22 @@ 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; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.NoppesUtil; +import net.minecraft.world.World; +import noppes.npcs.CustomNpcs; +import noppes.npcs.Server; +import noppes.npcs.client.fx.CustomFX; +import noppes.npcs.scripted.ScriptParticle; import java.io.IOException; @@ -40,6 +48,42 @@ public final class ScriptedParticlePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - NoppesUtil.spawnScriptedParticle(player, in); + if(CustomNpcs.side() != Side.CLIENT) + return; + + spawnScriptedParticle(player, in); + } + + @SideOnly(Side.CLIENT) + public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer){ + Minecraft minecraft = Minecraft.getMinecraft(); + + NBTTagCompound compound; + ScriptParticle particle; + try { + compound = Server.readNBT(buffer); + particle = ScriptParticle.fromNBT(compound); + } catch (IOException ignored) { + return; + } + + World worldObj = player.worldObj; + if (worldObj == null) { + return; + } + + Entity entity = null; + if (compound.hasKey("EntityID")) { + entity = worldObj.getEntityByID(compound.getInteger("EntityID")); + if (entity != null) + worldObj = entity.worldObj; + else return; + } + + CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity); + + for(int i = 0; i < particle.amount; i++){ + minecraft.effectRenderer.addEffect(fx); + } } } 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 381b7107a..7a5750051 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.util.IScrollData; @@ -35,6 +37,9 @@ public final class ScrollSelectedPacket extends AbstractPacket { @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 d936f2971..d2de64a97 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java @@ -1,11 +1,13 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.controllers.ScriptSoundController; import java.io.IOException; @@ -32,6 +34,9 @@ public final class StopSoundForPacket extends AbstractPacket { @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 1abedb3be..07920a16c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java @@ -1,11 +1,13 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.controllers.ScriptSoundController; import java.io.IOException; @@ -32,6 +34,9 @@ public final class StopSoundsPacket extends AbstractPacket { @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 cdc6eaae8..05ba2a996 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import java.io.IOException; @@ -32,6 +34,9 @@ public final class SwingPlayerArmPacket extends AbstractPacket { @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 91399cc74..5776abd9b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -9,6 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.controllers.data.Animation; @@ -39,6 +41,9 @@ public final class UpdateAnimationsPacket extends AbstractPacket { @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 202604664..d9d437155 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java @@ -1,5 +1,6 @@ package kamkeel.npcs.network.packets.client; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.PacketBuffer; +import noppes.npcs.CustomNpcs; import noppes.npcs.ServerEventsHandler; import net.minecraft.village.MerchantRecipeList; @@ -34,6 +36,9 @@ public final class VillagerListPacket extends AbstractPacket { @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/GuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java index edfd24540..515f7acb0 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.util.IGuiClose; @@ -46,6 +48,9 @@ public final class GuiClosePacket extends AbstractPacket { @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 d7f81e9bd..cd10c94dc 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.client.gui.util.GuiNPCInterface; @@ -45,6 +47,9 @@ public final class GuiDataPacket extends AbstractPacket { @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 9dcf12367..1f1593b00 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.util.IGuiError; @@ -46,6 +48,9 @@ public final class GuiErrorPacket extends AbstractPacket { @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/GuiRedstonePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java index 4116e7eed..b96c8a19d 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; @@ -34,6 +36,9 @@ public final class GuiRedstonePacket extends AbstractPacket { @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 b9df7dd7c..2011197fb 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -32,6 +33,9 @@ public final class GuiTeleporterPacket extends AbstractPacket { @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 094e9ef90..3ad029dd3 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; @@ -34,6 +36,9 @@ public final class GuiWaypointPacket extends AbstractPacket { @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 041deba86..6531c89a4 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.NoppesUtil; import java.io.IOException; @@ -33,6 +35,9 @@ public final class IsGuiOpenPacket extends AbstractPacket { @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 864b8d8e3..0c5d09a6e 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.gui; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.player.GuiBook; import noppes.npcs.client.NoppesUtil; @@ -36,6 +38,9 @@ public final class OpenBookPacket extends AbstractPacket { @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 738a3c91a..d46d66c8b 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.npc; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.entity.EntityNPCInterface; import java.io.IOException; @@ -40,6 +42,9 @@ public final class DeleteNpcPacket extends AbstractPacket { @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 9e2b8fa83..986f98a71 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.npc; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.NoppesUtil; import noppes.npcs.entity.EntityNPCInterface; @@ -40,6 +42,9 @@ public final class EditNpcPacket extends AbstractPacket { @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 916db40fa..69435950b 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.npc; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -9,6 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.entity.EntityNPCInterface; @@ -36,6 +38,9 @@ public final class UpdateNpcPacket extends AbstractPacket { @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 47b151726..c577c945a 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,11 +1,13 @@ package kamkeel.npcs.network.packets.client.sound; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.controllers.ScriptSoundController; import java.io.IOException; @@ -32,6 +34,9 @@ public final class ContinueSoundsPacket extends AbstractPacket { @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 add8d770e..e7998ca12 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,11 +1,13 @@ package kamkeel.npcs.network.packets.client.sound; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.client.controllers.ScriptSoundController; import java.io.IOException; @@ -32,6 +34,9 @@ public final class PauseSoundsPacket extends AbstractPacket { @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 b59cfb9e3..85ede77bd 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,11 +1,13 @@ package kamkeel.npcs.network.packets.client.sound; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.controllers.MusicController; @@ -33,6 +35,9 @@ public final class PlayMusicPacket extends AbstractPacket { @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 a81e3873a..6288417a5 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,11 +1,13 @@ package kamkeel.npcs.network.packets.client.sound; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.controllers.MusicController; @@ -33,6 +35,9 @@ public final class PlaySoundPacket extends AbstractPacket { @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 665a477a0..b6ca766df 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.sound; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.controllers.ScriptClientSound; import noppes.npcs.client.controllers.ScriptSoundController; @@ -35,6 +37,9 @@ public final class PlaySoundToNoIdPacket extends AbstractPacket { @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 d8f4a94f0..8643c63dd 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.sound; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.controllers.ScriptClientSound; import noppes.npcs.client.controllers.ScriptSoundController; @@ -35,6 +37,9 @@ public final class PlaySoundToPacket extends AbstractPacket { @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 5532cd97f..bbf0aefd7 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.sync; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.controllers.SyncController; @@ -34,6 +36,9 @@ public final class SyncConfigPacket extends AbstractPacket { @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/SyncRecipesCarpentryBenchPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java index f78cf1ea1..445d85c81 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,11 +1,13 @@ package kamkeel.npcs.network.packets.client.sync; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.controllers.RecipeController; import java.io.IOException; @@ -32,6 +34,9 @@ public final class SyncRecipesCarpentryBenchPacket extends AbstractPacket { @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 da4608155..0e35a66a6 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,11 +1,13 @@ package kamkeel.npcs.network.packets.client.sync; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcs; import noppes.npcs.controllers.RecipeController; import java.io.IOException; @@ -32,6 +34,9 @@ public final class SyncRecipesWorkbenchPacket extends AbstractPacket { @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 22d9d9789..503c219e6 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,5 +1,6 @@ package kamkeel.npcs.network.packets.client.sync; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; @@ -9,6 +10,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.entity.EntityNPCInterface; @@ -36,6 +38,9 @@ public final class SyncWeaponPacket extends AbstractPacket { @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/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index f4e3ab5ba..b0df591f8 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -4,19 +4,14 @@ import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Util; -import net.minecraft.world.World; import noppes.npcs.CustomNpcs; import noppes.npcs.Server; -import noppes.npcs.client.fx.CustomFX; import noppes.npcs.client.gui.player.GuiDialogInteract; import noppes.npcs.client.gui.player.GuiQuestCompletion; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; @@ -29,15 +24,12 @@ import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.ScriptParticle; import org.lwjgl.Sys; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.net.URI; import java.util.HashMap; -import java.util.Random; import java.util.Vector; public class NoppesUtil { @@ -50,28 +42,7 @@ public class NoppesUtil { Client.sendData(EnumPacketServer.Gui, gui.ordinal(), i, j, k); } - public static void spawnParticle(ByteBuf buffer) throws IOException{ - double posX = buffer.readDouble(); - double posY = buffer.readDouble(); - double posZ = buffer.readDouble(); - float height = buffer.readFloat(); - float width = buffer.readFloat(); - float yOffset = buffer.readFloat(); - - String particle = Server.readString(buffer); - World worldObj = Minecraft.getMinecraft().theWorld; - - Random rand = worldObj.rand; - if(particle.equals("heal")){ - for (int k = 0; k < 6; k++) - { - worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0); - worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0); - } - } - } - - public static void updateSkinOverlayData(EntityPlayer player, NBTTagCompound compound) { + public static void updateSkinOverlayData(EntityPlayer player, NBTTagCompound compound) { HashMap skinOverlays = new HashMap<>(); HashMap oldOverlays = new HashMap<>(); NBTTagList skinOverlayList = compound.getTagList("SkinOverlayData",10); @@ -90,39 +61,7 @@ public class NoppesUtil { ClientCacheHandler.skinOverlays.put(player.getUniqueID(), skinOverlays); } - public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer){ - Minecraft minecraft = Minecraft.getMinecraft(); - - NBTTagCompound compound; - ScriptParticle particle; - try { - compound = Server.readNBT(buffer); - particle = ScriptParticle.fromNBT(compound); - } catch (IOException ignored) { - return; - } - - World worldObj = player.worldObj; - if (worldObj == null) { - return; - } - - Entity entity = null; - if (compound.hasKey("EntityID")) { - entity = worldObj.getEntityByID(compound.getInteger("EntityID")); - if (entity != null) - worldObj = entity.worldObj; - else return; - } - - CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity); - - for(int i = 0; i < particle.amount; i++){ - minecraft.effectRenderer.addEffect(fx); - } - } - - public static void clickSound() { + public static void clickSound() { Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index b13f8df8b..d6c4c0f7a 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -124,12 +124,6 @@ public class PacketHandlerClient extends PacketHandlerServer{ EnumGuiType gui = EnumGuiType.values()[buffer.readInt()]; CustomNpcs.proxy.openGui(NoppesUtil.getLastNpc(), gui, buffer.readInt(), buffer.readInt(), buffer.readInt()); } - else if(type == EnumPacketClient.SCRIPTED_PARTICLE){ - NoppesUtil.spawnScriptedParticle(player, buffer); - } - else if(type == EnumPacketClient.PARTICLE){ - NoppesUtil.spawnParticle(buffer); - } else if(type == EnumPacketClient.DELETE_NPC){ Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt()); if(entity == null || !(entity instanceof EntityNPCInterface)) diff --git a/src/main/java/noppes/npcs/constants/EnumPacketClient.java b/src/main/java/noppes/npcs/constants/EnumPacketClient.java index ec0ceb509..34b1a9934 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketClient.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketClient.java @@ -12,8 +12,6 @@ public enum EnumPacketClient { UPDATE_NPC, ROLE, GUI, - SCRIPTED_PARTICLE, - PARTICLE, DELETE_NPC, SCROLL_SELECTED, GUI_REDSTONE,