aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2025-02-27 15:47:55 -0500
committerGitHub <noreply@github.com>2025-02-28 04:47:55 +0800
commit37422acb185653f1d33c606687a97715db1a7264 (patch)
tree46e9c6e8347e09ccc1e2c3c17c9d233c3092d58f /src
parent97a36bdbe9713437539005b707da9a4b8110d407 (diff)
downloadSkyblocker-37422acb185653f1d33c606687a97715db1a7264.tar.gz
Skyblocker-37422acb185653f1d33c606687a97715db1a7264.tar.bz2
Skyblocker-37422acb185653f1d33c606687a97715db1a7264.zip
Slot Text Stuff (#1134)
* HOTM Perk Level Slot Text * Add Discrite as an evolving item * Replace magic values with constants * Changes * Take max perk level into consideration --------- Co-authored-by: Rime <81419447+Emirlol@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/WardrobeKeybinds.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotText.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CatacombsLevelAdder.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CollectionAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CommunityShopAdder.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EnchantmentLevelAdder.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EssenceShopAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EvolvingItemAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/HotmPerkLevelAdder.java45
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/MinionLevelAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/NewYearCakeAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PotionLevelAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PowerStonesGuideAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PrehistoricEggAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/RancherBootsSpeedAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkillLevelAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/SkyblockLevelAdder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/StatsTuningAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/YourEssenceAdder.java2
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json1
23 files changed, 93 insertions, 32 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/WardrobeKeybinds.java b/src/main/java/de/hysky/skyblocker/skyblock/WardrobeKeybinds.java
index 3aa5ffc7..9adcf2ff 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/WardrobeKeybinds.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/WardrobeKeybinds.java
@@ -67,7 +67,7 @@ public class WardrobeKeybinds extends SimpleSlotTextAdder {
public @NotNull List<SlotText> getText(@Nullable Slot slot, @NotNull ItemStack stack, int slotId) {
if (!stack.isOf(Items.PINK_DYE) && !stack.isOf(Items.LIME_DYE)) return List.of();
if (!(slotId >= 36 && slotId <= 44)) return List.of();
- return SlotText.bottomLeftList(Text.literal(String.valueOf(slotId - 35)).withColor(0x74c7ec));
+ return SlotText.bottomLeftList(Text.literal(String.valueOf(slotId - 35)).withColor(SlotText.MID_BLUE));
}
@Override
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
index 43960c9c..eadcbcef 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotText.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotText.java
@@ -7,6 +7,20 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public record SlotText(@NotNull Text text, @NotNull TextPosition position) {
+ /**
+ * The "default" slot text color.
+ */
+ public static final int CREAM = 0xFFDDC1;
+ public static final int GOLD = 0xE5B80B;
+ public static final int LIGHT_BLUE = 0xCFF8F8;
+ public static final int LIGHT_ORANGE = 0xFAB387;
+ public static final int LIGHT_YELLOW = 0xF9E2AF;
+ public static final int LIGHT_PURPLE = 0xCBA6F7;
+ public static final int LIGHT_RED = 0xFF7276;
+ public static final int LIGHT_GREEN = 0x90EE90;
+ public static final int MID_BLUE = 0x74C7EC;
+ public static final int WHITE = 0xFFFFFF;
+
public static SlotText bottomLeft(@NotNull Text text) {
return new SlotText(text, TextPosition.BOTTOM_LEFT);
}
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 f5b9c200..a6a03a6d 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
@@ -37,6 +37,7 @@ public class SlotTextManager {
new MinionLevelAdder(),
new PetLevelAdder(),
new SkyblockLevelAdder(),
+ new HotmPerkLevelAdder(),
new SkillLevelAdder(),
new CatacombsLevelAdder.Dungeoneering(),
new CatacombsLevelAdder.DungeonClasses(),
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 16719364..a42294c7 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
@@ -87,8 +87,8 @@ public class AttributeShardAdder extends SimpleSlotTextAdder {
String attributeInitials = ID_2_SHORT_NAME.getOrDefault(attributeId, "");
return List.of(
- SlotText.bottomRight(Text.literal(String.valueOf(attributeLevel)).withColor(0xFFDDC1)),
- SlotText.topLeft(Text.literal(attributeInitials).withColor(0xCFF8F8))
+ SlotText.bottomRight(Text.literal(String.valueOf(attributeLevel)).withColor(SlotText.CREAM)),
+ SlotText.topLeft(Text.literal(attributeInitials).withColor(SlotText.LIGHT_BLUE))
);
}
}
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 87a67b93..0877751c 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
@@ -51,7 +51,7 @@ public class CatacombsLevelAdder {
level = String.valueOf(RomanNumerals.romanToDecimal(roman));
}
- return SlotText.bottomLeftList(Text.literal(level).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(level).withColor(SlotText.CREAM));
}
default -> {
return List.of();
@@ -72,7 +72,7 @@ public class CatacombsLevelAdder {
case 11, 12, 13, 14, 15 -> {
String level = getBracketedLevelFromName(stack);
if (!NumberUtils.isDigits(level)) return List.of();
- return SlotText.bottomLeftList(Text.literal(level).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(level).withColor(SlotText.CREAM));
}
default -> {
return List.of();
@@ -93,7 +93,7 @@ public class CatacombsLevelAdder {
case 29, 30, 31, 32, 33 -> {
String level = getBracketedLevelFromName(stack);
if (!NumberUtils.isDigits(level)) return List.of();
- return SlotText.bottomLeftList(Text.literal(level).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(level).withColor(SlotText.CREAM));
}
default -> {
return List.of();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CollectionAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CollectionAdder.java
index 7104a61d..3d915303 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CollectionAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CollectionAdder.java
@@ -31,9 +31,9 @@ public class CollectionAdder extends SimpleSlotTextAdder {
if (matcher.matches()) {
int level = RomanNumerals.romanToDecimal(matcher.group("level"));
if (ItemUtils.getLoreLineIf(stack, s -> s.contains("Progress to ")) != null) {
- return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(SlotText.CREAM));
} else {
- return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xE5B80B));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(SlotText.GOLD));
}
}
return List.of();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CommunityShopAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CommunityShopAdder.java
index 9d4a1470..630ed727 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CommunityShopAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CommunityShopAdder.java
@@ -51,10 +51,10 @@ public class CommunityShopAdder extends SimpleSlotTextAdder {
if (lore.isEmpty()) yield List.of();
String lastLine = lore.getLast().getString();
yield SlotText.bottomLeftList(switch (lastLine) {
- case "Maxed out!" -> Text.literal("Max").withColor(0xfab387);
- case "Currently upgrading!", "Click to instantly upgrade!" -> Text.literal("⏰").withColor(0xf9e2af).formatted(Formatting.BOLD);
+ case "Maxed out!" -> Text.literal("Max").withColor(SlotText.LIGHT_ORANGE);
+ case "Currently upgrading!", "Click to instantly upgrade!" -> Text.literal("⏰").withColor(SlotText.LIGHT_YELLOW).formatted(Formatting.BOLD);
case "Click to claim!" -> Text.literal("✅").withColor(0xa6e3a1).formatted(Formatting.BOLD);
- default -> Text.literal(String.valueOf(RomanNumerals.romanToDecimal(roman))).withColor(0xcba6f7);
+ default -> Text.literal(String.valueOf(RomanNumerals.romanToDecimal(roman))).withColor(SlotText.LIGHT_PURPLE);
});
}
default -> 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 3cae5588..521c0cfa 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
@@ -209,14 +209,14 @@ public class EnchantmentLevelAdder extends SimpleSlotTextAdder {
if (enchantments.getSize() != 1) return List.of(); //Only makes sense to display the level when there's one enchant.
final String enchantmentId = enchantments.getKeys().iterator().next();
int level = enchantments.getInt(enchantmentId);
- final SlotText enchantmentLevel = SlotText.bottomLeft(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
+ final SlotText enchantmentLevel = SlotText.bottomLeft(Text.literal(String.valueOf(level)).withColor(SlotText.CREAM));
return getAbbreviation(enchantmentId)
.map(text -> List.of(SlotText.topRight(text), enchantmentLevel))
.orElseGet(() -> List.of(enchantmentLevel));
} else { //In bazaar, the books have the enchantment level in the name
int level = getEnchantLevelFromString(name);
- return level != 0 ? SlotText.bottomLeftList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1)) : List.of();
+ return level != 0 ? SlotText.bottomLeftList(Text.literal(String.valueOf(level)).withColor(SlotText.CREAM)) : List.of();
}
}
@@ -232,4 +232,4 @@ public class EnchantmentLevelAdder extends SimpleSlotTextAdder {
private static int getEnchantLevelFromString(String str) {
return RomanNumerals.romanToDecimal(str.substring(str.lastIndexOf(' ') + 1)); //+1 because we don't need the space itself
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EssenceShopAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EssenceShopAdder.java
index 23b5bee7..03f37479 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EssenceShopAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EssenceShopAdder.java
@@ -40,12 +40,12 @@ public class EssenceShopAdder extends SimpleSlotTextAdder {
if (unlockedMatcher == null) {
level -= 1;
}
- return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(SlotText.CREAM));
}
if (essenceAmountMatcher == null) return List.of();
String essenceAmount = essenceAmountMatcher.group("essence").replace(",", "");
if (!essenceAmount.matches("-?\\d+")) return List.of();
- return SlotText.bottomRightList(Text.literal(YourEssenceAdder.COMPACT_NUMBER_FORMATTER.format(Integer.parseInt(essenceAmount))).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(YourEssenceAdder.COMPACT_NUMBER_FORMATTER.format(Integer.parseInt(essenceAmount))).withColor(SlotText.CREAM));
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EvolvingItemAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EvolvingItemAdder.java
index 8c213347..e36b19a0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EvolvingItemAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EvolvingItemAdder.java
@@ -29,7 +29,7 @@ public class EvolvingItemAdder extends SimpleSlotTextAdder {
@Override
public @NotNull List<SlotText> getText(@Nullable Slot slot, @NotNull ItemStack stack, int slotId) {
switch (stack.getSkyblockId()) {
- case "NEW_BOTTLE_OF_JYRRE", "DARK_CACAO_TRUFFLE" -> {
+ case "NEW_BOTTLE_OF_JYRRE", "DARK_CACAO_TRUFFLE", "DISCRITE" -> {
return actualLogic(stack, "Current Bonus: ");
}
case "TRAINING_WEIGHTS" -> {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/HotmPerkLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/HotmPerkLevelAdder.java
new file mode 100644
index 00000000..4d5c6195
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/HotmPerkLevelAdder.java
@@ -0,0 +1,45 @@
+package de.hysky.skyblocker.skyblock.item.slottext.adders;
+
+import de.hysky.skyblocker.skyblock.item.slottext.SimpleSlotTextAdder;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
+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 org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class HotmPerkLevelAdder extends SimpleSlotTextAdder {
+ private static final ConfigInformation CONFIG_INFORMATION = new ConfigInformation(
+ "hotm_perk_level",
+ "skyblocker.config.uiAndVisuals.slotText.hotmPerkLevel");
+ private static final Pattern LEVEL = Pattern.compile("Level (?<level>\\d+)/?(?<max>\\d+)?");
+
+ public HotmPerkLevelAdder() {
+ super("^Heart of the Mountain$", CONFIG_INFORMATION);
+ }
+
+ @Override
+ @NotNull
+ public List<SlotText> getText(@Nullable Slot slot, @NotNull ItemStack stack, int slotId) {
+ if (slotId < 0 || slotId > 44 || stack.isOf(Items.COAL)) return List.of();
+
+ List<Text> lore = ItemUtils.getLore(stack);
+ if (lore.isEmpty()) return List.of();
+
+ String levelLine = lore.getFirst().getString();
+ Matcher matcher = LEVEL.matcher(levelLine);
+ if (!matcher.matches()) return List.of();
+
+ String level = matcher.group("level");
+ // The `/<max>` part is removed when the level is max, so the group being null means it's maxed
+ boolean isMaxed = matcher.group("max") == null;
+
+ return SlotText.bottomRightList(Text.literal(level).withColor(isMaxed ? SlotText.GOLD : SlotText.CREAM));
+ }
+}
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 6b723d63..81faa6ee 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
@@ -31,6 +31,6 @@ public class MinionLevelAdder extends SimpleSlotTextAdder {
String romanNumeral = matcher.group(1);
if (!RomanNumerals.isValidRomanNumeral(romanNumeral)) return List.of();
int level = RomanNumerals.romanToDecimal(romanNumeral);
- return SlotText.topRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
+ return SlotText.topRightList(Text.literal(String.valueOf(level)).withColor(SlotText.CREAM));
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/NewYearCakeAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/NewYearCakeAdder.java
index f81c0df8..d5196a1f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/NewYearCakeAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/NewYearCakeAdder.java
@@ -18,6 +18,6 @@ public class NewYearCakeAdder extends SimpleSlotTextAdder {
if (!stack.isOf(Items.CAKE)) return List.of();
int year = ItemUtils.getCustomData(stack).getInt("new_years_cake");
if (year <= 0) return List.of();
- return SlotText.bottomLeftList(Text.literal(String.valueOf(year)).withColor(0x74c7ec));
+ return SlotText.bottomLeftList(Text.literal(String.valueOf(year)).withColor(SlotText.MID_BLUE));
}
}
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 61233778..ef5ce27d 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
@@ -31,6 +31,6 @@ public class PetLevelAdder extends SimpleSlotTextAdder {
if (!matcher.matches()) return List.of();
String level = matcher.group(1);
if (!NumberUtils.isDigits(level) || "100".equals(level) || "200".equals(level)) return List.of();
- return SlotText.topLeftList(Text.literal(level).withColor(0xFFDDC1));
+ return SlotText.topLeftList(Text.literal(level).withColor(SlotText.CREAM));
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PotionLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PotionLevelAdder.java
index 96f3b32f..4e06f47a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PotionLevelAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PotionLevelAdder.java
@@ -29,10 +29,10 @@ public class PotionLevelAdder extends SimpleSlotTextAdder {
if (customData.contains("potion_level", NbtElement.INT_TYPE) && !title.contains("Healer Class") && !title.contains("Class Passives")) {
if (title.contains("Healer Level ")){
String level = title.replaceAll("\\D", "");
- return SlotText.bottomRightList(Text.literal(level).withColor(0xFFFFFF));
+ return SlotText.bottomRightList(Text.literal(level).withColor(SlotText.WHITE));
} else {
int level = customData.getInt("potion_level");
- return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(SlotText.CREAM));
}
}
return List.of();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PowerStonesGuideAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PowerStonesGuideAdder.java
index 967c1cf2..6336d532 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PowerStonesGuideAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PowerStonesGuideAdder.java
@@ -30,8 +30,8 @@ public class PowerStonesGuideAdder extends SimpleSlotTextAdder {
if (match == null) return List.of();
String symbol = match.group("symbol");
Text text = symbol.equals("✖")
- ? Text.literal("✖").withColor(0xFF7276)
- : Text.literal("✔").withColor(0x90ee90);
+ ? Text.literal("✖").withColor(SlotText.LIGHT_RED)
+ : Text.literal("✔").withColor(SlotText.LIGHT_GREEN);
return SlotText.bottomRightList(text);
}
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 3162eeec..4faad12d 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
@@ -36,6 +36,6 @@ public class PrehistoricEggAdder extends SimpleSlotTextAdder {
else if (walked < 10000) walkedStr = String.format("%.1fk", walked/1000.0f);
else walkedStr = walked / 1000 + "k";
- return SlotText.bottomLeftList(Text.literal(walkedStr).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(walkedStr).withColor(SlotText.CREAM));
}
}
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 112a9f63..07c31954 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
@@ -31,6 +31,6 @@ public class RancherBootsSpeedAdder extends SimpleSlotTextAdder {
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 SlotText.bottomLeftList(Text.literal(speed).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(speed).withColor(SlotText.CREAM));
}
}
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 b52022db..885b0789 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
@@ -31,9 +31,9 @@ public class SkillLevelAdder extends SimpleSlotTextAdder {
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
if (ItemUtils.getLoreLineIf(stack, s -> s.contains("Max Skill level reached!")) != null) {
- return SlotText.bottomLeftList(Text.literal(String.valueOf(RomanNumerals.isValidRomanNumeral(romanNumeral) ? RomanNumerals.romanToDecimal(romanNumeral) : Integer.parseInt(romanNumeral))).withColor(0xE5B80B));
+ return SlotText.bottomLeftList(Text.literal(String.valueOf(RomanNumerals.isValidRomanNumeral(romanNumeral) ? RomanNumerals.romanToDecimal(romanNumeral) : Integer.parseInt(romanNumeral))).withColor(SlotText.GOLD));
} else {
- return SlotText.bottomLeftList(Text.literal(String.valueOf(RomanNumerals.isValidRomanNumeral(romanNumeral) ? RomanNumerals.romanToDecimal(romanNumeral) : Integer.parseInt(romanNumeral))).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(String.valueOf(RomanNumerals.isValidRomanNumeral(romanNumeral) ? RomanNumerals.romanToDecimal(romanNumeral) : Integer.parseInt(romanNumeral))).withColor(SlotText.CREAM));
}
}
default -> {
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 6f6ff562..630589a3 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
@@ -29,6 +29,6 @@ public class SkyblockLevelAdder extends SimpleSlotTextAdder {
if (siblings.size() < 3) return List.of();
String levelText = siblings.get(2).getString(); //The 3rd child is the level text itself
if (!NumberUtils.isDigits(levelText)) return List.of();
- return SlotText.bottomLeftList(Text.literal(levelText).withColor(0xFFDDC1));
+ return SlotText.bottomLeftList(Text.literal(levelText).withColor(SlotText.CREAM));
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/StatsTuningAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/StatsTuningAdder.java
index b5c70ca0..32f0194b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/StatsTuningAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/StatsTuningAdder.java
@@ -33,13 +33,13 @@ public class StatsTuningAdder extends SimpleSlotTextAdder {
if (stack.getName().getString().equals("Stats Tuning")) {
if (unassignedMatcher == null) return List.of();
String unassignedPoints = unassignedMatcher.group("points");
- return SlotText.bottomRightList(Text.literal(unassignedPoints).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(unassignedPoints).withColor(SlotText.CREAM));
}
if (statMatcher == null) return List.of();
String assignedPoints = statMatcher.group("points");
if (assignedPoints.equals("0")) return List.of();
- return SlotText.bottomRightList(Text.literal(assignedPoints).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(assignedPoints).withColor(SlotText.CREAM));
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/YourEssenceAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/YourEssenceAdder.java
index 3f8bd66d..4e0ca4e1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/YourEssenceAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/YourEssenceAdder.java
@@ -38,7 +38,7 @@ public class YourEssenceAdder extends SimpleSlotTextAdder {
return essenceAmountMatcher(ItemUtils.getLore(stack)).<List<SlotText>>map(essenceAmountMatcher -> {
String essenceAmount = essenceAmountMatcher.group("essence").replace(",", "");
if (!essenceAmount.matches("-?\\d+")) return List.of();
- return SlotText.bottomRightList(Text.literal(COMPACT_NUMBER_FORMATTER.format(Integer.parseInt(essenceAmount))).withColor(0xFFDDC1));
+ return SlotText.bottomRightList(Text.literal(COMPACT_NUMBER_FORMATTER.format(Integer.parseInt(essenceAmount))).withColor(SlotText.CREAM));
}).orElse(List.of());
}
return List.of();
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 21ac16a8..870e3580 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -859,6 +859,7 @@
"skyblocker.config.uiAndVisuals.slotText.enchantmentLevel": "Enchantment Book Level",
"skyblocker.config.uiAndVisuals.slotText.essenceShop": "Essence Shop",
"skyblocker.config.uiAndVisuals.slotText.essenceShop.@Tooltip": "Displays the levels and your current amount of essence while in essence shops.",
+ "skyblocker.config.uiAndVisuals.slotText.hotmPerkLevel": "HOTM Perk Level",
"skyblocker.config.uiAndVisuals.slotText.minionLevel": "Minion Level",
"skyblocker.config.uiAndVisuals.slotText.petLevel": "Pet Level",
"skyblocker.config.uiAndVisuals.slotText.potionLevel": "Potion Level",