From 1600f4515a2751e4717d0fb97b89df8f5806da5f Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Sun, 31 Dec 2023 03:26:38 -0500
Subject: More Compatible Colour Parsing (#463)

---
 .../de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

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 adc23bbb..9d92f505 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
@@ -11,6 +11,7 @@ import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.item.TooltipContext;
+import net.minecraft.item.DyeableItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
@@ -183,10 +184,8 @@ public class ItemTooltip {
         }
 
         if (TooltipInfoType.COLOR.isTooltipEnabledAndHasOrNullWarning(internalID) && stack.getNbt() != null) {
-            final NbtElement color = stack.getNbt().getCompound("display").get("color");
-
-            if (color != null) {
-                String colorHex = String.format("%06X", Integer.parseInt(color.asString()));
+            if (stack.getItem() instanceof DyeableItem item && item.hasColor(stack)) {
+                String colorHex = String.format("%06X", item.getColor(stack));
                 String expectedHex = ExoticTooltip.getExpectedHex(internalID);
 
                 boolean correctLine = false;
-- 
cgit