Mixin to PlayerManager#onConnect instead of using ServerPlayConnectio…

…nEvents.JOIN

Should fix displaynames being inaccurate on player join?

Signed-off-by: unilock <[email protected]>

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.4+build.3
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=2.3.0
+mod_version=2.3.1
 maven_group=cc.unilock.nilcord
 archives_base_name=nilcord
 

src/main/java/cc/unilock/nilcord/NilcordPremain.java

@@ -39,9 +39,9 @@ public void onInitialize() {
         ServerMessageEvents.CHAT_MESSAGE.register((message, sender, params) -> {
             listener.playerChatMessage(sender, message.getContent());
         });
-        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
-            listener.playerJoin(handler.getPlayer());
-        });
+//        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
+//            listener.playerJoin(handler.getPlayer());
+//        });
         ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
             listener.playerLeave(handler.getPlayer());
         });

src/main/java/cc/unilock/nilcord/mixin/PlayerManagerMixin.java

@@ -0,0 +1,19 @@
+package cc.unilock.nilcord.mixin;
+
+import cc.unilock.nilcord.NilcordPremain;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayerEntity;
+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;
+
+@Mixin(PlayerManager.class)
+public class PlayerManagerMixin {
+    @Inject(method = "onPlayerConnect", at = @At("TAIL"))
+    private void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
+        NilcordPremain.listener.playerJoin(player);
+    }
+}

src/main/resources/nilcord.mixins.json

@@ -3,7 +3,8 @@
 	"package": "cc.unilock.nilcord.mixin",
 	"compatibilityLevel": "JAVA_17",
 	"mixins": [
-		"PlayerAdvancementTrackerMixin"
+		"PlayerAdvancementTrackerMixin",
+		"PlayerManagerMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1