From 25ee7d7419ecd1dccdb06f0b0718fd20bebc0d14 Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:54:36 +0300 Subject: Rename ItemStackInternalIdGetter and its methods to be more distinguishable --- .../skyblocker/skyblock/item/tooltip/adders/AccessoryTooltip.java | 2 +- .../hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java | 2 +- .../skyblocker/skyblock/item/tooltip/adders/BazaarPriceTooltip.java | 4 ++-- .../hysky/skyblocker/skyblock/item/tooltip/adders/ColorTooltip.java | 2 +- .../de/hysky/skyblocker/skyblock/item/tooltip/adders/LBinTooltip.java | 4 ++-- .../hysky/skyblocker/skyblock/item/tooltip/adders/MotesTooltip.java | 2 +- .../hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java | 2 +- .../skyblocker/skyblock/item/tooltip/adders/NpcPriceTooltip.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock/item/tooltip') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AccessoryTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AccessoryTooltip.java index 34d93abc..3b150488 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AccessoryTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AccessoryTooltip.java @@ -18,7 +18,7 @@ public class AccessoryTooltip extends TooltipAdder { @Override public void addToTooltip(List lines, Slot focusedSlot) { - final String internalID = focusedSlot.getStack().getInternalId(); + final String internalID = focusedSlot.getStack().getSkyblockId(); if (TooltipInfoType.ACCESSORIES.isTooltipEnabledAndHasOrNullWarning(internalID)) { Pair report = AccessoriesHelper.calculateReport4Accessory(internalID); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java index 4754932b..a36f30e9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java @@ -21,7 +21,7 @@ public class AvgBinTooltip extends TooltipAdder { public void addToTooltip(List lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); String neuName = itemStack.getNeuName(); - String internalID = itemStack.getInternalId(); + String internalID = itemStack.getSkyblockId(); if (neuName == null || internalID == null) return; if (SkyblockerConfigManager.get().general.itemTooltip.enableAvgBIN) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BazaarPriceTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BazaarPriceTooltip.java index 9237c141..ed24a2fd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BazaarPriceTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BazaarPriceTooltip.java @@ -23,9 +23,9 @@ public class BazaarPriceTooltip extends TooltipAdder { public void addToTooltip(List lines, Slot focusedSlot) { bazaarExist = false; final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.getInternalId(); + final String internalID = itemStack.getSkyblockId(); if (internalID == null) return; - String name = itemStack.getInternalName(); + String name = itemStack.getSkyblockName(); if (name == null) return; if (name.startsWith("ISSHINY_")) name = "SHINY_" + internalID; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ColorTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ColorTooltip.java index 56dd60b0..2b576be6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ColorTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ColorTooltip.java @@ -29,7 +29,7 @@ public class ColorTooltip extends TooltipAdder { @Override public void addToTooltip(List lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.getInternalId(); + final String internalID = itemStack.getSkyblockId(); if (TooltipInfoType.COLOR.isTooltipEnabledAndHasOrNullWarning(internalID) && itemStack.contains(DataComponentTypes.DYED_COLOR)) { String uuid = ItemUtils.getItemUuid(itemStack); boolean hasCustomDye = SkyblockerConfigManager.get().general.customDyeColors.containsKey(uuid) || SkyblockerConfigManager.get().general.customAnimatedDyes.containsKey(uuid); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/LBinTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/LBinTooltip.java index 2a28df79..38ef49e6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/LBinTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/LBinTooltip.java @@ -21,9 +21,9 @@ public class LBinTooltip extends TooltipAdder { public void addToTooltip(List lines, Slot focusedSlot) { lbinExist = false; final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.getInternalId(); + final String internalID = itemStack.getSkyblockId(); if (internalID == null) return; - String name = itemStack.getInternalName(); + String name = itemStack.getSkyblockName(); if (name == null) return; if (name.startsWith("ISSHINY_")) name = "SHINY_" + internalID; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MotesTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MotesTooltip.java index 5a8c2ddb..64640b95 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MotesTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MotesTooltip.java @@ -20,7 +20,7 @@ public class MotesTooltip extends TooltipAdder { @Override public void addToTooltip(List lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.getInternalId(); + final String internalID = itemStack.getSkyblockId(); if (internalID != null && TooltipInfoType.MOTES.isTooltipEnabledAndHasOrNullWarning(internalID)) { lines.add(Text.literal(String.format("%-20s", "Motes Price:")) .formatted(Formatting.LIGHT_PURPLE) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java index ce98f1c5..1c64760a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java @@ -20,7 +20,7 @@ public class MuseumTooltip extends TooltipAdder { @Override public void addToTooltip(List lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.getInternalId(); + final String internalID = itemStack.getSkyblockId(); if (TooltipInfoType.MUSEUM.isTooltipEnabledAndHasOrNullWarning(internalID)) { String itemCategory = TooltipInfoType.MUSEUM.getData().get(internalID).getAsString(); String format = switch (itemCategory) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/NpcPriceTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/NpcPriceTooltip.java index ba24364b..3ac7d298 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/NpcPriceTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/NpcPriceTooltip.java @@ -18,7 +18,7 @@ public class NpcPriceTooltip extends TooltipAdder { @Override public void addToTooltip(List lines, Slot focusedSlot) { final ItemStack stack = focusedSlot.getStack(); - final String internalID = stack.getInternalId(); + final String internalID = stack.getSkyblockId(); if (internalID != null && TooltipInfoType.NPC.isTooltipEnabledAndHasOrNullWarning(internalID)) { lines.add(Text.literal(String.format("%-21s", "NPC Sell Price:")) .formatted(Formatting.YELLOW) -- cgit