Merge branch '1.21-multiloader' into 1.20.5-multiloader

This reverts commit 6c159d6aa2.

.gitignore

@@ -30,3 +30,4 @@ bin/
 
 .architectury-transformer/
 run/
+scripts/

buildSrc/src/main/groovy/multiloader-publish.gradle

@@ -3,12 +3,7 @@ plugins {
 }
 
 publishMods {
-    if (project.name == 'fabric')
-        file = remapJar.archiveFile
-    else if (project.name == 'neoforge')
-        file = jar.archiveFile
-    else
-        file = tasks.named('jarJar').get().archiveFile
+    file = project.layout.buildDirectory.file("libs/${project.archivesBaseName}-${project.version}.jar").map { it.asFile }.getOrNull()
 
     modLoaders.add(project.name)
     type = STABLE

common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java

@@ -6,17 +6,26 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.players.PlayerList;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Collections;
+import java.util.List;
 
 @Mixin(PlayerList.class)
 public abstract class PlayerListMixin {
     
+    @Shadow
+    public abstract List<ServerPlayer> getPlayers();
+    
+    @Shadow @Final
+    private MinecraftServer server;
+    
     @Inject(method = "remove", at = @At("TAIL"))
     private void remove(ServerPlayer player, CallbackInfo ci) {
         SkinRestorer.Events.onPlayerDisconnect(player);
@@ -24,14 +33,13 @@ public abstract class PlayerListMixin {
     
     @Inject(method = "removeAll", at = @At("HEAD"))
     private void removeAll(CallbackInfo ci) {
-        for (var player : ((PlayerList) (Object) this).getPlayers()) {
+        for (var player : getPlayers()) {
             SkinRestorer.Events.onPlayerDisconnect(player);
         }
     }
     
     @Inject(method = "placeNewPlayer", at = @At("HEAD"))
     private void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie, CallbackInfo ci) {
-        var server = ((PlayerList) (Object) this).getServer();
         var delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
         
         if (delay <= 0) {

common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java

@@ -1,13 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(ServerLoginPacketListenerImpl.class)
-public interface ServerLoginPacketListenerImplAccessorInvoker {
-    
-    @Accessor
-    GameProfile getAuthenticatedProfile();
-}

common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java

@@ -7,7 +7,9 @@ import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
 import net.lionarius.skinrestorer.util.PlayerUtils;
 import net.lionarius.skinrestorer.util.Result;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -18,6 +20,9 @@ import java.util.concurrent.CompletableFuture;
 @Mixin(ServerLoginPacketListenerImpl.class)
 public abstract class ServerLoginPacketListenerImplMixin {
     
+    @Shadow @Nullable
+    private GameProfile authenticatedProfile;
+    
     @Unique
     private CompletableFuture<Void> skinrestorer$pendingSkin;
     
@@ -27,7 +32,7 @@ public abstract class ServerLoginPacketListenerImplMixin {
     public void waitForSkin(CallbackInfo ci) {
         if (skinrestorer$pendingSkin == null) {
             skinrestorer$pendingSkin = CompletableFuture.supplyAsync(() -> {
-                final var profile = ((ServerLoginPacketListenerImplAccessorInvoker) this).getAuthenticatedProfile();
+                final var profile = authenticatedProfile;
                 
                 assert profile != null;
                 var originalSkin = PlayerUtils.getPlayerSkin(profile);

common/src/main/resources/skinrestorer.mixins.json

@@ -8,7 +8,6 @@
     "mixins": [
         "ChunkMapAccessor",
         "PlayerListMixin",
-        "ServerLoginPacketListenerImplAccessorInvoker",
         "ServerLoginPacketListenerImplMixin",
         "TrackedEntityAccessorInvoker"
     ],