Pattern Matching!

2 files changed, 24 insertions, 18 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
index 73a0bfdb..681b0cbd 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
@@ -215,19 +215,26 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
 
         // Experiment Solvers
         if (currentSolver instanceof ExperimentSolver experimentSolver && experimentSolver.getState() == ExperimentSolver.State.SHOW && slot.inventory instanceof SimpleInventory) {
-            if (experimentSolver instanceof ChronomatronSolver chronomatronSolver) {
-                Item item = chronomatronSolver.getChronomatronSlots().get(chronomatronSolver.getChronomatronCurrentOrdinal());
-                if ((stack.isOf(item) || ChronomatronSolver.TERRACOTTA_TO_GLASS.get(stack.getItem()) == item) && chronomatronSolver.incrementChronomatronCurrentOrdinal() >= chronomatronSolver.getChronomatronSlots().size()) {
-                    chronomatronSolver.setState(ExperimentSolver.State.END);
+            switch (experimentSolver) {
+                case ChronomatronSolver chronomatronSolver -> {
+                    Item item = chronomatronSolver.getChronomatronSlots().get(chronomatronSolver.getChronomatronCurrentOrdinal());
+                    if ((stack.isOf(item) || ChronomatronSolver.TERRACOTTA_TO_GLASS.get(stack.getItem()) == item) && chronomatronSolver.incrementChronomatronCurrentOrdinal() >= chronomatronSolver.getChronomatronSlots().size()) {
+                        chronomatronSolver.setState(ExperimentSolver.State.END);
+                    }
                 }
-            } else if (experimentSolver instanceof SuperpairsSolver superpairsSolver) {
-                superpairsSolver.setSuperpairsPrevClickedSlot(slot.getIndex());
-                superpairsSolver.setSuperpairsCurrentSlot(ItemStack.EMPTY);
-            } else if (experimentSolver instanceof UltrasequencerSolver ultrasequencerSolver && slot.getIndex() == ultrasequencerSolver.getUltrasequencerNextSlot()) {
-                int count = ultrasequencerSolver.getSlots().get(ultrasequencerSolver.getUltrasequencerNextSlot()).getCount() + 1;
-                ultrasequencerSolver.getSlots().entrySet().stream().filter(entry -> entry.getValue().getCount() == count).findAny().map(Map.Entry::getKey).ifPresentOrElse(ultrasequencerSolver::setUltrasequencerNextSlot, () -> ultrasequencerSolver.setState(ExperimentSolver.State.END));
+
+                case SuperpairsSolver superpairsSolver -> {
+                    superpairsSolver.setSuperpairsPrevClickedSlot(slot.getIndex());
+                    superpairsSolver.setSuperpairsCurrentSlot(ItemStack.EMPTY);
+                }
+
+                case UltrasequencerSolver ultrasequencerSolver when slot.getIndex() == ultrasequencerSolver.getUltrasequencerNextSlot() -> {
+                    int count = ultrasequencerSolver.getSlots().get(ultrasequencerSolver.getUltrasequencerNextSlot()).getCount() + 1;
+                    ultrasequencerSolver.getSlots().entrySet().stream().filter(entry -> entry.getValue().getCount() == count).findAny().map(Map.Entry::getKey).ifPresentOrElse(ultrasequencerSolver::setUltrasequencerNextSlot, () -> ultrasequencerSolver.setState(ExperimentSolver.State.END));
+                }
+
+                default -> { /*Do Nothing*/ }
             }
-            return;
         }
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
index ba4b9a5f..59239081 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
@@ -119,13 +119,12 @@ public class Waterboard extends DungeonPuzzle {
         for (Cell[] row : cells) {
             sb.append("\n");
             for (Cell cell : row) {
-                if (cell == null) {
-                    sb.append('?');
-                } else if (cell instanceof SwitchCell switchCell) {
-                    sb.append(switchCell.id);
-                } else switch (cell.type) {
-                    case BLOCK -> sb.append('#');
-                    case EMPTY -> sb.append('.');
+                switch (cell) {
+                    case SwitchCell switchCell -> sb.append(switchCell.id);
+                    case Cell c when c.type == Cell.Type.BLOCK -> sb.append('#');
+                    case Cell c when c.type == Cell.Type.EMPTY -> sb.append('.');
+
+                    default -> sb.append('?');
                 }
             }
         }