Merge branch '1.21.5' into 1.21.8

Author: rfresh2

fabric/src/gametest/java/xaeroplus/fabric/gametest/mixin/client/MixinClientGameTestImpl.java

@@ -0,0 +1,18 @@
+package xaeroplus.fabric.gametest.mixin.client;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.fabricmc.fabric.impl.client.gametest.util.ClientGameTestImpl;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ClientGameTestImpl.class)
+public class MixinClientGameTestImpl {
+
+    @ModifyExpressionValue(method = "waitForWorldLoad",
+        at = @At(
+            value = "CONSTANT",
+            args = "intValue=1200"))
+    private static int customMaxWaitTime(final int original) {
+        return 20 * 600;
+    }
+}

fabric/src/gametest/resources/fabric.mod.json

@@ -8,5 +8,8 @@
     "fabric-client-gametest": [
       "xaeroplus.fabric.gametest.XaeroPlusClientGameTest"
     ]
-  }
+  },
+  "mixins": [
+    "gametest.mixins.json"
+  ]
 }

fabric/src/gametest/resources/gametest.mixins.json

@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "package": "xaeroplus.fabric.gametest.mixin.client",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "client": [
+    "MixinClientGameTestImpl"
+  ]
+}