Port to 1.21.4 and fix some inconsistencies

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.16.9
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.10
 
 # Mod Properties
 mod_version=1.0.0
 maven_group=com.rikaisan
 archives_base_name=respectworldspawn
 
 # Dependencies
-fabric_version=0.92.3+1.20.1
+fabric_version=0.115.1+1.21.4

src/main/java/com/rikaisan/RespectWorldSpawn.java

@@ -18,5 +18,6 @@ public class RespectWorldSpawn implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		LOGGER.info("Respecting YOUR spawn logic since 2025!");
+		LOGGER.info("Obligatory Meow!");
 	}
 }

src/main/java/com/rikaisan/mixin/ServerPlayerEntityMixin.java

@@ -0,0 +1,28 @@
+package com.rikaisan.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.rikaisan.RespectWorldSpawn;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.GameMode;
+import net.minecraft.world.SaveProperties;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ServerPlayerEntity.class)
+public abstract class ServerPlayerEntityMixin {
+
+	// No need to do much, Adventure mode already has this behaviour.
+	@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/SaveProperties;getGameMode()Lnet/minecraft/world/GameMode;"), method = "getWorldSpawnPos")
+	private GameMode getGameMode(SaveProperties instance, @Local(argsOnly = true) ServerWorld world) {
+		return world.getGameRules().getBoolean(RespectWorldSpawn.RESPECT_SPAWN_HEIGHT) ? GameMode.ADVENTURE : instance.getGameMode();
+	}
+
+	// Enforce the facing angle of newly joined players.
+	@ModifyArg(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;refreshPositionAndAngles(Lnet/minecraft/util/math/Vec3d;FF)V"), index = 1)
+	private float modifyAngle(float requestedYaw, @Local(argsOnly = true) ServerWorld world) {
+		return world.getGameRules().getBoolean(RespectWorldSpawn.RESPECT_SPAWN_ROTATION) ? world.getSpawnAngle() : requestedYaw;
+	}
+}

src/main/java/com/rikaisan/mixin/TeleportTargetMixin.java

@@ -0,0 +1,24 @@
+package com.rikaisan.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.rikaisan.RespectWorldSpawn;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.TeleportTarget;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(TeleportTarget.class)
+public class TeleportTargetMixin {
+    // Enforce world spawn angle when respawning using world spawn.
+    @ModifyArg(method = "<init>(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/world/TeleportTarget$PostDimensionTransition;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/TeleportTarget;<init>(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;FFZZLjava/util/Set;Lnet/minecraft/world/TeleportTarget$PostDimensionTransition;)V"), index = 3)
+    private static float enforceAngle(float requestedYaw, @Local(argsOnly = true) ServerWorld world) {
+        return world.getGameRules().getBoolean(RespectWorldSpawn.RESPECT_SPAWN_ROTATION) ? world.getSpawnAngle() : requestedYaw;
+    }
+
+    // Enforce world spawn angle when respawning from obstructed spawn.
+    @ModifyArg(method = "missingSpawnBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/TeleportTarget;<init>(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;FFZZLjava/util/Set;Lnet/minecraft/world/TeleportTarget$PostDimensionTransition;)V"), index = 3)
+    private static float obstructedEnforceAngle(float requestedYaw, @Local(argsOnly = true) ServerWorld world) {
+        return world.getGameRules().getBoolean(RespectWorldSpawn.RESPECT_SPAWN_ROTATION) ? world.getSpawnAngle() : requestedYaw;
+    }
+}

src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
 		"respectworldspawn.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.16.9",
-		"minecraft": "~1.20.1",
+		"fabricloader": ">=0.16.10",
+		"minecraft": "~1.21.4",
 		"java": ">=17",
 		"fabric-api": "*"
 	},

src/main/resources/respectworldspawn.mixins.json

@@ -3,7 +3,8 @@
   "package": "com.rikaisan.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "RespawnMixin"
+    "ServerPlayerEntityMixin",
+    "TeleportTargetMixin"
   ],
   "injectors": {
     "defaultRequire": 1