Skip to content

Commit dd5e73a

Browse files
committed
Fixing not actually reading the datapackage cache properly
1 parent 979f594 commit dd5e73a

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import dev.koifysh.archipelago.network.server.ConnectUpdatePacket;
66
import dev.koifysh.archipelago.network.server.RoomInfoPacket;
77
import dev.koifysh.archipelago.parts.DataPackage;
8+
import dev.koifysh.archipelago.parts.Game;
89
import dev.koifysh.archipelago.parts.NetworkSlot;
910
import dev.koifysh.archipelago.parts.Version;
1011
import dev.koifysh.archipelago.network.client.*;
@@ -83,6 +84,23 @@ public abstract class Client {
8384
private Set<String> tags = new HashSet<>();
8485
private int itemsHandlingFlags = 0b000;
8586

87+
public static void main(String[] args) throws Exception {
88+
Client client = new Client(){
89+
@Override
90+
public void onError(Exception ex) {
91+
ex.printStackTrace();
92+
}
93+
94+
@Override
95+
public void onClose(String Reason, int attemptingReconnect) {
96+
System.err.println(Reason);
97+
}
98+
};
99+
client.setName("TheArchiSpire");
100+
client.connect("archipelago.gg:37013");
101+
102+
}
103+
86104
public Client() {
87105
//Determine what platform we are on
88106
if(OS.startsWith("windows")){
@@ -196,7 +214,8 @@ protected void loadDataPackage() {
196214
String versionStr = versions.get(gameName);
197215
if(versionStr != null && versionStr.equals(version.getName())) {
198216
try(FileReader reader = new FileReader(version)){
199-
updateDataPackage(gson.fromJson(reader, DataPackage.class));
217+
Game game = gson.fromJson(reader, Game.class);
218+
dataPackage.update(gameName, game);
200219
LOGGER.info("Read datapackage for Game: ".concat(gameName).concat(" Checksum: ").concat(version.getName()));
201220
} catch (IOException e){
202221
LOGGER.info("Failed to read a datapackage. Starting with a new one.");

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,9 @@ public String getUUID() {
5858
public void update(DataPackage newData) {
5959
games.putAll(newData.getGames());
6060
}
61+
62+
public void update(String name, Game game)
63+
{
64+
games.put(name, game);
65+
}
6166
}

0 commit comments

Comments
 (0)