From ebf1075155b614e3498f2ec332c20af195ab82a4 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Tue, 28 Nov 2023 00:00:54 +0100
Subject: [PATCH] Fixed crash when using the F3 + F4 menu in <= 1.8

---
 .../screen/MixinGameModeSelectionScreen.java       |  8 ++++++--
 ...nGameModeSelectionScreen_GameModeSelection.java | 14 +++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
index 6ed8ba3b..5fe4c71e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
@@ -50,8 +50,12 @@ public class MixinGameModeSelectionScreen extends Screen {
         if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_8)) {
             final List<GameModeSelectionScreen.GameModeSelection> gameModeSelections = new ArrayList<>(Arrays.stream(GameModeSelectionScreen.GameModeSelection.values()).toList());
 
-            if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_3_1tor1_3_2)) gameModeSelections.remove(GameModeSelectionScreen.GameModeSelection.ADVENTURE);
-            if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_8)) gameModeSelections.remove(GameModeSelectionScreen.GameModeSelection.SPECTATOR);
+            if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_3_1tor1_3_2)) {
+                gameModeSelections.remove(GameModeSelectionScreen.GameModeSelection.ADVENTURE);
+            }
+            if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_8)) {
+                gameModeSelections.remove(GameModeSelectionScreen.GameModeSelection.SPECTATOR);
+            }
 
             viafabricplus_unwrappedGameModes = gameModeSelections.toArray(GameModeSelectionScreen.GameModeSelection[]::new);
             UI_WIDTH = viafabricplus_unwrappedGameModes.length * 31 - 5;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
index 1f718ee8..55201022 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
@@ -52,18 +52,18 @@ public class MixinGameModeSelectionScreen_GameModeSelection {
     }
 
     @Inject(method = "next", at = @At("HEAD"), cancellable = true)
-    public void unwrapGameModes(CallbackInfoReturnable<Optional<GameModeSelectionScreen.GameModeSelection>> cir) {
+    private void unwrapGameModes(CallbackInfoReturnable<GameModeSelectionScreen.GameModeSelection> cir) {
         if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_8)) {
-            switch ((GameModeSelectionScreen.GameModeSelection)(Object)this) {
-                case CREATIVE -> cir.setReturnValue(Optional.of(SURVIVAL));
+            switch ((GameModeSelectionScreen.GameModeSelection) (Object) this) {
+                case CREATIVE -> cir.setReturnValue(SURVIVAL);
                 case SURVIVAL -> {
-                    if (ProtocolHack.getTargetVersion().isOlderThan(VersionEnum.r1_2_4tor1_2_5)) {
-                        cir.setReturnValue(Optional.of(CREATIVE));
+                    if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_2_4tor1_2_5)) {
+                        cir.setReturnValue(CREATIVE);
                     } else {
-                        cir.setReturnValue(Optional.of(GameModeSelectionScreen.GameModeSelection.ADVENTURE));
+                        cir.setReturnValue(GameModeSelectionScreen.GameModeSelection.ADVENTURE);
                     }
                 }
-                case ADVENTURE -> cir.setReturnValue(Optional.of(CREATIVE));
+                case ADVENTURE -> cir.setReturnValue(CREATIVE);
             }
         }
     }