Refactor SkyblockerStack and ItemStackMixin

6 files changed, 21 insertions, 25 deletions

diff --git a/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java b/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java
index dc3d9c1f..2f54917b 100644
--- a/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java
+++ b/src/main/java/de/hysky/skyblocker/injected/SkyblockerStack.java
@@ -9,7 +9,7 @@ public interface SkyblockerStack {
 	}
 
 	@Nullable
-	default String getSkyblockName() {
+	default String getSkyblockApiId() {
 		return "";
 	}
 
diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
index 1e5cff10..b57ee32a 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
@@ -43,7 +43,7 @@ public abstract class ItemStackMixin implements SkyblockerStack {
 	private String skyblockId;
 
 	@Unique
-	private String skyblockName;
+	private String skyblockApiId;
 
 	@Unique
 	private String neuName;
@@ -127,34 +127,31 @@ public abstract class ItemStackMixin implements SkyblockerStack {
 	@Nullable
 	public String getSkyblockId() {
 		if (skyblockId != null && !skyblockId.isEmpty()) return skyblockId;
-		skyblockId = skyblocker$getInternalNameFromNBT(true);
-		return skyblockId;
+		return skyblockId = skyblocker$getSkyblockId(true);
 	}
 
 	@Override
 	@Nullable
-	public String getSkyblockName() {
-		if (skyblockName != null && !skyblockName.isEmpty()) return skyblockName;
-		skyblockName = skyblocker$getInternalNameFromNBT(false);
-		return skyblockName;
+	public String getSkyblockApiId() {
+		if (skyblockApiId != null && !skyblockApiId.isEmpty()) return skyblockApiId;
+		return skyblockApiId = skyblocker$getSkyblockId(false);
 	}
 
 	@Override
 	@Nullable
 	public String getNeuName() {
 		if (neuName != null && !neuName.isEmpty()) return neuName;
-		String name = getSkyblockName();
+		String apiId = getSkyblockApiId();
 		String id = getSkyblockId();
-		if (name == null || id == null) return null;
+		if (apiId == null || id == null) return null;
 
-		if (name.startsWith("ISSHINY_")) name = id;
+		if (apiId.startsWith("ISSHINY_")) apiId = id;
 
-		neuName = ItemTooltip.getNeuName(id, name);
-		return neuName;
+		return neuName = ItemTooltip.getNeuName(id, apiId);
 	}
 
 	@Unique
-	private String skyblocker$getInternalNameFromNBT(boolean internalIDOnly) {
+	private String skyblocker$getSkyblockId(boolean internalIDOnly) {
 		NbtCompound customData = ItemUtils.getCustomData((ItemStack) (Object) this);
 
 		if (customData == null || !customData.contains(ItemUtils.ID, NbtElement.STRING_TYPE)) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
index cc800803..0b5e623a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
@@ -12,7 +12,6 @@ import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.longs.LongBooleanPair;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.Screens;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -44,7 +43,7 @@ public class ChestValue {
 				if (DUNGEON_CHESTS.contains(titleString)) {
 					if (SkyblockerConfigManager.get().dungeons.dungeonChestProfit.enableProfitCalculator) {
 						ScreenEvents.afterTick(screen).register(screen_ ->
-								((ScreenAccessor) screen).setTitle(getDungeonChestProfit(genericContainerScreen.getScreenHandler(), title, titleString, client))
+								((ScreenAccessor) screen).setTitle(getDungeonChestProfit(genericContainerScreen.getScreenHandler(), title, titleString))
 						);
 					}
 				} else if (SkyblockerConfigManager.get().uiAndVisuals.chestValue.enableChestValue && !titleString.equals("SkyBlock Menu")) {
@@ -64,7 +63,7 @@ public class ChestValue {
 		});
 	}
 
-	private static Text getDungeonChestProfit(GenericContainerScreenHandler handler, Text title, String titleString, MinecraftClient client) {
+	private static Text getDungeonChestProfit(GenericContainerScreenHandler handler, Text title, String titleString) {
 		try {
 			long profit = 0;
 			boolean hasIncompleteData = false, usedKismet = false;
@@ -80,7 +79,7 @@ public class ChestValue {
 				}
 
 				String name = stack.getName().getString();
-				String internalName = stack.getSkyblockName();
+				String internalName = stack.getSkyblockApiId();
 
 				//Regular item price
 				if (internalName != null) {
@@ -115,7 +114,7 @@ public class ChestValue {
 
 				//Determine the cost of the chest
 				if (name.contains("Open Reward Chest")) {
-					String foundString = searchLoreFor(stack, client, "Coins");
+					String foundString = searchLoreFor(stack, "Coins");
 
 					//Incase we're searching the free chest
 					if (!StringUtils.isBlank(foundString)) {
@@ -127,7 +126,7 @@ public class ChestValue {
 
 				//Determine if a kismet was used or not
 				if (name.contains("Reroll Chest")) {
-					usedKismet = !StringUtils.isBlank(searchLoreFor(stack, client, "You already rerolled a chest!"));
+					usedKismet = !StringUtils.isBlank(searchLoreFor(stack, "You already rerolled a chest!"));
 				}
 			}
 
@@ -159,7 +158,7 @@ public class ChestValue {
 					continue;
 				}
 
-				String internalName = stack.getSkyblockName();
+				String internalName = stack.getSkyblockApiId();
 
 				if (internalName != null) {
 					LongBooleanPair priceData = getItemPrice(internalName);
@@ -205,7 +204,7 @@ public class ChestValue {
 	/**
 	 * Searches for a specific string of characters in the name and lore of an item
 	 */
-	private static String searchLoreFor(ItemStack stack, MinecraftClient client, String searchString) {
+	private static String searchLoreFor(ItemStack stack, String searchString) {
 		return ItemUtils.getLoreLineIf(stack, line -> line.contains(searchString));
 	}
 
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 3d205252..557cb6c9 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java
@@ -295,7 +295,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI<AuctionHouseS
                             String coins = split[1].replace(",", "").replace("coins", "").trim();
                             try {
                                 long parsed = Long.parseLong(coins);
-                                String name = stack.getSkyblockName();
+                                String name = stack.getSkyblockApiId();
                                 String internalID = stack.getSkyblockId();
                                 String neuName = name;
                                 if (name == null || internalID == null) break;
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 ed24a2fd..0aab21c0 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
@@ -25,7 +25,7 @@ public class BazaarPriceTooltip extends TooltipAdder {
 		final ItemStack itemStack = focusedSlot.getStack();
 		final String internalID = itemStack.getSkyblockId();
 		if (internalID == null) return;
-		String name = itemStack.getSkyblockName();
+		String name = itemStack.getSkyblockApiId();
 		if (name == null) return;
 
 		if (name.startsWith("ISSHINY_")) name = "SHINY_" + internalID;
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 38ef49e6..45cfe3e4 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
@@ -23,7 +23,7 @@ public class LBinTooltip extends TooltipAdder {
 		final ItemStack itemStack = focusedSlot.getStack();
 		final String internalID = itemStack.getSkyblockId();
 		if (internalID == null) return;
-		String name = itemStack.getSkyblockName();
+		String name = itemStack.getSkyblockApiId();
 		if (name == null) return;
 
 		if (name.startsWith("ISSHINY_")) name = "SHINY_" + internalID;