From 4581056e0f741e6f253613eb401c2c84652c9e1c Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 6 Apr 2024 04:22:23 -0400 Subject: More Pattern Matching This is not everything. --- .../java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java') 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; } -- cgit