From 702df25036028d94843c7319b8f54622d896a9cc Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 30 Jan 2025 13:58:09 -0500 Subject: [PATCH] Reorganization again --- .../kamkeel/npcs/network/PacketChannel.java | 10 ++-- .../kamkeel/npcs/network/PacketHandler.java | 18 +++--- ...umPacketType.java => EnumChannelType.java} | 2 +- .../npcs/network/enums/EnumClientPacket.java | 58 ------------------- .../npcs/network/enums/EnumDataPacket.java | 55 ++++++++++++++++++ ...mInfoPacket.java => EnumPlayerPacket.java} | 2 +- .../packets/data/AchievementPacket.java | 4 +- .../network/packets/data/ChatAlertPacket.java | 4 +- .../packets/data/ChatBubblePacket.java | 4 +- .../network/packets/data/ClonerPacket.java | 4 +- .../packets/data/ConfigCommandPacket.java | 4 +- .../packets/data/DisableMouseInputPacket.java | 4 +- .../network/packets/data/LoginPacket.java | 4 +- .../network/packets/data/MarkDataPacket.java | 4 +- .../data/OverlayQuestTrackingPacket.java | 4 +- .../network/packets/data/ParticlePacket.java | 4 +- .../data/PlayerUpdateSkinOverlaysPacket.java | 4 +- .../packets/data/QuestCompletionPacket.java | 4 +- .../packets/data/ScrollSelectedPacket.java | 4 +- .../packets/data/SoundManagementPacket.java | 4 +- .../packets/data/SwingPlayerArmPacket.java | 4 +- .../packets/data/UpdateAnimationsPacket.java | 4 +- .../packets/data/VillagerListPacket.java | 4 +- .../packets/data/gui/GuiClosePacket.java | 4 +- .../packets/data/gui/GuiErrorPacket.java | 4 +- .../packets/data/gui/GuiOpenBookPacket.java | 4 +- .../packets/data/gui/GuiOpenPacket.java | 4 +- .../packets/data/gui/GuiRedstonePacket.java | 4 +- .../packets/data/gui/GuiTeleporterPacket.java | 4 +- .../packets/data/gui/GuiWaypointPacket.java | 4 +- .../packets/data/gui/IsGuiOpenPacket.java | 4 +- .../packets/data/large/GuiDataPacket.java | 4 +- .../packets/data/large/PartyDataPacket.java | 4 +- .../packets/data/large/ScrollDataPacket.java | 4 +- .../packets/data/large/ScrollGroupPacket.java | 4 +- .../packets/data/large/ScrollListPacket.java | 4 +- .../packets/data/large/SyncPacket.java | 4 +- .../packets/data/npc/DeleteNpcPacket.java | 4 +- .../packets/data/npc/DialogPacket.java | 4 +- .../packets/data/npc/EditNpcPacket.java | 4 +- .../network/packets/data/npc/RolePacket.java | 4 +- .../packets/data/npc/UpdateNpcPacket.java | 4 +- .../packets/data/npc/WeaponNpcPacket.java | 4 +- .../data/script/ScriptOverlayClosePacket.java | 4 +- .../data/script/ScriptOverlayDataPacket.java | 4 +- .../data/script/ScriptedParticlePacket.java | 4 +- 46 files changed, 151 insertions(+), 154 deletions(-) rename src/main/java/kamkeel/npcs/network/enums/{EnumPacketType.java => EnumChannelType.java} (74%) delete mode 100644 src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java rename src/main/java/kamkeel/npcs/network/enums/{EnumInfoPacket.java => EnumPlayerPacket.java} (61%) diff --git a/src/main/java/kamkeel/npcs/network/PacketChannel.java b/src/main/java/kamkeel/npcs/network/PacketChannel.java index aae7eca34..d080f1239 100644 --- a/src/main/java/kamkeel/npcs/network/PacketChannel.java +++ b/src/main/java/kamkeel/npcs/network/PacketChannel.java @@ -1,6 +1,6 @@ package kamkeel.npcs.network; -import kamkeel.npcs.network.enums.EnumPacketType; +import kamkeel.npcs.network.enums.EnumChannelType; import java.util.Hashtable; import java.util.Map; @@ -8,11 +8,11 @@ import java.util.Map; public class PacketChannel { private String channelName; - private EnumPacketType channelType; + private EnumChannelType channelType; public Map packets = new Hashtable<>(); - public PacketChannel(String channelName, EnumPacketType channelType) { + public PacketChannel(String channelName, EnumChannelType channelType) { this.channelName = channelName; this.channelType = channelType; } @@ -25,11 +25,11 @@ public class PacketChannel { this.channelName = channelName; } - public EnumPacketType getChannelType() { + public EnumChannelType getChannelType() { return channelType; } - public void setChannelType(EnumPacketType channelType) { + public void setChannelType(EnumChannelType channelType) { this.channelType = channelType; } diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index d3fcda649..a7774c739 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -6,7 +6,7 @@ import cpw.mods.fml.common.network.FMLNetworkEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.enums.EnumPacketType; +import kamkeel.npcs.network.enums.EnumChannelType; import kamkeel.npcs.network.packets.data.*; import kamkeel.npcs.network.packets.data.gui.*; import kamkeel.npcs.network.packets.data.large.*; @@ -25,11 +25,11 @@ public final class PacketHandler { public static PacketHandler Instance; // Channels - public Map channels = new Hashtable<>(); + public Map channels = new Hashtable<>(); - public static final PacketChannel PERMISSION_PACKET = new PacketChannel("CNPC+|Perm", EnumPacketType.PERMISSION); - public static final PacketChannel PLAYER_PACKET = new PacketChannel("CNPC+|Player", EnumPacketType.PLAYER); - public static final PacketChannel DATA_PACKET = new PacketChannel("CNPC+|Data", EnumPacketType.DATA); + public static final PacketChannel PERMISSION_PACKET = new PacketChannel("CNPC+|Perm", EnumChannelType.PERMISSION); + public static final PacketChannel PLAYER_PACKET = new PacketChannel("CNPC+|Player", EnumChannelType.PLAYER); + public static final PacketChannel DATA_PACKET = new PacketChannel("CNPC+|Data", EnumChannelType.DATA); private static final List packetChannels = new ArrayList<>(); @@ -40,10 +40,10 @@ public final class PacketHandler { packetChannels.add(DATA_PACKET); this.registerChannels(); - this.registerClientPackets(); + this.registerDataPackets(); } - public void registerClientPackets(){ + public void registerDataPackets(){ // Client Packets DATA_PACKET.registerPacket(new AchievementPacket()); DATA_PACKET.registerPacket(new ChatAlertPacket()); @@ -104,7 +104,7 @@ public final class PacketHandler { } } - public PacketChannel getPacketChannel(EnumPacketType type) { + public PacketChannel getPacketChannel(EnumChannelType type) { return packetChannels.stream() .filter(channel -> channel.getChannelType() == type) .findFirst() @@ -134,7 +134,7 @@ public final class PacketHandler { try { // First two ints are channelTypeOrdinal and packetTypeOrdinal int packetTypeOrdinal = buf.readInt(); - EnumPacketType packetType = EnumPacketType.values()[packetTypeOrdinal]; + EnumChannelType packetType = EnumChannelType.values()[packetTypeOrdinal]; PacketChannel packetChannel = getPacketChannel(packetType); if (packetChannel == null) { diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumPacketType.java b/src/main/java/kamkeel/npcs/network/enums/EnumChannelType.java similarity index 74% rename from src/main/java/kamkeel/npcs/network/enums/EnumPacketType.java rename to src/main/java/kamkeel/npcs/network/enums/EnumChannelType.java index 7c65e5df3..b9ff6a5ac 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumPacketType.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumChannelType.java @@ -1,6 +1,6 @@ package kamkeel.npcs.network.enums; -public enum EnumPacketType { +public enum EnumChannelType { PERMISSION, PLAYER, DATA, diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java deleted file mode 100644 index 934b8a8c2..000000000 --- a/src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java +++ /dev/null @@ -1,58 +0,0 @@ -package kamkeel.npcs.network.enums; - -// Packets to the Client -public enum EnumClientPacket { - // Synchronization - SYNC, - CONFIG_COMMAND, - - // Messages - CHAT_ALERT, - ACHIEVEMENT, - CHATBUBBLE, - SOUND, - DIALOG, - QUEST_COMPLETION, - - - // NPC - EDIT_NPC, - UPDATE_NPC, - ROLE_NPC, - DELETE_NPC, - CLONE_NPC, - WEAPON_NPC, - - // Data - SCROLL_LIST, - SCROLL_DATA, - SCROLL_GROUP, - SCROLL_SELECTED, - PARTY_DATA, - - // GUI - GUI_OPEN, - GUI_REDSTONE, - GUI_WAYPOINT, - GUI_TELEPORTER, - GUI_BOOK, - GUI_DATA, - GUI_ERROR, - GUI_CLOSE, - ISGUIOPEN, - - // Visual - SCRIPTED_PARTICLE, - PARTICLE, - PLAYER_UPDATE_SKIN_OVERLAYS, - UPDATE_ANIMATIONS, - SCRIPT_OVERLAY_DATA, - SCRIPT_OVERLAY_CLOSE, - OVERLAY_QUEST_TRACKING, - MARK_DATA, - - // Other - VILLAGER_LIST, - SWING_PLAYER_ARM, - DISABLE_MOUSE_INPUT, -} diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java index 9ca60f8f8..29e714dd8 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java @@ -1,4 +1,59 @@ package kamkeel.npcs.network.enums; +// Packets to the Client public enum EnumDataPacket { + // Synchronization + SYNC, + CONFIG_COMMAND, + + // Messages + CHAT_ALERT, + ACHIEVEMENT, + CHATBUBBLE, + SOUND, + DIALOG, + QUEST_COMPLETION, + + + // NPC + EDIT_NPC, + UPDATE_NPC, + ROLE_NPC, + DELETE_NPC, + CLONE_NPC, + WEAPON_NPC, + + // Data + SCROLL_LIST, + SCROLL_DATA, + SCROLL_GROUP, + SCROLL_SELECTED, + PARTY_DATA, + + // GUI + GUI_OPEN, + GUI_REDSTONE, + GUI_WAYPOINT, + GUI_TELEPORTER, + GUI_BOOK, + GUI_DATA, + GUI_ERROR, + GUI_CLOSE, + ISGUIOPEN, + + // Visual + SCRIPTED_PARTICLE, + PARTICLE, + PLAYER_UPDATE_SKIN_OVERLAYS, + UPDATE_ANIMATIONS, + SCRIPT_OVERLAY_DATA, + SCRIPT_OVERLAY_CLOSE, + OVERLAY_QUEST_TRACKING, + MARK_DATA, + + // Other + VILLAGER_LIST, + SWING_PLAYER_ARM, + DISABLE_MOUSE_INPUT, + LOGIN, } diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumInfoPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java similarity index 61% rename from src/main/java/kamkeel/npcs/network/enums/EnumInfoPacket.java rename to src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java index 86cab3ee5..58b7e72fc 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java @@ -1,5 +1,5 @@ package kamkeel.npcs.network.enums; -public enum EnumInfoPacket { +public enum EnumPlayerPacket { LOGIN, } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java index f46cca579..d7742450b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java @@ -7,7 +7,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.achievement.GuiAchievement; @@ -44,7 +44,7 @@ public final class AchievementPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.ACHIEVEMENT; + return EnumDataPacket.ACHIEVEMENT; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java index 38ba7adee..8c6776b5f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,7 +33,7 @@ public final class ChatAlertPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.CHAT_ALERT; + return EnumDataPacket.CHAT_ALERT; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java index 206d75d23..4eeb26534 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -35,7 +35,7 @@ public final class ChatBubblePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.CHATBUBBLE; + return EnumDataPacket.CHATBUBBLE; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java index a64d592af..c841776c0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java @@ -7,7 +7,7 @@ import io.netty.buffer.Unpooled; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -29,7 +29,7 @@ public final class ClonerPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.CLONE_NPC; + return EnumDataPacket.CLONE_NPC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java index 7f5eb45a7..8a9738a71 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.network.enums.EnumConfigOperation; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +32,7 @@ public final class ConfigCommandPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.CONFIG_COMMAND; + return EnumDataPacket.CONFIG_COMMAND; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java index 305868eed..649680470 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.ClientEventHandler; @@ -28,7 +28,7 @@ public final class DisableMouseInputPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.DISABLE_MOUSE_INPUT; + return EnumDataPacket.DISABLE_MOUSE_INPUT; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java index 58a0460bc..ac1c9b049 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java @@ -4,7 +4,7 @@ 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.EnumInfoPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +18,7 @@ public final class LoginPacket extends AbstractPacket { @Override public Enum getType() { - return EnumInfoPacket.LOGIN; + return EnumDataPacket.LOGIN; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java index 009b1afa3..520c55932 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +31,7 @@ public final class MarkDataPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.MARK_DATA; + return EnumDataPacket.MARK_DATA; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java index 4ea6f9151..8a4306ae8 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +29,7 @@ public final class OverlayQuestTrackingPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.OVERLAY_QUEST_TRACKING; + return EnumDataPacket.OVERLAY_QUEST_TRACKING; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java index 4b885fb69..c411ac6d5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +42,7 @@ public final class ParticlePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.PARTICLE; + return EnumDataPacket.PARTICLE; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java index 7d04f43b6..5e0854f5d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +30,7 @@ public final class PlayerUpdateSkinOverlaysPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.PLAYER_UPDATE_SKIN_OVERLAYS; + return EnumDataPacket.PLAYER_UPDATE_SKIN_OVERLAYS; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java index 75bded4ad..8cc9fa545 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,7 +33,7 @@ public final class QuestCompletionPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.QUEST_COMPLETION; + return EnumDataPacket.QUEST_COMPLETION; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java index 4b2382937..2b1116a65 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -34,7 +34,7 @@ public final class ScrollSelectedPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCROLL_SELECTED; + return EnumDataPacket.SCROLL_SELECTED; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java index 7f36c8545..74ce3312f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.network.enums.EnumSoundOperation; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; @@ -61,7 +61,7 @@ public final class SoundManagementPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SOUND; + return EnumDataPacket.SOUND; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java index 85df80307..58902dae2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +19,7 @@ public final class SwingPlayerArmPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SWING_PLAYER_ARM; + return EnumDataPacket.SWING_PLAYER_ARM; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java index bb9deb78a..b6a6ea284 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -34,7 +34,7 @@ public final class UpdateAnimationsPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.UPDATE_ANIMATIONS; + return EnumDataPacket.UPDATE_ANIMATIONS; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java index c798376c8..e12221047 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.PacketBuffer; @@ -28,7 +28,7 @@ public final class VillagerListPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.VILLAGER_LIST; + return EnumDataPacket.VILLAGER_LIST; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java index 1d3780fcf..5498649dd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -37,7 +37,7 @@ public final class GuiClosePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_CLOSE; + return EnumDataPacket.GUI_CLOSE; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java index 387fa36fa..eb77ed12c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -37,7 +37,7 @@ public final class GuiErrorPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_ERROR; + return EnumDataPacket.GUI_ERROR; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java index 6cfb4ac99..a13584f42 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -35,7 +35,7 @@ public final class GuiOpenBookPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_BOOK; + return EnumDataPacket.GUI_BOOK; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java index c12235fba..564e2634e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcs; @@ -38,7 +38,7 @@ public final class GuiOpenPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_OPEN; + return EnumDataPacket.GUI_OPEN; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java index 8abfbe319..9d0587615 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -27,7 +27,7 @@ public final class GuiRedstonePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_REDSTONE; + return EnumDataPacket.GUI_REDSTONE; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java index 19faca548..390aaeedd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumGuiType; @@ -21,7 +21,7 @@ public final class GuiTeleporterPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_TELEPORTER; + return EnumDataPacket.GUI_TELEPORTER; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java index 86dd15e04..5e61d9156 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -27,7 +27,7 @@ public final class GuiWaypointPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_WAYPOINT; + return EnumDataPacket.GUI_WAYPOINT; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java index 91bfe9bcb..f025a97d5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; @@ -20,7 +20,7 @@ public final class IsGuiOpenPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.ISGUIOPEN; + return EnumDataPacket.ISGUIOPEN; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java index d4e3be4bc..94f43e1c7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java @@ -7,7 +7,7 @@ import io.netty.buffer.Unpooled; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -38,7 +38,7 @@ public final class GuiDataPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.GUI_DATA; + return EnumDataPacket.GUI_DATA; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java index ab6982403..4f13d7ba4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java @@ -7,7 +7,7 @@ import io.netty.buffer.Unpooled; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -38,7 +38,7 @@ public final class PartyDataPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.PARTY_DATA; + return EnumDataPacket.PARTY_DATA; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java index 3cfe916ed..dbb79c3b5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java @@ -5,7 +5,7 @@ import io.netty.buffer.Unpooled; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -32,7 +32,7 @@ public final class ScrollDataPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCROLL_DATA; + return EnumDataPacket.SCROLL_DATA; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java index 5c4e522a2..c6b8e4e89 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java @@ -5,7 +5,7 @@ import io.netty.buffer.Unpooled; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -32,7 +32,7 @@ public final class ScrollGroupPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCROLL_GROUP; + return EnumDataPacket.SCROLL_GROUP; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java index 1b6db6a9a..d15d7c178 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java @@ -5,7 +5,7 @@ import io.netty.buffer.Unpooled; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -32,7 +32,7 @@ public final class ScrollListPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCROLL_LIST; + return EnumDataPacket.SCROLL_LIST; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java index c7e904ea9..b9861b85c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java @@ -7,7 +7,7 @@ import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.network.enums.EnumSyncAction; import kamkeel.npcs.network.enums.EnumSyncType; import kamkeel.npcs.util.ByteBufUtils; @@ -42,7 +42,7 @@ public final class SyncPacket extends LargeAbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SYNC; + return EnumDataPacket.SYNC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java index eda6cea23..197796d69 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +27,7 @@ public final class DeleteNpcPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.DELETE_NPC; + return EnumDataPacket.DELETE_NPC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java index f826ace77..4272316ee 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -35,7 +35,7 @@ public final class DialogPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.DIALOG; + return EnumDataPacket.DIALOG; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java index 7bcaf992a..bf4add8dd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +27,7 @@ public final class EditNpcPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.EDIT_NPC; + return EnumDataPacket.EDIT_NPC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java index 6375d9df2..f21e2d47f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -30,7 +30,7 @@ public final class RolePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.ROLE_NPC; + return EnumDataPacket.ROLE_NPC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java index 5f4cab288..a03b8a449 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -29,7 +29,7 @@ public final class UpdateNpcPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.UPDATE_NPC; + return EnumDataPacket.UPDATE_NPC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java index 8abfc9f6e..8d1a9f0c7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -34,7 +34,7 @@ public final class WeaponNpcPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.WEAPON_NPC; + return EnumDataPacket.WEAPON_NPC; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java index 77057f641..85fef97d7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.ClientCacheHandler; @@ -25,7 +25,7 @@ public final class ScriptOverlayClosePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCRIPT_OVERLAY_CLOSE; + return EnumDataPacket.SCRIPT_OVERLAY_CLOSE; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java index 97fbfa4f4..670743471 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +29,7 @@ public final class ScriptOverlayDataPacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCRIPT_OVERLAY_DATA; + return EnumDataPacket.SCRIPT_OVERLAY_DATA; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java index 2295a754c..ddc8182d0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java @@ -6,7 +6,7 @@ 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.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -32,7 +32,7 @@ public final class ScriptedParticlePacket extends AbstractPacket { @Override public Enum getType() { - return EnumClientPacket.SCRIPTED_PARTICLE; + return EnumDataPacket.SCRIPTED_PARTICLE; } @Override