some changes

1 files changed, 42 insertions, 27 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/collections/GenericCategory.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/collections/GenericCategory.java
index ef26332e..e842939a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/collections/GenericCategory.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/collections/GenericCategory.java
@@ -5,13 +5,12 @@ import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.skyblock.profileviewer.ProfileViewerPage;
 import de.hysky.skyblocker.skyblock.tabhud.util.Ico;
-import de.hysky.skyblocker.utils.NEURepoManager;
-import io.github.moulberry.repo.data.NEUItem;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.LoreComponent;
+import net.minecraft.component.type.NbtComponent;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.tooltip.TooltipType;
@@ -21,17 +20,18 @@ import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 
 import java.awt.*;
-import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 
 import static de.hysky.skyblocker.skyblock.profileviewer.ProfileViewerScreen.fetchCollectionsData;
+import static de.hysky.skyblocker.skyblock.profileviewer.utils.ProfileViewerUtils.COMMA_FORMATTER;
 
 public class GenericCategory implements ProfileViewerPage {
     private final String category;
     private final LinkedList<ItemStack> collections = new LinkedList<>();
     private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-    private static final NumberFormat FORMATTER = NumberFormat.getInstance(Locale.US);
     private static final Identifier BUTTON_TEXTURE = Identifier.of(SkyblockerMod.NAMESPACE, "textures/gui/profile_viewer/button_icon_toggled.png");
     private static final int COLUMN_GAP = 26;
     private static final int ROW_GAP = 34;
@@ -61,40 +61,50 @@ public class GenericCategory implements ProfileViewerPage {
         JsonObject playerCollection = pProfile.getAsJsonObject("collection");
 
         for (String collection : collectionsMap.get(this.category)) {
-            Map<String, NEUItem> items = NEURepoManager.NEU_REPO.getItems().getItems();
-            ItemStack itemStack = items.values().stream()
-                    .filter(i -> Formatting.strip(i.getSkyblockItemId()).equals(ICON_TRANSLATION.getOrDefault(collection, collection).replace(':', '-')))
-                    .findFirst()
-                    .map(NEUItem::getSkyblockItemId)
-                    .map(ItemRepository::getItemStack)
-                    .map(ItemStack::copy)
-                    .orElse(Ico.BARRIER.copy());
+            ItemStack itemStack = ItemRepository.getItemStack(ICON_TRANSLATION.getOrDefault(collection, collection).replace(':', '-'));
+            itemStack = itemStack == null ? Ico.BARRIER.copy() : itemStack.copy();
+
+            if (itemStack.getItem().getName().getString().equals("Barrier"))  {
+                itemStack.set(DataComponentTypes.CUSTOM_NAME, Text.of(collection));
+                System.out.println(collection);
+                System.out.println(this.category);
+            }
+
+            Style style = Style.EMPTY.withColor(Formatting.WHITE).withItalic(false);
+            itemStack.set(DataComponentTypes.CUSTOM_NAME, Text.literal(Formatting.strip(itemStack.getComponents().get(DataComponentTypes.CUSTOM_NAME).getString())).setStyle(style));
 
-            if (itemStack.getItem().getName().getString().equals("Barrier")) itemStack.set(DataComponentTypes.ITEM_NAME, Text.of(collection));
 
             int personalColl = playerCollection != null && playerCollection.has(collection) ? playerCollection.get(collection).getAsInt() : 0;
 
-            int coopColl = 0;
+            int totalCollection = 0;
             for (String member : hProfile.get("members").getAsJsonObject().keySet()) {
                 if (!hProfile.getAsJsonObject("members").getAsJsonObject(member).has("collection")) continue;
                 JsonObject memberColl = hProfile.getAsJsonObject("members").getAsJsonObject(member).getAsJsonObject("collection");
-                coopColl += memberColl.has(collection) ? memberColl.get(collection).getAsInt() : 0;
+                totalCollection += memberColl.has(collection) ? memberColl.get(collection).getAsInt() : 0;
             }
 
-            int collectionTier = calculateTier(coopColl, tierRequirementsMap.get(collection));
+            int collectionTier = calculateTier(totalCollection, tierRequirementsMap.get(collection));
             List<Integer> tierRequirements = tierRequirementsMap.get(collection);
 
             List<Text> lore = new ArrayList<>();
-            Style style = Style.EMPTY.withItalic(false);
-            lore.add(Text.literal("Collection: " + FORMATTER.format(personalColl)).setStyle(style).formatted(Formatting.YELLOW));
+            lore.add(Text.literal("Collection Item").setStyle(style).formatted(Formatting.DARK_GRAY));
+            lore.add(Text.empty());
+
             if (hProfile.get("members").getAsJsonObject().keySet().size() > 1) {
-                lore.add(Text.literal("Co-op Collection: " + FORMATTER.format(coopColl)).setStyle(style).formatted(Formatting.AQUA));
+                lore.add(Text.literal("Personal: " + COMMA_FORMATTER.format(personalColl)).setStyle(style).formatted(Formatting.GOLD));
+                lore.add(Text.literal("Co-op Collection: " + COMMA_FORMATTER.format(totalCollection-personalColl)).setStyle(style).formatted(Formatting.AQUA));
             }
-            lore.add(Text.literal("Collection Tier: " + collectionTier).setStyle(style).formatted(Formatting.LIGHT_PURPLE));
-            itemStack.set(DataComponentTypes.LORE, new LoreComponent(lore));
+            lore.add(Text.literal("Collection: " + COMMA_FORMATTER.format(totalCollection)).setStyle(style).formatted(Formatting.YELLOW));
+
+            lore.add(Text.empty());
+            lore.add(Text.literal("Collection Tier: " + collectionTier + "/" + tierRequirements.size()).setStyle(style).formatted(Formatting.LIGHT_PURPLE));
 
             if (collectionTier == tierRequirements.size()) itemStack.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
 
+            itemStack.set(DataComponentTypes.LORE, new LoreComponent(lore));
+
+            itemStack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT);
+
             collections.add(itemStack);
         }
     }
@@ -116,11 +126,16 @@ public class GenericCategory implements ProfileViewerPage {
             ItemStack itemStack = collections.get(i);
             List<Text> lore = itemStack.getOrDefault(DataComponentTypes.LORE, LoreComponent.DEFAULT).lines();
             for (Text text : lore) {
-                if (!text.getString().startsWith("Collection Tier: ")) continue;
-                int cTier = Integer.parseInt(text.getString().substring("Collection Tier: ".length()));
-                Color colour = Boolean.TRUE.equals(itemStack.get(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE)) ? Color.MAGENTA : Color.darkGray;
-                context.drawText(textRenderer, Text.literal(toRomanNumerals(cTier)), x + 9 - (textRenderer.getWidth(toRomanNumerals(cTier)) / 2), y + 21, colour.getRGB(), false);
-                break;
+                if (text.getString().startsWith("Collection Tier: ")) {
+                    String tierText = text.getString().substring("Collection Tier: ".length());
+                    if (tierText.contains("/")) {
+                        String[] parts = tierText.split("/");
+                        int cTier = Integer.parseInt(parts[0].trim());
+                        Color colour = Boolean.TRUE.equals(itemStack.get(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE)) ? Color.MAGENTA : Color.darkGray;
+                        context.drawText(textRenderer, Text.literal(toRomanNumerals(cTier)), x + 9 - (textRenderer.getWidth(toRomanNumerals(cTier)) / 2), y + 21, colour.getRGB(), false);
+                    }
+                    break;
+                }
             }
 
             if (mouseX > x && mouseX < x + 16 && mouseY > y && mouseY < y + 16) {