diff options
Diffstat (limited to 'src/main/java/de')
13 files changed, 40 insertions, 34 deletions
diff --git a/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java b/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java index 25b84516..87c1304b 100644 --- a/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java +++ b/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java @@ -1,11 +1,15 @@ package de.hysky.skyblocker.injected; public interface ItemStackInternalIdGetter { - default String skyblocker$getInternalId(boolean internalIdOnly) { + default String getInternalId() { return ""; } - default String skyblocker$getNeuName() { + default String getInternalName() { + return ""; + } + + default String getNeuName() { return ""; } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java index 48710bc0..8b5dd31d 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java @@ -123,27 +123,29 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { } @Override - public String skyblocker$getInternalId(boolean internalIDOnly) { - if (internalIDOnly) { - if (internalId != null && !internalId.isEmpty()) return internalId; - internalId = skyblocker$getInternalNameFromNBT(true); - return internalId; - } // else + public String getInternalId() { + if (internalId != null && !internalId.isEmpty()) return internalId; + internalId = skyblocker$getInternalNameFromNBT(true); + return internalId; + } + + @Override + public String getInternalName() { if (internalName != null && !internalName.isEmpty()) return internalName; internalName = skyblocker$getInternalNameFromNBT(false); return internalName; } @Override - public String skyblocker$getNeuName() { + public String getNeuName() { if (neuName != null && !neuName.isEmpty()) return neuName; - String name = skyblocker$getInternalId(false); - String internalId = skyblocker$getInternalId(true); - if (name == null || internalId == null) return ""; + String name = getInternalName(); + String id = getInternalId(); + if (name == null || id == null) return ""; - if (name.startsWith("ISSHINY_")) name = internalId; + if (name.startsWith("ISSHINY_")) name = id; - neuName = ItemTooltip.getNeuName(internalId, name); + neuName = ItemTooltip.getNeuName(id, name); return neuName; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java index 0ca15e81..3d1da0bd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java @@ -80,11 +80,11 @@ public class ChestValue { } String name = stack.getName().getString(); - String id = stack.skyblocker$getInternalId(false); + String internalName = stack.getInternalName(); //Regular item price - if (id != null) { - LongBooleanPair priceData = getItemPrice(id); + if (internalName != null) { + LongBooleanPair priceData = getItemPrice(internalName); if (!priceData.rightBoolean()) hasIncompleteData = true; @@ -159,10 +159,10 @@ public class ChestValue { continue; } - String id = stack.skyblocker$getInternalId(false); + String internalName = stack.getInternalName(); - if (id != null) { - LongBooleanPair priceData = getItemPrice(id); + if (internalName != null) { + LongBooleanPair priceData = getItemPrice(internalName); if (!priceData.rightBoolean()) hasIncompleteData = true; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java index b431dcc9..d8a05809 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java @@ -26,7 +26,7 @@ public class TeleportOverlay { private static void render(WorldRenderContext wrc) { if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) { ItemStack heldItem = client.player.getMainHandStack(); - String itemId = heldItem.skyblocker$getInternalId(true); + String itemId = heldItem.getInternalId(); NbtCompound customData = ItemUtils.getCustomData(heldItem); if (itemId != null) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java index 3a825e81..21bd965c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java @@ -295,8 +295,8 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI<AuctionHouseS String coins = split[1].replace(",", "").replace("coins", "").trim(); try { long parsed = Long.parseLong(coins); - String name = stack.skyblocker$getInternalId(false); - String internalID = stack.skyblocker$getInternalId(true); + String name = stack.getInternalName(); + String internalID = stack.getInternalId(); String neuName = name; if (name == null || internalID == null) break; if (name.startsWith("ISSHINY_")) { 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 18991a1c..0bc50997 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 @@ -17,7 +17,7 @@ public class AccessoryTooltip extends TooltipAdder { @Override public void addToTooltip(List<Text> lines, Slot focusedSlot) { - final String internalID = focusedSlot.getStack().skyblocker$getInternalId(true); + final String internalID = focusedSlot.getStack().getInternalId(); if (TooltipInfoType.ACCESSORIES.isTooltipEnabledAndHasOrNullWarning(internalID)) { Pair<AccessoriesHelper.AccessoryReport, String> 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 85c8d4e1..ba06b54d 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 @@ -19,8 +19,8 @@ public class AvgBinTooltip extends TooltipAdder { @Override public void addToTooltip(List<Text> lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - String neuName = itemStack.skyblocker$getNeuName(); - String internalID = itemStack.skyblocker$getInternalId(true); + String neuName = itemStack.getNeuName(); + String internalID = itemStack.getInternalId(); 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 5ebe1f30..afd6d301 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 @@ -22,9 +22,9 @@ public class BazaarPriceTooltip extends TooltipAdder { public void addToTooltip(List<Text> lines, Slot focusedSlot) { bazaarExist = false; final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.skyblocker$getInternalId(true); + final String internalID = itemStack.getInternalId(); if (internalID == null) return; - String name = itemStack.skyblocker$getInternalId(false); + String name = itemStack.getInternalName(); 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 ac28e08b..85be7215 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 @@ -28,7 +28,7 @@ public class ColorTooltip extends TooltipAdder { @Override public void addToTooltip(List<Text> lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.skyblocker$getInternalId(true); + final String internalID = itemStack.getInternalId(); 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 8f3bfe09..da6b9ed0 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 @@ -20,9 +20,9 @@ public class LBinTooltip extends TooltipAdder { public void addToTooltip(List<Text> lines, Slot focusedSlot) { lbinExist = false; final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.skyblocker$getInternalId(true); + final String internalID = itemStack.getInternalId(); if (internalID == null) return; - String name = itemStack.skyblocker$getInternalId(false); + String name = itemStack.getInternalName(); 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 7311e614..6e286ea6 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 @@ -19,7 +19,7 @@ public class MotesTooltip extends TooltipAdder { @Override public void addToTooltip(List<Text> lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.skyblocker$getInternalId(true); + final String internalID = itemStack.getInternalId(); 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 d6e2c13b..5ce0e730 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 @@ -19,7 +19,7 @@ public class MuseumTooltip extends TooltipAdder { @Override public void addToTooltip(List<Text> lines, Slot focusedSlot) { final ItemStack itemStack = focusedSlot.getStack(); - final String internalID = itemStack.skyblocker$getInternalId(true); + final String internalID = itemStack.getInternalId(); 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 3ffdc003..d59d26f6 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 @@ -17,7 +17,7 @@ public class NpcPriceTooltip extends TooltipAdder { @Override public void addToTooltip(List<Text> lines, Slot focusedSlot) { final ItemStack stack = focusedSlot.getStack(); - final String internalID = stack.skyblocker$getInternalId(true); + final String internalID = stack.getInternalId(); if (internalID != null && TooltipInfoType.NPC.isTooltipEnabledAndHasOrNullWarning(internalID)) { lines.add(Text.literal(String.format("%-21s", "NPC Sell Price:")) .formatted(Formatting.YELLOW) |