aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-07-27 12:13:16 +0300
committerRime <81419447+Emirlol@users.noreply.github.com>2024-07-27 12:13:16 +0300
commitb3565d3599227bd09005df644bb645bd9eeae872 (patch)
treea46358c45d40bd3325b6658e15cc5aa830730dae /src/main/java
parent036ede6ccf7c20226ae5f1f9e5b4950602e9e92d (diff)
downloadSkyblocker-b3565d3599227bd09005df644bb645bd9eeae872.tar.gz
Skyblocker-b3565d3599227bd09005df644bb645bd9eeae872.tar.bz2
Skyblocker-b3565d3599227bd09005df644bb645bd9eeae872.zip
Update all SlotTextAdder implementations to use the convenience methods for returning a list
This is more for readability than performance.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CatacombsLevelAdder.java8
-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.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/EnchantmentLevelAdder.java4
-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/MinionLevelAdder.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.java2
-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.java6
-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
14 files changed, 25 insertions, 25 deletions
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 ce0e3872..68813fd5 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
@@ -35,7 +35,7 @@ public class CatacombsLevelAdder {
if (!matcher.matches()) return List.of();
String arabic = matcher.group("arabic");
String roman = matcher.group("roman");
- if (arabic == null && roman == null) return List.of(SlotText.bottomLeft(Text.literal("0").formatted(Formatting.RED)));
+ if (arabic == null && roman == null) return SlotText.bottomLeftList(Text.literal("0").formatted(Formatting.RED));
String level;
if (arabic != null) {
if (!NumberUtils.isDigits(arabic)) return List.of(); //Sanity check
@@ -45,7 +45,7 @@ public class CatacombsLevelAdder {
level = String.valueOf(RomanNumerals.romanToDecimal(roman));
}
- return List.of(SlotText.bottomLeft(Text.literal(level).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(level).withColor(0xFFDDC1));
}
default -> {
return List.of();
@@ -66,7 +66,7 @@ public class CatacombsLevelAdder {
case 11, 12, 13, 14, 15 -> {
String level = getBracketedLevelFromName(stack);
if (!NumberUtils.isDigits(level)) return List.of();
- return List.of(SlotText.bottomLeft(Text.literal(level).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(level).withColor(0xFFDDC1));
}
default -> {
return List.of();
@@ -87,7 +87,7 @@ public class CatacombsLevelAdder {
case 29, 30, 31, 32, 33 -> {
String level = getBracketedLevelFromName(stack);
if (!NumberUtils.isDigits(level)) return List.of();
- return List.of(SlotText.bottomLeft(Text.literal(level).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(level).withColor(0xFFDDC1));
}
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 5b020fd4..c941fa6c 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
@@ -27,9 +27,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 List.of(SlotText.bottomRight(Text.literal(String.valueOf(level)).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
} else {
- return List.of(SlotText.bottomRight(Text.literal(String.valueOf(level)).withColor(0xE5B80B)));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xE5B80B));
}
}
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 4450c0b3..59ed8ecb 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
@@ -46,12 +46,12 @@ public class CommunityShopAdder extends SimpleSlotTextAdder {
List<Text> lore = ItemUtils.getLore(stack);
if (lore.isEmpty()) yield List.of();
String lastLine = lore.getLast().getString();
- yield List.of(SlotText.bottomLeft(switch (lastLine) {
+ 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 "Click to claim!" -> Text.literal("✅").withColor(0xa6e3a1).formatted(Formatting.BOLD);
default -> Text.literal(String.valueOf(RomanNumerals.romanToDecimal(roman))).withColor(0xcba6f7);
- }));
+ });
}
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 b4f89cdd..af63ec2e 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
@@ -30,11 +30,11 @@ public class EnchantmentLevelAdder extends SimpleSlotTextAdder {
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)).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
} 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)).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
}
}
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 ec0eb346..2a838ffe 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
@@ -36,7 +36,7 @@ public class EssenceShopAdder extends SimpleSlotTextAdder {
if (unlockedMatcher == null) {
level -= 1;
}
- return List.of(SlotText.bottomRight(Text.literal(String.valueOf(level)).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
}
if (essenceAmountMatcher == null) return List.of();
String essenceAmount = essenceAmountMatcher.group("essence").replace(",", "");
@@ -45,6 +45,6 @@ public class EssenceShopAdder extends SimpleSlotTextAdder {
NUMBER_FORMATTER_S.setMinimumFractionDigits(1);
int amount = Integer.parseInt(essenceAmount);
- return List.of(SlotText.bottomRight(Text.literal(NUMBER_FORMATTER_S.format(amount)).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(NUMBER_FORMATTER_S.format(amount)).withColor(0xFFDDC1));
}
}
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 b54e6c73..9ab1c374 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
@@ -28,6 +28,6 @@ public class MinionLevelAdder extends SimpleSlotTextAdder {
String romanNumeral = matcher.group(1);
if (!RomanNumerals.isValidRomanNumeral(romanNumeral)) return List.of();
int level = RomanNumerals.romanToDecimal(romanNumeral);
- return List.of(SlotText.topRight(Text.literal(String.valueOf(level)).withColor(0xFFDDC1)));
+ return SlotText.topRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
}
}
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 e229bc57..788560c3 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
@@ -21,10 +21,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 List.of(SlotText.bottomRight(Text.literal(level).withColor(0xFFFFFF)));
+ return SlotText.bottomRightList(Text.literal(level).withColor(0xFFFFFF));
} else {
int level = customData.getInt("potion_level");
- return List.of(SlotText.bottomRight(Text.literal(String.valueOf(level)).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(String.valueOf(level)).withColor(0xFFDDC1));
}
}
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 e3ee5eda..0032d331 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
@@ -29,6 +29,6 @@ public class PowerStonesGuideAdder extends SimpleSlotTextAdder {
? Text.literal("✖").withColor(0xFF7276)
: Text.literal("✔").withColor(0x90ee90);
- return List.of(SlotText.bottomRight(text));
+ 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 87781e1e..abaccd0a 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
@@ -28,6 +28,6 @@ public class PrehistoricEggAdder extends SimpleSlotTextAdder {
else if (walked < 10000) walkedStr = String.format("%.1fk", walked/1000.0f);
else walkedStr = walked / 1000 + "k";
- return List.of(SlotText.bottomLeft(Text.literal(walkedStr).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(walkedStr).withColor(0xFFDDC1));
}
}
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 b34e67c1..1de67074 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
@@ -30,6 +30,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 List.of(SlotText.bottomLeft(Text.literal(speed).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(speed).withColor(0xFFDDC1));
}
}
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 5ffce34a..b7117eaf 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
@@ -24,13 +24,13 @@ public class SkillLevelAdder extends SimpleSlotTextAdder {
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 = stack.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.
+ if (lastIndex == -1) return SlotText.bottomLeftList(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
if (ItemUtils.getLoreLineIf(stack, s -> s.contains("Max Skill level reached!")) != null) {
- return List.of(SlotText.bottomLeft(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(0xE5B80B));
} else {
- return List.of(SlotText.bottomLeft(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(0xFFDDC1));
}
}
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 aa7b577e..2e6ebc1e 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
@@ -26,6 +26,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 List.of(SlotText.bottomLeft(Text.literal(levelText).withColor(0xFFDDC1)));
+ return SlotText.bottomLeftList(Text.literal(levelText).withColor(0xFFDDC1));
}
}
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 5c175b1b..0b5906e4 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
@@ -29,13 +29,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 List.of(SlotText.bottomRight(Text.literal(unassignedPoints).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(unassignedPoints).withColor(0xFFDDC1));
}
if (statMatcher == null) return List.of();
String assignedPoints = statMatcher.group("points");
if (assignedPoints.equals("0")) return List.of();
- return List.of(SlotText.bottomRight(Text.literal(assignedPoints).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(assignedPoints).withColor(0xFFDDC1));
}
}
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 98dd9807..97bd35df 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 {
NUMBER_FORMATTER_S.setMinimumFractionDigits(1);
int amount = Integer.parseInt(essenceAmount);
- return List.of(SlotText.bottomRight(Text.literal(NUMBER_FORMATTER_S.format(amount)).withColor(0xFFDDC1)));
+ return SlotText.bottomRightList(Text.literal(NUMBER_FORMATTER_S.format(amount)).withColor(0xFFDDC1));
}
}
return List.of();