Class moved up in package

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;
 

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;

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;
 

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;

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;
 

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.*;

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;

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;

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 {

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;
 
 

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;
 
 /**

src/engine/net/client/msg/ActivateNPCMessage.java

@@ -10,11 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.net.AbstractConnection;
+import engine.net.*;
-import engine.net.AbstractNetMsg;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.client.Protocol;
 import engine.objects.Item;
 
 import java.util.ArrayList;

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;
 
 

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 {

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 {

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;
 
 

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;

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 {

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 {

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;

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 {
 

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 {
 

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;

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 {
 

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;

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 {

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;

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;
 
 

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 {

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 {

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 {

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 {

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;

src/engine/net/client/msg/CityChoiceMsg.java

@@ -10,11 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.net.AbstractConnection;
+import engine.net.*;
-import engine.net.AbstractNetMsg;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.client.Protocol;
 import engine.objects.PlayerCharacter;
 
 

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.*;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.Network;
-import engine.net.client.Protocol;
 import engine.objects.AbstractGameObject;
 import engine.objects.City;
 import engine.objects.Mine;

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 {

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 {

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;
 
 
 /**

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.*;
-import engine.net.AbstractNetMsg;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.client.Protocol;
 
 public abstract class ClientNetMsg extends AbstractNetMsg {
 

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;
 
 /**

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;
 
 
 /**

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 {

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;
 
 /**

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;
 
 

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 {
 

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;

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 {

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 {
 

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 {

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 {

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;
 
 

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 {
 

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

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

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 {

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;

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 {

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;

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;
 

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 {

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;
 
 /**

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 {

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

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 {

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.*;
-import engine.net.AbstractNetMsg;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.client.Protocol;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.objects.MobLoot;

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

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 {

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;

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 {

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.*;
-import engine.net.AbstractNetMsg;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.client.Protocol;
 import engine.objects.AbstractCharacter;
 import engine.objects.Corpse;
 

src/engine/net/client/msg/LoadStructureMsg.java

@@ -10,11 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.net.AbstractConnection;
+import engine.net.*;
-import engine.net.AbstractNetMsg;
-import engine.net.ByteBufferReader;
-import engine.net.ByteBufferWriter;
-import engine.net.client.Protocol;
 import engine.objects.Building;
 
 import java.util.ArrayList;

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 {

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 {
 

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 {

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 {
 

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;

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;

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;

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 {

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;

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;
 
 /**

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 {

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;
 

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 {
 

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 {

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;
 

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;
 

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;

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;
 
 /**

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;
 
 /**

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;
 

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 {

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 {
 

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 {
 

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 {
 

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 {

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;
 

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;
 

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;
 
 

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 {