23w31a fixes

Author: tildejustin

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'fabric-loom' version '1.3-SNAPSHOT'
-	id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
+	id 'io.github.juuxel.loom-vineflower' version '1.11.0'
 	id 'org.ajoberstar.grgit' version '4.1.0'
 }
 

gradle.properties

@@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/develop
 mod_id=setspawnmod
 target_version=1.19-1.20
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.9
-loader_version=0.14.21
+minecraft_version=23w31a
+yarn_mappings=23w31a+build.4
+loader_version=0.14.22

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/set/spawn/mod/mixin/PlayerManagerMixin.java

@@ -1,25 +1,29 @@
 package net.set.spawn.mod.mixin;
 
-import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import net.set.spawn.mod.SetSpawn;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(PlayerManager.class)
 public class PlayerManagerMixin {
-
-    @Inject(method = "onPlayerConnect", at = @At("TAIL"))
-    public void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) {
+    @Redirect(
+            method = {
+                    "Lnet/minecraft/server/PlayerManager;onPlayerConnect(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;)V",
+                    "Lnet/minecraft/server/PlayerManager;onPlayerConnect(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;I)V"
+            },
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;onSpawn()V"),
+            require = 0
+    )
+    private void onPlayerConnect(ServerPlayerEntity player) {
+        player.onSpawn();
         if (SetSpawn.shouldSendErrorMessage) {
             Text message = Text.of("§c" + SetSpawn.errorMessage + " This run is not verifiable.");
             player.sendMessage(message, false);
         }
         SetSpawn.shouldSendErrorMessage = false;
     }
-
 }