From 4cffdc3eb6f4b25b88d74620ef93a6d50fcce28c Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Tue, 23 Dec 2025 00:18:17 +0800 Subject: [PATCH] Fix crash on forge 1.20.4. (#360) --- .../customskinloader/fake/FakeSkinManager.java | 13 +------------ .../customskinloader/utils/LIFOBlockingQueue.java | 2 +- .../customskinloader/fabric/DevEnvRemapper.java | 2 +- Forge/V2/src/main/resources/transformers.js | 14 +++++++------- .../customskinloader/mixin/MixinSkinManager.java | 15 --------------- 5 files changed, 10 insertions(+), 36 deletions(-) diff --git a/Common/src/main/java/customskinloader/fake/FakeSkinManager.java b/Common/src/main/java/customskinloader/fake/FakeSkinManager.java index 1cc6e5e..e4676e9 100644 --- a/Common/src/main/java/customskinloader/fake/FakeSkinManager.java +++ b/Common/src/main/java/customskinloader/fake/FakeSkinManager.java @@ -52,17 +52,6 @@ public class FakeSkinManager { HttpTextureUtil.defaultCacheDir = skinCacheDirectory.toFile(); } - /** - * 23w42a ~ 25w33a - * Invoked from {@link SkinManager#getOrLoad(GameProfile)} - * - * 25w34a+ - * Invoked from {@link SkinManager#get(GameProfile)} - */ - public static Property createProperty(Property property) { - return property == null ? new Property(null, null) : property; - } - /** * 1.20.1- * Invoked from {@link SkinManager#loadSkin(MinecraftProfileTexture, MinecraftProfileTexture.Type, SkinManager$SkinAvailableCallback)} @@ -234,7 +223,7 @@ public class FakeSkinManager { * Invoked from {@link SkinManager#get(GameProfile)} */ public static SkinManager$CacheKey createFakeCacheKey(UUID uuid, Property property, GameProfile profile) { - return new FakeCacheKey(uuid, property, profile); + return new FakeCacheKey(uuid, property == null ? new Property(null, null) : property, profile); } public static Object createMinecraftProfileTextures(Map textures) { diff --git a/Common/src/main/java/customskinloader/utils/LIFOBlockingQueue.java b/Common/src/main/java/customskinloader/utils/LIFOBlockingQueue.java index d8f5be1..6f12225 100644 --- a/Common/src/main/java/customskinloader/utils/LIFOBlockingQueue.java +++ b/Common/src/main/java/customskinloader/utils/LIFOBlockingQueue.java @@ -47,4 +47,4 @@ public class LIFOBlockingQueue extends ForwardingBlockingQueue { public E peek() { return deque.peekFirst(); } -} \ No newline at end of file +} diff --git a/Fabric/src/main/java/customskinloader/fabric/DevEnvRemapper.java b/Fabric/src/main/java/customskinloader/fabric/DevEnvRemapper.java index 4f5f889..4131e9d 100644 --- a/Fabric/src/main/java/customskinloader/fabric/DevEnvRemapper.java +++ b/Fabric/src/main/java/customskinloader/fabric/DevEnvRemapper.java @@ -52,7 +52,7 @@ public class DevEnvRemapper extends SimpleRemapper { remappedClasses.put( "net.minecraft.class_3300", new AbstractMap.SimpleEntry<>( - Lists.newArrayList("customskinloader.fake.itf.IFakeIResourceManager"), + Lists.newArrayList("customskinloader.fake.itf.IFakeIResourceManager$V1", "customskinloader.fake.itf.IFakeIResourceManager$V2"), Lists.newArrayList("customskinloader.fake.itf.FakeInterfaceManager") ) ); diff --git a/Forge/V2/src/main/resources/transformers.js b/Forge/V2/src/main/resources/transformers.js index deaebb6..46bdadd 100644 --- a/Forge/V2/src/main/resources/transformers.js +++ b/Forge/V2/src/main/resources/transformers.js @@ -49,8 +49,6 @@ function initializeCoreMod() { if (node.getOpcode() === Opcodes.RETURN) { mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 2)); mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "setSkinCacheDir", "(Ljava/nio/file/Path;)V", false)); - } else if (node.getOpcode() === Opcodes.INVOKEVIRTUAL && node.owner.equals("com/google/common/cache/CacheBuilder") && checkName(node.name, "build") && node.desc.equals("(Lcom/google/common/cache/CacheLoader;)Lcom/google/common/cache/LoadingCache;")) { - mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "setCacheLoader", "(Lcom/google/common/cache/CacheLoader;)Lcom/google/common/cache/CacheLoader;", false)); } } } else if (checkName(mn.name, "m_118828_") && mn.desc.equals("(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinTextureCallback;)Lnet/minecraft/resources/ResourceLocation;")) { // 1.20.1- @@ -120,11 +118,13 @@ function initializeCoreMod() { } else if (checkName(mn.name, "m_293351_") && mn.desc.equals("(Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture;")) { // 1.20.2+ for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); - if (node.getOpcode() === Opcodes.INVOKESPECIAL && node.owner.equals("net/minecraft/client/resources/SkinManager$CacheKey") && checkName(node.name, "") && node.desc.equals("(Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V")) { - mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "createProperty", "(Lcom/mojang/authlib/properties/Property;)Lcom/mojang/authlib/properties/Property;", false)); - } else if (node.getOpcode() === Opcodes.INVOKEINTERFACE && node.owner.equals("com/google/common/cache/LoadingCache") && checkName(node.name, "getUnchecked") && node.desc.equals("(Ljava/lang/Object;)Ljava/lang/Object;")) { + if (node.getOpcode() === Opcodes.NEW && node.desc.equals("net/minecraft/client/resources/SkinManager$CacheKey")) { + iterator.remove(); + iterator.next(); // DUP + iterator.remove(); + } else if (node.getOpcode() === Opcodes.INVOKESPECIAL && node.owner.equals("net/minecraft/client/resources/SkinManager$CacheKey") && checkName(node.name, "") && node.desc.equals("(Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V")) { mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 1)); - mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "loadCache", "(Ljava/lang/Object;Lcom/mojang/authlib/GameProfile;)Ljava/lang/Object;", false)); + mn.instructions.set(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager$FakeCacheKey", "createFakeCacheKey", "(Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/client/resources/SkinManager$CacheKey;", false)); } } } @@ -163,7 +163,7 @@ function initializeCoreMod() { for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); if (node.getOpcode() === Opcodes.INVOKEINTERFACE && node.owner.equals("com/mojang/authlib/minecraft/MinecraftSessionService") && checkName(node.name, "unpackTextures") && node.desc.equals("(Lcom/mojang/authlib/properties/Property;)Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;")) { - mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 1)); + mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 0)); mn.instructions.insert(node, new TypeInsnNode(Opcodes.CHECKCAST, "com/mojang/authlib/minecraft/MinecraftProfileTextures")); mn.instructions.set(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "loadSkinFromCache", "(Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/properties/Property;Lnet/minecraft/client/resources/SkinManager$CacheKey;)Ljava/lang/Object;", false)); } diff --git a/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager.java index 157131c..9e9e8a0 100644 --- a/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager.java +++ b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager.java @@ -22,7 +22,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.Group; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyArgs; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -242,20 +241,6 @@ public abstract class MixinSkinManager { // 23w42a+ @Mixin(SkinManager.class) public abstract static class V3 { - @ModifyArg( - method = { - "Lnet/minecraft/client/resources/SkinManager;getOrLoad(Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture;", // 23w42a ~ 25w33a - "Lnet/minecraft/client/resources/SkinManager;get(Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture;" // 25w34a+ - }, - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/resources/SkinManager$CacheKey;(Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V" - ) - ) - private Property modifyArg_getOrLoad(Property property) { - return FakeSkinManager.createProperty(property); - } - @Redirect( method = { "Lnet/minecraft/client/resources/SkinManager;getOrLoad(Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture;", // 23w42a ~ 25w33a