clean up datapackage

Author: KonoTyran

src/main/java/dev/koifysh/archipelago/Client.java

@@ -334,8 +334,7 @@ public boolean checkLocations(Collection<Long> locationIDs) {
      * @param locationIDs List of location ID's to request info on.
      */
     public void scoutLocations(ArrayList<Long> locationIDs) {
-        HashMap<Long, String> locations = dataPackage.getLocationsForGame(game);
-        locationIDs.removeIf( location -> !locations.containsKey(location));
+        locationIDs.removeIf( location -> !dataPackage.getGame(game).locationNameToId.containsValue(location));
         webSocket.scoutLocation(locationIDs);
     }
 

src/main/java/dev/koifysh/archipelago/parts/DataPackage.java

@@ -14,10 +14,6 @@ public class DataPackage implements Serializable {
     @SerializedName("games")
     HashMap<String, Game> games = new HashMap<>();
 
-    HashMap<Long, String> itemIdToName = new HashMap<>();
-
-    HashMap<Long, String> locationIdToName = new HashMap<>();
-
     public String uuid = UUID.randomUUID().toString();
 
     public String getItem(long itemID, String game) {
@@ -50,48 +46,8 @@ public HashMap<String, Game> getGames() {
         return games;
     }
 
-    public HashMap<Long, String> getItems() {
-        if(itemIdToName.isEmpty()) {
-            for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
-                for (Map.Entry<String, Long> items : gameEntry.getValue().itemNameToId.entrySet()) {
-                    itemIdToName.put(items.getValue(), items.getKey());
-                }
-            }
-        }
-        return itemIdToName;
-    }
-
-    public HashMap<Long, String> getItemsForGame(String game) {
-        HashMap<Long, String> ret = new HashMap<>();
-        for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
-            if(!gameEntry.getKey().equals(game)) continue;
-            for (Map.Entry<String, Long> items : gameEntry.getValue().itemNameToId.entrySet()) {
-                ret.put(items.getValue(), items.getKey());
-            }
-        }
-        return ret;
-    }
-
-    public HashMap<Long, String> getLocations() {
-        if(locationIdToName.isEmpty()) {
-            for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
-                for (Map.Entry<String, Long> locations : gameEntry.getValue().locationNameToId.entrySet()) {
-                    itemIdToName.put(locations.getValue(), locations.getKey());
-                }
-            }
-        }
-        return itemIdToName;
-    }
-
-    public HashMap<Long, String> getLocationsForGame(String game) {
-        HashMap<Long, String> ret = new HashMap<>();
-        for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
-            if(!gameEntry.getKey().equals(game)) continue;
-            for (Map.Entry<String, Long> locations : gameEntry.getValue().locationNameToId.entrySet()) {
-                ret.put(locations.getValue(), locations.getKey());
-            }
-        }
-        return ret;
+    public Game getGame(String game) {
+        return games.get(game);
     }