parse tab list for skill info (#780)

Co-authored-by: nopo <nopotheemail@gmail.com>

3 files changed, 4 insertions, 49 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java
index ff776025..0b4e3934 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 NotEnoughUpdates contributors
+ * Copyright (C) 2022-2023 NotEnoughUpdates contributors
  *
  * This file is part of NotEnoughUpdates.
  *
@@ -45,6 +45,7 @@ import io.github.moulberry.notenoughupdates.util.Constants;
 import io.github.moulberry.notenoughupdates.util.NotificationHandler;
 import io.github.moulberry.notenoughupdates.util.ProfileApiSyncer;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
+import io.github.moulberry.notenoughupdates.util.TabSkillInfoParser;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import io.github.moulberry.notenoughupdates.util.XPInformation;
 import net.minecraft.client.Minecraft;
@@ -171,7 +172,7 @@ public class NEUEventListener {
 
 			CrystalOverlay.tick();
 			FairySouls.getInstance().tick();
-			XPInformation.getInstance().tick();
+			TabSkillInfoParser.parseSkillInfo();
 			ItemCustomizeManager.tick();
 			BackgroundBlur.markDirty();
 			NPCRetexturing.getInstance().tick();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java
index 566e0c07..f2f9c6ad 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java
@@ -865,7 +865,6 @@ public class SkyblockProfiles {
 				if (skillName.equals("farming")) {
 					maxLevel += Utils.getElementAsInt(Utils.getElement(profileJson, "jacob2.perks.farming_level_cap"), 0);
 				}
-
 				out.put(skillName, ProfileViewerUtils.getLevel(levelingArray, skillExperience, maxLevel, false));
 			}
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
index 0a501415..117545c9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 NotEnoughUpdates contributors
+ * Copyright (C) 2022-2023 NotEnoughUpdates contributors
  *
  * This file is part of NotEnoughUpdates.
  *
@@ -24,15 +24,12 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe;
 import io.github.moulberry.notenoughupdates.core.util.StringUtils;
-import io.github.moulberry.notenoughupdates.profileviewer.ProfileViewer;
-import io.github.moulberry.notenoughupdates.profileviewer.SkyblockProfiles;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -210,46 +207,4 @@ public class XPInformation {
 		}
 		updateWithPercentage.clear();
 	}
-
-	public void tick() {
-		ProfileApiSyncer.getInstance().requestResync("xpinformation", 5 * 60 * 1000,
-			() -> {
-			}, this::onApiUpdated
-		);
-	}
-
-	private static final String[] skills = {
-		"taming",
-		"mining",
-		"foraging",
-		"enchanting",
-		"carpentry",
-		"farming",
-		"combat",
-		"fishing",
-		"alchemy",
-		"runecrafting"
-	};
-
-	private void onApiUpdated(SkyblockProfiles profile) {
-		Map<String, ProfileViewer.Level> skyblockInfo = profile.getLatestProfile().getLevelingInfo();
-		if (skyblockInfo == null) {
-			return;
-		}
-
-		for (String skill : skills) {
-			SkillInfo info = new SkillInfo();
-
-			ProfileViewer.Level levelInfo = skyblockInfo.get(skill);
-			float level = levelInfo.level;
-
-			info.totalXp = levelInfo.totalXp;
-			info.currentXpMax = levelInfo.maxXpForLevel;
-			info.level = (int) level;
-			info.currentXp = (level % 1) * info.currentXpMax;
-			info.fromApi = true;
-
-			skillInfoMap.put(skill.toLowerCase(), info);
-		}
-	}
 }