From dd5e73a89633fde77df4113ec10a0c121aa8d7f2 Mon Sep 17 00:00:00 2001 From: platanobailando Date: Mon, 9 Jun 2025 22:32:13 -0500 Subject: [PATCH 1/3] Fixing not actually reading the datapackage cache properly --- .../java/dev/koifysh/archipelago/Client.java | 21 ++++++++++++++++++- .../archipelago/parts/DataPackage.java | 5 +++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/koifysh/archipelago/Client.java b/src/main/java/dev/koifysh/archipelago/Client.java index b932bf2..05d3320 100644 --- a/src/main/java/dev/koifysh/archipelago/Client.java +++ b/src/main/java/dev/koifysh/archipelago/Client.java @@ -5,6 +5,7 @@ import dev.koifysh.archipelago.network.server.ConnectUpdatePacket; import dev.koifysh.archipelago.network.server.RoomInfoPacket; import dev.koifysh.archipelago.parts.DataPackage; +import dev.koifysh.archipelago.parts.Game; import dev.koifysh.archipelago.parts.NetworkSlot; import dev.koifysh.archipelago.parts.Version; import dev.koifysh.archipelago.network.client.*; @@ -83,6 +84,23 @@ public abstract class Client { private Set tags = new HashSet<>(); private int itemsHandlingFlags = 0b000; + public static void main(String[] args) throws Exception { + Client client = new Client(){ + @Override + public void onError(Exception ex) { + ex.printStackTrace(); + } + + @Override + public void onClose(String Reason, int attemptingReconnect) { + System.err.println(Reason); + } + }; + client.setName("TheArchiSpire"); + client.connect("archipelago.gg:37013"); + + } + public Client() { //Determine what platform we are on if(OS.startsWith("windows")){ @@ -196,7 +214,8 @@ protected void loadDataPackage() { String versionStr = versions.get(gameName); if(versionStr != null && versionStr.equals(version.getName())) { try(FileReader reader = new FileReader(version)){ - updateDataPackage(gson.fromJson(reader, DataPackage.class)); + Game game = gson.fromJson(reader, Game.class); + dataPackage.update(gameName, game); LOGGER.info("Read datapackage for Game: ".concat(gameName).concat(" Checksum: ").concat(version.getName())); } catch (IOException e){ LOGGER.info("Failed to read a datapackage. Starting with a new one."); diff --git a/src/main/java/dev/koifysh/archipelago/parts/DataPackage.java b/src/main/java/dev/koifysh/archipelago/parts/DataPackage.java index 85a3573..fb7c4c9 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/DataPackage.java +++ b/src/main/java/dev/koifysh/archipelago/parts/DataPackage.java @@ -58,4 +58,9 @@ public String getUUID() { public void update(DataPackage newData) { games.putAll(newData.getGames()); } + + public void update(String name, Game game) + { + games.put(name, game); + } } From 187e82f75633675ae53a02d41e1e6d318d61da7e Mon Sep 17 00:00:00 2001 From: platanobailando Date: Mon, 9 Jun 2025 22:48:06 -0500 Subject: [PATCH 2/3] Removing debug main method --- .../java/dev/koifysh/archipelago/Client.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/main/java/dev/koifysh/archipelago/Client.java b/src/main/java/dev/koifysh/archipelago/Client.java index 05d3320..82bd495 100644 --- a/src/main/java/dev/koifysh/archipelago/Client.java +++ b/src/main/java/dev/koifysh/archipelago/Client.java @@ -84,23 +84,6 @@ public abstract class Client { private Set tags = new HashSet<>(); private int itemsHandlingFlags = 0b000; - public static void main(String[] args) throws Exception { - Client client = new Client(){ - @Override - public void onError(Exception ex) { - ex.printStackTrace(); - } - - @Override - public void onClose(String Reason, int attemptingReconnect) { - System.err.println(Reason); - } - }; - client.setName("TheArchiSpire"); - client.connect("archipelago.gg:37013"); - - } - public Client() { //Determine what platform we are on if(OS.startsWith("windows")){ From 5104087bc0e6756f9fd3791ffee5624fc32be99b Mon Sep 17 00:00:00 2001 From: platanobailando Date: Tue, 10 Jun 2025 08:33:00 -0500 Subject: [PATCH 3/3] Adding debugging for the workflows --- .github/workflows/release.yml | 14 +++++++++++++- .github/workflows/snapshot.yml | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b236950..ba35a9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,4 +35,16 @@ jobs: # The content here needs to be the values of the public and secret key pair JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.gpgPublicKey }} JRELEASER_GPG_SECRET_KEY: ${{ secrets.gpgSecretKey }} - run: ./gradlew jreleaserDeploy \ No newline at end of file + run: ./gradlew jreleaserDeploy + - name: Store JReleaser Logs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: jreleaser + path: build/jreleaser + - name: Store Reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: reports + path: build/reports diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 7490803..9a49f1b 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -31,3 +31,15 @@ jobs: JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.gpgPublicKey }} JRELEASER_GPG_SECRET_KEY: ${{ secrets.gpgSecretKey }} run: ./gradlew jreleaserDeploy + - name: Store JReleaser Logs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: jreleaser + path: build/jreleaser + - name: Store Reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: reports + path: build/reports