From 36cf0be6a305fd5c6eae9f5948230bce56f553a6 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Wed, 24 Apr 2024 16:48:20 -0400
Subject: Cleanup references to ExtraAttributes and fix a bug relating to it

---
 .../java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java | 4 ++--
 .../java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock/item/tooltip')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java
index 66d94890..46babc8b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java
@@ -65,8 +65,8 @@ public class ExoticTooltip {
         return DyeType.EXOTIC;
     }
 
-    public static boolean intendedDyed(NbtCompound ItemData) {
-        return ItemData.getCompound("ExtraAttributes").contains("dye_item");
+    public static boolean intendedDyed(NbtCompound customData) {
+        return customData.contains("dye_item");
     }
 
     public enum DyeType implements StringIdentifiable {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index d4d34e0f..e1c9d074 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -275,8 +275,8 @@ public class ItemTooltip {
         return neuName;
     }
 
-    private static void addExoticTooltip(List<Text> lines, String internalID, NbtCompound nbt, String colorHex, String expectedHex, String existingTooltip) {
-        if (expectedHex != null && !colorHex.equalsIgnoreCase(expectedHex) && !ExoticTooltip.isException(internalID, colorHex) && !ExoticTooltip.intendedDyed(nbt)) {
+    private static void addExoticTooltip(List<Text> lines, String internalID, NbtCompound customData, String colorHex, String expectedHex, String existingTooltip) {
+        if (expectedHex != null && !colorHex.equalsIgnoreCase(expectedHex) && !ExoticTooltip.isException(internalID, colorHex) && !ExoticTooltip.intendedDyed(customData)) {
             final ExoticTooltip.DyeType type = ExoticTooltip.checkDyeType(colorHex);
             lines.add(1, Text.literal(existingTooltip + Formatting.DARK_GRAY + "(").append(type.getTranslatedText()).append(Formatting.DARK_GRAY + ")"));
         }
-- 
cgit