Migrating pv to v2 endpoint (#939)

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

6 files changed, 35 insertions, 30 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/CoreTaskLevel.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/CoreTaskLevel.java
index 1633c593..7bd4805a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/CoreTaskLevel.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/CoreTaskLevel.java
@@ -27,6 +27,7 @@ import io.github.moulberry.notenoughupdates.profileviewer.ProfileViewer;
 import io.github.moulberry.notenoughupdates.profileviewer.SkyblockProfiles;
 import io.github.moulberry.notenoughupdates.profileviewer.level.LevelPage;
 import io.github.moulberry.notenoughupdates.util.Constants;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import io.github.moulberry.notenoughupdates.util.hypixelapi.ProfileCollectionInfo;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -107,8 +108,10 @@ public class CoreTaskLevel extends GuiTaskLevel {
 		// museum is not possible
 
 		// fairy soul
-		int fairySoulsCollected = object.get("fairy_souls_collected").getAsInt();
-		int sbXpGainedFairy = ((fairySoulsCollected / 5)) * coreTask.get("fairy_souls_xp").getAsInt();
+		int sbXpGainedFairy = Utils.getElementAsInt(Utils.getElement(
+			selectedProfile.getProfileJson(),
+			"fairy_soul.total_collected"
+		), 0) / 5 * coreTask.get("fairy_souls_xp").getAsInt();
 
 		int sbXpCollection = -1;
 		int sbXpMinionTier = -1; // keeping at -1 here because cobblestone 1 minion XP isn't included for some reason?
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EssenceTaskLevel.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EssenceTaskLevel.java
index 2ca2788c..7d42ce30 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EssenceTaskLevel.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EssenceTaskLevel.java
@@ -53,12 +53,10 @@ public class EssenceTaskLevel extends GuiTaskLevel {
 			String name = stringJsonElementEntry.getKey();
 			JsonObject individualObjects = stringJsonElementEntry.getValue().getAsJsonObject();
 			for (Map.Entry<String, JsonElement> jsonElementEntry : individualObjects.entrySet()) {
-				String key = jsonElementEntry.getKey();
-				if (!essencePerks.has(key)) {
-					continue;
-				}
-
-				int essenceAmount = essencePerks.get(key).getAsInt();
+				int essenceAmount = Utils.getElementAsInt(Utils.getElement(
+					object,
+					"player_data.perks." + jsonElementEntry.getKey()
+				), 0);
 
 				int amountReceivedForEach = 0;
 				for (int i = essenceAmount - 1; i >= 0; i--) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EventTaskLevel.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EventTaskLevel.java
index f44e8af8..a846b416 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EventTaskLevel.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/EventTaskLevel.java
@@ -23,6 +23,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.profileviewer.level.LevelPage;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
@@ -69,11 +70,10 @@ public class EventTaskLevel extends GuiTaskLevel {
 			}
 		}
 
-		int sbXpUniqueMedals = 0;
-		if(object.has("jacob2") && object.getAsJsonObject("jacob2").has("unique_golds2")) {
-			int size = object.getAsJsonObject("jacob2").getAsJsonArray("unique_golds2").size();
-			sbXpUniqueMedals = size * eventTask.get("jacob_farming_contest_xp").getAsInt();
-		}
+		int sbXpUniqueMedals = Utils
+			.getElementOrDefault(object, "jacobs_contest.unique_brackets.gold", new JsonArray())
+			.getAsJsonArray()
+			.size() * eventTask.get("jacob_farming_contest_xp").getAsInt();
 
 		lore.add(levelPage.buildLore("Mining Fiesta", sbXpMiningFiesta, eventTask.get("mining_fiesta").getAsInt(), false));
 		lore.add(levelPage.buildLore(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/MiscTaskLevel.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/MiscTaskLevel.java
index c0bb9319..af18aff6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/MiscTaskLevel.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/MiscTaskLevel.java
@@ -157,12 +157,13 @@ public class MiscTaskLevel extends GuiTaskLevel {
 
 		// personal bank
 		int sbXpPersonalBank = 0;
-		if (object.has("personal_bank_upgrade")) {
-			int personalBankUpgrade = object.get("personal_bank_upgrade").getAsInt();
-			JsonArray personalBankUpgradesXpArr = miscellaneousTask.getAsJsonArray("personal_bank_upgrades_xp");
-			for (int i = 1; i <= personalBankUpgrade; i++) {
-				sbXpPersonalBank += personalBankUpgradesXpArr.get(i - 1).getAsInt();
-			}
+		int personalBankUpgrade = Utils.getElementAsInt(Utils.getElement(
+			selectedProfile.getProfileJson(),
+			"profile.personal_bank_upgrade"
+		), 0);
+		JsonArray personalBankUpgradesXp = miscellaneousTask.getAsJsonArray("personal_bank_upgrades_xp");
+		for (int i = 1; i <= personalBankUpgrade; i++) {
+			sbXpPersonalBank += personalBankUpgradesXp.get(i - 1).getAsInt();
 		}
 
 		int sbXpTimeCharm = 0;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SkillRelatedTaskLevel.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SkillRelatedTaskLevel.java
index 107aa38c..aae11c93 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SkillRelatedTaskLevel.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SkillRelatedTaskLevel.java
@@ -99,7 +99,11 @@ public class SkillRelatedTaskLevel extends GuiTaskLevel{
 		}
 
 		int sbXpCommissionMilestone = 0;
-		JsonArray tutorialArray = object.get("tutorial").getAsJsonArray();
+		JsonArray tutorialArray = Utils.getElementOrDefault(
+			selectedProfile.getProfileJson(),
+			"objectives.tutorial",
+			new JsonArray()
+		).getAsJsonArray();
 		JsonArray commissionMilestoneXpArray = miningObj.get("commission_milestone_xp").getAsJsonArray();
 		for (JsonElement jsonElement : tutorialArray) {
 			if (jsonElement.getAsJsonPrimitive().isString() && jsonElement.getAsString().startsWith(
@@ -115,7 +119,7 @@ public class SkillRelatedTaskLevel extends GuiTaskLevel{
 		// rock mines
 		float pet_milestone_ores_mined = Utils.getElementAsFloat(Utils.getElement(
 			object,
-			"stats.pet_milestone_ores_mined"
+			"player_stats.pets.milestone.ores_mined"
 		), 0);
 
 		int sbXpRockPet = 0;
@@ -131,8 +135,8 @@ public class SkillRelatedTaskLevel extends GuiTaskLevel{
 		// farming
 		JsonObject farmingObj = skillRelatedTask.get("farming").getAsJsonObject();
 		int anitaShopUpgradesXp = farmingObj.get("anita_shop_upgrades_xp").getAsInt();
-		int doubleDrops = Utils.getElementAsInt(Utils.getElement(object, "jacob2.perks.double_drops"), 0);
-		int farmingLevelCap = Utils.getElementAsInt(Utils.getElement(object, "jacob2.perks.farming_level_cap"), 0);
+		int doubleDrops = Utils.getElementAsInt(Utils.getElement(object, "jacobs_contest.perks.double_drops"), 0);
+		int farmingLevelCap = Utils.getElementAsInt(Utils.getElement(object, "jacobs_contest.perks.farming_level_cap"), 0);
 
 		int sbXpGainedByAnita = (doubleDrops + farmingLevelCap) * anitaShopUpgradesXp;
 
@@ -156,7 +160,7 @@ public class SkillRelatedTaskLevel extends GuiTaskLevel{
 
 		}
 		float petMilestoneKilled = Utils.getElementAsFloat(
-			Utils.getElement(object, "stats.pet_milestone_sea_creatures_killed"),
+			Utils.getElement(object, "player_stats.pets.milestone.sea_creatures_killed"),
 			0
 		);
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SlayingTaskLevel.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SlayingTaskLevel.java
index 3a64b257..0ec3aa1c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SlayingTaskLevel.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/level/task/SlayingTaskLevel.java
@@ -166,11 +166,10 @@ public class SlayingTaskLevel extends GuiTaskLevel {
 
 		int sbXpBestiary = GuiProfileViewer.getSelectedProfile().getBestiaryXp();
 
-		int mythologicalKillsXp = 0;
-		if (object.has("stats")) {
-			JsonObject stats = object.get("stats").getAsJsonObject();
-			if (stats.has("mythos_kills")) mythologicalKillsXp += (stats.get("mythos_kills").getAsLong() / 100);
-		}
+		int mythologicalKillsXp = Utils.getElementAsInt(Utils.getElement(
+			selectedProfile.getProfileJson(),
+			"player_stats.mythos.kills"
+		), 0) / 100;
 
 		int mythologicalKillsMax = slayingTask.get("mythological_kills").getAsInt();
 		if (mythologicalKillsXp > mythologicalKillsMax) mythologicalKillsXp = mythologicalKillsMax;
@@ -196,7 +195,7 @@ public class SlayingTaskLevel extends GuiTaskLevel {
 			for (int i = 0; i < 5; i++) {
 				if (i >= maxLevel) break;
 				float tier = Utils.getElementAsFloat(
-					Utils.getElement(object, "slayer_bosses." + entry.getKey() + ".boss_kills_tier_" + i),
+					Utils.getElement(object, "slayer.slayer_bosses." + entry.getKey() + ".boss_kills_tier_" + i),
 					0
 				);
 				if (tier != 0) {