From 19a342e77da3378f24dc0e82e490aa5da2c40de5 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 14 Apr 2024 07:17:24 -0400 Subject: Refactor pattern matching null cases to be shared with default Didn't know you could do this --- .../skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java | 3 +-- .../hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock') 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 cd5e3dba..2efadfda 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,9 +123,8 @@ 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('?'); + case null, 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 b09622e4..e9fc592b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java @@ -55,9 +55,8 @@ public class ShortcutsConfigListWidget extends ElementListWidget Optional.of(category); case ShortcutEntry shortcutEntry -> Optional.of(shortcutEntry.category); - case null -> Optional.empty(); - default -> Optional.empty(); + case null, default -> Optional.empty(); }; } -- cgit