aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2023-12-31 03:26:38 -0500
committerGitHub <noreply@github.com>2023-12-31 16:26:38 +0800
commit1600f4515a2751e4717d0fb97b89df8f5806da5f (patch)
treecce34d99ee7728ac1201208035c7b188aea413ec /src/main/java/de/hysky/skyblocker
parent3f0a9adc3374081467d4d7ad4dcc13706127982a (diff)
downloadSkyblocker-1600f4515a2751e4717d0fb97b89df8f5806da5f.tar.gz
Skyblocker-1600f4515a2751e4717d0fb97b89df8f5806da5f.tar.bz2
Skyblocker-1600f4515a2751e4717d0fb97b89df8f5806da5f.zip
More Compatible Colour Parsing (#463)
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java7
1 files changed, 3 insertions, 4 deletions
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;