diff options
Diffstat (limited to 'src/main')
14 files changed, 66 insertions, 66 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java index 47229a54..e4dc09fb 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java @@ -14,7 +14,7 @@ import de.hysky.skyblocker.skyblock.garden.VisitorHelper; import de.hysky.skyblocker.skyblock.item.ItemProtection; import de.hysky.skyblocker.skyblock.item.ItemRarityBackgrounds; import de.hysky.skyblocker.skyblock.item.WikiLookup; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +import de.hysky.skyblocker.skyblock.item.slottext.SlotText; import de.hysky.skyblocker.skyblock.item.slottext.SlotTextManager; import de.hysky.skyblocker.skyblock.item.tooltip.BackpackPreview; import de.hysky.skyblocker.skyblock.item.tooltip.CompactorDeletorPreview; @@ -315,30 +315,30 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen @Inject(method = "drawSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V")) private void skyblocker$drawSlotText(DrawContext context, Slot slot, CallbackInfo ci) { - List<PositionedText> textList = SlotTextManager.getText(slot); + List<SlotText> textList = SlotTextManager.getText(slot); if (textList.isEmpty()) return; MatrixStack matrices = context.getMatrices(); - for (PositionedText positionedText : textList) { + for (SlotText slotText : textList) { matrices.push(); matrices.translate(0.0f, 0.0f, 200.0f); - int length = textRenderer.getWidth(positionedText.text()); + int length = textRenderer.getWidth(slotText.text()); if (length > 16) { matrices.scale(16.0f / length, 16.0f / length, 1.0f); //Make them fit in the slot. FYI, a slot is sized 16×16. final float x = (slot.x * length / 16.0f) - slot.x; //Save in a variable to not recalculate - switch (positionedText.position()) { + switch (slotText.position()) { case TOP_LEFT, TOP_RIGHT -> matrices.translate(x, (slot.y * length / 16.0f) - slot.y, 0.0f); case BOTTOM_LEFT, BOTTOM_RIGHT -> matrices.translate(x, ((slot.y + 16f - textRenderer.fontHeight + 2f + 0.7f) * length / 16.0f) - slot.y, 0.0f); } } else { - switch (positionedText.position()) { + switch (slotText.position()) { case TOP_LEFT -> { /*Do Nothing*/ } case TOP_RIGHT -> matrices.translate(16f - length, 0.0f, 0.0f); case BOTTOM_LEFT -> matrices.translate(0.0f, 16f - textRenderer.fontHeight + 2f, 0.0f); case BOTTOM_RIGHT -> matrices.translate(16f - length, 16f - textRenderer.fontHeight + 2f, 0.0f); } } - context.drawText(textRenderer, positionedText.text(), slot.x, slot.y, 0xFFFFFF, true); + context.drawText(textRenderer, slotText.text(), slot.x, slot.y, 0xFFFFFF, true); matrices.pop(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/PositionedText.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/PositionedText.java deleted file mode 100644 index 4738038a..00000000 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/PositionedText.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.hysky.skyblocker.skyblock.item.slottext; - -import net.minecraft.text.Text; - -public record PositionedText(Text text, TextPosition position) { - public static PositionedText BOTTOM_LEFT(Text text) { - return new PositionedText(text, TextPosition.BOTTOM_LEFT); - } - - public static PositionedText BOTTOM_RIGHT(Text text) { - return new PositionedText(text, TextPosition.BOTTOM_RIGHT); - } - - public static PositionedText TOP_LEFT(Text text) { - return new PositionedText(text, TextPosition.TOP_LEFT); - } - - public static PositionedText TOP_RIGHT(Text text) { - return new PositionedText(text, TextPosition.TOP_RIGHT); - } -} 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 index 2e6213b0..18bf1dc1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextAdder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextAdder.java @@ -51,7 +51,7 @@ public abstract class SlotTextAdder { * @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<PositionedText> getText(Slot slot); + public abstract @NotNull List<SlotText> getText(Slot slot); /** * Override this method to add conditions to enable or disable this adder. 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 index 4885f0b8..7b4b34cf 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java @@ -57,10 +57,10 @@ public class SlotTextManager { * The order of the adders remains the same as they were added to the {@link SlotTextManager#adders} array. */ @NotNull - public static List<PositionedText> getText(Slot slot) { + public static List<SlotText> getText(Slot slot) { if (currentScreenAdders.isEmpty()) return List.of(); for (SlotTextAdder adder : currentScreenAdders) { - List<PositionedText> text = adder.getText(slot); + 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/adders/AttributeShardAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java index d15031e9..811677d7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java @@ -1,7 +1,7 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; import de.hysky.skyblocker.config.SkyblockerConfigManager; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -70,7 +70,7 @@ public class AttributeShardAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + public @NotNull List<SlotText> getText(Slot slot) { final ItemStack stack = slot.getStack(); NbtCompound customData = ItemUtils.getCustomData(stack); @@ -85,8 +85,8 @@ public class AttributeShardAdder extends SlotTextAdder { String attributeInitials = ID_2_SHORT_NAME.getOrDefault(attributeId, ""); return List.of( - PositionedText.BOTTOM_RIGHT(Text.literal(String.valueOf(attributeLevel)).withColor(0x34eb77)), - PositionedText.TOP_LEFT(Text.literal(attributeInitials).formatted(Formatting.AQUA)) + SlotText.bottomRight(Text.literal(String.valueOf(attributeLevel)).withColor(0x34eb77)), + SlotText.topLeft(Text.literal(attributeInitials).formatted(Formatting.AQUA)) ); } 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 index 90aa5d3e..31e0d110 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -23,15 +23,15 @@ public class CatacombsLevelAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(PositionedText.BOTTOM_LEFT(Text.literal("0").formatted(Formatting.RED))); + 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(PositionedText.BOTTOM_RIGHT(Text.literal(level).formatted(Formatting.RED))); + return List.of(SlotText.bottomRight(Text.literal(level).formatted(Formatting.RED))); } default -> { return List.of(); @@ -47,12 +47,12 @@ public class CatacombsLevelAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(PositionedText.BOTTOM_LEFT(Text.literal(level).formatted(Formatting.RED))); + return List.of(SlotText.bottomLeft(Text.literal(level).formatted(Formatting.RED))); } default -> { return List.of(); @@ -68,12 +68,12 @@ public class CatacombsLevelAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(PositionedText.BOTTOM_LEFT(Text.literal(level).formatted(Formatting.RED))); + return List.of(SlotText.bottomLeft(Text.literal(level).formatted(Formatting.RED))); } default -> { return List.of(); 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 index 4131d07c..9c85ae61 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -21,7 +21,7 @@ public class EnchantmentLevelAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(); @@ -31,11 +31,11 @@ public class EnchantmentLevelAdder extends SlotTextAdder { 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(PositionedText.BOTTOM_LEFT(Text.literal(String.valueOf(level)).formatted(Formatting.GREEN))); + 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(PositionedText.BOTTOM_LEFT(Text.literal(String.valueOf(level)).formatted(Formatting.GREEN))); + return List.of(SlotText.bottomLeft(Text.literal(String.valueOf(level)).formatted(Formatting.GREEN))); } } 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 index b98bed2b..b54b6a89 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -18,7 +18,7 @@ public class MinionLevelAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(); @@ -26,6 +26,6 @@ public class MinionLevelAdder extends SlotTextAdder { 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(PositionedText.TOP_RIGHT(Text.literal(String.valueOf(level)).formatted(Formatting.AQUA))); + 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 index 9c3eef08..3813563a 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -18,11 +18,11 @@ public class PetLevelAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(PositionedText.TOP_LEFT(Text.literal(level).formatted(Formatting.GOLD))); + 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 index 5db253fc..cbb3515f 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -17,7 +17,7 @@ import java.util.List; public class PrehistoricEggAdder extends SlotTextAdder { @Override - public @NotNull List<PositionedText> getText(Slot slot) { + public @NotNull List<SlotText> getText(Slot slot) { final ItemStack stack = slot.getStack(); if (!stack.isOf(Items.PLAYER_HEAD) || !StringUtils.equals(stack.getInternalId(), "PREHISTORIC_EGG")) return List.of(); NbtCompound nbt = ItemUtils.getCustomData(stack); @@ -29,6 +29,6 @@ public class PrehistoricEggAdder extends SlotTextAdder { else if (walked < 10000) walkedstr = String.format("%.1fk", walked/1000.0f); else walkedstr = walked / 1000 + "k"; - return List.of(PositionedText.BOTTOM_LEFT(Text.literal(walkedstr).formatted(Formatting.GOLD))); + 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 index 9fd498b7..c56e4525 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -23,7 +23,7 @@ public class RancherBootsSpeedAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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.getInternalId(), "RANCHERS_BOOTS")) return List.of(); @@ -31,6 +31,6 @@ public class RancherBootsSpeedAdder extends SlotTextAdder { 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(PositionedText.BOTTOM_LEFT(Text.literal(speed).formatted(Formatting.GREEN))); + 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 index efc077cd..095982af 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -16,15 +16,15 @@ public class SkillLevelAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(PositionedText.BOTTOM_LEFT(Text.literal("0").formatted(Formatting.LIGHT_PURPLE))); //Skills without any levels don't display any roman numerals. Probably because 0 doesn't exist. + 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(PositionedText.BOTTOM_LEFT(Text.literal(String.valueOf(RomanNumerals.isValidRomanNumeral(romanNumeral) ? RomanNumerals.romanToDecimal(romanNumeral) : Integer.parseInt(romanNumeral))).formatted(Formatting.LIGHT_PURPLE))); + 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 index f1e9f52c..8b528508 100644 --- 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 @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.item.slottext.PositionedText; +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; @@ -16,7 +16,7 @@ public class SkyblockLevelAdder extends SlotTextAdder { } @Override - public @NotNull List<PositionedText> getText(Slot slot) { + 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(); @@ -24,6 +24,6 @@ public class SkyblockLevelAdder extends SlotTextAdder { if (siblings.size() < 3) return List.of(); Text levelText = siblings.get(2); //The 3rd child is the level text itself if (!NumberUtils.isDigits(levelText.getString())) return List.of(); - return List.of(PositionedText.BOTTOM_LEFT(levelText)); + return List.of(SlotText.bottomLeft(levelText)); } } |