aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-07-22 15:46:14 +0800
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-07-22 15:46:14 +0800
commit14d4abe61f1344f29a9eebb73d6a3d7004dfc2d5 (patch)
treee7733d33fc085e3d90046e67b0361f18afda547b /src/main/java/de/hysky/skyblocker/skyblock
parenta846b52122422887e464d83ca01f0b771f3882f5 (diff)
downloadSkyblocker-14d4abe61f1344f29a9eebb73d6a3d7004dfc2d5.tar.gz
Skyblocker-14d4abe61f1344f29a9eebb73d6a3d7004dfc2d5.tar.bz2
Skyblocker-14d4abe61f1344f29a9eebb73d6a3d7004dfc2d5.zip
Code review part 1
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/CommunityShopAdder.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java2
2 files changed, 7 insertions, 9 deletions
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 65215b28..4450c0b3 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
@@ -36,26 +36,24 @@ public class CommunityShopAdder extends SimpleSlotTextAdder {
}
private static List<SlotText> getTextForUpgradesScreen(ItemStack stack, int slotId) {
- switch (slotId) {
+ return switch (slotId) {
case 30, 31, 32, 33, 34, 38, 39, 40, 41, 42, 43, 44 -> {
String name = stack.getName().getString();
int lastIndex = name.lastIndexOf(' ');
String roman = name.substring(lastIndex + 1); // + 1 as we don't want the space
- if (!RomanNumerals.isValidRomanNumeral(roman)) return List.of();
+ if (!RomanNumerals.isValidRomanNumeral(roman)) yield List.of();
List<Text> lore = ItemUtils.getLore(stack);
- if (lore.isEmpty()) return List.of();
+ if (lore.isEmpty()) yield List.of();
String lastLine = lore.getLast().getString();
- return List.of(SlotText.bottomLeft(switch (lastLine) {
+ yield List.of(SlotText.bottomLeft(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 -> {
- return List.of();
- }
- }
+ default -> List.of();
+ };
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java
index fcc9bd97..6a53dbdb 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/MuseumTooltip.java
@@ -20,7 +20,7 @@ public class MuseumTooltip extends SimpleTooltipAdder {
@Override
public boolean isEnabled() {
- return TooltipInfoType.MOTES.isTooltipEnabled();
+ return TooltipInfoType.MUSEUM.isTooltipEnabled();
}
@Override