Skip to content

Fixed getlocations #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Fixed getlocations #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
649e7a6
Fixed locations missing from locationIdToName
charlesfire Jan 17, 2024
7d947ac
Removed unused method clone()
charlesfire Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 29 additions & 32 deletions src/main/java/gg/archipelago/client/parts/DataPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,18 @@ public class DataPackage implements Serializable {
public String uuid = UUID.randomUUID().toString();

public String getItem(long itemID) {
for (Map.Entry<String, Game> game : games.entrySet()) {
for (Map.Entry<String, Long> item : game.getValue().itemNameToId.entrySet()) {
if(item.getValue() == itemID)
return item.getKey();
}
if(!itemIdToName.containsKey(itemID)) {
return String.format("Unknown Item [%d]", itemID);
}
return String.format("Unknown Item [%d]", itemID);

return itemIdToName.get(itemID);
}

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, Long> location : game.getValue().locationNameToId.entrySet()) {
if(location.getValue() == locationID) {
locationIdToName.put(locationID, location.getKey());
return location.getKey();
}
}
}
return String.format("Unknown Location [%d]", locationID);
if(!locationIdToName.containsKey(locationID))
return String.format("Unknown Location [%d]", locationID);

return locationIdToName.get(locationID);
}

public Map<String, Integer> getVersions() {
Expand All @@ -57,13 +48,6 @@ public HashMap<String, Game> getGames() {
}

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;
}

Expand All @@ -79,14 +63,7 @@ public HashMap<Long, String> getItemsForGame(String game) {
}

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;
return locationIdToName;
}

public HashMap<Long, String> getLocationsForGame(String game) {
Expand All @@ -110,6 +87,26 @@ public String getUUID() {

public void update(DataPackage newData) {
games.putAll(newData.getGames());
buildItemsMap();
buildLocationsMap();
version = newData.version;
}

private void buildItemsMap() {
for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
for (Map.Entry<String, Long> items : gameEntry.getValue().itemNameToId.entrySet()) {
itemIdToName.put(items.getValue(), items.getKey());
}
}
}

private void buildLocationsMap() {
locationIdToName.clear();

for (Map.Entry<String, Game> gameEntry : games.entrySet()) {
for (Map.Entry<String, Long> locations : gameEntry.getValue().locationNameToId.entrySet()) {
locationIdToName.put(locations.getValue(), locations.getKey());
}
}
}
}