convert item and location ID's to longs.

KonoTyran · KonoTyran · commit a9118941be57 · 2022-07-15T19:39:54.000-07:00
started work on using StructureModifiers to randomize structure locations.
diff --git a/src/main/java/gg/archipelago/APClient/APClient.java b/src/main/java/gg/archipelago/APClient/APClient.java
@@ -196,11 +196,11 @@ public void sendChat(String message) {
         }
     }
 
-    public boolean checkLocation(int locationID) {
+    public boolean checkLocation(long locationID) {
         return locationManager.checkLocation(locationID);
     }
 
-    public void scoutLocations(ArrayList<Integer> locationIDs) {
+    public void scoutLocations(ArrayList<Long> locationIDs) {
         apWebSocket.scoutLocation(locationIDs);
     }
 
@@ -222,7 +222,11 @@ public void scoutLocations(ArrayList<Integer> locationIDs) {
 
     public abstract void onLocationInfo(ArrayList<NetworkItem> item);
 
-    public abstract void onLocationChecked(int locationID);
+    /***
+     * called when the Archipelago server checks a location for you, such as during co-op or during a !collect
+     * @param locationID
+     */
+    public abstract void onLocationChecked(long locationID);
 
     public DataPackage getDataPackage() {
         return dataPackage;
diff --git a/src/main/java/gg/archipelago/APClient/APWebSocket.java b/src/main/java/gg/archipelago/APClient/APWebSocket.java
@@ -188,7 +188,7 @@ private void updateRoom(RoomUpdatePacket updateRoomPacket) {
         apClient.setHintPoints(updateRoomPacket.hintPoints);
         apClient.setAlias(apClient.getRoomInfo().getPlayer(apClient.getTeam(), apClient.getSlot()).alias);
 
-        for (int location : updateRoomPacket.checkedLocations) {
+        for (long location : updateRoomPacket.checkedLocations) {
             if(apClient.getLocationManager().getCheckedLocations().contains(location))
                 continue;
             apClient.onLocationChecked(location);
@@ -284,7 +284,7 @@ public boolean isAuthenticated() {
         return authenticated;
     }
 
-    public void scoutLocation(ArrayList<Integer> locationIDs) {
+    public void scoutLocation(ArrayList<Long> locationIDs) {
         LocationScouts packet = new LocationScouts(locationIDs);
         sendPacket(packet);
     }
diff --git a/src/main/java/gg/archipelago/APClient/SaveData.java b/src/main/java/gg/archipelago/APClient/SaveData.java
@@ -11,7 +11,7 @@
 public class SaveData {
 
     @SerializedName("locations")
-    public Set<Integer> checkedLocations = new HashSet<>();
+    public Set<Long> checkedLocations = new HashSet<>();
 
     @SerializedName("items")
     public ArrayList<NetworkItem> receivedItems = new ArrayList<>();
diff --git a/src/main/java/gg/archipelago/APClient/itemmanager/ItemManager.java b/src/main/java/gg/archipelago/APClient/itemmanager/ItemManager.java
@@ -22,7 +22,7 @@ public ItemManager(APClient apClient) {
         this.apClient = apClient;
     }
 
-    public void receiveItems(ArrayList<NetworkItem> ids, int index) {
+    public void receiveItems(ArrayList<NetworkItem> ids, long index) {
         if (index == 0) {
             receivedItems = new ArrayList<>();
         }
@@ -66,8 +66,8 @@ public ArrayList<NetworkItem> getReceivedItems() {
         return receivedItems;
     }
 
-    public ArrayList<Integer> getReceivedItemIDs() {
-        ArrayList<Integer> ids = new ArrayList<>();
+    public ArrayList<Long> getReceivedItemIDs() {
+        ArrayList<Long> ids = new ArrayList<>();
         for (NetworkItem receivedItem : receivedItems) {
             ids.add(receivedItem.itemID);
         }
diff --git a/src/main/java/gg/archipelago/APClient/locationmanager/LocationManager.java b/src/main/java/gg/archipelago/APClient/locationmanager/LocationManager.java
@@ -15,13 +15,13 @@ public class LocationManager {
     APClient apClient;
     APWebSocket webSocket;
 
-    Set<Integer> checkedLocations = new HashSet<>();
+    Set<Long> checkedLocations = new HashSet<>();
 
     public LocationManager(APClient apClient) {
         this.apClient = apClient;
     }
 
-    public boolean checkLocation(int id) {
+    public boolean checkLocation(long id) {
         checkedLocations.add(id);
         apClient.getDataManager().save();
         LocationChecks packet = new LocationChecks();
@@ -36,15 +36,15 @@ public boolean checkLocation(int id) {
         return false;
     }
 
-    public void writeFromSave(Set<Integer> checkedLocations) {
+    public void writeFromSave(Set<Long> checkedLocations) {
         this.checkedLocations = checkedLocations;
 
     }
 
-    public void sendIfChecked(Set<Integer> missingChecks) {
+    public void sendIfChecked(Set<Long> missingChecks) {
         LocationChecks packet = new LocationChecks();
         packet.locations = new HashSet<>();
-        for (int missingCheck : missingChecks) {
+        for (Long missingCheck : missingChecks) {
             if(checkedLocations.contains(missingCheck)) {
                 packet.locations.add(missingCheck);
             }
@@ -65,11 +65,11 @@ public void setAPWebSocket(APWebSocket apWebSocket) {
         this.webSocket = apWebSocket;
     }
 
-    public Set<Integer> getCheckedLocations() {
+    public Set<Long> getCheckedLocations() {
         return checkedLocations;
     }
 
-    public void addCheckedLocations(Set<Integer> newLocations) {
+    public void addCheckedLocations(Set<Long> newLocations) {
         this.checkedLocations.addAll(newLocations);
         apClient.getDataManager().save();
     }
diff --git a/src/main/java/gg/archipelago/APClient/network/ConnectedPacket.java b/src/main/java/gg/archipelago/APClient/network/ConnectedPacket.java
@@ -15,7 +15,7 @@ public class ConnectedPacket extends APPacket {
     @SerializedName("players")
     public ArrayList<NetworkPlayer> players;
     @SerializedName("missing_locations")
-    public HashSet<Integer> missingLocations = new HashSet<>();
+    public HashSet<Long> missingLocations = new HashSet<>();
     @SerializedName("checked_locations")
-    public HashSet<Integer> checkedLocations = new HashSet<>();
+    public HashSet<Long> checkedLocations = new HashSet<>();
 }
diff --git a/src/main/java/gg/archipelago/APClient/network/LocationChecks.java b/src/main/java/gg/archipelago/APClient/network/LocationChecks.java
@@ -9,7 +9,7 @@
 public class LocationChecks extends APPacket {
 
     @SerializedName("locations")
-    public Set<Integer> locations = new HashSet<>();
+    public Set<Long> locations = new HashSet<>();
 
     public LocationChecks() {
         this.cmd = APPacketType.LocationChecks;
diff --git a/src/main/java/gg/archipelago/APClient/network/LocationScouts.java b/src/main/java/gg/archipelago/APClient/network/LocationScouts.java
@@ -5,9 +5,9 @@
 
 public class LocationScouts extends APPacket {
 
-    public ArrayList<Integer> locations = new ArrayList<>();
+    public ArrayList<Long> locations = new ArrayList<>();
 
-    public LocationScouts(ArrayList<Integer> locations) {
+    public LocationScouts(ArrayList<Long> locations) {
         this.cmd = APPacketType.LocationScouts;
         this.locations = locations;
     }
diff --git a/src/main/java/gg/archipelago/APClient/network/RecivedItems.java b/src/main/java/gg/archipelago/APClient/network/RecivedItems.java
@@ -8,7 +8,7 @@
 public class RecivedItems extends APPacket {
 
     @SerializedName("index")
-    public int index;
+    public long index;
 
     @SerializedName("items")
     public ArrayList<NetworkItem> items;
diff --git a/src/main/java/gg/archipelago/APClient/network/RoomUpdatePacket.java b/src/main/java/gg/archipelago/APClient/network/RoomUpdatePacket.java
@@ -34,10 +34,10 @@ public class RoomUpdatePacket extends APPacket {
     public int locationCheckPoints;
 
     @SerializedName("checked_locations")
-    public ArrayList<Integer> checkedLocations = new ArrayList<>();
+    public ArrayList<Long> checkedLocations = new ArrayList<>();
 
     @SerializedName("missing_locations")
-    public ArrayList<Integer> missingLocations = new ArrayList<>();
+    public ArrayList<Long> missingLocations = new ArrayList<>();
 
     @SerializedName("players")
     public ArrayList<NetworkPlayer> networkPlayers = new ArrayList<>();
diff --git a/src/main/java/gg/archipelago/APClient/parts/DataPackage.java b/src/main/java/gg/archipelago/APClient/parts/DataPackage.java
@@ -16,27 +16,27 @@ public class DataPackage implements Serializable {
     @SerializedName("version")
     int version = -1;
 
-    HashMap<Integer, String> itemIdToName = new HashMap<>();
+    HashMap<Long, String> itemIdToName = new HashMap<>();
 
-    HashMap<Integer, String> locationIdToName = new HashMap<>();
+    HashMap<Long, String> locationIdToName = new HashMap<>();
 
     public String uuid = UUID.randomUUID().toString();
 
-    public String getItem(int itemID) {
+    public String getItem(long itemID) {
         for (Map.Entry<String, Game> game : games.entrySet()) {
-            for (Map.Entry<String, Integer> item : game.getValue().itemNameToId.entrySet()) {
+            for (Map.Entry<String, Long> item : game.getValue().itemNameToId.entrySet()) {
                 if(item.getValue() == itemID)
                     return item.getKey();
             }
         }
         return String.format("Unknown Item [%d]", itemID);
     }
 
-    public String getLocation(int locationID) {
+    public String getLocation(long locationID) {
         if(locationIdToName.containsKey(locationID))
             return locationIdToName.get(locationID);
         for (Map.Entry<String, Game> game : games.entrySet()) {
-            for (Map.Entry<String, Integer> location : game.getValue().locationNameToId.entrySet()) {
+            for (Map.Entry<String, Long> location : game.getValue().locationNameToId.entrySet()) {
                 if(location.getValue() == locationID) {
                     locationIdToName.put(locationID, location.getKey());
                     return location.getKey();
@@ -56,21 +56,21 @@ public HashMap<String, Game> getGames() {
         return games;
     }
 
-    public HashMap<Integer, String> getItems() {
+    public HashMap<Long, String> getItems() {
         if(itemIdToName.isEmpty()) {
             for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
-                for (Map.Entry<String, Integer> items : gameEntry.getValue().itemNameToId.entrySet()) {
+                for (Map.Entry<String, Long> items : gameEntry.getValue().itemNameToId.entrySet()) {
                     itemIdToName.put(items.getValue(), items.getKey());
                 }
             }
         }
         return itemIdToName;
     }
 
-    public HashMap<Integer, String> getLocations() {
+    public HashMap<Long, String> getLocations() {
         if(locationIdToName.isEmpty()) {
             for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
-                for (Map.Entry<String, Integer> items : gameEntry.getValue().locationNameToId.entrySet()) {
+                for (Map.Entry<String, Long> items : gameEntry.getValue().locationNameToId.entrySet()) {
                     itemIdToName.put(items.getValue(), items.getKey());
                 }
             }
diff --git a/src/main/java/gg/archipelago/APClient/parts/Game.java b/src/main/java/gg/archipelago/APClient/parts/Game.java
@@ -11,8 +11,8 @@ public class Game implements Serializable {
     int version;
 
     @SerializedName("item_name_to_id")
-    HashMap<String,Integer> itemNameToId = new HashMap<>();
+    HashMap<String,Long> itemNameToId = new HashMap<>();
 
     @SerializedName("location_name_to_id")
-    HashMap<String,Integer> locationNameToId = new HashMap<>();
+    HashMap<String,Long> locationNameToId = new HashMap<>();
 }
diff --git a/src/main/java/gg/archipelago/APClient/parts/NetworkItem.java b/src/main/java/gg/archipelago/APClient/parts/NetworkItem.java
@@ -6,10 +6,10 @@
 public class NetworkItem {
 
     @SerializedName("item")
-    public int itemID;
+    public long itemID;
 
     @SerializedName("location")
-    public int locationID;
+    public long locationID;
 
     @SerializedName("player")
     public int playerID;

Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,11 @@ public void sendChat(String message) {`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- public boolean checkLocation(int locationID) {`
	`199`	`+ public boolean checkLocation(long locationID) {`
`200`	`200`	`return locationManager.checkLocation(locationID);`
`201`	`201`	`}`
`202`	`202`
`203`		`- public void scoutLocations(ArrayList<Integer> locationIDs) {`
	`203`	`+ public void scoutLocations(ArrayList<Long> locationIDs) {`
`204`	`204`	`apWebSocket.scoutLocation(locationIDs);`
`205`	`205`	`}`
`206`	`206`
`@@ -222,7 +222,11 @@ public void scoutLocations(ArrayList<Integer> locationIDs) {`
`222`	`222`
`223`	`223`	`public abstract void onLocationInfo(ArrayList<NetworkItem> item);`
`224`	`224`
`225`		`- public abstract void onLocationChecked(int locationID);`
	`225`	`+ /***`
	`226`	`+ * called when the Archipelago server checks a location for you, such as during co-op or during a !collect`
	`227`	`+ * @param locationID`
	`228`	`+ */`
	`229`	`+ public abstract void onLocationChecked(long locationID);`
`226`	`230`
`227`	`231`	`public DataPackage getDataPackage() {`
`228`	`232`	`return dataPackage;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public ItemManager(APClient apClient) {`
`22`	`22`	`this.apClient = apClient;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public void receiveItems(ArrayList<NetworkItem> ids, int index) {`
	`25`	`+ public void receiveItems(ArrayList<NetworkItem> ids, long index) {`
`26`	`26`	`if (index == 0) {`
`27`	`27`	`receivedItems = new ArrayList<>();`
`28`	`28`	`}`
`@@ -66,8 +66,8 @@ public ArrayList<NetworkItem> getReceivedItems() {`
`66`	`66`	`return receivedItems;`
`67`	`67`	`}`
`68`	`68`
`69`		`- public ArrayList<Integer> getReceivedItemIDs() {`
`70`		`- ArrayList<Integer> ids = new ArrayList<>();`
	`69`	`+ public ArrayList<Long> getReceivedItemIDs() {`
	`70`	`+ ArrayList<Long> ids = new ArrayList<>();`
`71`	`71`	`for (NetworkItem receivedItem : receivedItems) {`
`72`	`72`	`ids.add(receivedItem.itemID);`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ public class LocationManager {`
`15`	`15`	`APClient apClient;`
`16`	`16`	`APWebSocket webSocket;`
`17`	`17`
`18`		`- Set<Integer> checkedLocations = new HashSet<>();`
	`18`	`+ Set<Long> checkedLocations = new HashSet<>();`
`19`	`19`
`20`	`20`	`public LocationManager(APClient apClient) {`
`21`	`21`	`this.apClient = apClient;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public boolean checkLocation(int id) {`
	`24`	`+ public boolean checkLocation(long id) {`
`25`	`25`	`checkedLocations.add(id);`
`26`	`26`	`apClient.getDataManager().save();`
`27`	`27`	`LocationChecks packet = new LocationChecks();`
`@@ -36,15 +36,15 @@ public boolean checkLocation(int id) {`
`36`	`36`	`return false;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public void writeFromSave(Set<Integer> checkedLocations) {`
	`39`	`+ public void writeFromSave(Set<Long> checkedLocations) {`
`40`	`40`	`this.checkedLocations = checkedLocations;`
`41`	`41`
`42`	`42`	`}`
`43`	`43`
`44`		`- public void sendIfChecked(Set<Integer> missingChecks) {`
	`44`	`+ public void sendIfChecked(Set<Long> missingChecks) {`
`45`	`45`	`LocationChecks packet = new LocationChecks();`
`46`	`46`	`packet.locations = new HashSet<>();`
`47`		`- for (int missingCheck : missingChecks) {`
	`47`	`+ for (Long missingCheck : missingChecks) {`
`48`	`48`	`if(checkedLocations.contains(missingCheck)) {`
`49`	`49`	`packet.locations.add(missingCheck);`
`50`	`50`	`}`
`@@ -65,11 +65,11 @@ public void setAPWebSocket(APWebSocket apWebSocket) {`
`65`	`65`	`this.webSocket = apWebSocket;`
`66`	`66`	`}`
`67`	`67`
`68`		`- public Set<Integer> getCheckedLocations() {`
	`68`	`+ public Set<Long> getCheckedLocations() {`
`69`	`69`	`return checkedLocations;`
`70`	`70`	`}`
`71`	`71`
`72`		`- public void addCheckedLocations(Set<Integer> newLocations) {`
	`72`	`+ public void addCheckedLocations(Set<Long> newLocations) {`
`73`	`73`	`this.checkedLocations.addAll(newLocations);`
`74`	`74`	`apClient.getDataManager().save();`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`public class LocationScouts extends APPacket {`
`7`	`7`
`8`		`- public ArrayList<Integer> locations = new ArrayList<>();`
	`8`	`+ public ArrayList<Long> locations = new ArrayList<>();`
`9`	`9`
`10`		`- public LocationScouts(ArrayList<Integer> locations) {`
	`10`	`+ public LocationScouts(ArrayList<Long> locations) {`
`11`	`11`	`this.cmd = APPacketType.LocationScouts;`
`12`	`12`	`this.locations = locations;`
`13`	`13`	`}`