Warehosue cleanup

src/engine/devcmd/cmds/MakeItemCmd.java

@@ -14,6 +14,7 @@ import engine.Enum.ItemType;
 import engine.Enum.OwnerType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
+import engine.gameManager.WarehouseManager;
 import engine.objects.*;
 import engine.powers.EffectsBase;
 
@@ -33,7 +34,7 @@ public class MakeItemCmd extends AbstractDevCmd {
                           AbstractGameObject target) {
 
         if (words[0].equals("resources")) {
-            for (int ibID : Warehouse.getMaxResources().keySet()) {
+            for (int ibID : WarehouseManager.getMaxResources().keySet()) {
                 if (ibID == 7)
                     continue;
 
@@ -53,7 +54,7 @@ public class MakeItemCmd extends AbstractDevCmd {
                         true, false, ItemContainerType.INVENTORY, (byte) 0,
                         new ArrayList<>(), "");
 
-                item.setNumOfItems(Warehouse.getMaxResources().get(ibID));
+                item.setNumOfItems(WarehouseManager.getMaxResources().get(ibID));
 
                 try {
                     item = DbManager.ItemQueries.ADD_ITEM(item);

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -13,10 +13,7 @@ import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
+import engine.gameManager.*;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 
@@ -134,7 +131,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
             if (city != null) {
                 city.setWarehouseBuildingID(0);
             }
-            Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
+            WarehouseManager.warehouseByBuildingUUID.remove(building.getObjectUUID());
         }
 
         //remove cached shrines.