diff options
author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-24 16:48:20 -0400 |
---|---|---|
committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-26 16:23:22 -0400 |
commit | 36cf0be6a305fd5c6eae9f5948230bce56f553a6 (patch) | |
tree | 51d6c857477d716db882e7bce859f76fa62d6085 /src/main/java/de/hysky/skyblocker/skyblock/item/tooltip | |
parent | 86e8f24272ada7d38006e09650ebe77c8cf6a532 (diff) | |
download | Skyblocker-36cf0be6a305fd5c6eae9f5948230bce56f553a6.tar.gz Skyblocker-36cf0be6a305fd5c6eae9f5948230bce56f553a6.tar.bz2 Skyblocker-36cf0be6a305fd5c6eae9f5948230bce56f553a6.zip |
Cleanup references to ExtraAttributes and fix a bug relating to it
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/item/tooltip')
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java | 4 | ||||
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java | 4 |
2 files changed, 4 insertions, 4 deletions
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 + ")")); } |