From 4ba73931e36c67fbdde51fa52df5a3d67d216444 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:17:53 +0800
Subject: Clean up ProfileViewerScreen

---
 .../skyblock/profileviewer/ProfileViewerScreen.java          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java
index d9a99b54..ad6987c7 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java
@@ -16,7 +16,7 @@ import de.hysky.skyblocker.utils.ApiUtils;
 import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.ProfileUtils;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntImmutableList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
@@ -34,7 +34,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerModelPart;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -201,7 +200,7 @@ public class ProfileViewerScreen extends Screen {
         fetchCollectionsData(); // caching on launch
 
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
-            LiteralArgumentBuilder<FabricClientCommandSource> literalArgumentBuilder =  ClientCommandManager.literal("pv")
+            LiteralArgumentBuilder<FabricClientCommandSource> literalArgumentBuilder = ClientCommandManager.literal("pv")
                     .then(ClientCommandManager.argument("username", StringArgumentType.string())
                             .suggests((source, builder) -> CommandSource.suggestMatching(getPlayerSuggestions(source.getSource()), builder))
                             .executes(Scheduler.queueOpenScreenFactoryCommand(context -> new ProfileViewerScreen(StringArgumentType.getString(context, "username"))))
@@ -212,7 +211,6 @@ public class ProfileViewerScreen extends Screen {
         });
     }
 
-    @NotNull
     private static void fetchCollectionsData() {
         CompletableFuture.runAsync(() -> {
             try {
@@ -227,9 +225,9 @@ public class ProfileViewerScreen extends Screen {
                         String[] items = itemsObject.keySet().toArray(new String[0]);
                         collectionsMap.put(category, items);
                         itemsObject.entrySet().forEach(itemEntry -> {
-                            IntList tierReqs = new IntArrayList();
-                            itemEntry.getValue().getAsJsonObject().getAsJsonArray("tiers").forEach(req ->
-                                    tierReqs.add(req.getAsJsonObject().get("amountRequired").getAsInt()));
+                            IntImmutableList tierReqs = IntImmutableList.toList(itemEntry.getValue().getAsJsonObject().getAsJsonArray("tiers").asList().stream()
+                                    .mapToInt(tier -> tier.getAsJsonObject().get("amountRequired").getAsInt())
+                            );
                             tierRequirementsMap.put(itemEntry.getKey(), tierReqs);
                         });
                     });
-- 
cgit