lionarius/SkinRestorer
1
0
Fork 0
mirror of https://github.com/Suiranoil/SkinRestorer.git synced 2026-01-16 04:42:12 +00:00
Code Wiki Activity

Revert "remove shadow from ServerLoginPacketListenerImplMixin"

Browse Source 
This reverts commit 5b384c32d6.
This commit is contained in:
Lionarius
2025-06-01 18:24:22 +03:00
parent 38a2fd7214
commit 3b15f7b341
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
View File

@@ -16,7 +16,6 @@ import java.util.Collections;
@Mixin(PlayerList.class) @Mixin(PlayerList.class)
public abstract class PlayerListMixin { public abstract class PlayerListMixin {
@Inject(method = "remove", at = @At("TAIL")) @Inject(method = "remove", at = @At("TAIL"))
private void remove(ServerPlayer player, CallbackInfo ci) { private void remove(ServerPlayer player, CallbackInfo ci) {
SkinRestorer.Events.onPlayerDisconnect(player); SkinRestorer.Events.onPlayerDisconnect(player);

13
common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
View File

@@ -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();
}

7
common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
View File

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

1
common/src/main/resources/skinrestorer.mixins.json
View File

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