From 24f55139dd00162acae01a656034424ec823e5d1 Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Tue, 14 Jun 2016 21:29:10 +0100 Subject: [PATCH] mass replaced all methods to pascal case --- FFXIVClassic Common Class Lib/Blowfish.cs | 20 +- .../EfficientHashTables.cs | 14 +- FFXIVClassic Common Class Lib/STA_INIFile.cs | 8 +- FFXIVClassic Common Class Lib/Utils.cs | 6 +- FFXIVClassic Lobby Server/ClientConnection.cs | 20 +- FFXIVClassic Lobby Server/ConfigConstants.cs | 2 +- FFXIVClassic Lobby Server/Database.cs | 32 +- FFXIVClassic Lobby Server/PacketProcessor.cs | 162 ++--- FFXIVClassic Lobby Server/Program.cs | 4 +- FFXIVClassic Lobby Server/Server.cs | 38 +- .../dataobjects/CharaInfo.cs | 10 +- .../packets/BasePacket.cs | 36 +- .../packets/SubPacket.cs | 16 +- .../packets/send/AccountListPacket.cs | 2 +- .../packets/send/CharaCreatorPacket.cs | 2 +- .../packets/send/CharacterListPacket.cs | 10 +- .../packets/send/ErrorPacket.cs | 2 +- .../packets/send/ImportListPacket.cs | 2 +- .../packets/send/RetainerListPacket.cs | 2 +- .../send/SelectCharacterConfirmPacket.cs | 2 +- .../packets/send/WorldListPacket.cs | 2 +- FFXIVClassic Map Server/ClientConnection.cs | 24 +- FFXIVClassic Map Server/CommandProcessor.cs | 310 +++++----- FFXIVClassic Map Server/ConfigConstants.cs | 2 +- FFXIVClassic Map Server/Database.cs | 78 +-- FFXIVClassic Map Server/PacketProcessor.cs | 152 ++--- FFXIVClassic Map Server/Program.cs | 18 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Resources.resx | 8 +- FFXIVClassic Map Server/Server.cs | 62 +- FFXIVClassic Map Server/WorldManager.cs | 70 +-- FFXIVClassic Map Server/actors/Actor.cs | 146 ++--- .../actors/StaticActors.cs | 12 +- FFXIVClassic Map Server/actors/area/Area.cs | 42 +- .../actors/area/PrivateArea.cs | 12 +- FFXIVClassic Map Server/actors/area/Zone.cs | 18 +- .../actors/chara/Character.cs | 20 +- .../actors/chara/npc/Npc.cs | 82 +-- .../actors/chara/player/Equipment.cs | 64 +- .../actors/chara/player/Inventory.cs | 214 +++---- .../actors/chara/player/Player.cs | 566 +++++++++--------- FFXIVClassic Map Server/actors/debug/Debug.cs | 24 +- .../actors/director/Director.cs | 34 +- .../actors/director/OpeningDirector.cs | 6 +- .../actors/director/WeatherDirector.cs | 24 +- .../director/quest/QuestDirectorMan0g001.cs | 6 +- .../director/quest/QuestDirectorMan0l001.cs | 6 +- .../director/quest/QuestDirectorMan0u001.cs | 6 +- FFXIVClassic Map Server/actors/quest/Quest.cs | 2 +- .../actors/world/WorldMaster.cs | 24 +- .../dataobjects/ConnectedPlayer.cs | 52 +- .../dataobjects/DBWorld.cs | 2 +- .../dataobjects/InventoryItem.cs | 4 +- FFXIVClassic Map Server/dataobjects/Item.cs | 6 +- .../dataobjects/SearchEntry.cs | 2 +- FFXIVClassic Map Server/lua/LuaEngine.cs | 74 +-- FFXIVClassic Map Server/lua/LuaEvent.cs | 4 +- FFXIVClassic Map Server/lua/LuaPlayer.cs | 34 +- FFXIVClassic Map Server/lua/LuaUtils.cs | 60 +- FFXIVClassic Map Server/packets/BasePacket.cs | 36 +- FFXIVClassic Map Server/packets/SubPacket.cs | 16 +- .../receive/events/EventStartPacket.cs | 2 +- .../receive/events/EventUpdatePacket.cs | 2 +- .../packets/send/Actor/ActorDoEmotePacket.cs | 4 +- .../send/Actor/ActorInstantiatePacket.cs | 4 +- .../send/Actor/ActorSpecialGraphicPacket.cs | 2 +- .../packets/send/Actor/AddActorPacket.cs | 2 +- .../packets/send/Actor/BattleAction1Packet.cs | 2 +- .../send/Actor/DeleteAllActorsPacket.cs | 2 +- .../send/Actor/MoveActorToPositionPacket.cs | 2 +- .../packets/send/Actor/RemoveActorPacket.cs | 2 +- .../send/Actor/SetActorAppearancePacket.cs | 2 +- .../packets/send/Actor/SetActorIconPacket.cs | 2 +- .../send/Actor/SetActorIdleAnimationPacket.cs | 2 +- .../send/Actor/SetActorIsZoningPacket.cs | 2 +- .../packets/send/Actor/SetActorNamePacket.cs | 2 +- .../send/Actor/SetActorPositionPacket.cs | 2 +- .../send/Actor/SetActorPropetyPacket.cs | 44 +- .../packets/send/Actor/SetActorSpeedPacket.cs | 4 +- .../packets/send/Actor/SetActorStatePacket.cs | 2 +- .../send/Actor/SetActorStatusAllPacket.cs | 2 +- .../send/Actor/SetActorStatusPacket.cs | 2 +- .../Actor/SetActorTargetAnimatedPacket.cs | 2 +- .../send/Actor/SetActorTargetPacket.cs | 2 +- .../packets/send/Actor/_0x132Packet.cs | 2 +- .../packets/send/Actor/_0xFPacket.cs | 2 +- .../Actor/battle/BattleActionX00Packet.cs | 2 +- .../Actor/battle/BattleActionX01Packet.cs | 2 +- .../Actor/battle/BattleActionX10Packet.cs | 2 +- .../Actor/battle/BattleActionX18Packet.cs | 2 +- .../Actor/events/SetEmoteEventCondition.cs | 2 +- .../send/Actor/events/SetEventStatus.cs | 2 +- .../Actor/events/SetNoticeEventCondition.cs | 2 +- .../events/SetPushEventConditionWithCircle.cs | 2 +- .../events/SetPushEventConditionWithFan.cs | 4 +- .../SetPushEventConditionWithTriggerBox.cs | 2 +- .../Actor/events/SetTalkEventCondition.cs | 2 +- .../Actor/inventory/EquipmentListX01Packet.cs | 2 +- .../Actor/inventory/EquipmentListX08Packet.cs | 2 +- .../Actor/inventory/EquipmentListX16Packet.cs | 2 +- .../Actor/inventory/EquipmentListX32Packet.cs | 2 +- .../Actor/inventory/EquipmentListX64Packet.cs | 2 +- .../inventory/InventoryBeginChangePacket.cs | 4 +- .../inventory/InventoryEndChangePacket.cs | 4 +- .../Actor/inventory/InventoryItemEndPacket.cs | 4 +- .../Actor/inventory/InventoryItemPacket.cs | 4 +- .../Actor/inventory/InventoryListX01Packet.cs | 8 +- .../Actor/inventory/InventoryListX08Packet.cs | 8 +- .../Actor/inventory/InventoryListX16Packet.cs | 8 +- .../Actor/inventory/InventoryListX32Packet.cs | 4 +- .../Actor/inventory/InventoryListX64Packet.cs | 4 +- .../inventory/InventoryRemoveX01Packet.cs | 2 +- .../inventory/InventoryRemoveX08Packet.cs | 2 +- .../inventory/InventoryRemoveX16Packet.cs | 2 +- .../inventory/InventoryRemoveX32Packet.cs | 2 +- .../inventory/InventoryRemoveX64Packet.cs | 2 +- .../inventory/InventorySetBeginPacket.cs | 6 +- .../Actor/inventory/InventorySetEndPacket.cs | 4 +- .../inventory/SetInitialEquipmentPacket.cs | 4 +- .../packets/send/GameMessagePacket.cs | 24 +- .../packets/send/LogoutPacket.cs | 2 +- .../packets/send/PongPacket.cs | 2 +- .../packets/send/QuitPacket.cs | 2 +- .../packets/send/SendMessagePacket.cs | 2 +- .../packets/send/SetMapPacket.cs | 2 +- .../packets/send/SetMusicPacket.cs | 2 +- .../packets/send/SetWeatherPacket.cs | 2 +- .../packets/send/_0x02Packet.cs | 2 +- .../packets/send/_0x10Packet.cs | 2 +- .../packets/send/_0xE2Packet.cs | 2 +- .../packets/send/events/EndEventPacket.cs | 2 +- .../packets/send/events/KickEventPacket.cs | 4 +- .../send/events/RunEventFunctionPacket.cs | 4 +- .../packets/send/list/ListBeginPacket.cs | 2 +- .../packets/send/list/ListEndPacket.cs | 2 +- .../packets/send/list/ListEntriesEndPacket.cs | 2 +- .../packets/send/list/ListStartPacket.cs | 4 +- .../packets/send/list/ListUtils.cs | 30 +- .../send/list/SetListPropertyPacket.cs | 36 +- .../packets/send/login/0x2Packet.cs | 2 +- .../packets/send/login/0x7ResponsePacket.cs | 4 +- .../send/player/AchievementEarnedPacket.cs | 2 +- .../send/player/InfoRequestResponsePacket.cs | 4 +- .../send/player/SendAchievementRatePacket.cs | 2 +- .../send/player/SetAchievementPointsPacket.cs | 2 +- .../send/player/SetChocoboNamePacket.cs | 2 +- .../player/SetCompletedAchievementsPacket.cs | 2 +- .../send/player/SetCurrentJobPacket.cs | 2 +- .../player/SetCurrentMountChocoboPacket.cs | 2 +- .../player/SetCurrentMountGoobbuePacket.cs | 2 +- .../send/player/SetCutsceneBookPacket.cs | 2 +- .../send/player/SetGrandCompanyPacket.cs | 2 +- .../send/player/SetHasChocoboPacket.cs | 2 +- .../send/player/SetHasGoobbuePacket.cs | 2 +- .../player/SetLatestAchievementsPacket.cs | 2 +- .../send/player/SetPlayerDreamPacket.cs | 2 +- .../send/player/SetPlayerTitlePacket.cs | 2 +- .../packets/send/player/_0x196Packet.cs | 2 +- .../CurrentRecruitmentDetailsPacket.cs | 2 +- .../send/recruitment/EndRecruitmentPacket.cs | 2 +- .../send/recruitment/RecruiterStatePacket.cs | 2 +- .../recruitment/StartRecruitingResponse.cs | 2 +- .../send/social/BlacklistAddedPacket.cs | 2 +- .../send/social/BlacklistRemovedPacket.cs | 2 +- .../packets/send/social/FriendStatusPacket.cs | 2 +- .../send/social/FriendlistAddedPacket.cs | 2 +- .../send/social/FriendlistRemovedPacket.cs | 2 +- .../send/social/SendBlacklistPacket.cs | 2 +- .../send/social/SendFriendlistPacket.cs | 2 +- .../send/supportdesk/EndGMTicketPacket.cs | 2 +- .../send/supportdesk/FaqBodyResponsePacket.cs | 2 +- .../send/supportdesk/FaqListResponsePacket.cs | 2 +- .../send/supportdesk/GMTicketPacket.cs | 2 +- .../supportdesk/GMTicketSentResponsePacket.cs | 2 +- .../supportdesk/IssueListResponsePacket.cs | 2 +- .../send/supportdesk/StartGMTicketPacket.cs | 2 +- .../utils/ActorPropertyPacketUtil.cs | 24 +- .../utils/CharacterUtils.cs | 4 +- .../utils/SQLGeneration.cs | 12 +- 179 files changed, 1585 insertions(+), 1585 deletions(-) diff --git a/FFXIVClassic Common Class Lib/Blowfish.cs b/FFXIVClassic Common Class Lib/Blowfish.cs index f05afbea..e42fd062 100644 --- a/FFXIVClassic Common Class Lib/Blowfish.cs +++ b/FFXIVClassic Common Class Lib/Blowfish.cs @@ -283,7 +283,7 @@ namespace FFXIVClassic.Common public Blowfish(byte[] key) { - initializeBlowfish(key); + InitializeBlowfish(key); } public void Encipher(byte[] data, int offset, int length) @@ -295,7 +295,7 @@ namespace FFXIVClassic.Common { uint xl = (uint)((data[i + 0]) | (data[i + 1] << 8) | (data[i + 2] << 16) | (data[i + 3] << 24)); uint xr = (uint)((data[i + 4]) | (data[i + 5] << 8) | (data[i + 6] << 16) | (data[i + 7] << 24)); - blowfish_encipher(ref xl, ref xr); + BlowfishEncipher(ref xl, ref xr); data[i + 0] = (byte)(xl >> 0); data[i + 1] = (byte)(xl >> 8); data[i + 2] = (byte)(xl >> 16); @@ -316,7 +316,7 @@ namespace FFXIVClassic.Common { uint xl = (uint)((data[i + 0]) | (data[i + 1] << 8) | (data[i + 2] << 16) | (data[i + 3] << 24)); uint xr = (uint)((data[i + 4]) | (data[i + 5] << 8) | (data[i + 6] << 16) | (data[i + 7] << 24)); - blowfish_decipher(ref xl, ref xr); + BlowfishDecipher(ref xl, ref xr); data[i + 0] = (byte)(xl >> 0); data[i + 1] = (byte)(xl >> 8); data[i + 2] = (byte)(xl >> 16); @@ -351,7 +351,7 @@ namespace FFXIVClassic.Common return y; } - private void blowfish_encipher(ref UInt32 xl, ref UInt32 xr) + private void BlowfishEncipher(ref UInt32 xl, ref UInt32 xr) { UInt32 temp; Int32 i; @@ -374,7 +374,7 @@ namespace FFXIVClassic.Common } - private void blowfish_decipher(ref UInt32 xl, ref UInt32 xr) + private void BlowfishDecipher(ref UInt32 xl, ref UInt32 xr) { UInt32 temp; Int32 i; @@ -383,13 +383,13 @@ namespace FFXIVClassic.Common xl = xl ^ P[i]; xr = F(xl) ^ xr; - /* Exchange xl and xr */ + /* ExChange xl and xr */ temp = xl; xl = xr; xr = temp; } - /* Exchange xl and xr */ + /* ExChange xl and xr */ temp = xl; xl = xr; xr = temp; @@ -399,7 +399,7 @@ namespace FFXIVClassic.Common } - private int initializeBlowfish(byte [] key) + private int InitializeBlowfish(byte [] key) { Int16 i; Int16 j; @@ -433,7 +433,7 @@ namespace FFXIVClassic.Common for (i = 0; i < N + 2; i += 2) { - blowfish_encipher(ref datal, ref datar); + BlowfishEncipher(ref datal, ref datar); P[i] = datal; P[i + 1] = datar; @@ -443,7 +443,7 @@ namespace FFXIVClassic.Common { for (j = 0; j < 256; j += 2) { - blowfish_encipher(ref datal, ref datar); + BlowfishEncipher(ref datal, ref datar); S[i,j] = datal; S[i,j + 1] = datar; } diff --git a/FFXIVClassic Common Class Lib/EfficientHashTables.cs b/FFXIVClassic Common Class Lib/EfficientHashTables.cs index 92744b96..d96f2303 100644 --- a/FFXIVClassic Common Class Lib/EfficientHashTables.cs +++ b/FFXIVClassic Common Class Lib/EfficientHashTables.cs @@ -25,14 +25,14 @@ namespace FFXIVClassic.Common _buckets = new element[_capacity][]; } - public uint hash(ulong key) + public uint Hash(ulong key) { return (uint)(key % _capacity); } public void Add(ulong key, T value) { - uint hsh = hash(key); + uint hsh = Hash(key); element[] e; if (_buckets[hsh] == null) _buckets[hsh] = e = new element[1]; @@ -53,7 +53,7 @@ namespace FFXIVClassic.Common public T Get(ulong key) { - uint hsh = hash(key); + uint hsh = Hash(key); element[] e = _buckets[hsh]; if (e == null) return default(T); foreach (var f in e) @@ -64,7 +64,7 @@ namespace FFXIVClassic.Common public bool Has(ulong key) { - uint hsh = hash(key); + uint hsh = Hash(key); element[] e = _buckets[hsh]; if (e == null) return false; foreach (var f in e) @@ -104,14 +104,14 @@ namespace FFXIVClassic.Common _buckets = new element[_capacity][]; } - public uint hash(uint key) + public uint Hash(uint key) { return (uint)(key % _capacity); } public void Add(uint key, T value) { - uint hsh = hash(key); + uint hsh = Hash(key); element[] e; if (_buckets[hsh] == null) _buckets[hsh] = e = new element[1]; @@ -132,7 +132,7 @@ namespace FFXIVClassic.Common public T Get(uint key) { - uint hsh = hash(key); + uint hsh = Hash(key); element[] e = _buckets[hsh]; if (e == null) return default(T); foreach (var f in e) diff --git a/FFXIVClassic Common Class Lib/STA_INIFile.cs b/FFXIVClassic Common Class Lib/STA_INIFile.cs index e8669eca..08fe7e2d 100644 --- a/FFXIVClassic Common Class Lib/STA_INIFile.cs +++ b/FFXIVClassic Common Class Lib/STA_INIFile.cs @@ -198,7 +198,7 @@ namespace FFXIVClassic.Common // *** Open the original file *** sr = new StreamReader(m_FileName); - // *** Read the file original content, replace changes with local cache values *** + // *** Read the file original content, replace Changes with local cache values *** string s; string SectionName; string Key = null; @@ -379,7 +379,7 @@ namespace FFXIVClassic.Common Dictionary Section; if (!m_Sections.TryGetValue(SectionName, out Section)) { - // *** If it doesn't, add it *** + // *** If it Doesn't, Add it *** Section = new Dictionary(); m_Sections.Add(SectionName,Section); } @@ -473,7 +473,7 @@ namespace FFXIVClassic.Common return DefaultValue; } - internal double GetValue(string SectionName, string Key, double DefaultValue) + internal Double GetValue(string SectionName, string Key, Double DefaultValue) { string StringValue = GetValue(SectionName, Key, DefaultValue.ToString(CultureInfo.InvariantCulture)); double Value; @@ -518,7 +518,7 @@ namespace FFXIVClassic.Common SetValue(SectionName, Key, Value.ToString(CultureInfo.InvariantCulture)); } - internal void SetValue(string SectionName, string Key, double Value) + internal void SetValue(string SectionName, string Key, Double Value) { SetValue(SectionName, Key, Value.ToString(CultureInfo.InvariantCulture)); } diff --git a/FFXIVClassic Common Class Lib/Utils.cs b/FFXIVClassic Common Class Lib/Utils.cs index 728d5d96..f1de60b3 100644 --- a/FFXIVClassic Common Class Lib/Utils.cs +++ b/FFXIVClassic Common Class Lib/Utils.cs @@ -107,7 +107,7 @@ namespace FFXIVClassic.Common return unixTimeStamp; } - public static ulong swapEndian(ulong input) + public static ulong SwapEndian(ulong input) { return ((0x00000000000000FF) & (input >> 56) | (0x000000000000FF00) & (input >> 40) | @@ -119,7 +119,7 @@ namespace FFXIVClassic.Common (0xFF00000000000000) & (input << 56)); } - public static uint swapEndian(uint input) + public static uint SwapEndian(uint input) { return ((input >> 24) & 0xff) | ((input << 8) & 0xff0000) | @@ -127,7 +127,7 @@ namespace FFXIVClassic.Common ((input << 24) & 0xff000000); } - public static int swapEndian(int input) + public static int SwapEndian(int input) { uint inputAsUint = (uint)input; diff --git a/FFXIVClassic Lobby Server/ClientConnection.cs b/FFXIVClassic Lobby Server/ClientConnection.cs index 01a91863..02747492 100644 --- a/FFXIVClassic Lobby Server/ClientConnection.cs +++ b/FFXIVClassic Lobby Server/ClientConnection.cs @@ -15,7 +15,7 @@ namespace FFXIVClassic_Lobby_Server public Socket socket; public byte[] buffer = new byte[0xffff]; public CircularBuffer incomingStream = new CircularBuffer(1024); - public BlockingCollection sendPacketQueue = new BlockingCollection(100); + public BlockingCollection SendPacketQueue = new BlockingCollection(100); public int lastPartialSize = 0; //Instance Stuff @@ -31,7 +31,7 @@ namespace FFXIVClassic_Lobby_Server public ushort newCharaWorldId; - public void processIncoming(int bytesIn) + public void ProcessIncoming(int bytesIn) { if (bytesIn == 0) return; @@ -39,20 +39,20 @@ namespace FFXIVClassic_Lobby_Server incomingStream.Put(buffer, 0, bytesIn); } - public void queuePacket(BasePacket packet) + public void QueuePacket(BasePacket packet) { - sendPacketQueue.Add(packet); + SendPacketQueue.Add(packet); } - public void flushQueuedSendPackets() + public void FlushQueuedSendPackets() { if (!socket.Connected) return; - while (sendPacketQueue.Count > 0) + while (SendPacketQueue.Count > 0) { - BasePacket packet = sendPacketQueue.Take(); - byte[] packetBytes = packet.getPacketBytes(); + BasePacket packet = SendPacketQueue.Take(); + byte[] packetBytes = packet.GetPacketBytes(); byte[] buffer = new byte[0xffff]; Array.Copy(packetBytes, buffer, packetBytes.Length); try { @@ -63,12 +63,12 @@ namespace FFXIVClassic_Lobby_Server } } - public String getAddress() + public String GetAddress() { return String.Format("{0}:{1}", (socket.RemoteEndPoint as IPEndPoint).Address, (socket.RemoteEndPoint as IPEndPoint).Port); } - public void disconnect() + public void Disconnect() { socket.Shutdown(SocketShutdown.Both); socket.Disconnect(false); diff --git a/FFXIVClassic Lobby Server/ConfigConstants.cs b/FFXIVClassic Lobby Server/ConfigConstants.cs index 7a4c2d48..5f625a60 100644 --- a/FFXIVClassic Lobby Server/ConfigConstants.cs +++ b/FFXIVClassic Lobby Server/ConfigConstants.cs @@ -16,7 +16,7 @@ namespace FFXIVClassic_Lobby_Server public static String DATABASE_USERNAME; public static String DATABASE_PASSWORD; - public static bool load() + public static bool Load() { Console.Write("Loading lobby_config.ini file... "); diff --git a/FFXIVClassic Lobby Server/Database.cs b/FFXIVClassic Lobby Server/Database.cs index 7dce90c7..de0ff845 100644 --- a/FFXIVClassic Lobby Server/Database.cs +++ b/FFXIVClassic Lobby Server/Database.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Lobby_Server class Database { - public static uint getUserIdFromSession(String sessionId) + public static uint GetUserIdFromSession(String sessionId) { uint id = 0; using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -44,7 +44,7 @@ namespace FFXIVClassic_Lobby_Server return id; } - public static bool reserveCharacter(uint userId, uint slot, uint serverId, String name, out uint pid, out uint cid) + public static bool ReserveCharacter(uint userId, uint slot, uint serverId, String name, out uint pid, out uint cid) { bool alreadyExists = false; using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -100,13 +100,13 @@ namespace FFXIVClassic_Lobby_Server conn.Dispose(); } - Program.Log.Debug("[SQL] CID={0} created on 'characters' table.", cid); + Program.Log.Debug("[SQL] CID={0} Created on 'characters' table.", cid); } return alreadyExists; } - public static void makeCharacter(uint accountId, uint cid, CharaInfo charaInfo) + public static void MakeCharacter(uint accountId, uint cid, CharaInfo charaInfo) { //Update character entry using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -245,7 +245,7 @@ namespace FFXIVClassic_Lobby_Server Program.Log.Debug("[SQL] CID={0} state updated to active(2).", cid); } - public static bool renameCharacter(uint userId, uint characterId, uint serverId, String newName) + public static bool RenameCharacter(uint userId, uint characterId, uint serverId, String newName) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -267,7 +267,7 @@ namespace FFXIVClassic_Lobby_Server cmd = new MySqlCommand(); cmd.Connection = conn; - cmd.CommandText = "UPDATE characters SET name=@name, doRename=0 WHERE id=@cid AND userId=@uid"; + cmd.CommandText = "UPDATE characters SET name=@name, DoRename=0 WHERE id=@cid AND userId=@uid"; cmd.Prepare(); cmd.Parameters.AddWithValue("@uid", userId); cmd.Parameters.AddWithValue("@cid", characterId); @@ -292,7 +292,7 @@ namespace FFXIVClassic_Lobby_Server } } - public static void deleteCharacter(uint characterId, String name) + public static void DeleteCharacter(uint characterId, String name) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -323,7 +323,7 @@ namespace FFXIVClassic_Lobby_Server Program.Log.Debug("[SQL] CID={0} deleted.", characterId); } - public static List getServers() + public static List GetServers() { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -345,7 +345,7 @@ namespace FFXIVClassic_Lobby_Server } } - public static World getServer(uint serverId) + public static World GetServer(uint serverId) { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -369,7 +369,7 @@ namespace FFXIVClassic_Lobby_Server } } - public static List getCharacters(uint userId) + public static List GetCharacters(uint userId) { List characters = new List(); using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -384,7 +384,7 @@ namespace FFXIVClassic_Lobby_Server serverId, name, isLegacy, - doRename, + DoRename, currentZoneId, guardian, birthMonth, @@ -427,7 +427,7 @@ namespace FFXIVClassic_Lobby_Server return characters; } - public static Character getCharacter(uint userId, uint charId) + public static Character GetCharacter(uint userId, uint charId) { Character chara = null; using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -441,7 +441,7 @@ namespace FFXIVClassic_Lobby_Server serverId, name, isLegacy, - doRename, + DoRename, currentZoneId, guardian, birthMonth, @@ -482,7 +482,7 @@ namespace FFXIVClassic_Lobby_Server return chara; } - public static Appearance getAppearance(uint charaId) + public static Appearance GetAppearance(uint charaId) { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -506,7 +506,7 @@ namespace FFXIVClassic_Lobby_Server } } - public static List getReservedNames(uint userId) + public static List GetReservedNames(uint userId) { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -528,7 +528,7 @@ namespace FFXIVClassic_Lobby_Server } } - public static List getRetainers(uint userId) + public static List GetRetainers(uint userId) { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { diff --git a/FFXIVClassic Lobby Server/PacketProcessor.cs b/FFXIVClassic Lobby Server/PacketProcessor.cs index c7c723f9..e0255986 100644 --- a/FFXIVClassic Lobby Server/PacketProcessor.cs +++ b/FFXIVClassic Lobby Server/PacketProcessor.cs @@ -14,25 +14,25 @@ namespace FFXIVClassic_Lobby_Server class PacketProcessor { - public void processPacket(ClientConnection client, BasePacket packet) + public void ProcessPacket(ClientConnection client, BasePacket packet) { if ((packet.header.packetSize == 0x288) && (packet.data[0x34] == 'T')) //Test Ticket Data { - packet.debugPrintPacket(); + packet.DebugPrintPacket(); //Crypto handshake ProcessStartSession(client, packet); return; } - BasePacket.decryptPacket(client.blowfish, ref packet); + BasePacket.DecryptPacket(client.blowfish, ref packet); - packet.debugPrintPacket(); + packet.DebugPrintPacket(); - List subPackets = packet.getSubpackets(); + List subPackets = packet.GetSubpackets(); foreach (SubPacket subpacket in subPackets) { - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); if (subpacket.header.type == 3) { @@ -71,30 +71,30 @@ namespace FFXIVClassic_Lobby_Server //Respond with acknowledgment BasePacket outgoingPacket = new BasePacket(HardCoded_Packets.g_secureConnectionAcknowledgment); - BasePacket.encryptPacket(client.blowfish, outgoingPacket); - client.queuePacket(outgoingPacket); + BasePacket.EncryptPacket(client.blowfish, outgoingPacket); + client.QueuePacket(outgoingPacket); } private void ProcessSessionAcknowledgement(ClientConnection client, SubPacket packet) { - packet.debugPrintSubPacket(); + packet.DebugPrintSubPacket(); SessionPacket sessionPacket = new SessionPacket(packet.data); String clientVersion = sessionPacket.version; Program.Log.Info("Got acknowledgment for secure session."); Program.Log.Info("CLIENT VERSION: {0}", clientVersion); - uint userId = Database.getUserIdFromSession(sessionPacket.session); + uint userId = Database.GetUserIdFromSession(sessionPacket.session); client.currentUserId = userId; client.currentSessionToken = sessionPacket.session; ; if (userId == 0) { ErrorPacket errorPacket = new ErrorPacket(sessionPacket.sequence, 0, 0, 13001, "Your session has expired, please login again."); - SubPacket subpacket = errorPacket.buildPacket(); - BasePacket errorBasePacket = BasePacket.createPacket(subpacket, true, false); - BasePacket.encryptPacket(client.blowfish, errorBasePacket); - client.queuePacket(errorBasePacket); + SubPacket subpacket = errorPacket.BuildPacket(); + BasePacket errorBasePacket = BasePacket.CreatePacket(subpacket, true, false); + BasePacket.EncryptPacket(client.blowfish, errorBasePacket); + client.QueuePacket(errorBasePacket); Program.Log.Info("Invalid session, kicking..."); return; @@ -108,19 +108,19 @@ namespace FFXIVClassic_Lobby_Server defaultAccount.name = "FINAL FANTASY XIV"; accountList.Add(defaultAccount); AccountListPacket listPacket = new AccountListPacket(1, accountList); - BasePacket basePacket = BasePacket.createPacket(listPacket.buildPackets(), true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + BasePacket basePacket = BasePacket.CreatePacket(listPacket.BuildPackets(), true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); } private void ProcessGetCharacters(ClientConnection client, SubPacket packet) { - Program.Log.Info("{0} => Get characters", client.currentUserId == 0 ? client.getAddress() : "User " + client.currentUserId); + Program.Log.Info("{0} => Get characters", client.currentUserId == 0 ? client.GetAddress() : "User " + client.currentUserId); - sendWorldList(client, packet); - sendImportList(client, packet); - sendRetainerList(client, packet); - sendCharacterList(client, packet); + SendWorldList(client, packet); + SendImportList(client, packet); + SendRetainerList(client, packet); + SendCharacterList(client, packet); } @@ -128,29 +128,29 @@ namespace FFXIVClassic_Lobby_Server { SelectCharacterPacket selectCharRequest = new SelectCharacterPacket(packet.data); - Program.Log.Info("{0} => Select character id {1}", client.currentUserId == 0 ? client.getAddress() : "User " + client.currentUserId, selectCharRequest.characterId); + Program.Log.Info("{0} => Select character id {1}", client.currentUserId == 0 ? client.GetAddress() : "User " + client.currentUserId, selectCharRequest.characterId); - Character chara = Database.getCharacter(client.currentUserId, selectCharRequest.characterId); + Character chara = Database.GetCharacter(client.currentUserId, selectCharRequest.characterId); World world = null; if (chara != null) - world = Database.getServer(chara.serverId); + world = Database.GetServer(chara.serverId); if (world == null) { - ErrorPacket errorPacket = new ErrorPacket(selectCharRequest.sequence, 0, 0, 13001, "World does not exist or is inactive."); - SubPacket subpacket = errorPacket.buildPacket(); - BasePacket basePacket = BasePacket.createPacket(subpacket, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + ErrorPacket errorPacket = new ErrorPacket(selectCharRequest.sequence, 0, 0, 13001, "World Does not exist or is inactive."); + SubPacket subpacket = errorPacket.BuildPacket(); + BasePacket basePacket = BasePacket.CreatePacket(subpacket, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); return; } SelectCharacterConfirmPacket connectCharacter = new SelectCharacterConfirmPacket(selectCharRequest.sequence, selectCharRequest.characterId, client.currentSessionToken, world.address, world.port, selectCharRequest.ticket); - BasePacket outgoingPacket = BasePacket.createPacket(connectCharacter.buildPackets(), true, false); - BasePacket.encryptPacket(client.blowfish, outgoingPacket); - client.queuePacket(outgoingPacket); + BasePacket outgoingPacket = BasePacket.CreatePacket(connectCharacter.BuildPackets(), true, false); + BasePacket.EncryptPacket(client.blowfish, outgoingPacket); + client.QueuePacket(outgoingPacket); } private void ProcessModifyCharacter(ClientConnection client, SubPacket packet) @@ -169,23 +169,23 @@ namespace FFXIVClassic_Lobby_Server //Check if this character exists, get world from there if (worldId == 0 && charaReq.characterId != 0) { - Character chara = Database.getCharacter(client.currentUserId, charaReq.characterId); + Character chara = Database.GetCharacter(client.currentUserId, charaReq.characterId); if (chara != null) worldId = chara.serverId; } string worldName = null; - World world = Database.getServer(worldId); + World world = Database.GetServer(worldId); if (world != null) worldName = world.name; if (worldName == null) { - ErrorPacket errorPacket = new ErrorPacket(charaReq.sequence, 0, 0, 13001, "World does not exist or is inactive."); - SubPacket subpacket = errorPacket.buildPacket(); - BasePacket basePacket = BasePacket.createPacket(subpacket, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + ErrorPacket errorPacket = new ErrorPacket(charaReq.sequence, 0, 0, 13001, "World Does not exist or is inactive."); + SubPacket subpacket = errorPacket.BuildPacket(); + BasePacket basePacket = BasePacket.CreatePacket(subpacket, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); Program.Log.Info("User {0} => Error; invalid server id: \"{1}\"", client.currentUserId, worldId); return; @@ -197,15 +197,15 @@ namespace FFXIVClassic_Lobby_Server { case 0x01://Reserve - alreadyTaken = Database.reserveCharacter(client.currentUserId, slot, worldId, name, out pid, out cid); + alreadyTaken = Database.ReserveCharacter(client.currentUserId, slot, worldId, name, out pid, out cid); if (alreadyTaken) { ErrorPacket errorPacket = new ErrorPacket(charaReq.sequence, 1003, 0, 13005, ""); //BDB - Chara Name Used, //1003 - Bad Word - SubPacket subpacket = errorPacket.buildPacket(); - BasePacket basePacket = BasePacket.createPacket(subpacket, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + SubPacket subpacket = errorPacket.BuildPacket(); + BasePacket basePacket = BasePacket.CreatePacket(subpacket, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); Program.Log.Info("User {0} => Error; name taken: \"{1}\"", client.currentUserId, charaReq.characterName); return; @@ -222,7 +222,7 @@ namespace FFXIVClassic_Lobby_Server Program.Log.Info("User {0} => Character reserved \"{1}\"", client.currentUserId, name); break; case 0x02://Make - CharaInfo info = CharaInfo.getFromNewCharRequest(charaReq.characterInfoEncoded); + CharaInfo info = CharaInfo.GetFromNewCharRequest(charaReq.characterInfoEncoded); //Set Initial Appearance (items will be loaded in by map server) uint[] classAppearance = CharacterCreatorUtils.GetEquipmentForClass(info.currentClass); @@ -266,25 +266,25 @@ namespace FFXIVClassic_Lobby_Server break; } - Database.makeCharacter(client.currentUserId, client.newCharaCid, info); + Database.MakeCharacter(client.currentUserId, client.newCharaCid, info); pid = 1; cid = client.newCharaCid; name = client.newCharaName; - Program.Log.Info("User {0} => Character created \"{1}\"", client.currentUserId, name); + Program.Log.Info("User {0} => Character Created \"{1}\"", client.currentUserId, name); break; case 0x03://Rename - alreadyTaken = Database.renameCharacter(client.currentUserId, charaReq.characterId, worldId, charaReq.characterName); + alreadyTaken = Database.RenameCharacter(client.currentUserId, charaReq.characterId, worldId, charaReq.characterName); if (alreadyTaken) { ErrorPacket errorPacket = new ErrorPacket(charaReq.sequence, 1003, 0, 13005, ""); //BDB - Chara Name Used, //1003 - Bad Word - SubPacket subpacket = errorPacket.buildPacket(); - BasePacket basePacket = BasePacket.createPacket(subpacket, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + SubPacket subpacket = errorPacket.BuildPacket(); + BasePacket basePacket = BasePacket.CreatePacket(subpacket, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); Program.Log.Info("User {0} => Error; name taken: \"{1}\"", client.currentUserId, charaReq.characterName); return; @@ -293,7 +293,7 @@ namespace FFXIVClassic_Lobby_Server Program.Log.Info("User {0} => Character renamed \"{1}\"", client.currentUserId, name); break; case 0x04://Delete - Database.deleteCharacter(charaReq.characterId, charaReq.characterName); + Database.DeleteCharacter(charaReq.characterId, charaReq.characterName); Program.Log.Info("User {0} => Character deleted \"{1}\"", client.currentUserId, name); break; @@ -304,58 +304,58 @@ namespace FFXIVClassic_Lobby_Server } CharaCreatorPacket charaCreator = new CharaCreatorPacket(charaReq.sequence, charaReq.command, pid, cid, 1, name, worldName); - BasePacket charaCreatorPacket = BasePacket.createPacket(charaCreator.buildPacket(), true, false); - BasePacket.encryptPacket(client.blowfish, charaCreatorPacket); - client.queuePacket(charaCreatorPacket); + BasePacket charaCreatorPacket = BasePacket.CreatePacket(charaCreator.BuildPacket(), true, false); + BasePacket.EncryptPacket(client.blowfish, charaCreatorPacket); + client.QueuePacket(charaCreatorPacket); } - private void sendWorldList(ClientConnection client, SubPacket packet) + private void SendWorldList(ClientConnection client, SubPacket packet) { - List serverList = Database.getServers(); + List serverList = Database.GetServers(); WorldListPacket worldlistPacket = new WorldListPacket(0, serverList); - List subPackets = worldlistPacket.buildPackets(); + List subPackets = worldlistPacket.BuildPackets(); - BasePacket basePacket = BasePacket.createPacket(subPackets, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + BasePacket basePacket = BasePacket.CreatePacket(subPackets, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); } - private void sendImportList(ClientConnection client, SubPacket packet) + private void SendImportList(ClientConnection client, SubPacket packet) { - List names = Database.getReservedNames(client.currentUserId); + List names = Database.GetReservedNames(client.currentUserId); ImportListPacket importListPacket = new ImportListPacket(0, names); - List subPackets = importListPacket.buildPackets(); - BasePacket basePacket = BasePacket.createPacket(subPackets, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + List subPackets = importListPacket.BuildPackets(); + BasePacket basePacket = BasePacket.CreatePacket(subPackets, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); } - private void sendRetainerList(ClientConnection client, SubPacket packet) + private void SendRetainerList(ClientConnection client, SubPacket packet) { - List retainers = Database.getRetainers(client.currentUserId); + List retainers = Database.GetRetainers(client.currentUserId); RetainerListPacket retainerListPacket = new RetainerListPacket(0, retainers); - List subPackets = retainerListPacket.buildPackets(); - BasePacket basePacket = BasePacket.createPacket(subPackets, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + List subPackets = retainerListPacket.BuildPackets(); + BasePacket basePacket = BasePacket.CreatePacket(subPackets, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); } - private void sendCharacterList(ClientConnection client, SubPacket packet) + private void SendCharacterList(ClientConnection client, SubPacket packet) { - List characterList = Database.getCharacters(client.currentUserId); + List characterList = Database.GetCharacters(client.currentUserId); if (characterList.Count > 8) Program.Log.Error("Warning, got more than 8 characters. List truncated, check DB for issues."); CharacterListPacket characterlistPacket = new CharacterListPacket(0, characterList); - List subPackets = characterlistPacket.buildPackets(); - BasePacket basePacket = BasePacket.createPacket(subPackets, true, false); - BasePacket.encryptPacket(client.blowfish, basePacket); - client.queuePacket(basePacket); + List subPackets = characterlistPacket.BuildPackets(); + BasePacket basePacket = BasePacket.CreatePacket(subPackets, true, false); + BasePacket.EncryptPacket(client.blowfish, basePacket); + client.QueuePacket(basePacket); } private byte[] GenerateKey(string ticketPhrase, uint clientNumber) diff --git a/FFXIVClassic Lobby Server/Program.cs b/FFXIVClassic Lobby Server/Program.cs index 72ac95fc..df2c4771 100644 --- a/FFXIVClassic Lobby Server/Program.cs +++ b/FFXIVClassic Lobby Server/Program.cs @@ -21,7 +21,7 @@ namespace FFXIVClassic_Lobby_Server bool startServer = true; //Load Config - if (!ConfigConstants.load()) + if (!ConfigConstants.Load()) startServer = false; Log = LogManager.GetCurrentClassLogger(); @@ -57,7 +57,7 @@ namespace FFXIVClassic_Lobby_Server if (startServer) { Server server = new Server(); - server.startServer(); + server.StartServer(); } Program.Log.Info("Press any key to continue..."); diff --git a/FFXIVClassic Lobby Server/Server.cs b/FFXIVClassic Lobby Server/Server.cs index b6eeb7a7..20b08be8 100644 --- a/FFXIVClassic Lobby Server/Server.cs +++ b/FFXIVClassic Lobby Server/Server.cs @@ -24,7 +24,7 @@ namespace FFXIVClassic_Lobby_Server private Thread cleanupThread; private bool killCleanupThread = false; - private void socketCleanup() + private void SocketCleanup() { Program.Log.Info("Cleanup thread started; it will run every {0} seconds.", CLEANUP_THREAD_SLEEP_TIME); while (!killCleanupThread) @@ -47,7 +47,7 @@ namespace FFXIVClassic_Lobby_Server } #region Socket Handling - public bool startServer() + public bool StartServer() { //cleanupThread = new Thread(new ThreadStart(socketCleanup)); //cleanupThread.Name = "LobbyThread:Cleanup"; @@ -60,7 +60,7 @@ namespace FFXIVClassic_Lobby_Server } catch (Exception e) { - throw new ApplicationException("Could not create socket, check to make sure not duplicating port", e); + throw new ApplicationException("Could not Create socket, check to make sure not duplicating port", e); } try { @@ -73,7 +73,7 @@ namespace FFXIVClassic_Lobby_Server } try { - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } catch (Exception e) { @@ -89,7 +89,7 @@ namespace FFXIVClassic_Lobby_Server return true; } - private void acceptCallback(IAsyncResult result) + private void AcceptCallback(IAsyncResult result) { ClientConnection conn = null; try @@ -103,9 +103,9 @@ namespace FFXIVClassic_Lobby_Server mConnectionList.Add(conn); } //Queue recieving of data from the connection - conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(receiveCallback), conn); + conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(ReceiveCallback), conn); //Queue the accept of the next incomming connection - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); Program.Log.Info("Connection {0}:{1} has connected.", (conn.socket.RemoteEndPoint as IPEndPoint).Address, (conn.socket.RemoteEndPoint as IPEndPoint).Port); } catch (SocketException) @@ -118,7 +118,7 @@ namespace FFXIVClassic_Lobby_Server mConnectionList.Remove(conn); } } - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } catch (Exception) { @@ -130,11 +130,11 @@ namespace FFXIVClassic_Lobby_Server mConnectionList.Remove(conn); } } - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } } - private void receiveCallback(IAsyncResult result) + private void ReceiveCallback(IAsyncResult result) { ClientConnection conn = (ClientConnection)result.AsyncState; @@ -151,13 +151,13 @@ namespace FFXIVClassic_Lobby_Server //Build packets until can no longer or out of data while (true) { - BasePacket basePacket = buildPacket(ref offset, conn.buffer, bytesRead); + BasePacket basePacket = BuildPacket(ref offset, conn.buffer, bytesRead); //If can't build packet, break, else process another if (basePacket == null) break; else - mProcessor.processPacket(conn, basePacket); + mProcessor.ProcessPacket(conn, basePacket); } //Not all bytes consumed, transfer leftover to beginning @@ -169,22 +169,22 @@ namespace FFXIVClassic_Lobby_Server conn.lastPartialSize = bytesRead - offset; //Build any queued subpackets into basepackets and send - conn.flushQueuedSendPackets(); + conn.FlushQueuedSendPackets(); if (offset < bytesRead) //Need offset since not all bytes consumed - conn.socket.BeginReceive(conn.buffer, bytesRead - offset, conn.buffer.Length - (bytesRead - offset), SocketFlags.None, new AsyncCallback(receiveCallback), conn); + conn.socket.BeginReceive(conn.buffer, bytesRead - offset, conn.buffer.Length - (bytesRead - offset), SocketFlags.None, new AsyncCallback(ReceiveCallback), conn); else //All bytes consumed, full buffer available - conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(receiveCallback), conn); + conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(ReceiveCallback), conn); } else { - Program.Log.Info("{0} has disconnected.", conn.currentUserId == 0 ? conn.getAddress() : "User " + conn.currentUserId); + Program.Log.Info("{0} has disconnected.", conn.currentUserId == 0 ? conn.GetAddress() : "User " + conn.currentUserId); lock (mConnectionList) { - conn.disconnect(); + conn.Disconnect(); mConnectionList.Remove(conn); } } @@ -193,7 +193,7 @@ namespace FFXIVClassic_Lobby_Server { if (conn.socket != null) { - Program.Log.Info("{0} has disconnected.", conn.currentUserId == 0 ? conn.getAddress() : "User " + conn.currentUserId); + Program.Log.Info("{0} has disconnected.", conn.currentUserId == 0 ? conn.GetAddress() : "User " + conn.currentUserId); lock (mConnectionList) { @@ -209,7 +209,7 @@ namespace FFXIVClassic_Lobby_Server /// Current offset in buffer. /// Incoming buffer. /// Returns either a BasePacket or null if not enough data. - public BasePacket buildPacket(ref int offset, byte[] buffer, int bytesRead) + public BasePacket BuildPacket(ref int offset, byte[] buffer, int bytesRead) { BasePacket newPacket = null; diff --git a/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs b/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs index 835436ee..857131b5 100644 --- a/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs +++ b/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs @@ -56,7 +56,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects public uint feet; public uint belt; - public static CharaInfo getFromNewCharRequest(String encoded) + public static CharaInfo GetFromNewCharRequest(String encoded) { byte[] data = Convert.FromBase64String(encoded.Replace('-', '+').Replace('_', '/')); @@ -116,7 +116,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects return info; } - public static String buildForCharaList(Character chara, Appearance appearance) + public static String BuildForCharaList(Character chara, Appearance appearance) { byte[] data; @@ -146,7 +146,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects writer.Write(System.Text.Encoding.UTF8.GetBytes(chara.name + '\0')); writer.Write((UInt32)0x1c); writer.Write((UInt32)0x04); - writer.Write((UInt32)getTribeModel(chara.tribe)); + writer.Write((UInt32)GetTribeModel(chara.tribe)); writer.Write((UInt32)appearance.size); uint colorVal = appearance.skinColor | (uint)(appearance.hairColor << 10) | (uint)(appearance.eyeColor << 20); writer.Write((UInt32)colorVal); @@ -223,7 +223,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects return Convert.ToBase64String(data).Replace('+', '-').Replace('/', '_'); } - public static String debug() + public static String Debug() { byte[] bytes = File.ReadAllBytes("./packets/charaappearance.bin"); @@ -232,7 +232,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects return Convert.ToBase64String(bytes).Replace('+', '-').Replace('/', '_'); } - public static UInt32 getTribeModel(byte tribe) + public static UInt32 GetTribeModel(byte tribe) { switch (tribe) { diff --git a/FFXIVClassic Lobby Server/packets/BasePacket.cs b/FFXIVClassic Lobby Server/packets/BasePacket.cs index 587acd36..2ac99336 100644 --- a/FFXIVClassic Lobby Server/packets/BasePacket.cs +++ b/FFXIVClassic Lobby Server/packets/BasePacket.cs @@ -103,7 +103,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.data = data; } - public List getSubpackets() + public List GetSubpackets() { List subpackets = new List(header.numSubpackets); @@ -115,7 +115,7 @@ namespace FFXIVClassic_Lobby_Server.packets return subpackets; } - public unsafe static BasePacketHeader getHeader(byte[] bytes) + public unsafe static BasePacketHeader GetHeader(byte[] bytes) { BasePacketHeader header; if (bytes.Length < BASEPACKET_SIZE) @@ -129,7 +129,7 @@ namespace FFXIVClassic_Lobby_Server.packets return header; } - public byte[] getHeaderBytes() + public byte[] GetHeaderBytes() { int size = Marshal.SizeOf(header); byte[] arr = new byte[size]; @@ -141,16 +141,16 @@ namespace FFXIVClassic_Lobby_Server.packets return arr; } - public byte[] getPacketBytes() + public byte[] GetPacketBytes() { byte[] outBytes = new byte[header.packetSize]; - Array.Copy(getHeaderBytes(), 0, outBytes, 0, BASEPACKET_SIZE); + 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) + public void ReplaceActorID(uint actorID) { using (MemoryStream mem = new MemoryStream(data)) { @@ -173,7 +173,7 @@ namespace FFXIVClassic_Lobby_Server.packets } //Replaces all instances of the sniffed actorID with the given one - public void replaceActorID(uint fromActorID, uint actorID) + public void ReplaceActorID(uint fromActorID, uint actorID) { using (MemoryStream mem = new MemoryStream(data)) { @@ -196,7 +196,7 @@ namespace FFXIVClassic_Lobby_Server.packets } #region Utility Functions - public static BasePacket createPacket(List subpackets, bool isAuthed, bool isEncrypted) + public static BasePacket CreatePacket(List subpackets, bool isAuthed, bool isEncrypted) { //Create Header BasePacketHeader header = new BasePacketHeader(); @@ -218,7 +218,7 @@ namespace FFXIVClassic_Lobby_Server.packets int offset = 0; foreach (SubPacket subpacket in subpackets) { - byte[] subpacketData = subpacket.getBytes(); + byte[] subpacketData = subpacket.GetBytes(); Array.Copy(subpacketData, 0, data, offset, subpacketData.Length); offset += (ushort)subpacketData.Length; } @@ -229,7 +229,7 @@ namespace FFXIVClassic_Lobby_Server.packets return packet; } - public static BasePacket createPacket(SubPacket subpacket, bool isAuthed, bool isEncrypted) + public static BasePacket CreatePacket(SubPacket subpacket, bool isAuthed, bool isEncrypted) { //Create Header BasePacketHeader header = new BasePacketHeader(); @@ -247,7 +247,7 @@ namespace FFXIVClassic_Lobby_Server.packets data = new byte[header.packetSize - 0x10]; //Add Subpackets - byte[] subpacketData = subpacket.getBytes(); + byte[] subpacketData = subpacket.GetBytes(); Array.Copy(subpacketData, 0, data, 0, subpacketData.Length); Debug.Assert(data != null); @@ -256,7 +256,7 @@ namespace FFXIVClassic_Lobby_Server.packets return packet; } - public static BasePacket createPacket(byte[] data, bool isAuthed, bool isEncrypted) + public static BasePacket CreatePacket(byte[] data, bool isAuthed, bool isEncrypted) { Debug.Assert(data != null); @@ -277,7 +277,7 @@ namespace FFXIVClassic_Lobby_Server.packets return packet; } - public static unsafe void encryptPacket(Blowfish blowfish, BasePacket packet) + public static unsafe void EncryptPacket(Blowfish blowfish, BasePacket packet) { byte[] data = packet.data; int size = packet.header.packetSize; @@ -304,7 +304,7 @@ namespace FFXIVClassic_Lobby_Server.packets } - public static unsafe void decryptPacket(Blowfish blowfish, ref BasePacket packet) + public static unsafe void DecryptPacket(Blowfish blowfish, ref BasePacket packet) { byte[] data = packet.data; int size = packet.header.packetSize; @@ -331,16 +331,16 @@ namespace FFXIVClassic_Lobby_Server.packets } #endregion - public void debugPrintPacket() + public void DebugPrintPacket() { #if DEBUG Console.BackgroundColor = ConsoleColor.DarkYellow; - Program.Log.Debug("IsAuth: {0} Size: 0x{1:X}, NumSubpackets: {2}{3}{4}", header.isAuthenticated, header.packetSize, header.numSubpackets, Environment.NewLine, Utils.ByteArrayToHex(getHeaderBytes())); + Program.Log.Debug("IsAuth: {0} Size: 0x{1:X}, NumSubpackets: {2}{3}{4}", header.isAuthenticated, header.packetSize, header.numSubpackets, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes())); - foreach (SubPacket sub in getSubpackets()) + foreach (SubPacket sub in GetSubpackets()) { - sub.debugPrintSubPacket(); + sub.DebugPrintSubPacket(); } Console.BackgroundColor = ConsoleColor.Black; diff --git a/FFXIVClassic Lobby Server/packets/SubPacket.cs b/FFXIVClassic Lobby Server/packets/SubPacket.cs index bdf8e9e9..f30393b8 100644 --- a/FFXIVClassic Lobby Server/packets/SubPacket.cs +++ b/FFXIVClassic Lobby Server/packets/SubPacket.cs @@ -101,7 +101,7 @@ namespace FFXIVClassic_Lobby_Server.packets data = original.data; } - public byte[] getHeaderBytes() + public byte[] GetHeaderBytes() { int size = Marshal.SizeOf(header); byte[] arr = new byte[size]; @@ -113,7 +113,7 @@ namespace FFXIVClassic_Lobby_Server.packets return arr; } - public byte[] getGameMessageBytes() + public byte[] GetGameMessageBytes() { int size = Marshal.SizeOf(gameMessage); byte[] arr = new byte[size]; @@ -125,26 +125,26 @@ namespace FFXIVClassic_Lobby_Server.packets return arr; } - public byte[] getBytes() + public byte[] GetBytes() { byte[] outBytes = new byte[header.subpacketSize]; - Array.Copy(getHeaderBytes(), 0, outBytes, 0, SUBPACKET_SIZE); + Array.Copy(GetHeaderBytes(), 0, outBytes, 0, SUBPACKET_SIZE); if (header.type == 0x3) - Array.Copy(getGameMessageBytes(), 0, outBytes, SUBPACKET_SIZE, GAMEMESSAGE_SIZE); + 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() + public void DebugPrintSubPacket() { #if DEBUG - Program.Log.Debug("Size: 0x{0:X}{1}{2}", header.subpacketSize, Environment.NewLine, Utils.ByteArrayToHex(getHeaderBytes())); + Program.Log.Debug("Size: 0x{0:X}{1}{2}", header.subpacketSize, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes())); if (header.type == 0x03) { - Program.Log.Debug("Opcode: 0x{0:X}{1}{2}", gameMessage.opcode, Environment.NewLine, Utils.ByteArrayToHex(getGameMessageBytes(), SUBPACKET_SIZE)); + Program.Log.Debug("Opcode: 0x{0:X}{1}{2}", gameMessage.opcode, Environment.NewLine, Utils.ByteArrayToHex(GetGameMessageBytes(), SUBPACKET_SIZE)); } Program.Log.Debug("Data: {0}{1}", Environment.NewLine, Utils.ByteArrayToHex(data, SUBPACKET_SIZE + GAMEMESSAGE_SIZE)); diff --git a/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs b/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs index ab68dc7e..9bedc3d3 100644 --- a/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs @@ -20,7 +20,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.accountList = accountList; } - public List buildPackets() + public List BuildPackets() { List subPackets = new List(); diff --git a/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs b/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs index b3f1385e..d5b9289b 100644 --- a/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs @@ -36,7 +36,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.worldName = worldName; } - public SubPacket buildPacket() + public SubPacket BuildPacket() { MemoryStream memStream = new MemoryStream(0x1F0); BinaryWriter binWriter = new BinaryWriter(memStream); diff --git a/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs b/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs index c8e77f39..2ad1b0b9 100644 --- a/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs @@ -20,7 +20,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.characterList = characterList; } - public List buildPackets() + public List BuildPackets() { List subPackets = new List(); @@ -34,7 +34,7 @@ namespace FFXIVClassic_Lobby_Server.packets foreach (Character chara in characterList) { - Appearance appearance = Database.getAppearance(chara.id); + Appearance appearance = Database.GetAppearance(chara.id); if (totalCount == 0 || characterCount % MAXPERPACKET == 0) { @@ -53,7 +53,7 @@ namespace FFXIVClassic_Lobby_Server.packets binWriter.Seek(0x10 + (0x1D0 * characterCount), SeekOrigin.Begin); //Write Entries - World world = Database.getServer(chara.serverId); + World world = Database.GetServer(chara.serverId); string worldname = world == null ? "Unknown" : world.name; binWriter.Write((uint)0); //??? @@ -74,8 +74,8 @@ namespace FFXIVClassic_Lobby_Server.packets binWriter.Write(Encoding.ASCII.GetBytes(chara.name.PadRight(0x20, '\0'))); //Name binWriter.Write(Encoding.ASCII.GetBytes(worldname.PadRight(0xE, '\0'))); //World Name - binWriter.Write(CharaInfo.buildForCharaList(chara, appearance)); //Appearance Data - //binWriter.Write(CharaInfo.debug()); //Appearance Data + binWriter.Write(CharaInfo.BuildForCharaList(chara, appearance)); //Appearance Data + //binWriter.Write(CharaInfo.Debug()); //Appearance Data characterCount++; totalCount++; diff --git a/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs b/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs index 25c24049..0e707e62 100644 --- a/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs @@ -23,7 +23,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.message = message; } - public SubPacket buildPacket() + public SubPacket BuildPacket() { MemoryStream memStream = new MemoryStream(0x210); BinaryWriter binWriter = new BinaryWriter(memStream); diff --git a/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs b/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs index af029d75..80bce85c 100644 --- a/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs @@ -19,7 +19,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.namesList = names; } - public List buildPackets() + public List BuildPackets() { List subPackets = new List(); diff --git a/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs b/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs index f296c072..c12c245b 100644 --- a/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs @@ -19,7 +19,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.retainerList = retainerList; } - public List buildPackets() + public List BuildPackets() { List subPackets = new List(); diff --git a/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs b/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs index cc660d2f..352c11e3 100644 --- a/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs @@ -26,7 +26,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.selectCharTicket = selectCharTicket; } - public List buildPackets() + public List BuildPackets() { List subPackets = new List(); diff --git a/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs b/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs index c352fa12..06866bfc 100644 --- a/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs @@ -20,7 +20,7 @@ namespace FFXIVClassic_Lobby_Server.packets this.worldList = serverList; } - public List buildPackets() + public List BuildPackets() { List subPackets = new List(); diff --git a/FFXIVClassic Map Server/ClientConnection.cs b/FFXIVClassic Map Server/ClientConnection.cs index a06b5961..8592d78c 100644 --- a/FFXIVClassic Map Server/ClientConnection.cs +++ b/FFXIVClassic Map Server/ClientConnection.cs @@ -13,33 +13,33 @@ namespace FFXIVClassic_Map_Server public Blowfish blowfish; public Socket socket; public byte[] buffer; - private BlockingCollection sendPacketQueue = new BlockingCollection(1000); + private BlockingCollection SendPacketQueue = new BlockingCollection(1000); public int lastPartialSize = 0; //Instance Stuff public uint owner = 0; public int connType = 0; - public void queuePacket(BasePacket packet) + public void QueuePacket(BasePacket packet) { - sendPacketQueue.Add(packet); + SendPacketQueue.Add(packet); } - public void queuePacket(SubPacket subpacket, bool isAuthed, bool isEncrypted) + public void QueuePacket(SubPacket subpacket, bool isAuthed, bool isEncrypted) { - sendPacketQueue.Add(BasePacket.createPacket(subpacket, isAuthed, isEncrypted)); + SendPacketQueue.Add(BasePacket.CreatePacket(subpacket, isAuthed, isEncrypted)); } - public void flushQueuedSendPackets() + public void FlushQueuedSendPackets() { if (!socket.Connected) return; - while (sendPacketQueue.Count > 0) + while (SendPacketQueue.Count > 0) { - BasePacket packet = sendPacketQueue.Take(); + BasePacket packet = SendPacketQueue.Take(); - byte[] packetBytes = packet.getPacketBytes(); + byte[] packetBytes = packet.GetPacketBytes(); try { @@ -50,17 +50,17 @@ namespace FFXIVClassic_Map_Server } } - public String getAddress() + public String GetAddress() { return String.Format("{0}:{1}", (socket.RemoteEndPoint as IPEndPoint).Address, (socket.RemoteEndPoint as IPEndPoint).Port); } - public bool isConnected() + public bool IsConnected() { return (socket.Poll(1, SelectMode.SelectRead) && socket.Available == 0); } - public void disconnect() + public void Disconnect() { if (socket.Connected) socket.Disconnect(false); diff --git a/FFXIVClassic Map Server/CommandProcessor.cs b/FFXIVClassic Map Server/CommandProcessor.cs index 73bd6c5c..50b1b945 100644 --- a/FFXIVClassic Map Server/CommandProcessor.cs +++ b/FFXIVClassic Map Server/CommandProcessor.cs @@ -26,45 +26,45 @@ namespace FFXIVClassic_Map_Server mConnectedPlayerList = playerList; } - public void sendPacket(ConnectedPlayer client, string path) + public void SendPacket(ConnectedPlayer client, string path) { BasePacket packet = new BasePacket(path); if (client != null) { - packet.replaceActorID(client.actorID); - client.queuePacket(packet); + packet.ReplaceActorID(client.actorID); + client.QueuePacket(packet); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - packet.replaceActorID(entry.Value.actorID); - entry.Value.queuePacket(packet); + packet.ReplaceActorID(entry.Value.actorID); + entry.Value.QueuePacket(packet); } } } - public void changeProperty(uint id, uint value, string target) + public void ChangeProperty(uint id, uint value, string target) { - SetActorPropetyPacket changeProperty = new SetActorPropetyPacket(target); + SetActorPropetyPacket ChangeProperty = new SetActorPropetyPacket(target); - changeProperty.setTarget(target); - changeProperty.addInt(id, value); - changeProperty.addTarget(); + ChangeProperty.SetTarget(target); + ChangeProperty.AddInt(id, value); + ChangeProperty.AddTarget(); foreach (KeyValuePair entry in mConnectedPlayerList) { - SubPacket changePropertyPacket = changeProperty.buildPacket((entry.Value.actorID), (entry.Value.actorID)); + SubPacket ChangePropertyPacket = ChangeProperty.BuildPacket((entry.Value.actorID), (entry.Value.actorID)); - BasePacket packet = BasePacket.createPacket(changePropertyPacket, true, false); - packet.debugPrintPacket(); + BasePacket packet = BasePacket.CreatePacket(ChangePropertyPacket, true, false); + packet.DebugPrintPacket(); - entry.Value.queuePacket(packet); + entry.Value.QueuePacket(packet); } } - public void doMusic(ConnectedPlayer client, string music) + public void DoMusic(ConnectedPlayer client, string music) { ushort musicId; @@ -74,13 +74,13 @@ namespace FFXIVClassic_Map_Server musicId = Convert.ToUInt16(music); if (client != null) - client.queuePacket(BasePacket.createPacket(SetMusicPacket.buildPacket(client.actorID, musicId, 1), true, false)); + client.QueuePacket(BasePacket.CreatePacket(SetMusicPacket.BuildPacket(client.actorID, musicId, 1), true, false)); else { foreach (KeyValuePair entry in mConnectedPlayerList) { - BasePacket musicPacket = BasePacket.createPacket(SetMusicPacket.buildPacket(entry.Value.actorID, musicId, 1), true, false); - entry.Value.queuePacket(musicPacket); + BasePacket musicPacket = BasePacket.CreatePacket(SetMusicPacket.BuildPacket(entry.Value.actorID, musicId, 1), true, false); + entry.Value.QueuePacket(musicPacket); } } } @@ -90,228 +90,228 @@ namespace FFXIVClassic_Map_Server /// /// The current player /// Predefined list: <ffxiv_database>\server_zones_spawnlocations - public void doWarp(ConnectedPlayer client, uint id) + public void DoWarp(ConnectedPlayer client, uint id) { WorldManager worldManager = Server.GetWorldManager(); - FFXIVClassic_Map_Server.WorldManager.ZoneEntrance ze = worldManager.getZoneEntrance(id); + FFXIVClassic_Map_Server.WorldManager.ZoneEntrance ze = worldManager.GetZoneEntrance(id); if (ze == null) return; if (client != null) - worldManager.DoZoneChange(client.getActor(), ze.zoneId, ze.privateAreaName, ze.spawnType, ze.spawnX, ze.spawnY, ze.spawnZ, ze.spawnRotation); + worldManager.DoZoneChange(client.GetActor(), ze.zoneId, ze.privateAreaName, ze.spawnType, ze.spawnX, ze.spawnY, ze.spawnZ, ze.spawnRotation); else { foreach (KeyValuePair entry in mConnectedPlayerList) { - worldManager.DoZoneChange(entry.Value.getActor(), ze.zoneId, ze.privateAreaName, ze.spawnType, ze.spawnX, ze.spawnY, ze.spawnZ, ze.spawnRotation); + worldManager.DoZoneChange(entry.Value.GetActor(), ze.zoneId, ze.privateAreaName, ze.spawnType, ze.spawnX, ze.spawnY, ze.spawnZ, ze.spawnRotation); } } } - public void doWarp(ConnectedPlayer client, uint zoneId, string privateArea, byte spawnType, float x, float y, float z, float r) + public void DoWarp(ConnectedPlayer client, uint zoneId, string privateArea, byte spawnType, float x, float y, float z, float r) { WorldManager worldManager = Server.GetWorldManager(); if (worldManager.GetZone(zoneId) == null) { if (client != null) - client.queuePacket(BasePacket.createPacket(SendMessagePacket.buildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", "Zone does not exist or setting isn't valid."), true, false)); - Program.Log.Error("Zone does not exist or setting isn't valid."); + client.QueuePacket(BasePacket.CreatePacket(SendMessagePacket.BuildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", "Zone Does not exist or setting isn't valid."), true, false)); + Program.Log.Error("Zone Does not exist or setting isn't valid."); } if (client != null) - worldManager.DoZoneChange(client.getActor(), zoneId, privateArea, spawnType, x, y, z, r); + worldManager.DoZoneChange(client.GetActor(), zoneId, privateArea, spawnType, x, y, z, r); else { foreach (KeyValuePair entry in mConnectedPlayerList) { - worldManager.DoZoneChange(entry.Value.getActor(), zoneId, privateArea, spawnType, x, y, z, r); + worldManager.DoZoneChange(entry.Value.GetActor(), zoneId, privateArea, spawnType, x, y, z, r); } } } - public void printPos(ConnectedPlayer client) + public void PrintPos(ConnectedPlayer client) { if (client != null) { - Player p = client.getActor(); - client.queuePacket(BasePacket.createPacket(SendMessagePacket.buildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", String.Format("{0}\'s position: ZoneID: {1}, X: {2}, Y: {3}, Z: {4}, Rotation: {5}", p.customDisplayName, p.zoneId, p.positionX, p.positionY, p.positionZ, p.rotation)), true, false)); + Player p = client.GetActor(); + client.QueuePacket(BasePacket.CreatePacket(SendMessagePacket.BuildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", String.Format("{0}\'s position: ZoneID: {1}, X: {2}, Y: {3}, Z: {4}, Rotation: {5}", p.customDisplayName, p.zoneId, p.positionX, p.positionY, p.positionZ, p.rotation)), true, false)); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); + Player p = entry.Value.GetActor(); Program.Log.Info("{0}\'s position: ZoneID: {1}, X: {2}, Y: {3}, Z: {4}, Rotation: {5}", p.customDisplayName, p.zoneId, p.positionX, p.positionY, p.positionZ, p.rotation); } } } - private void setGraphic(ConnectedPlayer client, uint slot, uint wId, uint eId, uint vId, uint cId) + private void SetGraphic(ConnectedPlayer client, uint slot, uint wId, uint eId, uint vId, uint cId) { if (client != null) { - Player p = client.getActor(); - p.graphicChange(slot, wId, eId, vId, cId); - p.sendAppearance(); + Player p = client.GetActor(); + p.GraphicChange(slot, wId, eId, vId, cId); + p.SendAppearance(); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.graphicChange(slot, wId, eId, vId, cId); - p.sendAppearance(); + Player p = entry.Value.GetActor(); + p.GraphicChange(slot, wId, eId, vId, cId); + p.SendAppearance(); } } } - private void giveItem(ConnectedPlayer client, uint itemId, int quantity) + private void GiveItem(ConnectedPlayer client, uint itemId, int quantity) { if (client != null) { - Player p = client.getActor(); - p.getInventory(Inventory.NORMAL).addItem(itemId, quantity); + Player p = client.GetActor(); + p.GetInventory(Inventory.NORMAL).AddItem(itemId, quantity); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.getInventory(Inventory.NORMAL).addItem(itemId, quantity); + Player p = entry.Value.GetActor(); + p.GetInventory(Inventory.NORMAL).AddItem(itemId, quantity); } } } - private void giveItem(ConnectedPlayer client, uint itemId, int quantity, ushort type) + private void GiveItem(ConnectedPlayer client, uint itemId, int quantity, ushort type) { if (client != null) { - Player p = client.getActor(); + Player p = client.GetActor(); - if (p.getInventory(type) != null) - p.getInventory(type).addItem(itemId, quantity); + if (p.GetInventory(type) != null) + p.GetInventory(type).AddItem(itemId, quantity); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); + Player p = entry.Value.GetActor(); - if (p.getInventory(type) != null) - p.getInventory(type).addItem(itemId, quantity); + if (p.GetInventory(type) != null) + p.GetInventory(type).AddItem(itemId, quantity); } } } - private void removeItem(ConnectedPlayer client, uint itemId, int quantity) + private void RemoveItem(ConnectedPlayer client, uint itemId, int quantity) { if (client != null) { - Player p = client.getActor(); - p.getInventory(Inventory.NORMAL).removeItem(itemId, quantity); + Player p = client.GetActor(); + p.GetInventory(Inventory.NORMAL).RemoveItem(itemId, quantity); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.getInventory(Inventory.NORMAL).removeItem(itemId, quantity); + Player p = entry.Value.GetActor(); + p.GetInventory(Inventory.NORMAL).RemoveItem(itemId, quantity); } } } - private void removeItem(ConnectedPlayer client, uint itemId, int quantity, ushort type) + private void RemoveItem(ConnectedPlayer client, uint itemId, int quantity, ushort type) { if (client != null) { - Player p = client.getActor(); + Player p = client.GetActor(); - if (p.getInventory(type) != null) - p.getInventory(type).removeItem(itemId, quantity); + if (p.GetInventory(type) != null) + p.GetInventory(type).RemoveItem(itemId, quantity); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); + Player p = entry.Value.GetActor(); - if (p.getInventory(type) != null) - p.getInventory(type).removeItem(itemId, quantity); + if (p.GetInventory(type) != null) + p.GetInventory(type).RemoveItem(itemId, quantity); } } } - private void giveCurrency(ConnectedPlayer client, uint itemId, int quantity) + private void GiveCurrency(ConnectedPlayer client, uint itemId, int quantity) { if (client != null) { - Player p = client.getActor(); - p.getInventory(Inventory.CURRENCY).addItem(itemId, quantity); + Player p = client.GetActor(); + p.GetInventory(Inventory.CURRENCY).AddItem(itemId, quantity); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.getInventory(Inventory.CURRENCY).addItem(itemId, quantity); + Player p = entry.Value.GetActor(); + p.GetInventory(Inventory.CURRENCY).AddItem(itemId, quantity); } } } - // TODO: make removeCurrency() remove all quantity of a currency if quantity_to_remove > quantity_in_inventory instead of silently failing - private void removeCurrency(ConnectedPlayer client, uint itemId, int quantity) + // TODO: make RemoveCurrency() remove all quantity of a currency if quantity_to_remove > quantity_in_inventory instead of silently failing + private void RemoveCurrency(ConnectedPlayer client, uint itemId, int quantity) { if (client != null) { - Player p = client.getActor(); - p.getInventory(Inventory.CURRENCY).removeItem(itemId, quantity); + Player p = client.GetActor(); + p.GetInventory(Inventory.CURRENCY).RemoveItem(itemId, quantity); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.getInventory(Inventory.CURRENCY).removeItem(itemId, quantity); + Player p = entry.Value.GetActor(); + p.GetInventory(Inventory.CURRENCY).RemoveItem(itemId, quantity); } } } - private void giveKeyItem(ConnectedPlayer client, uint itemId) + private void GiveKeyItem(ConnectedPlayer client, uint itemId) { if (client != null) { - Player p = client.getActor(); - p.getInventory(Inventory.KEYITEMS).addItem(itemId, 1); + Player p = client.GetActor(); + p.GetInventory(Inventory.KEYITEMS).AddItem(itemId, 1); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.getInventory(Inventory.KEYITEMS).addItem(itemId, 1); + Player p = entry.Value.GetActor(); + p.GetInventory(Inventory.KEYITEMS).AddItem(itemId, 1); } } } - private void removeKeyItem(ConnectedPlayer client, uint itemId) + private void RemoveKeyItem(ConnectedPlayer client, uint itemId) { if (client != null) { - Player p = client.getActor(); - p.getInventory(Inventory.KEYITEMS).removeItem(itemId, 1); + Player p = client.GetActor(); + p.GetInventory(Inventory.KEYITEMS).RemoveItem(itemId, 1); } else { foreach (KeyValuePair entry in mConnectedPlayerList) { - Player p = entry.Value.getActor(); - p.getInventory(Inventory.KEYITEMS).removeItem(itemId, 1); + Player p = entry.Value.GetActor(); + p.GetInventory(Inventory.KEYITEMS).RemoveItem(itemId, 1); } } } - private void parseWarp(ConnectedPlayer client, string[] split) + private void ParseWarp(ConnectedPlayer client, string[] split) { float x = 0, y = 0, z = 0, r = 0.0f; uint zoneId = 0; @@ -331,7 +331,7 @@ namespace FFXIVClassic_Map_Server catch{return;} #endregion - doWarp(client, zoneId); + DoWarp(client, zoneId); } else if (split.Length == 4) { @@ -343,7 +343,7 @@ namespace FFXIVClassic_Map_Server if (String.IsNullOrEmpty(split[1])) split[1] = "0"; - try { x = Single.Parse(split[1]) + client.getActor().positionX; } + try { x = Single.Parse(split[1]) + client.GetActor().positionX; } catch{return;} split[1] = x.ToString(); @@ -355,7 +355,7 @@ namespace FFXIVClassic_Map_Server if (String.IsNullOrEmpty(split[2])) split[2] = "0"; - try { y = Single.Parse(split[2]) + client.getActor().positionY; } + try { y = Single.Parse(split[2]) + client.GetActor().positionY; } catch{return;} split[2] = y.ToString(); @@ -367,7 +367,7 @@ namespace FFXIVClassic_Map_Server if (String.IsNullOrEmpty(split[3])) split[3] = "0"; - try { z = Single.Parse(split[3]) + client.getActor().positionZ; } + try { z = Single.Parse(split[3]) + client.GetActor().positionZ; } catch{return;} split[3] = z.ToString(); @@ -381,12 +381,12 @@ namespace FFXIVClassic_Map_Server } catch{return;} - zoneId = client.getActor().zoneId; - r = client.getActor().rotation; + zoneId = client.GetActor().zoneId; + r = client.GetActor().rotation; #endregion - sendMessage(client, String.Format("Warping to: ZoneID: {0} X: {1}, Y: {2}, Z: {3}", zoneId, x, y, z)); - doWarp(client, zoneId, privatearea, 0x00, x, y, z, r); + SendMessage(client, String.Format("Warping to: ZoneID: {0} X: {1}, Y: {2}, Z: {3}", zoneId, x, y, z)); + DoWarp(client, zoneId, privatearea, 0x00, x, y, z, r); } else if (split.Length == 5) { @@ -411,8 +411,8 @@ namespace FFXIVClassic_Map_Server } #endregion - sendMessage(client, String.Format("Warping to: ZoneID: {0} X: {1}, Y: {2}, Z: {3}", zoneId, x, y, z)); - doWarp(client, zoneId, privatearea, 0x2, x, y, z, r); + SendMessage(client, String.Format("Warping to: ZoneID: {0} X: {1}, Y: {2}, Z: {3}", zoneId, x, y, z)); + DoWarp(client, zoneId, privatearea, 0x2, x, y, z, r); } else if (split.Length == 6) { @@ -439,20 +439,20 @@ namespace FFXIVClassic_Map_Server privatearea = split[2]; #endregion - sendMessage(client, String.Format("Warping to: ZoneID: {0} X: {1}, Y: {2}, Z: {3}", zoneId, x, y, z)); - doWarp(client, zoneId, privatearea, 0x2, x, y, z, r); + SendMessage(client, String.Format("Warping to: ZoneID: {0} X: {1}, Y: {2}, Z: {3}", zoneId, x, y, z)); + DoWarp(client, zoneId, privatearea, 0x2, x, y, z, r); } else return; // catch any invalid warps here } - private void doWeather(ConnectedPlayer client, string weatherID, string value) + private void DoWeather(ConnectedPlayer client, string weatherID, string value) { ushort weather = Convert.ToUInt16(weatherID); if (client != null) { - client.queuePacket(BasePacket.createPacket(SetWeatherPacket.buildPacket(client.actorID, weather, Convert.ToUInt16(value)), true, false)); + client.QueuePacket(BasePacket.CreatePacket(SetWeatherPacket.BuildPacket(client.actorID, weather, Convert.ToUInt16(value)), true, false)); } /* @@ -461,15 +461,15 @@ namespace FFXIVClassic_Map_Server uint currentZoneID; if (client != null) { - currentZoneID = client.getActor().zoneId; + currentZoneID = client.GetActor().zoneId; foreach (KeyValuePair entry in mConnectedPlayerList) { // Change the weather for everyone in the same zone - if (currentZoneID == entry.Value.getActor().zoneId) + if (currentZoneID == entry.Value.GetActor().zoneId) { - BasePacket weatherPacket = BasePacket.createPacket(SetWeatherPacket.buildPacket(entry.Value.actorID, weather), true, false); - entry.Value.queuePacket(weatherPacket); + BasePacket weatherPacket = BasePacket.CreatePacket(SetWeatherPacket.BuildPacket(entry.Value.actorID, weather), true, false); + entry.Value.QueuePacket(weatherPacket); } } } @@ -482,13 +482,13 @@ namespace FFXIVClassic_Map_Server /// /// /// - private void sendMessage(ConnectedPlayer client, String message) + private void SendMessage(ConnectedPlayer client, String message) { if (client != null) - client.getActor().queuePacket(SendMessagePacket.buildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", message)); + client.GetActor().QueuePacket(SendMessagePacket.BuildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", message)); } - internal bool doCommand(string input, ConnectedPlayer client) + internal bool DoCommand(string input, ConnectedPlayer client) { input.Trim(); if (input.StartsWith("!")) @@ -499,7 +499,7 @@ namespace FFXIVClassic_Map_Server split = split.Where(temp => temp != "").ToArray(); // strips extra whitespace from commands // Debug - //sendMessage(client, string.Join(",", split)); + //SendMessage(client, string.Join(",", split)); if (split.Length >= 1) { @@ -508,41 +508,41 @@ namespace FFXIVClassic_Map_Server { if (split.Length == 1) { - sendMessage(client, Resources.CPhelp); + SendMessage(client, Resources.CPhelp); } if (split.Length == 2) { if (split[1].Equals("mypos")) - sendMessage(client, Resources.CPmypos); + SendMessage(client, Resources.CPmypos); else if (split[1].Equals("music")) - sendMessage(client, Resources.CPmusic); + SendMessage(client, Resources.CPmusic); else if (split[1].Equals("warp")) - sendMessage(client, Resources.CPwarp); + SendMessage(client, Resources.CPwarp); else if (split[1].Equals("givecurrency")) - sendMessage(client, Resources.CPgivecurrency); + SendMessage(client, Resources.CPgivecurrency); else if (split[1].Equals("giveitem")) - sendMessage(client, Resources.CPgiveitem); + SendMessage(client, Resources.CPgiveitem); else if (split[1].Equals("givekeyitem")) - sendMessage(client, Resources.CPgivekeyitem); + SendMessage(client, Resources.CPgivekeyitem); else if (split[1].Equals("removecurrency")) - sendMessage(client, Resources.CPremovecurrency); + SendMessage(client, Resources.CPremovecurrency); else if (split[1].Equals("removeitem")) - sendMessage(client, Resources.CPremoveitem); + SendMessage(client, Resources.CPremoveitem); else if (split[1].Equals("removekeyitem")) - sendMessage(client, Resources.CPremovekeyitem); + SendMessage(client, Resources.CPremovekeyitem); else if (split[1].Equals("reloaditems")) - sendMessage(client, Resources.CPreloaditems); + SendMessage(client, Resources.CPreloaditems); else if (split[1].Equals("reloadzones")) - sendMessage(client, Resources.CPreloadzones); + SendMessage(client, Resources.CPreloadzones); /* else if (split[1].Equals("property")) - sendMessage(client, Resources.CPproperty); + SendMessage(client, Resources.CPproperty); else if (split[1].Equals("property2")) - sendMessage(client, Resources.CPproperty2); + SendMessage(client, Resources.CPproperty2); else if (split[1].Equals("sendpacket")) - sendMessage(client, Resources.CPsendpacket); + SendMessage(client, Resources.CPsendpacket); else if (split[1].Equals("setgraphic")) - sendMessage(client, Resources.CPsetgraphic); + SendMessage(client, Resources.CPsetgraphic); */ } if (split.Length == 3) @@ -550,7 +550,7 @@ namespace FFXIVClassic_Map_Server if(split[1].Equals("test")) { if (split[2].Equals("weather")) - sendMessage(client, Resources.CPtestweather); + SendMessage(client, Resources.CPtestweather); } } @@ -564,7 +564,7 @@ namespace FFXIVClassic_Map_Server if (split.Length == 1) { // catch invalid commands - sendMessage(client, Resources.CPhelp); + SendMessage(client, Resources.CPhelp); } else if (split.Length >= 2) { @@ -573,12 +573,12 @@ namespace FFXIVClassic_Map_Server { try { - doWeather(client, split[2], split[3]); + DoWeather(client, split[2], split[3]); return true; } catch (Exception e) { - Program.Log.Error("Could not change weather: " + e); + Program.Log.Error("Could not Change weather: " + e); } } #endregion @@ -592,7 +592,7 @@ namespace FFXIVClassic_Map_Server { try { - printPos(client); + PrintPos(client); return true; } catch (Exception e) @@ -607,13 +607,13 @@ namespace FFXIVClassic_Map_Server { if (client != null) { - Program.Log.Info("Got request to reset zone: {0}", client.getActor().zoneId); - client.getActor().zone.clear(); - client.getActor().zone.addActorToZone(client.getActor()); - client.getActor().sendInstanceUpdate(); - client.queuePacket(BasePacket.createPacket(SendMessagePacket.buildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", String.Format("Reseting zone {0}...", client.getActor().zoneId)), true, false)); + Program.Log.Info("Got request to reset zone: {0}", client.GetActor().zoneId); + client.GetActor().zone.Clear(); + client.GetActor().zone.AddActorToZone(client.GetActor()); + client.GetActor().SendInstanceUpdate(); + client.QueuePacket(BasePacket.CreatePacket(SendMessagePacket.BuildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", String.Format("Reseting zone {0}...", client.GetActor().zoneId)), true, false)); } - Server.GetWorldManager().reloadZone(client.getActor().zoneId); + Server.GetWorldManager().ReloadZone(client.GetActor().zoneId); return true; } #endregion @@ -622,11 +622,11 @@ namespace FFXIVClassic_Map_Server else if (split[0].Equals("reloaditems")) { Program.Log.Info("Got request to reload item gamedata"); - sendMessage(client, "Reloading Item Gamedata..."); + SendMessage(client, "Reloading Item Gamedata..."); gamedataItems.Clear(); - gamedataItems = Database.getItemGamedata(); + gamedataItems = Database.GetItemGamedata(); Program.Log.Info("Loaded {0} items.", gamedataItems.Count); - sendMessage(client, String.Format("Loaded {0} items.", gamedataItems.Count)); + SendMessage(client, String.Format("Loaded {0} items.", gamedataItems.Count)); return true; } #endregion @@ -639,7 +639,7 @@ namespace FFXIVClassic_Map_Server try { - sendPacket(client, "./packets/" + split[1]); + SendPacket(client, "./packets/" + split[1]); return true; } catch (Exception e) @@ -655,7 +655,7 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 6) - setGraphic(client, UInt32.Parse(split[1]), UInt32.Parse(split[2]), UInt32.Parse(split[3]), UInt32.Parse(split[4]), UInt32.Parse(split[5])); + SetGraphic(client, UInt32.Parse(split[1]), UInt32.Parse(split[2]), UInt32.Parse(split[3]), UInt32.Parse(split[4]), UInt32.Parse(split[5])); return true; } catch (Exception e) @@ -671,11 +671,11 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 2) - giveItem(client, UInt32.Parse(split[1]), 1); + GiveItem(client, UInt32.Parse(split[1]), 1); else if (split.Length == 3) - giveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); + GiveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); else if (split.Length == 4) - giveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]), UInt16.Parse(split[3])); + GiveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]), UInt16.Parse(split[3])); return true; } catch (Exception e) @@ -694,11 +694,11 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 2) - removeItem(client, UInt32.Parse(split[1]), 1); + RemoveItem(client, UInt32.Parse(split[1]), 1); else if (split.Length == 3) - removeItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); + RemoveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); else if (split.Length == 4) - removeItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]), UInt16.Parse(split[3])); + RemoveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]), UInt16.Parse(split[3])); return true; } catch (Exception e) @@ -714,7 +714,7 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 2) - giveKeyItem(client, UInt32.Parse(split[1])); + GiveKeyItem(client, UInt32.Parse(split[1])); } catch (Exception e) { @@ -732,7 +732,7 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 2) - removeKeyItem(client, UInt32.Parse(split[1])); + RemoveKeyItem(client, UInt32.Parse(split[1])); return true; } catch (Exception e) @@ -748,9 +748,9 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 2) - giveCurrency(client, ITEM_GIL, Int32.Parse(split[1])); + GiveCurrency(client, ITEM_GIL, Int32.Parse(split[1])); else if (split.Length == 3) - giveCurrency(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); + GiveCurrency(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); } catch (Exception e) { @@ -768,9 +768,9 @@ namespace FFXIVClassic_Map_Server try { if (split.Length == 2) - removeCurrency(client, ITEM_GIL, Int32.Parse(split[1])); + RemoveCurrency(client, ITEM_GIL, Int32.Parse(split[1])); else if (split.Length == 3) - removeCurrency(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); + RemoveCurrency(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); return true; } catch (Exception e) @@ -788,12 +788,12 @@ namespace FFXIVClassic_Map_Server try { - doMusic(client, split[1]); + DoMusic(client, split[1]); return true; } catch (Exception e) { - Program.Log.Error("Could not change music: " + e); + Program.Log.Error("Could not Change music: " + e); } } #endregion @@ -801,7 +801,7 @@ namespace FFXIVClassic_Map_Server #region !warp else if (split[0].Equals("warp")) { - parseWarp(client, split); + ParseWarp(client, split); return true; } #endregion @@ -811,7 +811,7 @@ namespace FFXIVClassic_Map_Server { if (split.Length == 4) { - changeProperty(Utils.MurmurHash2(split[1], 0), Convert.ToUInt32(split[2], 16), split[3]); + ChangeProperty(Utils.MurmurHash2(split[1], 0), Convert.ToUInt32(split[2], 16), split[3]); } return true; } @@ -822,7 +822,7 @@ namespace FFXIVClassic_Map_Server { if (split.Length == 4) { - changeProperty(Convert.ToUInt32(split[1], 16), Convert.ToUInt32(split[2], 16), split[3]); + ChangeProperty(Convert.ToUInt32(split[1], 16), Convert.ToUInt32(split[2], 16), split[3]); } return true; } diff --git a/FFXIVClassic Map Server/ConfigConstants.cs b/FFXIVClassic Map Server/ConfigConstants.cs index 18248d2d..1509ee58 100644 --- a/FFXIVClassic Map Server/ConfigConstants.cs +++ b/FFXIVClassic Map Server/ConfigConstants.cs @@ -17,7 +17,7 @@ namespace FFXIVClassic_Map_Server public static String DATABASE_USERNAME; public static String DATABASE_PASSWORD; - public static bool load() + public static bool Load() { Console.Write("Loading map_config.ini file... "); diff --git a/FFXIVClassic Map Server/Database.cs b/FFXIVClassic Map Server/Database.cs index 426beb47..920be9cb 100644 --- a/FFXIVClassic Map Server/Database.cs +++ b/FFXIVClassic Map Server/Database.cs @@ -17,7 +17,7 @@ namespace FFXIVClassic_Map_Server class Database { - public static uint getUserIdFromSession(String sessionId) + public static uint GetUserIdFromSession(String sessionId) { uint id = 0; using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -47,7 +47,7 @@ namespace FFXIVClassic_Map_Server return id; } - public static DBWorld getServer(uint serverId) + public static DBWorld GetServer(uint serverId) { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -70,7 +70,7 @@ namespace FFXIVClassic_Map_Server } } - public static List getNpcList() + public static List GetNpcList() { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -93,7 +93,7 @@ namespace FFXIVClassic_Map_Server } } - public static Dictionary getItemGamedata() + public static Dictionary GetItemGamedata() { using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -149,7 +149,7 @@ namespace FFXIVClassic_Map_Server } } - public static void savePlayerAppearance(Player player) + public static void SavePlayerAppearance(Player player) { string query; MySqlCommand cmd; @@ -205,7 +205,7 @@ namespace FFXIVClassic_Map_Server } } - public static void savePlayerCurrentClass(Player player) + public static void SavePlayerCurrentClass(Player player) { string query; MySqlCommand cmd; @@ -241,7 +241,7 @@ namespace FFXIVClassic_Map_Server } } - public static void savePlayerPosition(Player player) + public static void SavePlayerPosition(Player player) { string query; MySqlCommand cmd; @@ -283,7 +283,7 @@ namespace FFXIVClassic_Map_Server } } - public static void savePlayerPlayTime(Player player) + public static void SavePlayerPlayTime(Player player) { string query; MySqlCommand cmd; @@ -302,7 +302,7 @@ namespace FFXIVClassic_Map_Server cmd = new MySqlCommand(query, conn); cmd.Parameters.AddWithValue("@charaId", player.actorId); - cmd.Parameters.AddWithValue("@playtime", player.getPlayTime(true)); + cmd.Parameters.AddWithValue("@playtime", player.GetPlayTime(true)); cmd.ExecuteNonQuery(); } @@ -317,19 +317,19 @@ namespace FFXIVClassic_Map_Server } } - public static void saveQuest(Player player, Quest quest) + public static void SaveQuest(Player player, Quest quest) { - int slot = player.getQuestSlot(quest.actorId); + int slot = player.GetQuestSlot(quest.actorId); if (slot == -1) { Program.Log.Error("Tried saving quest player didn't have: Player: {0:x}, QuestId: {0:x}", player.actorId, quest.actorId); return; } else - saveQuest(player, quest, slot); + SaveQuest(player, quest, slot); } - public static void saveQuest(Player player, Quest quest, int slot) + public static void SaveQuest(Player player, Quest quest, int slot) { string query; MySqlCommand cmd; @@ -369,7 +369,7 @@ namespace FFXIVClassic_Map_Server } } - public static void loadPlayerCharacter(Player player) + public static void LoadPlayerCharacter(Player player) { string query; MySqlCommand cmd; @@ -560,12 +560,12 @@ namespace FFXIVClassic_Map_Server if (reader.Read()) { if (reader.GetUInt32(0) == 0xFFFFFFFF) - player.modelId = CharacterUtils.getTribeModel(player.playerWork.tribe); + player.modelId = CharacterUtils.GetTribeModel(player.playerWork.tribe); else player.modelId = reader.GetUInt32(0); player.appearanceIds[Character.SIZE] = reader.GetByte(1); player.appearanceIds[Character.COLORINFO] = (uint)(reader.GetUInt16(3) | (reader.GetUInt16(5) << 10) | (reader.GetUInt16(7) << 20)); - player.appearanceIds[Character.FACEINFO] = PrimitiveConversion.ToUInt32(CharacterUtils.getFaceInfo(reader.GetByte(8), reader.GetByte(9), reader.GetByte(10), reader.GetByte(11), reader.GetByte(12), reader.GetByte(13), reader.GetByte(14), reader.GetByte(15), reader.GetByte(16), reader.GetByte(17))); + player.appearanceIds[Character.FACEINFO] = PrimitiveConversion.ToUInt32(CharacterUtils.GetFaceInfo(reader.GetByte(8), reader.GetByte(9), reader.GetByte(10), reader.GetByte(11), reader.GetByte(12), reader.GetByte(13), reader.GetByte(14), reader.GetByte(15), reader.GetByte(16), reader.GetByte(17))); player.appearanceIds[Character.HIGHLIGHT_HAIR] = (uint)(reader.GetUInt16(6) | reader.GetUInt16(4) << 10); player.appearanceIds[Character.VOICE] = reader.GetByte(2); player.appearanceIds[Character.MAINHAND] = reader.GetUInt32(18); @@ -712,7 +712,7 @@ namespace FFXIVClassic_Map_Server else questFlags = 0; - string questName = Server.getStaticActors(player.playerWork.questScenario[index]).actorName; + string questName = Server.GetStaticActors(player.playerWork.questScenario[index]).actorName; player.questScenario[index] = new Quest(player, player.playerWork.questScenario[index], questName, questData, questFlags); } } @@ -779,14 +779,14 @@ namespace FFXIVClassic_Map_Server } } - player.getInventory(Inventory.NORMAL).initList(getInventory(player, 0, Inventory.NORMAL)); - player.getInventory(Inventory.KEYITEMS).initList(getInventory(player, 0, Inventory.KEYITEMS)); - player.getInventory(Inventory.CURRENCY).initList(getInventory(player, 0, Inventory.CURRENCY)); - player.getInventory(Inventory.BAZAAR).initList(getInventory(player, 0, Inventory.BAZAAR)); - player.getInventory(Inventory.MELDREQUEST).initList(getInventory(player, 0, Inventory.MELDREQUEST)); - player.getInventory(Inventory.LOOT).initList(getInventory(player, 0, Inventory.LOOT)); + player.GetInventory(Inventory.NORMAL).InitList(GetInventory(player, 0, Inventory.NORMAL)); + player.GetInventory(Inventory.KEYITEMS).InitList(GetInventory(player, 0, Inventory.KEYITEMS)); + player.GetInventory(Inventory.CURRENCY).InitList(GetInventory(player, 0, Inventory.CURRENCY)); + player.GetInventory(Inventory.BAZAAR).InitList(GetInventory(player, 0, Inventory.BAZAAR)); + player.GetInventory(Inventory.MELDREQUEST).InitList(GetInventory(player, 0, Inventory.MELDREQUEST)); + player.GetInventory(Inventory.LOOT).InitList(GetInventory(player, 0, Inventory.LOOT)); - player.getEquipment().SetEquipment(getEquipment(player, player.charaWork.parameterSave.state_mainSkill[0])); + player.GetEquipment().SetEquipment(GetEquipment(player, player.charaWork.parameterSave.state_mainSkill[0])); } catch (MySqlException e) { @@ -800,9 +800,9 @@ namespace FFXIVClassic_Map_Server } - public static InventoryItem[] getEquipment(Player player, ushort classId) + public static InventoryItem[] GetEquipment(Player player, ushort classId) { - InventoryItem[] equipment = new InventoryItem[player.getEquipment().GetCapacity()]; + InventoryItem[] equipment = new InventoryItem[player.GetEquipment().GetCapacity()]; using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -827,7 +827,7 @@ namespace FFXIVClassic_Map_Server { ushort equipSlot = reader.GetUInt16(0); ulong uniqueItemId = reader.GetUInt16(1); - InventoryItem item = player.getInventory(Inventory.NORMAL).getItemById(uniqueItemId); + InventoryItem item = player.GetInventory(Inventory.NORMAL).GetItemById(uniqueItemId); equipment[equipSlot] = item; } } @@ -845,7 +845,7 @@ namespace FFXIVClassic_Map_Server return equipment; } - public static void equipItem(Player player, ushort equipSlot, ulong uniqueItemId) + public static void EquipItem(Player player, ushort equipSlot, ulong uniqueItemId) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -882,7 +882,7 @@ namespace FFXIVClassic_Map_Server } - public static void unequipItem(Player player, ushort equipSlot) + public static void UnequipItem(Player player, ushort equipSlot) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -915,7 +915,7 @@ namespace FFXIVClassic_Map_Server } - public static List getInventory(Player player, uint slotOffset, uint type) + public static List GetInventory(Player player, uint slotOffset, uint type) { List items = new List(); @@ -987,7 +987,7 @@ namespace FFXIVClassic_Map_Server return items; } - public static InventoryItem addItem(Player player, uint itemId, int quantity, byte quality, byte itemType, int durability, ushort type) + public static InventoryItem AddItem(Player player, uint itemId, int quantity, byte quality, byte itemType, int durability, ushort type) { InventoryItem insertedItem = null; @@ -1028,7 +1028,7 @@ namespace FFXIVClassic_Map_Server cmd.ExecuteNonQuery(); cmd2.ExecuteNonQuery(); - insertedItem = new InventoryItem((uint)cmd.LastInsertedId, itemId, quantity, (ushort)player.getInventory(type).getNextEmptySlot(), itemType, quality, durability, 0, 0, 0, 0, 0, 0); + insertedItem = new InventoryItem((uint)cmd.LastInsertedId, itemId, quantity, (ushort)player.GetInventory(type).GetNextEmptySlot(), itemType, quality, durability, 0, 0, 0, 0, 0, 0); } catch (MySqlException e) { @@ -1043,7 +1043,7 @@ namespace FFXIVClassic_Map_Server return insertedItem; } - public static void setQuantity(Player player, uint slot, ushort type, int quantity) + public static void SetQuantity(Player player, uint slot, ushort type, int quantity) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -1077,7 +1077,7 @@ namespace FFXIVClassic_Map_Server } - public static void removeItem(Player player, ulong serverItemId, ushort type) + public static void RemoveItem(Player player, ulong serverItemId, ushort type) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}; Allow User Variables=True", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -1117,7 +1117,7 @@ namespace FFXIVClassic_Map_Server } - public static void removeItem(Player player, ushort slot, ushort type) + public static void RemoveItem(Player player, ushort slot, ushort type) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}; Allow User Variables=True", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -1158,7 +1158,7 @@ namespace FFXIVClassic_Map_Server } - public static SubPacket getLatestAchievements(Player player) + public static SubPacket GetLatestAchievements(Player player) { uint[] latestAchievements = new uint[5]; using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -1196,10 +1196,10 @@ namespace FFXIVClassic_Map_Server } } - return SetLatestAchievementsPacket.buildPacket(player.actorId, latestAchievements); + return SetLatestAchievementsPacket.BuildPacket(player.actorId, latestAchievements); } - public static SubPacket getAchievementsPacket(Player player) + public static SubPacket GetAchievementsPacket(Player player) { SetCompletedAchievementsPacket cheevosPacket = new SetCompletedAchievementsPacket(); @@ -1242,7 +1242,7 @@ namespace FFXIVClassic_Map_Server } } - return cheevosPacket.buildPacket(player.actorId); + return cheevosPacket.BuildPacket(player.actorId); } diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs index 734df6cd..7474c7eb 100644 --- a/FFXIVClassic Map Server/PacketProcessor.cs +++ b/FFXIVClassic Map Server/PacketProcessor.cs @@ -36,17 +36,17 @@ namespace FFXIVClassic_Map_Server cp = new CommandProcessor(playerList); } - public void processPacket(ClientConnection client, BasePacket packet) + public void ProcessPacket(ClientConnection client, BasePacket packet) { if (packet.header.isCompressed == 0x01) - BasePacket.decryptPacket(client.blowfish, ref packet); + BasePacket.DecryptPacket(client.blowfish, ref packet); - List subPackets = packet.getSubpackets(); + List subPackets = packet.GetSubpackets(); foreach (SubPacket subpacket in subPackets) { if (subpacket.header.type == 0x01) { - packet.debugPrintPacket(); + packet.DebugPrintPacket(); byte[] reply1Data = { 0x01, 0x00, 0x00, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xFD, 0xFF, 0xFF, @@ -117,35 +117,35 @@ namespace FFXIVClassic_Map_Server player = mPlayers[client.owner]; } - //Create connected player if not created + //Create connected player if not Created if (player == null) { player = new ConnectedPlayer(actorID); mPlayers[actorID] = player; } - player.setConnection(packet.header.connectionType, client); + player.SetConnection(packet.header.connectionType, client); if (packet.header.connectionType == BasePacket.TYPE_ZONE) - Program.Log.Debug("Got {0} connection for ActorID {1} @ {2}.", "zone", actorID, client.getAddress()); + Program.Log.Debug("Got {0} connection for ActorID {1} @ {2}.", "zone", actorID, client.GetAddress()); else if (packet.header.connectionType == BasePacket.TYPE_CHAT) - Program.Log.Debug("Got {0} connection for ActorID {1} @ {2}.", "chat", actorID, client.getAddress()); + Program.Log.Debug("Got {0} connection for ActorID {1} @ {2}.", "chat", actorID, client.GetAddress()); //Create player actor - reply1.debugPrintPacket(); - client.queuePacket(reply1); - client.queuePacket(reply2); + reply1.DebugPrintPacket(); + client.QueuePacket(reply1); + client.QueuePacket(reply2); break; } else if (subpacket.header.type == 0x07) { - BasePacket init = Login0x7ResponsePacket.buildPacket(BitConverter.ToUInt32(packet.data, 0x10), Utils.UnixTimeStampUTC()); - //client.queuePacket(init); + BasePacket init = Login0x7ResponsePacket.BuildPacket(BitConverter.ToUInt32(packet.data, 0x10), Utils.UnixTimeStampUTC()); + //client.QueuePacket(init); } else if (subpacket.header.type == 0x08) { //Response, client's current [actorID][time] - packet.debugPrintPacket(); + packet.DebugPrintPacket(); } else if (subpacket.header.type == 0x03) { @@ -162,18 +162,18 @@ namespace FFXIVClassic_Map_Server { //Ping case 0x0001: - //subpacket.debugPrintSubPacket(); + //subpacket.DebugPrintSubPacket(); PingPacket pingPacket = new PingPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(PongPacket.buildPacket(player.actorID, pingPacket.time), true, false)); - player.ping(); + client.QueuePacket(BasePacket.CreatePacket(PongPacket.BuildPacket(player.actorID, pingPacket.time), true, false)); + player.Ping(); break; //Unknown case 0x0002: - subpacket.debugPrintSubPacket(); - client.queuePacket(_0x2Packet.buildPacket(player.actorID), true, false); + subpacket.DebugPrintSubPacket(); + client.QueuePacket(_0x2Packet.BuildPacket(player.actorID), true, false); - Server.GetWorldManager().DoLogin(player.getActor()); + Server.GetWorldManager().DoLogin(player.GetActor()); break; @@ -181,15 +181,15 @@ namespace FFXIVClassic_Map_Server case 0x0003: ChatMessagePacket chatMessage = new ChatMessagePacket(subpacket.data); Program.Log.Info("Got type-{5} message: {0} @ {1}, {2}, {3}, Rot: {4}", chatMessage.message, chatMessage.posX, chatMessage.posY, chatMessage.posZ, chatMessage.posRot, chatMessage.logType); - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); if (chatMessage.message.StartsWith("!")) { - if (cp.doCommand(chatMessage.message, player)) + if (cp.DoCommand(chatMessage.message, player)) continue; } - player.getActor().broadcastPacket(SendMessagePacket.buildPacket(player.actorID, player.actorID, chatMessage.logType, player.getActor().customDisplayName, chatMessage.message), false); + player.GetActor().BroadcastPacket(SendMessagePacket.BuildPacket(player.actorID, player.actorID, chatMessage.logType, player.GetActor().customDisplayName, chatMessage.message), false); break; //Langauge Code @@ -199,37 +199,37 @@ namespace FFXIVClassic_Map_Server break; //Unknown - Happens a lot at login, then once every time player zones case 0x0007: - //subpacket.debugPrintSubPacket(); + //subpacket.DebugPrintSubPacket(); _0x07Packet unknown07 = new _0x07Packet(subpacket.data); break; //Update Position case 0x00CA: //Update Position - //subpacket.debugPrintSubPacket(); + //subpacket.DebugPrintSubPacket(); UpdatePlayerPositionPacket posUpdate = new UpdatePlayerPositionPacket(subpacket.data); - player.updatePlayerActorPosition(posUpdate.x, posUpdate.y, posUpdate.z, posUpdate.rot, posUpdate.moveState); - player.getActor().sendInstanceUpdate(); + player.UpdatePlayerActorPosition(posUpdate.x, posUpdate.y, posUpdate.z, posUpdate.rot, posUpdate.moveState); + player.GetActor().SendInstanceUpdate(); - if (player.getActor().isInZoneChange()) - player.getActor().setZoneChanging(false); + if (player.GetActor().IsInZoneChange()) + player.GetActor().SetZoneChanging(false); break; //Set Target case 0x00CD: - //subpacket.debugPrintSubPacket(); + //subpacket.DebugPrintSubPacket(); SetTargetPacket setTarget = new SetTargetPacket(subpacket.data); - player.getActor().currentTarget = setTarget.actorID; - player.getActor().broadcastPacket(SetActorTargetAnimatedPacket.buildPacket(player.actorID, player.actorID, setTarget.actorID), true); + player.GetActor().currentTarget = setTarget.actorID; + player.GetActor().BroadcastPacket(SetActorTargetAnimatedPacket.BuildPacket(player.actorID, player.actorID, setTarget.actorID), true); break; //Lock Target case 0x00CC: LockTargetPacket lockTarget = new LockTargetPacket(subpacket.data); - player.getActor().currentLockedTarget = lockTarget.actorID; + player.GetActor().currentLockedTarget = lockTarget.actorID; break; //Start Event case 0x012D: - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); EventStartPacket eventStart = new EventStartPacket(subpacket.data); /* @@ -245,83 +245,83 @@ namespace FFXIVClassic_Map_Server } */ - Actor ownerActor = Server.getStaticActors(eventStart.scriptOwnerActorID); + Actor ownerActor = Server.GetStaticActors(eventStart.scriptOwnerActorID); if (ownerActor != null && ownerActor is Command) { - player.getActor().currentCommand = eventStart.scriptOwnerActorID; - player.getActor().currentCommandName = eventStart.triggerName; + player.GetActor().currentCommand = eventStart.scriptOwnerActorID; + player.GetActor().currentCommandName = eventStart.triggerName; } else { - player.getActor().currentEventOwner = eventStart.scriptOwnerActorID; - player.getActor().currentEventName = eventStart.triggerName; + player.GetActor().currentEventOwner = eventStart.scriptOwnerActorID; + player.GetActor().currentEventName = eventStart.triggerName; } if (ownerActor == null) { //Is it a instance actor? - ownerActor = Server.GetWorldManager().GetActorInWorld(player.getActor().currentEventOwner); + ownerActor = Server.GetWorldManager().GetActorInWorld(player.GetActor().currentEventOwner); if (ownerActor == null) { //Is it a Director? - if (player.getActor().currentDirector != null && player.getActor().currentEventOwner == player.getActor().currentDirector.actorId) - ownerActor = player.getActor().currentDirector; + if (player.GetActor().currentDirector != null && player.GetActor().currentEventOwner == player.GetActor().currentDirector.actorId) + ownerActor = player.GetActor().currentDirector; else { - Program.Log.Debug("\n===Event START===\nCould not find actor 0x{0:X} for event started by caller: 0x{1:X}\nEvent Starter: {2}\nParams: {3}", eventStart.actorID, eventStart.scriptOwnerActorID, eventStart.triggerName, LuaUtils.dumpParams(eventStart.luaParams)); + Program.Log.Debug("\n===Event START===\nCould not find actor 0x{0:X} for event started by caller: 0x{1:X}\nEvent Starter: {2}\nParams: {3}", eventStart.actorID, eventStart.scriptOwnerActorID, eventStart.triggerName, LuaUtils.DumpParams(eventStart.luaParams)); break; } } } - LuaEngine.doActorOnEventStarted(player.getActor(), ownerActor, eventStart); + LuaEngine.DoActorOnEventStarted(player.GetActor(), ownerActor, eventStart); - Program.Log.Debug("\n===Event START===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nEvent Starter: {4}\nParams: {5}", eventStart.actorID, eventStart.scriptOwnerActorID, eventStart.val1, eventStart.val2, eventStart.triggerName, LuaUtils.dumpParams(eventStart.luaParams)); + Program.Log.Debug("\n===Event START===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nEvent Starter: {4}\nParams: {5}", eventStart.actorID, eventStart.scriptOwnerActorID, eventStart.val1, eventStart.val2, eventStart.triggerName, LuaUtils.DumpParams(eventStart.luaParams)); break; //Unknown, happens at npc spawn and cutscene play???? case 0x00CE: break; //Event Result case 0x012E: - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); EventUpdatePacket eventUpdate = new EventUpdatePacket(subpacket.data); - Program.Log.Debug("\n===Event UPDATE===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nStep: 0x{4:X}\nParams: {5}", eventUpdate.actorID, eventUpdate.scriptOwnerActorID, eventUpdate.val1, eventUpdate.val2, eventUpdate.step, LuaUtils.dumpParams(eventUpdate.luaParams)); + Program.Log.Debug("\n===Event UPDATE===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nStep: 0x{4:X}\nParams: {5}", eventUpdate.actorID, eventUpdate.scriptOwnerActorID, eventUpdate.val1, eventUpdate.val2, eventUpdate.step, LuaUtils.DumpParams(eventUpdate.luaParams)); //Is it a static actor? If not look in the player's instance - Actor updateOwnerActor = Server.getStaticActors(player.getActor().currentEventOwner); + Actor updateOwnerActor = Server.GetStaticActors(player.GetActor().currentEventOwner); if (updateOwnerActor == null) { - updateOwnerActor = Server.GetWorldManager().GetActorInWorld(player.getActor().currentEventOwner); + updateOwnerActor = Server.GetWorldManager().GetActorInWorld(player.GetActor().currentEventOwner); - if (player.getActor().currentDirector != null && player.getActor().currentEventOwner == player.getActor().currentDirector.actorId) - updateOwnerActor = player.getActor().currentDirector; + if (player.GetActor().currentDirector != null && player.GetActor().currentEventOwner == player.GetActor().currentDirector.actorId) + updateOwnerActor = player.GetActor().currentDirector; if (updateOwnerActor == null) break; } - LuaEngine.doActorOnEventUpdated(player.getActor(), updateOwnerActor, eventUpdate); + LuaEngine.DoActorOnEventUpdated(player.GetActor(), updateOwnerActor, eventUpdate); break; case 0x012F: - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); ParameterDataRequestPacket paramRequest = new ParameterDataRequestPacket(subpacket.data); if (paramRequest.paramName.Equals("charaWork/exp")) - player.getActor().sendCharaExpInfo(); + player.GetActor().SendCharaExpInfo(); break; /* RECRUITMENT */ //Start Recruiting case 0x01C3: StartRecruitingRequestPacket recruitRequestPacket = new StartRecruitingRequestPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(StartRecruitingResponse.buildPacket(player.actorID, true), true, false)); + client.QueuePacket(BasePacket.CreatePacket(StartRecruitingResponse.BuildPacket(player.actorID, true), true, false)); break; //End Recruiting case 0x01C4: - client.queuePacket(BasePacket.createPacket(EndRecruitmentPacket.buildPacket(player.actorID), true, false)); + client.QueuePacket(BasePacket.CreatePacket(EndRecruitmentPacket.BuildPacket(player.actorID), true, false)); break; //Party Window Opened, Request State case 0x01C5: - client.queuePacket(BasePacket.createPacket(RecruiterStatePacket.buildPacket(player.actorID, true, true, 1), true, false)); + client.QueuePacket(BasePacket.CreatePacket(RecruiterStatePacket.BuildPacket(player.actorID, true, true, 1), true, false)); break; //Search Recruiting case 0x01C7: @@ -335,84 +335,84 @@ namespace FFXIVClassic_Map_Server details.purposeId = 2; details.locationId = 1; details.subTaskId = 1; - details.comment = "This is a test details packet sent by the server. No implementation has been created yet..."; + details.comment = "This is a test details packet sent by the server. No implementation has been Created yet..."; details.num[0] = 1; - client.queuePacket(BasePacket.createPacket(CurrentRecruitmentDetailsPacket.buildPacket(player.actorID, details), true, false)); + client.QueuePacket(BasePacket.CreatePacket(CurrentRecruitmentDetailsPacket.BuildPacket(player.actorID, details), true, false)); break; //Accepted Recruiting case 0x01C6: - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); break; /* SOCIAL STUFF */ case 0x01C9: AddRemoveSocialPacket addBlackList = new AddRemoveSocialPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(BlacklistAddedPacket.buildPacket(player.actorID, true, addBlackList.name), true, false)); + client.QueuePacket(BasePacket.CreatePacket(BlacklistAddedPacket.BuildPacket(player.actorID, true, addBlackList.name), true, false)); break; case 0x01CA: AddRemoveSocialPacket removeBlackList = new AddRemoveSocialPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(BlacklistRemovedPacket.buildPacket(player.actorID, true, removeBlackList.name), true, false)); + client.QueuePacket(BasePacket.CreatePacket(BlacklistRemovedPacket.BuildPacket(player.actorID, true, removeBlackList.name), true, false)); break; case 0x01CB: int offset1 = 0; - client.queuePacket(BasePacket.createPacket(SendBlacklistPacket.buildPacket(player.actorID, new String[] { "Test" }, ref offset1), true, false)); + client.QueuePacket(BasePacket.CreatePacket(SendBlacklistPacket.BuildPacket(player.actorID, new String[] { "Test" }, ref offset1), true, false)); break; case 0x01CC: AddRemoveSocialPacket addFriendList = new AddRemoveSocialPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(FriendlistAddedPacket.buildPacket(player.actorID, true, (uint)addFriendList.name.GetHashCode(), true, addFriendList.name), true, false)); + client.QueuePacket(BasePacket.CreatePacket(FriendlistAddedPacket.BuildPacket(player.actorID, true, (uint)addFriendList.name.GetHashCode(), true, addFriendList.name), true, false)); break; case 0x01CD: AddRemoveSocialPacket removeFriendList = new AddRemoveSocialPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(FriendlistRemovedPacket.buildPacket(player.actorID, true, removeFriendList.name), true, false)); + client.QueuePacket(BasePacket.CreatePacket(FriendlistRemovedPacket.BuildPacket(player.actorID, true, removeFriendList.name), true, false)); break; case 0x01CE: int offset2 = 0; - client.queuePacket(BasePacket.createPacket(SendFriendlistPacket.buildPacket(player.actorID, new Tuple[] { new Tuple(01, "Test2") }, ref offset2), true, false)); + client.QueuePacket(BasePacket.CreatePacket(SendFriendlistPacket.BuildPacket(player.actorID, new Tuple[] { new Tuple(01, "Test2") }, ref offset2), true, false)); break; case 0x01CF: - client.queuePacket(BasePacket.createPacket(FriendStatusPacket.buildPacket(player.actorID, null), true, false)); + client.QueuePacket(BasePacket.CreatePacket(FriendStatusPacket.BuildPacket(player.actorID, null), true, false)); break; /* SUPPORT DESK STUFF */ //Request for FAQ/Info List case 0x01D0: FaqListRequestPacket faqRequest = new FaqListRequestPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(FaqListResponsePacket.buildPacket(player.actorID, new string[] { "Testing FAQ1", "Coded style!" }), true, false)); + client.QueuePacket(BasePacket.CreatePacket(FaqListResponsePacket.BuildPacket(player.actorID, new string[] { "Testing FAQ1", "Coded style!" }), true, false)); break; //Request for body of a faq/info selection case 0x01D1: FaqBodyRequestPacket faqBodyRequest = new FaqBodyRequestPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(FaqBodyResponsePacket.buildPacket(player.actorID, "HERE IS A GIANT BODY. Nothing else to say!"), true, false)); + client.QueuePacket(BasePacket.CreatePacket(FaqBodyResponsePacket.BuildPacket(player.actorID, "HERE IS A GIANT BODY. Nothing else to say!"), true, false)); break; //Request issue list case 0x01D2: GMTicketIssuesRequestPacket issuesRequest = new GMTicketIssuesRequestPacket(subpacket.data); - client.queuePacket(BasePacket.createPacket(IssueListResponsePacket.buildPacket(player.actorID, new string[] { "Test1", "Test2", "Test3", "Test4", "Test5" }), true, false)); + client.QueuePacket(BasePacket.CreatePacket(IssueListResponsePacket.BuildPacket(player.actorID, new string[] { "Test1", "Test2", "Test3", "Test4", "Test5" }), true, false)); break; //Request if GM ticket exists case 0x01D3: - client.queuePacket(BasePacket.createPacket(StartGMTicketPacket.buildPacket(player.actorID, false), true, false)); + client.QueuePacket(BasePacket.CreatePacket(StartGMTicketPacket.BuildPacket(player.actorID, false), true, false)); break; //Request for GM response message case 0x01D4: - client.queuePacket(BasePacket.createPacket(GMTicketPacket.buildPacket(player.actorID, "This is a GM Ticket Title", "This is a GM Ticket Body."), true, false)); + client.QueuePacket(BasePacket.CreatePacket(GMTicketPacket.BuildPacket(player.actorID, "This is a GM Ticket Title", "This is a GM Ticket Body."), true, false)); break; //GM Ticket Sent case 0x01D5: GMSupportTicketPacket gmTicket = new GMSupportTicketPacket(subpacket.data); Program.Log.Info("Got GM Ticket: \n" + gmTicket.ticketTitle + "\n" + gmTicket.ticketBody); - client.queuePacket(BasePacket.createPacket(GMTicketSentResponsePacket.buildPacket(player.actorID, true), true, false)); + client.QueuePacket(BasePacket.CreatePacket(GMTicketSentResponsePacket.BuildPacket(player.actorID, true), true, false)); break; //Request to end ticket case 0x01D6: - client.queuePacket(BasePacket.createPacket(EndGMTicketPacket.buildPacket(player.actorID), true, false)); + client.QueuePacket(BasePacket.CreatePacket(EndGMTicketPacket.BuildPacket(player.actorID), true, false)); break; default: Program.Log.Debug("Unknown command 0x{0:X} received.", subpacket.gameMessage.opcode); - subpacket.debugPrintSubPacket(); + subpacket.DebugPrintSubPacket(); break; } } else - packet.debugPrintPacket(); + packet.DebugPrintPacket(); } } diff --git a/FFXIVClassic Map Server/Program.cs b/FFXIVClassic Map Server/Program.cs index 80a3a6e4..0f0ff4f8 100644 --- a/FFXIVClassic Map Server/Program.cs +++ b/FFXIVClassic Map Server/Program.cs @@ -26,11 +26,11 @@ namespace FFXIVClassic_Map_Server bool startServer = true; //Load Config - if (!ConfigConstants.load()) - startServer = false; - - // set up logging - + if (!ConfigConstants.Load()) + startServer = false; + + // set up logging + Log = LogManager.GetCurrentClassLogger(); Program.Log.Info("---------FFXIV 1.0 Map Server---------"); @@ -58,7 +58,7 @@ namespace FFXIVClassic_Map_Server } //Check World ID - DBWorld thisWorld = Database.getServer(ConfigConstants.DATABASE_WORLDID); + DBWorld thisWorld = Database.GetServer(ConfigConstants.DATABASE_WORLDID); if (thisWorld != null) Program.Log.Info("Successfully pulled world info from DB. Server name is {0}.", thisWorld.name); else @@ -68,14 +68,14 @@ namespace FFXIVClassic_Map_Server if (startServer) { Server server = new Server(); - CommandProcessor cp = new CommandProcessor(server.getConnectedPlayerList()); - server.startServer(); + CommandProcessor cp = new CommandProcessor(server.GetConnectedPlayerList()); + server.StartServer(); while (startServer) { String input = Console.ReadLine(); Log.Info("[Console Input] " + input); - cp.doCommand(input, null); + cp.DoCommand(input, null); } } diff --git a/FFXIVClassic Map Server/Properties/Resources.Designer.cs b/FFXIVClassic Map Server/Properties/Resources.Designer.cs index 62ed5ea5..11a22948 100644 --- a/FFXIVClassic Map Server/Properties/Resources.Designer.cs +++ b/FFXIVClassic Map Server/Properties/Resources.Designer.cs @@ -129,7 +129,7 @@ namespace FFXIVClassic_Map_Server.Properties { /// /// Looks up a localized string similar to Prints out your current location /// - ///*Note: The X/Y/Z coordinates do not correspond to the coordinates listed in the in-game map, they are based on the underlying game data. + ///*Note: The X/Y/Z coordinates Do not correspond to the coordinates listed in the in-game map, they are based on the underlying game data. /// public static string CPmypos { get { @@ -226,7 +226,7 @@ namespace FFXIVClassic_Map_Server.Properties { /// /// Looks up a localized string similar to Overrides the currently displayed character equipment in a specific slot /// - ///*Note: Similar to Glamours in FFXIV:ARR, the overridden graphics are purely cosmetic, they do not affect the underlying stats of whatever is equipped on that slot + ///*Note: Similar to Glamours in FFXIV:ARR, the overridden graphics are purely cosmetic, they Do not affect the underlying stats of whatever is equipped on that slot /// ///*Syntax: sendpacket <slot> <wid> <eid> <vid> <cid> ///<w/e/v/c id> are as defined in the client game data. diff --git a/FFXIVClassic Map Server/Properties/Resources.resx b/FFXIVClassic Map Server/Properties/Resources.resx index 0413ecca..a5538877 100644 --- a/FFXIVClassic Map Server/Properties/Resources.resx +++ b/FFXIVClassic Map Server/Properties/Resources.resx @@ -7,7 +7,7 @@ The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes + various data types are Done through the TypeConverter classes associated with the data types. Example: @@ -33,7 +33,7 @@ Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the + Classes that Don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the @@ -156,7 +156,7 @@ Test: test weather Prints out your current location -*Note: The X/Y/Z coordinates do not correspond to the coordinates listed in the in-game map, they are based on the underlying game data +*Note: The X/Y/Z coordinates Do not correspond to the coordinates listed in the in-game map, they are based on the underlying game data *Syntax: property <value 1> <value 2> <value 3> @@ -199,7 +199,7 @@ Test: test weather Overrides the currently displayed character equipment in a specific slot -*Note: Similar to Glamours in FFXIV:ARR, the overridden graphics are purely cosmetic, they do not affect the underlying stats of whatever is equipped on that slot +*Note: Similar to Glamours in FFXIV:ARR, the overridden graphics are purely cosmetic, they Do not affect the underlying stats of whatever is equipped on that slot *Syntax: sendpacket <slot> <wid> <eid> <vid> <cid> <w/e/v/c id> are as defined in the client game data diff --git a/FFXIVClassic Map Server/Server.cs b/FFXIVClassic Map Server/Server.cs index 5bcac0de..92cb1168 100644 --- a/FFXIVClassic Map Server/Server.cs +++ b/FFXIVClassic Map Server/Server.cs @@ -38,7 +38,7 @@ namespace FFXIVClassic_Map_Server private Thread mConnectionHealthThread; private bool killHealthThread = false; - private void connectionHealth() + private void ConnectionHealth() { Program.Log.Info("Connection Health thread started; it will run every {0} seconds.", HEALTH_THREAD_SLEEP_TIME); while (!killHealthThread) @@ -48,12 +48,12 @@ namespace FFXIVClassic_Map_Server List dcedPlayers = new List(); foreach (ConnectedPlayer cp in mConnectedPlayerList.Values) { - if (cp.checkIfDCing()) + if (cp.CheckIfDCing()) dcedPlayers.Add(cp); } foreach (ConnectedPlayer cp in dcedPlayers) - cp.getActor().cleanupAndSave(); + cp.GetActor().CleanupAndSave(); } Thread.Sleep(HEALTH_THREAD_SLEEP_TIME * 1000); } @@ -64,20 +64,20 @@ namespace FFXIVClassic_Map_Server mSelf = this; } - public static Server getServer() + public static Server GetServer() { return mSelf; } - public bool startServer() + public bool StartServer() { - mConnectionHealthThread = new Thread(new ThreadStart(connectionHealth)); + mConnectionHealthThread = new Thread(new ThreadStart(ConnectionHealth)); mConnectionHealthThread.Name = "MapThread:Health"; //mConnectionHealthThread.Start(); mStaticActors = new StaticActors(STATIC_ACTORS_PATH); - gamedataItems = Database.getItemGamedata(); + gamedataItems = Database.GetItemGamedata(); Program.Log.Info("Loaded {0} items.", gamedataItems.Count); mWorldManager = new WorldManager(this); @@ -93,7 +93,7 @@ namespace FFXIVClassic_Map_Server } catch (Exception e) { - throw new ApplicationException("Could not create socket, check to make sure not duplicating port", e); + throw new ApplicationException("Could not Create socket, check to make sure not duplicating port", e); } try { @@ -106,7 +106,7 @@ namespace FFXIVClassic_Map_Server } try { - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } catch (Exception e) { @@ -124,7 +124,7 @@ namespace FFXIVClassic_Map_Server return true; } - public void removePlayer(Player player) + public void RemovePlayer(Player player) { lock (mConnectedPlayerList) { @@ -134,7 +134,7 @@ namespace FFXIVClassic_Map_Server } #region Socket Handling - private void acceptCallback(IAsyncResult result) + private void AcceptCallback(IAsyncResult result) { ClientConnection conn = null; Socket socket = (System.Net.Sockets.Socket)result.AsyncState; @@ -153,9 +153,9 @@ namespace FFXIVClassic_Map_Server Program.Log.Info("Connection {0}:{1} has connected.", (conn.socket.RemoteEndPoint as IPEndPoint).Address, (conn.socket.RemoteEndPoint as IPEndPoint).Port); //Queue recieving of data from the connection - conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(receiveCallback), conn); + conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(ReceiveCallback), conn); //Queue the accept of the next incomming connection - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } catch (SocketException) { @@ -167,7 +167,7 @@ namespace FFXIVClassic_Map_Server mConnectionList.Remove(conn); } } - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } catch (Exception) { @@ -178,21 +178,21 @@ namespace FFXIVClassic_Map_Server mConnectionList.Remove(conn); } } - mServerSocket.BeginAccept(new AsyncCallback(acceptCallback), mServerSocket); + mServerSocket.BeginAccept(new AsyncCallback(AcceptCallback), mServerSocket); } } - public static Actor getStaticActors(uint id) + public static Actor GetStaticActors(uint id) { - return mStaticActors.getActor(id); + return mStaticActors.GetActor(id); } - public static Actor getStaticActors(string name) + public static Actor GetStaticActors(string name) { - return mStaticActors.findStaticActor(name); + return mStaticActors.FindStaticActor(name); } - public static Item getItemGamedata(uint id) + public static Item GetItemGamedata(uint id) { if (gamedataItems.ContainsKey(id)) return gamedataItems[id]; @@ -204,7 +204,7 @@ namespace FFXIVClassic_Map_Server /// Receive Callback. Reads in incoming data, converting them to base packets. Base packets are sent to be parsed. If not enough data at the end to build a basepacket, move to the beginning and prepend. /// /// - private void receiveCallback(IAsyncResult result) + private void ReceiveCallback(IAsyncResult result) { ClientConnection conn = (ClientConnection)result.AsyncState; @@ -218,7 +218,7 @@ namespace FFXIVClassic_Map_Server mConnectionList.Remove(conn); } if (conn.connType == BasePacket.TYPE_ZONE) - Program.Log.Info("{0} has disconnected.", conn.owner == 0 ? conn.getAddress() : "User " + conn.owner); + Program.Log.Info("{0} has disconnected.", conn.owner == 0 ? conn.GetAddress() : "User " + conn.owner); return; } @@ -235,13 +235,13 @@ namespace FFXIVClassic_Map_Server //Build packets until can no longer or out of data while (true) { - BasePacket basePacket = buildPacket(ref offset, conn.buffer, bytesRead); + BasePacket basePacket = BuildPacket(ref offset, conn.buffer, bytesRead); //If can't build packet, break, else process another if (basePacket == null) break; else - mProcessor.processPacket(conn, basePacket); + mProcessor.ProcessPacket(conn, basePacket); } //Not all bytes consumed, transfer leftover to beginning @@ -251,18 +251,18 @@ namespace FFXIVClassic_Map_Server conn.lastPartialSize = bytesRead - offset; //Build any queued subpackets into basepackets and send - conn.flushQueuedSendPackets(); + conn.FlushQueuedSendPackets(); if (offset < bytesRead) //Need offset since not all bytes consumed - conn.socket.BeginReceive(conn.buffer, bytesRead - offset, conn.buffer.Length - (bytesRead - offset), SocketFlags.None, new AsyncCallback(receiveCallback), conn); + conn.socket.BeginReceive(conn.buffer, bytesRead - offset, conn.buffer.Length - (bytesRead - offset), SocketFlags.None, new AsyncCallback(ReceiveCallback), conn); else //All bytes consumed, full buffer available - conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(receiveCallback), conn); + conn.socket.BeginReceive(conn.buffer, 0, conn.buffer.Length, SocketFlags.None, new AsyncCallback(ReceiveCallback), conn); } else { - Program.Log.Info("{0} has disconnected.", conn.owner == 0 ? conn.getAddress() : "User " + conn.owner); + Program.Log.Info("{0} has disconnected.", conn.owner == 0 ? conn.GetAddress() : "User " + conn.owner); lock (mConnectionList) { @@ -274,7 +274,7 @@ namespace FFXIVClassic_Map_Server { if (conn.socket != null) { - Program.Log.Info("{0} has disconnected.", conn.owner == 0 ? conn.getAddress() : "User " + conn.owner); + Program.Log.Info("{0} has disconnected.", conn.owner == 0 ? conn.GetAddress() : "User " + conn.owner); lock (mConnectionList) { @@ -290,7 +290,7 @@ namespace FFXIVClassic_Map_Server /// Current offset in buffer. /// Incoming buffer. /// Returns either a BasePacket or null if not enough data. - public BasePacket buildPacket(ref int offset, byte[] buffer, int bytesRead) + public BasePacket BuildPacket(ref int offset, byte[] buffer, int bytesRead) { BasePacket newPacket = null; @@ -327,7 +327,7 @@ namespace FFXIVClassic_Map_Server return mWorldManager; } - public Dictionary getConnectedPlayerList() + public Dictionary GetConnectedPlayerList() { return mConnectedPlayerList; } diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs index 1353c440..e0cbb995 100644 --- a/FFXIVClassic Map Server/WorldManager.cs +++ b/FFXIVClassic Map Server/WorldManager.cs @@ -106,7 +106,7 @@ namespace FFXIVClassic_Map_Server { Zone parent = zoneList[parentZoneId]; PrivateArea privArea = new PrivateArea(parent, reader.GetUInt32("id"), reader.GetString("className"), reader.GetString("privateAreaName"), reader.GetUInt16("dayMusic"), reader.GetUInt16("nightMusic"), reader.GetUInt16("battleMusic")); - parent.addPrivateArea(privArea); + parent.AddPrivateArea(privArea); } else continue; @@ -224,7 +224,7 @@ namespace FFXIVClassic_Map_Server if (!reader.IsDBNull(12)) { string eventConditions = reader.GetString(12); - npc.loadEventConditions(eventConditions); + npc.LoadEventConditions(eventConditions); } if (!zoneList.ContainsKey(npc.zoneId)) @@ -233,7 +233,7 @@ namespace FFXIVClassic_Map_Server if (zone == null) continue; npc.zone = zone; - zone.addActorToZone(npc); + zone.AddActorToZone(npc); count++; } @@ -297,7 +297,7 @@ namespace FFXIVClassic_Map_Server if (!reader.IsDBNull(12)) { string eventConditions = reader.GetString(12); - npc.loadEventConditions(eventConditions); + npc.LoadEventConditions(eventConditions); } if (!zoneList.ContainsKey(npc.zoneId)) @@ -306,7 +306,7 @@ namespace FFXIVClassic_Map_Server if (zone == null) continue; npc.zone = zone; - zone.addActorToZone(npc); + zone.AddActorToZone(npc); count++; } @@ -326,7 +326,7 @@ namespace FFXIVClassic_Map_Server Program.Log.Info("Loaded {0} npc(s).", count); } - //Moves the actor to the new zone if exists. No packets are sent nor position changed. + //Moves the actor to the new zone if exists. No packets are sent nor position Changed. public void DoSeamlessZoneChange(Player player, uint destinationZoneId) { Area oldZone; @@ -334,19 +334,19 @@ namespace FFXIVClassic_Map_Server if (player.zone != null) { oldZone = player.zone; - oldZone.removeActorFromZone(player); + oldZone.RemoveActorFromZone(player); } //Add player to new zone and update Zone newZone = GetZone(destinationZoneId); - //This server does not contain that zoneId + //This server Does not contain that zoneId if (newZone == null) return; - newZone.addActorToZone(player); + newZone.AddActorToZone(player); - LuaEngine.onZoneIn(player); + LuaEngine.OnZoneIn(player); } //Moves actor to new zone, and sends packets to spawn at the given zone entrance @@ -371,7 +371,7 @@ namespace FFXIVClassic_Map_Server if (player.zone != null) { oldZone = player.zone; - oldZone.removeActorFromZone(player); + oldZone.RemoveActorFromZone(player); } //Add player to new zone and update @@ -380,12 +380,12 @@ namespace FFXIVClassic_Map_Server if (destinationPrivateArea == null) newArea = GetZone(destinationZoneId); else - newArea = GetZone(destinationZoneId).getPrivateArea(destinationPrivateArea, 0); - //This server does not contain that zoneId + newArea = GetZone(destinationZoneId).GetPrivateArea(destinationPrivateArea, 0); + //This server Does not contain that zoneId if (newArea == null) return; - newArea.addActorToZone(player); + newArea.AddActorToZone(player); //Update player actor's properties player.zoneId = newArea.actorId; @@ -396,13 +396,13 @@ namespace FFXIVClassic_Map_Server player.rotation = spawnRotation; //Send packets - player.playerSession.queuePacket(DeleteAllActorsPacket.buildPacket(player.actorId), true, false); - player.playerSession.queuePacket(_0xE2Packet.buildPacket(player.actorId, 0x0), true, false); - player.sendZoneInPackets(this, spawnType); - player.playerSession.clearInstance(); - player.sendInstanceUpdate(); + player.playerSession.QueuePacket(DeleteAllActorsPacket.BuildPacket(player.actorId), true, false); + player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.actorId, 0x0), true, false); + player.SendZoneInPackets(this, spawnType); + player.playerSession.ClearInstance(); + player.SendInstanceUpdate(); - LuaEngine.onZoneIn(player); + LuaEngine.OnZoneIn(player); } //Moves actor within zone to spawn position @@ -428,8 +428,8 @@ namespace FFXIVClassic_Map_Server //Remove player from currentZone if transfer else it's login if (player.zone != null) { - player.zone.removeActorFromZone(player); - player.zone.addActorToZone(player); + player.zone.RemoveActorFromZone(player); + player.zone.AddActorToZone(player); //Update player actor's properties; player.positionX = spawnX; @@ -438,9 +438,9 @@ namespace FFXIVClassic_Map_Server player.rotation = spawnRotation; //Send packets - player.playerSession.queuePacket(_0xE2Packet.buildPacket(player.actorId, 0x0), true, false); - player.playerSession.queuePacket(player.createSpawnTeleportPacket(player.actorId, spawnType), true, false); - player.sendInstanceUpdate(); + player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.actorId, 0x0), true, false); + player.playerSession.QueuePacket(player.CreateSpawnTeleportPacket(player.actorId, spawnType), true, false); + player.SendInstanceUpdate(); } } @@ -451,31 +451,31 @@ namespace FFXIVClassic_Map_Server //Add player to new zone and update Zone zone = GetZone(player.zoneId); - //This server does not contain that zoneId + //This server Does not contain that zoneId if (zone == null) return; - //Set the current zone and add player + //Set the current zone and Add player player.zone = zone; - LuaEngine.onBeginLogin(player); + LuaEngine.OnBeginLogin(player); - zone.addActorToZone(player); + zone.AddActorToZone(player); //Send packets - player.sendZoneInPackets(this, 0x1); + player.SendZoneInPackets(this, 0x1); - LuaEngine.onLogin(player); - LuaEngine.onZoneIn(player); + LuaEngine.OnLogin(player); + LuaEngine.OnZoneIn(player); } - public void reloadZone(uint zoneId) + public void ReloadZone(uint zoneId) { if (!zoneList.ContainsKey(zoneId)) return; Zone zone = zoneList[zoneId]; - //zone.clear(); + //zone.Clear(); LoadNPCs(zone.actorId); } @@ -552,7 +552,7 @@ namespace FFXIVClassic_Map_Server } } - public ZoneEntrance getZoneEntrance(uint entranceId) + public ZoneEntrance GetZoneEntrance(uint entranceId) { if (zoneEntranceList.ContainsKey(entranceId)) return zoneEntranceList[entranceId]; diff --git a/FFXIVClassic Map Server/actors/Actor.cs b/FFXIVClassic Map Server/actors/Actor.cs index 18901a16..53e2c9b2 100644 --- a/FFXIVClassic Map Server/actors/Actor.cs +++ b/FFXIVClassic Map Server/actors/Actor.cs @@ -52,66 +52,66 @@ namespace FFXIVClassic_Map_Server.Actors this.moveSpeeds[3] = SetActorSpeedPacket.DEFAULT_RUN; } - public SubPacket createAddActorPacket(uint playerActorId, byte val) + public SubPacket CreateAddActorPacket(uint playerActorId, byte val) { - return AddActorPacket.buildPacket(actorId, playerActorId, val); + return AddActorPacket.BuildPacket(actorId, playerActorId, val); } - public SubPacket createNamePacket(uint playerActorId) + public SubPacket CreateNamePacket(uint playerActorId) { - return SetActorNamePacket.buildPacket(actorId, playerActorId, displayNameId, displayNameId == 0xFFFFFFFF | displayNameId == 0x0 ? customDisplayName : ""); + return SetActorNamePacket.BuildPacket(actorId, playerActorId, displayNameId, displayNameId == 0xFFFFFFFF | displayNameId == 0x0 ? customDisplayName : ""); } - public SubPacket createSpeedPacket(uint playerActorId) + public SubPacket CreateSpeedPacket(uint playerActorId) { - return SetActorSpeedPacket.buildPacket(actorId, playerActorId); + return SetActorSpeedPacket.BuildPacket(actorId, playerActorId); } - public SubPacket createSpawnPositonPacket(uint playerActorId, uint spawnType) + public SubPacket CreateSpawnPositonPacket(uint playerActorId, uint spawnType) { SubPacket spawnPacket; if (!spawnedFirstTime && playerActorId == actorId) - spawnPacket = SetActorPositionPacket.buildPacket(actorId, playerActorId, 0, positionX, positionY, positionZ, rotation, 0x1, false); + spawnPacket = SetActorPositionPacket.BuildPacket(actorId, playerActorId, 0, positionX, positionY, positionZ, rotation, 0x1, false); else if (playerActorId == actorId) - spawnPacket = SetActorPositionPacket.buildPacket(actorId, playerActorId, 0xFFFFFFFF, positionX, positionY, positionZ, rotation, spawnType, true); + spawnPacket = SetActorPositionPacket.BuildPacket(actorId, playerActorId, 0xFFFFFFFF, positionX, positionY, positionZ, rotation, spawnType, true); else { if (this is Player) - spawnPacket = SetActorPositionPacket.buildPacket(actorId, playerActorId, 0, positionX, positionY, positionZ, rotation, spawnType, false); + spawnPacket = SetActorPositionPacket.BuildPacket(actorId, playerActorId, 0, positionX, positionY, positionZ, rotation, spawnType, false); else - spawnPacket = SetActorPositionPacket.buildPacket(actorId, playerActorId, actorId, positionX, positionY, positionZ, rotation, spawnType, false); + spawnPacket = SetActorPositionPacket.BuildPacket(actorId, playerActorId, actorId, positionX, positionY, positionZ, rotation, spawnType, false); } - //return SetActorPositionPacket.buildPacket(actorId, playerActorId, -211.895477f, 190.000000f, 29.651011f, 2.674819f, SetActorPositionPacket.SPAWNTYPE_PLAYERWAKE); + //return SetActorPositionPacket.BuildPacket(actorId, playerActorId, -211.895477f, 190.000000f, 29.651011f, 2.674819f, SetActorPositionPacket.SPAWNTYPE_PLAYERWAKE); spawnedFirstTime = true; return spawnPacket; } - public SubPacket createSpawnTeleportPacket(uint playerActorId, uint spawnType) + public SubPacket CreateSpawnTeleportPacket(uint playerActorId, uint spawnType) { SubPacket spawnPacket; - spawnPacket = SetActorPositionPacket.buildPacket(actorId, playerActorId, 0xFFFFFFFF, positionX, positionY, positionZ, rotation, spawnType, false); + spawnPacket = SetActorPositionPacket.BuildPacket(actorId, playerActorId, 0xFFFFFFFF, positionX, positionY, positionZ, rotation, spawnType, false); - //return SetActorPositionPacket.buildPacket(actorId, playerActorId, -211.895477f, 190.000000f, 29.651011f, 2.674819f, SetActorPositionPacket.SPAWNTYPE_PLAYERWAKE); + //return SetActorPositionPacket.BuildPacket(actorId, playerActorId, -211.895477f, 190.000000f, 29.651011f, 2.674819f, SetActorPositionPacket.SPAWNTYPE_PLAYERWAKE); - spawnPacket.debugPrintSubPacket(); + spawnPacket.DebugPrintSubPacket(); return spawnPacket; } - public SubPacket createPositionUpdatePacket(uint playerActorId) + public SubPacket CreatePositionUpdatePacket(uint playerActorId) { - return MoveActorToPositionPacket.buildPacket(actorId, playerActorId, positionX, positionY, positionZ, rotation, moveState); + return MoveActorToPositionPacket.BuildPacket(actorId, playerActorId, positionX, positionY, positionZ, rotation, moveState); } - public SubPacket createStatePacket(uint playerActorID) + public SubPacket CreateStatePacket(uint playerActorID) { - return SetActorStatePacket.buildPacket(actorId, playerActorID, currentMainState, currentSubState); + return SetActorStatePacket.BuildPacket(actorId, playerActorID, currentMainState, currentSubState); } - public List getEventConditionPackets(uint playerActorId) + public List GetEventConditionPackets(uint playerActorId) { List subpackets = new List(); @@ -122,126 +122,126 @@ namespace FFXIVClassic_Map_Server.Actors if (eventConditions.talkEventConditions != null) { foreach (EventList.TalkEventCondition condition in eventConditions.talkEventConditions) - subpackets.Add(SetTalkEventCondition.buildPacket(playerActorId, actorId, condition)); + subpackets.Add(SetTalkEventCondition.BuildPacket(playerActorId, actorId, condition)); } if (eventConditions.noticeEventConditions != null) { foreach (EventList.NoticeEventCondition condition in eventConditions.noticeEventConditions) - subpackets.Add(SetNoticeEventCondition.buildPacket(playerActorId, actorId, condition)); + subpackets.Add(SetNoticeEventCondition.BuildPacket(playerActorId, actorId, condition)); } if (eventConditions.emoteEventConditions != null) { foreach (EventList.EmoteEventCondition condition in eventConditions.emoteEventConditions) - subpackets.Add(SetEmoteEventCondition.buildPacket(playerActorId, actorId, condition)); + subpackets.Add(SetEmoteEventCondition.BuildPacket(playerActorId, actorId, condition)); } if (eventConditions.pushWithCircleEventConditions != null) { foreach (EventList.PushCircleEventCondition condition in eventConditions.pushWithCircleEventConditions) - subpackets.Add(SetPushEventConditionWithCircle.buildPacket(playerActorId, actorId, condition)); + subpackets.Add(SetPushEventConditionWithCircle.BuildPacket(playerActorId, actorId, condition)); } if (eventConditions.pushWithFanEventConditions != null) { foreach (EventList.PushFanEventCondition condition in eventConditions.pushWithFanEventConditions) - subpackets.Add(SetPushEventConditionWithFan.buildPacket(playerActorId, actorId, condition)); + subpackets.Add(SetPushEventConditionWithFan.BuildPacket(playerActorId, actorId, condition)); } if (eventConditions.pushWithBoxEventConditions != null) { foreach (EventList.PushBoxEventCondition condition in eventConditions.pushWithBoxEventConditions) - subpackets.Add(SetPushEventConditionWithTriggerBox.buildPacket(playerActorId, actorId, condition)); + subpackets.Add(SetPushEventConditionWithTriggerBox.BuildPacket(playerActorId, actorId, condition)); } return subpackets; } - public BasePacket getSetEventStatusPackets(uint playerActorId) + public BasePacket GetSetEventStatusPackets(uint playerActorId) { List subpackets = new List(); //Return empty list if (eventConditions == null) - return BasePacket.createPacket(subpackets, true, false); + return BasePacket.CreatePacket(subpackets, true, false); if (eventConditions.talkEventConditions != null) { foreach (EventList.TalkEventCondition condition in eventConditions.talkEventConditions) - subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, true, 1, condition.conditionName)); + subpackets.Add(SetEventStatus.BuildPacket(playerActorId, actorId, true, 1, condition.conditionName)); } if (eventConditions.noticeEventConditions != null) { foreach (EventList.NoticeEventCondition condition in eventConditions.noticeEventConditions) - subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, true, 1, condition.conditionName)); + subpackets.Add(SetEventStatus.BuildPacket(playerActorId, actorId, true, 1, condition.conditionName)); } if (eventConditions.emoteEventConditions != null) { foreach (EventList.EmoteEventCondition condition in eventConditions.emoteEventConditions) - subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, true, 3, condition.conditionName)); + subpackets.Add(SetEventStatus.BuildPacket(playerActorId, actorId, true, 3, condition.conditionName)); } if (eventConditions.pushWithCircleEventConditions != null) { foreach (EventList.PushCircleEventCondition condition in eventConditions.pushWithCircleEventConditions) - subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, true, 2, condition.conditionName)); + subpackets.Add(SetEventStatus.BuildPacket(playerActorId, actorId, true, 2, condition.conditionName)); } if (eventConditions.pushWithFanEventConditions != null) { foreach (EventList.PushFanEventCondition condition in eventConditions.pushWithFanEventConditions) - subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, true, 2, condition.conditionName)); + subpackets.Add(SetEventStatus.BuildPacket(playerActorId, actorId, true, 2, condition.conditionName)); } if (eventConditions.pushWithBoxEventConditions != null) { foreach (EventList.PushBoxEventCondition condition in eventConditions.pushWithBoxEventConditions) - subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, true, 2, condition.conditionName)); + subpackets.Add(SetEventStatus.BuildPacket(playerActorId, actorId, true, 2, condition.conditionName)); } - return BasePacket.createPacket(subpackets, true, false); + return BasePacket.CreatePacket(subpackets, true, false); } - public SubPacket createIsZoneingPacket(uint playerActorId) + public SubPacket CreateIsZoneingPacket(uint playerActorId) { - return SetActorIsZoningPacket.buildPacket(actorId, playerActorId, false); + return SetActorIsZoningPacket.BuildPacket(actorId, playerActorId, false); } - public virtual SubPacket createScriptBindPacket(uint playerActorId) + public virtual SubPacket CreateScriptBindPacket(uint playerActorId) { - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, classParams); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, classParams); } - public virtual BasePacket getSpawnPackets(uint playerActorId) + public virtual BasePacket GetSpawnPackets(uint playerActorId) { - return getSpawnPackets(playerActorId, 0x1); + return GetSpawnPackets(playerActorId, 0x1); } - public virtual BasePacket getSpawnPackets(uint playerActorId, uint spawnType) + public virtual BasePacket GetSpawnPackets(uint playerActorId, uint spawnType) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 8)); - subpackets.AddRange(getEventConditionPackets(playerActorId)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, spawnType)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 8)); + subpackets.AddRange(GetEventConditionPackets(playerActorId)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, spawnType)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } - public virtual BasePacket getInitPackets(uint playerActorId) + public virtual BasePacket GetInitPackets(uint playerActorId) { SetActorPropetyPacket initProperties = new SetActorPropetyPacket("/_init"); - initProperties.addByte(0xE14B0CA8, 1); - initProperties.addByte(0x2138FD71, 1); - initProperties.addByte(0xFBFBCFB1, 1); - initProperties.addTarget(); - return BasePacket.createPacket(initProperties.buildPacket(playerActorId, actorId), true, false); + initProperties.AddByte(0xE14B0CA8, 1); + initProperties.AddByte(0x2138FD71, 1); + initProperties.AddByte(0xFBFBCFB1, 1); + initProperties.AddTarget(); + return BasePacket.CreatePacket(initProperties.BuildPacket(playerActorId, actorId), true, false); } public override bool Equals(Object obj) @@ -253,50 +253,50 @@ namespace FFXIVClassic_Map_Server.Actors return actorId == actorObj.actorId; } - public string getName() + public string GetName() { return actorName; } - public string getClassName() + public string GetClassName() { return className; } - public ushort getState() + public ushort GetState() { return currentMainState; } - public List getLuaParams() + public List GetLuaParams() { return classParams; } - public void changeState(ushort newState) + public void ChangeState(ushort newState) { currentMainState = newState; - SubPacket changeStatePacket = SetActorStatePacket.buildPacket(actorId, actorId, newState, currentSubState); - SubPacket battleActionPacket = BattleAction1Packet.buildPacket(actorId, actorId); - zone.broadcastPacketAroundActor(this, changeStatePacket); - zone.broadcastPacketAroundActor(this, battleActionPacket); + SubPacket ChangeStatePacket = SetActorStatePacket.BuildPacket(actorId, actorId, newState, currentSubState); + SubPacket battleActionPacket = BattleAction1Packet.BuildPacket(actorId, actorId); + zone.BroadcastPacketAroundActor(this, ChangeStatePacket); + zone.BroadcastPacketAroundActor(this, battleActionPacket); } - public void changeSpeed(int type, float value) + public void ChangeSpeed(int type, float value) { moveSpeeds[type] = value; - SubPacket changeSpeedPacket = SetActorSpeedPacket.buildPacket(actorId, actorId, moveSpeeds[0], moveSpeeds[1], moveSpeeds[2]); - zone.broadcastPacketAroundActor(this, changeSpeedPacket); + SubPacket ChangeSpeedPacket = SetActorSpeedPacket.BuildPacket(actorId, actorId, moveSpeeds[0], moveSpeeds[1], moveSpeeds[2]); + zone.BroadcastPacketAroundActor(this, ChangeSpeedPacket); } - public void changeSpeed(float speedStop, float speedWalk, float speedRun) + public void ChangeSpeed(float speedStop, float speedWalk, float speedRun) { moveSpeeds[0] = speedStop; moveSpeeds[1] = speedWalk; moveSpeeds[2] = speedRun; moveSpeeds[3] = speedRun; - SubPacket changeSpeedPacket = SetActorSpeedPacket.buildPacket(actorId, actorId, moveSpeeds[0], moveSpeeds[1], moveSpeeds[2]); - zone.broadcastPacketAroundActor(this, changeSpeedPacket); + SubPacket ChangeSpeedPacket = SetActorSpeedPacket.BuildPacket(actorId, actorId, moveSpeeds[0], moveSpeeds[1], moveSpeeds[2]); + zone.BroadcastPacketAroundActor(this, ChangeSpeedPacket); } } diff --git a/FFXIVClassic Map Server/actors/StaticActors.cs b/FFXIVClassic Map Server/actors/StaticActors.cs index 8cee5340..998cdb06 100644 --- a/FFXIVClassic Map Server/actors/StaticActors.cs +++ b/FFXIVClassic Map Server/actors/StaticActors.cs @@ -18,7 +18,7 @@ namespace FFXIVClassic_Map_Server.Actors if (data[0] == 's' && data[1] == 'a' && data[2] == 'n' && data[3] == 'e') data = DecryptStaticActorsFile(data); - loadStaticActors(data); + LoadStaticActors(data); } private byte[] DecryptStaticActorsFile(byte[] encoded) @@ -50,7 +50,7 @@ namespace FFXIVClassic_Map_Server.Actors return decoded; } - private bool loadStaticActors(byte[] data) + private bool LoadStaticActors(byte[] data) { try { @@ -61,7 +61,7 @@ namespace FFXIVClassic_Map_Server.Actors while (binReader.BaseStream.Position != binReader.BaseStream.Length) { - uint id = Utils.swapEndian(binReader.ReadUInt32()) | 0xA0F00000; + uint id = Utils.SwapEndian(binReader.ReadUInt32()) | 0xA0F00000; List list = new List(); byte readByte; @@ -96,12 +96,12 @@ namespace FFXIVClassic_Map_Server.Actors return true; } - public bool exists(uint actorId) + public bool Exists(uint actorId) { return mStaticActors[actorId] != null; } - public Actor findStaticActor(string name) + public Actor FindStaticActor(string name) { foreach (Actor a in mStaticActors.Values) { @@ -112,7 +112,7 @@ namespace FFXIVClassic_Map_Server.Actors return null; } - public Actor getActor(uint actorId) + public Actor GetActor(uint actorId) { if (mStaticActors.ContainsKey(actorId)) return mStaticActors[actorId]; diff --git a/FFXIVClassic Map Server/actors/area/Area.cs b/FFXIVClassic Map Server/actors/area/Area.cs index def0b87d..9d66bc23 100644 --- a/FFXIVClassic Map Server/actors/area/Area.cs +++ b/FFXIVClassic Map Server/actors/area/Area.cs @@ -65,29 +65,29 @@ namespace FFXIVClassic_Map_Server.Actors } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList(classPath, false, true, zoneName, "/Area/Zone/ZoneDefault", -1, (byte)1, true, false, false, false, false, false, false, false); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, "ZoneDefault", lParams); + lParams = LuaUtils.CreateLuaParamList(classPath, false, true, zoneName, "/Area/Zone/ZoneDefault", -1, (byte)1, true, false, false, false, false, false, false, false); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, "ZoneDefault", lParams); } - public override BasePacket getSpawnPackets(uint playerActorId) + public override BasePacket GetSpawnPackets(uint playerActorId) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 0)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, 0x1)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 0)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, 0x1)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } #region Actor Management - public void addActorToZone(Actor actor) + public void AddActorToZone(Actor actor) { if (!mActorList.ContainsKey(actor.actorId)) mActorList.Add(actor.actorId, actor); @@ -112,7 +112,7 @@ namespace FFXIVClassic_Map_Server.Actors mActorBlock[gridX, gridY].Add(actor); } - public void removeActorFromZone(Actor actor) + public void RemoveActorFromZone(Actor actor) { mActorList.Remove(actor.actorId); @@ -136,7 +136,7 @@ namespace FFXIVClassic_Map_Server.Actors mActorBlock[gridX, gridY].Remove(actor); } - public void updateActorPosition(Actor actor) + public void UpdateActorPosition(Actor actor) { int gridX = (int)actor.positionX / boundingGridSize; int gridY = (int)actor.positionZ / boundingGridSize; @@ -181,7 +181,7 @@ namespace FFXIVClassic_Map_Server.Actors } } - public List getActorsAroundPoint(float x, float y, int checkDistance) + public List GetActorsAroundPoint(float x, float y, int checkDistance) { checkDistance /= boundingGridSize; @@ -224,7 +224,7 @@ namespace FFXIVClassic_Map_Server.Actors return result; } - public List getActorsAroundActor(Actor actor, int checkDistance) + public List GetActorsAroundActor(Actor actor, int checkDistance) { checkDistance /= boundingGridSize; @@ -296,7 +296,7 @@ namespace FFXIVClassic_Map_Server.Actors return (Player)mActorList[id]; } - public void clear() + public void Clear() { //Clear All mActorList.Clear(); @@ -309,12 +309,12 @@ namespace FFXIVClassic_Map_Server.Actors } } - public void broadcastPacketAroundActor(Actor actor, SubPacket packet) + public void BroadcastPacketAroundActor(Actor actor, SubPacket packet) { if (isIsolated) return; - List aroundActor = getActorsAroundActor(actor, 50); + List aroundActor = GetActorsAroundActor(actor, 50); foreach (Actor a in aroundActor) { if (a is Player) @@ -324,7 +324,7 @@ namespace FFXIVClassic_Map_Server.Actors SubPacket clonedPacket = new SubPacket(packet, actor.actorId); Player p = (Player)a; - p.queuePacket(clonedPacket); + p.QueuePacket(clonedPacket); } } } diff --git a/FFXIVClassic Map Server/actors/area/PrivateArea.cs b/FFXIVClassic Map Server/actors/area/PrivateArea.cs index 1858076e..997adb2c 100644 --- a/FFXIVClassic Map Server/actors/area/PrivateArea.cs +++ b/FFXIVClassic Map Server/actors/area/PrivateArea.cs @@ -18,17 +18,17 @@ namespace FFXIVClassic_Map_Server.actors.area this.privateAreaName = privateAreaName; } - public string getPrivateAreaName() + public string GetPrivateAreaName() { return privateAreaName; } - public Zone getParentZone() + public Zone GetParentZone() { return parentZone; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; @@ -37,9 +37,9 @@ namespace FFXIVClassic_Map_Server.actors.area if (className.ToLower().Contains("content")) path = "Content/" + className; - lParams = LuaUtils.createLuaParamList("/Area/PrivateArea/" + path, false, true, zoneName, privateAreaName, 0x9E, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, false, false, false); - ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams).debugPrintSubPacket(); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Area/PrivateArea/" + path, false, true, zoneName, privateAreaName, 0x9E, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, false, false, false); + ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams).DebugPrintSubPacket(); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } } diff --git a/FFXIVClassic Map Server/actors/area/Zone.cs b/FFXIVClassic Map Server/actors/area/Zone.cs index 78bb4d25..24e8fa0a 100644 --- a/FFXIVClassic Map Server/actors/area/Zone.cs +++ b/FFXIVClassic Map Server/actors/area/Zone.cs @@ -16,18 +16,18 @@ namespace FFXIVClassic_Map_Server.actors.area } - public void addPrivateArea(PrivateArea pa) + public void AddPrivateArea(PrivateArea pa) { - if (privateAreas.ContainsKey(pa.getPrivateAreaName())) - privateAreas[pa.getPrivateAreaName()][0] = pa; + if (privateAreas.ContainsKey(pa.GetPrivateAreaName())) + privateAreas[pa.GetPrivateAreaName()][0] = pa; else { - privateAreas[pa.getPrivateAreaName()] = new Dictionary(); - privateAreas[pa.getPrivateAreaName()][0] = pa; + privateAreas[pa.GetPrivateAreaName()] = new Dictionary(); + privateAreas[pa.GetPrivateAreaName()][0] = pa; } } - public PrivateArea getPrivateArea(string type, uint number) + public PrivateArea GetPrivateArea(string type, uint number) { if (privateAreas.ContainsKey(type)) { @@ -41,13 +41,13 @@ namespace FFXIVClassic_Map_Server.actors.area return null; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { bool isEntranceDesion = false; List lParams; - lParams = LuaUtils.createLuaParamList("/Area/Zone/" + className, false, true, zoneName, "", -1, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, true, isInstanceRaid, isEntranceDesion); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Area/Zone/" + className, false, true, zoneName, "", -1, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, true, isInstanceRaid, isEntranceDesion); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } } diff --git a/FFXIVClassic Map Server/actors/chara/Character.cs b/FFXIVClassic Map Server/actors/chara/Character.cs index 5766b9b5..ddde616c 100644 --- a/FFXIVClassic Map Server/actors/chara/Character.cs +++ b/FFXIVClassic Map Server/actors/chara/Character.cs @@ -55,30 +55,30 @@ namespace FFXIVClassic_Map_Server.Actors charaWork.statusShownTime[i] = 0xFFFFFFFF; } - public SubPacket createAppearancePacket(uint playerActorId) + public SubPacket CreateAppearancePacket(uint playerActorId) { SetActorAppearancePacket setappearance = new SetActorAppearancePacket(modelId, appearanceIds); - return setappearance.buildPacket(actorId, playerActorId); + return setappearance.BuildPacket(actorId, playerActorId); } - public SubPacket createInitStatusPacket(uint playerActorId) + public SubPacket CreateInitStatusPacket(uint playerActorId) { - return (SetActorStatusAllPacket.buildPacket(actorId, playerActorId, charaWork.status)); + return (SetActorStatusAllPacket.BuildPacket(actorId, playerActorId, charaWork.status)); } - public SubPacket createSetActorIconPacket(uint playerActorId) + public SubPacket CreateSetActorIconPacket(uint playerActorId) { - return SetActorIconPacket.buildPacket(actorId, playerActorId, currentActorIcon); + return SetActorIconPacket.BuildPacket(actorId, playerActorId, currentActorIcon); } - public SubPacket createIdleAnimationPacket(uint playerActorId) + public SubPacket CreateIdleAnimationPacket(uint playerActorId) { - return SetActorIdleAnimationPacket.buildPacket(actorId, playerActorId, animationId); + return SetActorIdleAnimationPacket.BuildPacket(actorId, playerActorId, animationId); } - public void setQuestGraphic(Player player, int graphicNum) + public void SetQuestGraphic(Player player, int graphicNum) { - player.queuePacket(SetActorQuestGraphicPacket.buildPacket(player.actorId, actorId, graphicNum)); + player.QueuePacket(SetActorQuestGraphicPacket.BuildPacket(player.actorId, actorId, graphicNum)); } } diff --git a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs index c8297e2f..83e10097 100644 --- a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs +++ b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs @@ -35,7 +35,7 @@ namespace FFXIVClassic_Map_Server.Actors this.zoneId = zoneId; - loadNpcTemplate(id); + LoadNpcTemplate(id); charaWork.battleSave.potencial = 1.0f; @@ -58,47 +58,47 @@ namespace FFXIVClassic_Map_Server.Actors charaWork.property[4] = 1; } - public SubPacket createAddActorPacket(uint playerActorId) + public SubPacket CreateAddActorPacket(uint playerActorId) { - return AddActorPacket.buildPacket(actorId, playerActorId, 8); + return AddActorPacket.BuildPacket(actorId, playerActorId, 8); } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; Player player = Server.GetWorldManager().GetPCInWorld(playerActorId); - lParams = LuaEngine.doActorInstantiate(player, this); + lParams = LuaEngine.DoActorInstantiate(player, this); if (lParams == null) { className = "PopulaceStandard"; - lParams = LuaUtils.createLuaParamList("/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, 0xF47F6, false, false, 0, 1, "TEST"); + lParams = LuaUtils.CreateLuaParamList("/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, 0xF47F6, false, false, 0, 1, "TEST"); } - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } - public override BasePacket getSpawnPackets(uint playerActorId, uint spawnType) + public override BasePacket GetSpawnPackets(uint playerActorId, uint spawnType) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId)); - subpackets.AddRange(getEventConditionPackets(playerActorId)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, 0x0)); - subpackets.Add(createAppearancePacket(playerActorId)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIdleAnimationPacket(playerActorId)); - subpackets.Add(createInitStatusPacket(playerActorId)); - subpackets.Add(createSetActorIconPacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); + subpackets.Add(CreateAddActorPacket(playerActorId)); + subpackets.AddRange(GetEventConditionPackets(playerActorId)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, 0x0)); + subpackets.Add(CreateAppearancePacket(playerActorId)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIdleAnimationPacket(playerActorId)); + subpackets.Add(CreateInitStatusPacket(playerActorId)); + subpackets.Add(CreateSetActorIconPacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + return BasePacket.CreatePacket(subpackets, true, false); } - public override BasePacket getInitPackets(uint playerActorId) + public override BasePacket GetInitPackets(uint playerActorId) { ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("/_init", this, playerActorId); @@ -106,52 +106,52 @@ namespace FFXIVClassic_Map_Server.Actors for (int i = 0; i < charaWork.property.Length; i++) { if (charaWork.property[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.property[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.property[{0}]", i)); } //Parameters - propPacketUtil.addProperty("charaWork.parameterSave.hp[0]"); - propPacketUtil.addProperty("charaWork.parameterSave.hpMax[0]"); - propPacketUtil.addProperty("charaWork.parameterSave.mp"); - propPacketUtil.addProperty("charaWork.parameterSave.mpMax"); - propPacketUtil.addProperty("charaWork.parameterTemp.tp"); + propPacketUtil.AddProperty("charaWork.parameterSave.hp[0]"); + propPacketUtil.AddProperty("charaWork.parameterSave.hpMax[0]"); + propPacketUtil.AddProperty("charaWork.parameterSave.mp"); + propPacketUtil.AddProperty("charaWork.parameterSave.mpMax"); + propPacketUtil.AddProperty("charaWork.parameterTemp.tp"); if (charaWork.parameterSave.state_mainSkill[0] != 0) - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkill[0]"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[0]"); if (charaWork.parameterSave.state_mainSkill[1] != 0) - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkill[1]"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[1]"); if (charaWork.parameterSave.state_mainSkill[2] != 0) - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkill[2]"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[2]"); if (charaWork.parameterSave.state_mainSkill[3] != 0) - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkill[3]"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[3]"); - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkillLevel"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkillLevel"); //Status Times for (int i = 0; i < charaWork.statusShownTime.Length; i++) { if (charaWork.statusShownTime[i] != 0xFFFFFFFF) - propPacketUtil.addProperty(String.Format("charaWork.statusShownTime[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.statusShownTime[{0}]", i)); } //General Parameters for (int i = 3; i < charaWork.battleTemp.generalParameter.Length; i++) { if (charaWork.battleTemp.generalParameter[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.battleTemp.generalParameter[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.battleTemp.generalParameter[{0}]", i)); } - propPacketUtil.addProperty("npcWork.hateType"); + propPacketUtil.AddProperty("npcWork.hateType"); - return BasePacket.createPacket(propPacketUtil.done(), true, false); + return BasePacket.CreatePacket(propPacketUtil.Done(), true, false); } - public uint getActorClassId() + public uint GetActorClassId() { return actorClassId; } - public void loadNpcTemplate(uint id) + public void LoadNpcTemplate(uint id) { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) { @@ -216,7 +216,7 @@ namespace FFXIVClassic_Map_Server.Actors modelId = reader.GetUInt32(0); appearanceIds[Character.SIZE] = reader.GetUInt32(1); appearanceIds[Character.COLORINFO] = (uint)(reader.GetUInt32(16) | (reader.GetUInt32(15) << 10) | (reader.GetUInt32(17) << 20)); //17 - Skin Color, 16 - Hair Color, 18 - Eye Color - appearanceIds[Character.FACEINFO] = PrimitiveConversion.ToUInt32(CharacterUtils.getFaceInfo(reader.GetByte(6), reader.GetByte(7), reader.GetByte(5), reader.GetByte(14), reader.GetByte(13), reader.GetByte(12), reader.GetByte(11), reader.GetByte(10), reader.GetByte(9), reader.GetByte(8))); + appearanceIds[Character.FACEINFO] = PrimitiveConversion.ToUInt32(CharacterUtils.GetFaceInfo(reader.GetByte(6), reader.GetByte(7), reader.GetByte(5), reader.GetByte(14), reader.GetByte(13), reader.GetByte(12), reader.GetByte(11), reader.GetByte(10), reader.GetByte(9), reader.GetByte(8))); appearanceIds[Character.HIGHLIGHT_HAIR] = (uint)(reader.GetUInt32(3) | reader.GetUInt32(2) << 10); //5- Hair Highlight, 4 - Hair Style appearanceIds[Character.VOICE] = reader.GetUInt32(17); appearanceIds[Character.MAINHAND] = reader.GetUInt32(19); @@ -247,7 +247,7 @@ namespace FFXIVClassic_Map_Server.Actors } } - public void loadEventConditions(string eventConditions) + public void LoadEventConditions(string eventConditions) { EventList conditions = JsonConvert.DeserializeObject(eventConditions); this.eventConditions = conditions; diff --git a/FFXIVClassic Map Server/actors/chara/player/Equipment.cs b/FFXIVClassic Map Server/actors/chara/player/Equipment.cs index 106f32af..ebe1f88d 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Equipment.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Equipment.cs @@ -64,40 +64,40 @@ namespace FFXIVClassic_Map_Server.actors.chara.player } } - toPlayer.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, toPlayer.actorId, 0x23, Inventory.EQUIPMENT_OTHERPLAYER)); + toPlayer.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, toPlayer.actorId, 0x23, Inventory.EQUIPMENT_OTHERPLAYER)); int currentIndex = 0; while (true) { if (items.Count - currentIndex >= 16) - toPlayer.queuePacket(InventoryListX16Packet.buildPacket(owner.actorId, toPlayer.actorId, items, ref currentIndex)); + toPlayer.QueuePacket(InventoryListX16Packet.BuildPacket(owner.actorId, toPlayer.actorId, items, ref currentIndex)); else if (items.Count - currentIndex > 1) - toPlayer.queuePacket(InventoryListX08Packet.buildPacket(owner.actorId, toPlayer.actorId, items, ref currentIndex)); + toPlayer.QueuePacket(InventoryListX08Packet.BuildPacket(owner.actorId, toPlayer.actorId, items, ref currentIndex)); else if (items.Count - currentIndex == 1) { - toPlayer.queuePacket(InventoryListX01Packet.buildPacket(owner.actorId, toPlayer.actorId, items[currentIndex])); + toPlayer.QueuePacket(InventoryListX01Packet.BuildPacket(owner.actorId, toPlayer.actorId, items[currentIndex])); currentIndex++; } else break; } - toPlayer.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId, toPlayer.actorId)); + toPlayer.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId, toPlayer.actorId)); } - public void SendFullEquipment(bool doClear) + public void SendFullEquipment(bool DoClear) { List slotsToUpdate = new List(); for (ushort i = 0; i < list.Length; i++) { - if (list[i] == null && doClear) + if (list[i] == null && DoClear) slotsToUpdate.Add(0); else if (list[i] != null) slotsToUpdate.Add(i); } - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); SendEquipmentPackets(slotsToUpdate); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); } public void SetEquipment(ushort[] slots, ushort[] itemSlots) @@ -107,18 +107,18 @@ namespace FFXIVClassic_Map_Server.actors.chara.player for (int i = 0; i < slots.Length; i++) { - InventoryItem item = normalInventory.getItemBySlot(itemSlots[i]); + InventoryItem item = normalInventory.GetItemBySlot(itemSlots[i]); if (item == null) continue; - Database.equipItem(owner, slots[i], item.uniqueId); - list[slots[i]] = normalInventory.getItemBySlot(itemSlots[i]); + Database.EquipItem(owner, slots[i], item.uniqueId); + list[slots[i]] = normalInventory.GetItemBySlot(itemSlots[i]); } - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); SendFullEquipment(false); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); } public void SetEquipment(InventoryItem[] toEquip) @@ -134,7 +134,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player public void Equip(ushort slot, ushort invSlot) { - InventoryItem item = normalInventory.getItemBySlot(invSlot); + InventoryItem item = normalInventory.GetItemBySlot(invSlot); if (item == null) return; @@ -148,20 +148,20 @@ namespace FFXIVClassic_Map_Server.actors.chara.player return; if (writeToDB) - Database.equipItem(owner, slot, item.uniqueId); + Database.EquipItem(owner, slot, item.uniqueId); - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); if (list[slot] != null) normalInventory.RefreshItem(list[slot], item); else normalInventory.RefreshItem(item); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); SendEquipmentPackets(slot, item); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); list[slot] = item; } @@ -177,17 +177,17 @@ namespace FFXIVClassic_Map_Server.actors.chara.player return; if (writeToDB) - Database.unequipItem(owner, slot); + Database.UnequipItem(owner, slot); - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); normalInventory.RefreshItem(list[slot]); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); SendEquipmentPackets(slot, null); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); list[slot] = null; } @@ -195,9 +195,9 @@ namespace FFXIVClassic_Map_Server.actors.chara.player private void SendEquipmentPackets(ushort equipSlot, InventoryItem item) { if (item == null) - owner.queuePacket(InventoryRemoveX01Packet.buildPacket(owner.actorId, equipSlot)); + owner.QueuePacket(InventoryRemoveX01Packet.BuildPacket(owner.actorId, equipSlot)); else - owner.queuePacket(EquipmentListX01Packet.buildPacket(owner.actorId, equipSlot, item.slot)); + owner.QueuePacket(EquipmentListX01Packet.BuildPacket(owner.actorId, equipSlot, item.slot)); } private void SendEquipmentPackets(List slotsToUpdate) @@ -208,16 +208,16 @@ namespace FFXIVClassic_Map_Server.actors.chara.player while (true) { if (slotsToUpdate.Count - currentIndex >= 64) - owner.queuePacket(EquipmentListX64Packet.buildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); + owner.QueuePacket(EquipmentListX64Packet.BuildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); else if (slotsToUpdate.Count - currentIndex >= 32) - owner.queuePacket(EquipmentListX32Packet.buildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); + owner.QueuePacket(EquipmentListX32Packet.BuildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); else if (slotsToUpdate.Count - currentIndex >= 16) - owner.queuePacket(EquipmentListX16Packet.buildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); + owner.QueuePacket(EquipmentListX16Packet.BuildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); else if (slotsToUpdate.Count - currentIndex > 1) - owner.queuePacket(EquipmentListX08Packet.buildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); + owner.QueuePacket(EquipmentListX08Packet.BuildPacket(owner.actorId, list, slotsToUpdate, ref currentIndex)); else if (slotsToUpdate.Count - currentIndex == 1) { - owner.queuePacket(EquipmentListX01Packet.buildPacket(owner.actorId, slotsToUpdate[currentIndex], list[slotsToUpdate[currentIndex]].slot)); + owner.QueuePacket(EquipmentListX01Packet.BuildPacket(owner.actorId, slotsToUpdate[currentIndex], list[slotsToUpdate[currentIndex]].slot)); currentIndex++; } else diff --git a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs index 855934b5..38ec5ffe 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs @@ -33,12 +33,12 @@ namespace FFXIVClassic_Map_Server.actors.chara.player } #region Inventory Management - public void initList(List itemsFromDB) + public void InitList(List itemsFromDB) { list = itemsFromDB; } - public InventoryItem getItemBySlot(ushort slot) + public InventoryItem GetItemBySlot(ushort slot) { if (slot < list.Count) return list[slot]; @@ -46,7 +46,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player return null; } - public InventoryItem getItemById(ulong itemId) + public InventoryItem GetItemById(ulong itemId) { foreach (InventoryItem item in list) { @@ -58,41 +58,41 @@ namespace FFXIVClassic_Map_Server.actors.chara.player public void RefreshItem(InventoryItem item) { - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(item); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + SendInventoryPackets(item); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); } public void RefreshItem(params InventoryItem[] items) { - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(items.ToList()); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + SendInventoryPackets(items.ToList()); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); } public void RefreshItem(List items) { - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(items); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + SendInventoryPackets(items); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); } - public void addItem(uint itemId) + public void AddItem(uint itemId) { - addItem(itemId, 1, 1); + AddItem(itemId, 1, 1); } - public void addItem(uint itemId, int quantity) + public void AddItem(uint itemId, int quantity) { - addItem(itemId, quantity, 1); + AddItem(itemId, quantity, 1); } - public void addItem(uint itemId, int quantity, byte quality) + public void AddItem(uint itemId, int quantity, byte quality) { - if (!isSpaceForAdd(itemId, quantity)) + if (!IsSpaceForAdd(itemId, quantity)) return; - Item gItem = Server.getItemGamedata(itemId); + Item gItem = Server.GetItemGamedata(itemId); List slotsToUpdate = new List(); List addItemPackets = new List(); @@ -121,73 +121,73 @@ namespace FFXIVClassic_Map_Server.actors.chara.player // return ITEMERROR_FULL; //Update lists and db - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - //These had their quantities changed + //These had their quantities Changed foreach (ushort slot in slotsToUpdate) { - Database.setQuantity(owner, slot, inventoryCode, list[slot].quantity); + Database.SetQuantity(owner, slot, inventoryCode, list[slot].quantity); if (inventoryCode != CURRENCY && inventoryCode != KEYITEMS) - sendInventoryPackets(list[slot]); + SendInventoryPackets(list[slot]); } //New item that spilled over while (quantityCount > 0) { - InventoryItem addedItem = Database.addItem(owner, itemId, Math.Min(quantityCount, gItem.maxStack), quality, gItem.isExclusive ? (byte)0x3 : (byte)0x0, gItem.durability, inventoryCode); + InventoryItem addedItem = Database.AddItem(owner, itemId, Math.Min(quantityCount, gItem.maxStack), quality, gItem.isExclusive ? (byte)0x3 : (byte)0x0, gItem.durability, inventoryCode); list.Add(addedItem); if (inventoryCode != CURRENCY && inventoryCode != KEYITEMS) - sendInventoryPackets(addedItem); + SendInventoryPackets(addedItem); quantityCount -= gItem.maxStack; } if (inventoryCode == CURRENCY || inventoryCode == KEYITEMS) - sendFullInventory(); + SendFullInventory(); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); } - public void addItem(uint[] itemId) + public void AddItem(uint[] itemId) { - if (!isSpaceForAdd(itemId[0], itemId.Length)) + if (!IsSpaceForAdd(itemId[0], itemId.Length)) return; //Update lists and db - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); int startPos = list.Count; //New item that spilled over for (int i = 0; i < itemId.Length; i++) { - Item gItem = Server.getItemGamedata(itemId[i]); - InventoryItem addedItem = Database.addItem(owner, itemId[i], 1, (byte)1, gItem.isExclusive ? (byte)0x3 : (byte)0x0, gItem.durability, inventoryCode); + Item gItem = Server.GetItemGamedata(itemId[i]); + InventoryItem addedItem = Database.AddItem(owner, itemId[i], 1, (byte)1, gItem.isExclusive ? (byte)0x3 : (byte)0x0, gItem.durability, inventoryCode); list.Add(addedItem); } - sendInventoryPackets(startPos); + SendInventoryPackets(startPos); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); } - public void removeItem(uint itemId, int quantity) + public void RemoveItem(uint itemId, int quantity) { - if (!hasItem(itemId, quantity)) + if (!HasItem(itemId, quantity)) return; List slotsToUpdate = new List(); List itemsToRemove = new List(); List slotsToRemove = new List(); - List addItemPackets = new List(); + List AddItemPackets = new List(); //Remove as we go along int quantityCount = quantity; @@ -220,13 +220,13 @@ namespace FFXIVClassic_Map_Server.actors.chara.player for (int i = 0; i < slotsToUpdate.Count; i++) { - Database.setQuantity(owner, slotsToUpdate[i], inventoryCode, list[slotsToUpdate[i]].quantity); + Database.SetQuantity(owner, slotsToUpdate[i], inventoryCode, list[slotsToUpdate[i]].quantity); } int oldListSize = list.Count; for (int i = 0; i < itemsToRemove.Count; i++) { - Database.removeItem(owner, itemsToRemove[i].uniqueId, inventoryCode); + Database.RemoveItem(owner, itemsToRemove[i].uniqueId, inventoryCode); list.Remove(itemsToRemove[i]); } @@ -241,21 +241,21 @@ namespace FFXIVClassic_Map_Server.actors.chara.player slotsToRemove.Add((ushort)i); } - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(lowestSlot); - sendInventoryRemovePackets(slotsToRemove); + SendInventoryPackets(lowestSlot); + SendInventoryRemovePackets(slotsToRemove); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); if (inventoryCode == NORMAL) - owner.getEquipment().SendFullEquipment(false); + owner.GetEquipment().SendFullEquipment(false); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); } - public void removeItem(ulong itemDBId) + public void RemoveItem(ulong itemDBId) { ushort slot = 0; InventoryItem toDelete = null; @@ -274,104 +274,104 @@ namespace FFXIVClassic_Map_Server.actors.chara.player int oldListSize = list.Count; list.RemoveAt(slot); - Database.removeItem(owner, itemDBId, inventoryCode); + Database.RemoveItem(owner, itemDBId, inventoryCode); //Realign slots for (int i = slot; i < list.Count; i++) list[i].slot = (ushort)i; - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(slot); - sendInventoryRemovePackets(slot); + SendInventoryPackets(slot); + SendInventoryRemovePackets(slot); if (slot != oldListSize - 1) - sendInventoryRemovePackets((ushort)(oldListSize - 1)); + SendInventoryRemovePackets((ushort)(oldListSize - 1)); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); if (inventoryCode == NORMAL) - owner.getEquipment().SendFullEquipment(false); + owner.GetEquipment().SendFullEquipment(false); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); } - public void removeItem(ushort slot) + public void RemoveItem(ushort slot) { if (slot >= list.Count) return; int oldListSize = list.Count; list.RemoveAt((int)slot); - Database.removeItem(owner, slot, inventoryCode); + Database.RemoveItem(owner, slot, inventoryCode); //Realign slots for (int i = slot; i < list.Count; i++) list[i].slot = (ushort)i; - owner.queuePacket(InventoryBeginChangePacket.buildPacket(owner.actorId)); - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + owner.QueuePacket(InventoryBeginChangePacket.BuildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(slot); - sendInventoryRemovePackets(slot); + SendInventoryPackets(slot); + SendInventoryRemovePackets(slot); if (slot != oldListSize - 1) - sendInventoryRemovePackets((ushort)(oldListSize - 1)); + SendInventoryRemovePackets((ushort)(oldListSize - 1)); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); if (inventoryCode == NORMAL) - owner.getEquipment().SendFullEquipment(false); + owner.GetEquipment().SendFullEquipment(false); - owner.queuePacket(InventoryEndChangePacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventoryEndChangePacket.BuildPacket(owner.actorId)); } - public void changeDurability(uint slot, uint durabilityChange) + public void ChangeDurability(uint slot, uint durabilityChange) { } - public void changeSpiritBind(uint slot, uint spiritBindChange) + public void ChangeSpiritBind(uint slot, uint spiritBindChange) { } - public void changeMateria(uint slot, byte materiaSlot, byte materiaId) + public void ChangeMateria(uint slot, byte materiaSlot, byte materiaId) { } #endregion #region Packet Functions - public void sendFullInventory() + public void SendFullInventory() { - owner.queuePacket(InventorySetBeginPacket.buildPacket(owner.actorId, inventoryCapacity, inventoryCode)); - sendInventoryPackets(0); - owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); + owner.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, inventoryCapacity, inventoryCode)); + SendInventoryPackets(0); + owner.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId)); } - private void sendInventoryPackets(InventoryItem item) + private void SendInventoryPackets(InventoryItem item) { - owner.queuePacket(InventoryListX01Packet.buildPacket(owner.actorId, item)); + owner.QueuePacket(InventoryListX01Packet.BuildPacket(owner.actorId, item)); } - private void sendInventoryPackets(List items) + private void SendInventoryPackets(List items) { int currentIndex = 0; while (true) { if (items.Count - currentIndex >= 64) - owner.queuePacket(InventoryListX64Packet.buildPacket(owner.actorId, items, ref currentIndex)); + owner.QueuePacket(InventoryListX64Packet.BuildPacket(owner.actorId, items, ref currentIndex)); else if (items.Count - currentIndex >= 32) - owner.queuePacket(InventoryListX32Packet.buildPacket(owner.actorId, items, ref currentIndex)); + owner.QueuePacket(InventoryListX32Packet.BuildPacket(owner.actorId, items, ref currentIndex)); else if (items.Count - currentIndex >= 16) - owner.queuePacket(InventoryListX16Packet.buildPacket(owner.actorId, items, ref currentIndex)); + owner.QueuePacket(InventoryListX16Packet.BuildPacket(owner.actorId, items, ref currentIndex)); else if (items.Count - currentIndex > 1) - owner.queuePacket(InventoryListX08Packet.buildPacket(owner.actorId, items, ref currentIndex)); + owner.QueuePacket(InventoryListX08Packet.BuildPacket(owner.actorId, items, ref currentIndex)); else if (items.Count - currentIndex == 1) { - owner.queuePacket(InventoryListX01Packet.buildPacket(owner.actorId, items[currentIndex])); + owner.QueuePacket(InventoryListX01Packet.BuildPacket(owner.actorId, items[currentIndex])); currentIndex++; } else @@ -380,23 +380,23 @@ namespace FFXIVClassic_Map_Server.actors.chara.player } - private void sendInventoryPackets(int startOffset) + private void SendInventoryPackets(int startOffset) { int currentIndex = startOffset; while (true) { if (list.Count - currentIndex >= 64) - owner.queuePacket(InventoryListX64Packet.buildPacket(owner.actorId, list, ref currentIndex)); + owner.QueuePacket(InventoryListX64Packet.BuildPacket(owner.actorId, list, ref currentIndex)); else if (list.Count - currentIndex >= 32) - owner.queuePacket(InventoryListX32Packet.buildPacket(owner.actorId, list, ref currentIndex)); + owner.QueuePacket(InventoryListX32Packet.BuildPacket(owner.actorId, list, ref currentIndex)); else if (list.Count - currentIndex >= 16) - owner.queuePacket(InventoryListX16Packet.buildPacket(owner.actorId, list, ref currentIndex)); + owner.QueuePacket(InventoryListX16Packet.BuildPacket(owner.actorId, list, ref currentIndex)); else if (list.Count - currentIndex > 1) - owner.queuePacket(InventoryListX08Packet.buildPacket(owner.actorId, list, ref currentIndex)); + owner.QueuePacket(InventoryListX08Packet.BuildPacket(owner.actorId, list, ref currentIndex)); else if (list.Count - currentIndex == 1) { - owner.queuePacket(InventoryListX01Packet.buildPacket(owner.actorId, list[currentIndex])); + owner.QueuePacket(InventoryListX01Packet.BuildPacket(owner.actorId, list[currentIndex])); currentIndex++; } else @@ -405,28 +405,28 @@ namespace FFXIVClassic_Map_Server.actors.chara.player } - private void sendInventoryRemovePackets(ushort index) + private void SendInventoryRemovePackets(ushort index) { - owner.queuePacket(InventoryRemoveX01Packet.buildPacket(owner.actorId, index)); + owner.QueuePacket(InventoryRemoveX01Packet.BuildPacket(owner.actorId, index)); } - private void sendInventoryRemovePackets(List indexes) + private void SendInventoryRemovePackets(List indexes) { int currentIndex = 0; while (true) { if (indexes.Count - currentIndex >= 64) - owner.queuePacket(InventoryRemoveX64Packet.buildPacket(owner.actorId, indexes, ref currentIndex)); + owner.QueuePacket(InventoryRemoveX64Packet.BuildPacket(owner.actorId, indexes, ref currentIndex)); else if (indexes.Count - currentIndex >= 32) - owner.queuePacket(InventoryRemoveX32Packet.buildPacket(owner.actorId, indexes, ref currentIndex)); + owner.QueuePacket(InventoryRemoveX32Packet.BuildPacket(owner.actorId, indexes, ref currentIndex)); else if (indexes.Count - currentIndex >= 16) - owner.queuePacket(InventoryRemoveX16Packet.buildPacket(owner.actorId, indexes, ref currentIndex)); + owner.QueuePacket(InventoryRemoveX16Packet.BuildPacket(owner.actorId, indexes, ref currentIndex)); else if (indexes.Count - currentIndex > 1) - owner.queuePacket(InventoryRemoveX08Packet.buildPacket(owner.actorId, indexes, ref currentIndex)); + owner.QueuePacket(InventoryRemoveX08Packet.BuildPacket(owner.actorId, indexes, ref currentIndex)); else if (indexes.Count - currentIndex == 1) { - owner.queuePacket(InventoryRemoveX01Packet.buildPacket(owner.actorId, indexes[currentIndex])); + owner.QueuePacket(InventoryRemoveX01Packet.BuildPacket(owner.actorId, indexes[currentIndex])); currentIndex++; } else @@ -439,18 +439,18 @@ namespace FFXIVClassic_Map_Server.actors.chara.player #region Inventory Utils - public bool isFull() + public bool IsFull() { return list.Count >= inventoryCapacity; } - public bool isSpaceForAdd(uint itemId, int quantity) + public bool IsSpaceForAdd(uint itemId, int quantity) { int quantityCount = quantity; for (int i = 0; i < list.Count; i++) { InventoryItem item = list[i]; - Item gItem = Server.getItemGamedata(item.itemId); + Item gItem = Server.GetItemGamedata(item.itemId); if (item.itemId == itemId && item.quantity < gItem.maxStack) { quantityCount -= (gItem.maxStack - item.quantity); @@ -459,15 +459,15 @@ namespace FFXIVClassic_Map_Server.actors.chara.player } } - return quantityCount <= 0 || (quantityCount > 0 && !isFull()); + return quantityCount <= 0 || (quantityCount > 0 && !IsFull()); } - public bool hasItem(uint itemId) + public bool HasItem(uint itemId) { - return hasItem(itemId, 1); + return HasItem(itemId, 1); } - public bool hasItem(uint itemId, int minQuantity) + public bool HasItem(uint itemId, int minQuantity) { int count = 0; @@ -483,7 +483,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player return false; } - public int getNextEmptySlot() + public int GetNextEmptySlot() { return list.Count == 0 ? 0 : list.Count(); } diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 340a4fb0..53be333c 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -228,144 +228,144 @@ namespace FFXIVClassic_Map_Server.Actors charaWork.parameterTemp.tp = 3000; - Database.loadPlayerCharacter(this); + Database.LoadPlayerCharacter(this); lastPlayTimeUpdate = Utils.UnixTimeStampUTC(); } - public List create0x132Packets(uint playerActorId) + public List Create0x132Packets(uint playerActorId) { List packets = new List(); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0xB, "commandForced")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0xA, "commandDefault")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0x6, "commandWeak")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0x4, "commandContent")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0x6, "commandJudgeMode")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0x100, "commandRequest")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0x100, "widgetCreate")); - packets.Add(_0x132Packet.buildPacket(playerActorId, 0x100, "macroRequest")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0xB, "commandForced")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0xA, "commandDefault")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x6, "commandWeak")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x4, "commandContent")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x6, "commandJudgeMode")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "commandRequest")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "widgetCreate")); + packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "macroRequest")); return packets; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - if (isMyPlayer(playerActorId)) + if (IsMyPlayer(playerActorId)) { if (currentDirector != null) - lParams = LuaUtils.createLuaParamList("/Chara/Player/Player_work", false, false, true, currentDirector, true, 0, false, timers, true); + lParams = LuaUtils.CreateLuaParamList("/Chara/Player/Player_work", false, false, true, currentDirector, true, 0, false, timers, true); else - lParams = LuaUtils.createLuaParamList("/Chara/Player/Player_work", false, false, false, true, 0, false, timers, true); + lParams = LuaUtils.CreateLuaParamList("/Chara/Player/Player_work", false, false, false, true, 0, false, timers, true); } else - lParams = LuaUtils.createLuaParamList("/Chara/Player/Player_work", false, false, false, false, false, true); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Chara/Player/Player_work", false, false, false, false, false, true); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } - public override BasePacket getSpawnPackets(uint playerActorId, uint spawnType) + public override BasePacket GetSpawnPackets(uint playerActorId, uint spawnType) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 8)); - if (isMyPlayer(playerActorId)) - subpackets.AddRange(create0x132Packets(playerActorId)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, spawnType)); - subpackets.Add(createAppearancePacket(playerActorId)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(_0xFPacket.buildPacket(playerActorId, playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIdleAnimationPacket(playerActorId)); - subpackets.Add(createInitStatusPacket(playerActorId)); - subpackets.Add(createSetActorIconPacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.AddRange(createPlayerRelatedPackets(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 8)); + if (IsMyPlayer(playerActorId)) + subpackets.AddRange(Create0x132Packets(playerActorId)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, spawnType)); + subpackets.Add(CreateAppearancePacket(playerActorId)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(_0xFPacket.BuildPacket(playerActorId, playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIdleAnimationPacket(playerActorId)); + subpackets.Add(CreateInitStatusPacket(playerActorId)); + subpackets.Add(CreateSetActorIconPacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.AddRange(CreatePlayerRelatedPackets(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } - public List createPlayerRelatedPackets(uint playerActorId) + public List CreatePlayerRelatedPackets(uint playerActorId) { List subpackets = new List(); if (gcCurrent != 0) - subpackets.Add(SetGrandCompanyPacket.buildPacket(actorId, playerActorId, gcCurrent, gcRankLimsa, gcRankGridania, gcRankUldah)); + subpackets.Add(SetGrandCompanyPacket.BuildPacket(actorId, playerActorId, gcCurrent, gcRankLimsa, gcRankGridania, gcRankUldah)); if (currentTitle != 0) - subpackets.Add(SetPlayerTitlePacket.buildPacket(actorId, playerActorId, currentTitle)); + subpackets.Add(SetPlayerTitlePacket.BuildPacket(actorId, playerActorId, currentTitle)); if (currentJob != 0) - subpackets.Add(SetCurrentJobPacket.buildPacket(actorId, playerActorId, currentJob)); + subpackets.Add(SetCurrentJobPacket.BuildPacket(actorId, playerActorId, currentJob)); - if (isMyPlayer(playerActorId)) + if (IsMyPlayer(playerActorId)) { - subpackets.Add(_0x196Packet.buildPacket(playerActorId, playerActorId)); + subpackets.Add(_0x196Packet.BuildPacket(playerActorId, playerActorId)); if (hasChocobo && chocoboName != null && !chocoboName.Equals("")) { - subpackets.Add(SetChocoboNamePacket.buildPacket(actorId, playerActorId, chocoboName)); - subpackets.Add(SetHasChocoboPacket.buildPacket(playerActorId, hasChocobo)); + subpackets.Add(SetChocoboNamePacket.BuildPacket(actorId, playerActorId, chocoboName)); + subpackets.Add(SetHasChocoboPacket.BuildPacket(playerActorId, hasChocobo)); } if (hasGoobbue) - subpackets.Add(SetHasGoobbuePacket.buildPacket(playerActorId, hasGoobbue)); + subpackets.Add(SetHasGoobbuePacket.BuildPacket(playerActorId, hasGoobbue)); - subpackets.Add(SetAchievementPointsPacket.buildPacket(playerActorId, achievementPoints)); - subpackets.Add(Database.getLatestAchievements(this)); - subpackets.Add(Database.getAchievementsPacket(this)); + subpackets.Add(SetAchievementPointsPacket.BuildPacket(playerActorId, achievementPoints)); + subpackets.Add(Database.GetLatestAchievements(this)); + subpackets.Add(Database.GetAchievementsPacket(this)); } return subpackets; } - public override BasePacket getInitPackets(uint playerActorId) + public override BasePacket GetInitPackets(uint playerActorId) { ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("/_init", this, playerActorId); - propPacketUtil.addProperty("charaWork.eventSave.bazaarTax"); - propPacketUtil.addProperty("charaWork.battleSave.potencial"); + propPacketUtil.AddProperty("charaWork.eventSave.bazaarTax"); + propPacketUtil.AddProperty("charaWork.battleSave.potencial"); //Properties for (int i = 0; i < charaWork.property.Length; i++) { if (charaWork.property[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.property[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.property[{0}]", i)); } //Parameters - propPacketUtil.addProperty("charaWork.parameterSave.hp[0]"); - propPacketUtil.addProperty("charaWork.parameterSave.hpMax[0]"); - propPacketUtil.addProperty("charaWork.parameterSave.mp"); - propPacketUtil.addProperty("charaWork.parameterSave.mpMax"); - propPacketUtil.addProperty("charaWork.parameterTemp.tp"); - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkill[0]"); - propPacketUtil.addProperty("charaWork.parameterSave.state_mainSkillLevel"); + propPacketUtil.AddProperty("charaWork.parameterSave.hp[0]"); + propPacketUtil.AddProperty("charaWork.parameterSave.hpMax[0]"); + propPacketUtil.AddProperty("charaWork.parameterSave.mp"); + propPacketUtil.AddProperty("charaWork.parameterSave.mpMax"); + propPacketUtil.AddProperty("charaWork.parameterTemp.tp"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[0]"); + propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkillLevel"); //Status Times for (int i = 0; i < charaWork.statusShownTime.Length; i++) { if (charaWork.statusShownTime[i] != 0xFFFFFFFF) - propPacketUtil.addProperty(String.Format("charaWork.statusShownTime[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.statusShownTime[{0}]", i)); } //General Parameters for (int i = 3; i < charaWork.battleTemp.generalParameter.Length; i++) { if (charaWork.battleTemp.generalParameter[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.battleTemp.generalParameter[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.battleTemp.generalParameter[{0}]", i)); } - propPacketUtil.addProperty("charaWork.battleTemp.castGauge_speed[0]"); - propPacketUtil.addProperty("charaWork.battleTemp.castGauge_speed[1]"); + propPacketUtil.AddProperty("charaWork.battleTemp.castGauge_speed[0]"); + propPacketUtil.AddProperty("charaWork.battleTemp.castGauge_speed[1]"); //Battle Save Skillpoint //Commands - propPacketUtil.addProperty("charaWork.commandBorder"); + propPacketUtil.AddProperty("charaWork.commandBorder"); for (int i = 0; i < charaWork.command.Length; i++) { if (charaWork.command[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.command[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.command[{0}]", i)); } @@ -373,110 +373,110 @@ namespace FFXIVClassic_Map_Server.Actors { charaWork.commandCategory[i] = 1; if (charaWork.commandCategory[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.commandCategory[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.commandCategory[{0}]", i)); } for (int i = 0; i < charaWork.commandAcquired.Length; i++) { if (charaWork.commandAcquired[i] != false) - propPacketUtil.addProperty(String.Format("charaWork.commandAcquired[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.commandAcquired[{0}]", i)); } for (int i = 0; i < charaWork.additionalCommandAcquired.Length; i++) { if (charaWork.additionalCommandAcquired[i] != false) - propPacketUtil.addProperty(String.Format("charaWork.additionalCommandAcquired[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.additionalCommandAcquired[{0}]", i)); } for (int i = 0; i < charaWork.parameterSave.commandSlot_compatibility.Length; i++) { charaWork.parameterSave.commandSlot_compatibility[i] = true; if (charaWork.parameterSave.commandSlot_compatibility[i]) - propPacketUtil.addProperty(String.Format("charaWork.parameterSave.commandSlot_compatibility[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.parameterSave.commandSlot_compatibility[{0}]", i)); } /* for (int i = 0; i < charaWork.parameterSave.commandSlot_recastTime.Length; i++) { if (charaWork.parameterSave.commandSlot_recastTime[i] != 0) - propPacketUtil.addProperty(String.Format("charaWork.parameterSave.commandSlot_recastTime[{0}]", i)); + propPacketUtil.AddProperty(String.Format("charaWork.parameterSave.commandSlot_recastTime[{0}]", i)); } */ //System - propPacketUtil.addProperty("charaWork.parameterTemp.forceControl_float_forClientSelf[0]"); - propPacketUtil.addProperty("charaWork.parameterTemp.forceControl_float_forClientSelf[1]"); - propPacketUtil.addProperty("charaWork.parameterTemp.forceControl_int16_forClientSelf[0]"); - propPacketUtil.addProperty("charaWork.parameterTemp.forceControl_int16_forClientSelf[1]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.forceControl_float_forClientSelf[0]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.forceControl_float_forClientSelf[1]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.forceControl_int16_forClientSelf[0]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.forceControl_int16_forClientSelf[1]"); charaWork.parameterTemp.otherClassAbilityCount[0] = 4; charaWork.parameterTemp.otherClassAbilityCount[1] = 5; charaWork.parameterTemp.giftCount[1] = 5; - propPacketUtil.addProperty("charaWork.parameterTemp.otherClassAbilityCount[0]"); - propPacketUtil.addProperty("charaWork.parameterTemp.otherClassAbilityCount[1]"); - propPacketUtil.addProperty("charaWork.parameterTemp.giftCount[1]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.otherClassAbilityCount[0]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.otherClassAbilityCount[1]"); + propPacketUtil.AddProperty("charaWork.parameterTemp.giftCount[1]"); - propPacketUtil.addProperty("charaWork.depictionJudge"); + propPacketUtil.AddProperty("charaWork.depictionJudge"); //Scenario for (int i = 0; i < playerWork.questScenario.Length; i++) { if (playerWork.questScenario[i] != 0) - propPacketUtil.addProperty(String.Format("playerWork.questScenario[{0}]", i)); + propPacketUtil.AddProperty(String.Format("playerWork.questScenario[{0}]", i)); } //Guildleve - Local for (int i = 0; i < playerWork.questGuildleve.Length; i++) { if (playerWork.questGuildleve[i] != 0) - propPacketUtil.addProperty(String.Format("playerWork.questGuildleve[{0}]", i)); + propPacketUtil.AddProperty(String.Format("playerWork.questGuildleve[{0}]", i)); } //Guildleve - Regional for (int i = 0; i < work.guildleveId.Length; i++) { if (work.guildleveId[i] != 0) - propPacketUtil.addProperty(String.Format("work.guildleveId[{0}]", i)); + propPacketUtil.AddProperty(String.Format("work.guildleveId[{0}]", i)); if (work.guildleveDone[i] != false) - propPacketUtil.addProperty(String.Format("work.guildleveDone[{0}]", i)); + propPacketUtil.AddProperty(String.Format("work.guildleveDone[{0}]", i)); if (work.guildleveChecked[i] != false) - propPacketUtil.addProperty(String.Format("work.guildleveChecked[{0}]", i)); + propPacketUtil.AddProperty(String.Format("work.guildleveChecked[{0}]", i)); } //NPC Linkshell for (int i = 0; i < playerWork.npcLinkshellChatCalling.Length; i++) { if (playerWork.npcLinkshellChatCalling[i] != false) - propPacketUtil.addProperty(String.Format("playerWork.npcLinkshellChatCalling[{0}]", i)); + propPacketUtil.AddProperty(String.Format("playerWork.npcLinkshellChatCalling[{0}]", i)); if (playerWork.npcLinkshellChatExtra[i] != false) - propPacketUtil.addProperty(String.Format("playerWork.npcLinkshellChatExtra[{0}]", i)); + propPacketUtil.AddProperty(String.Format("playerWork.npcLinkshellChatExtra[{0}]", i)); } - propPacketUtil.addProperty("playerWork.restBonusExpRate"); + propPacketUtil.AddProperty("playerWork.restBonusExpRate"); //Profile - propPacketUtil.addProperty("playerWork.tribe"); - propPacketUtil.addProperty("playerWork.guardian"); - propPacketUtil.addProperty("playerWork.birthdayMonth"); - propPacketUtil.addProperty("playerWork.birthdayDay"); - propPacketUtil.addProperty("playerWork.initialTown"); + propPacketUtil.AddProperty("playerWork.tribe"); + propPacketUtil.AddProperty("playerWork.guardian"); + propPacketUtil.AddProperty("playerWork.birthdayMonth"); + propPacketUtil.AddProperty("playerWork.birthdayDay"); + propPacketUtil.AddProperty("playerWork.initialTown"); - return BasePacket.createPacket(propPacketUtil.done(), true, false); + return BasePacket.CreatePacket(propPacketUtil.Done(), true, false); } - public void sendZoneInPackets(WorldManager world, ushort spawnType) + public void SendZoneInPackets(WorldManager world, ushort spawnType) { - queuePacket(SetActorIsZoningPacket.buildPacket(actorId, actorId, false)); - queuePacket(_0x10Packet.buildPacket(actorId, 0xFF)); - queuePacket(SetMusicPacket.buildPacket(actorId, zone.bgmDay, 0x01)); - queuePacket(SetWeatherPacket.buildPacket(actorId, SetWeatherPacket.WEATHER_CLEAR, 1)); + QueuePacket(SetActorIsZoningPacket.BuildPacket(actorId, actorId, false)); + QueuePacket(_0x10Packet.BuildPacket(actorId, 0xFF)); + QueuePacket(SetMusicPacket.BuildPacket(actorId, zone.bgmDay, 0x01)); + QueuePacket(SetWeatherPacket.BuildPacket(actorId, SetWeatherPacket.WEATHER_CLEAR, 1)); - queuePacket(SetMapPacket.buildPacket(actorId, zone.regionId, zone.actorId)); + QueuePacket(SetMapPacket.BuildPacket(actorId, zone.regionId, zone.actorId)); - queuePacket(getSpawnPackets(actorId, spawnType)); - getSpawnPackets(actorId, spawnType).debugPrintPacket(); + QueuePacket(GetSpawnPackets(actorId, spawnType)); + GetSpawnPackets(actorId, spawnType).DebugPrintPacket(); #region grouptest //Retainers @@ -485,52 +485,52 @@ namespace FFXIVClassic_Map_Server.Actors retainerListEntries.Add(new ListEntry(0x23, 0x0, 0xFFFFFFFF, false, false, "TEST1")); retainerListEntries.Add(new ListEntry(0x24, 0x0, 0xFFFFFFFF, false, false, "TEST2")); retainerListEntries.Add(new ListEntry(0x25, 0x0, 0xFFFFFFFF, false, false, "TEST3")); - BasePacket retainerListPacket = BasePacket.createPacket(ListUtils.createRetainerList(actorId, 0xF4, 1, 0x800000000004e639, retainerListEntries), true, false); - playerSession.queuePacket(retainerListPacket); + BasePacket retainerListPacket = BasePacket.CreatePacket(ListUtils.CreateRetainerList(actorId, 0xF4, 1, 0x800000000004e639, retainerListEntries), true, false); + playerSession.QueuePacket(retainerListPacket); //Party List partyListEntries = new List(); partyListEntries.Add(new ListEntry(actorId, 0xFFFFFFFF, 0xFFFFFFFF, false, true, customDisplayName)); partyListEntries.Add(new ListEntry(0x029B27D3, 0xFFFFFFFF, 0x195, false, true, "Valentine Bluefeather")); - BasePacket partyListPacket = BasePacket.createPacket(ListUtils.createPartyList(actorId, 0xF4, 1, 0x8000000000696df2, partyListEntries), true, false); - playerSession.queuePacket(partyListPacket); + BasePacket partyListPacket = BasePacket.CreatePacket(ListUtils.CreatePartyList(actorId, 0xF4, 1, 0x8000000000696df2, partyListEntries), true, false); + playerSession.QueuePacket(partyListPacket); #endregion #region Inventory & Equipment - queuePacket(InventoryBeginChangePacket.buildPacket(actorId)); - inventories[Inventory.NORMAL].sendFullInventory(); - inventories[Inventory.CURRENCY].sendFullInventory(); - inventories[Inventory.KEYITEMS].sendFullInventory(); - inventories[Inventory.BAZAAR].sendFullInventory(); - inventories[Inventory.MELDREQUEST].sendFullInventory(); - inventories[Inventory.LOOT].sendFullInventory(); + QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId)); + inventories[Inventory.NORMAL].SendFullInventory(); + inventories[Inventory.CURRENCY].SendFullInventory(); + inventories[Inventory.KEYITEMS].SendFullInventory(); + inventories[Inventory.BAZAAR].SendFullInventory(); + inventories[Inventory.MELDREQUEST].SendFullInventory(); + inventories[Inventory.LOOT].SendFullInventory(); equipment.SendFullEquipment(false); - playerSession.queuePacket(InventoryEndChangePacket.buildPacket(actorId), true, false); + playerSession.QueuePacket(InventoryEndChangePacket.BuildPacket(actorId), true, false); #endregion - playerSession.queuePacket(getInitPackets(actorId)); + playerSession.QueuePacket(GetInitPackets(actorId)); - BasePacket areaMasterSpawn = zone.getSpawnPackets(actorId); - BasePacket debugSpawn = world.GetDebugActor().getSpawnPackets(actorId); - BasePacket worldMasterSpawn = world.GetActor().getSpawnPackets(actorId); - BasePacket weatherDirectorSpawn = new WeatherDirector(this, 8003).getSpawnPackets(actorId); + BasePacket areaMasterSpawn = zone.GetSpawnPackets(actorId); + BasePacket debugSpawn = world.GetDebugActor().GetSpawnPackets(actorId); + BasePacket worldMasterSpawn = world.GetActor().GetSpawnPackets(actorId); + BasePacket weatherDirectorSpawn = new WeatherDirector(this, 8003).GetSpawnPackets(actorId); BasePacket directorSpawn = null; if (currentDirector != null) - directorSpawn = currentDirector.getSpawnPackets(actorId); + directorSpawn = currentDirector.GetSpawnPackets(actorId); - playerSession.queuePacket(areaMasterSpawn); - playerSession.queuePacket(debugSpawn); + playerSession.QueuePacket(areaMasterSpawn); + playerSession.QueuePacket(debugSpawn); if (directorSpawn != null) { - //directorSpawn.debugPrintPacket(); - // currentDirector.getInitPackets(actorId).debugPrintPacket(); - queuePacket(directorSpawn); - queuePacket(currentDirector.getInitPackets(actorId)); - //queuePacket(currentDirector.getSetEventStatusPackets(actorId)); + //directorSpawn.DebugPrintPacket(); + // currentDirector.GetInitPackets(actorId).DebugPrintPacket(); + QueuePacket(directorSpawn); + QueuePacket(currentDirector.GetInitPackets(actorId)); + //QueuePacket(currentDirector.GetSetEventStatusPackets(actorId)); } - playerSession.queuePacket(worldMasterSpawn); + playerSession.QueuePacket(worldMasterSpawn); if (zone.isInn) { @@ -538,73 +538,73 @@ namespace FFXIVClassic_Map_Server.Actors for (int i = 0; i < 2048; i++) cutsceneBookPacket.cutsceneFlags[i] = true; - SubPacket packet = cutsceneBookPacket.buildPacket(actorId, "", 11, 1, 1); + SubPacket packet = cutsceneBookPacket.BuildPacket(actorId, "", 11, 1, 1); - packet.debugPrintSubPacket(); - queuePacket(packet); + packet.DebugPrintSubPacket(); + QueuePacket(packet); } - playerSession.queuePacket(weatherDirectorSpawn); + playerSession.QueuePacket(weatherDirectorSpawn); /* #region hardcode - BasePacket reply10 = new BasePacket("./packets/login/login10.bin"); //Item Storage, Inn Door created + BasePacket reply10 = new BasePacket("./packets/login/login10.bin"); //Item Storage, Inn Door Created BasePacket reply11 = new BasePacket("./packets/login/login11.bin"); //NPC Create ??? Final init - reply10.replaceActorID(actorId); - reply11.replaceActorID(actorId); - //playerSession.queuePacket(reply10); - // playerSession.queuePacket(reply11); + reply10.ReplaceActorID(actorId); + reply11.ReplaceActorID(actorId); + //playerSession.QueuePacket(reply10); + // playerSession.QueuePacket(reply11); #endregion */ } - private void sendRemoveInventoryPackets(List slots) + private void SendRemoveInventoryPackets(List slots) { int currentIndex = 0; while (true) { if (slots.Count - currentIndex >= 64) - queuePacket(InventoryRemoveX64Packet.buildPacket(actorId, slots, ref currentIndex)); + QueuePacket(InventoryRemoveX64Packet.BuildPacket(actorId, slots, ref currentIndex)); else if (slots.Count - currentIndex >= 32) - queuePacket(InventoryRemoveX32Packet.buildPacket(actorId, slots, ref currentIndex)); + QueuePacket(InventoryRemoveX32Packet.BuildPacket(actorId, slots, ref currentIndex)); else if (slots.Count - currentIndex >= 16) - queuePacket(InventoryRemoveX16Packet.buildPacket(actorId, slots, ref currentIndex)); + QueuePacket(InventoryRemoveX16Packet.BuildPacket(actorId, slots, ref currentIndex)); else if (slots.Count - currentIndex >= 8) - queuePacket(InventoryRemoveX08Packet.buildPacket(actorId, slots, ref currentIndex)); + QueuePacket(InventoryRemoveX08Packet.BuildPacket(actorId, slots, ref currentIndex)); else if (slots.Count - currentIndex == 1) - queuePacket(InventoryRemoveX01Packet.buildPacket(actorId, slots[currentIndex])); + QueuePacket(InventoryRemoveX01Packet.BuildPacket(actorId, slots[currentIndex])); else break; } } - public bool isMyPlayer(uint otherActorId) + public bool IsMyPlayer(uint otherActorId) { return actorId == otherActorId; } - public void queuePacket(BasePacket packet) + public void QueuePacket(BasePacket packet) { - playerSession.queuePacket(packet); + playerSession.QueuePacket(packet); } - public void queuePacket(SubPacket packet) + public void QueuePacket(SubPacket packet) { - playerSession.queuePacket(packet, true, false); + playerSession.QueuePacket(packet, true, false); } - public void queuePackets(List packets) + public void QueuePackets(List packets) { foreach (SubPacket subpacket in packets) - playerSession.queuePacket(subpacket, true, false); + playerSession.QueuePacket(subpacket, true, false); } - public void broadcastPacket(SubPacket packet, bool sendToSelf) + public void BroadcastPacket(SubPacket packet, bool sendToSelf) { if (sendToSelf) - queuePacket(packet); + QueuePacket(packet); foreach (Actor a in playerSession.actorInstanceList) { @@ -612,62 +612,62 @@ namespace FFXIVClassic_Map_Server.Actors { Player p = (Player)a; SubPacket clonedPacket = new SubPacket(packet, a.actorId); - p.queuePacket(clonedPacket); + p.QueuePacket(clonedPacket); } } } - public void setDCFlag(bool flag) + public void SetDCFlag(bool flag) { if (flag) { - broadcastPacket(SetActorIconPacket.buildPacket(actorId, actorId, SetActorIconPacket.DISCONNECTING), true); + BroadcastPacket(SetActorIconPacket.BuildPacket(actorId, actorId, SetActorIconPacket.DISCONNECTING), true); } else { if (isGM) - broadcastPacket(SetActorIconPacket.buildPacket(actorId, actorId, SetActorIconPacket.ISGM), true); + BroadcastPacket(SetActorIconPacket.BuildPacket(actorId, actorId, SetActorIconPacket.ISGM), true); else - broadcastPacket(SetActorIconPacket.buildPacket(actorId, actorId, 0), true); + BroadcastPacket(SetActorIconPacket.BuildPacket(actorId, actorId, 0), true); } } - public void cleanupAndSave() + public void CleanupAndSave() { //Remove actor from zone and main server list - zone.removeActorFromZone(this); - Server.getServer().removePlayer(this); + zone.RemoveActorFromZone(this); + Server.GetServer().RemovePlayer(this); //Save Player - Database.savePlayerPlayTime(this); - Database.savePlayerPosition(this); + Database.SavePlayerPlayTime(this); + Database.SavePlayerPosition(this); Program.Log.Info("{0} has been logged out and saved.", this.customDisplayName); } - public Area getZone() + public Area GetZone() { return zone; } - public void sendMessage(uint logType, string sender, string message) + public void SendMessage(uint logType, string sender, string message) { - queuePacket(SendMessagePacket.buildPacket(actorId, actorId, logType, sender, message)); + QueuePacket(SendMessagePacket.BuildPacket(actorId, actorId, logType, sender, message)); } - public void logout() + public void Logout() { - queuePacket(LogoutPacket.buildPacket(actorId)); - cleanupAndSave(); + QueuePacket(LogoutPacket.BuildPacket(actorId)); + CleanupAndSave(); } - public void quitGame() + public void QuitGame() { - queuePacket(QuitPacket.buildPacket(actorId)); - cleanupAndSave(); + QueuePacket(QuitPacket.BuildPacket(actorId)); + CleanupAndSave(); } - public uint getPlayTime(bool doUpdate) + public uint GetPlayTime(bool doUpdate) { if (doUpdate) { @@ -679,82 +679,82 @@ namespace FFXIVClassic_Map_Server.Actors return playTime; } - public void changeMusic(ushort musicId) + public void ChangeMusic(ushort musicId) { - queuePacket(SetMusicPacket.buildPacket(actorId, musicId, 1)); + QueuePacket(SetMusicPacket.BuildPacket(actorId, musicId, 1)); } - public void sendChocoboAppearance() + public void SendChocoboAppearance() { - broadcastPacket(SetCurrentMountChocoboPacket.buildPacket(actorId, chocoboAppearance), true); + BroadcastPacket(SetCurrentMountChocoboPacket.BuildPacket(actorId, chocoboAppearance), true); } - public void sendGoobbueAppearance() + public void SendGoobbueAppearance() { - broadcastPacket(SetCurrentMountGoobbuePacket.buildPacket(actorId, 1), true); + BroadcastPacket(SetCurrentMountGoobbuePacket.BuildPacket(actorId, 1), true); } - public void setMountState(byte mountState) + public void SetMountState(byte mountState) { this.mountState = mountState; } - public byte getMountState() + public byte GetMountState() { return mountState; } - public void doEmote(uint emoteId) + public void DoEmote(uint emoteId) { - broadcastPacket(ActorDoEmotePacket.buildPacket(actorId, actorId, currentTarget, emoteId), true); + BroadcastPacket(ActorDoEmotePacket.BuildPacket(actorId, actorId, currentTarget, emoteId), true); } - public void sendGameMessage(Actor sourceActor, Actor textIdOwner, ushort textId, byte log, params object[] msgParams) + public void SendGameMessage(Actor sourceActor, Actor textIdOwner, ushort textId, byte log, params object[] msgParams) { if (msgParams.Length == 0) { - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, sourceActor.actorId, textIdOwner.actorId, textId, log)); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, sourceActor.actorId, textIdOwner.actorId, textId, log)); } else - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, sourceActor.actorId, textIdOwner.actorId, textId, log, LuaUtils.createLuaParamList(msgParams))); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, sourceActor.actorId, textIdOwner.actorId, textId, log, LuaUtils.CreateLuaParamList(msgParams))); } - public void sendGameMessage(Actor textIdOwner, ushort textId, byte log, params object[] msgParams) + public void SendGameMessage(Actor textIdOwner, ushort textId, byte log, params object[] msgParams) { if (msgParams.Length == 0) - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, log)); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, log)); else - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, log, LuaUtils.createLuaParamList(msgParams))); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, log, LuaUtils.CreateLuaParamList(msgParams))); } - public void sendGameMessage(Actor textIdOwner, ushort textId, byte log, string customSender, params object[] msgParams) + public void SendGameMessage(Actor textIdOwner, ushort textId, byte log, string customSender, params object[] msgParams) { if (msgParams.Length == 0) - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, customSender, log)); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, customSender, log)); else - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, customSender, log, LuaUtils.createLuaParamList(msgParams))); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, customSender, log, LuaUtils.CreateLuaParamList(msgParams))); } - public void sendGameMessage(Actor textIdOwner, ushort textId, byte log, uint displayId, params object[] msgParams) + public void SendGameMessage(Actor textIdOwner, ushort textId, byte log, uint displayId, params object[] msgParams) { if (msgParams.Length == 0) - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, displayId, log)); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, displayId, log)); else - queuePacket(GameMessagePacket.buildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, displayId, log, LuaUtils.createLuaParamList(msgParams))); + QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().actorId, actorId, textIdOwner.actorId, textId, displayId, log, LuaUtils.CreateLuaParamList(msgParams))); } - public void broadcastWorldMessage(ushort worldMasterId, params object[] msgParams) + public void BroadcastWorldMessage(ushort worldMasterId, params object[] msgParams) { //SubPacket worldMasterMessage = - //zone.broadcastPacketAroundActor(this, worldMasterMessage); + //zone.BroadcastPacketAroundActor(this, worldMasterMessage); } - public void graphicChange(uint slot, uint graphicId) + public void GraphicChange(uint slot, uint graphicId) { appearanceIds[slot] = graphicId; } - public void graphicChange(uint slot, uint weapId, uint equipId, uint variantId, uint colorId) + public void GraphicChange(uint slot, uint weapId, uint equipId, uint variantId, uint colorId) { uint mixedVariantId; @@ -773,12 +773,12 @@ namespace FFXIVClassic_Map_Server.Actors } - public void sendAppearance() + public void SendAppearance() { - broadcastPacket(createAppearancePacket(actorId), true); + BroadcastPacket(CreateAppearancePacket(actorId), true); } - public void sendCharaExpInfo() + public void SendCharaExpInfo() { if (lastStep == 0) { @@ -792,22 +792,22 @@ namespace FFXIVClassic_Map_Server.Actors Buffer.BlockCopy(charaWork.battleSave.skillLevel, 0, skillLevelBuffer, 0, skillLevelBuffer.Length); SetActorPropetyPacket charaInfo1 = new SetActorPropetyPacket("charaWork/exp"); - charaInfo1.setIsArrayMode(true); + charaInfo1.SetIsArrayMode(true); if (maxLength == 0x5E) { - charaInfo1.addBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevel", 0), skillLevelBuffer, 0, skillLevelBuffer.Length, 0x0); + charaInfo1.AddBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevel", 0), skillLevelBuffer, 0, skillLevelBuffer.Length, 0x0); lastPosition += maxLength; } else { - charaInfo1.addBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevel", 0), skillLevelBuffer, 0, skillLevelBuffer.Length, 0x3); + charaInfo1.AddBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevel", 0), skillLevelBuffer, 0, skillLevelBuffer.Length, 0x3); lastPosition = 0; lastStep++; } - charaInfo1.addTarget(); + charaInfo1.AddTarget(); - queuePacket(charaInfo1.buildPacket(actorId, actorId)); + QueuePacket(charaInfo1.BuildPacket(actorId, actorId)); } else if (lastStep == 1) { @@ -824,38 +824,38 @@ namespace FFXIVClassic_Map_Server.Actors if (maxLength == 0x5E) { - charaInfo1.setIsArrayMode(true); - charaInfo1.addBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevelCap", 0), skillCapBuffer, 0, skillCapBuffer.Length, 0x1); + charaInfo1.SetIsArrayMode(true); + charaInfo1.AddBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevelCap", 0), skillCapBuffer, 0, skillCapBuffer.Length, 0x1); lastPosition += maxLength; } else { - charaInfo1.setIsArrayMode(false); - charaInfo1.addBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevelCap", 0), skillCapBuffer, 0, skillCapBuffer.Length, 0x3); + charaInfo1.SetIsArrayMode(false); + charaInfo1.AddBuffer(Utils.MurmurHash2("charaWork.battleSave.skillLevelCap", 0), skillCapBuffer, 0, skillCapBuffer.Length, 0x3); lastStep = 0; lastPosition = 0; } - charaInfo1.addTarget(); + charaInfo1.AddTarget(); - queuePacket(charaInfo1.buildPacket(actorId, actorId)); + QueuePacket(charaInfo1.BuildPacket(actorId, actorId)); } } - public InventoryItem[] getGearset(ushort classId) + public InventoryItem[] GetGearset(ushort classId) { - return Database.getEquipment(this, classId); + return Database.GetEquipment(this, classId); } - public void prepareClassChange(byte classId) + public void PrepareClassChange(byte classId) { //If new class, init abilties and level - sendCharaExpInfo(); + SendCharaExpInfo(); } - public void doClassChange(byte classId) + public void DoClassChange(byte classId) { //load hotbars //Calculate stats @@ -886,26 +886,26 @@ namespace FFXIVClassic_Map_Server.Actors ActorPropertyPacketUtil propertyBuilder = new ActorPropertyPacketUtil("charaWork/stateForAll", this, actorId); - propertyBuilder.addProperty("charaWork.parameterSave.state_mainSkill[0]"); - propertyBuilder.addProperty("charaWork.parameterSave.state_mainSkillLevel"); - propertyBuilder.newTarget("playerWork/expBonus"); - propertyBuilder.addProperty("playerWork.restBonusExpRate"); + propertyBuilder.AddProperty("charaWork.parameterSave.state_mainSkill[0]"); + propertyBuilder.AddProperty("charaWork.parameterSave.state_mainSkillLevel"); + propertyBuilder.NewTarget("playerWork/expBonus"); + propertyBuilder.AddProperty("playerWork.restBonusExpRate"); - List packets = propertyBuilder.done(); + List packets = propertyBuilder.Done(); foreach (SubPacket packet in packets) - broadcastPacket(packet, true); + BroadcastPacket(packet, true); - Database.savePlayerCurrentClass(this); + Database.SavePlayerCurrentClass(this); } - public void graphicChange(int slot, InventoryItem invItem) + public void GraphicChange(int slot, InventoryItem invItem) { if (invItem == null) appearanceIds[slot] = 0; else { - Item item = Server.getItemGamedata(invItem.itemId); + Item item = Server.GetItemGamedata(invItem.itemId); if (item is EquipmentItem) { EquipmentItem eqItem = (EquipmentItem)item; @@ -926,12 +926,12 @@ namespace FFXIVClassic_Map_Server.Actors } } - Database.savePlayerAppearance(this); + Database.SavePlayerAppearance(this); - broadcastPacket(createAppearancePacket(actorId), true); + BroadcastPacket(CreateAppearancePacket(actorId), true); } - public Inventory getInventory(ushort type) + public Inventory GetInventory(ushort type) { if (inventories.ContainsKey(type)) return inventories[type]; @@ -939,7 +939,7 @@ namespace FFXIVClassic_Map_Server.Actors return null; } - public Actor getActorInInstance(uint actorId) + public Actor GetActorInInstance(uint actorId) { foreach (Actor a in playerSession.actorInstanceList) { @@ -950,27 +950,27 @@ namespace FFXIVClassic_Map_Server.Actors return null; } - public void setZoneChanging(bool flag) + public void SetZoneChanging(bool flag) { isZoneChanging = flag; } - public bool isInZoneChange() + public bool IsInZoneChange() { return isZoneChanging; } - public Equipment getEquipment() + public Equipment GetEquipment() { return equipment; } - public byte getInitialTown() + public byte GetInitialTown() { return playerWork.initialTown; } - public int getFreeQuestSlot() + public int GetFreeQuestSlot() { for (int i = 0; i < questScenario.Length; i++) { @@ -981,32 +981,32 @@ namespace FFXIVClassic_Map_Server.Actors return -1; } - public void addQuest(uint id) + public void AddQuest(uint id) { - Actor actor = Server.getStaticActors((0xA0F00000 | id)); - addQuest(actor.actorName); + Actor actor = Server.GetStaticActors((0xA0F00000 | id)); + AddQuest(actor.actorName); } - public void addQuest(string name) + public void AddQuest(string name) { - Actor actor = Server.getStaticActors(name); + Actor actor = Server.GetStaticActors(name); if (actor == null) return; uint id = actor.actorId; - int freeSlot = getFreeQuestSlot(); + int freeSlot = GetFreeQuestSlot(); if (freeSlot == -1) return; playerWork.questScenario[freeSlot] = id; questScenario[freeSlot] = new Quest(this, playerWork.questScenario[freeSlot], name, null, 0); - Database.saveQuest(this, questScenario[freeSlot]); + Database.SaveQuest(this, questScenario[freeSlot]); } - public Quest getQuest(uint id) + public Quest GetQuest(uint id) { for (int i = 0; i < questScenario.Length; i++) { @@ -1017,7 +1017,7 @@ namespace FFXIVClassic_Map_Server.Actors return null; } - public Quest getQuest(string name) + public Quest GetQuest(string name) { for (int i = 0; i < questScenario.Length; i++) { @@ -1028,7 +1028,7 @@ namespace FFXIVClassic_Map_Server.Actors return null; } - public bool hasQuest(string name) + public bool HasQuest(string name) { for (int i = 0; i < questScenario.Length; i++) { @@ -1039,7 +1039,7 @@ namespace FFXIVClassic_Map_Server.Actors return false; } - public bool hasQuest(uint id) + public bool HasQuest(uint id) { for (int i = 0; i < questScenario.Length; i++) { @@ -1050,7 +1050,7 @@ namespace FFXIVClassic_Map_Server.Actors return false; } - public int getQuestSlot(uint id) + public int GetQuestSlot(uint id) { for (int i = 0; i < questScenario.Length; i++) { @@ -1061,7 +1061,7 @@ namespace FFXIVClassic_Map_Server.Actors return -1; } - public void setDirector(string directorType, bool sendPackets) + public void SetDirector(string directorType, bool sendPackets) { if (directorType.Equals("openingDirector")) { @@ -1082,22 +1082,22 @@ namespace FFXIVClassic_Map_Server.Actors if (sendPackets) { - queuePacket(RemoveActorPacket.buildPacket(actorId, 0x46080012)); - queuePacket(currentDirector.getSpawnPackets(actorId)); - queuePacket(currentDirector.getInitPackets(actorId)); - //queuePacket(currentDirector.getSetEventStatusPackets(actorId)); - //currentDirector.getSpawnPackets(actorId).debugPrintPacket(); - //currentDirector.getInitPackets(actorId).debugPrintPacket(); + QueuePacket(RemoveActorPacket.BuildPacket(actorId, 0x46080012)); + QueuePacket(currentDirector.GetSpawnPackets(actorId)); + QueuePacket(currentDirector.GetInitPackets(actorId)); + //QueuePacket(currentDirector.GetSetEventStatusPackets(actorId)); + //currentDirector.GetSpawnPackets(actorId).DebugPrintPacket(); + //currentDirector.GetInitPackets(actorId).DebugPrintPacket(); } } - public Director getDirector() + public Director GetDirector() { return currentDirector; } - public void examinePlayer(Actor examinee) + public void ExaminePlayer(Actor examinee) { Player toBeExamined; if (examinee is Player) @@ -1105,79 +1105,79 @@ namespace FFXIVClassic_Map_Server.Actors else return; - queuePacket(InventoryBeginChangePacket.buildPacket(toBeExamined.actorId, actorId)); - toBeExamined.getEquipment().SendCheckEquipmentToPlayer(this); - queuePacket(InventoryEndChangePacket.buildPacket(toBeExamined.actorId, actorId)); + QueuePacket(InventoryBeginChangePacket.BuildPacket(toBeExamined.actorId, actorId)); + toBeExamined.GetEquipment().SendCheckEquipmentToPlayer(this); + QueuePacket(InventoryEndChangePacket.BuildPacket(toBeExamined.actorId, actorId)); } - public void sendRequestedInfo(params object[] parameters) + public void SendRequestedInfo(params object[] parameters) { - List lParams = LuaUtils.createLuaParamList(parameters); - SubPacket spacket = InfoRequestResponsePacket.buildPacket(actorId, actorId, lParams); - spacket.debugPrintSubPacket(); - queuePacket(spacket); + List lParams = LuaUtils.CreateLuaParamList(parameters); + SubPacket spacket = InfoRequestResponsePacket.BuildPacket(actorId, actorId, lParams); + spacket.DebugPrintSubPacket(); + QueuePacket(spacket); } - public void kickEvent(Actor actor, string conditionName, params object[] parameters) + public void KickEvent(Actor actor, string conditionName, params object[] parameters) { if (actor == null) return; - List lParams = LuaUtils.createLuaParamList(parameters); - SubPacket spacket = KickEventPacket.buildPacket(actorId, actor.actorId, conditionName, lParams); - spacket.debugPrintSubPacket(); - queuePacket(spacket); + List lParams = LuaUtils.CreateLuaParamList(parameters); + SubPacket spacket = KickEventPacket.BuildPacket(actorId, actor.actorId, conditionName, lParams); + spacket.DebugPrintSubPacket(); + QueuePacket(spacket); } - public void setEventStatus(Actor actor, string conditionName, bool enabled, byte unknown) + public void SetEventStatus(Actor actor, string conditionName, bool enabled, byte unknown) { - queuePacket(SetEventStatus.buildPacket(actorId, actor.actorId, enabled, unknown, conditionName)); + QueuePacket(packets.send.actor.events.SetEventStatus.BuildPacket(actorId, actor.actorId, enabled, unknown, conditionName)); } - public void runEventFunction(string functionName, params object[] parameters) + public void RunEventFunction(string functionName, params object[] parameters) { - List lParams = LuaUtils.createLuaParamList(parameters); - SubPacket spacket = RunEventFunctionPacket.buildPacket(actorId, currentEventOwner, currentEventName, functionName, lParams); - spacket.debugPrintSubPacket(); - queuePacket(spacket); + List lParams = LuaUtils.CreateLuaParamList(parameters); + SubPacket spacket = RunEventFunctionPacket.BuildPacket(actorId, currentEventOwner, currentEventName, functionName, lParams); + spacket.DebugPrintSubPacket(); + QueuePacket(spacket); } - public void endEvent() + public void EndEvent() { - SubPacket p = EndEventPacket.buildPacket(actorId, currentEventOwner, currentEventName); - p.debugPrintSubPacket(); - queuePacket(p); + SubPacket p = EndEventPacket.BuildPacket(actorId, currentEventOwner, currentEventName); + p.DebugPrintSubPacket(); + QueuePacket(p); currentEventOwner = 0; currentEventName = ""; eventMenuId = 0; } - public void endCommand() + public void EndCommand() { - SubPacket p = EndEventPacket.buildPacket(actorId, currentCommand, currentCommandName); - p.debugPrintSubPacket(); - queuePacket(p); + SubPacket p = EndEventPacket.BuildPacket(actorId, currentCommand, currentCommandName); + p.DebugPrintSubPacket(); + QueuePacket(p); currentCommand = 0; currentCommandName = ""; } - public void setCurrentMenuId(uint id) + public void SetCurrentMenuId(uint id) { eventMenuId = id; } - public uint getCurrentMenuId() + public uint GetCurrentMenuId() { return eventMenuId; } - public void sendInstanceUpdate() + public void SendInstanceUpdate() { //Update Instance - playerSession.updateInstance(zone.getActorsAroundActor(this, 50)); + playerSession.UpdateInstance(zone.GetActorsAroundActor(this, 50)); } diff --git a/FFXIVClassic Map Server/actors/debug/Debug.cs b/FFXIVClassic Map Server/actors/debug/Debug.cs index 9625afd6..8c84c223 100644 --- a/FFXIVClassic Map Server/actors/debug/Debug.cs +++ b/FFXIVClassic Map Server/actors/debug/Debug.cs @@ -18,24 +18,24 @@ namespace FFXIVClassic_Map_Server.Actors this.className = "Debug"; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/System/Debug.prog", false, false, false, false, true, 0xC51F, true, true); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/System/Debug.prog", false, false, false, false, true, 0xC51F, true, true); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } - public override BasePacket getSpawnPackets(uint playerActorId) + public override BasePacket GetSpawnPackets(uint playerActorId) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 0)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, 0x1)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 0)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, 0x1)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } } diff --git a/FFXIVClassic Map Server/actors/director/Director.cs b/FFXIVClassic Map Server/actors/director/Director.cs index f8a5e12f..fb50c3c8 100644 --- a/FFXIVClassic Map Server/actors/director/Director.cs +++ b/FFXIVClassic Map Server/actors/director/Director.cs @@ -15,35 +15,35 @@ namespace FFXIVClassic_Map_Server.actors.director this.owner = owner; } - public virtual BasePacket getSpawnPackets(uint playerActorId, uint spawnType) + public virtual BasePacket GetSpawnPackets(uint playerActorId, uint spawnType) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 0)); - subpackets.AddRange(getEventConditionPackets(playerActorId)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, 0)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 0)); + subpackets.AddRange(GetEventConditionPackets(playerActorId)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, 0)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } - public override BasePacket getInitPackets(uint playerActorId) + public override BasePacket GetInitPackets(uint playerActorId) { SetActorPropetyPacket initProperties = new SetActorPropetyPacket("/_init"); - initProperties.addTarget(); - return BasePacket.createPacket(initProperties.buildPacket(playerActorId, actorId), true, false); + initProperties.AddTarget(); + return BasePacket.CreatePacket(initProperties.BuildPacket(playerActorId, actorId), true, false); } - public void onTalked(Npc npc) + public void OnTalked(Npc npc) { - LuaEngine.doDirectorOnTalked(this, owner, npc); + LuaEngine.DoDirectorOnTalked(this, owner, npc); } - public void onCommand(Command command) + public void OnCommand(Command command) { - LuaEngine.doDirectorOnCommand(this, owner, command); + LuaEngine.DoDirectorOnCommand(this, owner, command); } } diff --git a/FFXIVClassic Map Server/actors/director/OpeningDirector.cs b/FFXIVClassic Map Server/actors/director/OpeningDirector.cs index 276d4e9e..c47f18b5 100644 --- a/FFXIVClassic Map Server/actors/director/OpeningDirector.cs +++ b/FFXIVClassic Map Server/actors/director/OpeningDirector.cs @@ -30,11 +30,11 @@ namespace FFXIVClassic_Map_Server.actors.director this.eventConditions.noticeEventConditions = noticeEventList; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/Director/OpeningDirector", false, false, false, false, 0x13881); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Director/OpeningDirector", false, false, false, false, 0x13881); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } } } diff --git a/FFXIVClassic Map Server/actors/director/WeatherDirector.cs b/FFXIVClassic Map Server/actors/director/WeatherDirector.cs index 931750ef..2ce196f9 100644 --- a/FFXIVClassic Map Server/actors/director/WeatherDirector.cs +++ b/FFXIVClassic Map Server/actors/director/WeatherDirector.cs @@ -25,24 +25,24 @@ namespace FFXIVClassic_Map_Server.Actors this.className = "Debug"; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/Director/Weather/WeatherDirector", false, false, false, false, weatherId); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Director/Weather/WeatherDirector", false, false, false, false, weatherId); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } - public override BasePacket getSpawnPackets(uint playerActorId) + public override BasePacket GetSpawnPackets(uint playerActorId) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 0)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, 0x1)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 0)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, 0x1)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } } } diff --git a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs index 5c0a972f..a5404dd6 100644 --- a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs +++ b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs @@ -27,11 +27,11 @@ namespace FFXIVClassic_Map_Server.actors.director this.eventConditions.noticeEventConditions = noticeEventList; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/Director/Quest/QuestDirectorMan0g001", false, false, false, false, false, 0x753A); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Director/Quest/QuestDirectorMan0g001", false, false, false, false, false, 0x753A); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } } } diff --git a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs index 26b8cf0c..821bcb86 100644 --- a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs +++ b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs @@ -27,11 +27,11 @@ namespace FFXIVClassic_Map_Server.actors.director this.eventConditions.noticeEventConditions = noticeEventList; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/Director/Quest/QuestDirectorMan0l001", false, false, false, false, false, 0x7532); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Director/Quest/QuestDirectorMan0l001", false, false, false, false, false, 0x7532); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } } } diff --git a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs index 11c50869..1c581b3b 100644 --- a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs +++ b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs @@ -27,11 +27,11 @@ namespace FFXIVClassic_Map_Server.actors.director this.eventConditions.noticeEventConditions = noticeEventList; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/Director/Quest/QuestDirectorMan0u001", false, false, false, false, false, 0x757F); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/Director/Quest/QuestDirectorMan0u001", false, false, false, false, false, 0x757F); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } } } diff --git a/FFXIVClassic Map Server/actors/quest/Quest.cs b/FFXIVClassic Map Server/actors/quest/Quest.cs index 1a56a6ba..4baa6899 100644 --- a/FFXIVClassic Map Server/actors/quest/Quest.cs +++ b/FFXIVClassic Map Server/actors/quest/Quest.cs @@ -115,7 +115,7 @@ namespace FFXIVClassic_Map_Server.Actors public void SaveData() { - Database.saveQuest(owner, this); + Database.SaveQuest(owner, this); } } diff --git a/FFXIVClassic Map Server/actors/world/WorldMaster.cs b/FFXIVClassic Map Server/actors/world/WorldMaster.cs index 7d58aa50..fd2a4a6a 100644 --- a/FFXIVClassic Map Server/actors/world/WorldMaster.cs +++ b/FFXIVClassic Map Server/actors/world/WorldMaster.cs @@ -16,24 +16,24 @@ namespace FFXIVClassic_Map_Server.Actors this.className = "WorldMaster"; } - public override SubPacket createScriptBindPacket(uint playerActorId) + public override SubPacket CreateScriptBindPacket(uint playerActorId) { List lParams; - lParams = LuaUtils.createLuaParamList("/World/WorldMaster_event", false, false, false, false, false, null); - return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams); + lParams = LuaUtils.CreateLuaParamList("/World/WorldMaster_event", false, false, false, false, false, null); + return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, className, lParams); } - public override BasePacket getSpawnPackets(uint playerActorId) + public override BasePacket GetSpawnPackets(uint playerActorId) { List subpackets = new List(); - subpackets.Add(createAddActorPacket(playerActorId, 0)); - subpackets.Add(createSpeedPacket(playerActorId)); - subpackets.Add(createSpawnPositonPacket(playerActorId, 0x1)); - subpackets.Add(createNamePacket(playerActorId)); - subpackets.Add(createStatePacket(playerActorId)); - subpackets.Add(createIsZoneingPacket(playerActorId)); - subpackets.Add(createScriptBindPacket(playerActorId)); - return BasePacket.createPacket(subpackets, true, false); + subpackets.Add(CreateAddActorPacket(playerActorId, 0)); + subpackets.Add(CreateSpeedPacket(playerActorId)); + subpackets.Add(CreateSpawnPositonPacket(playerActorId, 0x1)); + subpackets.Add(CreateNamePacket(playerActorId)); + subpackets.Add(CreateStatePacket(playerActorId)); + subpackets.Add(CreateIsZoneingPacket(playerActorId)); + subpackets.Add(CreateScriptBindPacket(playerActorId)); + return BasePacket.CreatePacket(subpackets, true, false); } } } diff --git a/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs b/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs index a3438b22..47b4defb 100644 --- a/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs +++ b/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs @@ -29,7 +29,7 @@ namespace FFXIVClassic_Map_Server.dataobjects actorInstanceList.Add(playerActor); } - public void setConnection(int type, ClientConnection conn) + public void SetConnection(int type, ClientConnection conn) { conn.connType = type; switch (type) @@ -43,55 +43,55 @@ namespace FFXIVClassic_Map_Server.dataobjects } } - public bool isClientConnectionsReady() + public bool IsClientConnectionsReady() { return (zoneConnection != null && chatConnection != null); } - public void disconnect() + public void Disconnect() { - zoneConnection.disconnect(); - chatConnection.disconnect(); + zoneConnection.Disconnect(); + chatConnection.Disconnect(); } - public bool isDisconnected() + public bool IsDisconnected() { - return (!zoneConnection.isConnected() && !chatConnection.isConnected()); + return (!zoneConnection.IsConnected() && !chatConnection.IsConnected()); } - public void queuePacket(BasePacket basePacket) + public void QueuePacket(BasePacket basePacket) { - zoneConnection.queuePacket(basePacket); + zoneConnection.QueuePacket(basePacket); } - public void queuePacket(SubPacket subPacket, bool isAuthed, bool isEncrypted) + public void QueuePacket(SubPacket subPacket, bool isAuthed, bool isEncrypted) { - zoneConnection.queuePacket(subPacket, isAuthed, isEncrypted); + zoneConnection.QueuePacket(subPacket, isAuthed, isEncrypted); } - public Player getActor() + public Player GetActor() { return playerActor; } - public void ping() + public void Ping() { lastPingPacket = Utils.UnixTimeStampUTC(); } - public bool checkIfDCing() + public bool CheckIfDCing() { uint currentTime = Utils.UnixTimeStampUTC(); if (currentTime - lastPingPacket >= 5000) //Show D/C flag - playerActor.setDCFlag(true); + playerActor.SetDCFlag(true); else if (currentTime - lastPingPacket >= 30000) //DCed return true; else - playerActor.setDCFlag(false); + playerActor.SetDCFlag(false); return false; } - public void updatePlayerActorPosition(float x, float y, float z, float rot, ushort moveState) + public void UpdatePlayerActorPosition(float x, float y, float z, float rot, ushort moveState) { playerActor.oldPositionX = playerActor.positionX; playerActor.oldPositionY = playerActor.positionY; @@ -104,11 +104,11 @@ namespace FFXIVClassic_Map_Server.dataobjects playerActor.rotation = rot; playerActor.moveState = moveState; - getActor().zone.updateActorPosition(getActor()); + GetActor().zone.UpdateActorPosition(GetActor()); } - public void updateInstance(List list) + public void UpdateInstance(List list) { List basePackets = new List(); List removeActorSubpackets = new List(); @@ -119,7 +119,7 @@ namespace FFXIVClassic_Map_Server.dataobjects { if (!list.Contains(actorInstanceList[i])) { - getActor().queuePacket(RemoveActorPacket.buildPacket(playerActor.actorId, actorInstanceList[i].actorId)); + GetActor().QueuePacket(RemoveActorPacket.BuildPacket(playerActor.actorId, actorInstanceList[i].actorId)); actorInstanceList.RemoveAt(i); } } @@ -134,18 +134,18 @@ namespace FFXIVClassic_Map_Server.dataobjects if (actorInstanceList.Contains(actor)) { - getActor().queuePacket(actor.createPositionUpdatePacket(playerActor.actorId)); + GetActor().QueuePacket(actor.CreatePositionUpdatePacket(playerActor.actorId)); } else { - getActor().queuePacket(actor.getSpawnPackets(playerActor.actorId, 1)); - getActor().queuePacket(actor.getInitPackets(playerActor.actorId)); - getActor().queuePacket(actor.getSetEventStatusPackets(playerActor.actorId)); + GetActor().QueuePacket(actor.GetSpawnPackets(playerActor.actorId, 1)); + GetActor().QueuePacket(actor.GetInitPackets(playerActor.actorId)); + GetActor().QueuePacket(actor.GetSetEventStatusPackets(playerActor.actorId)); actorInstanceList.Add(actor); if (actor is Npc) { - LuaEngine.doActorOnSpawn(getActor(), (Npc)actor); + LuaEngine.DoActorOnSpawn(GetActor(), (Npc)actor); } } } @@ -153,7 +153,7 @@ namespace FFXIVClassic_Map_Server.dataobjects } - public void clearInstance() + public void ClearInstance() { actorInstanceList.Clear(); } diff --git a/FFXIVClassic Map Server/dataobjects/DBWorld.cs b/FFXIVClassic Map Server/dataobjects/DBWorld.cs index f9b79bf6..4cad9ca3 100644 --- a/FFXIVClassic Map Server/dataobjects/DBWorld.cs +++ b/FFXIVClassic Map Server/dataobjects/DBWorld.cs @@ -3,7 +3,7 @@ class DBWorld { public ushort id; - public string address; + public string Address; public ushort port; public ushort listPosition; public ushort population; diff --git a/FFXIVClassic Map Server/dataobjects/InventoryItem.cs b/FFXIVClassic Map Server/dataobjects/InventoryItem.cs index e7d8f6fc..aec328be 100644 --- a/FFXIVClassic Map Server/dataobjects/InventoryItem.cs +++ b/FFXIVClassic Map Server/dataobjects/InventoryItem.cs @@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.dataobjects this.quantity = 1; this.slot = slot; - Item gItem = Server.getItemGamedata(itemId); + Item gItem = Server.GetItemGamedata(itemId); itemType = gItem.isExclusive ? (byte)0x3 : (byte)0x0; } @@ -72,7 +72,7 @@ namespace FFXIVClassic_Map_Server.dataobjects this.materia5 = materia5; } - public byte[] toPacketBytes() + public byte[] ToPacketBytes() { byte[] data = new byte[0x70]; diff --git a/FFXIVClassic Map Server/dataobjects/Item.cs b/FFXIVClassic Map Server/dataobjects/Item.cs index 351117c9..b9240aa7 100644 --- a/FFXIVClassic Map Server/dataobjects/Item.cs +++ b/FFXIVClassic Map Server/dataobjects/Item.cs @@ -378,7 +378,7 @@ namespace FFXIVClassic_Map_Server.dataobjects return -1; } - public double getItemHQValue(float value1, float value2) + public Double GetItemHQValue(float value1, float value2) { return Math.Max(value1 + 1, Math.Ceiling(value1 * value2)); } @@ -420,7 +420,7 @@ namespace FFXIVClassic_Map_Server.dataobjects public readonly int paramBonusType10; public readonly short paramBonusValue10; - public readonly short additionalEffect; + public readonly short AdditionalEffect; public readonly bool materialBindPermission; public readonly short materializeTable; @@ -459,7 +459,7 @@ namespace FFXIVClassic_Map_Server.dataobjects paramBonusType10 = reader.GetInt32("paramBonusType10"); paramBonusValue10 = reader.GetInt16("paramBonusValue10"); - additionalEffect = reader.GetInt16("additionalEffect"); + AdditionalEffect = reader.GetInt16("additionalEffect"); materialBindPermission = reader.GetBoolean("materiaBindPermission"); materializeTable = reader.GetInt16("materializeTable"); } diff --git a/FFXIVClassic Map Server/dataobjects/SearchEntry.cs b/FFXIVClassic Map Server/dataobjects/SearchEntry.cs index 9a60b055..d272a1bf 100644 --- a/FFXIVClassic Map Server/dataobjects/SearchEntry.cs +++ b/FFXIVClassic Map Server/dataobjects/SearchEntry.cs @@ -16,7 +16,7 @@ namespace FFXIVClassic_Map_Server.dataobjects public ushort[] classes = new ushort[2 * 20]; public ushort[] jobs = new ushort[8]; - public void writeSearchEntry(BinaryWriter writer) + public void WriteSearchEntry(BinaryWriter writer) { writer.Write((UInt16)preferredClass); writer.Write((UInt16)langauges); diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index 4e3e61d5..3444babd 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -28,13 +28,13 @@ namespace FFXIVClassic_Map_Server.lua UserData.RegistrationPolicy = InteropRegistrationPolicy.Automatic; } - public static List doActorInstantiate(Player player, Actor target) + public static List DoActorInstantiate(Player player, Actor target) { string luaPath; if (target is Npc) { - luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.getName()); + luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { Script script = loadScript(luaPath); @@ -43,12 +43,12 @@ namespace FFXIVClassic_Map_Server.lua return null; DynValue result = script.Call(script.Globals["init"], target); - List lparams = LuaUtils.createLuaParamList(result); + List lparams = LuaUtils.CreateLuaParamList(result); return lparams; } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.getName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); return null; } } @@ -56,20 +56,20 @@ namespace FFXIVClassic_Map_Server.lua return null; } - public static void doActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) + public static void DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) { string luaPath; if (target is Command) { - luaPath = String.Format(FILEPATH_COMMANDS, target.getName()); + luaPath = String.Format(FILEPATH_COMMANDS, target.GetName()); } else if (target is Director) { - luaPath = String.Format(FILEPATH_DIRECTORS, target.getName()); + luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName()); } else - luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.getName()); + luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { @@ -78,14 +78,14 @@ namespace FFXIVClassic_Map_Server.lua if (script == null) return; - //Have to do this to combine LuaParams + //Have to Do this to combine LuaParams List objects = new List(); objects.Add(player); objects.Add(target); objects.Add(eventStart.triggerName); if (eventStart.luaParams != null) - objects.AddRange(LuaUtils.createLuaParamObjectList(eventStart.luaParams)); + objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventStart.luaParams)); //Run Script if (!script.Globals.Get("onEventStarted").IsNil()) @@ -93,14 +93,14 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.getName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); } } - public static void doActorOnSpawn(Player player, Npc target) + public static void DoActorOnSpawn(Player player, Npc target) { - string luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.getName()); + string luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { @@ -115,21 +115,21 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.getName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); } } - public static void doActorOnEventUpdated(Player player, Actor target, EventUpdatePacket eventUpdate) + public static void DoActorOnEventUpdated(Player player, Actor target, EventUpdatePacket eventUpdate) { string luaPath; if (target is Command) - luaPath = String.Format(FILEPATH_COMMANDS, target.getName()); + luaPath = String.Format(FILEPATH_COMMANDS, target.GetName()); else if (target is Director) - luaPath = String.Format(FILEPATH_DIRECTORS, target.getName()); + luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName()); else - luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.getName()); + luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { @@ -138,12 +138,12 @@ namespace FFXIVClassic_Map_Server.lua if (script == null) return; - //Have to do this to combine LuaParams + //Have to Do this to combine LuaParams List objects = new List(); objects.Add(player); objects.Add(target); objects.Add(eventUpdate.val2); - objects.AddRange(LuaUtils.createLuaParamObjectList(eventUpdate.luaParams)); + objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventUpdate.luaParams)); //Run Script if (!script.Globals.Get("onEventUpdate").IsNil()) @@ -151,13 +151,13 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.getName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); } } - public static void onZoneIn(Player player) + public static void OnZoneIn(Player player) { - string luaPath = String.Format(FILEPATH_ZONE, player.getZone().actorId); + string luaPath = String.Format(FILEPATH_ZONE, player.GetZone().actorId); if (File.Exists(luaPath)) { @@ -172,7 +172,7 @@ namespace FFXIVClassic_Map_Server.lua } } - public static void onBeginLogin(Player player) + public static void OnBeginLogin(Player player) { if (File.Exists(FILEPATH_PLAYER)) { @@ -187,7 +187,7 @@ namespace FFXIVClassic_Map_Server.lua } } - public static void onLogin(Player player) + public static void OnLogin(Player player) { if (File.Exists(FILEPATH_PLAYER)) { @@ -207,9 +207,9 @@ namespace FFXIVClassic_Map_Server.lua Script script = new Script(); ((FileSystemScriptLoader)script.Options.ScriptLoader).ModulePaths = FileSystemScriptLoader.UnpackStringPaths("./scripts/?;./scripts/?.lua"); script.Globals["getWorldManager"] = (Func)Server.GetWorldManager; - script.Globals["getStaticActor"] = (Func)Server.getStaticActors; + script.Globals["getStaticActor"] = (Func)Server.GetStaticActors; script.Globals["getWorldMaster"] = (Func)Server.GetWorldManager().GetActor; - script.Globals["getItemGamedata"] = (Func)Server.getItemGamedata; + script.Globals["getItemGamedata"] = (Func)Server.GetItemGamedata; try { @@ -225,16 +225,16 @@ namespace FFXIVClassic_Map_Server.lua private static void SendError(Player player, string message) { - List sendError = new List(); - sendError.Add(EndEventPacket.buildPacket(player.actorId, player.currentEventOwner, player.currentEventName)); - player.sendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message); - player.playerSession.queuePacket(BasePacket.createPacket(sendError, true, false)); + List SendError = new List(); + SendError.Add(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName)); + player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message); + player.playerSession.QueuePacket(BasePacket.CreatePacket(SendError, true, false)); } - internal static void doDirectorOnTalked(Director director, Player player, Npc npc) + internal static void DoDirectorOnTalked(Director director, Player player, Npc npc) { - string luaPath = String.Format(FILEPATH_DIRECTORS, director.getName()); + string luaPath = String.Format(FILEPATH_DIRECTORS, director.GetName()); if (File.Exists(luaPath)) { @@ -249,13 +249,13 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.getName())); + SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.GetName())); } } - internal static void doDirectorOnCommand(Director director, Player player, Command command) + internal static void DoDirectorOnCommand(Director director, Player player, Command command) { - string luaPath = String.Format(FILEPATH_DIRECTORS, director.getName()); + string luaPath = String.Format(FILEPATH_DIRECTORS, director.GetName()); if (File.Exists(luaPath)) { @@ -270,7 +270,7 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.getName())); + SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.GetName())); } } } diff --git a/FFXIVClassic Map Server/lua/LuaEvent.cs b/FFXIVClassic Map Server/lua/LuaEvent.cs index 12a57ed9..a22aae1b 100644 --- a/FFXIVClassic Map Server/lua/LuaEvent.cs +++ b/FFXIVClassic Map Server/lua/LuaEvent.cs @@ -2,12 +2,12 @@ { class LuaEvent { - public static void getStep() + public static void GetStep() { } - public static void getParam() + public static void GetParam() { } diff --git a/FFXIVClassic Map Server/lua/LuaPlayer.cs b/FFXIVClassic Map Server/lua/LuaPlayer.cs index b8be404b..5ad16978 100644 --- a/FFXIVClassic Map Server/lua/LuaPlayer.cs +++ b/FFXIVClassic Map Server/lua/LuaPlayer.cs @@ -15,55 +15,55 @@ namespace FFXIVClassic_Map_Server.lua this.player = player; } - public void setMusic(ushort musicID, ushort playMode) + public void SetMusic(ushort musicID, ushort playMode) { - player.playerSession.queuePacket(SetMusicPacket.buildPacket(player.actorId, musicID, playMode), true, false); + player.playerSession.QueuePacket(SetMusicPacket.BuildPacket(player.actorId, musicID, playMode), true, false); } - public void setWeather(ushort weatherID) + public void SetWeather(ushort weatherID) { - player.playerSession.queuePacket(SetWeatherPacket.buildPacket(player.actorId, weatherID, 1), true, false); + player.playerSession.QueuePacket(SetWeatherPacket.BuildPacket(player.actorId, weatherID, 1), true, false); } - public void getParameter(string paramName) + public void GetParameter(string paramName) { } - public void setParameter(string paramName, object value, string uiToRefresh) + public void SetParameter(string paramName, object value, string uiToRefresh) { } - public void getAttributePoints() + public void GetAttributePoints() { } - public void setAttributePoints(int str, int vit, int dex, int inte, int min, int pie) + public void SetAttributePoints(int str, int vit, int dex, int inte, int min, int pie) { } - public void logout() + public void Logout() { - player.playerSession.queuePacket(LogoutPacket.buildPacket(player.actorId), true, false); + player.playerSession.QueuePacket(LogoutPacket.BuildPacket(player.actorId), true, false); } - public void quitGame() + public void QuitGame() { - player.playerSession.queuePacket(QuitPacket.buildPacket(player.actorId), true, false); + player.playerSession.QueuePacket(QuitPacket.BuildPacket(player.actorId), true, false); } - public void runEvent(string functionName, params object[] parameters) + public void RunEvent(string functionName, params object[] parameters) { - List lParams = LuaUtils.createLuaParamList(parameters); - // player.playerSession.queuePacket(RunEventFunctionPacket.buildPacket(player.actorId, player.eventCurrentOwner, player.eventCurrentStarter, functionName, lParams), true, false); + List lParams = LuaUtils.CreateLuaParamList(parameters); + // player.playerSession.QueuePacket(RunEventFunctionPacket.BuildPacket(player.actorId, player.eventCurrentOwner, player.eventCurrentStarter, functionName, lParams), true, false); } - public void endEvent() + public void EndEvent() { - // player.playerSession.queuePacket(EndEventPacket.buildPacket(player.actorId, player.eventCurrentOwner, player.eventCurrentStarter), true, false); + // player.playerSession.QueuePacket(EndEventPacket.BuildPacket(player.actorId, player.eventCurrentOwner, player.eventCurrentStarter), true, false); } } diff --git a/FFXIVClassic Map Server/lua/LuaUtils.cs b/FFXIVClassic Map Server/lua/LuaUtils.cs index 341f69be..84a340ab 100644 --- a/FFXIVClassic Map Server/lua/LuaUtils.cs +++ b/FFXIVClassic Map Server/lua/LuaUtils.cs @@ -40,7 +40,7 @@ namespace FFXIVClassic_Map_Server } } - public static List readLuaParams(BinaryReader reader) + public static List ReadLuaParams(BinaryReader reader) { List luaParams = new List(); @@ -54,10 +54,10 @@ namespace FFXIVClassic_Map_Server switch (code) { case 0x0: //Int32 - value = Utils.swapEndian(reader.ReadInt32()); + value = Utils.SwapEndian(reader.ReadInt32()); break; case 0x1: //Int32 - value = Utils.swapEndian(reader.ReadUInt32()); + value = Utils.SwapEndian(reader.ReadUInt32()); break; case 0x2: //Null Termed String List list = new List(); @@ -79,17 +79,17 @@ namespace FFXIVClassic_Map_Server wasNil = true; break; case 0x6: //Actor (By Id) - value = Utils.swapEndian(reader.ReadUInt32()); + value = Utils.SwapEndian(reader.ReadUInt32()); break; case 0x7: //Weird one used for inventory - uint type7ActorId = Utils.swapEndian(reader.ReadUInt32()); + uint type7ActorId = Utils.SwapEndian(reader.ReadUInt32()); byte type7Unknown = reader.ReadByte(); byte type7Slot = reader.ReadByte(); byte type7InventoryType = reader.ReadByte(); value = new Type7Param(type7ActorId, type7Unknown, type7Slot, type7InventoryType); break; case 0x9: //Two Longs (only storing first one) - value = new Type9Param(Utils.swapEndian(reader.ReadUInt64()), Utils.swapEndian(reader.ReadUInt64())); + value = new Type9Param(Utils.SwapEndian(reader.ReadUInt64()), Utils.SwapEndian(reader.ReadUInt64())); break; case 0xC: //Byte value = reader.ReadByte(); @@ -114,7 +114,7 @@ namespace FFXIVClassic_Map_Server return luaParams; } - public static void writeLuaParams(BinaryWriter writer, List luaParams) + public static void WriteLuaParams(BinaryWriter writer, List luaParams) { foreach (LuaParam l in luaParams) { @@ -126,10 +126,10 @@ namespace FFXIVClassic_Map_Server switch (l.typeID) { case 0x0: //Int32 - writer.Write((Int32)Utils.swapEndian((Int32)l.value)); + writer.Write((Int32)Utils.SwapEndian((Int32)l.value)); break; case 0x1: //Int32 - writer.Write((UInt32)Utils.swapEndian((UInt32)l.value)); + writer.Write((UInt32)Utils.SwapEndian((UInt32)l.value)); break; case 0x2: //Null Termed String string sv = (string)l.value; @@ -143,18 +143,18 @@ namespace FFXIVClassic_Map_Server case 0x5: //Nil break; case 0x6: //Actor (By Id) - writer.Write((UInt32)Utils.swapEndian((UInt32)l.value)); + writer.Write((UInt32)Utils.SwapEndian((UInt32)l.value)); break; case 0x7: //Weird one used for inventory Type7Param type7 = (Type7Param)l.value; - writer.Write((UInt32)Utils.swapEndian((UInt32)type7.actorId)); + writer.Write((UInt32)Utils.SwapEndian((UInt32)type7.actorId)); writer.Write((Byte)type7.unknown); writer.Write((Byte)type7.slot); writer.Write((Byte)type7.inventoryType); break; case 0x9: //Two Longs (only storing first one) - writer.Write((UInt64)Utils.swapEndian(((Type9Param)l.value).item1)); - writer.Write((UInt64)Utils.swapEndian(((Type9Param)l.value).item2)); + writer.Write((UInt64)Utils.SwapEndian(((Type9Param)l.value).item1)); + writer.Write((UInt64)Utils.SwapEndian(((Type9Param)l.value).item2)); break; case 0xC: //Byte writer.Write((Byte)l.value); @@ -169,7 +169,7 @@ namespace FFXIVClassic_Map_Server writer.Write((Byte)0xF); } - public static List readLuaParams(byte[] bytesIn) + public static List ReadLuaParams(byte[] bytesIn) { List luaParams = new List(); @@ -187,10 +187,10 @@ namespace FFXIVClassic_Map_Server switch (code) { case 0x0: //Int32 - value = Utils.swapEndian(reader.ReadInt32()); + value = Utils.SwapEndian(reader.ReadInt32()); break; case 0x1: //Int32 - value = Utils.swapEndian(reader.ReadUInt32()); + value = Utils.SwapEndian(reader.ReadUInt32()); break; case 0x2: //Null Termed String List list = new List(); @@ -213,17 +213,17 @@ namespace FFXIVClassic_Map_Server wasNil = true; break; case 0x6: //Actor (By Id) - value = Utils.swapEndian(reader.ReadUInt32()); + value = Utils.SwapEndian(reader.ReadUInt32()); break; case 0x7: //Weird one used for inventory - uint type7ActorId = Utils.swapEndian(reader.ReadUInt32()); + uint type7ActorId = Utils.SwapEndian(reader.ReadUInt32()); byte type7Unknown = reader.ReadByte(); byte type7Slot = reader.ReadByte(); byte type7InventoryType = reader.ReadByte(); value = new Type7Param(type7ActorId, type7Unknown, type7Slot, type7InventoryType); break; case 0x9: //Two Longs (only storing first one) - value = new Type9Param(Utils.swapEndian(reader.ReadUInt64()), Utils.swapEndian(reader.ReadUInt64())); + value = new Type9Param(Utils.SwapEndian(reader.ReadUInt64()), Utils.SwapEndian(reader.ReadUInt64())); break; case 0xC: //Byte value = reader.ReadByte(); @@ -249,7 +249,7 @@ namespace FFXIVClassic_Map_Server return luaParams; } - public static List createLuaParamList(DynValue fromScript) + public static List CreateLuaParamList(DynValue fromScript) { List luaParams = new List(); @@ -257,16 +257,16 @@ namespace FFXIVClassic_Map_Server { foreach (DynValue d in fromScript.Tuple) { - addToList(d, luaParams); + AddToList(d, luaParams); } } else - addToList(fromScript, luaParams); + AddToList(fromScript, luaParams); return luaParams; } - public static List createLuaParamList(params object[] list) + public static List CreateLuaParamList(params object[] list) { List luaParams = new List(); @@ -276,16 +276,16 @@ namespace FFXIVClassic_Map_Server { Array arrayO = (Array)o; foreach (object o2 in arrayO) - addToList(o2, luaParams); + AddToList(o2, luaParams); } else - addToList(o, luaParams); + AddToList(o, luaParams); } return luaParams; } - private static void addToList(DynValue d, List luaParams) + private static void AddToList(DynValue d, List luaParams) { if (d.Type == DataType.Number) { @@ -316,7 +316,7 @@ namespace FFXIVClassic_Map_Server } } - private static void addToList(object o, List luaParams) + private static void AddToList(object o, List luaParams) { if (o is int) { @@ -326,7 +326,7 @@ namespace FFXIVClassic_Map_Server { luaParams.Add(new LuaParam(0x1, (uint)o)); } - else if (o is double) + else if (o is Double) { if (((double)o) % 1 == 0) luaParams.Add(new LuaParam(0x0, (int)(double)o)); @@ -364,7 +364,7 @@ namespace FFXIVClassic_Map_Server } } - public static object[] createLuaParamObjectList(List luaParams) + public static object[] CreateLuaParamObjectList(List luaParams) { object[] list = new object[luaParams.Count]; @@ -375,7 +375,7 @@ namespace FFXIVClassic_Map_Server } - public static string dumpParams(List lParams) + public static string DumpParams(List lParams) { if (lParams == null) return "Param list was null?"; diff --git a/FFXIVClassic Map Server/packets/BasePacket.cs b/FFXIVClassic Map Server/packets/BasePacket.cs index 1def763e..2a74d790 100644 --- a/FFXIVClassic Map Server/packets/BasePacket.cs +++ b/FFXIVClassic Map Server/packets/BasePacket.cs @@ -102,7 +102,7 @@ namespace FFXIVClassic_Map_Server.packets this.data = data; } - public List getSubpackets() + public List GetSubpackets() { List subpackets = new List(header.numSubpackets); @@ -114,7 +114,7 @@ namespace FFXIVClassic_Map_Server.packets return subpackets; } - public unsafe static BasePacketHeader getHeader(byte[] bytes) + public unsafe static BasePacketHeader GetHeader(byte[] bytes) { BasePacketHeader header; if (bytes.Length < BASEPACKET_SIZE) @@ -128,7 +128,7 @@ namespace FFXIVClassic_Map_Server.packets return header; } - public byte[] getHeaderBytes() + public byte[] GetHeaderBytes() { int size = Marshal.SizeOf(header); byte[] arr = new byte[size]; @@ -140,16 +140,16 @@ namespace FFXIVClassic_Map_Server.packets return arr; } - public byte[] getPacketBytes() + public byte[] GetPacketBytes() { byte[] outBytes = new byte[header.packetSize]; - Array.Copy(getHeaderBytes(), 0, outBytes, 0, BASEPACKET_SIZE); + 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) + public void ReplaceActorID(uint actorID) { using (MemoryStream mem = new MemoryStream(data)) { @@ -172,7 +172,7 @@ namespace FFXIVClassic_Map_Server.packets } //Replaces all instances of the sniffed actorID with the given one - public void replaceActorID(uint fromActorID, uint actorID) + public void ReplaceActorID(uint fromActorID, uint actorID) { using (MemoryStream mem = new MemoryStream(data)) { @@ -195,7 +195,7 @@ namespace FFXIVClassic_Map_Server.packets } #region Utility Functions - public static BasePacket createPacket(List subpackets, bool isAuthed, bool isCompressed) + public static BasePacket CreatePacket(List subpackets, bool isAuthed, bool isCompressed) { //Create Header BasePacketHeader header = new BasePacketHeader(); @@ -217,7 +217,7 @@ namespace FFXIVClassic_Map_Server.packets int offset = 0; foreach (SubPacket subpacket in subpackets) { - byte[] subpacketData = subpacket.getBytes(); + byte[] subpacketData = subpacket.GetBytes(); Array.Copy(subpacketData, 0, data, offset, subpacketData.Length); offset += (ushort)subpacketData.Length; } @@ -228,7 +228,7 @@ namespace FFXIVClassic_Map_Server.packets return packet; } - public static BasePacket createPacket(SubPacket subpacket, bool isAuthed, bool isCompressed) + public static BasePacket CreatePacket(SubPacket subpacket, bool isAuthed, bool isCompressed) { //Create Header BasePacketHeader header = new BasePacketHeader(); @@ -246,7 +246,7 @@ namespace FFXIVClassic_Map_Server.packets data = new byte[header.packetSize - 0x10]; //Add Subpackets - byte[] subpacketData = subpacket.getBytes(); + byte[] subpacketData = subpacket.GetBytes(); Array.Copy(subpacketData, 0, data, 0, subpacketData.Length); Debug.Assert(data != null); @@ -255,7 +255,7 @@ namespace FFXIVClassic_Map_Server.packets return packet; } - public static BasePacket createPacket(byte[] data, bool isAuthed, bool isCompressed) + public static BasePacket CreatePacket(byte[] data, bool isAuthed, bool isCompressed) { Debug.Assert(data != null); @@ -276,7 +276,7 @@ namespace FFXIVClassic_Map_Server.packets return packet; } - public static unsafe void encryptPacket(Blowfish blowfish, BasePacket packet) + public static unsafe void EncryptPacket(Blowfish blowfish, BasePacket packet) { byte[] data = packet.data; int size = packet.header.packetSize; @@ -302,7 +302,7 @@ namespace FFXIVClassic_Map_Server.packets } - public static unsafe void decryptPacket(Blowfish blowfish, ref BasePacket packet) + public static unsafe void DecryptPacket(Blowfish blowfish, ref BasePacket packet) { byte[] data = packet.data; int size = packet.header.packetSize; @@ -329,16 +329,16 @@ namespace FFXIVClassic_Map_Server.packets } #endregion - public void debugPrintPacket() + public void DebugPrintPacket() { #if DEBUG Console.BackgroundColor = ConsoleColor.DarkYellow; - Program.Log.Debug("IsAuth: {0} IsEncrypted: {1}, Size: 0x{2:X}, NumSubpackets: {3}{4}{5}", header.isAuthenticated, header.isCompressed, header.packetSize, header.numSubpackets, Environment.NewLine, Utils.ByteArrayToHex(getHeaderBytes())); + Program.Log.Debug("IsAuth: {0} IsEncrypted: {1}, Size: 0x{2:X}, NumSubpackets: {3}{4}{5}", header.isAuthenticated, header.isCompressed, header.packetSize, header.numSubpackets, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes())); - foreach (SubPacket sub in getSubpackets()) + foreach (SubPacket sub in GetSubpackets()) { - sub.debugPrintSubPacket(); + sub.DebugPrintSubPacket(); } Console.BackgroundColor = ConsoleColor.Black; diff --git a/FFXIVClassic Map Server/packets/SubPacket.cs b/FFXIVClassic Map Server/packets/SubPacket.cs index da285388..5bb0b746 100644 --- a/FFXIVClassic Map Server/packets/SubPacket.cs +++ b/FFXIVClassic Map Server/packets/SubPacket.cs @@ -101,7 +101,7 @@ namespace FFXIVClassic_Map_Server.packets data = original.data; } - public byte[] getHeaderBytes() + public byte[] GetHeaderBytes() { int size = Marshal.SizeOf(header); byte[] arr = new byte[size]; @@ -113,7 +113,7 @@ namespace FFXIVClassic_Map_Server.packets return arr; } - public byte[] getGameMessageBytes() + public byte[] GetGameMessageBytes() { int size = Marshal.SizeOf(gameMessage); byte[] arr = new byte[size]; @@ -125,28 +125,28 @@ namespace FFXIVClassic_Map_Server.packets return arr; } - public byte[] getBytes() + public byte[] GetBytes() { byte[] outBytes = new byte[header.subpacketSize]; - Array.Copy(getHeaderBytes(), 0, outBytes, 0, SUBPACKET_SIZE); + Array.Copy(GetHeaderBytes(), 0, outBytes, 0, SUBPACKET_SIZE); if (header.type == 0x3) - Array.Copy(getGameMessageBytes(), 0, outBytes, SUBPACKET_SIZE, GAMEMESSAGE_SIZE); + 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() + public void DebugPrintSubPacket() { #if DEBUG Console.BackgroundColor = ConsoleColor.DarkRed; - Program.Log.Debug("Size: 0x{0:X}{1}{2}", header.subpacketSize, Environment.NewLine, Utils.ByteArrayToHex(getHeaderBytes())); + Program.Log.Debug("Size: 0x{0:X}{1}{2}", header.subpacketSize, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes())); if (header.type == 0x03) { - Program.Log.Debug("Opcode: 0x{0:X}{1}{2}", gameMessage.opcode, Environment.NewLine, Utils.ByteArrayToHex(getGameMessageBytes(), SUBPACKET_SIZE)); + Program.Log.Debug("Opcode: 0x{0:X}{1}{2}", gameMessage.opcode, Environment.NewLine, Utils.ByteArrayToHex(GetGameMessageBytes(), SUBPACKET_SIZE)); Console.BackgroundColor = ConsoleColor.DarkMagenta; diff --git a/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs b/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs index a7e14a2a..34daa640 100644 --- a/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs +++ b/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs @@ -63,7 +63,7 @@ namespace FFXIVClassic_Map_Server.packets.receive.events binReader.BaseStream.Seek(0x31, SeekOrigin.Begin); - luaParams = LuaUtils.readLuaParams(binReader); + luaParams = LuaUtils.ReadLuaParams(binReader); } catch (Exception){ invalidPacket = true; diff --git a/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs b/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs index dfc60347..656531de 100644 --- a/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs +++ b/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs @@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.receive.events val1 = binReader.ReadUInt32(); val2 = binReader.ReadUInt32(); step = binReader.ReadByte(); - luaParams = LuaUtils.readLuaParams(binReader); + luaParams = LuaUtils.ReadLuaParams(binReader); } catch (Exception){ invalidPacket = true; diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs index 6bb36c4b..ee59c7d3 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00E1; public const uint PACKET_SIZE = 0x30; - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId, uint targettedActorId, uint emoteID) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, uint targettedActorId, uint emoteID) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } SubPacket packet = new SubPacket(OPCODE, sourceActorId, targetActorId, data); - packet.debugPrintSubPacket(); + packet.DebugPrintSubPacket(); return packet; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs index 0a9f69f8..14a72cb8 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CC; public const uint PACKET_SIZE = 0x128; - public static SubPacket buildPacket(uint sourceActorID, uint targetActorID, string objectName, string className, List initParams) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, string objectName, string className, List initParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor binWriter.BaseStream.Seek(0x24, SeekOrigin.Begin); binWriter.Write(Encoding.ASCII.GetBytes(className), 0, Encoding.ASCII.GetByteCount(className) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(className)); binWriter.BaseStream.Seek(0x44, SeekOrigin.Begin); - LuaUtils.writeLuaParams(binWriter, initParams); + LuaUtils.WriteLuaParams(binWriter, initParams); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs index 7db9cef7..2ba4f976 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00E3; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, int iconCode) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, int iconCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs index b0f4fd24..c561e9d4 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x00CA; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint actorID, byte val) + public static SubPacket BuildPacket(uint playerActorID, uint actorID, byte val) { byte[] data = new byte[PACKET_SIZE-0x20]; data[0] = val; //Why? diff --git a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs index c2ac69e3..e6d61e39 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0139; public const uint PACKET_SIZE = 0x58; - public static SubPacket buildPacket(uint sourceId, uint targetId) + public static SubPacket BuildPacket(uint sourceId, uint targetId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs index d3461cd3..e4bf1ef1 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x0007; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]); } diff --git a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs index 01c054c9..60e5596a 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CF; public const uint PACKET_SIZE = 0x50; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, float x, float y, float z, float rot, ushort moveState) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float x, float y, float z, float rot, ushort moveState) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs index eaeb97bf..6d612713 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CB; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint actorId) + public static SubPacket BuildPacket(uint playerActorID, uint actorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs index d0e7d85b..2769482c 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs @@ -51,7 +51,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor appearanceIDs = appearanceTable; } - public SubPacket buildPacket(uint playerActorID, uint actorID) + public SubPacket BuildPacket(uint playerActorID, uint actorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs index adedc0b0..662e6096 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0145; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, uint iconCode) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint iconCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs index e332dbaf..12341c95 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x144; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetID, uint idleAnimationId) + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint idleAnimationId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs index 8e30823a..5b46c55b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x017B; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, bool isDimmed) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, bool isDimmed) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(isDimmed ? 1 : 0); diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs index 7ef682fb..6036cd4d 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x013D; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, uint displayNameID, string customName) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint displayNameID, string customName) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs index 59a1a683..7e0012ea 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs @@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const float INNPOS_Z = 165.050003f; public const float INNPOS_ROT = -1.530000f; - public static SubPacket buildPacket(uint sourceActorID, uint targetActorID, uint actorId, float x, float y, float z, float rotation, uint spawnType, bool isZoningPlayer) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint actorId, float x, float y, float z, float rotation, uint spawnType, bool isZoningPlayer) { byte[] data = new byte[PACKET_SIZE-0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs index 62d53728..b059f506 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs @@ -34,13 +34,13 @@ namespace FFXIVClassic_Map_Server.packets.send.actor currentTarget = startingTarget; } - public void closeStreams() + public void CloseStreams() { binWriter.Dispose(); mem.Dispose(); } - public bool addByte(uint id, byte value) + public bool AddByte(uint id, byte value) { if (runningByteTotal + 6 + (1 + Encoding.ASCII.GetByteCount(currentTarget)) > MAXBYTES) return false; @@ -53,7 +53,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addShort(uint id, ushort value) + public bool AddShort(uint id, ushort value) { if (runningByteTotal + 7 + (1 + Encoding.ASCII.GetByteCount(currentTarget)) > MAXBYTES) return false; @@ -66,7 +66,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addInt(uint id, uint value) + public bool AddInt(uint id, uint value) { if (runningByteTotal + 9 + (1 + Encoding.ASCII.GetByteCount(currentTarget)) > MAXBYTES) return false; @@ -79,7 +79,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addBuffer(uint id, byte[] buffer) + public bool AddBuffer(uint id, byte[] buffer) { if (runningByteTotal + 5 + buffer.Length + (1 + Encoding.ASCII.GetByteCount(currentTarget)) > MAXBYTES) return false; @@ -92,7 +92,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addBuffer(uint id, byte[] buffer, int index, int length, int page) + public bool AddBuffer(uint id, byte[] buffer, int index, int length, int page) { if (runningByteTotal + 5 + length + (1 + Encoding.ASCII.GetByteCount(currentTarget)) > MAXBYTES) return false; @@ -106,7 +106,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addProperty(FFXIVClassic_Map_Server.Actors.Actor actor, string name) + public bool AddProperty(FFXIVClassic_Map_Server.Actors.Actor actor, string name) { string[] split = name.Split('.'); int arrayIndex = 0; @@ -151,43 +151,43 @@ namespace FFXIVClassic_Map_Server.packets.send.actor if (curObj == null) return false; - //Cast to the proper object and add to packet + //Cast to the proper object and Add to packet uint id = Utils.MurmurHash2(name, 0); if (curObj is bool) - return addByte(id, (byte)(((bool)curObj) ? 1 : 0)); + return AddByte(id, (byte)(((bool)curObj) ? 1 : 0)); else if (curObj is byte) - return addByte(id, (byte)curObj); + return AddByte(id, (byte)curObj); else if (curObj is ushort) - return addShort(id, (ushort)curObj); + return AddShort(id, (ushort)curObj); else if (curObj is short) - return addShort(id, (ushort)(short)curObj); + return AddShort(id, (ushort)(short)curObj); else if (curObj is uint) - return addInt(id, (uint)curObj); + return AddInt(id, (uint)curObj); else if (curObj is int) - return addInt(id, (uint)(int)curObj); + return AddInt(id, (uint)(int)curObj); else if (curObj is float) - return addBuffer(id, BitConverter.GetBytes((float)curObj)); + return AddBuffer(id, BitConverter.GetBytes((float)curObj)); else return false; } } - public void setIsArrayMode(bool flag) + public void SetIsArrayMode(bool flag) { isArrayMode = flag; } - public void setIsMore(bool flag) + public void SetIsMore(bool flag) { isMore = flag; } - public void setTarget(string target) + public void SetTarget(string target) { currentTarget = target; } - public void addTarget() + public void AddTarget() { if (isArrayMode) binWriter.Write((byte)(0xA4 + currentTarget.Length)); @@ -197,7 +197,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor runningByteTotal += (ushort)(1 + Encoding.ASCII.GetByteCount(currentTarget)); } - public void addTarget(string newTarget) + public void AddTarget(string newTarget) { binWriter.Write((byte)(isMore ? 0x60 + currentTarget.Length : 0x82 + currentTarget.Length)); binWriter.Write(Encoding.ASCII.GetBytes(currentTarget)); @@ -205,12 +205,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor currentTarget = newTarget; } - public SubPacket buildPacket(uint playerActorID, uint actorID) + public SubPacket BuildPacket(uint playerActorID, uint actorID) { binWriter.Seek(0, SeekOrigin.Begin); binWriter.Write((byte)runningByteTotal); - closeStreams(); + CloseStreams(); SubPacket packet = new SubPacket(OPCODE, actorID, playerActorID, data); return packet; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs index 659fc5aa..5f22942b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const float DEFAULT_WALK = 2.0f; public const float DEFAULT_RUN = 5.0f; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return new SubPacket(OPCODE, playerActorID, targetActorID, data); } - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, float stopSpeed, float walkSpeed, float runSpeed) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float stopSpeed, float walkSpeed, float runSpeed) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs index 386abe7c..bb3a0cc6 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs @@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x134; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetID, uint mainState, uint subState) + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint mainState, uint subState) { ulong combined = (mainState & 0xFF) | ((subState & 0xFF) << 8); return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes(combined)); diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs index 3135f353..277dda2b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0179; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, ushort[] statusIds) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, ushort[] statusIds) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs index 63b3d8e6..bd148efb 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0177; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, ushort index, ushort statusCode) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, ushort index, ushort statusCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs index b144942e..ebc77e0d 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00D3; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, uint targetID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint targetID) { return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID)); } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs index db269009..645209cc 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00DB; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, uint targetID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint targetID) { return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID)); } diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs index 90f6395a..066cb231 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x132; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, ushort number, string function) + public static SubPacket BuildPacket(uint playerActorID, ushort number, string function) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs index ad31f280..7fe72cae 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x000F; public const uint PACKET_SIZE = 0x38; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs index f2173c62..30995408 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle public const ushort OPCODE = 0x013C; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, ushort commandId) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, ushort commandId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs index 04edb879..0a90d960 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle public const ushort OPCODE = 0x0139; public const uint PACKET_SIZE = 0x58; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, uint effectId, ushort worldMasterTextId, ushort commandId, ushort amount, byte param) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, uint effectId, ushort worldMasterTextId, ushort commandId, ushort amount, byte param) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs index c809bc61..67775962 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle public const ushort OPCODE = 0x013A; public const uint PACKET_SIZE = 0xD8; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorId, uint animationId, ushort commandId, BattleAction[] actionList) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint animationId, ushort commandId, BattleAction[] actionList) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs index 3345b801..38038ab3 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle public const ushort OPCODE = 0x013B; public const uint PACKET_SIZE = 0x148; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorId, uint animationId, ushort commandId, BattleAction[] actionList) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint animationId, ushort commandId, BattleAction[] actionList) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs index a5f6d6e3..dc98bab6 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x016C; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, EventList.EmoteEventCondition condition) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.EmoteEventCondition condition) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs index dcf14e4a..4867950a 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x0136; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, bool enabled, byte unknown2, string conditionName) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, bool enabled, byte unknown2, string conditionName) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs index d48bff56..04099db3 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x016B; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, EventList.NoticeEventCondition condition) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.NoticeEventCondition condition) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs index c218339e..7b55dbd1 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x016F; public const uint PACKET_SIZE = 0x58; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, EventList.PushCircleEventCondition condition) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.PushCircleEventCondition condition) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs index 21b638b2..3d81c625 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x0170; public const uint PACKET_SIZE = 0x60; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, EventList.PushFanEventCondition condition) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.PushFanEventCondition condition) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events binWriter.Write(Encoding.ASCII.GetBytes(condition.conditionName), 0, Encoding.ASCII.GetByteCount(condition.conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(condition.conditionName)); } } - new SubPacket(OPCODE, sourceActorID, playerActorID, data).debugPrintSubPacket(); + new SubPacket(OPCODE, sourceActorID, playerActorID, data).DebugPrintSubPacket(); return new SubPacket(OPCODE, sourceActorID, playerActorID, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs index 517dc082..97a0ffd2 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x0175; public const uint PACKET_SIZE = 0x60; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, EventList.PushBoxEventCondition condition) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.PushBoxEventCondition condition) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs index 716ead46..4616cbd9 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events public const ushort OPCODE = 0x012E; public const uint PACKET_SIZE = 0x48; - public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, EventList.TalkEventCondition condition) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.TalkEventCondition condition) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs index 4f3175b1..364c575c 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x014D; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, ushort equipSlot, uint itemSlot) + public static SubPacket BuildPacket(uint playerActorID, ushort equipSlot, uint itemSlot) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs index 5e956990..ccf67e65 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x14E; public const uint PACKET_SIZE = 0x58; - public static SubPacket buildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs index c9776eb7..5fc79272 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x14F; public const uint PACKET_SIZE = 0x80; - public static SubPacket buildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs index b4827947..c6dde267 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x150; public const uint PACKET_SIZE = 0xE0; - public static SubPacket buildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs index 410556b2..309f2cf5 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x151; public const uint PACKET_SIZE = 0x194; - public static SubPacket buildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorId, InventoryItem[] equipment, List slotsToUpdate, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs index ea90f1d0..4df15032 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs @@ -5,14 +5,14 @@ public const ushort OPCODE = 0x016D; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId) { byte[] data = new byte[8]; data[0] = 2; return new SubPacket(OPCODE, sourceActorId, targetActorId, data); } - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { byte[] data = new byte[8]; return new SubPacket(OPCODE, playerActorID, playerActorID, data); diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs index 516d3396..c6944676 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs @@ -5,12 +5,12 @@ public const ushort OPCODE = 0x016E; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId) { return new SubPacket(OPCODE, sourceActorId, targetActorId, new byte[8]); } - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]); } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs index ab5db224..d1665120 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x0149; public const uint PACKET_SIZE = 0x90; - public static SubPacket buildPacket(uint playerActorID, List items, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List items, ref int listOffset) { byte[] data; @@ -20,7 +20,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory { for (int i = listOffset; i < items.Count; i++) { - binWriter.Write(items[i].toPacketBytes()); + binWriter.Write(items[i].ToPacketBytes()); listOffset++; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs index bffc20bc..75cdd97d 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x014A; public const uint PACKET_SIZE = 0x90; - public static SubPacket buildPacket(uint playerActorID, List items, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List items, ref int listOffset) { byte[] data; @@ -20,7 +20,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory { for (int i = listOffset; i < items.Count; i++) { - binWriter.Write(items[i].toPacketBytes()); + binWriter.Write(items[i].ToPacketBytes()); listOffset++; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs index f585b22c..5d4db4fe 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs @@ -8,12 +8,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory public const ushort OPCODE = 0x0148; public const uint PACKET_SIZE = 0x90; - public static SubPacket buildPacket(uint playerActorId, InventoryItem item) + public static SubPacket BuildPacket(uint playerActorId, InventoryItem item) { - return buildPacket(playerActorId, playerActorId, item); + return BuildPacket(playerActorId, playerActorId, item); } - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId, InventoryItem item) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, InventoryItem item) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - binWriter.Write(item.toPacketBytes()); + binWriter.Write(item.ToPacketBytes()); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs index 2e811033..b136429c 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs @@ -10,12 +10,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory public const ushort OPCODE = 0x0149; public const uint PACKET_SIZE = 0x3A8; - public static SubPacket buildPacket(uint playerActorId, List items, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorId, List items, ref int listOffset) { - return buildPacket(playerActorId, playerActorId, items, ref listOffset); + return BuildPacket(playerActorId, playerActorId, items, ref listOffset); } - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory for (int i = 0; i < max; i++) { - binWriter.Write(items[listOffset].toPacketBytes()); + binWriter.Write(items[listOffset].ToPacketBytes()); listOffset++; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs index 5c79fea3..31cf4cc4 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs @@ -9,12 +9,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory public const ushort OPCODE = 0x014A; public const uint PACKET_SIZE = 0x720; - public static SubPacket buildPacket(uint playerActorId, List items, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorId, List items, ref int listOffset) { - return buildPacket(playerActorId, playerActorId, items, ref listOffset); + return BuildPacket(playerActorId, playerActorId, items, ref listOffset); } - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory for (int i = 0; i < max; i++) { - binWriter.Write(items[listOffset].toPacketBytes()); + binWriter.Write(items[listOffset].ToPacketBytes()); listOffset++; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs index 32eae219..58e1c9c8 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory public const ushort OPCODE = 0x014B; public const uint PACKET_SIZE = 0xE20; - public static SubPacket buildPacket(uint playerActorID, List items, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List items, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory for (int i = 0; i < max; i++) { - binWriter.Write(items[listOffset].toPacketBytes()); + binWriter.Write(items[listOffset].ToPacketBytes()); listOffset++; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs index 127bf32b..7599f309 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory public const ushort OPCODE = 0x014C; public const uint PACKET_SIZE = 0x1C20; - public static SubPacket buildPacket(uint playerActorID, List items, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List items, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory for (int i = 0; i < max; i++) { - binWriter.Write(items[listOffset].toPacketBytes()); + binWriter.Write(items[listOffset].ToPacketBytes()); listOffset++; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs index fe7e035e..e210bacb 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x0152; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, ushort slot) + public static SubPacket BuildPacket(uint playerActorID, ushort slot) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs index 0d59892c..54f9cfa4 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x0153; public const uint PACKET_SIZE = 0x38; - public static SubPacket buildPacket(uint playerActorID, List slots, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List slots, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs index 4414c9bb..e47e0e95 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x154; public const uint PACKET_SIZE = 0x40; - public static SubPacket buildPacket(uint playerActorID, List slots, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List slots, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs index 5e3e9808..6af8c465 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x0155; public const uint PACKET_SIZE = 0x60; - public static SubPacket buildPacket(uint playerActorID, List slots, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List slots, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs index 5233dd31..b6d7a3b5 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x156; public const uint PACKET_SIZE = 0xA0; - public static SubPacket buildPacket(uint playerActorID, List slots, ref int listOffset) + public static SubPacket BuildPacket(uint playerActorID, List slots, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs index cf12e0e8..707f9ca1 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs @@ -8,12 +8,12 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory public const ushort OPCODE = 0x0146; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorId, ushort size, ushort code) + public static SubPacket BuildPacket(uint playerActorId, ushort size, ushort code) { - return buildPacket(playerActorId, playerActorId, size, code); + return BuildPacket(playerActorId, playerActorId, size, code); } - public static SubPacket buildPacket(uint sourceActorId, uint targetActorId, ushort size, ushort code) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, ushort size, ushort code) { byte[] data = new byte[8]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs index c6cf8dd0..29da7459 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs @@ -6,12 +6,12 @@ public const ushort OPCODE = 0x0147; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorId) + public static SubPacket BuildPacket(uint playerActorId) { return new SubPacket(OPCODE, playerActorId, playerActorId, new byte[8]); } - public static SubPacket buildPacket(uint sourceActorId, uint targetActorID) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorID) { return new SubPacket(OPCODE, sourceActorId, targetActorID, new byte[8]); } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/SetInitialEquipmentPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/SetInitialEquipmentPacket.cs index f21f3ae1..f6feab76 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/SetInitialEquipmentPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/SetInitialEquipmentPacket.cs @@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory equipment[i] = UNEQUIPPED; //We will use this as "Unequipped" } - public void setItem(int slot, uint itemSlot) + public void SetItem(int slot, uint itemSlot) { if (slot >= equipment.Length) return; @@ -50,7 +50,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory equipment[slot] = itemSlot; } - public List buildPackets(uint playerActorID) + public List BuildPackets(uint playerActorID) { List packets = new List(); int packetCount = 0; diff --git a/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs b/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs index b96a26a3..9524bae1 100644 --- a/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs +++ b/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs @@ -56,7 +56,7 @@ namespace FFXIVClassic_Map_Server.packets.send private const ushort SIZE_GAMEMESSAGE_WITHOUT_ACTOR4 = 0x48; private const ushort SIZE_GAMEMESSAGE_WITHOUT_ACTOR5 = 0x68; - public static SubPacket buildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_ACTOR1 - 0x20]; @@ -74,7 +74,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(OPCODE_GAMEMESSAGE_WITH_ACTOR1, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -109,7 +109,7 @@ namespace FFXIVClassic_Map_Server.packets.send binWriter.Write((UInt32)textOwnerActorId); binWriter.Write((UInt16)textId); binWriter.Write((UInt16)log); - LuaUtils.writeLuaParams(binWriter, lParams); + LuaUtils.WriteLuaParams(binWriter, lParams); if (lParamsSize <= 0x14-12) { @@ -122,7 +122,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(opcode, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_CUSTOM_SENDER1 - 0x20]; @@ -140,7 +140,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(OPCODE_GAMEMESSAGE_WITH_CUSTOM_SENDER1, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -175,7 +175,7 @@ namespace FFXIVClassic_Map_Server.packets.send binWriter.Write((UInt16)textId); binWriter.Write((UInt16)log); binWriter.Write(Encoding.ASCII.GetBytes(sender), 0, Encoding.ASCII.GetByteCount(sender) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(sender)); - LuaUtils.writeLuaParams(binWriter, lParams); + LuaUtils.WriteLuaParams(binWriter, lParams); if (lParamsSize <= 0x14 - 12) { @@ -188,7 +188,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(opcode, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_DISPID_SENDER1 - 0x20]; @@ -206,7 +206,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(OPCODE_GAMEMESSAGE_WITH_DISPID_SENDER1, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -241,7 +241,7 @@ namespace FFXIVClassic_Map_Server.packets.send binWriter.Write((UInt32)textOwnerActorId); binWriter.Write((UInt16)textId); binWriter.Write((UInt16)log); - LuaUtils.writeLuaParams(binWriter, lParams); + LuaUtils.WriteLuaParams(binWriter, lParams); if (lParamsSize <= 0x14 - 12) { @@ -254,7 +254,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(opcode, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITHOUT_ACTOR1 - 0x20]; @@ -271,7 +271,7 @@ namespace FFXIVClassic_Map_Server.packets.send return new SubPacket(OPCODE_GAMEMESSAGE_WITHOUT_ACTOR1, sourceId, targetId, data); } - public static SubPacket buildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -305,7 +305,7 @@ namespace FFXIVClassic_Map_Server.packets.send binWriter.Write((UInt32)textOwnerActorId); binWriter.Write((UInt16)textId); binWriter.Write((UInt16)log); - LuaUtils.writeLuaParams(binWriter, lParams); + LuaUtils.WriteLuaParams(binWriter, lParams); if (lParamsSize <= 0x8) { diff --git a/FFXIVClassic Map Server/packets/send/LogoutPacket.cs b/FFXIVClassic Map Server/packets/send/LogoutPacket.cs index fbb5d4a7..cd8babaf 100644 --- a/FFXIVClassic Map Server/packets/send/LogoutPacket.cs +++ b/FFXIVClassic Map Server/packets/send/LogoutPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x000E; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]); } diff --git a/FFXIVClassic Map Server/packets/send/PongPacket.cs b/FFXIVClassic Map Server/packets/send/PongPacket.cs index 1ae4233e..695116b9 100644 --- a/FFXIVClassic Map Server/packets/send/PongPacket.cs +++ b/FFXIVClassic Map Server/packets/send/PongPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.receive public const ushort OPCODE = 0x0001; public const uint PACKET_SIZE = 0x40; - public static SubPacket buildPacket(uint playerActorID, uint pingTicks) + public static SubPacket BuildPacket(uint playerActorID, uint pingTicks) { byte[] data = new byte[PACKET_SIZE-0x20]; diff --git a/FFXIVClassic Map Server/packets/send/QuitPacket.cs b/FFXIVClassic Map Server/packets/send/QuitPacket.cs index f425537c..b10c9e24 100644 --- a/FFXIVClassic Map Server/packets/send/QuitPacket.cs +++ b/FFXIVClassic Map Server/packets/send/QuitPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x0011; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]); } diff --git a/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs b/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs index 09a59e97..6152f215 100644 --- a/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs +++ b/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs @@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x0003; public const uint PACKET_SIZE = 0x248; - public static SubPacket buildPacket(uint playerActorID, uint targetID, uint messageType, string sender, string message) + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint messageType, string sender, string message) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/SetMapPacket.cs b/FFXIVClassic Map Server/packets/send/SetMapPacket.cs index 3a54c3e4..797b8199 100644 --- a/FFXIVClassic Map Server/packets/send/SetMapPacket.cs +++ b/FFXIVClassic Map Server/packets/send/SetMapPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x0005; public const uint PACKET_SIZE = 0x30; - public static SubPacket buildPacket(uint playerActorID, uint mapID, uint regionID) + public static SubPacket BuildPacket(uint playerActorID, uint mapID, uint regionID) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs b/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs index e69305c9..08a66521 100644 --- a/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs +++ b/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs @@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort EFFECT_PLAY_NORMAL_CHANNEL = 0x5; //Only works for multi channeled music public const ushort EFFECT_PLAY_BATTLE_CHANNEL = 0x6; - public static SubPacket buildPacket(uint playerActorID, ushort musicID, ushort musicTrackMode) + public static SubPacket BuildPacket(uint playerActorID, ushort musicID, ushort musicTrackMode) { ulong combined = (ulong)(musicID | (musicTrackMode << 16)); return new SubPacket(OPCODE, 0, playerActorID, BitConverter.GetBytes(combined)); diff --git a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs index cb076e7d..cce963f3 100644 --- a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs +++ b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs @@ -35,7 +35,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x000D; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, ushort weatherId, ushort transitionTime) + public static SubPacket BuildPacket(uint playerActorID, ushort weatherId, ushort transitionTime) { ulong combined = (ulong)(weatherId | (transitionTime << 16)); return new SubPacket(OPCODE, 0, playerActorID, BitConverter.GetBytes(combined)); diff --git a/FFXIVClassic Map Server/packets/send/_0x02Packet.cs b/FFXIVClassic Map Server/packets/send/_0x02Packet.cs index 95810c97..0f627e35 100644 --- a/FFXIVClassic Map Server/packets/send/_0x02Packet.cs +++ b/FFXIVClassic Map Server/packets/send/_0x02Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x0002; public const uint PACKET_SIZE = 0x30; - public static SubPacket buildPacket(uint playerActorId, int val) + public static SubPacket BuildPacket(uint playerActorId, int val) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/_0x10Packet.cs b/FFXIVClassic Map Server/packets/send/_0x10Packet.cs index 5100cf7a..e0f229c2 100644 --- a/FFXIVClassic Map Server/packets/send/_0x10Packet.cs +++ b/FFXIVClassic Map Server/packets/send/_0x10Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x0010; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorId, int val) + public static SubPacket BuildPacket(uint playerActorId, int val) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs b/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs index 1bc7c351..0ad9b340 100644 --- a/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs +++ b/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x00E2; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, int val) + public static SubPacket BuildPacket(uint playerActorID, int val) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (Byte) (val & 0xFF); diff --git a/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs index 7f1bc1cd..29facf3d 100644 --- a/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x0131; public const uint PACKET_SIZE = 0x50; - public static SubPacket buildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter) + public static SubPacket BuildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter) { byte[] data = new byte[PACKET_SIZE - 0x20]; int maxBodySize = data.Length - 0x80; diff --git a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs index f67398a2..35571c55 100644 --- a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x012F; public const uint PACKET_SIZE = 0x90; - public static SubPacket buildPacket(uint playerActorId, uint targetActorId, string conditionName, List luaParams) + public static SubPacket BuildPacket(uint playerActorId, uint targetActorId, string conditionName, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events binWriter.Seek(0x30, SeekOrigin.Begin); - LuaUtils.writeLuaParams(binWriter, luaParams); + LuaUtils.WriteLuaParams(binWriter, luaParams); } } diff --git a/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs b/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs index 98a153c6..fe2c989e 100644 --- a/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x0130; public const uint PACKET_SIZE = 0x2B8; - public static SubPacket buildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter, string callFunction, List luaParams) + public static SubPacket BuildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter, string callFunction, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; int maxBodySize = data.Length - 0x80; @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events binWriter.Write(Encoding.ASCII.GetBytes(callFunction), 0, Encoding.ASCII.GetByteCount(callFunction) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(callFunction)); binWriter.Seek(0x49, SeekOrigin.Begin); - LuaUtils.writeLuaParams(binWriter, luaParams); + LuaUtils.WriteLuaParams(binWriter, luaParams); } } diff --git a/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs index 263e2a4a..9acebfd7 100644 --- a/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs +++ b/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.list public const ushort OPCODE = 0x017D; public const uint PACKET_SIZE = 0x40; - public static SubPacket buildPacket(uint playerActorID, uint locationCode, ulong sequenceId, ulong listId, int numEntries) + public static SubPacket BuildPacket(uint playerActorID, uint locationCode, ulong sequenceId, ulong listId, int numEntries) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs index fe5f0100..e8cc597d 100644 --- a/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs +++ b/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.list public const ushort OPCODE = 0x017E; public const uint PACKET_SIZE = 0x38; - public static SubPacket buildPacket(uint playerActorID, uint locationCode, ulong sequenceId, ulong listId) + public static SubPacket BuildPacket(uint playerActorID, uint locationCode, ulong sequenceId, ulong listId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs index 809af982..eaf661ba 100644 --- a/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs +++ b/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.list public const ushort OPCODE = 0x017F; public const uint PACKET_SIZE = 0x1B8; - public static SubPacket buildPacket(uint playerActorID, uint locationCode, ulong sequenceId, List entries, int offset) + public static SubPacket BuildPacket(uint playerActorID, uint locationCode, ulong sequenceId, List entries, int offset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs index 05fa6f90..56934bef 100644 --- a/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs +++ b/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.list public const ushort OPCODE = 0x017C; public const uint PACKET_SIZE = 0x98; - public static SubPacket buildPacket(uint playerActorID, uint locationCode, ulong sequenceId, ulong listId, uint listTypeId, int numEntries) + public static SubPacket BuildPacket(uint playerActorID, uint locationCode, ulong sequenceId, ulong listId, uint listTypeId, int numEntries) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send.list binWriter.Write((UInt64)0); binWriter.Write((UInt64)listId); - //This seems to change depending on what the list is for + //This seems to Change depending on what the list is for binWriter.Write((UInt32)listTypeId); binWriter.Seek(0x40, SeekOrigin.Begin); diff --git a/FFXIVClassic Map Server/packets/send/list/ListUtils.cs b/FFXIVClassic Map Server/packets/send/list/ListUtils.cs index 59318c8b..03269fe1 100644 --- a/FFXIVClassic Map Server/packets/send/list/ListUtils.cs +++ b/FFXIVClassic Map Server/packets/send/list/ListUtils.cs @@ -5,33 +5,33 @@ namespace FFXIVClassic_Map_Server.packets.send.list class ListUtils { - public static List createList(uint actorId, uint locationCode, ulong sequenceId, ulong listId, uint listTypeId, List listEntries) + public static List CreateList(uint actorId, uint locationCode, ulong sequenceId, ulong listId, uint listTypeId, List listEntries) { List subpacketList = new List(); - subpacketList.Add(ListStartPacket.buildPacket(actorId, locationCode, sequenceId, listId, listTypeId, listEntries.Count)); - subpacketList.Add(ListBeginPacket.buildPacket(actorId, locationCode, sequenceId, listId, listEntries.Count)); - subpacketList.Add(ListEntriesEndPacket.buildPacket(actorId, locationCode, sequenceId, listEntries, 0)); - subpacketList.Add(ListEndPacket.buildPacket(actorId, locationCode, sequenceId, listId)); + subpacketList.Add(ListStartPacket.BuildPacket(actorId, locationCode, sequenceId, listId, listTypeId, listEntries.Count)); + subpacketList.Add(ListBeginPacket.BuildPacket(actorId, locationCode, sequenceId, listId, listEntries.Count)); + subpacketList.Add(ListEntriesEndPacket.BuildPacket(actorId, locationCode, sequenceId, listEntries, 0)); + subpacketList.Add(ListEndPacket.BuildPacket(actorId, locationCode, sequenceId, listId)); return subpacketList; } - public static List createRetainerList(uint actorId, uint locationCode, ulong sequenceId, ulong listId, List listEntries) + public static List CreateRetainerList(uint actorId, uint locationCode, ulong sequenceId, ulong listId, List listEntries) { List subpacketList = new List(); - subpacketList.Add(ListStartPacket.buildPacket(actorId, locationCode, sequenceId, listId, ListStartPacket.TYPEID_RETAINER, listEntries.Count)); - subpacketList.Add(ListBeginPacket.buildPacket(actorId, locationCode, sequenceId, listId, listEntries.Count)); - subpacketList.Add(ListEntriesEndPacket.buildPacket(actorId, locationCode, sequenceId, listEntries, 0)); - subpacketList.Add(ListEndPacket.buildPacket(actorId, locationCode, sequenceId, listId)); + subpacketList.Add(ListStartPacket.BuildPacket(actorId, locationCode, sequenceId, listId, ListStartPacket.TYPEID_RETAINER, listEntries.Count)); + subpacketList.Add(ListBeginPacket.BuildPacket(actorId, locationCode, sequenceId, listId, listEntries.Count)); + subpacketList.Add(ListEntriesEndPacket.BuildPacket(actorId, locationCode, sequenceId, listEntries, 0)); + subpacketList.Add(ListEndPacket.BuildPacket(actorId, locationCode, sequenceId, listId)); return subpacketList; } - public static List createPartyList(uint actorId, uint locationCode, ulong sequenceId, ulong listId, List listEntries) + public static List CreatePartyList(uint actorId, uint locationCode, ulong sequenceId, ulong listId, List listEntries) { List subpacketList = new List(); - subpacketList.Add(ListStartPacket.buildPacket(actorId, locationCode, sequenceId, listId, ListStartPacket.TYPEID_PARTY, listEntries.Count)); - subpacketList.Add(ListBeginPacket.buildPacket(actorId, locationCode, sequenceId, listId, listEntries.Count)); - subpacketList.Add(ListEntriesEndPacket.buildPacket(actorId, locationCode, sequenceId, listEntries, 0)); - subpacketList.Add(ListEndPacket.buildPacket(actorId, locationCode, sequenceId, listId)); + subpacketList.Add(ListStartPacket.BuildPacket(actorId, locationCode, sequenceId, listId, ListStartPacket.TYPEID_PARTY, listEntries.Count)); + subpacketList.Add(ListBeginPacket.BuildPacket(actorId, locationCode, sequenceId, listId, listEntries.Count)); + subpacketList.Add(ListEntriesEndPacket.BuildPacket(actorId, locationCode, sequenceId, listEntries, 0)); + subpacketList.Add(ListEndPacket.BuildPacket(actorId, locationCode, sequenceId, listId)); return subpacketList; } diff --git a/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs b/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs index 896225fc..781e137f 100644 --- a/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs @@ -29,13 +29,13 @@ namespace FFXIVClassic_Map_Server.packets.send.actor binWriter.Seek(1, SeekOrigin.Current); } - public void closeStreams() + public void CloseStreams() { binWriter.Dispose(); mem.Dispose(); } - public bool addByte(uint id, byte value) + public bool AcceptCallback(uint id, byte value) { if (runningByteTotal + 6 > MAXBYTES) return false; @@ -48,7 +48,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addShort(uint id, ushort value) + public bool AddShort(uint id, ushort value) { if (runningByteTotal + 7 > MAXBYTES) return false; @@ -61,7 +61,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addInt(uint id, uint value) + public bool AddInt(uint id, uint value) { if (runningByteTotal + 9 > MAXBYTES) return false; @@ -74,7 +74,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public bool addBuffer(uint id, byte[] buffer) + public bool AddBuffer(uint id, byte[] buffer) { if (runningByteTotal + 5 + buffer.Length > MAXBYTES) return false; @@ -87,7 +87,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor return true; } - public void addProperty(FFXIVClassic_Map_Server.Actors.Actor actor, string name) + public void AddProperty(FFXIVClassic_Map_Server.Actors.Actor actor, string name) { string[] split = name.Split('.'); int arrayIndex = 0; @@ -132,33 +132,33 @@ namespace FFXIVClassic_Map_Server.packets.send.actor if (curObj == null) return; - //Cast to the proper object and add to packet + //Cast to the proper object and Add to packet uint id = Utils.MurmurHash2(name, 0); if (curObj is bool) - addByte(id, (byte)(((bool)curObj) ? 1 : 0)); + AcceptCallback(id, (byte)(((bool)curObj) ? 1 : 0)); else if (curObj is byte) - addByte(id, (byte)curObj); + AcceptCallback(id, (byte)curObj); else if (curObj is ushort) - addShort(id, (ushort)curObj); + AddShort(id, (ushort)curObj); else if (curObj is short) - addShort(id, (ushort)(short)curObj); + AddShort(id, (ushort)(short)curObj); else if (curObj is uint) - addInt(id, (uint)curObj); + AddInt(id, (uint)curObj); else if (curObj is int) - addInt(id, (uint)(int)curObj); + AddInt(id, (uint)(int)curObj); else if (curObj is float) - addBuffer(id, BitConverter.GetBytes((float)curObj)); + AddBuffer(id, BitConverter.GetBytes((float)curObj)); else return; } } - public void setIsMore(bool flag) + public void SetIsMore(bool flag) { isMore = flag; } - public void setTarget(string target) + public void SetTarget(string target) { binWriter.Write((byte)(isMore ? 0x62 + target.Length : 0x82 + target.Length)); binWriter.Write(Encoding.ASCII.GetBytes(target)); @@ -166,12 +166,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } - public SubPacket buildPacket(uint playerActorID, uint actorID) + public SubPacket BuildPacket(uint playerActorID, uint actorID) { binWriter.Seek(0x8, SeekOrigin.Begin); binWriter.Write((byte)runningByteTotal); - closeStreams(); + CloseStreams(); SubPacket packet = new SubPacket(OPCODE, playerActorID, actorID, data); return packet; diff --git a/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs b/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs index 015b7f08..59a1f583 100644 --- a/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs +++ b/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login public const ushort OPCODE = 0x0002; public const uint PACKET_SIZE = 0x30; - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { byte[] data = new byte[PACKET_SIZE-0x20]; diff --git a/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs b/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs index bad66f4d..133fffb5 100644 --- a/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs @@ -5,7 +5,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login { class Login0x7ResponsePacket { - public static BasePacket buildPacket(uint actorID, uint time) + public static BasePacket BuildPacket(uint actorID, uint time) { byte[] data = new byte[0x18]; @@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login } } - return BasePacket.createPacket(data, false, false); + return BasePacket.CreatePacket(data, false, false); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs b/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs index 31764238..2151e81c 100644 --- a/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019E; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint achievementID) + public static SubPacket BuildPacket(uint playerActorID, uint achievementID) { return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((UInt64)achievementID)); } diff --git a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs index e771fe30..73780b4c 100644 --- a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0133; public const uint PACKET_SIZE = 0xE0; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, List luaParams) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -17,7 +17,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - LuaUtils.writeLuaParams(binWriter, luaParams); + LuaUtils.WriteLuaParams(binWriter, luaParams); } } diff --git a/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs b/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs index a80c90b9..60b9b2b9 100644 --- a/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019F; public const uint PACKET_SIZE = 0x30; - public static SubPacket buildPacket(uint playerActorID, uint achievementId, uint progressCount, uint progressFlags) + public static SubPacket BuildPacket(uint playerActorID, uint achievementId, uint progressCount, uint progressFlags) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs index 232548d9..6c4248a2 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019C; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint numAchievementPoints) + public static SubPacket BuildPacket(uint playerActorID, uint numAchievementPoints) { return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((UInt64) numAchievementPoints)); } diff --git a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs index b38bed3c..53bbb748 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0198; public const uint PACKET_SIZE = 0x40; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, string name) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string name) { if (Encoding.Unicode.GetByteCount(name) >= 0x20) name = "ERR: Too Long"; diff --git a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs index 7a97fd27..4368f77a 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public bool[] achievementFlags = new bool[1024]; - public SubPacket buildPacket(uint playerActorID) + public SubPacket BuildPacket(uint playerActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs index e4043714..43a07cd0 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A4; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint sourceActorID, uint targetActorID, uint jobId) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint jobId) { return new SubPacket(OPCODE, sourceActorID, targetActorID, BitConverter.GetBytes((uint)jobId)); } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs index 28c7bc2e..b4d7a013 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs @@ -22,7 +22,7 @@ public const ushort OPCODE = 0x0197; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, int appearanceId) + public static SubPacket BuildPacket(uint playerActorID, int appearanceId) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[5] = (byte)(appearanceId & 0xFF); diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs index 0429392c..ec65824c 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs @@ -6,7 +6,7 @@ public const ushort OPCODE = 0x01a0; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, int appearanceId) + public static SubPacket BuildPacket(uint playerActorID, int appearanceId) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(appearanceId & 0xFF); diff --git a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs index fe45db0f..75211b87 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs @@ -60,7 +60,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public bool[] cutsceneFlags = new bool[2048]; - public SubPacket buildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality) + public SubPacket BuildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs index b175c2ea..4b177966 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0194; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint sourceActorID, uint targetActorID, ushort currentAllegiance, ushort rankLimsa, ushort rankGridania, ushort rankUldah) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, ushort currentAllegiance, ushort rankLimsa, ushort rankGridania, ushort rankUldah) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs index bc7d9321..d2fe62d3 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x0199; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, bool hasChocobo) + public static SubPacket BuildPacket(uint playerActorID, bool hasChocobo) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(hasChocobo ? 1 : 0); diff --git a/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs index c4f28e2c..114bf124 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x01A1; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, bool hasGoobbue) + public static SubPacket BuildPacket(uint playerActorID, bool hasGoobbue) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(hasGoobbue ? 1 : 0); diff --git a/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs index 155d27b0..cb50cdb7 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019B; public const uint PACKET_SIZE = 0x40; - public static SubPacket buildPacket(uint playerActorID, uint[] latestAchievementIDs) + public static SubPacket BuildPacket(uint playerActorID, uint[] latestAchievementIDs) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs index 8f1df9b3..5f357dc1 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A7; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint dreamID) + public static SubPacket BuildPacket(uint playerActorID, uint dreamID) { dreamID += 0x20E; return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((uint)dreamID)); diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs index 155e8cd3..112def38 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019D; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID, uint titleID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint titleID) { return new SubPacket(OPCODE, playerActorID, targetActorID, BitConverter.GetBytes((UInt64)titleID)); } diff --git a/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs b/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs index ab5e0e3f..221f4d37 100644 --- a/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs +++ b/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0196; public const uint PACKET_SIZE = 0x38; - public static SubPacket buildPacket(uint playerActorID, uint targetActorID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs index 77c9095f..99068bf6 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment public const ushort OPCODE = 0x01C8; public const uint PACKET_SIZE = 0x218; - public static SubPacket buildPacket(uint playerActorID, RecruitmentDetails details) + public static SubPacket BuildPacket(uint playerActorID, RecruitmentDetails details) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs index 4709f0bf..e0ef929d 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x01C4; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = 1; diff --git a/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs index 6e13ac72..3e557b97 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment public const ushort OPCODE = 0x01C5; public const uint PACKET_SIZE = 0x038; - public static SubPacket buildPacket(uint playerActorID, bool isRecruiting, bool isRecruiter, long recruitmentId) + public static SubPacket BuildPacket(uint playerActorID, bool isRecruiting, bool isRecruiter, long recruitmentId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs b/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs index d4a8b87d..5e78f219 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x01C3; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, bool success) + public static SubPacket BuildPacket(uint playerActorID, bool success) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs b/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs index 9962a699..eac92f94 100644 --- a/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01C9; public const uint PACKET_SIZE = 0x048; - public static SubPacket buildPacket(uint playerActorID, bool isSuccess, string nameToAdd) + public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, string nameToAdd) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs b/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs index ff6cdc13..507d8e58 100644 --- a/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CA; public const uint PACKET_SIZE = 0x048; - public static SubPacket buildPacket(uint playerActorID, bool isSuccess, string nameToRemove) + public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, string nameToRemove) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs index 3ddb2e1b..5cee912d 100644 --- a/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CF; public const uint PACKET_SIZE = 0x686; - public static SubPacket buildPacket(uint playerActorID, Tuple[] friendStatus) + public static SubPacket BuildPacket(uint playerActorID, Tuple[] friendStatus) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs index 6e6a69e5..7f708c29 100644 --- a/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CC; public const uint PACKET_SIZE = 0x067; - public static SubPacket buildPacket(uint playerActorID, bool isSuccess, long id, bool isOnline, string nameToAdd) + public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, long id, bool isOnline, string nameToAdd) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs index 95882a58..f4ccef4d 100644 --- a/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CD; public const uint PACKET_SIZE = 0x057; - public static SubPacket buildPacket(uint playerActorID, bool isSuccess, string nameToRemove) + public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, string nameToRemove) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs b/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs index 5f7dccfa..54d3b9b9 100644 --- a/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CB; public const uint PACKET_SIZE = 0x686; - public static SubPacket buildPacket(uint playerActorID, string[] blacklistedNames, ref int offset) + public static SubPacket BuildPacket(uint playerActorID, string[] blacklistedNames, ref int offset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs b/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs index 7d8ed27c..7074ca3d 100644 --- a/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CE; public const uint PACKET_SIZE = 0x686; - public static SubPacket buildPacket(uint playerActorID, Tuple[] friends, ref int offset) + public static SubPacket BuildPacket(uint playerActorID, Tuple[] friends, ref int offset) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs index b4370f63..0a84b09a 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x01D6; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint playerActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = 1; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs index e7f2ce35..a3ab11c5 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk public const ushort OPCODE = 0x01D1; public const uint PACKET_SIZE = 0x587; - public static SubPacket buildPacket(uint playerActorID, string faqsBodyText) + public static SubPacket BuildPacket(uint playerActorID, string faqsBodyText) { byte[] data = new byte[PACKET_SIZE - 0x20]; int maxBodySize = data.Length - 0x04; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs index a4141982..cc8193b4 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk public const ushort OPCODE = 0x01D0; public const uint PACKET_SIZE = 0x2B8; - public static SubPacket buildPacket(uint playerActorID, string[] faqsTitles) + public static SubPacket BuildPacket(uint playerActorID, string[] faqsTitles) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs index 811f7177..3ec04973 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk public const ushort OPCODE = 0x01D4; public const uint PACKET_SIZE = 0x2B8; - public static SubPacket buildPacket(uint playerActorID, string titleText, string bodyText) + public static SubPacket BuildPacket(uint playerActorID, string titleText, string bodyText) { byte[] data = new byte[PACKET_SIZE - 0x20]; int maxBodySize = data.Length - 0x80; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs index f1135116..502b1f74 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x01D5; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, bool wasSent) + public static SubPacket BuildPacket(uint playerActorID, bool wasSent) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs index 58d32f5c..7f1defa5 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk public const ushort OPCODE = 0x01D2; public const uint PACKET_SIZE = 0x160; - public static SubPacket buildPacket(uint playerActorID, string[] issueStrings) + public static SubPacket BuildPacket(uint playerActorID, string[] issueStrings) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs index a7ebe4db..a06b23bb 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs @@ -5,7 +5,7 @@ public const ushort OPCODE = 0x01D3; public const uint PACKET_SIZE = 0x28; - public static SubPacket buildPacket(uint playerActorID, bool startGM) + public static SubPacket BuildPacket(uint playerActorID, bool startGM) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(startGM ? 1 : 0); diff --git a/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs b/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs index 0447d0d4..e86996eb 100644 --- a/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs +++ b/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs @@ -21,29 +21,29 @@ namespace FFXIVClassic_Map_Server.utils this.currentTarget = firstTarget; } - public void addProperty(string property) + public void AddProperty(string property) { - if (!currentActorPropertyPacket.addProperty(forActor, property)) + if (!currentActorPropertyPacket.AddProperty(forActor, property)) { - currentActorPropertyPacket.setIsMore(true); - currentActorPropertyPacket.addTarget(); - subPackets.Add(currentActorPropertyPacket.buildPacket(playerActorId, forActor.actorId)); + currentActorPropertyPacket.SetIsMore(true); + currentActorPropertyPacket.AddTarget(); + subPackets.Add(currentActorPropertyPacket.BuildPacket(playerActorId, forActor.actorId)); currentActorPropertyPacket = new SetActorPropetyPacket(currentTarget); } } - public void newTarget(string target) + public void NewTarget(string target) { - currentActorPropertyPacket.addTarget(); + currentActorPropertyPacket.AddTarget(); currentTarget = target; - currentActorPropertyPacket.setTarget(target); + currentActorPropertyPacket.SetTarget(target); } - public List done() + public List Done() { - currentActorPropertyPacket.addTarget(); - currentActorPropertyPacket.setIsMore(false); - subPackets.Add(currentActorPropertyPacket.buildPacket(playerActorId, forActor.actorId)); + currentActorPropertyPacket.AddTarget(); + currentActorPropertyPacket.SetIsMore(false); + subPackets.Add(currentActorPropertyPacket.BuildPacket(playerActorId, forActor.actorId)); return subPackets; } diff --git a/FFXIVClassic Map Server/utils/CharacterUtils.cs b/FFXIVClassic Map Server/utils/CharacterUtils.cs index 64b2306d..3df2bc6a 100644 --- a/FFXIVClassic Map Server/utils/CharacterUtils.cs +++ b/FFXIVClassic Map Server/utils/CharacterUtils.cs @@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.utils public uint unknown; } - public static FaceInfo getFaceInfo(byte characteristics, byte characteristicsColor, byte faceType, byte ears, byte faceMouth, byte faceFeatures, byte faceNose, byte faceEyeShape, byte faceIrisSize, byte faceEyebrows) + public static FaceInfo GetFaceInfo(byte characteristics, byte characteristicsColor, byte faceType, byte ears, byte faceMouth, byte faceFeatures, byte faceNose, byte faceEyeShape, byte faceIrisSize, byte faceEyebrows) { FaceInfo faceInfo = new FaceInfo(); faceInfo.characteristics = characteristics; @@ -47,7 +47,7 @@ namespace FFXIVClassic_Map_Server.utils return faceInfo; } - public static UInt32 getTribeModel(byte tribe) + public static UInt32 GetTribeModel(byte tribe) { switch (tribe) { diff --git a/FFXIVClassic Map Server/utils/SQLGeneration.cs b/FFXIVClassic Map Server/utils/SQLGeneration.cs index c50f3650..b48be652 100644 --- a/FFXIVClassic Map Server/utils/SQLGeneration.cs +++ b/FFXIVClassic Map Server/utils/SQLGeneration.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.utils class SQLGeneration { - public static void generateZones() + public static void GenerateZones() { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -95,7 +95,7 @@ namespace FFXIVClassic_Map_Server.utils } } - public static void generateActors() + public static void GenerateActors() { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -153,7 +153,7 @@ namespace FFXIVClassic_Map_Server.utils } } - public static void generateActorAppearance() + public static void GenerateActorAppearance() { uint NUMFIELDS = 39; using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -221,7 +221,7 @@ namespace FFXIVClassic_Map_Server.utils } - public static void generateAchievementIds() + public static void GenerateAchievementIds() { using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) @@ -311,7 +311,7 @@ namespace FFXIVClassic_Map_Server.utils } - public void getStaticActors() + public void GetStaticActors() { using (MemoryStream s = new MemoryStream(File.ReadAllBytes("D:\\luadec\\script\\staticactorr9w.luab"))) { @@ -324,7 +324,7 @@ namespace FFXIVClassic_Map_Server.utils while (binReader.BaseStream.Position != binReader.BaseStream.Length) { - uint id = Utils.swapEndian(binReader.ReadUInt32()) | 0xA0F00000; + uint id = Utils.SwapEndian(binReader.ReadUInt32()) | 0xA0F00000; List list = new List(); byte readByte;