From 10805a7d3783bb7da4e16df8ad9940f490b216fc Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sat, 6 Apr 2024 15:30:35 -0400 Subject: [PATCH] Class moved up in package --- src/engine/net/AbstractConnection.java | 1 - src/engine/net/AbstractNetMsg.java | 1 - src/engine/net/CheckNetMsgFactoryJob.java | 1 - src/engine/net/NetMsgFactory.java | 1 - src/engine/net/NetMsgStat.java | 2 -- src/engine/net/{client => }/Protocol.java | 4 +--- src/engine/net/client/ClientConnection.java | 1 + .../net/client/handlers/AbstractChatMsgHandler.java | 2 +- src/engine/net/client/msg/AbandonAssetMsg.java | 2 +- src/engine/net/client/msg/AcceptFriendMsg.java | 2 +- src/engine/net/client/msg/AcceptTradeRequestMsg.java | 2 +- src/engine/net/client/msg/ActivateNPCMessage.java | 6 +----- src/engine/net/client/msg/AddFriendMessage.java | 2 +- src/engine/net/client/msg/AddGoldToTradeWindowMsg.java | 2 +- src/engine/net/client/msg/AddItemToTradeWindowMsg.java | 2 +- src/engine/net/client/msg/AllianceChangeMsg.java | 2 +- src/engine/net/client/msg/AllyEnemyListMsg.java | 2 +- src/engine/net/client/msg/ApplyBuildingEffectMsg.java | 2 +- src/engine/net/client/msg/ApplyEffectMsg.java | 2 +- src/engine/net/client/msg/ApplyRuneMsg.java | 1 - src/engine/net/client/msg/ArcLoginNotifyMsg.java | 2 +- src/engine/net/client/msg/ArcMineChangeProductionMsg.java | 2 +- .../net/client/msg/ArcMineWindowAvailableTimeMsg.java | 2 +- src/engine/net/client/msg/ArcMineWindowChangeMsg.java | 2 +- src/engine/net/client/msg/ArcOwnedMinesListMsg.java | 2 +- src/engine/net/client/msg/ArcSiegeSpireMsg.java | 2 +- .../net/client/msg/ArcViewAssetTransactionsMsg.java | 2 +- src/engine/net/client/msg/AssetSupportMsg.java | 2 +- src/engine/net/client/msg/AttackCmdMsg.java | 2 +- src/engine/net/client/msg/ChangeAltitudeMsg.java | 2 +- src/engine/net/client/msg/ChangeGuildLeaderMsg.java | 2 +- src/engine/net/client/msg/ChatFilterMsg.java | 2 +- src/engine/net/client/msg/CityAssetMsg.java | 2 +- src/engine/net/client/msg/CityChoiceMsg.java | 6 +----- src/engine/net/client/msg/CityDataMsg.java | 6 +----- src/engine/net/client/msg/CityZoneMsg.java | 2 +- src/engine/net/client/msg/ClaimAssetMsg.java | 2 +- src/engine/net/client/msg/ClaimGuildTreeMsg.java | 2 +- src/engine/net/client/msg/ClientNetMsg.java | 6 +----- src/engine/net/client/msg/CloseTradeWindowMsg.java | 2 +- src/engine/net/client/msg/CommitToTradeMsg.java | 2 +- src/engine/net/client/msg/ConfirmPromoteMsg.java | 2 +- src/engine/net/client/msg/CostOpenBankMsg.java | 2 +- src/engine/net/client/msg/DeclineFriendMsg.java | 2 +- src/engine/net/client/msg/DeleteItemMsg.java | 2 +- src/engine/net/client/msg/DestroyBuildingMsg.java | 2 +- src/engine/net/client/msg/DoorTryOpenMsg.java | 2 +- src/engine/net/client/msg/DropGoldMsg.java | 2 +- src/engine/net/client/msg/EnterWorldReceivedMsg.java | 2 +- src/engine/net/client/msg/ErrorPopupMsg.java | 1 - src/engine/net/client/msg/FriendRequestMsg.java | 2 +- src/engine/net/client/msg/FurnitureMsg.java | 4 ++-- src/engine/net/client/msg/GoldFromVaultMsg.java | 2 +- src/engine/net/client/msg/GoldToVaultMsg.java | 4 ++-- src/engine/net/client/msg/GrantExperienceMsg.java | 2 +- src/engine/net/client/msg/GuildTreeStatusMsg.java | 2 +- src/engine/net/client/msg/HirelingServiceMsg.java | 2 +- src/engine/net/client/msg/HotzoneChangeMsg.java | 2 +- src/engine/net/client/msg/IgnoreListMsg.java | 2 +- src/engine/net/client/msg/IgnoreMsg.java | 2 +- src/engine/net/client/msg/InvalidTradeRequestMsg.java | 2 +- src/engine/net/client/msg/ItemEffectMsg.java | 2 +- src/engine/net/client/msg/ItemFromVaultMsg.java | 2 +- src/engine/net/client/msg/ItemHealthUpdateMsg.java | 2 +- src/engine/net/client/msg/ItemProductionMsg.java | 6 +----- src/engine/net/client/msg/ItemToVaultMsg.java | 2 +- src/engine/net/client/msg/KeepAliveServerClientMsg.java | 2 +- src/engine/net/client/msg/LeaderboardMessage.java | 2 +- src/engine/net/client/msg/LeaveWorldMsg.java | 2 +- src/engine/net/client/msg/LoadCharacterMsg.java | 6 +----- src/engine/net/client/msg/LoadStructureMsg.java | 6 +----- src/engine/net/client/msg/LockUnlockDoorMsg.java | 2 +- src/engine/net/client/msg/LoginToGameServerMsg.java | 2 +- src/engine/net/client/msg/LootMsg.java | 2 +- src/engine/net/client/msg/LootWindowRequestMsg.java | 2 +- src/engine/net/client/msg/LootWindowResponseMsg.java | 2 +- src/engine/net/client/msg/ManageCityAssetsMsg.java | 2 +- src/engine/net/client/msg/ManageNPCMsg.java | 2 +- src/engine/net/client/msg/MerchantMsg.java | 2 +- src/engine/net/client/msg/MinionTrainingMessage.java | 2 +- src/engine/net/client/msg/ModifyCommitToTradeMsg.java | 2 +- src/engine/net/client/msg/ModifyHealthKillMsg.java | 2 +- src/engine/net/client/msg/ModifyHealthMsg.java | 2 +- src/engine/net/client/msg/ModifyStatMsg.java | 2 +- src/engine/net/client/msg/MoveCorrectionMsg.java | 2 +- src/engine/net/client/msg/MoveToPointMsg.java | 2 +- src/engine/net/client/msg/ObjectActionMsg.java | 2 +- src/engine/net/client/msg/OpenFriendsCondemnListMsg.java | 2 +- src/engine/net/client/msg/OpenTradeWindowMsg.java | 2 +- src/engine/net/client/msg/OpenVaultMsg.java | 2 +- src/engine/net/client/msg/OrderNPCMsg.java | 2 +- src/engine/net/client/msg/PassiveMessageTriggerMsg.java | 2 +- src/engine/net/client/msg/PerformActionMsg.java | 2 +- src/engine/net/client/msg/PetAttackMsg.java | 2 +- src/engine/net/client/msg/PetCmdMsg.java | 2 +- src/engine/net/client/msg/PetMsg.java | 2 +- src/engine/net/client/msg/PetitionReceivedMsg.java | 2 +- src/engine/net/client/msg/PlaceAssetMsg.java | 1 - src/engine/net/client/msg/PowerProjectileMsg.java | 2 +- src/engine/net/client/msg/PromptRecallMsg.java | 2 +- src/engine/net/client/msg/RandomMsg.java | 2 +- src/engine/net/client/msg/RecommendNationMsg.java | 2 +- src/engine/net/client/msg/RecvSummonsMsg.java | 2 +- src/engine/net/client/msg/RecyclePowerMsg.java | 2 +- src/engine/net/client/msg/RefineMsg.java | 2 +- src/engine/net/client/msg/RefinerScreenMsg.java | 2 +- src/engine/net/client/msg/RejectTradeRequestMsg.java | 2 +- src/engine/net/client/msg/RemoveFriendMessage.java | 2 +- src/engine/net/client/msg/RepairBuildingMsg.java | 2 +- src/engine/net/client/msg/RepairMsg.java | 2 +- src/engine/net/client/msg/ReqBankInventoryMsg.java | 2 +- src/engine/net/client/msg/RequestBallListMessage.java | 2 +- src/engine/net/client/msg/RequestEnterWorldMsg.java | 2 +- src/engine/net/client/msg/RespawnMsg.java | 2 +- src/engine/net/client/msg/RespondLeaveWorldMsg.java | 2 +- src/engine/net/client/msg/RotateObjectMsg.java | 2 +- src/engine/net/client/msg/SafeModeMsg.java | 2 +- src/engine/net/client/msg/ScaleObjectMsg.java | 2 +- src/engine/net/client/msg/SelectCityMsg.java | 6 +----- src/engine/net/client/msg/SendBallEntryMessage.java | 2 +- src/engine/net/client/msg/SendOwnPlayerMsg.java | 6 +----- src/engine/net/client/msg/SendSummonsMsg.java | 2 +- src/engine/net/client/msg/ServerInfoMsg.java | 2 +- src/engine/net/client/msg/SetCombatModeMsg.java | 2 +- src/engine/net/client/msg/SetObjectValueMsg.java | 2 +- src/engine/net/client/msg/ShowBankInventoryMsg.java | 2 +- src/engine/net/client/msg/ShowMsg.java | 2 +- src/engine/net/client/msg/ShowVaultInventoryMsg.java | 2 +- src/engine/net/client/msg/SocialMsg.java | 2 +- src/engine/net/client/msg/StuckMsg.java | 2 +- src/engine/net/client/msg/TargetObjectMsg.java | 2 +- src/engine/net/client/msg/TargetedActionMsg.java | 2 +- src/engine/net/client/msg/TaxCityMsg.java | 4 ++-- src/engine/net/client/msg/TaxResourcesMsg.java | 4 ++-- src/engine/net/client/msg/TeleportRepledgeListMsg.java | 6 +----- src/engine/net/client/msg/TeleportToPointMsg.java | 2 +- src/engine/net/client/msg/TerritoryChangeMessage.java | 2 +- src/engine/net/client/msg/ToggleCombatMsg.java | 2 +- src/engine/net/client/msg/ToggleLfgRecruitingMsg.java | 2 +- src/engine/net/client/msg/ToggleSitStandMsg.java | 2 +- src/engine/net/client/msg/TrackArrowMsg.java | 2 +- src/engine/net/client/msg/TrackWindowMsg.java | 6 +----- src/engine/net/client/msg/TradeRequestMsg.java | 2 +- src/engine/net/client/msg/TrainMsg.java | 2 +- src/engine/net/client/msg/TrainerInfoMsg.java | 2 +- src/engine/net/client/msg/TransferAssetMsg.java | 2 +- src/engine/net/client/msg/TransferBuildingMsg.java | 2 +- .../net/client/msg/TransferGoldToFromBuildingMsg.java | 2 +- src/engine/net/client/msg/TransferItemFromBankMsg.java | 2 +- .../client/msg/TransferItemFromEquipToInventoryMsg.java | 4 ++-- .../client/msg/TransferItemFromInventoryToEquipMsg.java | 4 ++-- src/engine/net/client/msg/TransferItemToBankMsg.java | 2 +- src/engine/net/client/msg/UncommitToTradeMsg.java | 2 +- src/engine/net/client/msg/Unknown1Msg.java | 2 +- src/engine/net/client/msg/UnknownMsg.java | 2 +- src/engine/net/client/msg/UnloadObjectsMsg.java | 2 +- src/engine/net/client/msg/UpdateCharOrMobMessage.java | 2 +- src/engine/net/client/msg/UpdateClientAlliancesMsg.java | 4 ++-- src/engine/net/client/msg/UpdateEffectsMsg.java | 2 +- src/engine/net/client/msg/UpdateFriendStatusMessage.java | 4 ++-- src/engine/net/client/msg/UpdateGoldMsg.java | 4 ++-- src/engine/net/client/msg/UpdateInventoryMsg.java | 2 +- src/engine/net/client/msg/UpdateObjectMsg.java | 2 +- src/engine/net/client/msg/UpdateStateMsg.java | 2 +- src/engine/net/client/msg/UpdateTradeWindowMsg.java | 2 +- src/engine/net/client/msg/UpdateVaultMsg.java | 2 +- src/engine/net/client/msg/UpgradeAssetMessage.java | 6 +----- src/engine/net/client/msg/UseCharterMsg.java | 2 +- src/engine/net/client/msg/VendorBuyMsg.java | 2 +- src/engine/net/client/msg/VendorBuyWindowMsg.java | 8 ++------ src/engine/net/client/msg/VendorDialogMsg.java | 2 +- src/engine/net/client/msg/VendorSellMsg.java | 2 +- src/engine/net/client/msg/VendorSellWindowMsg.java | 2 +- src/engine/net/client/msg/ViewResourcesMsg.java | 4 ++-- src/engine/net/client/msg/VisualUpdateMessage.java | 4 ++-- src/engine/net/client/msg/WhoRequestMsg.java | 2 +- src/engine/net/client/msg/WhoResponseMsg.java | 3 +-- src/engine/net/client/msg/WorldDataMsg.java | 8 ++------ src/engine/net/client/msg/WorldRealmMsg.java | 2 +- src/engine/net/client/msg/chat/AbstractChatMsg.java | 2 +- src/engine/net/client/msg/chat/ChatCSRMsg.java | 2 +- src/engine/net/client/msg/chat/ChatCityMsg.java | 2 +- src/engine/net/client/msg/chat/ChatGlobalMsg.java | 2 +- src/engine/net/client/msg/chat/ChatGroupMsg.java | 2 +- src/engine/net/client/msg/chat/ChatGuildMsg.java | 2 +- src/engine/net/client/msg/chat/ChatICMsg.java | 2 +- src/engine/net/client/msg/chat/ChatInfoMsg.java | 2 +- src/engine/net/client/msg/chat/ChatLeaderMsg.java | 2 +- src/engine/net/client/msg/chat/ChatPvPMsg.java | 2 +- src/engine/net/client/msg/chat/ChatSayMsg.java | 2 +- src/engine/net/client/msg/chat/ChatShoutMsg.java | 2 +- src/engine/net/client/msg/chat/ChatSystemChannelMsg.java | 2 +- src/engine/net/client/msg/chat/ChatSystemMsg.java | 2 +- src/engine/net/client/msg/chat/ChatTellMsg.java | 2 +- src/engine/net/client/msg/chat/GuildEnterWorldMsg.java | 2 +- .../net/client/msg/commands/ClientAdminCommandMsg.java | 2 +- .../net/client/msg/group/AppointGroupLeaderMsg.java | 2 +- src/engine/net/client/msg/group/DisbandGroupMsg.java | 2 +- src/engine/net/client/msg/group/FormationFollowMsg.java | 2 +- src/engine/net/client/msg/group/GroupInviteMsg.java | 2 +- .../net/client/msg/group/GroupInviteResponseMsg.java | 2 +- src/engine/net/client/msg/group/GroupUpdateMsg.java | 4 ++-- src/engine/net/client/msg/group/LeaveGroupMsg.java | 2 +- src/engine/net/client/msg/group/RemoveFromGroupMsg.java | 2 +- src/engine/net/client/msg/group/ToggleGroupSplitMsg.java | 2 +- .../net/client/msg/guild/AcceptInviteToGuildMsg.java | 2 +- src/engine/net/client/msg/guild/AcceptSubInviteMsg.java | 2 +- src/engine/net/client/msg/guild/BanishUnbanishMsg.java | 2 +- src/engine/net/client/msg/guild/BreakFealtyMsg.java | 2 +- src/engine/net/client/msg/guild/ChangeRankMsg.java | 2 +- src/engine/net/client/msg/guild/DisbandGuildMsg.java | 2 +- src/engine/net/client/msg/guild/DismissGuildMsg.java | 2 +- src/engine/net/client/msg/guild/GuildControlMsg.java | 2 +- .../net/client/msg/guild/GuildCreationCloseMsg.java | 2 +- .../net/client/msg/guild/GuildCreationFinalizeMsg.java | 2 +- .../net/client/msg/guild/GuildCreationOptionsMsg.java | 2 +- src/engine/net/client/msg/guild/GuildInfoMsg.java | 2 +- src/engine/net/client/msg/guild/GuildListMsg.java | 2 +- src/engine/net/client/msg/guild/GuildUnknownMsg.java | 2 +- src/engine/net/client/msg/guild/InviteToGuildMsg.java | 2 +- src/engine/net/client/msg/guild/InviteToSubMsg.java | 2 +- src/engine/net/client/msg/guild/LeaveGuildMsg.java | 2 +- src/engine/net/client/msg/guild/MOTDCommitMsg.java | 2 +- src/engine/net/client/msg/guild/MOTDMsg.java | 2 +- src/engine/net/client/msg/guild/ReqGuildListMsg.java | 2 +- src/engine/net/client/msg/guild/SendGuildEntryMsg.java | 2 +- src/engine/net/client/msg/guild/SwearInGuildMsg.java | 2 +- src/engine/net/client/msg/guild/SwearInMsg.java | 2 +- src/engine/net/client/msg/login/CharSelectScreenMsg.java | 6 +----- src/engine/net/client/msg/login/ClientLoginInfoMsg.java | 2 +- .../net/client/msg/login/CommitNewCharacterMsg.java | 2 +- src/engine/net/client/msg/login/DeleteCharacterMsg.java | 2 +- .../net/client/msg/login/GameServerIPRequestMsg.java | 2 +- .../net/client/msg/login/GameServerIPResponseMsg.java | 2 +- src/engine/net/client/msg/login/InvalidNameMsg.java | 2 +- src/engine/net/client/msg/login/LoginErrorMsg.java | 2 +- src/engine/net/client/msg/login/ServerStatusMsg.java | 2 +- src/engine/net/client/msg/login/VersionInfoMsg.java | 2 +- src/engine/server/login/LoginServer.java | 2 +- src/engine/server/world/WorldServer.java | 2 +- 240 files changed, 246 insertions(+), 317 deletions(-) rename src/engine/net/{client => }/Protocol.java (99%) diff --git a/src/engine/net/AbstractConnection.java b/src/engine/net/AbstractConnection.java index 8fb86d11..c5bcf4cd 100644 --- a/src/engine/net/AbstractConnection.java +++ b/src/engine/net/AbstractConnection.java @@ -10,7 +10,6 @@ package engine.net; import engine.job.JobManager; -import engine.net.client.Protocol; import engine.net.client.msg.ClientNetMsg; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/AbstractNetMsg.java b/src/engine/net/AbstractNetMsg.java index eb7e7095..8a00f4b2 100644 --- a/src/engine/net/AbstractNetMsg.java +++ b/src/engine/net/AbstractNetMsg.java @@ -10,7 +10,6 @@ package engine.net; import engine.exception.SerializationException; -import engine.net.client.Protocol; import engine.server.MBServerStatics; import engine.util.StringUtils; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/CheckNetMsgFactoryJob.java b/src/engine/net/CheckNetMsgFactoryJob.java index 18ec9e7d..29529fce 100644 --- a/src/engine/net/CheckNetMsgFactoryJob.java +++ b/src/engine/net/CheckNetMsgFactoryJob.java @@ -9,7 +9,6 @@ package engine.net; import engine.job.AbstractJob; -import engine.net.client.Protocol; import engine.net.client.msg.ClientNetMsg; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/NetMsgFactory.java b/src/engine/net/NetMsgFactory.java index c1cbba91..79799d8a 100644 --- a/src/engine/net/NetMsgFactory.java +++ b/src/engine/net/NetMsgFactory.java @@ -12,7 +12,6 @@ package engine.net; import engine.exception.FactoryBuildException; import engine.gameManager.ChatManager; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.PlayerCharacter; import engine.server.MBServerStatics; import org.joda.time.DateTime; diff --git a/src/engine/net/NetMsgStat.java b/src/engine/net/NetMsgStat.java index eef4b0b2..4f57bffe 100644 --- a/src/engine/net/NetMsgStat.java +++ b/src/engine/net/NetMsgStat.java @@ -9,8 +9,6 @@ package engine.net; -import engine.net.client.Protocol; - import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/engine/net/client/Protocol.java b/src/engine/net/Protocol.java similarity index 99% rename from src/engine/net/client/Protocol.java rename to src/engine/net/Protocol.java index fef9b5da..67adc7e1 100644 --- a/src/engine/net/client/Protocol.java +++ b/src/engine/net/Protocol.java @@ -1,11 +1,9 @@ -package engine.net.client; +package engine.net; /* This class defines Magicbane's application network protocol. --> Name / Opcode / Message / Handler */ -import engine.net.AbstractConnection; -import engine.net.ByteBufferReader; import engine.net.client.handlers.*; import engine.net.client.msg.*; import engine.net.client.msg.chat.*; diff --git a/src/engine/net/client/ClientConnection.java b/src/engine/net/client/ClientConnection.java index b2ec544a..142f324f 100644 --- a/src/engine/net/client/ClientConnection.java +++ b/src/engine/net/client/ClientConnection.java @@ -17,6 +17,7 @@ import engine.mbEnums; import engine.net.AbstractConnection; import engine.net.AbstractNetMsg; import engine.net.Network; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.login.LoginErrorMsg; import engine.objects.Account; diff --git a/src/engine/net/client/handlers/AbstractChatMsgHandler.java b/src/engine/net/client/handlers/AbstractChatMsgHandler.java index 0b33adf0..d1bba7e3 100644 --- a/src/engine/net/client/handlers/AbstractChatMsgHandler.java +++ b/src/engine/net/client/handlers/AbstractChatMsgHandler.java @@ -10,8 +10,8 @@ package engine.net.client.handlers; import engine.exception.MsgSendException; import engine.gameManager.ChatManager; +import engine.net.Protocol; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.chat.*; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/AbandonAssetMsg.java b/src/engine/net/client/msg/AbandonAssetMsg.java index 51e1b19a..c33ca990 100644 --- a/src/engine/net/client/msg/AbandonAssetMsg.java +++ b/src/engine/net/client/msg/AbandonAssetMsg.java @@ -13,7 +13,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class AbandonAssetMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/AcceptFriendMsg.java b/src/engine/net/client/msg/AcceptFriendMsg.java index b309e78e..b9ed8024 100644 --- a/src/engine/net/client/msg/AcceptFriendMsg.java +++ b/src/engine/net/client/msg/AcceptFriendMsg.java @@ -9,7 +9,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/AcceptTradeRequestMsg.java b/src/engine/net/client/msg/AcceptTradeRequestMsg.java index e0f63f5e..3b0da8d4 100644 --- a/src/engine/net/client/msg/AcceptTradeRequestMsg.java +++ b/src/engine/net/client/msg/AcceptTradeRequestMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/ActivateNPCMessage.java b/src/engine/net/client/msg/ActivateNPCMessage.java index 985acbf9..45dd7ecd 100644 --- a/src/engine/net/client/msg/ActivateNPCMessage.java +++ b/src/engine/net/client/msg/ActivateNPCMessage.java @@ -10,11 +10,7 @@ package engine.net.client.msg; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.Item; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/AddFriendMessage.java b/src/engine/net/client/msg/AddFriendMessage.java index 0ed159fb..051eb4a2 100644 --- a/src/engine/net/client/msg/AddFriendMessage.java +++ b/src/engine/net/client/msg/AddFriendMessage.java @@ -10,7 +10,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/AddGoldToTradeWindowMsg.java b/src/engine/net/client/msg/AddGoldToTradeWindowMsg.java index ee1ab4ff..818abbce 100644 --- a/src/engine/net/client/msg/AddGoldToTradeWindowMsg.java +++ b/src/engine/net/client/msg/AddGoldToTradeWindowMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class AddGoldToTradeWindowMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/AddItemToTradeWindowMsg.java b/src/engine/net/client/msg/AddItemToTradeWindowMsg.java index c66c4b9b..d2f6c91b 100644 --- a/src/engine/net/client/msg/AddItemToTradeWindowMsg.java +++ b/src/engine/net/client/msg/AddItemToTradeWindowMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; public class AddItemToTradeWindowMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/AllianceChangeMsg.java b/src/engine/net/client/msg/AllianceChangeMsg.java index 97ff500b..a132a028 100644 --- a/src/engine/net/client/msg/AllianceChangeMsg.java +++ b/src/engine/net/client/msg/AllianceChangeMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/AllyEnemyListMsg.java b/src/engine/net/client/msg/AllyEnemyListMsg.java index 95f5b756..242427cc 100644 --- a/src/engine/net/client/msg/AllyEnemyListMsg.java +++ b/src/engine/net/client/msg/AllyEnemyListMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Guild; import engine.objects.GuildAlliances; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/ApplyBuildingEffectMsg.java b/src/engine/net/client/msg/ApplyBuildingEffectMsg.java index f1b221fa..8a8df691 100644 --- a/src/engine/net/client/msg/ApplyBuildingEffectMsg.java +++ b/src/engine/net/client/msg/ApplyBuildingEffectMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ApplyBuildingEffectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ApplyEffectMsg.java b/src/engine/net/client/msg/ApplyEffectMsg.java index b0179ce6..c4e1cb3e 100644 --- a/src/engine/net/client/msg/ApplyEffectMsg.java +++ b/src/engine/net/client/msg/ApplyEffectMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ApplyEffectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ApplyRuneMsg.java b/src/engine/net/client/msg/ApplyRuneMsg.java index 22b88fab..aea94c6b 100644 --- a/src/engine/net/client/msg/ApplyRuneMsg.java +++ b/src/engine/net/client/msg/ApplyRuneMsg.java @@ -13,7 +13,6 @@ import engine.gameManager.DbManager; import engine.mbEnums; import engine.net.*; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.CharacterRune; import engine.objects.PlayerCharacter; import engine.objects.RuneBase; diff --git a/src/engine/net/client/msg/ArcLoginNotifyMsg.java b/src/engine/net/client/msg/ArcLoginNotifyMsg.java index fd4f48df..37bdeab2 100644 --- a/src/engine/net/client/msg/ArcLoginNotifyMsg.java +++ b/src/engine/net/client/msg/ArcLoginNotifyMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ArcLoginNotifyMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ArcMineChangeProductionMsg.java b/src/engine/net/client/msg/ArcMineChangeProductionMsg.java index 0799a9ce..ad8207be 100644 --- a/src/engine/net/client/msg/ArcMineChangeProductionMsg.java +++ b/src/engine/net/client/msg/ArcMineChangeProductionMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ArcMineChangeProductionMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ArcMineWindowAvailableTimeMsg.java b/src/engine/net/client/msg/ArcMineWindowAvailableTimeMsg.java index 249600cd..118fa551 100644 --- a/src/engine/net/client/msg/ArcMineWindowAvailableTimeMsg.java +++ b/src/engine/net/client/msg/ArcMineWindowAvailableTimeMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Building; import engine.objects.Guild; import engine.server.MBServerStatics; diff --git a/src/engine/net/client/msg/ArcMineWindowChangeMsg.java b/src/engine/net/client/msg/ArcMineWindowChangeMsg.java index f8b6d309..9c6011af 100644 --- a/src/engine/net/client/msg/ArcMineWindowChangeMsg.java +++ b/src/engine/net/client/msg/ArcMineWindowChangeMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ArcMineWindowChangeMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ArcOwnedMinesListMsg.java b/src/engine/net/client/msg/ArcOwnedMinesListMsg.java index 202dc621..24d0b70f 100644 --- a/src/engine/net/client/msg/ArcOwnedMinesListMsg.java +++ b/src/engine/net/client/msg/ArcOwnedMinesListMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Mine; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/ArcSiegeSpireMsg.java b/src/engine/net/client/msg/ArcSiegeSpireMsg.java index 2942fce6..71155876 100644 --- a/src/engine/net/client/msg/ArcSiegeSpireMsg.java +++ b/src/engine/net/client/msg/ArcSiegeSpireMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ArcSiegeSpireMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java b/src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java index f9ab6df8..924f0e5c 100644 --- a/src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java +++ b/src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java @@ -16,7 +16,7 @@ import engine.mbEnums.TransactionType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/AssetSupportMsg.java b/src/engine/net/client/msg/AssetSupportMsg.java index 7c92a009..3a35a18e 100644 --- a/src/engine/net/client/msg/AssetSupportMsg.java +++ b/src/engine/net/client/msg/AssetSupportMsg.java @@ -15,7 +15,7 @@ import engine.mbEnums; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/client/msg/AttackCmdMsg.java b/src/engine/net/client/msg/AttackCmdMsg.java index f2c41b4e..66dd1379 100644 --- a/src/engine/net/client/msg/AttackCmdMsg.java +++ b/src/engine/net/client/msg/AttackCmdMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class AttackCmdMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ChangeAltitudeMsg.java b/src/engine/net/client/msg/ChangeAltitudeMsg.java index 924a7031..f5cc95dc 100644 --- a/src/engine/net/client/msg/ChangeAltitudeMsg.java +++ b/src/engine/net/client/msg/ChangeAltitudeMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; public class ChangeAltitudeMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ChangeGuildLeaderMsg.java b/src/engine/net/client/msg/ChangeGuildLeaderMsg.java index 6443ad86..071e385d 100644 --- a/src/engine/net/client/msg/ChangeGuildLeaderMsg.java +++ b/src/engine/net/client/msg/ChangeGuildLeaderMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ChangeGuildLeaderMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ChatFilterMsg.java b/src/engine/net/client/msg/ChatFilterMsg.java index cd3e8bcd..84570168 100644 --- a/src/engine/net/client/msg/ChatFilterMsg.java +++ b/src/engine/net/client/msg/ChatFilterMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ChatFilterMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/CityAssetMsg.java b/src/engine/net/client/msg/CityAssetMsg.java index 5000ba92..7af6d02f 100644 --- a/src/engine/net/client/msg/CityAssetMsg.java +++ b/src/engine/net/client/msg/CityAssetMsg.java @@ -17,7 +17,7 @@ import engine.mbEnums.ProtectionState; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Building; import engine.objects.City; import engine.objects.Zone; diff --git a/src/engine/net/client/msg/CityChoiceMsg.java b/src/engine/net/client/msg/CityChoiceMsg.java index 1e89ec07..d43f26fa 100644 --- a/src/engine/net/client/msg/CityChoiceMsg.java +++ b/src/engine/net/client/msg/CityChoiceMsg.java @@ -10,11 +10,7 @@ package engine.net.client.msg; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/CityDataMsg.java b/src/engine/net/client/msg/CityDataMsg.java index 673a2dfc..62f27363 100644 --- a/src/engine/net/client/msg/CityDataMsg.java +++ b/src/engine/net/client/msg/CityDataMsg.java @@ -11,11 +11,7 @@ package engine.net.client.msg; import engine.gameManager.DbManager; import engine.mbEnums; -import engine.net.AbstractConnection; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.Network; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.AbstractGameObject; import engine.objects.City; import engine.objects.Mine; diff --git a/src/engine/net/client/msg/CityZoneMsg.java b/src/engine/net/client/msg/CityZoneMsg.java index b5e19696..7b80ea4c 100644 --- a/src/engine/net/client/msg/CityZoneMsg.java +++ b/src/engine/net/client/msg/CityZoneMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Zone; public class CityZoneMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ClaimAssetMsg.java b/src/engine/net/client/msg/ClaimAssetMsg.java index 5e41afae..590a4d8a 100644 --- a/src/engine/net/client/msg/ClaimAssetMsg.java +++ b/src/engine/net/client/msg/ClaimAssetMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ClaimAssetMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ClaimGuildTreeMsg.java b/src/engine/net/client/msg/ClaimGuildTreeMsg.java index de4d2767..221d808d 100644 --- a/src/engine/net/client/msg/ClaimGuildTreeMsg.java +++ b/src/engine/net/client/msg/ClaimGuildTreeMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** diff --git a/src/engine/net/client/msg/ClientNetMsg.java b/src/engine/net/client/msg/ClientNetMsg.java index 250d810c..a521f5e4 100644 --- a/src/engine/net/client/msg/ClientNetMsg.java +++ b/src/engine/net/client/msg/ClientNetMsg.java @@ -11,11 +11,7 @@ package engine.net.client.msg; import engine.exception.SerializationException; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; public abstract class ClientNetMsg extends AbstractNetMsg { diff --git a/src/engine/net/client/msg/CloseTradeWindowMsg.java b/src/engine/net/client/msg/CloseTradeWindowMsg.java index 322d9c4b..b34629a6 100644 --- a/src/engine/net/client/msg/CloseTradeWindowMsg.java +++ b/src/engine/net/client/msg/CloseTradeWindowMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/CommitToTradeMsg.java b/src/engine/net/client/msg/CommitToTradeMsg.java index f0bd2e71..cc871155 100644 --- a/src/engine/net/client/msg/CommitToTradeMsg.java +++ b/src/engine/net/client/msg/CommitToTradeMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** diff --git a/src/engine/net/client/msg/ConfirmPromoteMsg.java b/src/engine/net/client/msg/ConfirmPromoteMsg.java index 0031d0e3..ff3a9a6f 100644 --- a/src/engine/net/client/msg/ConfirmPromoteMsg.java +++ b/src/engine/net/client/msg/ConfirmPromoteMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ConfirmPromoteMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/CostOpenBankMsg.java b/src/engine/net/client/msg/CostOpenBankMsg.java index e854f7dc..5831816d 100644 --- a/src/engine/net/client/msg/CostOpenBankMsg.java +++ b/src/engine/net/client/msg/CostOpenBankMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; /** diff --git a/src/engine/net/client/msg/DeclineFriendMsg.java b/src/engine/net/client/msg/DeclineFriendMsg.java index d1d52f2c..0e1a7258 100644 --- a/src/engine/net/client/msg/DeclineFriendMsg.java +++ b/src/engine/net/client/msg/DeclineFriendMsg.java @@ -9,7 +9,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/DeleteItemMsg.java b/src/engine/net/client/msg/DeleteItemMsg.java index fd6ea26d..289cedd1 100644 --- a/src/engine/net/client/msg/DeleteItemMsg.java +++ b/src/engine/net/client/msg/DeleteItemMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class DeleteItemMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/DestroyBuildingMsg.java b/src/engine/net/client/msg/DestroyBuildingMsg.java index d5df7216..7bdfa851 100644 --- a/src/engine/net/client/msg/DestroyBuildingMsg.java +++ b/src/engine/net/client/msg/DestroyBuildingMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class DestroyBuildingMsg extends ClientNetMsg { private int pad = 0; diff --git a/src/engine/net/client/msg/DoorTryOpenMsg.java b/src/engine/net/client/msg/DoorTryOpenMsg.java index d9766b7f..daf32760 100644 --- a/src/engine/net/client/msg/DoorTryOpenMsg.java +++ b/src/engine/net/client/msg/DoorTryOpenMsg.java @@ -22,7 +22,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class DoorTryOpenMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/DropGoldMsg.java b/src/engine/net/client/msg/DropGoldMsg.java index 667916a5..fbde49dc 100644 --- a/src/engine/net/client/msg/DropGoldMsg.java +++ b/src/engine/net/client/msg/DropGoldMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class DropGoldMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/EnterWorldReceivedMsg.java b/src/engine/net/client/msg/EnterWorldReceivedMsg.java index b300a16a..d93b170f 100644 --- a/src/engine/net/client/msg/EnterWorldReceivedMsg.java +++ b/src/engine/net/client/msg/EnterWorldReceivedMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class EnterWorldReceivedMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ErrorPopupMsg.java b/src/engine/net/client/msg/ErrorPopupMsg.java index d01204f3..6c995f1b 100644 --- a/src/engine/net/client/msg/ErrorPopupMsg.java +++ b/src/engine/net/client/msg/ErrorPopupMsg.java @@ -11,7 +11,6 @@ package engine.net.client.msg; import engine.mbEnums; import engine.net.*; -import engine.net.client.Protocol; import engine.objects.PlayerCharacter; public class ErrorPopupMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/FriendRequestMsg.java b/src/engine/net/client/msg/FriendRequestMsg.java index ad735157..7f6c0aa3 100644 --- a/src/engine/net/client/msg/FriendRequestMsg.java +++ b/src/engine/net/client/msg/FriendRequestMsg.java @@ -9,7 +9,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/FurnitureMsg.java b/src/engine/net/client/msg/FurnitureMsg.java index 202db069..c682a8ff 100644 --- a/src/engine/net/client/msg/FurnitureMsg.java +++ b/src/engine/net/client/msg/FurnitureMsg.java @@ -9,13 +9,13 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; import engine.math.Vector3fImmutable; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class FurnitureMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/GoldFromVaultMsg.java b/src/engine/net/client/msg/GoldFromVaultMsg.java index cc55ecde..0357a44d 100644 --- a/src/engine/net/client/msg/GoldFromVaultMsg.java +++ b/src/engine/net/client/msg/GoldFromVaultMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Transfer gold from vault to inventory diff --git a/src/engine/net/client/msg/GoldToVaultMsg.java b/src/engine/net/client/msg/GoldToVaultMsg.java index b927ba63..8acef2a6 100644 --- a/src/engine/net/client/msg/GoldToVaultMsg.java +++ b/src/engine/net/client/msg/GoldToVaultMsg.java @@ -9,12 +9,12 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Transfer gold from inventory to vault diff --git a/src/engine/net/client/msg/GrantExperienceMsg.java b/src/engine/net/client/msg/GrantExperienceMsg.java index cdff6397..c8e43551 100644 --- a/src/engine/net/client/msg/GrantExperienceMsg.java +++ b/src/engine/net/client/msg/GrantExperienceMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; public class GrantExperienceMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/GuildTreeStatusMsg.java b/src/engine/net/client/msg/GuildTreeStatusMsg.java index 8b108589..ca304f53 100644 --- a/src/engine/net/client/msg/GuildTreeStatusMsg.java +++ b/src/engine/net/client/msg/GuildTreeStatusMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; import java.time.LocalDateTime; diff --git a/src/engine/net/client/msg/HirelingServiceMsg.java b/src/engine/net/client/msg/HirelingServiceMsg.java index 8a428dab..1b63a48d 100644 --- a/src/engine/net/client/msg/HirelingServiceMsg.java +++ b/src/engine/net/client/msg/HirelingServiceMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class HirelingServiceMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/HotzoneChangeMsg.java b/src/engine/net/client/msg/HotzoneChangeMsg.java index b779e3ac..9239ce18 100644 --- a/src/engine/net/client/msg/HotzoneChangeMsg.java +++ b/src/engine/net/client/msg/HotzoneChangeMsg.java @@ -15,7 +15,7 @@ import engine.gameManager.ZoneManager; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import java.time.Duration; import java.time.Instant; diff --git a/src/engine/net/client/msg/IgnoreListMsg.java b/src/engine/net/client/msg/IgnoreListMsg.java index cbfb0991..7f4c268d 100644 --- a/src/engine/net/client/msg/IgnoreListMsg.java +++ b/src/engine/net/client/msg/IgnoreListMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/IgnoreMsg.java b/src/engine/net/client/msg/IgnoreMsg.java index 6c86cf1b..f7bca0f4 100644 --- a/src/engine/net/client/msg/IgnoreMsg.java +++ b/src/engine/net/client/msg/IgnoreMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class IgnoreMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/InvalidTradeRequestMsg.java b/src/engine/net/client/msg/InvalidTradeRequestMsg.java index 4e97395b..0c9d917c 100644 --- a/src/engine/net/client/msg/InvalidTradeRequestMsg.java +++ b/src/engine/net/client/msg/InvalidTradeRequestMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/ItemEffectMsg.java b/src/engine/net/client/msg/ItemEffectMsg.java index 5408118c..4600fb2a 100644 --- a/src/engine/net/client/msg/ItemEffectMsg.java +++ b/src/engine/net/client/msg/ItemEffectMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ItemEffectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ItemFromVaultMsg.java b/src/engine/net/client/msg/ItemFromVaultMsg.java index c1aee4c9..75cec72f 100644 --- a/src/engine/net/client/msg/ItemFromVaultMsg.java +++ b/src/engine/net/client/msg/ItemFromVaultMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Transfer item from Vault to inventory diff --git a/src/engine/net/client/msg/ItemHealthUpdateMsg.java b/src/engine/net/client/msg/ItemHealthUpdateMsg.java index ba818e3d..fdd93c82 100644 --- a/src/engine/net/client/msg/ItemHealthUpdateMsg.java +++ b/src/engine/net/client/msg/ItemHealthUpdateMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ItemHealthUpdateMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ItemProductionMsg.java b/src/engine/net/client/msg/ItemProductionMsg.java index e65d0bf4..6d4df1ed 100644 --- a/src/engine/net/client/msg/ItemProductionMsg.java +++ b/src/engine/net/client/msg/ItemProductionMsg.java @@ -12,11 +12,7 @@ package engine.net.client.msg; import engine.gameManager.BuildingManager; import engine.gameManager.PowersManager; import engine.mbEnums.GameObjectType; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.Building; import engine.objects.Item; import engine.objects.MobLoot; diff --git a/src/engine/net/client/msg/ItemToVaultMsg.java b/src/engine/net/client/msg/ItemToVaultMsg.java index b4e3eb11..2c0ef59e 100644 --- a/src/engine/net/client/msg/ItemToVaultMsg.java +++ b/src/engine/net/client/msg/ItemToVaultMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Transfer item from inventory to vault diff --git a/src/engine/net/client/msg/KeepAliveServerClientMsg.java b/src/engine/net/client/msg/KeepAliveServerClientMsg.java index e674d1b5..96d35334 100644 --- a/src/engine/net/client/msg/KeepAliveServerClientMsg.java +++ b/src/engine/net/client/msg/KeepAliveServerClientMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class KeepAliveServerClientMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/LeaderboardMessage.java b/src/engine/net/client/msg/LeaderboardMessage.java index b5179f64..0026c456 100644 --- a/src/engine/net/client/msg/LeaderboardMessage.java +++ b/src/engine/net/client/msg/LeaderboardMessage.java @@ -15,7 +15,7 @@ import engine.mbEnums.ShrineType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Building; import engine.objects.Guild; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/LeaveWorldMsg.java b/src/engine/net/client/msg/LeaveWorldMsg.java index 0711c881..45b622bd 100644 --- a/src/engine/net/client/msg/LeaveWorldMsg.java +++ b/src/engine/net/client/msg/LeaveWorldMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class LeaveWorldMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/LoadCharacterMsg.java b/src/engine/net/client/msg/LoadCharacterMsg.java index 50399a6f..e4efc1b3 100644 --- a/src/engine/net/client/msg/LoadCharacterMsg.java +++ b/src/engine/net/client/msg/LoadCharacterMsg.java @@ -10,11 +10,7 @@ package engine.net.client.msg; import engine.exception.SerializationException; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.AbstractCharacter; import engine.objects.Corpse; diff --git a/src/engine/net/client/msg/LoadStructureMsg.java b/src/engine/net/client/msg/LoadStructureMsg.java index fe8014d2..a59a8064 100644 --- a/src/engine/net/client/msg/LoadStructureMsg.java +++ b/src/engine/net/client/msg/LoadStructureMsg.java @@ -10,11 +10,7 @@ package engine.net.client.msg; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.Building; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/LockUnlockDoorMsg.java b/src/engine/net/client/msg/LockUnlockDoorMsg.java index b644be14..99fe3750 100644 --- a/src/engine/net/client/msg/LockUnlockDoorMsg.java +++ b/src/engine/net/client/msg/LockUnlockDoorMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class LockUnlockDoorMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/LoginToGameServerMsg.java b/src/engine/net/client/msg/LoginToGameServerMsg.java index e77639aa..f1f17db8 100644 --- a/src/engine/net/client/msg/LoginToGameServerMsg.java +++ b/src/engine/net/client/msg/LoginToGameServerMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class LoginToGameServerMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/LootMsg.java b/src/engine/net/client/msg/LootMsg.java index 86c49c03..84b0024a 100644 --- a/src/engine/net/client/msg/LootMsg.java +++ b/src/engine/net/client/msg/LootMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Item; public class LootMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/LootWindowRequestMsg.java b/src/engine/net/client/msg/LootWindowRequestMsg.java index 94832bec..cd938df8 100644 --- a/src/engine/net/client/msg/LootWindowRequestMsg.java +++ b/src/engine/net/client/msg/LootWindowRequestMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class LootWindowRequestMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/LootWindowResponseMsg.java b/src/engine/net/client/msg/LootWindowResponseMsg.java index c6d42530..e18fe1f2 100644 --- a/src/engine/net/client/msg/LootWindowResponseMsg.java +++ b/src/engine/net/client/msg/LootWindowResponseMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Item; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/ManageCityAssetsMsg.java b/src/engine/net/client/msg/ManageCityAssetsMsg.java index 5f640f05..85620300 100644 --- a/src/engine/net/client/msg/ManageCityAssetsMsg.java +++ b/src/engine/net/client/msg/ManageCityAssetsMsg.java @@ -16,7 +16,7 @@ import engine.mbEnums.*; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/src/engine/net/client/msg/ManageNPCMsg.java b/src/engine/net/client/msg/ManageNPCMsg.java index a13620b9..2ec99f38 100644 --- a/src/engine/net/client/msg/ManageNPCMsg.java +++ b/src/engine/net/client/msg/ManageNPCMsg.java @@ -16,7 +16,7 @@ import engine.mbEnums.MinionType; import engine.mbEnums.ProtectionState; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; import engine.powers.EffectsBase; import org.joda.time.DateTime; diff --git a/src/engine/net/client/msg/MerchantMsg.java b/src/engine/net/client/msg/MerchantMsg.java index d14d0692..fd14a2f7 100644 --- a/src/engine/net/client/msg/MerchantMsg.java +++ b/src/engine/net/client/msg/MerchantMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class MerchantMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/MinionTrainingMessage.java b/src/engine/net/client/msg/MinionTrainingMessage.java index 507db953..d9e3cf84 100644 --- a/src/engine/net/client/msg/MinionTrainingMessage.java +++ b/src/engine/net/client/msg/MinionTrainingMessage.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class MinionTrainingMessage extends ClientNetMsg { private int npcID; diff --git a/src/engine/net/client/msg/ModifyCommitToTradeMsg.java b/src/engine/net/client/msg/ModifyCommitToTradeMsg.java index dad76a06..18b83439 100644 --- a/src/engine/net/client/msg/ModifyCommitToTradeMsg.java +++ b/src/engine/net/client/msg/ModifyCommitToTradeMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/ModifyHealthKillMsg.java b/src/engine/net/client/msg/ModifyHealthKillMsg.java index e0de0498..30e705f3 100644 --- a/src/engine/net/client/msg/ModifyHealthKillMsg.java +++ b/src/engine/net/client/msg/ModifyHealthKillMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; public class ModifyHealthKillMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ModifyHealthMsg.java b/src/engine/net/client/msg/ModifyHealthMsg.java index 39a9a94b..7e79efc6 100644 --- a/src/engine/net/client/msg/ModifyHealthMsg.java +++ b/src/engine/net/client/msg/ModifyHealthMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.Building; diff --git a/src/engine/net/client/msg/ModifyStatMsg.java b/src/engine/net/client/msg/ModifyStatMsg.java index f01ff56c..318c2242 100644 --- a/src/engine/net/client/msg/ModifyStatMsg.java +++ b/src/engine/net/client/msg/ModifyStatMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ModifyStatMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/MoveCorrectionMsg.java b/src/engine/net/client/msg/MoveCorrectionMsg.java index 67618bd8..b23b6b42 100644 --- a/src/engine/net/client/msg/MoveCorrectionMsg.java +++ b/src/engine/net/client/msg/MoveCorrectionMsg.java @@ -14,7 +14,7 @@ import engine.math.Vector3fImmutable; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; public class MoveCorrectionMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/MoveToPointMsg.java b/src/engine/net/client/msg/MoveToPointMsg.java index e9f83de7..6f9253fc 100644 --- a/src/engine/net/client/msg/MoveToPointMsg.java +++ b/src/engine/net/client/msg/MoveToPointMsg.java @@ -15,7 +15,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.Building; diff --git a/src/engine/net/client/msg/ObjectActionMsg.java b/src/engine/net/client/msg/ObjectActionMsg.java index c3922440..2e64dafc 100644 --- a/src/engine/net/client/msg/ObjectActionMsg.java +++ b/src/engine/net/client/msg/ObjectActionMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/OpenFriendsCondemnListMsg.java b/src/engine/net/client/msg/OpenFriendsCondemnListMsg.java index 4082d469..6b130bd9 100644 --- a/src/engine/net/client/msg/OpenFriendsCondemnListMsg.java +++ b/src/engine/net/client/msg/OpenFriendsCondemnListMsg.java @@ -15,8 +15,8 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; +import engine.net.Protocol; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.*; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/OpenTradeWindowMsg.java b/src/engine/net/client/msg/OpenTradeWindowMsg.java index 05af29b5..35931622 100644 --- a/src/engine/net/client/msg/OpenTradeWindowMsg.java +++ b/src/engine/net/client/msg/OpenTradeWindowMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/OpenVaultMsg.java b/src/engine/net/client/msg/OpenVaultMsg.java index 61aca7e9..3238008d 100644 --- a/src/engine/net/client/msg/OpenVaultMsg.java +++ b/src/engine/net/client/msg/OpenVaultMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/OrderNPCMsg.java b/src/engine/net/client/msg/OrderNPCMsg.java index dac9ea5b..f2e7f103 100644 --- a/src/engine/net/client/msg/OrderNPCMsg.java +++ b/src/engine/net/client/msg/OrderNPCMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/PassiveMessageTriggerMsg.java b/src/engine/net/client/msg/PassiveMessageTriggerMsg.java index 87070bdf..e6374948 100644 --- a/src/engine/net/client/msg/PassiveMessageTriggerMsg.java +++ b/src/engine/net/client/msg/PassiveMessageTriggerMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class PassiveMessageTriggerMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/PerformActionMsg.java b/src/engine/net/client/msg/PerformActionMsg.java index 0c838b09..e7301a05 100644 --- a/src/engine/net/client/msg/PerformActionMsg.java +++ b/src/engine/net/client/msg/PerformActionMsg.java @@ -15,7 +15,7 @@ import engine.math.Vector3fImmutable; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class PerformActionMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/PetAttackMsg.java b/src/engine/net/client/msg/PetAttackMsg.java index 40ae985b..86295028 100644 --- a/src/engine/net/client/msg/PetAttackMsg.java +++ b/src/engine/net/client/msg/PetAttackMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class PetAttackMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/PetCmdMsg.java b/src/engine/net/client/msg/PetCmdMsg.java index 64095719..1c13adf5 100644 --- a/src/engine/net/client/msg/PetCmdMsg.java +++ b/src/engine/net/client/msg/PetCmdMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class PetCmdMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/PetMsg.java b/src/engine/net/client/msg/PetMsg.java index ca378aae..886ba0bd 100644 --- a/src/engine/net/client/msg/PetMsg.java +++ b/src/engine/net/client/msg/PetMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Mob; public class PetMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/PetitionReceivedMsg.java b/src/engine/net/client/msg/PetitionReceivedMsg.java index fa66f1a9..5019632c 100644 --- a/src/engine/net/client/msg/PetitionReceivedMsg.java +++ b/src/engine/net/client/msg/PetitionReceivedMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import java.util.stream.IntStream; diff --git a/src/engine/net/client/msg/PlaceAssetMsg.java b/src/engine/net/client/msg/PlaceAssetMsg.java index 9991590f..15d0f14c 100644 --- a/src/engine/net/client/msg/PlaceAssetMsg.java +++ b/src/engine/net/client/msg/PlaceAssetMsg.java @@ -13,7 +13,6 @@ import engine.math.Vector3fImmutable; import engine.mbEnums; import engine.net.*; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.Zone; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/client/msg/PowerProjectileMsg.java b/src/engine/net/client/msg/PowerProjectileMsg.java index 0a7f46c2..1f31dd06 100644 --- a/src/engine/net/client/msg/PowerProjectileMsg.java +++ b/src/engine/net/client/msg/PowerProjectileMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; diff --git a/src/engine/net/client/msg/PromptRecallMsg.java b/src/engine/net/client/msg/PromptRecallMsg.java index d550bed4..fb4e716b 100644 --- a/src/engine/net/client/msg/PromptRecallMsg.java +++ b/src/engine/net/client/msg/PromptRecallMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class PromptRecallMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RandomMsg.java b/src/engine/net/client/msg/RandomMsg.java index e2b12421..1c12f9a1 100644 --- a/src/engine/net/client/msg/RandomMsg.java +++ b/src/engine/net/client/msg/RandomMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RandomMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RecommendNationMsg.java b/src/engine/net/client/msg/RecommendNationMsg.java index d5b86184..5efc2de8 100644 --- a/src/engine/net/client/msg/RecommendNationMsg.java +++ b/src/engine/net/client/msg/RecommendNationMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/RecvSummonsMsg.java b/src/engine/net/client/msg/RecvSummonsMsg.java index bf37bf96..e84caa10 100644 --- a/src/engine/net/client/msg/RecvSummonsMsg.java +++ b/src/engine/net/client/msg/RecvSummonsMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RecvSummonsMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RecyclePowerMsg.java b/src/engine/net/client/msg/RecyclePowerMsg.java index 015e5164..e91b626e 100644 --- a/src/engine/net/client/msg/RecyclePowerMsg.java +++ b/src/engine/net/client/msg/RecyclePowerMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RecyclePowerMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RefineMsg.java b/src/engine/net/client/msg/RefineMsg.java index 1e6e6eba..aa12f22c 100644 --- a/src/engine/net/client/msg/RefineMsg.java +++ b/src/engine/net/client/msg/RefineMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RefineMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RefinerScreenMsg.java b/src/engine/net/client/msg/RefinerScreenMsg.java index 54f5e8e3..674e63a3 100644 --- a/src/engine/net/client/msg/RefinerScreenMsg.java +++ b/src/engine/net/client/msg/RefinerScreenMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RefinerScreenMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RejectTradeRequestMsg.java b/src/engine/net/client/msg/RejectTradeRequestMsg.java index 1305a3a6..9fdb282e 100644 --- a/src/engine/net/client/msg/RejectTradeRequestMsg.java +++ b/src/engine/net/client/msg/RejectTradeRequestMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** diff --git a/src/engine/net/client/msg/RemoveFriendMessage.java b/src/engine/net/client/msg/RemoveFriendMessage.java index be34be10..42c88a98 100644 --- a/src/engine/net/client/msg/RemoveFriendMessage.java +++ b/src/engine/net/client/msg/RemoveFriendMessage.java @@ -10,7 +10,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RemoveFriendMessage extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RepairBuildingMsg.java b/src/engine/net/client/msg/RepairBuildingMsg.java index fdf86960..1cb03004 100644 --- a/src/engine/net/client/msg/RepairBuildingMsg.java +++ b/src/engine/net/client/msg/RepairBuildingMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RepairBuildingMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RepairMsg.java b/src/engine/net/client/msg/RepairMsg.java index cd3712b5..08a51023 100644 --- a/src/engine/net/client/msg/RepairMsg.java +++ b/src/engine/net/client/msg/RepairMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Contract; import engine.objects.NPC; diff --git a/src/engine/net/client/msg/ReqBankInventoryMsg.java b/src/engine/net/client/msg/ReqBankInventoryMsg.java index a2941cef..fd5f14bd 100644 --- a/src/engine/net/client/msg/ReqBankInventoryMsg.java +++ b/src/engine/net/client/msg/ReqBankInventoryMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/RequestBallListMessage.java b/src/engine/net/client/msg/RequestBallListMessage.java index 3e4a689e..1c29dc71 100644 --- a/src/engine/net/client/msg/RequestBallListMessage.java +++ b/src/engine/net/client/msg/RequestBallListMessage.java @@ -10,7 +10,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/RequestEnterWorldMsg.java b/src/engine/net/client/msg/RequestEnterWorldMsg.java index 217eb375..28c1eb9e 100644 --- a/src/engine/net/client/msg/RequestEnterWorldMsg.java +++ b/src/engine/net/client/msg/RequestEnterWorldMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RequestEnterWorldMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RespawnMsg.java b/src/engine/net/client/msg/RespawnMsg.java index ebf5eaa5..368f18e5 100644 --- a/src/engine/net/client/msg/RespawnMsg.java +++ b/src/engine/net/client/msg/RespawnMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RespawnMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RespondLeaveWorldMsg.java b/src/engine/net/client/msg/RespondLeaveWorldMsg.java index a2c646dc..a75a1cb2 100644 --- a/src/engine/net/client/msg/RespondLeaveWorldMsg.java +++ b/src/engine/net/client/msg/RespondLeaveWorldMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class RespondLeaveWorldMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/RotateObjectMsg.java b/src/engine/net/client/msg/RotateObjectMsg.java index 090a9b8c..ed19cfa8 100644 --- a/src/engine/net/client/msg/RotateObjectMsg.java +++ b/src/engine/net/client/msg/RotateObjectMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Mob; public class RotateObjectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/SafeModeMsg.java b/src/engine/net/client/msg/SafeModeMsg.java index 8dfb9de5..9aecaeab 100644 --- a/src/engine/net/client/msg/SafeModeMsg.java +++ b/src/engine/net/client/msg/SafeModeMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class SafeModeMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ScaleObjectMsg.java b/src/engine/net/client/msg/ScaleObjectMsg.java index 877fbcef..cd78d77b 100644 --- a/src/engine/net/client/msg/ScaleObjectMsg.java +++ b/src/engine/net/client/msg/ScaleObjectMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ScaleObjectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/SelectCityMsg.java b/src/engine/net/client/msg/SelectCityMsg.java index 4e13af87..07c199eb 100644 --- a/src/engine/net/client/msg/SelectCityMsg.java +++ b/src/engine/net/client/msg/SelectCityMsg.java @@ -10,11 +10,7 @@ package engine.net.client.msg; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/SendBallEntryMessage.java b/src/engine/net/client/msg/SendBallEntryMessage.java index 9b431841..447bbc11 100644 --- a/src/engine/net/client/msg/SendBallEntryMessage.java +++ b/src/engine/net/client/msg/SendBallEntryMessage.java @@ -9,7 +9,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/SendOwnPlayerMsg.java b/src/engine/net/client/msg/SendOwnPlayerMsg.java index f83f0dc1..bd43ba20 100644 --- a/src/engine/net/client/msg/SendOwnPlayerMsg.java +++ b/src/engine/net/client/msg/SendOwnPlayerMsg.java @@ -11,11 +11,7 @@ package engine.net.client.msg; import engine.exception.SerializationException; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.Building; import engine.objects.PlayerCharacter; import engine.objects.Regions; diff --git a/src/engine/net/client/msg/SendSummonsMsg.java b/src/engine/net/client/msg/SendSummonsMsg.java index 6b5723b5..64942b23 100644 --- a/src/engine/net/client/msg/SendSummonsMsg.java +++ b/src/engine/net/client/msg/SendSummonsMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class SendSummonsMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ServerInfoMsg.java b/src/engine/net/client/msg/ServerInfoMsg.java index 33320c0f..4d2f57f1 100644 --- a/src/engine/net/client/msg/ServerInfoMsg.java +++ b/src/engine/net/client/msg/ServerInfoMsg.java @@ -14,7 +14,7 @@ import engine.gameManager.ConfigManager; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.server.MBServerStatics; import engine.server.login.LoginServer; import engine.server.world.WorldServer; diff --git a/src/engine/net/client/msg/SetCombatModeMsg.java b/src/engine/net/client/msg/SetCombatModeMsg.java index 7ae0f3f5..2dab8536 100644 --- a/src/engine/net/client/msg/SetCombatModeMsg.java +++ b/src/engine/net/client/msg/SetCombatModeMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** diff --git a/src/engine/net/client/msg/SetObjectValueMsg.java b/src/engine/net/client/msg/SetObjectValueMsg.java index a7ea9e68..74cd0a16 100644 --- a/src/engine/net/client/msg/SetObjectValueMsg.java +++ b/src/engine/net/client/msg/SetObjectValueMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; public class SetObjectValueMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ShowBankInventoryMsg.java b/src/engine/net/client/msg/ShowBankInventoryMsg.java index c85801d6..f739f47a 100644 --- a/src/engine/net/client/msg/ShowBankInventoryMsg.java +++ b/src/engine/net/client/msg/ShowBankInventoryMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.Item; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/ShowMsg.java b/src/engine/net/client/msg/ShowMsg.java index 93686ce8..730bd234 100644 --- a/src/engine/net/client/msg/ShowMsg.java +++ b/src/engine/net/client/msg/ShowMsg.java @@ -14,7 +14,7 @@ import engine.math.Vector3fImmutable; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ShowMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ShowVaultInventoryMsg.java b/src/engine/net/client/msg/ShowVaultInventoryMsg.java index 5df29795..04692531 100644 --- a/src/engine/net/client/msg/ShowVaultInventoryMsg.java +++ b/src/engine/net/client/msg/ShowVaultInventoryMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/SocialMsg.java b/src/engine/net/client/msg/SocialMsg.java index be748357..cc9c7f21 100644 --- a/src/engine/net/client/msg/SocialMsg.java +++ b/src/engine/net/client/msg/SocialMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class SocialMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/StuckMsg.java b/src/engine/net/client/msg/StuckMsg.java index b598cb15..2ae240ca 100644 --- a/src/engine/net/client/msg/StuckMsg.java +++ b/src/engine/net/client/msg/StuckMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class StuckMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TargetObjectMsg.java b/src/engine/net/client/msg/TargetObjectMsg.java index 55d6f28f..d124a8de 100644 --- a/src/engine/net/client/msg/TargetObjectMsg.java +++ b/src/engine/net/client/msg/TargetObjectMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class TargetObjectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TargetedActionMsg.java b/src/engine/net/client/msg/TargetedActionMsg.java index c60d7056..6c06c56c 100644 --- a/src/engine/net/client/msg/TargetedActionMsg.java +++ b/src/engine/net/client/msg/TargetedActionMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/TaxCityMsg.java b/src/engine/net/client/msg/TaxCityMsg.java index e2e80e22..d0030bf7 100644 --- a/src/engine/net/client/msg/TaxCityMsg.java +++ b/src/engine/net/client/msg/TaxCityMsg.java @@ -9,13 +9,13 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; import engine.gameManager.BuildingManager; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Building; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/TaxResourcesMsg.java b/src/engine/net/client/msg/TaxResourcesMsg.java index a14639f8..f6ca4e28 100644 --- a/src/engine/net/client/msg/TaxResourcesMsg.java +++ b/src/engine/net/client/msg/TaxResourcesMsg.java @@ -9,12 +9,12 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Building; import java.util.HashMap; diff --git a/src/engine/net/client/msg/TeleportRepledgeListMsg.java b/src/engine/net/client/msg/TeleportRepledgeListMsg.java index a76f2abf..d48fc751 100644 --- a/src/engine/net/client/msg/TeleportRepledgeListMsg.java +++ b/src/engine/net/client/msg/TeleportRepledgeListMsg.java @@ -10,11 +10,7 @@ package engine.net.client.msg; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.City; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/TeleportToPointMsg.java b/src/engine/net/client/msg/TeleportToPointMsg.java index 61fcd6a6..78d888df 100644 --- a/src/engine/net/client/msg/TeleportToPointMsg.java +++ b/src/engine/net/client/msg/TeleportToPointMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class TeleportToPointMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TerritoryChangeMessage.java b/src/engine/net/client/msg/TerritoryChangeMessage.java index 87e811b0..ff42b87a 100644 --- a/src/engine/net/client/msg/TerritoryChangeMessage.java +++ b/src/engine/net/client/msg/TerritoryChangeMessage.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; import engine.objects.Realm; diff --git a/src/engine/net/client/msg/ToggleCombatMsg.java b/src/engine/net/client/msg/ToggleCombatMsg.java index 613ee1f0..170016df 100644 --- a/src/engine/net/client/msg/ToggleCombatMsg.java +++ b/src/engine/net/client/msg/ToggleCombatMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ToggleCombatMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ToggleLfgRecruitingMsg.java b/src/engine/net/client/msg/ToggleLfgRecruitingMsg.java index 8b443240..1ce26b80 100644 --- a/src/engine/net/client/msg/ToggleLfgRecruitingMsg.java +++ b/src/engine/net/client/msg/ToggleLfgRecruitingMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ToggleLfgRecruitingMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/ToggleSitStandMsg.java b/src/engine/net/client/msg/ToggleSitStandMsg.java index e7e94898..db55f3c8 100644 --- a/src/engine/net/client/msg/ToggleSitStandMsg.java +++ b/src/engine/net/client/msg/ToggleSitStandMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class ToggleSitStandMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TrackArrowMsg.java b/src/engine/net/client/msg/TrackArrowMsg.java index b66056de..872f5995 100644 --- a/src/engine/net/client/msg/TrackArrowMsg.java +++ b/src/engine/net/client/msg/TrackArrowMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class TrackArrowMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TrackWindowMsg.java b/src/engine/net/client/msg/TrackWindowMsg.java index 61256bfb..07751e55 100644 --- a/src/engine/net/client/msg/TrackWindowMsg.java +++ b/src/engine/net/client/msg/TrackWindowMsg.java @@ -10,11 +10,7 @@ package engine.net.client.msg; import engine.mbEnums.GameObjectType; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.objects.*; import java.util.HashSet; diff --git a/src/engine/net/client/msg/TradeRequestMsg.java b/src/engine/net/client/msg/TradeRequestMsg.java index bf9ace62..bfcbd30a 100644 --- a/src/engine/net/client/msg/TradeRequestMsg.java +++ b/src/engine/net/client/msg/TradeRequestMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; /** diff --git a/src/engine/net/client/msg/TrainMsg.java b/src/engine/net/client/msg/TrainMsg.java index 7cd3213f..9fd4ce7d 100644 --- a/src/engine/net/client/msg/TrainMsg.java +++ b/src/engine/net/client/msg/TrainMsg.java @@ -12,7 +12,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.NPC; diff --git a/src/engine/net/client/msg/TrainerInfoMsg.java b/src/engine/net/client/msg/TrainerInfoMsg.java index ea8c5630..4f751aea 100644 --- a/src/engine/net/client/msg/TrainerInfoMsg.java +++ b/src/engine/net/client/msg/TrainerInfoMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class TrainerInfoMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TransferAssetMsg.java b/src/engine/net/client/msg/TransferAssetMsg.java index 1ea61d0a..bfa55504 100644 --- a/src/engine/net/client/msg/TransferAssetMsg.java +++ b/src/engine/net/client/msg/TransferAssetMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class TransferAssetMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TransferBuildingMsg.java b/src/engine/net/client/msg/TransferBuildingMsg.java index 7a04c25c..83886f5da 100644 --- a/src/engine/net/client/msg/TransferBuildingMsg.java +++ b/src/engine/net/client/msg/TransferBuildingMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class TransferBuildingMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TransferGoldToFromBuildingMsg.java b/src/engine/net/client/msg/TransferGoldToFromBuildingMsg.java index 60011884..0681c9f4 100644 --- a/src/engine/net/client/msg/TransferGoldToFromBuildingMsg.java +++ b/src/engine/net/client/msg/TransferGoldToFromBuildingMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** diff --git a/src/engine/net/client/msg/TransferItemFromBankMsg.java b/src/engine/net/client/msg/TransferItemFromBankMsg.java index e330984f..3ee1da26 100644 --- a/src/engine/net/client/msg/TransferItemFromBankMsg.java +++ b/src/engine/net/client/msg/TransferItemFromBankMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Transfer item from bank to inventory diff --git a/src/engine/net/client/msg/TransferItemFromEquipToInventoryMsg.java b/src/engine/net/client/msg/TransferItemFromEquipToInventoryMsg.java index 48ba28c2..dce19863 100644 --- a/src/engine/net/client/msg/TransferItemFromEquipToInventoryMsg.java +++ b/src/engine/net/client/msg/TransferItemFromEquipToInventoryMsg.java @@ -10,12 +10,12 @@ package engine.net.client.msg; -import engine.mbEnums; import engine.exception.SerializationException; +import engine.mbEnums; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; public class TransferItemFromEquipToInventoryMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TransferItemFromInventoryToEquipMsg.java b/src/engine/net/client/msg/TransferItemFromInventoryToEquipMsg.java index 9aeb8ff3..8b734f3c 100644 --- a/src/engine/net/client/msg/TransferItemFromInventoryToEquipMsg.java +++ b/src/engine/net/client/msg/TransferItemFromInventoryToEquipMsg.java @@ -10,12 +10,12 @@ package engine.net.client.msg; -import engine.mbEnums; import engine.exception.SerializationException; +import engine.mbEnums; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; public class TransferItemFromInventoryToEquipMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/TransferItemToBankMsg.java b/src/engine/net/client/msg/TransferItemToBankMsg.java index 617befdb..deda39f6 100644 --- a/src/engine/net/client/msg/TransferItemToBankMsg.java +++ b/src/engine/net/client/msg/TransferItemToBankMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Transfer item from inventory to bank diff --git a/src/engine/net/client/msg/UncommitToTradeMsg.java b/src/engine/net/client/msg/UncommitToTradeMsg.java index 7a175350..abc38e61 100644 --- a/src/engine/net/client/msg/UncommitToTradeMsg.java +++ b/src/engine/net/client/msg/UncommitToTradeMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** diff --git a/src/engine/net/client/msg/Unknown1Msg.java b/src/engine/net/client/msg/Unknown1Msg.java index 4c92abf1..25a48584 100644 --- a/src/engine/net/client/msg/Unknown1Msg.java +++ b/src/engine/net/client/msg/Unknown1Msg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class Unknown1Msg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/UnknownMsg.java b/src/engine/net/client/msg/UnknownMsg.java index 7d57ea49..c0501f8e 100644 --- a/src/engine/net/client/msg/UnknownMsg.java +++ b/src/engine/net/client/msg/UnknownMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class UnknownMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/UnloadObjectsMsg.java b/src/engine/net/client/msg/UnloadObjectsMsg.java index e300e646..a1caed51 100644 --- a/src/engine/net/client/msg/UnloadObjectsMsg.java +++ b/src/engine/net/client/msg/UnloadObjectsMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/client/msg/UpdateCharOrMobMessage.java b/src/engine/net/client/msg/UpdateCharOrMobMessage.java index 5eae48ed..de5ab270 100644 --- a/src/engine/net/client/msg/UpdateCharOrMobMessage.java +++ b/src/engine/net/client/msg/UpdateCharOrMobMessage.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; public class UpdateCharOrMobMessage extends ClientNetMsg { diff --git a/src/engine/net/client/msg/UpdateClientAlliancesMsg.java b/src/engine/net/client/msg/UpdateClientAlliancesMsg.java index a872c431..c2b23970 100644 --- a/src/engine/net/client/msg/UpdateClientAlliancesMsg.java +++ b/src/engine/net/client/msg/UpdateClientAlliancesMsg.java @@ -9,12 +9,12 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Guild; diff --git a/src/engine/net/client/msg/UpdateEffectsMsg.java b/src/engine/net/client/msg/UpdateEffectsMsg.java index aa7a1f8b..0537b019 100644 --- a/src/engine/net/client/msg/UpdateEffectsMsg.java +++ b/src/engine/net/client/msg/UpdateEffectsMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; import engine.objects.Effect; diff --git a/src/engine/net/client/msg/UpdateFriendStatusMessage.java b/src/engine/net/client/msg/UpdateFriendStatusMessage.java index ecb34248..32444398 100644 --- a/src/engine/net/client/msg/UpdateFriendStatusMessage.java +++ b/src/engine/net/client/msg/UpdateFriendStatusMessage.java @@ -6,12 +6,12 @@ HashSet playerFriendSet = PlayerFriendsMap.get(playerUID); package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.gameManager.SessionManager; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/UpdateGoldMsg.java b/src/engine/net/client/msg/UpdateGoldMsg.java index 604014fa..4c706581 100644 --- a/src/engine/net/client/msg/UpdateGoldMsg.java +++ b/src/engine/net/client/msg/UpdateGoldMsg.java @@ -9,12 +9,12 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; import engine.objects.CharacterItemManager; import engine.objects.Item; diff --git a/src/engine/net/client/msg/UpdateInventoryMsg.java b/src/engine/net/client/msg/UpdateInventoryMsg.java index 2e458f9e..3eb03447 100644 --- a/src/engine/net/client/msg/UpdateInventoryMsg.java +++ b/src/engine/net/client/msg/UpdateInventoryMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.ItemType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Item; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/UpdateObjectMsg.java b/src/engine/net/client/msg/UpdateObjectMsg.java index aae3ea64..9b16e475 100644 --- a/src/engine/net/client/msg/UpdateObjectMsg.java +++ b/src/engine/net/client/msg/UpdateObjectMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; public class UpdateObjectMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/UpdateStateMsg.java b/src/engine/net/client/msg/UpdateStateMsg.java index 775fcafc..1496d432 100644 --- a/src/engine/net/client/msg/UpdateStateMsg.java +++ b/src/engine/net/client/msg/UpdateStateMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/UpdateTradeWindowMsg.java b/src/engine/net/client/msg/UpdateTradeWindowMsg.java index 9bf0d9d9..80937e16 100644 --- a/src/engine/net/client/msg/UpdateTradeWindowMsg.java +++ b/src/engine/net/client/msg/UpdateTradeWindowMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Item; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/UpdateVaultMsg.java b/src/engine/net/client/msg/UpdateVaultMsg.java index 0ef84124..9a8a278c 100644 --- a/src/engine/net/client/msg/UpdateVaultMsg.java +++ b/src/engine/net/client/msg/UpdateVaultMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Account; /** diff --git a/src/engine/net/client/msg/UpgradeAssetMessage.java b/src/engine/net/client/msg/UpgradeAssetMessage.java index d0366928..2f69180d 100644 --- a/src/engine/net/client/msg/UpgradeAssetMessage.java +++ b/src/engine/net/client/msg/UpgradeAssetMessage.java @@ -10,11 +10,7 @@ package engine.net.client.msg; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; public class UpgradeAssetMessage extends ClientNetMsg { diff --git a/src/engine/net/client/msg/UseCharterMsg.java b/src/engine/net/client/msg/UseCharterMsg.java index 8b80ca23..1fe5f91f 100644 --- a/src/engine/net/client/msg/UseCharterMsg.java +++ b/src/engine/net/client/msg/UseCharterMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.ItemType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Item; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/VendorBuyMsg.java b/src/engine/net/client/msg/VendorBuyMsg.java index 58183e53..643865b6 100644 --- a/src/engine/net/client/msg/VendorBuyMsg.java +++ b/src/engine/net/client/msg/VendorBuyMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Item; public class VendorBuyMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/VendorBuyWindowMsg.java b/src/engine/net/client/msg/VendorBuyWindowMsg.java index acbb835d..9c5517a3 100644 --- a/src/engine/net/client/msg/VendorBuyWindowMsg.java +++ b/src/engine/net/client/msg/VendorBuyWindowMsg.java @@ -9,14 +9,10 @@ package engine.net.client.msg; -import engine.mbEnums.ItemType; import engine.exception.SerializationException; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; +import engine.mbEnums.ItemType; +import engine.net.*; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.*; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java index f694a5a4..e91c7c34 100644 --- a/src/engine/net/client/msg/VendorDialogMsg.java +++ b/src/engine/net/client/msg/VendorDialogMsg.java @@ -12,7 +12,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.MenuOption; import engine.objects.VendorDialog; diff --git a/src/engine/net/client/msg/VendorSellMsg.java b/src/engine/net/client/msg/VendorSellMsg.java index 830400e4..630f8a60 100644 --- a/src/engine/net/client/msg/VendorSellMsg.java +++ b/src/engine/net/client/msg/VendorSellMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; /** * Buy from NPC msg diff --git a/src/engine/net/client/msg/VendorSellWindowMsg.java b/src/engine/net/client/msg/VendorSellWindowMsg.java index 5a81f731..152a3c74 100644 --- a/src/engine/net/client/msg/VendorSellWindowMsg.java +++ b/src/engine/net/client/msg/VendorSellWindowMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import java.util.ArrayList; diff --git a/src/engine/net/client/msg/ViewResourcesMsg.java b/src/engine/net/client/msg/ViewResourcesMsg.java index cbaaaa94..b3e5acff 100644 --- a/src/engine/net/client/msg/ViewResourcesMsg.java +++ b/src/engine/net/client/msg/ViewResourcesMsg.java @@ -9,12 +9,12 @@ package engine.net.client.msg; -import engine.mbEnums; import engine.gameManager.DbManager; +import engine.mbEnums; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.*; diff --git a/src/engine/net/client/msg/VisualUpdateMessage.java b/src/engine/net/client/msg/VisualUpdateMessage.java index 94e79894..fa88e585 100644 --- a/src/engine/net/client/msg/VisualUpdateMessage.java +++ b/src/engine/net/client/msg/VisualUpdateMessage.java @@ -10,12 +10,12 @@ package engine.net.client.msg; -import engine.mbEnums.GameObjectType; import engine.exception.SerializationException; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractGameObject; import engine.objects.Building; diff --git a/src/engine/net/client/msg/WhoRequestMsg.java b/src/engine/net/client/msg/WhoRequestMsg.java index 93433461..13849af0 100644 --- a/src/engine/net/client/msg/WhoRequestMsg.java +++ b/src/engine/net/client/msg/WhoRequestMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; public class WhoRequestMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/WhoResponseMsg.java b/src/engine/net/client/msg/WhoResponseMsg.java index 02cb59db..c89fe630 100644 --- a/src/engine/net/client/msg/WhoResponseMsg.java +++ b/src/engine/net/client/msg/WhoResponseMsg.java @@ -9,11 +9,10 @@ package engine.net.client.msg; -import engine.mbEnums; import engine.gameManager.SessionManager; +import engine.mbEnums; import engine.net.*; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.Guild; import engine.objects.GuildStatusController; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/WorldDataMsg.java b/src/engine/net/client/msg/WorldDataMsg.java index 025a30fe..bd526df0 100644 --- a/src/engine/net/client/msg/WorldDataMsg.java +++ b/src/engine/net/client/msg/WorldDataMsg.java @@ -10,16 +10,12 @@ package engine.net.client.msg; -import engine.mbEnums; import engine.exception.SerializationException; import engine.gameManager.ConfigManager; import engine.gameManager.DbManager; import engine.gameManager.ZoneManager; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.mbEnums; +import engine.net.*; import engine.objects.Zone; import engine.server.world.WorldServer; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/client/msg/WorldRealmMsg.java b/src/engine/net/client/msg/WorldRealmMsg.java index fde56eb5..3959504b 100644 --- a/src/engine/net/client/msg/WorldRealmMsg.java +++ b/src/engine/net/client/msg/WorldRealmMsg.java @@ -12,7 +12,7 @@ package engine.net.client.msg; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.Realm; import engine.server.world.WorldServer; diff --git a/src/engine/net/client/msg/chat/AbstractChatMsg.java b/src/engine/net/client/msg/chat/AbstractChatMsg.java index 5b69e03a..bdb17057 100644 --- a/src/engine/net/client/msg/chat/AbstractChatMsg.java +++ b/src/engine/net/client/msg/chat/AbstractChatMsg.java @@ -14,7 +14,7 @@ import engine.exception.SerializationException; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.AbstractWorldObject; diff --git a/src/engine/net/client/msg/chat/ChatCSRMsg.java b/src/engine/net/client/msg/chat/ChatCSRMsg.java index 1aff5bbd..b9e7a537 100644 --- a/src/engine/net/client/msg/chat/ChatCSRMsg.java +++ b/src/engine/net/client/msg/chat/ChatCSRMsg.java @@ -14,8 +14,8 @@ import engine.gameManager.SessionManager; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; +import engine.net.Protocol; import engine.net.client.ClientConnection; -import engine.net.client.Protocol; import engine.objects.AbstractWorldObject; import engine.server.world.WorldServer; import engine.session.Session; diff --git a/src/engine/net/client/msg/chat/ChatCityMsg.java b/src/engine/net/client/msg/chat/ChatCityMsg.java index 20956c9a..68cff1ea 100644 --- a/src/engine/net/client/msg/chat/ChatCityMsg.java +++ b/src/engine/net/client/msg/chat/ChatCityMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.AbstractGameObject; import engine.objects.AbstractWorldObject; diff --git a/src/engine/net/client/msg/chat/ChatGlobalMsg.java b/src/engine/net/client/msg/chat/ChatGlobalMsg.java index f7658ddd..b11f26fe 100644 --- a/src/engine/net/client/msg/chat/ChatGlobalMsg.java +++ b/src/engine/net/client/msg/chat/ChatGlobalMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; import engine.server.world.WorldServer; diff --git a/src/engine/net/client/msg/chat/ChatGroupMsg.java b/src/engine/net/client/msg/chat/ChatGroupMsg.java index 15bbe6a1..90fea319 100644 --- a/src/engine/net/client/msg/chat/ChatGroupMsg.java +++ b/src/engine/net/client/msg/chat/ChatGroupMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatGroupMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatGuildMsg.java b/src/engine/net/client/msg/chat/ChatGuildMsg.java index 8974654e..5bf73048 100644 --- a/src/engine/net/client/msg/chat/ChatGuildMsg.java +++ b/src/engine/net/client/msg/chat/ChatGuildMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatGuildMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatICMsg.java b/src/engine/net/client/msg/chat/ChatICMsg.java index b2d3dfe4..8b73f1cc 100644 --- a/src/engine/net/client/msg/chat/ChatICMsg.java +++ b/src/engine/net/client/msg/chat/ChatICMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatICMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatInfoMsg.java b/src/engine/net/client/msg/chat/ChatInfoMsg.java index 5645e8d0..f5cd1df9 100644 --- a/src/engine/net/client/msg/chat/ChatInfoMsg.java +++ b/src/engine/net/client/msg/chat/ChatInfoMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatInfoMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatLeaderMsg.java b/src/engine/net/client/msg/chat/ChatLeaderMsg.java index 7f83f1ed..0c59c615 100644 --- a/src/engine/net/client/msg/chat/ChatLeaderMsg.java +++ b/src/engine/net/client/msg/chat/ChatLeaderMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatLeaderMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatPvPMsg.java b/src/engine/net/client/msg/chat/ChatPvPMsg.java index a84610af..5f7eaf59 100644 --- a/src/engine/net/client/msg/chat/ChatPvPMsg.java +++ b/src/engine/net/client/msg/chat/ChatPvPMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatPvPMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatSayMsg.java b/src/engine/net/client/msg/chat/ChatSayMsg.java index 03826d7c..08f915f9 100644 --- a/src/engine/net/client/msg/chat/ChatSayMsg.java +++ b/src/engine/net/client/msg/chat/ChatSayMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.AbstractGameObject; import engine.objects.AbstractWorldObject; diff --git a/src/engine/net/client/msg/chat/ChatShoutMsg.java b/src/engine/net/client/msg/chat/ChatShoutMsg.java index 761f13dd..c5169445 100644 --- a/src/engine/net/client/msg/chat/ChatShoutMsg.java +++ b/src/engine/net/client/msg/chat/ChatShoutMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; import engine.server.world.WorldServer; diff --git a/src/engine/net/client/msg/chat/ChatSystemChannelMsg.java b/src/engine/net/client/msg/chat/ChatSystemChannelMsg.java index 30e1f1a9..a3581b39 100644 --- a/src/engine/net/client/msg/chat/ChatSystemChannelMsg.java +++ b/src/engine/net/client/msg/chat/ChatSystemChannelMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; public class ChatSystemChannelMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/chat/ChatSystemMsg.java b/src/engine/net/client/msg/chat/ChatSystemMsg.java index 29b412fa..785c38e1 100644 --- a/src/engine/net/client/msg/chat/ChatSystemMsg.java +++ b/src/engine/net/client/msg/chat/ChatSystemMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractWorldObject; import engine.server.MBServerStatics; diff --git a/src/engine/net/client/msg/chat/ChatTellMsg.java b/src/engine/net/client/msg/chat/ChatTellMsg.java index fe60e679..3170b47a 100644 --- a/src/engine/net/client/msg/chat/ChatTellMsg.java +++ b/src/engine/net/client/msg/chat/ChatTellMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.chat; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; import engine.server.world.WorldServer; diff --git a/src/engine/net/client/msg/chat/GuildEnterWorldMsg.java b/src/engine/net/client/msg/chat/GuildEnterWorldMsg.java index 6b6b5918..52867810 100644 --- a/src/engine/net/client/msg/chat/GuildEnterWorldMsg.java +++ b/src/engine/net/client/msg/chat/GuildEnterWorldMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.objects.PlayerCharacter; public class GuildEnterWorldMsg extends AbstractChatMsg { diff --git a/src/engine/net/client/msg/commands/ClientAdminCommandMsg.java b/src/engine/net/client/msg/commands/ClientAdminCommandMsg.java index a24be476..f6635c93 100644 --- a/src/engine/net/client/msg/commands/ClientAdminCommandMsg.java +++ b/src/engine/net/client/msg/commands/ClientAdminCommandMsg.java @@ -15,7 +15,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.AbstractGameObject; diff --git a/src/engine/net/client/msg/group/AppointGroupLeaderMsg.java b/src/engine/net/client/msg/group/AppointGroupLeaderMsg.java index d3d4013b..f04d2180 100644 --- a/src/engine/net/client/msg/group/AppointGroupLeaderMsg.java +++ b/src/engine/net/client/msg/group/AppointGroupLeaderMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class AppointGroupLeaderMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/DisbandGroupMsg.java b/src/engine/net/client/msg/group/DisbandGroupMsg.java index b23ae529..0f0ac390 100644 --- a/src/engine/net/client/msg/group/DisbandGroupMsg.java +++ b/src/engine/net/client/msg/group/DisbandGroupMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class DisbandGroupMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/FormationFollowMsg.java b/src/engine/net/client/msg/group/FormationFollowMsg.java index afd2acc4..f98abb7c 100644 --- a/src/engine/net/client/msg/group/FormationFollowMsg.java +++ b/src/engine/net/client/msg/group/FormationFollowMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class FormationFollowMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/GroupInviteMsg.java b/src/engine/net/client/msg/group/GroupInviteMsg.java index f6afdf00..5748a440 100644 --- a/src/engine/net/client/msg/group/GroupInviteMsg.java +++ b/src/engine/net/client/msg/group/GroupInviteMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class GroupInviteMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/GroupInviteResponseMsg.java b/src/engine/net/client/msg/group/GroupInviteResponseMsg.java index c9e26bf9..bb5b92d8 100644 --- a/src/engine/net/client/msg/group/GroupInviteResponseMsg.java +++ b/src/engine/net/client/msg/group/GroupInviteResponseMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class GroupInviteResponseMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/GroupUpdateMsg.java b/src/engine/net/client/msg/group/GroupUpdateMsg.java index f09f063c..bd57f065 100644 --- a/src/engine/net/client/msg/group/GroupUpdateMsg.java +++ b/src/engine/net/client/msg/group/GroupUpdateMsg.java @@ -9,12 +9,12 @@ package engine.net.client.msg.group; -import engine.mbEnums.GameObjectType; import engine.gameManager.GroupManager; +import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.Group; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/group/LeaveGroupMsg.java b/src/engine/net/client/msg/group/LeaveGroupMsg.java index f477de3b..8cbcb3b7 100644 --- a/src/engine/net/client/msg/group/LeaveGroupMsg.java +++ b/src/engine/net/client/msg/group/LeaveGroupMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class LeaveGroupMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/RemoveFromGroupMsg.java b/src/engine/net/client/msg/group/RemoveFromGroupMsg.java index 7ff6586a..da78c30a 100644 --- a/src/engine/net/client/msg/group/RemoveFromGroupMsg.java +++ b/src/engine/net/client/msg/group/RemoveFromGroupMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class RemoveFromGroupMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/group/ToggleGroupSplitMsg.java b/src/engine/net/client/msg/group/ToggleGroupSplitMsg.java index 1becdabb..2a27444c 100644 --- a/src/engine/net/client/msg/group/ToggleGroupSplitMsg.java +++ b/src/engine/net/client/msg/group/ToggleGroupSplitMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.group; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class ToggleGroupSplitMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/AcceptInviteToGuildMsg.java b/src/engine/net/client/msg/guild/AcceptInviteToGuildMsg.java index d8ef71d0..7fb2969d 100644 --- a/src/engine/net/client/msg/guild/AcceptInviteToGuildMsg.java +++ b/src/engine/net/client/msg/guild/AcceptInviteToGuildMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class AcceptInviteToGuildMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/AcceptSubInviteMsg.java b/src/engine/net/client/msg/guild/AcceptSubInviteMsg.java index 42f99620..d83a4158 100644 --- a/src/engine/net/client/msg/guild/AcceptSubInviteMsg.java +++ b/src/engine/net/client/msg/guild/AcceptSubInviteMsg.java @@ -22,7 +22,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class AcceptSubInviteMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/BanishUnbanishMsg.java b/src/engine/net/client/msg/guild/BanishUnbanishMsg.java index d06af36c..f0413e5d 100644 --- a/src/engine/net/client/msg/guild/BanishUnbanishMsg.java +++ b/src/engine/net/client/msg/guild/BanishUnbanishMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class BanishUnbanishMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/BreakFealtyMsg.java b/src/engine/net/client/msg/guild/BreakFealtyMsg.java index 7a003f63..77da9596 100644 --- a/src/engine/net/client/msg/guild/BreakFealtyMsg.java +++ b/src/engine/net/client/msg/guild/BreakFealtyMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class BreakFealtyMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/ChangeRankMsg.java b/src/engine/net/client/msg/guild/ChangeRankMsg.java index f3a9c46d..0803a00c 100644 --- a/src/engine/net/client/msg/guild/ChangeRankMsg.java +++ b/src/engine/net/client/msg/guild/ChangeRankMsg.java @@ -22,7 +22,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class ChangeRankMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/DisbandGuildMsg.java b/src/engine/net/client/msg/guild/DisbandGuildMsg.java index f9f7cfd3..2b7f34f5 100644 --- a/src/engine/net/client/msg/guild/DisbandGuildMsg.java +++ b/src/engine/net/client/msg/guild/DisbandGuildMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class DisbandGuildMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/DismissGuildMsg.java b/src/engine/net/client/msg/guild/DismissGuildMsg.java index 5d67a966..30dec40b 100644 --- a/src/engine/net/client/msg/guild/DismissGuildMsg.java +++ b/src/engine/net/client/msg/guild/DismissGuildMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class DismissGuildMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/GuildControlMsg.java b/src/engine/net/client/msg/guild/GuildControlMsg.java index 8d938a1d..d744134c 100644 --- a/src/engine/net/client/msg/guild/GuildControlMsg.java +++ b/src/engine/net/client/msg/guild/GuildControlMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class GuildControlMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/GuildCreationCloseMsg.java b/src/engine/net/client/msg/guild/GuildCreationCloseMsg.java index 3a259238..28b43e6d 100644 --- a/src/engine/net/client/msg/guild/GuildCreationCloseMsg.java +++ b/src/engine/net/client/msg/guild/GuildCreationCloseMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/client/msg/guild/GuildCreationFinalizeMsg.java b/src/engine/net/client/msg/guild/GuildCreationFinalizeMsg.java index acfe60a9..9ba812e9 100644 --- a/src/engine/net/client/msg/guild/GuildCreationFinalizeMsg.java +++ b/src/engine/net/client/msg/guild/GuildCreationFinalizeMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.GuildTag; import engine.objects.Item; diff --git a/src/engine/net/client/msg/guild/GuildCreationOptionsMsg.java b/src/engine/net/client/msg/guild/GuildCreationOptionsMsg.java index c22979b0..0a4fb9b4 100644 --- a/src/engine/net/client/msg/guild/GuildCreationOptionsMsg.java +++ b/src/engine/net/client/msg/guild/GuildCreationOptionsMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/guild/GuildInfoMsg.java b/src/engine/net/client/msg/guild/GuildInfoMsg.java index 938c2732..fc692299 100644 --- a/src/engine/net/client/msg/guild/GuildInfoMsg.java +++ b/src/engine/net/client/msg/guild/GuildInfoMsg.java @@ -14,7 +14,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.*; import org.joda.time.DateTime; diff --git a/src/engine/net/client/msg/guild/GuildListMsg.java b/src/engine/net/client/msg/guild/GuildListMsg.java index 1a225cb5..821745a7 100644 --- a/src/engine/net/client/msg/guild/GuildListMsg.java +++ b/src/engine/net/client/msg/guild/GuildListMsg.java @@ -15,7 +15,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.Guild; import engine.objects.GuildHistory; diff --git a/src/engine/net/client/msg/guild/GuildUnknownMsg.java b/src/engine/net/client/msg/guild/GuildUnknownMsg.java index 87ff4020..940b53b9 100644 --- a/src/engine/net/client/msg/guild/GuildUnknownMsg.java +++ b/src/engine/net/client/msg/guild/GuildUnknownMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class GuildUnknownMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/InviteToGuildMsg.java b/src/engine/net/client/msg/guild/InviteToGuildMsg.java index 48d9369f..192288ee 100644 --- a/src/engine/net/client/msg/guild/InviteToGuildMsg.java +++ b/src/engine/net/client/msg/guild/InviteToGuildMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/guild/InviteToSubMsg.java b/src/engine/net/client/msg/guild/InviteToSubMsg.java index d9c325e7..abe743cd 100644 --- a/src/engine/net/client/msg/guild/InviteToSubMsg.java +++ b/src/engine/net/client/msg/guild/InviteToSubMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/guild/LeaveGuildMsg.java b/src/engine/net/client/msg/guild/LeaveGuildMsg.java index f8a56216..cfd69d3d 100644 --- a/src/engine/net/client/msg/guild/LeaveGuildMsg.java +++ b/src/engine/net/client/msg/guild/LeaveGuildMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class LeaveGuildMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/MOTDCommitMsg.java b/src/engine/net/client/msg/guild/MOTDCommitMsg.java index 6f821824..39736fc1 100644 --- a/src/engine/net/client/msg/guild/MOTDCommitMsg.java +++ b/src/engine/net/client/msg/guild/MOTDCommitMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class MOTDCommitMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/MOTDMsg.java b/src/engine/net/client/msg/guild/MOTDMsg.java index 16060ae5..441b4a33 100644 --- a/src/engine/net/client/msg/guild/MOTDMsg.java +++ b/src/engine/net/client/msg/guild/MOTDMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class MOTDMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/ReqGuildListMsg.java b/src/engine/net/client/msg/guild/ReqGuildListMsg.java index 8dbe382a..00b652a1 100644 --- a/src/engine/net/client/msg/guild/ReqGuildListMsg.java +++ b/src/engine/net/client/msg/guild/ReqGuildListMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class ReqGuildListMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/SendGuildEntryMsg.java b/src/engine/net/client/msg/guild/SendGuildEntryMsg.java index 6398c14c..3cca297b 100644 --- a/src/engine/net/client/msg/guild/SendGuildEntryMsg.java +++ b/src/engine/net/client/msg/guild/SendGuildEntryMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.objects.Guild; import engine.objects.GuildTag; diff --git a/src/engine/net/client/msg/guild/SwearInGuildMsg.java b/src/engine/net/client/msg/guild/SwearInGuildMsg.java index a9051f59..d32c0e4e 100644 --- a/src/engine/net/client/msg/guild/SwearInGuildMsg.java +++ b/src/engine/net/client/msg/guild/SwearInGuildMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class SwearInGuildMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/guild/SwearInMsg.java b/src/engine/net/client/msg/guild/SwearInMsg.java index aa9c239e..8ae6e113 100644 --- a/src/engine/net/client/msg/guild/SwearInMsg.java +++ b/src/engine/net/client/msg/guild/SwearInMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.guild; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class SwearInMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/CharSelectScreenMsg.java b/src/engine/net/client/msg/login/CharSelectScreenMsg.java index 34fd3f32..fec17ef2 100644 --- a/src/engine/net/client/msg/login/CharSelectScreenMsg.java +++ b/src/engine/net/client/msg/login/CharSelectScreenMsg.java @@ -11,11 +11,7 @@ package engine.net.client.msg.login; import engine.exception.SerializationException; -import engine.net.AbstractConnection; -import engine.net.AbstractNetMsg; -import engine.net.ByteBufferReader; -import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.*; import engine.net.client.msg.ClientNetMsg; import engine.objects.Account; import engine.objects.PlayerCharacter; diff --git a/src/engine/net/client/msg/login/ClientLoginInfoMsg.java b/src/engine/net/client/msg/login/ClientLoginInfoMsg.java index 419360f5..0b2e0c3a 100644 --- a/src/engine/net/client/msg/login/ClientLoginInfoMsg.java +++ b/src/engine/net/client/msg/login/ClientLoginInfoMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.login; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class ClientLoginInfoMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/CommitNewCharacterMsg.java b/src/engine/net/client/msg/login/CommitNewCharacterMsg.java index 673656cf..2e17797a 100644 --- a/src/engine/net/client/msg/login/CommitNewCharacterMsg.java +++ b/src/engine/net/client/msg/login/CommitNewCharacterMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.login; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class CommitNewCharacterMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/DeleteCharacterMsg.java b/src/engine/net/client/msg/login/DeleteCharacterMsg.java index 0763c989..71a6be29 100644 --- a/src/engine/net/client/msg/login/DeleteCharacterMsg.java +++ b/src/engine/net/client/msg/login/DeleteCharacterMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class DeleteCharacterMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/GameServerIPRequestMsg.java b/src/engine/net/client/msg/login/GameServerIPRequestMsg.java index 19798412..678d9ee7 100644 --- a/src/engine/net/client/msg/login/GameServerIPRequestMsg.java +++ b/src/engine/net/client/msg/login/GameServerIPRequestMsg.java @@ -13,7 +13,7 @@ import engine.mbEnums.GameObjectType; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class GameServerIPRequestMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/GameServerIPResponseMsg.java b/src/engine/net/client/msg/login/GameServerIPResponseMsg.java index fe258fc9..7f07359c 100644 --- a/src/engine/net/client/msg/login/GameServerIPResponseMsg.java +++ b/src/engine/net/client/msg/login/GameServerIPResponseMsg.java @@ -14,7 +14,7 @@ import engine.gameManager.ConfigManager; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class GameServerIPResponseMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/InvalidNameMsg.java b/src/engine/net/client/msg/login/InvalidNameMsg.java index 0547abea..d3acc843 100644 --- a/src/engine/net/client/msg/login/InvalidNameMsg.java +++ b/src/engine/net/client/msg/login/InvalidNameMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.login; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; import engine.server.world.WorldServer; diff --git a/src/engine/net/client/msg/login/LoginErrorMsg.java b/src/engine/net/client/msg/login/LoginErrorMsg.java index d5247d96..c1cf76fa 100644 --- a/src/engine/net/client/msg/login/LoginErrorMsg.java +++ b/src/engine/net/client/msg/login/LoginErrorMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.login; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class LoginErrorMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/ServerStatusMsg.java b/src/engine/net/client/msg/login/ServerStatusMsg.java index 32d96198..6ff31558 100644 --- a/src/engine/net/client/msg/login/ServerStatusMsg.java +++ b/src/engine/net/client/msg/login/ServerStatusMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.login; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class ServerStatusMsg extends ClientNetMsg { diff --git a/src/engine/net/client/msg/login/VersionInfoMsg.java b/src/engine/net/client/msg/login/VersionInfoMsg.java index 81852009..5718cec9 100644 --- a/src/engine/net/client/msg/login/VersionInfoMsg.java +++ b/src/engine/net/client/msg/login/VersionInfoMsg.java @@ -13,7 +13,7 @@ package engine.net.client.msg.login; import engine.net.AbstractConnection; import engine.net.ByteBufferReader; import engine.net.ByteBufferWriter; -import engine.net.client.Protocol; +import engine.net.Protocol; import engine.net.client.msg.ClientNetMsg; public class VersionInfoMsg extends ClientNetMsg { diff --git a/src/engine/server/login/LoginServer.java b/src/engine/server/login/LoginServer.java index 1c951e81..341221b7 100644 --- a/src/engine/server/login/LoginServer.java +++ b/src/engine/server/login/LoginServer.java @@ -17,9 +17,9 @@ import engine.mbEnums; import engine.net.Dispatch; import engine.net.DispatchMessage; import engine.net.Network; +import engine.net.Protocol; import engine.net.client.ClientConnection; import engine.net.client.ClientConnectionManager; -import engine.net.client.Protocol; import engine.net.client.msg.login.*; import engine.objects.*; import engine.server.MBServerStatics; diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index 25a63082..446e9122 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -28,9 +28,9 @@ import engine.mobileAI.Threads.Respawner; import engine.net.DispatchMessage; import engine.net.ItemProductionManager; import engine.net.Network; +import engine.net.Protocol; import engine.net.client.ClientConnection; import engine.net.client.ClientConnectionManager; -import engine.net.client.Protocol; import engine.net.client.msg.UpdateStateMsg; import engine.net.client.msg.chat.ChatSystemMsg; import engine.objects.*;