Merge pull request #735 from Emirlol/tooltips-galore

Tooltip refactors

31 files changed, 1321 insertions, 453 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotText.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotText.java
new file mode 100644
index 00000000..66c02ca1
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotText.java
@@ -0,0 +1,21 @@
+package de.hysky.skyblocker.skyblock.item.slottext;
+
+import net.minecraft.text.Text;
+
+public record SlotText(Text text, TextPosition position) {
+	public static SlotText bottomLeft(Text text) {
+		return new SlotText(text, TextPosition.BOTTOM_LEFT);
+	}
+
+	public static SlotText bottomRight(Text text) {
+		return new SlotText(text, TextPosition.BOTTOM_RIGHT);
+	}
+
+	public static SlotText topLeft(Text text) {
+		return new SlotText(text, TextPosition.TOP_LEFT);
+	}
+
+	public static SlotText topRight(Text text) {
+		return new SlotText(text, TextPosition.TOP_RIGHT);
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextAdder.java
new file mode 100644
index 00000000..18bf1dc1
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextAdder.java
@@ -0,0 +1,64 @@
+package de.hysky.skyblocker.skyblock.item.slottext;
+
+import de.hysky.skyblocker.skyblock.ChestValue;
+import net.minecraft.screen.slot.Slot;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * Extend this class and add it to {@link SlotTextManager#adders} to add text to any arbitrary slot.
+ */
+public abstract class SlotTextAdder {
+	/**
+	 * The title of the screen must match this pattern for this adder to be applied. Null means it will be applied to all screens.
+	 * @implNote Don't end your regex with a {@code $} as {@link ChestValue} appends text to the end of the title,
+	 * so the regex will stop matching if the player uses it.
+	 */
+	public final @Nullable Pattern titlePattern;
+
+	/**
+	 * Utility constructor that will compile the given string into a pattern.
+	 *
+	 * @see #SlotTextAdder(Pattern)
+	 */
+	protected SlotTextAdder(@NotNull String titlePattern) {
+		this(Pattern.compile(titlePattern));
+	}
+
+	/**
+	 * Creates a SlotTextAdder that will be applied to screens with titles that match the given pattern.
+	 *
+	 * @param titlePattern The pattern to match the screen title against.
+	 */
+	protected SlotTextAdder(@NotNull Pattern titlePattern) {
+		this.titlePattern = titlePattern;
+	}
+
+	/**
+	 * Creates a SlotTextAdder that will be applied to all screens.
+	 */
+	protected SlotTextAdder() {
+		this.titlePattern = null;
+	}
+
+	/**
+	 * This method will be called for each rendered slot. Consider using a switch statement on {@link Slot#id} if you wish to add different text to different slots.
+	 *
+	 * @return A list of positioned text to be rendered. Return {@link List#of()} if no text should be rendered.
+	 * @implNote By minecraft's design, scaled text inexplicably moves around.
+	 * So, limit your text to 3 characters (or roughly less than 20 width) if you want it to not look horrible.
+	 */
+	public abstract @NotNull List<SlotText> getText(Slot slot);
+
+	/**
+	 * Override this method to add conditions to enable or disable this adder.
+	 * @return Whether this adder is enabled.
+	 * @implNote The slot text adders only work while in skyblock, so no need to check for that again.
+	 */
+	public boolean isEnabled() {
+		return true;
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java
new file mode 100644
index 00000000..7b4b34cf
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java
@@ -0,0 +1,68 @@
+package de.hysky.skyblocker.skyblock.item.slottext;
+
+import de.hysky.skyblocker.skyblock.item.slottext.adders.*;
+import de.hysky.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.screen.slot.Slot;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SlotTextManager {
+	private static final SlotTextAdder[] adders = new SlotTextAdder[]{
+			new EnchantmentLevelAdder(),
+			new MinionLevelAdder(),
+			new PetLevelAdder(),
+			new SkyblockLevelAdder(),
+			new SkillLevelAdder(),
+			new CatacombsLevelAdder.Dungeoneering(),
+			new CatacombsLevelAdder.DungeonClasses(),
+			new CatacombsLevelAdder.ReadyUp(),
+			new RancherBootsSpeedAdder(),
+			new AttributeShardAdder(),
+			new PrehistoricEggAdder()
+	};
+	private static final ArrayList<SlotTextAdder> currentScreenAdders = new ArrayList<>();
+
+	private SlotTextManager() {
+	}
+
+	public static void init() {
+		ScreenEvents.AFTER_INIT.register((client, screen, width, height) -> {
+			if (screen instanceof HandledScreen<?> && Utils.isOnSkyblock()) {
+				onScreenChange(screen);
+				ScreenEvents.remove(screen).register(ignored -> currentScreenAdders.clear());
+			}
+		});
+	}
+
+	private static void onScreenChange(Screen screen) {
+		final String title = screen.getTitle().getString();
+		for (SlotTextAdder adder : adders) {
+			if (!adder.isEnabled()) continue;
+			if (adder.titlePattern == null || adder.titlePattern.matcher(title).find()) {
+				currentScreenAdders.add(adder);
+			}
+		}
+	}
+
+	/**
+	 * The returned text is rendered on top of the slot. The text will be scaled if it doesn't fit in the slot,
+	 * but 3 characters should be seen as the maximum to keep it readable and in place as it tends to move around when scaled.
+	 *
+	 * @implNote Only the first adder that returns a non-null text will be used.
+	 * The order of the adders remains the same as they were added to the {@link SlotTextManager#adders} array.
+	 */
+	@NotNull
+	public static List<SlotText> getText(Slot slot) {
+		if (currentScreenAdders.isEmpty()) return List.of();
+		for (SlotTextAdder adder : currentScreenAdders) {
+			List<SlotText> text = adder.getText(slot);
+			if (!text.isEmpty()) return text;
+		}
+		return List.of();
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/TextPosition.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/TextPosition.java
new file mode 100644
index 00000000..052b228d
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/TextPosition.java
@@ -0,0 +1,8 @@
+package de.hysky.skyblocker.skyblock.item.slottext;
+
+public enum TextPosition {
+	TOP_LEFT,
+	TOP_RIGHT,
+	BOTTOM_LEFT,
+	BOTTOM_RIGHT
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/AttributeShards.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java
index ed650e26..811677d7 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/AttributeShards.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java
@@ -1,9 +1,22 @@
-package de.hysky.skyblocker.skyblock.item;
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
 
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
 
-public class AttributeShards {
-	private static final Object2ObjectOpenHashMap<String, String> ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>();
+import java.util.List;
+
+public class AttributeShardAdder extends SlotTextAdder {
+	private static final Object2ObjectMap<String, String> ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>();
 
 	static {
 		//Weapons
@@ -50,10 +63,35 @@ public class AttributeShards {
 		ID_2_SHORT_NAME.put("fishing_speed", "FS");
 		ID_2_SHORT_NAME.put("hunter", "H");
 		ID_2_SHORT_NAME.put("trophy_hunter", "TH");
+	}
+
+	public AttributeShardAdder() {
+		super();
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		final ItemStack stack = slot.getStack();
+		NbtCompound customData = ItemUtils.getCustomData(stack);
+
+		if (!ItemUtils.getItemId(stack).equals("ATTRIBUTE_SHARD")) return List.of();
+
+		NbtCompound attributesTag = customData.getCompound("attributes");
+		String[] attributes = attributesTag.getKeys().toArray(String[]::new);
+
+		if (attributes.length != 1) return List.of();
+		String attributeId = attributes[0];
+		int attributeLevel = attributesTag.getInt(attributeId);
+		String attributeInitials = ID_2_SHORT_NAME.getOrDefault(attributeId, "");
 
+		return List.of(
+				SlotText.bottomRight(Text.literal(String.valueOf(attributeLevel)).withColor(0x34eb77)),
+				SlotText.topLeft(Text.literal(attributeInitials).formatted(Formatting.AQUA))
+		);
 	}
 
-	public static String getShortName(String id) {
-		return ID_2_SHORT_NAME.getOrDefault(id, "");
+	@Override
+	public boolean isEnabled() {
+		return SkyblockerConfigManager.get().general.itemInfoDisplay.attributeShardInfo;
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CatacombsLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CatacombsLevelAdder.java
new file mode 100644
index 00000000..31e0d110
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CatacombsLevelAdder.java
@@ -0,0 +1,92 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+//This class is split into 3 inner classes as there are multiple screens for showing catacombs levels, each with different slot ids or different style of showing the level.
+//It's still kept in 1 main class for organization purposes.
+public class CatacombsLevelAdder {
+	private CatacombsLevelAdder() {
+	}
+
+	public static class Dungeoneering extends SlotTextAdder {
+		public Dungeoneering() {
+			super("^Dungeoneering");
+		}
+
+		@Override
+		public @NotNull List<SlotText> getText(Slot slot) {
+			switch (slot.id) {
+				case 12, 29, 30, 31, 32, 33 -> {
+					String name = slot.getStack().getName().getString();
+					int lastIndex = name.lastIndexOf(' ');
+					if (lastIndex == -1) return List.of(SlotText.bottomLeft(Text.literal("0").formatted(Formatting.RED)));
+					String level = name.substring(lastIndex + 1);
+					if (!NumberUtils.isDigits(level)) return List.of(); //Sanity check, just in case.
+					return List.of(SlotText.bottomRight(Text.literal(level).formatted(Formatting.RED)));
+				}
+				default -> {
+					return List.of();
+				}
+			}
+		}
+	}
+
+	public static class DungeonClasses extends SlotTextAdder {
+
+		public DungeonClasses() {
+			super("^Dungeon Classes"); //Applies to both screens as they are same in both the placement and the style of the level text.
+		}
+
+		@Override
+		public @NotNull List<SlotText> getText(Slot slot) {
+			switch (slot.id) {
+				case 11, 12, 13, 14, 15 -> {
+					String level = getBracketedLevelFromName(slot.getStack());
+					if (!NumberUtils.isDigits(level)) return List.of();
+					return List.of(SlotText.bottomLeft(Text.literal(level).formatted(Formatting.RED)));
+				}
+				default -> {
+					return List.of();
+				}
+			}
+		}
+	}
+
+	public static class ReadyUp extends SlotTextAdder {
+
+		public ReadyUp() {
+			super("^Ready Up");
+		}
+
+		@Override
+		public @NotNull List<SlotText> getText(Slot slot) {
+			switch (slot.id) {
+				case 29, 30, 31, 32, 33 -> {
+					String level = getBracketedLevelFromName(slot.getStack());
+					if (!NumberUtils.isDigits(level)) return List.of();
+					return List.of(SlotText.bottomLeft(Text.literal(level).formatted(Formatting.RED)));
+				}
+				default -> {
+					return List.of();
+				}
+			}
+		}
+	}
+
+	public static String getBracketedLevelFromName(ItemStack itemStack) {
+		String name = itemStack.getName().getString();
+		if (!name.startsWith("[Lvl ")) return null;
+		int index = name.indexOf(']');
+		if (index == -1) return null;
+		return name.substring(5, index);
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EnchantmentLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EnchantmentLevelAdder.java
new file mode 100644
index 00000000..9c85ae61
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EnchantmentLevelAdder.java
@@ -0,0 +1,46 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.RomanNumerals;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class EnchantmentLevelAdder extends SlotTextAdder {
+	public EnchantmentLevelAdder() {
+		super();
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		final ItemStack itemStack = slot.getStack();
+		if (!itemStack.isOf(Items.ENCHANTED_BOOK)) return List.of();
+		String name = itemStack.getName().getString();
+		if (name.equals("Enchanted Book")) {
+			NbtCompound nbt = ItemUtils.getCustomData(itemStack);
+			if (nbt.isEmpty() || !nbt.contains("enchantments", NbtElement.COMPOUND_TYPE)) return List.of();
+			NbtCompound enchantments = nbt.getCompound("enchantments");
+			if (enchantments.getSize() != 1) return List.of(); //Only makes sense to display the level when there's one enchant.
+			int level = enchantments.getInt(enchantments.getKeys().iterator().next());
+			return List.of(SlotText.bottomLeft(Text.literal(String.valueOf(level)).formatted(Formatting.GREEN)));
+		} else { //In bazaar, the books have the enchantment level in the name
+			int level = getEnchantLevelFromString(name);
+			if (level == 0) return List.of();
+			return List.of(SlotText.bottomLeft(Text.literal(String.valueOf(level)).formatted(Formatting.GREEN)));
+		}
+	}
+
+	private static int getEnchantLevelFromString(String str) {
+		String romanNumeral = str.substring(str.lastIndexOf(' ') + 1); //+1 because we don't need the space itself
+		return RomanNumerals.romanToDecimal(romanNumeral); //Temporary line. The method will be moved out later.
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/MinionLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/MinionLevelAdder.java
new file mode 100644
index 00000000..b54b6a89
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/MinionLevelAdder.java
@@ -0,0 +1,31 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.RomanNumerals;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class MinionLevelAdder extends SlotTextAdder {
+	public MinionLevelAdder() {
+		super();
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		ItemStack itemStack = slot.getStack();
+		if (!itemStack.isOf(Items.PLAYER_HEAD)) return List.of();
+		String name = itemStack.getName().getString();
+		if (!name.contains("Minion")) return List.of();
+		String romanNumeral = name.substring(name.lastIndexOf(' ') + 1); //+1 because we don't need the space itself
+		int level = RomanNumerals.romanToDecimal(romanNumeral);
+		if (level == 0) return List.of();
+		return List.of(SlotText.topRight(Text.literal(String.valueOf(level)).formatted(Formatting.AQUA)));
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
new file mode 100644
index 00000000..3813563a
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
@@ -0,0 +1,28 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class PetLevelAdder extends SlotTextAdder {
+	public PetLevelAdder() {
+		super();
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		ItemStack itemStack = slot.getStack();
+		if (!itemStack.isOf(Items.PLAYER_HEAD)) return List.of();
+		String level = CatacombsLevelAdder.getBracketedLevelFromName(itemStack);
+		if (!NumberUtils.isDigits(level)) return List.of();
+		return List.of(SlotText.topLeft(Text.literal(level).formatted(Formatting.GOLD)));
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PrehistoricEggAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PrehistoricEggAdder.java
new file mode 100644
index 00000000..a157efee
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PrehistoricEggAdder.java
@@ -0,0 +1,34 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class PrehistoricEggAdder extends SlotTextAdder {
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		final ItemStack stack = slot.getStack();
+		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");
+
+		String walkedstr;
+		if (walked < 1000) walkedstr = String.valueOf(walked);
+		else if (walked < 10000) walkedstr = String.format("%.1fk", walked/1000.0f);
+		else walkedstr = walked / 1000 + "k";
+
+		return List.of(SlotText.bottomLeft(Text.literal(walkedstr).formatted(Formatting.GOLD)));
+	}
+}
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
new file mode 100644
index 00000000..1f92fb8a
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/RancherBootsSpeedAdder.java
@@ -0,0 +1,36 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RancherBootsSpeedAdder extends SlotTextAdder {
+	private static final Pattern SPEED_PATTERN = Pattern.compile("Current Speed Cap: (\\d+) ?(\\d+)?");
+
+	public RancherBootsSpeedAdder() {
+		super();
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		final ItemStack itemStack = slot.getStack();
+		//                                                          V null-safe equals.
+		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);
+		if (speed == null) speed = matcher.group(1); //2nd group only matches when the speed cap is set to a number beyond the player's actual speed cap.
+		return List.of(SlotText.bottomLeft(Text.literal(speed).formatted(Formatting.GREEN)));
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkillLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkillLevelAdder.java
new file mode 100644
index 00000000..095982af
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkillLevelAdder.java
@@ -0,0 +1,34 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.RomanNumerals;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class SkillLevelAdder extends SlotTextAdder {
+	public SkillLevelAdder() {
+		super("^Your Skills");
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		switch (slot.id) {
+			case 19, 20, 21, 22, 23, 24, 25, 29, 30, 31, 32 -> { //These are the slots that contain the skill items. Note that they aren't continuous, as there are 2 rows.
+				String name = slot.getStack().getName().getString();
+				int lastIndex = name.lastIndexOf(' ');
+				if (lastIndex == -1) return List.of(SlotText.bottomLeft(Text.literal("0").formatted(Formatting.LIGHT_PURPLE))); //Skills without any levels don't display any roman numerals. Probably because 0 doesn't exist.
+				String romanNumeral = name.substring(lastIndex + 1); //+1 because we don't need the space itself
+				//The "romanNumeral" might be a latin numeral, too. There's a skyblock setting for this, so we have to do it this way V
+				return List.of(SlotText.bottomLeft(Text.literal(String.valueOf(RomanNumerals.isValidRomanNumeral(romanNumeral) ? RomanNumerals.romanToDecimal(romanNumeral) : Integer.parseInt(romanNumeral))).formatted(Formatting.LIGHT_PURPLE)));
+			}
+			default -> {
+				return List.of();
+			}
+		}
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkyblockLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkyblockLevelAdder.java
new file mode 100644
index 00000000..8b528508
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkyblockLevelAdder.java
@@ -0,0 +1,29 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class SkyblockLevelAdder extends SlotTextAdder {
+	public SkyblockLevelAdder() {
+		super("^SkyBlock Menu");
+	}
+
+	@Override
+	public @NotNull List<SlotText> getText(Slot slot) {
+		if (slot.getIndex() != 22) return List.of();
+		List<Text> lore = ItemUtils.getLore(slot.getStack());
+		if (lore.isEmpty()) return List.of();
+		List<Text> siblings = lore.getFirst().getSiblings()