From f8a70f9488263cd101d07c1271c68b15c62f959e Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Fri, 31 May 2024 20:58:22 +0300 Subject: Refactor romanToDecimal method to its own class and optimize a few things --- .../skyblock/item/slottext/adders/EnchantmentLevelAdder.java | 4 ++-- .../skyblocker/skyblock/item/slottext/adders/MinionLevelAdder.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock/item/slottext') 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 44b3c982..44b12a7e 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,8 +1,8 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver; 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.screen.slot.Slot; @@ -37,6 +37,6 @@ public class EnchantmentLevelAdder extends SlotTextAdder { private static int getEnchantLevelFromString(String str) { String romanNumeral = str.substring(str.lastIndexOf(' ') + 1); //+1 because we don't need the space itself - return ChocolateFactorySolver.romanToDecimal(romanNumeral); //Temporary line. The method will be moved out later. + 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 index d6f53b7d..3a27c022 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,7 +1,7 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders; -import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver; 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; @@ -21,7 +21,7 @@ public class MinionLevelAdder extends SlotTextAdder { String name = itemStack.getName().getString(); if (!name.contains("Minion")) return null; String romanNumeral = name.substring(name.lastIndexOf(' ') + 1); //+1 because we don't need the space itself - int level = ChocolateFactorySolver.romanToDecimal(romanNumeral); //Temporary line. The method will be moved out later. + int level = RomanNumerals.romanToDecimal(romanNumeral); if (level == 0) return null; return Text.literal(String.valueOf(level)).formatted(Formatting.DARK_PURPLE); } -- cgit