Code review part 1

6 files changed, 14 insertions, 11 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
diff --git a/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java b/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java
index 61d3821e..159f399e 100644
--- a/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java
+++ b/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java
@@ -3,11 +3,14 @@ package de.hysky.skyblocker.utils.container;
 import net.minecraft.client.gui.screen.Screen;
 import org.jetbrains.annotations.NotNull;
 
-public interface ContainerMatcher {
+import java.util.function.Predicate;
+
+public interface ContainerMatcher extends Predicate<Screen> {
     /**
      * Tests if the given screen should be handled by this matcher.
      * @return {@code true} if this matcher should apply to the given screen, {@code false} otherwise
      */
+    @Override
     boolean test(@NotNull Screen screen);
 
     /**
diff --git a/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java b/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java
index f3cb400e..c6162049 100644
--- a/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java
+++ b/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.utils.container;
 
 import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.Resettable;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
@@ -8,11 +9,12 @@ import net.minecraft.item.ItemStack;
 
 import java.util.List;
 
-public interface ContainerSolver extends ContainerMatcher {
+public interface ContainerSolver extends ContainerMatcher, Resettable {
 	List<ColorHighlight> getColors(Int2ObjectMap<ItemStack> slots);
 
 	default void start(GenericContainerScreen screen) {}
 
+	@Override
 	default void reset() {}
 
 	default boolean onClickSlot(int slot, ItemStack stack, int screenId) {
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java
deleted file mode 100644
index e69de29b..00000000
--- a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java
+++ /dev/null
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
deleted file mode 100644
index e69de29b..00000000
--- a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
+++ /dev/null