More Pattern Matching

This is not everything.

2 files changed, 12 insertions, 11 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java
index dd671b2e..75a45d7c 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java
@@ -43,11 +43,12 @@ public abstract class MinecraftClientMixin {
     @ModifyVariable(at = @At("HEAD"), method = "setScreen", ordinal = 0, argsOnly = true)
     public Screen modifySetScreen(Screen screen) {
         if (Utils.isOnSkyblock()) {
-            if (screen instanceof DownloadingTerrainScreen) {
-                return null;
-            } else if (screen instanceof ReconfiguringScreen && this.getNetworkHandler() != null) {
-                return new ReconfiguringPlaceholderScreen(this.getNetworkHandler().getConnection());
-            }
+            return switch (screen) {
+                case DownloadingTerrainScreen _s -> null;
+                case ReconfiguringScreen _s when this.getNetworkHandler() != null -> new ReconfiguringPlaceholderScreen(this.getNetworkHandler().getConnection());
+
+                default -> screen;
+            };
         }
         return screen;
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
index 0c35eb2a..3960b0d1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
@@ -52,12 +52,12 @@ public class ShortcutsConfigListWidget extends ElementListWidget<ShortcutsConfig
     }
 
     protected Optional<ShortcutCategoryEntry> getCategory() {
-        if (getSelectedOrNull() instanceof ShortcutCategoryEntry category) {
-            return Optional.of(category);
-        } else if (getSelectedOrNull() instanceof ShortcutEntry shortcutEntry) {
-            return Optional.of(shortcutEntry.category);
-        }
-        return Optional.empty();
+        return switch (getSelectedOrNull()) {
+            case ShortcutCategoryEntry category -> Optional.of(category);
+            case ShortcutEntry shortcutEntry -> Optional.of(shortcutEntry.category);
+
+            default -> Optional.empty();
+        };
     }
 
     @Override