Clean up rebased code

3 files changed, 10 insertions, 7 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
index b3017baf..3fb52b3a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
@@ -173,7 +173,7 @@ public class BackpackPreview {
 
             context.drawItem(currentStack, itemX, itemY);
             context.drawItemInSlot(textRenderer, currentStack, itemX, itemY);
-            SlotTextManager.renderSlotText(context, textRenderer, currentStack, i, itemX, itemY);
+            SlotTextManager.renderSlotText(context, textRenderer, null, currentStack, i, itemX, itemY);
         }
 
         matrices.pop();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
index ad4e181d..ce40d06c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
@@ -24,8 +24,8 @@ public class TooltipManager {
 	private static final TooltipAdder[] adders = new TooltipAdder[]{
 			new LineSmoothener(), // Applies before anything else
 			new SupercraftReminder(),
-			new ChocolateFactorySolver.Tooltip(),
-			new ReorderHelper.Tooltip(),
+			new ChocolateFactorySolver(),
+			new ReorderHelper(),
 			new NpcPriceTooltip(1),
 			new BazaarPriceTooltip(2),
 			new LBinTooltip(3),
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/EssenceShopPrice.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/EssenceShopPrice.java
index 5a7051d3..bc478d50 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/EssenceShopPrice.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/EssenceShopPrice.java
@@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.item.tooltip.adders;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.item.tooltip.TooltipAdder;
+import de.hysky.skyblocker.skyblock.item.tooltip.SimpleTooltipAdder;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.RegexUtils;
 import it.unimi.dsi.fastutil.objects.Object2LongArrayMap;
@@ -20,7 +20,7 @@ import java.util.OptionalLong;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class EssenceShopPrice extends TooltipAdder {
+public class EssenceShopPrice extends SimpleTooltipAdder {
 	private static final Pattern ESSENCE_PATTERN = Pattern.compile("Cost (?<amount>[\\d,]+) (?<type>[A-Za-z]+) Essence");
 	private static final NumberFormat DECIMAL_FORMAT = NumberFormat.getInstance(Locale.US);
 	private static final String[] ESSENCE_TYPES = {"WITHER", "SPIDER", "UNDEAD", "DRAGON", "GOLD", "DIAMOND", "ICE", "CRIMSON"};
@@ -45,8 +45,6 @@ public class EssenceShopPrice extends TooltipAdder {
 	//Todo: maybe move the price value right after the essence amount ex: "1,500 Wither Essence (645k coins)"
 	@Override
 	public void addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List<Text> lines) {
-		if (!SkyblockerConfigManager.get().general.itemTooltip.showEssenceCost) return;
-
 		String lore = ItemUtils.concatenateLore(lines);
 		Matcher essenceMatcher = ESSENCE_PATTERN.matcher(lore);
 		OptionalLong cost = RegexUtils.getLongFromMatcher(essenceMatcher);
@@ -64,4 +62,9 @@ public class EssenceShopPrice extends TooltipAdder {
 				.append(Text.literal(")").formatted(Formatting.GRAY))
 		);
 	}
+
+	@Override
+	public boolean isEnabled() {
+		return SkyblockerConfigManager.get().general.itemTooltip.showEssenceCost;
+	}
 }