From a36e915369caccab90d6cb03185c125b94cb0af5 Mon Sep 17 00:00:00 2001 From: jani270 <69345714+jani270@users.noreply.github.com> Date: Thu, 31 Jul 2025 20:36:00 +0200 Subject: fix: PlayerStats kills, deaths and itemsfished being in data instead of stats --- .../skyblock/profileviewer/model/PlayerData.java | 25 ---------------------- .../skyblock/profileviewer/model/PlayerStats.java | 16 ++++++++++++++ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerData.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerData.java index 188354c8..705d99a9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerData.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerData.java @@ -51,33 +51,8 @@ public class PlayerData { public Set craftedMinions = Set.of(); @SerializedName("fishing_treasure_caught") public int fishingTreasuresCaught; - // candy_collected - /** - * Has a {@code total} field and does not distinguish between levels. Not sure if this is updated with new kills after the bestiary data. - * - * @see Bestiary#kills - */ - public Map kills = Map.of(); - /** - * Has a {@code total} field and does not distinguish between levels. Not sure if this is updated with new deaths after the bestiary data. - * - * @see Bestiary#deaths - */ - public Map deaths = Map.of(); - @SerializedName("highest_critical_damage") - public double highestCriticalDamage; - @SerializedName("items_fished") - public ItemsFished itemsFished = new ItemsFished(); public Map experience = Map.of(); - public static class ItemsFished { - public int total; - public int normal; - public int treasure; - @SerializedName("large_treasure") - public int largeTreasure; - } - /** * @param tier one indexed minion tier diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerStats.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerStats.java index 81a1c13d..89d42ba1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerStats.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/model/PlayerStats.java @@ -2,6 +2,8 @@ package de.hysky.skyblocker.skyblock.profileviewer.model; import com.google.gson.annotations.SerializedName; +import java.util.Map; + public class PlayerStats { @SerializedName("sea_creature_kills") public int seaCreatureKills; @@ -12,6 +14,20 @@ public class PlayerStats { @SerializedName("highest_critical_damage") public long highestCriticalDamage; + // candy_collected + /** + * Has a {@code total} field and does not distinguish between levels. Not sure if this is updated with new kills after the bestiary data. + * + * @see Bestiary#kills + */ + public Map kills = Map.of(); + /** + * Has a {@code total} field and does not distinguish between levels. Not sure if this is updated with new deaths after the bestiary data. + * + * @see Bestiary#deaths + */ + public Map deaths = Map.of(); + public Pets pets = new Pets(); public static class Pets { @SerializedName("total_exp_gained") -- cgit