command changes and some logic cleanup

2 files changed, 7 insertions, 23 deletions

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 939d2bd1..4829a712 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.mixins.accessors.SkullBlockEntityAccessor;
 import de.hysky.skyblocker.skyblock.profileviewer.collections.CollectionsPage;
@@ -187,26 +188,7 @@ public class ProfileViewerScreen extends Screen {
         fetchCollectionsData(); // caching on launch
 
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
-            dispatcher.register(
-                    ClientCommandManager.literal(SkyblockerMod.NAMESPACE)
-                            .then(ClientCommandManager.literal("pv")
-                                    .then(ClientCommandManager.argument("username", StringArgumentType.string())
-                                            .executes(context -> {
-                                                String username = StringArgumentType.getString(context, "username");
-                                                Command<FabricClientCommandSource> cmd = Scheduler.queueOpenScreenCommand(() -> new ProfileViewerScreen(username));
-                                                return cmd.run(context);
-                                            })
-                                    )
-                                    .executes(context -> {
-                                        String username = MinecraftClient.getInstance().getSession().getUsername();
-                                        Command<FabricClientCommandSource> cmd = Scheduler.queueOpenScreenCommand(() -> new ProfileViewerScreen(username));
-                                        return cmd.run(context);
-                                    })
-                            )
-            );
-
-            dispatcher.register(
-                    ClientCommandManager.literal("pv")
+            LiteralArgumentBuilder<FabricClientCommandSource> literalArgumentBuilder =  ClientCommandManager.literal("pv")
                             .then(ClientCommandManager.argument("username", StringArgumentType.string())
                                     .executes(context -> {
                                         String username = StringArgumentType.getString(context, "username");
@@ -218,8 +200,9 @@ public class ProfileViewerScreen extends Screen {
                                 String username = MinecraftClient.getInstance().getSession().getUsername();
                                 Command<FabricClientCommandSource> cmd = Scheduler.queueOpenScreenCommand(() -> new ProfileViewerScreen(username));
                                 return cmd.run(context);
-                            })
-            );
+                            });
+            dispatcher.register(literalArgumentBuilder);
+            dispatcher.register(ClientCommandManager.literal(SkyblockerMod.NAMESPACE).then(literalArgumentBuilder));
         });
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java
index cb3a866a..4aebb26f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java
@@ -23,11 +23,12 @@ public class WardrobeInventoryItemLoader extends ItemLoader {
         try {
             itemList.addAll(super.loadItems(data));
             if (activeSlot != -1) {
+                List<ItemStack> activeArmour = super.loadItems(activeArmorSet);
                 for (int i = 0; i < 4; i++) {
                     int baseIndex = activeSlot % 9;
                     int page = activeSlot / 9;
                     int slotIndex = (page * 36) + (i * 9) + baseIndex - 1;
-                    itemList.set(slotIndex, super.loadItems(activeArmorSet).reversed().get(i));
+                    itemList.set(slotIndex, activeArmour.get(i));
                 }
             }
         } catch (Exception e) {