Reorganization again

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<Integer, AbstractPacket> 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;
     }
 

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<EnumPacketType, FMLEventChannel> channels = new Hashtable<>();
+    public Map<EnumChannelType, FMLEventChannel> 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<PacketChannel> 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) {

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,

src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java

@@ -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,
-}

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,
 }

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,
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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