Minion Helper (#254)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ThexXTURBOXx <nico.mexis@kabelmail.de>
Co-authored-by: efefury <69400149+efefury@users.noreply.github.com>

1 files changed, 9 insertions, 15 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.java
index 1968b51e..57c4ae3b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.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.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.events.ProfileDataLoadedEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.inventory.ContainerChest;
@@ -135,7 +136,7 @@ public class HotmInformation {
 	public synchronized void onLobbyJoin(WorldEvent.Load event) {
 		if (shouldReloadSoon) {
 			shouldReloadSoon = false;
-			requestUpdate(false);
+			neu.manager.apiUtils.updateProfileData();
 		}
 	}
 
@@ -154,17 +155,7 @@ public class HotmInformation {
 	@SubscribeEvent
 	public synchronized void onChat(ClientChatReceivedEvent event) {
 		if (event.message.getUnformattedText().equals("Welcome to Hypixel SkyBlock!"))
-			requestUpdate(false);
-	}
-
-	public synchronized void requestUpdate(boolean force) {
-		if (updateTask.isDone() || force) {
-			updateTask = neu.manager.apiUtils
-				.newHypixelApiRequest("skyblock/profiles")
-				.queryArgument("uuid", Minecraft.getMinecraft().thePlayer.getUniqueID().toString().replace("-", ""))
-				.requestJson()
-				.thenAccept(this::updateInformation);
-		}
+			 neu.manager.apiUtils.updateProfileData();
 	}
 
 	/*
@@ -176,10 +167,13 @@ public class HotmInformation {
 		if (level > 20) return -1;
 		return QUICK_FORGE_MULTIPLIERS[level - 1];
 	}
+	@SubscribeEvent
+	public void onApiDataLoaded(ProfileDataLoadedEvent event) {
+		JsonObject data = event.getData();
+		if (data == null) return;
 
-	public void updateInformation(JsonObject entireApiResponse) {
-		if (!entireApiResponse.has("success") || !entireApiResponse.get("success").getAsBoolean()) return;
-		JsonArray profiles = entireApiResponse.getAsJsonArray("profiles");
+		if (!data.has("success") || !data.get("success").getAsBoolean()) return;
+		JsonArray profiles = data.getAsJsonArray("profiles");
 		for (JsonElement element : profiles) {
 			JsonObject profile = element.getAsJsonObject();
 			String profileName = profile.get("cute_name").getAsString();