Migrating pv to v2 endpoint (#939)

Co-authored-by: efefury <69400149+efefury@users.noreply.github.com>
Co-authored-by: Lulonaut <lulonaut@lulonaut.tech>

1 files changed, 9 insertions, 14 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/MinionHelperApiLoader.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/MinionHelperApiLoader.java
index 6f488107..c9f67fd5 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/MinionHelperApiLoader.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/MinionHelperApiLoader.java
@@ -126,14 +126,7 @@ public class MinionHelperApiLoader {
 		int localPelts = manager.getLocalPelts();
 		if (localPelts != -1) return localPelts;
 
-		int peltCount = 0;
-		if (player.has("trapper_quest")) {
-			JsonObject jsonObject = player.getAsJsonObject("trapper_quest");
-			if (jsonObject.has("pelt_count")) {
-				peltCount = jsonObject.get("pelt_count").getAsInt();
-			}
-		}
-		return peltCount;
+		return Utils.getElementAsInt(Utils.getElement(player, "quests.trapper_quest.pelt_count"), 0);
 	}
 
 	private Map<String, Integer> getSlayers(JsonObject player) {
@@ -141,7 +134,7 @@ public class MinionHelperApiLoader {
 
 		Map<String, Integer> slayerTier = new HashMap<>();
 		if (player.has("slayer_bosses")) {
-			JsonObject slayerBosses = player.getAsJsonObject("slayer_bosses");
+			JsonObject slayerBosses = player.getAsJsonObject("slayer.slayer_bosses");
 			for (Map.Entry<String, JsonElement> entry : slayerBosses.entrySet()) {
 				String name = entry.getKey();
 				JsonObject slayerEntry = entry.getValue().getAsJsonObject();
@@ -166,8 +159,10 @@ public class MinionHelperApiLoader {
 
 	private Map<String, Integer> getCollections(JsonObject player) {
 		Map<String, Integer> highestCollectionTier = new HashMap<>();
-		if (player.has("unlocked_coll_tiers")) {
-			for (JsonElement element : player.get("unlocked_coll_tiers").getAsJsonArray()) {
+
+		JsonElement collectionTiers = Utils.getElement(player, "player_data.unlocked_coll_tiers");
+		if (collectionTiers != null) {
+			for (JsonElement element : collectionTiers.getAsJsonArray()) {
 				String text = element.getAsString();
 				String[] split = text.split("_");
 				int level = Integer.parseInt(split[split.length - 1]);
@@ -190,7 +185,7 @@ public class MinionHelperApiLoader {
 				highestCollectionTier.put(name, level);
 			}
 			if (!collectionApiEnabled) {
-				Utils.addChatMessage("§e[NEU] Collection API detected!");
+				Utils.addChatMessage("§e[NEU Minion Helper] Collection API detected!");
 			}
 			collectionApiEnabled = true;
 		} else {
@@ -206,8 +201,8 @@ public class MinionHelperApiLoader {
 		List<String> craftedMinions = new ArrayList<>();
 		for (Map.Entry<String, JsonElement> entry : members.entrySet()) {
 			JsonObject value = entry.getValue().getAsJsonObject();
-			if (value.has("crafted_generators")) {
-				for (JsonElement e : value.get("crafted_generators").getAsJsonArray()) {
+			if (value.has("player_data.crafted_generators")) {
+				for (JsonElement e : value.get("player_data.crafted_generators").getAsJsonArray()) {
 					String rawGenerator = e.getAsString();
 					String[] split = rawGenerator.split("_");
 					String tier = split[split.length - 1];