Moved packet structures to common.

FFXIVClassic Common Class Lib/BasePacket.cs

@@ -3,11 +3,10 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
-using FFXIVClassic.Common;
 using NLog;
 using NLog.Targets;
 
-namespace FFXIVClassic_Map_Server.packets
+namespace FFXIVClassic.Common
 {
     [StructLayout(LayoutKind.Sequential)]
     public struct BasePacketHeader

FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj

@@ -54,12 +54,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BasePacket.cs" />
     <Compile Include="Bitfield.cs" />
     <Compile Include="Blowfish.cs" />
     <Compile Include="EfficientHashTables.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Sql.cs" />
     <Compile Include="STA_INIFile.cs" />
+    <Compile Include="SubPacket.cs" />
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>

FFXIVClassic Common Class Lib/SubPacket.cs

@@ -4,7 +4,7 @@ using FFXIVClassic.Common;
 using NLog;
 using NLog.Targets;
 
-namespace FFXIVClassic_Map_Server.packets
+namespace FFXIVClassic.Common
 {
     [StructLayout(LayoutKind.Sequential)]
     public struct SubPacketHeader

FFXIVClassic Lobby Server/ClientConnection.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Net.Sockets;
-using FFXIVClassic_Lobby_Server.packets;
 using FFXIVClassic.Common;
 using System.Collections.Concurrent;
 using Cyotek.Collections.Generic;

FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj

@@ -89,7 +89,6 @@
     <Compile Include="Database.cs" />
     <Compile Include="dataobjects\World.cs" />
     <Compile Include="PacketProcessor.cs" />
-    <Compile Include="packets\BasePacket.cs" />
     <Compile Include="packets\receive\CharacterModifyPacket.cs" />
     <Compile Include="packets\receive\SecurityHandshakePacket.cs" />
     <Compile Include="packets\receive\SelectCharacterPacket.cs" />
@@ -99,7 +98,6 @@
     <Compile Include="packets\send\ErrorPacket.cs" />
     <Compile Include="packets\HardCoded_Packets.cs" />
     <Compile Include="packets\send\SelectCharacterConfirmPacket.cs" />
-    <Compile Include="packets\SubPacket.cs" />
     <Compile Include="packets\send\CharacterListPacket.cs" />
     <Compile Include="packets\send\ImportListPacket.cs" />
     <Compile Include="packets\send\AccountListPacket.cs" />

FFXIVClassic Lobby Server/Server.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
-using FFXIVClassic_Lobby_Server.packets;
+
 using FFXIVClassic.Common;
 using NLog;
 

FFXIVClassic Lobby Server/packets/BasePacket.cs

@@ -1,361 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using FFXIVClassic.Common;
-using NLog;
-using NLog.Targets;
-
-namespace FFXIVClassic_Lobby_Server.packets
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct BasePacketHeader
-    {
-        public byte isAuthenticated;
-        public byte isEncrypted;
-        public ushort connectionType;
-        public ushort packetSize;
-        public ushort numSubpackets;
-        public ulong timestamp; //Miliseconds
-    }
-
-    public class BasePacket
-    {
-        public const int TYPE_ZONE = 1;
-        public const int TYPE_CHAT = 2;
-        public const int BASEPACKET_SIZE = 0x10;
-        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
-        public byte[] data;
-
-        public BasePacketHeader header;
-
-        //Loads a sniffed packet from a file
-        public unsafe BasePacket(string path)
-        {
-            var bytes = File.ReadAllBytes(path);
-
-            if (bytes.Length < BASEPACKET_SIZE)
-                throw new OverflowException("Packet Error: Packet was too small");
-
-            fixed (byte* pdata = &bytes[0])
-            {
-                header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
-            }
-
-            if (bytes.Length < header.packetSize)
-                throw new OverflowException("Packet Error: Packet size didn't equal given size");
-
-            int packetSize = header.packetSize;
-
-            if (packetSize - BASEPACKET_SIZE != 0)
-            {
-                data = new byte[packetSize - BASEPACKET_SIZE];
-                Array.Copy(bytes, BASEPACKET_SIZE, data, 0, packetSize - BASEPACKET_SIZE);
-            }
-            else
-                data = new byte[0];
-        }
-
-        //Loads a sniffed packet from a byte array
-        public unsafe BasePacket(byte[] bytes)
-        {
-            if (bytes.Length < BASEPACKET_SIZE)
-                throw new OverflowException("Packet Error: Packet was too small");
-
-            fixed (byte* pdata = &bytes[0])
-            {
-                header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
-            }
-
-            if (bytes.Length < header.packetSize)
-                throw new OverflowException("Packet Error: Packet size didn't equal given size");
-
-            int packetSize = header.packetSize;
-
-            data = new byte[packetSize - BASEPACKET_SIZE];
-            Array.Copy(bytes, BASEPACKET_SIZE, data, 0, packetSize - BASEPACKET_SIZE);
-        }
-
-        public unsafe BasePacket(byte[] bytes, ref int offset)
-        {
-            if (bytes.Length < offset + BASEPACKET_SIZE)
-                throw new OverflowException("Packet Error: Packet was too small");
-
-            fixed (byte* pdata = &bytes[offset])
-            {
-                header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
-            }
-
-            int packetSize = header.packetSize;
-
-            if (bytes.Length < offset + header.packetSize)
-                throw new OverflowException("Packet Error: Packet size didn't equal given size");
-
-            data = new byte[packetSize - BASEPACKET_SIZE];
-            Array.Copy(bytes, offset + BASEPACKET_SIZE, data, 0, packetSize - BASEPACKET_SIZE);
-
-            offset += packetSize;
-        }
-
-        public BasePacket(BasePacketHeader header, byte[] data)
-        {
-            this.header = header;
-            this.data = data;
-        }
-
-        public List<SubPacket> GetSubpackets()
-        {
-            var subpackets = new List<SubPacket>(header.numSubpackets);
-
-            var offset = 0;
-
-            while (offset < data.Length)
-                subpackets.Add(new SubPacket(data, ref offset));
-
-            return subpackets;
-        }
-
-        public static unsafe BasePacketHeader GetHeader(byte[] bytes)
-        {
-            BasePacketHeader header;
-            if (bytes.Length < BASEPACKET_SIZE)
-                throw new OverflowException("Packet Error: Packet was too small");
-
-            fixed (byte* pdata = &bytes[0])
-            {
-                header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
-            }
-
-            return header;
-        }
-
-        public byte[] GetHeaderBytes()
-        {
-            var size = Marshal.SizeOf(header);
-            var arr = new byte[size];
-
-            var ptr = Marshal.AllocHGlobal(size);
-            Marshal.StructureToPtr(header, ptr, true);
-            Marshal.Copy(ptr, arr, 0, size);
-            Marshal.FreeHGlobal(ptr);
-            return arr;
-        }
-
-        public byte[] GetPacketBytes()
-        {
-            var outBytes = new byte[header.packetSize];
-            Array.Copy(GetHeaderBytes(), 0, outBytes, 0, BASEPACKET_SIZE);
-            Array.Copy(data, 0, outBytes, BASEPACKET_SIZE, data.Length);
-            return outBytes;
-        }
-
-        //Replaces all instances of the sniffed actorID with the given one
-        public void ReplaceActorID(uint actorID)
-        {
-            using (var mem = new MemoryStream(data))
-            {
-                using (var binWriter = new BinaryWriter(mem))
-                {
-                    using (var binreader = new BinaryReader(mem))
-                    {
-                        while (binreader.BaseStream.Position + 4 < data.Length)
-                        {
-                            var read = binreader.ReadUInt32();
-                            if (read == 0x029B2941 || read == 0x02977DC7 || read == 0x0297D2C8 || read == 0x0230d573 ||
-                                read == 0x23317df || read == 0x23344a3 || read == 0x1730bdb) //Original ID
-                            {
-                                binWriter.BaseStream.Seek(binreader.BaseStream.Position - 0x4, SeekOrigin.Begin);
-                                binWriter.Write(actorID);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //Replaces all instances of the sniffed actorID with the given one
-        public void ReplaceActorID(uint fromActorID, uint actorID)
-        {
-            using (var mem = new MemoryStream(data))
-            {
-                using (var binWriter = new BinaryWriter(mem))
-                {
-                    using (var binreader = new BinaryReader(mem))
-                    {
-                        while (binreader.BaseStream.Position + 4 < data.Length)
-                        {
-                            var read = binreader.ReadUInt32();
-                            if (read == fromActorID) //Original ID
-                            {
-                                binWriter.BaseStream.Seek(binreader.BaseStream.Position - 0x4, SeekOrigin.Begin);
-                                binWriter.Write(actorID);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public void DebugPrintPacket()
-        {
-#if DEBUG
-            logger.ColorDebug(
-                string.Format("IsAuth:{0} Size:0x{1:X}, NumSubpackets:{2}{3}{4}",
-                    header.isAuthenticated, header.packetSize, header.numSubpackets,
-                    Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes())), ConsoleOutputColor.DarkYellow);
-
-            foreach (var sub in GetSubpackets())
-            {
-                sub.DebugPrintSubPacket();
-            }
-#endif
-        }
-
-        #region Utility Functions
-
-        public static BasePacket CreatePacket(List<SubPacket> subpackets, bool isAuthed, bool isEncrypted)
-        {
-            //Create Header
-            var header = new BasePacketHeader();
-            byte[] data = null;
-
-            header.isAuthenticated = isAuthed ? (byte) 1 : (byte) 0;
-            header.isEncrypted = isEncrypted ? (byte) 1 : (byte) 0;
-            header.numSubpackets = (ushort) subpackets.Count;
-            header.packetSize = BASEPACKET_SIZE;
-            header.timestamp = Utils.MilisUnixTimeStampUTC();
-
-            //Get packet size
-            foreach (var subpacket in subpackets)
-                header.packetSize += subpacket.header.subpacketSize;
-
-            data = new byte[header.packetSize - 0x10];
-
-            //Add Subpackets
-            var offset = 0;
-            foreach (var subpacket in subpackets)
-            {
-                var subpacketData = subpacket.GetBytes();
-                Array.Copy(subpacketData, 0, data, offset, subpacketData.Length);
-                offset += (ushort) subpacketData.Length;
-            }
-
-            Debug.Assert(data != null && offset == data.Length && header.packetSize == 0x10 + offset);
-
-            var packet = new BasePacket(header, data);
-            return packet;
-        }
-
-        public static BasePacket CreatePacket(SubPacket subpacket, bool isAuthed, bool isEncrypted)
-        {
-            //Create Header
-            var header = new BasePacketHeader();
-            byte[] data = null;
-
-            header.isAuthenticated = isAuthed ? (byte) 1 : (byte) 0;
-            header.isEncrypted = isEncrypted ? (byte) 1 : (byte) 0;
-            header.numSubpackets = 1;
-            header.packetSize = BASEPACKET_SIZE;
-            header.timestamp = Utils.MilisUnixTimeStampUTC();
-
-            //Get packet size
-            header.packetSize += subpacket.header.subpacketSize;
-
-            data = new byte[header.packetSize - 0x10];
-
-            //Add Subpackets
-            var subpacketData = subpacket.GetBytes();
-            Array.Copy(subpacketData, 0, data, 0, subpacketData.Length);
-
-            Debug.Assert(data != null);
-
-            var packet = new BasePacket(header, data);
-            return packet;
-        }
-
-        public static BasePacket CreatePacket(byte[] data, bool isAuthed, bool isEncrypted)
-        {
-            Debug.Assert(data != null);
-
-            //Create Header
-            var header = new BasePacketHeader();
-
-            header.isAuthenticated = isAuthed ? (byte) 1 : (byte) 0;
-            header.isEncrypted = isEncrypted ? (byte) 1 : (byte) 0;
-            header.numSubpackets = 1;
-            header.packetSize = BASEPACKET_SIZE;
-            header.timestamp = Utils.MilisUnixTimeStampUTC();
-
-            //Get packet size
-            header.packetSize += (ushort) data.Length;
-
-            var packet = new BasePacket(header, data);
-            return packet;
-        }
-
-        public static unsafe void EncryptPacket(Blowfish blowfish, BasePacket packet)
-        {
-            var data = packet.data;
-            int size = packet.header.packetSize;
-
-            var offset = 0;
-            while (offset < data.Length)
-            {
-                if (data.Length < offset + SubPacket.SUBPACKET_SIZE)
-                    throw new OverflowException("Packet Error: Subpacket was too small");
-
-                SubPacketHeader header;
-                fixed (byte* pdata = &data[offset])
-                {
-                    header = (SubPacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(SubPacketHeader));
-                }
-
-                if (data.Length < offset + header.subpacketSize)
-                    throw new OverflowException("Packet Error: Subpacket size didn't equal subpacket data");
-
-                blowfish.Encipher(data, offset + 0x10, header.subpacketSize - 0x10);
-
-                offset += header.subpacketSize;
-            }
-        }
-
-        public static unsafe void DecryptPacket(Blowfish blowfish, ref BasePacket packet)
-        {
-            var data = packet.data;
-            int size = packet.header.packetSize;
-
-            var offset = 0;
-            while (offset < data.Length)
-            {
-                if (data.Length < offset + SubPacket.SUBPACKET_SIZE)
-                    throw new OverflowException("Packet Error: Subpacket was too small");
-
-                SubPacketHeader header;
-                fixed (byte* pdata = &data[offset])
-                {
-                    header = (SubPacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(SubPacketHeader));
-                }
-
-                if (data.Length < offset + header.subpacketSize)
-                    throw new OverflowException("Packet Error: Subpacket size didn't equal subpacket data");
-
-                blowfish.Decipher(data, offset + 0x10, header.subpacketSize - 0x10);
-
-                offset += header.subpacketSize;
-            }
-        }
-
-        #endregion
-    }
-
-    public static class LoggerExtensions
-    {
-        public static void ColorDebug(this Logger logger, string message, ConsoleOutputColor color)
-        {
-            var logEvent = new LogEventInfo(LogLevel.Debug, logger.Name, message);
-            logEvent.Properties["color"] = (int) color;
-            logger.Log(logEvent);
-        }
-    }
-}

FFXIVClassic Lobby Server/packets/SubPacket.cs

@@ -1,163 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using FFXIVClassic.Common;
-using NLog;
-using NLog.Targets;
-
-namespace FFXIVClassic_Lobby_Server.packets
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct SubPacketHeader
-    {
-        public ushort subpacketSize;
-        public ushort type;
-        public uint sourceId;
-        public uint targetId;
-        public uint unknown1;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct GameMessageHeader
-    {
-        public ushort unknown4; //Always 0x14
-        public ushort opcode;
-        public uint unknown5;
-        public uint timestamp;
-        public uint unknown6;
-    }
-
-    public class SubPacket
-    {
-        public const int SUBPACKET_SIZE = 0x10;
-        public const int GAMEMESSAGE_SIZE = 0x10;
-        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
-        public byte[] data;
-        public GameMessageHeader gameMessage;
-
-        public SubPacketHeader header;
-
-        public unsafe SubPacket(byte[] bytes, ref int offset)
-        {
-            if (bytes.Length < offset + SUBPACKET_SIZE)
-                throw new OverflowException("Packet Error: Subpacket was too small");
-
-            fixed (byte* pdata = &bytes[offset])
-            {
-                header = (SubPacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(SubPacketHeader));
-            }
-
-            if (header.type == 0x3)
-            {
-                fixed (byte* pdata = &bytes[offset + SUBPACKET_SIZE])
-                {
-                    gameMessage =
-                        (GameMessageHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(GameMessageHeader));
-                }
-            }
-
-            if (bytes.Length < offset + header.subpacketSize)
-                throw new OverflowException("Packet Error: Subpacket size didn't equal subpacket data");
-
-            if (header.type == 0x3)
-            {
-                data = new byte[header.subpacketSize - SUBPACKET_SIZE - GAMEMESSAGE_SIZE];
-                Array.Copy(bytes, offset + SUBPACKET_SIZE + GAMEMESSAGE_SIZE, data, 0, data.Length);
-            }
-            else
-            {
-                data = new byte[header.subpacketSize - SUBPACKET_SIZE];
-                Array.Copy(bytes, offset + SUBPACKET_SIZE, data, 0, data.Length);
-            }
-
-            offset += header.subpacketSize;
-        }
-
-        public SubPacket(ushort opcode, uint sourceId, uint targetId, byte[] data)
-        {
-            header = new SubPacketHeader();
-            gameMessage = new GameMessageHeader();
-
-            gameMessage.opcode = opcode;
-            header.sourceId = sourceId;
-            header.targetId = targetId;
-
-            gameMessage.timestamp = Utils.UnixTimeStampUTC();
-
-            header.type = 0x03;
-            header.unknown1 = 0x00;
-            gameMessage.unknown4 = 0x14;
-            gameMessage.unknown5 = 0x00;
-            gameMessage.unknown6 = 0x00;
-
-            this.data = data;
-
-            header.subpacketSize = (ushort) (SUBPACKET_SIZE + GAMEMESSAGE_SIZE + data.Length);
-        }
-
-        public SubPacket(SubPacket original, uint newTargetId)
-        {
-            header = new SubPacketHeader();
-            gameMessage = original.gameMessage;
-            header.subpacketSize = original.header.subpacketSize;
-            header.type = original.header.type;
-            header.sourceId = original.header.sourceId;
-            header.targetId = newTargetId;
-            data = original.data;
-        }
-
-        public byte[] GetHeaderBytes()
-        {
-            var size = Marshal.SizeOf(header);
-            var arr = new byte[size];
-
-            var ptr = Marshal.AllocHGlobal(size);
-            Marshal.StructureToPtr(header, ptr, true);
-            Marshal.Copy(ptr, arr, 0, size);
-            Marshal.FreeHGlobal(ptr);
-            return arr;
-        }
-
-        public byte[] GetGameMessageBytes()
-        {
-            var size = Marshal.SizeOf(gameMessage);
-            var arr = new byte[size];
-
-            var ptr = Marshal.AllocHGlobal(size);
-            Marshal.StructureToPtr(gameMessage, ptr, true);
-            Marshal.Copy(ptr, arr, 0, size);
-            Marshal.FreeHGlobal(ptr);
-            return arr;
-        }
-
-        public byte[] GetBytes()
-        {
-            var outBytes = new byte[header.subpacketSize];
-            Array.Copy(GetHeaderBytes(), 0, outBytes, 0, SUBPACKET_SIZE);
-
-            if (header.type == 0x3)
-                Array.Copy(GetGameMessageBytes(), 0, outBytes, SUBPACKET_SIZE, GAMEMESSAGE_SIZE);
-
-            Array.Copy(data, 0, outBytes, SUBPACKET_SIZE + (header.type == 0x3 ? GAMEMESSAGE_SIZE : 0), data.Length);
-            return outBytes;
-        }
-
-        public void DebugPrintSubPacket()
-        {
-#if DEBUG
-            logger.ColorDebug(
-                string.Format("Size:0x{0:X} Opcode:0x{1:X}{2}{3}", header.subpacketSize, gameMessage.opcode,
-                    Environment.NewLine,
-                    Utils.ByteArrayToHex(GetHeaderBytes())), ConsoleOutputColor.DarkRed);
-
-            if (header.type == 0x03)
-            {
-                logger.ColorDebug(Utils.ByteArrayToHex(GetGameMessageBytes(), SUBPACKET_SIZE),
-                    ConsoleOutputColor.DarkRed);
-
-                logger.ColorDebug(Utils.ByteArrayToHex(data, SUBPACKET_SIZE + GAMEMESSAGE_SIZE),
-                    ConsoleOutputColor.DarkMagenta);
-            }
-#endif
-        }
-    }
-}

FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Lobby_Server.dataobjects;
+using FFXIVClassic.Common;
+using FFXIVClassic_Lobby_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;

FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 using System.Text;
 

FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Lobby_Server.dataobjects;
+using FFXIVClassic.Common;
+using FFXIVClassic_Lobby_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;

FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 using System.Text;
 

FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Lobby_Server.dataobjects;
+using FFXIVClassic.Common;
+using FFXIVClassic_Lobby_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;

FFXIVClassic Map Server/ClientConnection.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Net.Sockets;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic.Common;
 using System.Collections.Concurrent;
 using System.Net;

FFXIVClassic Map Server/CommandProcessor.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Threading;
 using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.packets;
+
 using System.IO;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server;

FFXIVClassic Map Server/Database.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.utils;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.packets.send.player;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.Actors;

FFXIVClassic Map Server/FFXIVClassic Map Server.csproj

@@ -121,7 +121,6 @@
     <Compile Include="lua\LuaPlayer.cs" />
     <Compile Include="lua\LuaScript.cs" />
     <Compile Include="PacketProcessor.cs" />
-    <Compile Include="packets\BasePacket.cs" />
     <Compile Include="packets\receive\ChatMessagePacket.cs" />
     <Compile Include="packets\receive\events\EventUpdatePacket.cs" />
     <Compile Include="packets\receive\events\EventStartPacket.cs" />
@@ -255,7 +254,6 @@
     <Compile Include="packets\send\_0x02Packet.cs" />
     <Compile Include="packets\send\_0x10Packet.cs" />
     <Compile Include="packets\send\_0xE2Packet.cs" />
-    <Compile Include="packets\SubPacket.cs" />
     <Compile Include="packets\receive\PingPacket.cs" />
     <Compile Include="packets\receive\UpdatePlayerPositionPacket.cs" />
     <Compile Include="Program.cs" />

FFXIVClassic Map Server/PacketProcessor.cs

@@ -1,5 +1,5 @@
 using FFXIVClassic.Common;
-using FFXIVClassic_Map_Server.packets;
+
 using System;
 using System.Collections.Generic;
 using System.IO;

FFXIVClassic Map Server/Server.cs

@@ -4,7 +4,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic.Common;
 using NLog;
 using FFXIVClassic_Map_Server.Actors;

FFXIVClassic Map Server/actors/Actor.cs

@@ -1,4 +1,4 @@
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/area/Area.cs

@@ -1,6 +1,6 @@
 using FFXIVClassic_Map_Server;
 using FFXIVClassic.Common;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.actors.area;
 using FFXIVClassic_Map_Server.actors.chara.npc;
 using FFXIVClassic_Map_Server.dataobjects;

FFXIVClassic Map Server/actors/area/PrivateArea.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/area/Zone.cs

@@ -1,6 +1,6 @@
 using FFXIVClassic_Map_Server;
 using FFXIVClassic.Common;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.actors.chara.npc;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;

FFXIVClassic Map Server/actors/chara/Character.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors.Chara;
 using FFXIVClassic_Map_Server.packets.send.actor;
 

FFXIVClassic Map Server/actors/chara/npc/Npc.cs

@@ -3,7 +3,7 @@ using FFXIVClassic_Map_Server.actors;
 using FFXIVClassic_Map_Server.Actors.Chara;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.lua;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.packets.receive.events;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.utils;

FFXIVClassic Map Server/actors/chara/player/Equipment.cs

@@ -1,7 +1,6 @@
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.packets.send.actor.inventory;
-using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
 using System.Collections.Generic;
 
 namespace FFXIVClassic_Map_Server.actors.chara.player

FFXIVClassic Map Server/actors/chara/player/Inventory.cs

@@ -1,8 +1,8 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.packets.send.actor.inventory;
-using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
 using System;
 using System.Collections.Generic;
 using System.Linq;

FFXIVClassic Map Server/actors/chara/player/Player.cs

@@ -1,5 +1,5 @@
 using FFXIVClassic.Common;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.actors.chara.player;
 using FFXIVClassic_Map_Server.actors.director;
 using FFXIVClassic_Map_Server.dataobjects;
@@ -7,8 +7,6 @@ using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using FFXIVClassic_Map_Server.packets.send.actor.events;
-using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
 using FFXIVClassic_Map_Server.packets.send.events;
 using FFXIVClassic_Map_Server.packets.send.list;
 using FFXIVClassic_Map_Server.packets.send.player;
@@ -17,6 +15,7 @@ using System;
 using System.Collections.Generic;
 using MoonSharp.Interpreter;
 using FFXIVClassic_Map_Server.packets.receive.events;
+using FFXIVClassic_Map_Server.packets.send.actor.inventory;
 
 namespace FFXIVClassic_Map_Server.Actors
 {

FFXIVClassic Map Server/actors/debug/Debug.cs

@@ -1,4 +1,4 @@
-using FFXIVClassic_Map_Server.packets;
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using System.Collections.Generic;

FFXIVClassic Map Server/actors/director/Director.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/director/OpeningDirector.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/director/WeatherDirector.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.actors.director;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/actors/world/WorldMaster.cs

@@ -1,4 +1,5 @@
-using FFXIVClassic_Map_Server.packets;
+
+using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using System.Collections.Generic;

FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs

@@ -1,6 +1,6 @@
 using FFXIVClassic_Map_Server;
 using FFXIVClassic.Common;
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;

FFXIVClassic Map Server/lua/LuaEngine.cs

@@ -1,4 +1,4 @@
-using FFXIVClassic_Map_Server.packets;
+
 using FFXIVClassic_Map_Server.actors.director;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Diagnostics;
 using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic.Common;
 
 namespace FFXIVClassic_Map_Server.lua
 {

FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class ActorDoEmotePacket

FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class ActorInstantiatePacket

FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorQuestGraphicPacket

FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs

@@ -1,4 +1,8 @@
-namespace FFXIVClassic_Map_Server.packets.send.actor
+using FFXIVClassic.Common;
+
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class AddActorPacket
     {

FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs

@@ -1,4 +1,7 @@
-using System.IO;
+using FFXIVClassic.Common;
+using System.IO;
+
+using FFXIVClassic.Common;
 
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {

FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs

@@ -1,4 +1,8 @@
-namespace FFXIVClassic_Map_Server.packets.send.actor
+using FFXIVClassic.Common;
+
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class DeleteAllActorsPacket
     {

FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class MoveActorToPositionPacket

FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class RemoveActorPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs

@@ -1,5 +1,7 @@
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorAppearancePacket

FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorIconPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorIdleAnimationPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs

@@ -1,4 +1,6 @@
-namespace FFXIVClassic_Map_Server.packets.send.actor
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorIsZoningPacket
     {

FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs

@@ -2,6 +2,8 @@
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorNamePacket

FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorPositionPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs

@@ -5,6 +5,8 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorPropetyPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
 namespace  FFXIVClassic_Map_Server.packets.send.actor

FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs

@@ -1,4 +1,7 @@
-using System;
+using FFXIVClassic.Common;
+using System;
+
+using FFXIVClassic.Common;
 
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {

FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs

@@ -1,6 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorStatusAllPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs

@@ -1,6 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorStatusPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs

@@ -1,5 +1,7 @@
 using System;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorTargetAnimatedPacket

FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {

FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs

@@ -1,7 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class _0x132Packet

FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs

@@ -1,5 +1,7 @@
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor
 {
     class _0xFPacket

FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs

@@ -1,4 +1,6 @@
-namespace FFXIVClassic_Map_Server.packets.send.actor.battle
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.battle
 {
     class BattleAction
     {

FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs

@@ -1,6 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.battle
 {
     class BattleActionX00Packet

FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs

@@ -1,6 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.battle
 {
     class BattleActionX01Packet

FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs

@@ -1,6 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.battle
 {
     class BattleActionX10Packet

FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs

@@ -1,6 +1,9 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.battle
 {
     class BattleActionX18Packet

FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs

@@ -1,8 +1,11 @@
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic.Common;
+using FFXIVClassic_Map_Server.actors;
 using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetEmoteEventCondition

FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs

@@ -2,6 +2,8 @@
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetEventStatus

FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs

@@ -3,6 +3,8 @@ using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetNoticeEventCondition

FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs

@@ -3,6 +3,8 @@ using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetPushEventConditionWithCircle

FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs

@@ -3,6 +3,8 @@ using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetPushEventConditionWithFan

FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs

@@ -3,6 +3,8 @@ using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetPushEventConditionWithTriggerBox

FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs

@@ -3,6 +3,8 @@ using System;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.events
 {
     class SetTalkEventCondition

FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs

@@ -1,7 +1,9 @@
 using System;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class EquipmentListX01Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs

@@ -3,7 +3,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class EquipmentListX08Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs

@@ -3,7 +3,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class EquipmentListX16Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs

@@ -3,7 +3,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class EquipmentListX32Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs

@@ -3,7 +3,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class EquipmentListX64Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs

@@ -1,4 +1,6 @@
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryBeginChangePacket
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs

@@ -1,4 +1,6 @@
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryEndChangePacket
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryItemEndPacket
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryItemPacket
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs

@@ -1,6 +1,8 @@
 using FFXIVClassic_Map_Server.dataobjects;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryListX01Packet

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs

@@ -3,6 +3,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryListX08Packet

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryListX16Packet

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryListX32Packet

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using FFXIVClassic.Common;
+
 namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryListX64Packet

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs

@@ -1,7 +1,9 @@
 using System;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryRemoveX01Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs

@@ -1,8 +1,11 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryRemoveX08Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryRemoveX16Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryRemoveX32Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventoryRemoveX64Packet
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs

@@ -1,7 +1,9 @@
 using System;
 using System.IO;
 
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventorySetBeginPacket
     {

FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs

@@ -1,4 +1,6 @@
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+using FFXIVClassic.Common;
+
+namespace  FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
     class InventorySetEndPacket
     {

FFXIVClassic Map Server/packets/send/GameMessagePacket.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
+using FFXIVClassic.Common;
+
 namespace FFXIVClassic_Map_Server.packets.send
 {
     class GameMessagePacket

FFXIVClassic Map Server/packets/send/LogoutPacket.cs

@@ -1,4 +1,6 @@
-namespace FFXIVClassic_Map_Server.packets.send
+using FFXIVClassic.Common;
+
+namespace FFXIVClassic_Map_Server.packets.send
 {
     class LogoutPacket
     {

FFXIVClassic Map Server/packets/send/PongPacket.cs

@@ -1,4 +1,5 @@
-using System;
+using FFXIVClassic.Common;
+using System;
 using System.IO;
 
 namespace FFXIVClassic_Map_Server.packets.receive