Merge branch '1.20.1' into 1.19.4

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();
+        }
+    }
+}

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
             );
         }
     }

fabric/src/main/resources/xaeroplus-fabric.mixins.json

@@ -9,6 +9,7 @@
   "client": [
     "MixinBetterPVP",
     "MixinWorldMap",
-    "MixinXaeroMinimap"
+    "MixinXaeroMinimap",
+    "mc.MixinMinecraftClientFabric"
   ]
 }