Migration to org.json

src/engine/objects/Warehouse.java

@@ -19,8 +19,8 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.pmw.tinylog.Logger;
 
 import java.sql.SQLException;
@@ -56,8 +56,8 @@ public class Warehouse {
 
         JSONObject resources = (JSONObject) warehouse.get("resources");
 
-        for (Object key : resources.keySet()) {
-            mbEnums.ResourceType resourceType = mbEnums.ResourceType.valueOf((String) key);
+        for (String key : resources.keySet()) {
+            mbEnums.ResourceType resourceType = mbEnums.ResourceType.valueOf(key);
             int value = ((Long) resources.get(key)).intValue();
             this.resources.put(resourceType, value);
         }