From 530cb9c1c1da6170f78c998e00bede0a54aa4a04 Mon Sep 17 00:00:00 2001
From: rfresh2 <89827146+rfresh2@users.noreply.github.com>
Date: Sat, 23 Mar 2024 15:02:41 -0700
Subject: [PATCH] prevent incompatible minimap screen from being switched

---
 .../client/mc/MixinMinecraftClientFabric.java | 23 +++++++++++++++++++
 ...XaeroPlusCompatibleMinimapMixinPlugin.java |  3 ++-
 .../resources/xaeroplus-fabric.mixins.json    |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 fabric/src/main/java/xaeroplus/fabric/mixin/client/mc/MixinMinecraftClientFabric.java

diff --git a/fabric/src/main/java/xaeroplus/fabric/mixin/client/mc/MixinMinecraftClientFabric.java b/fabric/src/main/java/xaeroplus/fabric/mixin/client/mc/MixinMinecraftClientFabric.java
new file mode 100644
index 00000000..ab5c82c0
--- /dev/null
+++ b/fabric/src/main/java/xaeroplus/fabric/mixin/client/mc/MixinMinecraftClientFabric.java
@@ -0,0 +1,23 @@
+package xaeroplus.fabric.mixin.client.mc;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import xaeroplus.fabric.util.compat.IncompatibleMinimapWarningScreen;
+
+@Mixin(Minecraft.class)
+public class MixinMinecraftClientFabric {
+    @Shadow
+    public Screen screen;
+
+    @Inject(method = "setScreen", at = @At("HEAD"), cancellable = true)
+    public void preventMinimapIncompatibleScreenFromClosing(final Screen guiScreen, final CallbackInfo ci) {
+        if (this.screen instanceof IncompatibleMinimapWarningScreen) {
+            ci.cancel();
+        }
+    }
+}
diff --git a/fabric/src/main/java/xaeroplus/fabric/util/compat/XaeroPlusCompatibleMinimapMixinPlugin.java b/fabric/src/main/java/xaeroplus/fabric/util/compat/XaeroPlusCompatibleMinimapMixinPlugin.java
index 4ed67e1a..d516bffa 100644
--- a/fabric/src/main/java/xaeroplus/fabric/util/compat/XaeroPlusCompatibleMinimapMixinPlugin.java
+++ b/fabric/src/main/java/xaeroplus/fabric/util/compat/XaeroPlusCompatibleMinimapMixinPlugin.java
@@ -38,7 +38,8 @@ public void onLoad(final String mixinPackage) {
             xaeroWorldMapSettingsMixins = Set.of(
                 "MixinWorldMap",
                 "MixinWorldMapModSettings",
-                "MixinWorldMapOption"
+                "MixinWorldMapOption",
+                "MixinMinecraftClientFabric" // Prevents incompatible screen from being closed
             );
         }
     }
diff --git a/fabric/src/main/resources/xaeroplus-fabric.mixins.json b/fabric/src/main/resources/xaeroplus-fabric.mixins.json
index 8fa3ec59..adf459d3 100644
--- a/fabric/src/main/resources/xaeroplus-fabric.mixins.json
+++ b/fabric/src/main/resources/xaeroplus-fabric.mixins.json
@@ -9,6 +9,7 @@
   "client": [
     "MixinBetterPVP",
     "MixinWorldMap",
-    "MixinXaeroMinimap"
+    "MixinXaeroMinimap",
+    "mc.MixinMinecraftClientFabric"
   ]
 }