Renamed class to not conflict with the java.lang version.

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

@@ -6,7 +6,7 @@ HashSet<Integer> playerFriendSet = PlayerFriendsMap.get(playerUID);
 package engine.net.client.msg;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.exception.SerializationException;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.exception.SerializationException;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
 import engine.gameManager.DbManager;
+import engine.mbEnums;
 import engine.net.*;
 import engine.net.client.ClientConnection;
 import engine.net.client.Protocol;
@@ -308,13 +308,13 @@ public class ApplyRuneMsg extends ClientNetMsg {
         if (cost > 0) {
             ModifyStatMsg msm = new ModifyStatMsg((0 - cost), 0, 3);
             dispatch = Dispatch.borrow(playerCharacter, msm);
-            DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+            DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
         }
 
         //send apply rune message to client
         ApplyRuneMsg arm = new ApplyRuneMsg(playerCharacter.getObjectType().ordinal(), playerCharacter.getObjectUUID(), runeID, cr.getObjectType().ordinal(), cr.getObjectUUID(), false);
         dispatch = Dispatch.borrow(playerCharacter, arm);
-        DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+        DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
 
 
         //alert them of success

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

@@ -9,10 +9,10 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
-import engine.Enum.TransactionType;
 import engine.exception.SerializationException;
 import engine.gameManager.BuildingManager;
+import engine.mbEnums.GameObjectType;
+import engine.mbEnums.TransactionType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -10,8 +10,8 @@
 package engine.net.client.msg;
 
 
-import engine.Enum;
 import engine.exception.SerializationException;
+import engine.mbEnums;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -35,7 +35,7 @@ public class AssetSupportMsg extends ClientNetMsg {
     private int profitTax;
     private int weeklyTax;
     private byte enforceKOS;
-    private Enum.SupportMsgType supportMsgType;
+    private mbEnums.SupportMsgType supportMsgType;
 
 
     /**
@@ -55,10 +55,10 @@ public class AssetSupportMsg extends ClientNetMsg {
     protected void _deserialize(ByteBufferReader reader) {
 
         this.messageType = reader.getInt();
-        this.supportMsgType = Enum.SupportMsgType.typeLookup.get(this.messageType);
+        this.supportMsgType = mbEnums.SupportMsgType.typeLookup.get(this.messageType);
 
         if (this.supportMsgType == null) {
-            this.supportMsgType = Enum.SupportMsgType.NONE;
+            this.supportMsgType = mbEnums.SupportMsgType.NONE;
             Logger.error("No enumeration for support type" + this.messageType);
         }
 
@@ -155,10 +155,10 @@ public class AssetSupportMsg extends ClientNetMsg {
     protected void _serialize(ByteBufferWriter writer) throws SerializationException {
 
         writer.putInt(this.messageType);
-        this.supportMsgType = Enum.SupportMsgType.typeLookup.get(this.messageType);
+        this.supportMsgType = mbEnums.SupportMsgType.typeLookup.get(this.messageType);
 
         if (this.supportMsgType == null) {
-            this.supportMsgType = Enum.SupportMsgType.NONE;
+            this.supportMsgType = mbEnums.SupportMsgType.NONE;
             Logger.error("No enumeration for support type" + this.messageType);
         }
 

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.exception.SerializationException;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,11 +9,11 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
-import engine.Enum.GameObjectType;
-import engine.Enum.ProtectionState;
 import engine.exception.SerializationException;
 import engine.gameManager.BuildingManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
+import engine.mbEnums.ProtectionState;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -119,13 +119,13 @@ public class CityAssetMsg extends ClientNetMsg {
             if (building.getBlueprint().isWallPiece())
                 continue;
 
-            if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.TOL))
+            if (building.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL))
                 continue;
 
-            if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
+            if (building.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
                 continue;
 
-            if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHRINE))
+            if (building.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.SHRINE))
                 continue;
 
             if (!city.isLocationOnCityGrid(building.getLoc()))

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
 import engine.gameManager.DbManager;
+import engine.mbEnums;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -78,10 +78,10 @@ public class CityDataMsg extends ClientNetMsg {
 
 
         ArrayList<City> cityList = new ArrayList<>();
-        ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(Enum.GameObjectType.City);
+        ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(mbEnums.GameObjectType.City);
         for (AbstractGameObject ago : map.values())
 
-            if (ago.getObjectType().equals(Enum.GameObjectType.City))
+            if (ago.getObjectType().equals(mbEnums.GameObjectType.City))
                 cityList.add((City) ago);
 
         temp.putInt(cityList.size());
@@ -137,10 +137,10 @@ public class CityDataMsg extends ClientNetMsg {
         if (this.updateCities) {
             writer.put((byte) 0);
             ArrayList<City> cityList = new ArrayList<>();
-            ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(Enum.GameObjectType.City);
+            ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(mbEnums.GameObjectType.City);
             if (map != null) {
                 for (AbstractGameObject ago : map.values())
-                    if (ago.getObjectType().equals(Enum.GameObjectType.City))
+                    if (ago.getObjectType().equals(mbEnums.GameObjectType.City))
                         cityList.add((City) ago);
 
                 writer.putInt(cityList.size());

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -18,7 +18,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
+import engine.mbEnums;
 import engine.net.*;
 import engine.net.client.Protocol;
 import engine.objects.PlayerCharacter;
@@ -275,7 +275,7 @@ public class ErrorPopupMsg extends ClientNetMsg {
         popupMessage = new ErrorPopupMsg(300, errorMessage);
 
         errorDispatch = Dispatch.borrow(player, popupMessage);
-        DispatchMessage.dispatchMsgDispatch(errorDispatch, Enum.DispatchChannel.SECONDARY);
+        DispatchMessage.dispatchMsgDispatch(errorDispatch, mbEnums.DispatchChannel.SECONDARY);
 
     }
 
@@ -290,7 +290,7 @@ public class ErrorPopupMsg extends ClientNetMsg {
         errorPopup = new ErrorPopupMsg(popupID);
 
         errorDispatch = Dispatch.borrow(player, errorPopup);
-        DispatchMessage.dispatchMsgDispatch(errorDispatch, Enum.DispatchChannel.SECONDARY);
+        DispatchMessage.dispatchMsgDispatch(errorDispatch, mbEnums.DispatchChannel.SECONDARY);
     }
 
     /**

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.math.Vector3fImmutable;
 import engine.net.AbstractConnection;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

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

@@ -10,7 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,9 +9,9 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.PowersManager;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;

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

@@ -9,9 +9,9 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.ShrineType;
 import engine.exception.SerializationException;
 import engine.gameManager.BuildingManager;
+import engine.mbEnums.ShrineType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,10 +9,10 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.*;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums.*;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,11 +9,11 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
-import engine.Enum.MinionType;
-import engine.Enum.ProtectionState;
 import engine.gameManager.NPCManager;
 import engine.gameManager.PowersManager;
+import engine.mbEnums.GameObjectType;
+import engine.mbEnums.MinionType;
+import engine.mbEnums.ProtectionState;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
 import engine.net.client.Protocol;

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

@@ -9,9 +9,9 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,8 +9,9 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -515,7 +516,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
 
             switch (condemned.friendType) {
                 case 2:
-                    PlayerCharacter playerCharacter = (PlayerCharacter) DbManager.getObject(engine.Enum.GameObjectType.PlayerCharacter, condemned.playerUID);
+                    PlayerCharacter playerCharacter = (PlayerCharacter) DbManager.getObject(mbEnums.GameObjectType.PlayerCharacter, condemned.playerUID);
 
 
                     guild = playerCharacter.getGuild();

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums;
 import engine.net.*;
 import engine.net.client.ClientConnection;
 import engine.net.client.Protocol;
@@ -349,7 +349,7 @@ public class PlaceAssetMsg extends ClientNetMsg {
         outMsg.msg = stringData;
 
         Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), outMsg);
-        DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+        DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
     }
 
     public static void sendPlaceAssetConfirmWall(ClientConnection origin, Zone zone) {
@@ -364,7 +364,7 @@ public class PlaceAssetMsg extends ClientNetMsg {
 
 
         Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), outMsg);
-        DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+        DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
     }
 
     /**

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.exception.SerializationException;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -6,7 +6,7 @@ HashSet<Integer> playerFriendSet = PlayerFriendsMap.get(playerUID);
 package engine.net.client.msg;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
 import engine.exception.SerializationException;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -6,7 +6,7 @@ HashSet<Integer> playerFriendSet = PlayerFriendsMap.get(playerUID);
 package engine.net.client.msg;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.gameManager.BuildingManager;
 import engine.net.AbstractConnection;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;

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

@@ -10,7 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.Enum;
+import engine.mbEnums;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
@@ -22,12 +22,12 @@ public class TransferItemFromEquipToInventoryMsg extends ClientNetMsg {
 
     private int playerType;
     private int playerUUID;
-    public Enum.EquipSlotType slot;
+    public mbEnums.EquipSlotType slot;
 
     /**
      * This is the general purpose constructor.
      */
-    public TransferItemFromEquipToInventoryMsg(AbstractGameObject ago, Enum.EquipSlotType slot) {
+    public TransferItemFromEquipToInventoryMsg(AbstractGameObject ago, mbEnums.EquipSlotType slot) {
         super(Protocol.UNEQUIP);
         this.playerType = ago.getObjectType().ordinal();
         this.playerUUID = ago.getObjectUUID();
@@ -51,7 +51,7 @@ public class TransferItemFromEquipToInventoryMsg extends ClientNetMsg {
     protected void _deserialize(ByteBufferReader reader) {
         this.playerType = reader.getInt();
         this.playerUUID = reader.getInt();
-        this.slot = Enum.EquipSlotType.values()[reader.getInt()];
+        this.slot = mbEnums.EquipSlotType.values()[reader.getInt()];
     }
 
     /**

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

@@ -10,7 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.Enum;
+import engine.mbEnums;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
@@ -27,7 +27,7 @@ public class TransferItemFromInventoryToEquipMsg extends ClientNetMsg {
     private int type;
     private int objectUUID;
 
-    public Enum.EquipSlotType slot;
+    public mbEnums.EquipSlotType slot;
     private int pad2;
     private float unknown1, unknown2;
 
@@ -38,7 +38,7 @@ public class TransferItemFromInventoryToEquipMsg extends ClientNetMsg {
         super(Protocol.EQUIP);
     }
 
-    public TransferItemFromInventoryToEquipMsg(AbstractCharacter source, Enum.EquipSlotType slot, int templateID) {
+    public TransferItemFromInventoryToEquipMsg(AbstractCharacter source, mbEnums.EquipSlotType slot, int templateID) {
         super(Protocol.EQUIP);
         this.sourceType = source.getObjectType().ordinal();
         this.sourceID = source.getObjectUUID();
@@ -67,7 +67,7 @@ public class TransferItemFromInventoryToEquipMsg extends ClientNetMsg {
         templateID = reader.getInt();
         type = reader.getInt();
         objectUUID = reader.getInt();
-        slot = Enum.EquipSlotType.values()[reader.getInt()];
+        slot = mbEnums.EquipSlotType.values()[reader.getInt()];
         pad2 = reader.getInt();
         unknown1 = reader.getFloat();
         unknown2 = reader.getFloat();

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

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

@@ -6,7 +6,7 @@ HashSet<Integer> playerFriendSet = PlayerFriendsMap.get(playerUID);
 package engine.net.client.msg;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.gameManager.SessionManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.ItemType;
+import engine.mbEnums.ItemType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.ItemType;
+import engine.mbEnums.ItemType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum.ItemType;
+import engine.mbEnums.ItemType;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
+import engine.mbEnums;
 import engine.gameManager.DbManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
@@ -73,7 +73,7 @@ public class ViewResourcesMsg extends ClientNetMsg {
         if (this.warehouseBuilding.getParentZone() == null)
             return false;
 
-        this.city = (City) DbManager.getObject(Enum.GameObjectType.City, this.warehouseBuilding.getParentZone().playerCityUUID);
+        this.city = (City) DbManager.getObject(mbEnums.GameObjectType.City, this.warehouseBuilding.getParentZone().playerCityUUID);
 
         if (this.city == null)
             return false;
@@ -91,7 +91,7 @@ public class ViewResourcesMsg extends ClientNetMsg {
 
         writer.putInt(warehouseObject.resources.size());
 
-        for (Enum.ResourceType resourceType : (warehouseObject.resources.keySet())) {
+        for (mbEnums.ResourceType resourceType : (warehouseObject.resources.keySet())) {
 
             writer.putInt(resourceType.hash);
             writer.putInt((warehouseObject.resources.get(resourceType)));
@@ -105,7 +105,7 @@ public class ViewResourcesMsg extends ClientNetMsg {
 
         writer.putInt(warehouseObject.resources.size());
 
-        for (Enum.ResourceType resourceType : warehouseObject.resources.keySet()) {
+        for (mbEnums.ResourceType resourceType : warehouseObject.resources.keySet()) {
 
             writer.putInt(resourceType.hash);
             writer.putInt(0); //available?

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

@@ -10,7 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.exception.SerializationException;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

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

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg;
 
-import engine.Enum;
+import engine.mbEnums;
 import engine.gameManager.SessionManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -175,7 +175,7 @@ public class WhoResponseMsg extends ClientNetMsg {
         }
 
         Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), msg);
-        DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+        DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
 
     }
 

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

@@ -10,7 +10,7 @@
 package engine.net.client.msg;
 
 
-import engine.Enum;
+import engine.mbEnums;
 import engine.exception.SerializationException;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
@@ -48,7 +48,7 @@ public class WorldDataMsg extends ClientNetMsg {
 
     private static int getTotalMapSize() {
 
-        return DbManager.getList(Enum.GameObjectType.Zone).size();
+        return DbManager.getList(mbEnums.GameObjectType.Zone).size();
     }
 
     /**

src/engine/net/client/msg/chat/ChatCityMsg.java

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg.chat;
 
-import engine.Enum.GameObjectType;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/chat/ChatSayMsg.java

@@ -9,8 +9,8 @@
 
 package engine.net.client.msg.chat;
 
-import engine.Enum.GameObjectType;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/chat/GuildEnterWorldMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.chat;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/commands/ClientAdminCommandMsg.java

@@ -9,9 +9,9 @@
 
 package engine.net.client.msg.commands;
 
-import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
 import engine.math.Vector3f;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/group/GroupUpdateMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.group;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.gameManager.GroupManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;

src/engine/net/client/msg/guild/AcceptInviteToGuildMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.guild;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/guild/AcceptSubInviteMsg.java

@@ -18,7 +18,7 @@
 
 package engine.net.client.msg.guild;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/guild/ChangeRankMsg.java

@@ -18,7 +18,7 @@
 
 package engine.net.client.msg.guild;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/guild/GuildCreationFinalizeMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.guild;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/guild/GuildInfoMsg.java

@@ -10,7 +10,7 @@
 package engine.net.client.msg.guild;
 
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/guild/GuildListMsg.java

@@ -9,9 +9,9 @@
 
 package engine.net.client.msg.guild;
 
-import engine.Enum;
-import engine.Enum.GameObjectType;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -125,7 +125,7 @@ class GuildListMessageType1 extends GuildListMessageType {
 
     @Override
     void _serialize(ByteBufferWriter writer) {
-        Enum.GuildCharterType gt = Enum.GuildCharterType.getGuildTypeFromInt(g.getCharter());
+        mbEnums.GuildCharterType gt = mbEnums.GuildCharterType.getGuildTypeFromInt(g.getCharter());
 
         writer.putInt(1);
         writer.putInt(gt.ordinal());    //Charter Type
@@ -142,7 +142,7 @@ class GuildListMessageType1 extends GuildListMessageType {
         for (PlayerCharacter player : guildRoster) {
 
             byte isActive = SessionManager.getPlayerCharacterByID(player.getObjectUUID()) != null ? (byte) 1 : (byte) 0;
-            writer.putInt(Enum.GameObjectType.PlayerCharacter.ordinal());
+            writer.putInt(mbEnums.GameObjectType.PlayerCharacter.ordinal());
             writer.putInt(player.getObjectUUID());
             writer.putString(player.getCombinedName());
             writer.put(isActive);    //Active?
@@ -158,7 +158,7 @@ class GuildListMessageType1 extends GuildListMessageType {
 
         for (PlayerCharacter banished : g.getBanishList()) {
             byte isActive = SessionManager.getPlayerCharacterByID(banished.getObjectUUID()) != null ? (byte) 1 : (byte) 0;
-            writer.putInt(Enum.GameObjectType.PlayerCharacter.ordinal());
+            writer.putInt(mbEnums.GameObjectType.PlayerCharacter.ordinal());
             writer.putInt(banished.getObjectUUID());
             writer.putString(banished.getCombinedName());
             writer.put(isActive);    //Active?

src/engine/net/client/msg/guild/InviteToSubMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.guild;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/login/DeleteCharacterMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.login;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;

src/engine/net/client/msg/login/GameServerIPRequestMsg.java

@@ -9,7 +9,7 @@
 
 package engine.net.client.msg.login;
 
-import engine.Enum.GameObjectType;
+import engine.mbEnums.GameObjectType;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;