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 --- .../injected/ItemStackInternalIdGetter.java | 20 ---------------- .../hysky/skyblocker/injected/SkyblockerStack.java | 20 ++++++++++++++++ .../de/hysky/skyblocker/mixins/ItemStackMixin.java | 28 +++++++++++----------- .../de/hysky/skyblocker/skyblock/ChestValue.java | 4 ++-- .../hysky/skyblocker/skyblock/TeleportOverlay.java | 2 +- .../skyblock/auction/AuctionBrowserScreen.java | 4 ++-- .../item/slottext/adders/PrehistoricEggAdder.java | 2 +- .../slottext/adders/RancherBootsSpeedAdder.java | 2 +- .../item/tooltip/adders/AccessoryTooltip.java | 2 +- .../item/tooltip/adders/AvgBinTooltip.java | 2 +- .../item/tooltip/adders/BazaarPriceTooltip.java | 4 ++-- .../skyblock/item/tooltip/adders/ColorTooltip.java | 2 +- .../skyblock/item/tooltip/adders/LBinTooltip.java | 4 ++-- .../skyblock/item/tooltip/adders/MotesTooltip.java | 2 +- .../item/tooltip/adders/MuseumTooltip.java | 2 +- .../item/tooltip/adders/NpcPriceTooltip.java | 2 +- 16 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java create mode 100644 src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java (limited to 'src/main/java/de/hysky') diff --git a/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java b/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java deleted file mode 100644 index d1992705..00000000 --- a/src/main/java/de/hysky/skyblocker/injected/ItemStackInternalIdGetter.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.hysky.skyblocker.injected; - -import org.jetbrains.annotations.Nullable; - -public interface ItemStackInternalIdGetter { - @Nullable - default String getInternalId() { - return ""; - } - - @Nullable - default String getInternalName() { - return ""; - } - - @Nullable - default String getNeuName() { - return ""; - } -} diff --git a/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java b/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java new file mode 100644 index 00000000..dc3d9c1f --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java @@ -0,0 +1,20 @@ +package de.hysky.skyblocker.injected; + +import org.jetbrains.annotations.Nullable; + +public interface SkyblockerStack { + @Nullable + default String getSkyblockId() { + return ""; + } + + @Nullable + default String getSkyblockName() { + return ""; + } + + @Nullable + 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 e4550a5c..1e5cff10 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java @@ -4,7 +4,7 @@ import com.google.gson.JsonObject; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; -import de.hysky.skyblocker.injected.ItemStackInternalIdGetter; +import de.hysky.skyblocker.injected.SkyblockerStack; import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; import de.hysky.skyblocker.utils.ItemUtils; import de.hysky.skyblocker.utils.Utils; @@ -28,7 +28,7 @@ import java.util.Locale; import java.util.Optional; @Mixin(ItemStack.class) -public abstract class ItemStackMixin implements ItemStackInternalIdGetter { +public abstract class ItemStackMixin implements SkyblockerStack { @Shadow public abstract int getDamage(); @@ -40,10 +40,10 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { private int maxDamage; @Unique - private String internalId; + private String skyblockId; @Unique - private String internalName; + private String skyblockName; @Unique private String neuName; @@ -125,26 +125,26 @@ public abstract class ItemStackMixin implements ItemStackInternalIdGetter { @Override @Nullable - public String getInternalId() { - if (internalId != null && !internalId.isEmpty()) return internalId; - internalId = skyblocker$getInternalNameFromNBT(true); - return internalId; + public String getSkyblockId() { + if (skyblockId != null && !skyblockId.isEmpty()) return skyblockId; + skyblockId = skyblocker$getInternalNameFromNBT(true); + return skyblockId; } @Override @Nullable - public String getInternalName() { - if (internalName != null && !internalName.isEmpty()) return internalName; - internalName = skyblocker$getInternalNameFromNBT(false); - return internalName; + public String getSkyblockName() { + if (skyblockName != null && !skyblockName.isEmpty()) return skyblockName; + skyblockName = skyblocker$getInternalNameFromNBT(false); + return skyblockName; } @Override @Nullable public String getNeuName() { if (neuName != null && !neuName.isEmpty()) return neuName; - String name = getInternalName(); - String id = getInternalId(); + String name = getSkyblockName(); + String id = getSkyblockId(); if (name == null || id == null) return null; if (name.startsWith("ISSHINY_")) name = id; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java index 3d1da0bd..cc800803 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java @@ -80,7 +80,7 @@ public class ChestValue { } String name = stack.getName().getString(); - String internalName = stack.getInternalName(); + String internalName = stack.getSkyblockName(); //Regular item price if (internalName != null) { @@ -159,7 +159,7 @@ public class ChestValue { continue; } - String internalName = stack.getInternalName(); + String internalName = stack.getSkyblockName(); if (internalName != null) { LongBooleanPair priceData = getItemPrice(internalName); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java index d8a05809..a8155b43 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.getInternalId(); + String itemId = heldItem.getSkyblockId(); 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 21bd965c..3d205252 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 getText(Slot slot) { final ItemStack stack = slot.getStack(); - if (!stack.isOf(Items.PLAYER_HEAD) || !StringUtils.equals(stack.getInternalId(), "PREHISTORIC_EGG")) return List.of(); + if (!stack.isOf(Items.PLAYER_HEAD) || !StringUtils.equals(stack.getSkyblockId(), "PREHISTORIC_EGG")) return List.of(); NbtCompound nbt = ItemUtils.getCustomData(stack); if (!nbt.contains("blocks_walked", NbtElement.INT_TYPE)) return List.of(); int walked = nbt.getInt("blocks_walked"); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/RancherBootsSpeedAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/RancherBootsSpeedAdder.java index c56e4525..1f92fb8a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/RancherBootsSpeedAdder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/RancherBootsSpeedAdder.java @@ -26,7 +26,7 @@ public class RancherBootsSpeedAdder extends SlotTextAdder { public @NotNull List getText(Slot slot) { final ItemStack itemStack = slot.getStack(); // V null-safe equals. - if (!itemStack.isOf(Items.LEATHER_BOOTS) && !StringUtils.equals(itemStack.getInternalId(), "RANCHERS_BOOTS")) return List.of(); + if (!itemStack.isOf(Items.LEATHER_BOOTS) && !StringUtils.equals(itemStack.getSkyblockId(), "RANCHERS_BOOTS")) return List.of(); Matcher matcher = ItemUtils.getLoreLineIfMatch(slot.getStack(), SPEED_PATTERN); if (matcher == null) return List.of(); String speed = matcher.group(2); 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