From 7aea11badd887ab99b9f596a16b513ed5671ac42 Mon Sep 17 00:00:00 2001
From: tildejustin <spacepepper3.14@gmail.com>
Date: Tue, 3 Dec 2024 17:07:50 -0500
Subject: [PATCH] 1.21.2+ fix?

---
 {1.19-1.21 => 1.19-1.21.4}/build.gradle             |   0
 {1.19-1.21 => 1.19-1.21.4}/gradle.properties        |   0
 .../set/spawn/mod/mixin/MinecraftServerMixin.java   |   0
 .../spawn/mod/mixin/ServerPlayerEntityMixin.java    |   9 ++++++++-
 .../src/main/resources/assets/setspawnmod/icon.png  | Bin
 .../src/main/resources/fabric.mod.json              |   0
 .../src/main/resources/setspawnmod.mixins.json      |   0
 settings.gradle                                     |   2 +-
 8 files changed, 9 insertions(+), 2 deletions(-)
 rename {1.19-1.21 => 1.19-1.21.4}/build.gradle (100%)
 rename {1.19-1.21 => 1.19-1.21.4}/gradle.properties (100%)
 rename {1.19-1.21 => 1.19-1.21.4}/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java (100%)
 rename {1.19-1.21 => 1.19-1.21.4}/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java (91%)
 rename {1.19-1.21 => 1.19-1.21.4}/src/main/resources/assets/setspawnmod/icon.png (100%)
 rename {1.19-1.21 => 1.19-1.21.4}/src/main/resources/fabric.mod.json (100%)
 rename {1.19-1.21 => 1.19-1.21.4}/src/main/resources/setspawnmod.mixins.json (100%)

diff --git a/1.19-1.21/build.gradle b/1.19-1.21.4/build.gradle
similarity index 100%
rename from 1.19-1.21/build.gradle
rename to 1.19-1.21.4/build.gradle
diff --git a/1.19-1.21/gradle.properties b/1.19-1.21.4/gradle.properties
similarity index 100%
rename from 1.19-1.21/gradle.properties
rename to 1.19-1.21.4/gradle.properties
diff --git a/1.19-1.21/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java b/1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java
similarity index 100%
rename from 1.19-1.21/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java
rename to 1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java
diff --git a/1.19-1.21/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java b/1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java
similarity index 91%
rename from 1.19-1.21/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java
rename to 1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java
index eb82d40..4400d35 100644
--- a/1.19-1.21/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java
+++ b/1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java
@@ -88,7 +88,14 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
 
     @Group
     @Dynamic
-    @Inject(method = "method_14245(Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_3218;method_8587(Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z", ordinal = 1), require = 0)
+    @Inject(
+            method = "method_14245(Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;",
+            at = {
+                    @At(value = "INVOKE", target = "Lnet/minecraft/class_3218;method_8587(Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z", ordinal = 1),
+                    @At(value = "INVOKE", target = "Lnet/minecraft/class_3222;method_61274(Lnet/minecraft/class_3218;Lnet/minecraft/class_238;)Z", ordinal = 1)
+            },
+            require = 0, allow = 1
+    )
     private void failOnNonRandomSpawns2(CallbackInfoReturnable<Boolean> cir, @Share("seed") LocalRef<Seed> seed, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {
         if (!isRandomSpawn.get() && seed.get() != null) {
             this.setSpawnError = "Failed to apply SetSpawn configuration because the spawn was not random. Not overriding player spawnpoint.";
diff --git a/1.19-1.21/src/main/resources/assets/setspawnmod/icon.png b/1.19-1.21.4/src/main/resources/assets/setspawnmod/icon.png
similarity index 100%
rename from 1.19-1.21/src/main/resources/assets/setspawnmod/icon.png
rename to 1.19-1.21.4/src/main/resources/assets/setspawnmod/icon.png
diff --git a/1.19-1.21/src/main/resources/fabric.mod.json b/1.19-1.21.4/src/main/resources/fabric.mod.json
similarity index 100%
rename from 1.19-1.21/src/main/resources/fabric.mod.json
rename to 1.19-1.21.4/src/main/resources/fabric.mod.json
diff --git a/1.19-1.21/src/main/resources/setspawnmod.mixins.json b/1.19-1.21.4/src/main/resources/setspawnmod.mixins.json
similarity index 100%
rename from 1.19-1.21/src/main/resources/setspawnmod.mixins.json
rename to 1.19-1.21.4/src/main/resources/setspawnmod.mixins.json
diff --git a/settings.gradle b/settings.gradle
index 5688d2d..32b79c6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,4 +18,4 @@ include "1.12"
 include "1.8-1.12.2"
 include "1.13.x"
 include "1.14-1.18.2"
-include "1.19-1.21"
+include "1.19-1.21.4"