From 3b15f7b3416544d0749bf28fed8711df02482ba4 Mon Sep 17 00:00:00 2001
From: Lionarius <git@lionarius.ru>
Date: Sun, 1 Jun 2025 18:24:22 +0300
Subject: [PATCH] Revert "remove shadow from
 ServerLoginPacketListenerImplMixin"

This reverts commit 5b384c32d6cb3b075876d21544087fa6926b0a38.
---
 .../skinrestorer/mixin/PlayerListMixin.java         |  1 -
 ...erverLoginPacketListenerImplAccessorInvoker.java | 13 -------------
 .../mixin/ServerLoginPacketListenerImplMixin.java   |  7 ++++++-
 common/src/main/resources/skinrestorer.mixins.json  |  1 -
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java

diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
index 92982ab..6f49c96 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
@@ -16,7 +16,6 @@ import java.util.Collections;
 
 @Mixin(PlayerList.class)
 public abstract class PlayerListMixin {
-    
     @Inject(method = "remove", at = @At("TAIL"))
     private void remove(ServerPlayer player, CallbackInfo ci) {
         SkinRestorer.Events.onPlayerDisconnect(player);
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
deleted file mode 100644
index aab07c3..0000000
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
+++ /dev/null
@@ -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();
-}
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
index 5ce9df9..28e588e 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
+++ b/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);
diff --git a/common/src/main/resources/skinrestorer.mixins.json b/common/src/main/resources/skinrestorer.mixins.json
index 939d827..224662d 100644
--- a/common/src/main/resources/skinrestorer.mixins.json
+++ b/common/src/main/resources/skinrestorer.mixins.json
@@ -8,7 +8,6 @@
     "mixins": [
         "ChunkMapAccessor",
         "PlayerListMixin",
-        "ServerLoginPacketListenerImplAccessorInvoker",
         "ServerLoginPacketListenerImplMixin",
         "TrackedEntityAccessorInvoker"
     ],