diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-12 17:51:59 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-26 16:23:21 -0400 |
| commit | 813ab5ff0529be0606b63b774128bd0d3fc28d7d (patch) | |
| tree | 19db54e907cd9dead9789f7bd3bf40032cbc47df /src/main | |
| parent | 784ef6128b1963c696a13d2c81983fe372dd1424 (diff) | |
| download | Skyblocker-813ab5ff0529be0606b63b774128bd0d3fc28d7d.tar.gz Skyblocker-813ab5ff0529be0606b63b774128bd0d3fc28d7d.tar.bz2 Skyblocker-813ab5ff0529be0606b63b774128bd0d3fc28d7d.zip | |
Add null cases for pattern matching
Apparently default doesn't cover it... why? I don't know
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java index 41201439..f81c2688 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java @@ -40,18 +40,19 @@ public abstract class MinecraftClientMixin { } //Remove Downloading Terrain Screen and Reconfiguring Screen - /*@ModifyVariable(at = @At("HEAD"), method = "setScreen", ordinal = 0, argsOnly = true) + @ModifyVariable(at = @At("HEAD"), method = "setScreen", ordinal = 0, argsOnly = true) public Screen modifySetScreen(Screen screen) { if (Utils.isOnSkyblock()) { return switch (screen) { case DownloadingTerrainScreen _s -> null; case ReconfiguringScreen _s when this.getNetworkHandler() != null -> new ReconfiguringPlaceholderScreen(this.getNetworkHandler().getConnection()); + case null -> null; default -> screen; }; } return screen; - }*/ + } @ModifyArg(method = "joinWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;reset(Lnet/minecraft/client/gui/screen/Screen;)V"), index = 0) private Screen modifyJoinWorld(Screen screen) { 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 59239081..cd5e3dba 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 @@ -123,6 +123,7 @@ public class Waterboard extends DungeonPuzzle { 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('.'); + case null -> sb.append('?'); default -> sb.append('?'); } 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 3960b0d1..b09622e4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java @@ -55,6 +55,7 @@ public class ShortcutsConfigListWidget extends ElementListWidget<ShortcutsConfig return switch (getSelectedOrNull()) { case ShortcutCategoryEntry category -> Optional.of(category); case ShortcutEntry shortcutEntry -> Optional.of(shortcutEntry.category); + case null -> Optional.empty(); default -> Optional.empty(); }; |