From 958860ecce1fc8695cbf82fc25ae654170729582 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Fri, 24 Jan 2020 16:56:26 +0800 Subject: [PATCH] Support Forge & Fabric 1.15.2 (#78) * Increase compatible Java version to 8. * Support Forge & Fabric 1.15.2 --- .../fake/FakeClientPlayer.java | 4 - .../customskinloader/fake/FakeSkinBuffer.java | 20 ++--- .../fake/FakeSkinManager.java | 14 ++-- .../fake/itf/IFakeMinecraft.java | 17 ++++ .../fake/itf/IFakeTextureManager_1.java | 16 ++++ .../fake/itf/IFakeTextureManager_2.java | 10 +++ .../client/renderer/IImageBuffer.java | 5 ++ .../client/renderer/texture/Texture.java | 5 ++ Fabric/Fabric.srg | 5 ++ Fabric/build.gradle | 4 +- Fabric/build.properties | 2 +- Fabric/resource/mixins.customskinloader.json | 6 +- .../fabric/MixinConfigPlugin.java | 61 --------------- .../fabric/mixin/MixinFakeSkinManager.java | 11 --- .../fabric/mixin/MixinMinecraft.java | 11 +-- .../fabric/mixin/MixinSkinManager.java | 6 -- .../fabric/mixin/MixinTextureManager.java | 23 ++++++ .../mixin/MixinThreadDownloadImageData.java | 23 ++++++ Forge/build.gradle | 4 +- Forge/build.properties | 4 +- Forge/resource/transformers.js | 77 ++++++++----------- .../forge/TransformerManager.java | 77 ++++++++++++++----- .../forge/loader/LaunchWrapper.java | 37 ++++++--- .../FakeInterfacesTransformer.java | 50 ++++++++++++ .../client/resources/SkinManager.java | 11 +-- common.gradle | 4 +- 26 files changed, 311 insertions(+), 196 deletions(-) create mode 100644 Common/source/customskinloader/fake/itf/IFakeMinecraft.java create mode 100644 Common/source/customskinloader/fake/itf/IFakeTextureManager_1.java create mode 100644 Common/source/customskinloader/fake/itf/IFakeTextureManager_2.java create mode 100644 Common/source/net/minecraft/client/renderer/texture/Texture.java delete mode 100644 Fabric/source/customskinloader/fabric/MixinConfigPlugin.java delete mode 100644 Fabric/source/customskinloader/fabric/mixin/MixinFakeSkinManager.java create mode 100644 Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java create mode 100644 Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java create mode 100644 Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java diff --git a/Common/source/customskinloader/fake/FakeClientPlayer.java b/Common/source/customskinloader/fake/FakeClientPlayer.java index 2af5bab..f24d61e 100644 --- a/Common/source/customskinloader/fake/FakeClientPlayer.java +++ b/Common/source/customskinloader/fake/FakeClientPlayer.java @@ -85,9 +85,5 @@ public class FakeClientPlayer { CustomSkinLoader.logger.debug("Legacy Texture (" + resourceLocationIn + ") Loaded as " + ito.toString() + " (" + location + ")"); } - - public void onSkinTextureAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) { - this.skinAvailable(typeIn, location, profileTexture); - } } } diff --git a/Common/source/customskinloader/fake/FakeSkinBuffer.java b/Common/source/customskinloader/fake/FakeSkinBuffer.java index 62e65d0..fb06733 100644 --- a/Common/source/customskinloader/fake/FakeSkinBuffer.java +++ b/Common/source/customskinloader/fake/FakeSkinBuffer.java @@ -1,19 +1,25 @@ package customskinloader.fake; +import java.awt.image.BufferedImage; + import customskinloader.CustomSkinLoader; import customskinloader.fake.texture.FakeBufferedImage; import customskinloader.fake.texture.FakeImage; import customskinloader.fake.texture.FakeNativeImage; +import net.minecraft.client.renderer.IImageBuffer; +import net.minecraft.client.renderer.texture.NativeImage; -import java.awt.image.BufferedImage; - -public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffer { - +public class FakeSkinBuffer implements IImageBuffer { private int ratio = 1; private FakeImage image = null; + //parseUserSkin for 1.15+ + public static NativeImage processLegacySkin(NativeImage image) { + return new FakeSkinBuffer().func_195786_a(image); + } + //parseUserSkin for 1.13+ - public net.minecraft.client.renderer.texture.NativeImage func_195786_a(net.minecraft.client.renderer.texture.NativeImage image) { + public NativeImage func_195786_a(NativeImage image) { if (image == null) return null; @@ -145,10 +151,6 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe //A callback when skin loaded, nothing to do } - public void run() { - this.skinAvailable(); - } - private static int getARGB(int a, int r, int g, int b) { return (a << 24) | (r << 16) | (g << 8) | b; } diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/source/customskinloader/fake/FakeSkinManager.java index 606c431..0ccd42a 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/source/customskinloader/fake/FakeSkinManager.java @@ -14,12 +14,16 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.minecraft.MinecraftSessionService; import customskinloader.CustomSkinLoader; +import customskinloader.fake.itf.IFakeMinecraft; +import customskinloader.fake.itf.IFakeTextureManager_1; +import customskinloader.fake.itf.IFakeTextureManager_2; import customskinloader.utils.HttpTextureUtil; import customskinloader.utils.HttpTextureUtil.HttpTextureInfo; import customskinloader.utils.MinecraftUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.texture.SimpleTexture; +import net.minecraft.client.renderer.texture.Texture; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.SkinManager.SkinAvailableCallback; @@ -46,13 +50,13 @@ public class FakeSkinManager { final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash); - if (this.textureManager.getTexture(resourcelocation) != null)//Have already loaded + if (((IFakeTextureManager_1) this.textureManager).func_229267_b_(resourcelocation) != null)//Have already loaded makeCallback(skinAvailableCallback, textureType, resourcelocation, profileTexture); else { SimpleTexture threaddownloadimagedata = MinecraftUtil.createThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new BaseBuffer(skinAvailableCallback, textureType, resourcelocation, profileTexture), textureType); if (skinAvailableCallback instanceof FakeClientPlayer.LegacyBuffer)//Cache for client player FakeClientPlayer.textureCache.put(resourcelocation, threaddownloadimagedata); - this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata); + ((IFakeTextureManager_2) this.textureManager).func_229263_a_(resourcelocation, (Texture) threaddownloadimagedata); } return resourcelocation; } @@ -63,7 +67,7 @@ public class FakeSkinManager { final Map map = Maps.newHashMap(); map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - Minecraft.getMinecraft().addScheduledTask(new Runnable() { + ((IFakeMinecraft) Minecraft.getMinecraft()).execute(new Runnable() { public void run() { for (Type type : Type.values()) { if (map.containsKey(type)) { @@ -124,9 +128,5 @@ public class FakeSkinManager { FakeSkinManager.makeCallback(callback, type, location, texture); } - - public void run() { - this.skinAvailable(); - } } } diff --git a/Common/source/customskinloader/fake/itf/IFakeMinecraft.java b/Common/source/customskinloader/fake/itf/IFakeMinecraft.java new file mode 100644 index 0000000..b54ac81 --- /dev/null +++ b/Common/source/customskinloader/fake/itf/IFakeMinecraft.java @@ -0,0 +1,17 @@ +package customskinloader.fake.itf; + +import java.util.concurrent.Executor; + +import com.google.common.util.concurrent.ListenableFuture; + +public interface IFakeMinecraft extends Executor { + default ListenableFuture func_152344_a(Runnable runnable) { + this.execute(runnable); + return null; + } + + @Override + default void execute(Runnable runnable) { + this.func_152344_a(runnable); + } +} diff --git a/Common/source/customskinloader/fake/itf/IFakeTextureManager_1.java b/Common/source/customskinloader/fake/itf/IFakeTextureManager_1.java new file mode 100644 index 0000000..095c2ad --- /dev/null +++ b/Common/source/customskinloader/fake/itf/IFakeTextureManager_1.java @@ -0,0 +1,16 @@ +package customskinloader.fake.itf; + +import net.minecraft.client.renderer.texture.ITextureObject; +import net.minecraft.client.renderer.texture.Texture; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +public interface IFakeTextureManager_1 { + default boolean func_229263_a_(ResourceLocation textureLocation, Texture textureObj) { + return ((TextureManager) this).loadTexture(textureLocation, (ITextureObject) textureObj); + } + + default Texture func_229267_b_(ResourceLocation textureLocation) { + return (Texture) ((TextureManager) this).getTexture(textureLocation); + } +} diff --git a/Common/source/customskinloader/fake/itf/IFakeTextureManager_2.java b/Common/source/customskinloader/fake/itf/IFakeTextureManager_2.java new file mode 100644 index 0000000..bed8ab8 --- /dev/null +++ b/Common/source/customskinloader/fake/itf/IFakeTextureManager_2.java @@ -0,0 +1,10 @@ +package customskinloader.fake.itf; + +import net.minecraft.client.renderer.texture.Texture; +import net.minecraft.util.ResourceLocation; + +public interface IFakeTextureManager_2 { + default void func_229263_a_(ResourceLocation textureLocation, Texture textureObj) { + ((IFakeTextureManager_1) this).func_229263_a_(textureLocation, textureObj); + } +} diff --git a/Common/source/net/minecraft/client/renderer/IImageBuffer.java b/Common/source/net/minecraft/client/renderer/IImageBuffer.java index 1115c12..626f2d5 100644 --- a/Common/source/net/minecraft/client/renderer/IImageBuffer.java +++ b/Common/source/net/minecraft/client/renderer/IImageBuffer.java @@ -10,4 +10,9 @@ public interface IImageBuffer extends Runnable { NativeImage func_195786_a(NativeImage image); void skinAvailable(); + + @Override + default void run() { + this.skinAvailable(); + } } diff --git a/Common/source/net/minecraft/client/renderer/texture/Texture.java b/Common/source/net/minecraft/client/renderer/texture/Texture.java new file mode 100644 index 0000000..19baa19 --- /dev/null +++ b/Common/source/net/minecraft/client/renderer/texture/Texture.java @@ -0,0 +1,5 @@ +package net.minecraft.client.renderer.texture; + +// exclude +public interface Texture { +} diff --git a/Fabric/Fabric.srg b/Fabric/Fabric.srg index f998596..d6770b3 100644 --- a/Fabric/Fabric.srg +++ b/Fabric/Fabric.srg @@ -6,6 +6,7 @@ CL: net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/class_10 CL: net/minecraft/client/renderer/texture/ITextureObject net/minecraft/class_1062 CL: net/minecraft/client/renderer/texture/NativeImage net/minecraft/class_1011 CL: net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/class_1049 +CL: net/minecraft/client/renderer/texture/Texture net/minecraft/class_1044 CL: net/minecraft/client/renderer/texture/TextureManager net/minecraft/class_1060 CL: net/minecraft/client/resources/DefaultPlayerSkin net/minecraft/class_1068 CL: net/minecraft/client/resources/SkinManager net/minecraft/class_1071 @@ -17,6 +18,9 @@ CL: net/minecraft/util/Session net/minecraft/class_320 CL: net/minecraft/util/StringUtils net/minecraft/class_3544 FD: net/minecraft/client/Minecraft/field_71412_D net/minecraft/class_310/field_1697 FD: net/minecraft/client/multiplayer/ServerData/field_78845_b net/minecraft/class_642/field_3761 +MD: customskinloader/fake/itf/IFakeTextureManager_1/func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Z customskinloader/fake/itf/IFakeTextureManager_1/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Z +MD: customskinloader/fake/itf/IFakeTextureManager_1/func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/Texture; net/minecraft/class_1060/method_4619 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1044; +MD: customskinloader/fake/itf/IFakeTextureManager_2/func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V customskinloader/fake/itf/IFakeTextureManager_1/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V MD: net/minecraft/client/gui/GuiPlayerTabOverlay/func_175249_a (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V MD: net/minecraft/client/Minecraft/func_110432_I ()Lnet/minecraft/util/Session; net/minecraft/class_310/method_1548 ()Lnet/minecraft/class_320; @@ -29,6 +33,7 @@ MD: net/minecraft/client/Minecraft/func_71410_x ()Lnet/minecraft/client/Minecraf MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z net/minecraft/class_310/method_1542 ()Z MD: net/minecraft/client/renderer/IImageBuffer/func_152634_a ()V net/minecraft/class_760/method_3238 ()V MD: net/minecraft/client/renderer/IImageBuffer/func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_760/method_3237 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; +MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_1046/method_22798 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; MD: net/minecraft/client/renderer/texture/NativeImage/func_195699_a (IIIIIIZZ)V net/minecraft/class_1011/method_4304 (IIIIIIZZ)V MD: net/minecraft/client/renderer/texture/NativeImage/func_195700_a (III)V net/minecraft/class_1011/method_4305 (III)V MD: net/minecraft/client/renderer/texture/NativeImage/func_195702_a ()I net/minecraft/class_1011/method_4307 ()I diff --git a/Fabric/build.gradle b/Fabric/build.gradle index b11cebb..aaf8501 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -14,9 +14,9 @@ group = "customskinloader" archivesBaseName = "CustomSkinLoader_Fabric" ext.shortVersion = getShortVersion() -sourceCompatibility = targetCompatibility = 1.6 +sourceCompatibility = targetCompatibility = 1.8 compileJava { - sourceCompatibility = targetCompatibility = 1.6 + sourceCompatibility = targetCompatibility = 1.8 } minecraft { diff --git a/Fabric/build.properties b/Fabric/build.properties index ecb228c..16d11fb 100644 --- a/Fabric/build.properties +++ b/Fabric/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.14 -minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4 +minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Fabric/resource/mixins.customskinloader.json b/Fabric/resource/mixins.customskinloader.json index c1a1c47..2c0f679 100644 --- a/Fabric/resource/mixins.customskinloader.json +++ b/Fabric/resource/mixins.customskinloader.json @@ -2,13 +2,13 @@ "compatibilityLevel": "JAVA_8", "package": "customskinloader.fabric.mixin", "client": [ - "MixinFakeSkinManager", "MixinGuiPlayerTabOverlay", "MixinMinecraft", - "MixinSkinManager" + "MixinSkinManager", + "MixinTextureManager", + "MixinThreadDownloadImageData" ], "refmap": "mixins.customskinloader.refmap.json", - "plugin": "customskinloader.fabric.MixinConfigPlugin", "injectors": { "defaultRequire": 1 } diff --git a/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java b/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java deleted file mode 100644 index 0057f14..0000000 --- a/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java +++ /dev/null @@ -1,61 +0,0 @@ -package customskinloader.fabric; - -import java.util.List; -import java.util.Set; - -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -public class MixinConfigPlugin implements IMixinConfigPlugin { - public static boolean hasITextureObject = true; - - @Override - public void onLoad(String mixinPackage) { - - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - if (!hasITextureObject && targetClassName.equals("customskinloader.fake.FakeSkinManager")) { - for (MethodNode mn : targetClass.methods) { - if (mn.name.equals("loadSkin") && mn.desc.equals("(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960;")) { - for (AbstractInsnNode ain : mn.instructions.toArray()) { - if (ain instanceof MethodInsnNode) { - MethodInsnNode min = (MethodInsnNode) ain; - min.desc = min.desc.replace("Lnet/minecraft/class_1062;", "Lnet/minecraft/class_1044;"); - } - } - } - } - } - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } -} diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinFakeSkinManager.java b/Fabric/source/customskinloader/fabric/mixin/MixinFakeSkinManager.java deleted file mode 100644 index ac0c643..0000000 --- a/Fabric/source/customskinloader/fabric/mixin/MixinFakeSkinManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package customskinloader.fabric.mixin; - -import customskinloader.fake.FakeSkinManager; -import org.spongepowered.asm.mixin.Mixin; - -/** - * @see customskinloader.fabric.MixinConfigPlugin#preApply - */ -@Mixin(FakeSkinManager.class) -public abstract class MixinFakeSkinManager { -} diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java b/Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java index 7fd5751..e5dac4b 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java +++ b/Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java @@ -1,15 +1,10 @@ package customskinloader.fabric.mixin; -import java.util.concurrent.Executor; - -import com.google.common.util.concurrent.ListenableFuture; +import customskinloader.fake.itf.IFakeMinecraft; import net.minecraft.client.Minecraft; import org.spongepowered.asm.mixin.Mixin; @Mixin(Minecraft.class) -public abstract class MixinMinecraft implements Executor { - public ListenableFuture func_152344_a(Runnable runnable) { - this.execute(runnable); - return null; - } +public abstract class MixinMinecraft implements IFakeMinecraft { + } diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java b/Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java index 1a69551..13f1793 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java +++ b/Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java @@ -6,7 +6,6 @@ import java.util.Map; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftSessionService; -import customskinloader.fabric.MixinConfigPlugin; import customskinloader.fake.FakeSkinManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.SkinManager; @@ -26,11 +25,6 @@ public abstract class MixinSkinManager { at = @At("RETURN") ) private void inject_init(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService, CallbackInfo callbackInfo) { - try { - Class.forName("net.minecraft.class_1062", false, SkinManager.class.getClassLoader()); // net.minecraft.client.texture.Texture - } catch (ClassNotFoundException e) { - MixinConfigPlugin.hasITextureObject = false; - } this.fakeManager = new FakeSkinManager(textureManagerInstance, skinCacheDirectory, sessionService); } diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java b/Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java new file mode 100644 index 0000000..de95454 --- /dev/null +++ b/Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java @@ -0,0 +1,23 @@ +package customskinloader.fabric.mixin; + +import customskinloader.fake.itf.IFakeTextureManager_1; +import customskinloader.fake.itf.IFakeTextureManager_2; +import net.minecraft.client.renderer.texture.TextureManager; +import org.spongepowered.asm.mixin.Implements; +import org.spongepowered.asm.mixin.Interface; +import org.spongepowered.asm.mixin.Mixin; + +@Implements({ + @Interface( + iface = IFakeTextureManager_1.class, + prefix = "fake1$" + ), + @Interface( + iface = IFakeTextureManager_2.class, + prefix = "fake2$" + ), +}) +@Mixin(TextureManager.class) +public abstract class MixinTextureManager { + +} diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java b/Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java new file mode 100644 index 0000000..b4262f8 --- /dev/null +++ b/Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java @@ -0,0 +1,23 @@ +package customskinloader.fabric.mixin; + +import customskinloader.fake.FakeSkinBuffer; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import net.minecraft.client.renderer.texture.NativeImage; +import org.spongepowered.asm.mixin.Dynamic; +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.CallbackInfoReturnable; + +@Mixin(ThreadDownloadImageData.class) +public class MixinThreadDownloadImageData { + @Dynamic + @Inject( + method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;", + at = @At("HEAD"), + cancellable = true + ) + private static void inject_processLegacySkin(NativeImage image, CallbackInfoReturnable callbackInfoReturnable) { + callbackInfoReturnable.setReturnValue(FakeSkinBuffer.processLegacySkin(image)); + } +} diff --git a/Forge/build.gradle b/Forge/build.gradle index 8ebd35d..6d971d8 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -25,9 +25,9 @@ archivesBaseName = "CustomSkinLoader_Forge" version = getCSLVersion() group = "customskinloader" -sourceCompatibility = targetCompatibility = 1.6 +sourceCompatibility = targetCompatibility = 1.8 compileJava { - sourceCompatibility = targetCompatibility = 1.6 + sourceCompatibility = targetCompatibility = 1.8 } jar { manifest { diff --git a/Forge/build.properties b/Forge/build.properties index d72e2dd..728d5b0 100644 --- a/Forge/build.properties +++ b/Forge/build.properties @@ -1,7 +1,7 @@ minecraft_version=1.12.2 -minecraft_full_versions=1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2 +minecraft_full_versions=1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 mappings_version=stable_39 -srg_notch_map=Fabric.srg \ No newline at end of file +srg_notch_map=Forge.srg \ No newline at end of file diff --git a/Forge/resource/transformers.js b/Forge/resource/transformers.js index 47c4a6e..bd6b37b 100644 --- a/Forge/resource/transformers.js +++ b/Forge/resource/transformers.js @@ -1,12 +1,10 @@ +var InsnList = Java.type('org.objectweb.asm.tree.InsnList'); var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode'); var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); -var MethodNode = Java.type('org.objectweb.asm.tree.MethodNode'); var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); var Opcodes = Java.type('org.objectweb.asm.Opcodes'); -var hasITextureObject = true; - function PlayerTabTransformer(cn, mn) { var iterator = mn.instructions.iterator(); while (iterator.hasNext()) { @@ -37,21 +35,27 @@ function initializeCoreMod() { return cn; } }, - 'SkinAvailableCallbackTransformer': { + + // For 1.13+ + 'AbstractTextureTransformer': { 'target': { 'type': 'CLASS', - 'name': 'net/minecraft/client/resources/SkinManager$SkinAvailableCallback' + 'name': 'net/minecraft/client/renderer/texture/AbstractTexture' }, 'transformer': function (cn) { - cn.version = Opcodes.V1_8; - cn.methods.forEach(function (mn) { - mn.access -= Opcodes.ACC_ABSTRACT; - for (var j = 0; j < 4; j++) { - mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, j)); - } - mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, cn.name, mn.name.equals("func_180521_a") ? "onSkinTextureAvailable" : "func_180521_a", mn.desc, true)); - mn.instructions.add(new InsnNode(Opcodes.RETURN)); - }); + cn.interfaces.add("net/minecraft/client/renderer/texture/Texture"); + return cn; + } + }, + 'TextureTransformer': { + 'target': { + 'type': 'CLASS', + 'name': 'net/minecraft/client/renderer/texture/Texture' + }, + 'transformer': function (cn) { + if (cn.access === 0) { + cn.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT; + } return cn; } }, @@ -63,51 +67,38 @@ function initializeCoreMod() { 'name': 'net/minecraft/client/Minecraft' }, 'transformer': function (cn) { - if (!cn.methods.stream().anyMatch(function(mn) { - return mn.name.equals("func_152344_a"); - })) { - var methodNode = new MethodNode(Opcodes.ACC_PUBLIC, "func_152344_a", "(Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;", "(Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;", null); - methodNode.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0)); - methodNode.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1)); - methodNode.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/minecraft/util/concurrent/ThreadTaskExecutor", "execute", "(Ljava/lang/Runnable;)V", false)); - methodNode.instructions.add(new InsnNode(Opcodes.ACONST_NULL)); - methodNode.instructions.add(new InsnNode(Opcodes.ARETURN)); - cn.methods.add(methodNode); - } + cn.interfaces.add("customskinloader/fake/itf/IFakeMinecraft"); return cn; } }, // For 1.15+ - 'ITextureObjectTransformer': { + 'TextureManagerTransformer': { 'target': { 'type': 'CLASS', - 'name': 'net/minecraft/client/renderer/texture/ITextureObject' + 'name': 'net/minecraft/client/renderer/texture/TextureManager' }, 'transformer': function (cn) { - hasITextureObject = !cn.methods.isEmpty(); + cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_1"); + cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_2"); return cn; } }, - 'FakeSkinManagerTransformer': { + 'DownloadingTextureTransformer': { 'target': { 'type': 'CLASS', - 'name': 'customskinloader/fake/FakeSkinManager' + 'name': 'net/minecraft/client/renderer/texture/DownloadingTexture' }, 'transformer': function (cn) { - if (!hasITextureObject) { - cn.methods.stream().filter(function (mn) { - return mn.name.equals("loadSkin") && mn.desc.equals("(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;"); - }).forEach(function (mn) { - mn.instructions.iterator().forEachRemaining(function (ain) { - if (ain instanceof MethodInsnNode && ain.owner.equals("net/minecraft/client/renderer/texture/TextureManager")) { - if (ain.name.equals("func_110579_a")) ain.name = "func_229263_a_"; - if (ain.name.equals("func_110581_b")) ain.name = "func_229267_b_"; - ain.desc = ain.desc.replace("Lnet/minecraft/client/renderer/texture/ITextureObject;", "Lnet/minecraft/client/renderer/texture/Texture;"); - } - }); - }); - } + cn.methods.forEach(function (mn) { + if (mn.name.equals("func_229163_c_")) { + var il = new InsnList(); + il.add(new VarInsnNode(Opcodes.ALOAD, 0)); + il.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinBuffer", "processLegacySkin", "(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;", false)); + il.add(new InsnNode(Opcodes.ARETURN)); + mn.instructions.insert(il); + } + }); return cn; } } diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index 0e6d992..6a2e1af 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -5,14 +5,13 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.*; - -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; +import java.util.HashMap; +import java.util.Map; import customskinloader.Logger; - -import javax.annotation.Nullable; +import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; public class TransformerManager { public static Logger logger = new Logger(new File("./CustomSkinLoader/ForgePlugin.log")); @@ -22,28 +21,54 @@ public class TransformerManager { public @interface TransformTarget { String className(); - String[] methodNames(); + String[] methodNames() default {}; - String desc(); + String desc() default ""; + } + + public interface IClassTransformer { + void transform(ClassNode cn); } public interface IMethodTransformer { void transform(ClassNode cn, MethodNode mn); } - public Map> map; + public Map classMap = new HashMap<>(); + public Map> map = new HashMap<>(); - public TransformerManager(IMethodTransformer... transformers) { - map = new HashMap>(); - for (IMethodTransformer t : transformers) { - logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s", t.getClass().getName()); - if (!t.getClass().isAnnotationPresent(TransformTarget.class)) { - logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation."); - continue; + public TransformerManager(IMethodTransformer... methodTransformers) { + this(new IClassTransformer[0], methodTransformers); + } + + public TransformerManager(IClassTransformer[] classTransformers, IMethodTransformer[] methodTransformers) { + for (IClassTransformer t : classTransformers) { + TransformTarget tt = this.getTransformTarget(t.getClass()); + if (tt != null) { + addClassTransformer(tt.className(), t); } + } + for (IMethodTransformer t : methodTransformers) { + TransformTarget tt = this.getTransformTarget(t.getClass()); + if (tt != null) { + addMethodTransformer(tt, tt.className(), t); + } + } + } - TransformTarget tt = t.getClass().getAnnotation(TransformTarget.class); - addMethodTransformer(tt, tt.className(), t); + private TransformTarget getTransformTarget(Class cl) { + logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s", cl.getName()); + if (!cl.isAnnotationPresent(TransformTarget.class)) { + logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation."); + return null; + } + return cl.getAnnotation(TransformTarget.class); + } + + private void addClassTransformer(String className, IClassTransformer transformer) { + if (!classMap.containsKey(className)) { + classMap.put(className, transformer); + logger.info("[CSL DEBUG] REGISTERING CLASS %s", className); } } @@ -56,10 +81,24 @@ public class TransformerManager { } } + public ClassNode transform(ClassNode classNode) { + IClassTransformer transformer = classMap.get(FMLDeobfuscatingRemapper.INSTANCE.map(classNode.name).replace("/", ".")); + if (transformer != null) { + try { + transformer.transform(classNode); + logger.info("[CSL DEBUG] Successfully transformed class %s", classNode.name); + } catch (Exception e) { + logger.warning("[CSL DEBUG] An error happened when transforming class %s.", classNode.name); + logger.warning(e); + } + } + return classNode; + } + public MethodNode transform(ClassNode classNode, MethodNode methodNode, String className, String methodName, String methodDesc) { Map transMap = map.get(className); String methodTarget = methodName + methodDesc; - if (transMap.containsKey(methodTarget)) { + if (transMap != null && transMap.containsKey(methodTarget)) { try { transMap.get(methodTarget).transform(classNode, methodNode); logger.info("[CSL DEBUG] Successfully transformed method %s in class %s", methodName, className); diff --git a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java index cfc2096..5ce2fbb 100644 --- a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java +++ b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java @@ -1,6 +1,7 @@ package customskinloader.forge.loader; import customskinloader.forge.TransformerManager; +import customskinloader.forge.transformer.FakeInterfacesTransformer; import customskinloader.forge.transformer.PlayerTabTransformer; import customskinloader.forge.transformer.SkinManagerTransformer; import customskinloader.forge.transformer.SpectatorMenuTransformer; @@ -10,31 +11,45 @@ import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRema import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; //LaunchWrapper for 1.13- public class LaunchWrapper implements IClassTransformer { - private static final TransformerManager.IMethodTransformer[] TRANFORMERS = { - new SkinManagerTransformer.InitTransformer(), - new SkinManagerTransformer.LoadSkinTransformer(), - new SkinManagerTransformer.LoadProfileTexturesTransformer(), - new SkinManagerTransformer.LoadSkinFromCacheTransformer(), - new PlayerTabTransformer.ScoreObjectiveTransformer(), - new SpectatorMenuTransformer.PlayerMenuObjectTransformer() + private static final TransformerManager.IClassTransformer[] CLASS_TRANSFORMERS = { + new FakeInterfacesTransformer.MinecraftTransformer(), + new FakeInterfacesTransformer.AbstractTextureTransfomer(), + new FakeInterfacesTransformer.TextureTransformer(), + new FakeInterfacesTransformer.TextureManagerTransformer() }; - private TransformerManager transformerManager = new TransformerManager(TRANFORMERS); + private static final TransformerManager.IMethodTransformer[] TRANFORMERS = { + new SkinManagerTransformer.InitTransformer(), + new SkinManagerTransformer.LoadSkinTransformer(), + new SkinManagerTransformer.LoadProfileTexturesTransformer(), + new SkinManagerTransformer.LoadSkinFromCacheTransformer(), + new PlayerTabTransformer.ScoreObjectiveTransformer(), + new SpectatorMenuTransformer.PlayerMenuObjectTransformer() + }; + private TransformerManager transformerManager = new TransformerManager(CLASS_TRANSFORMERS, TRANFORMERS); //From: https://github.com/RecursiveG/UniSkinMod/blob/1.9.4/src/main/java/org/devinprogress/uniskinmod/coremod/BaseAsmTransformer.java#L83-L114 public byte[] transform(String obfClassName, String className, byte[] bytes) { - if (!transformerManager.map.containsKey(className)) return bytes;//Check if should be transformed + if (!transformerManager.classMap.containsKey(className) && !transformerManager.map.containsKey(className)) return bytes;//Check if should be transformed //Parse bytes to ClassNode - ClassReader cr = new ClassReader(bytes); ClassNode cn = new ClassNode(); - cr.accept(cn, 0); + if (bytes != null && bytes.length > 0) { + ClassReader cr = new ClassReader(bytes); + cr.accept(cn, 0); + } else { + cn.name = className.replace(".", "/"); + cn.version = Opcodes.V1_8; + cn.superName = "java/lang/Object"; + } //Transform ClassNode + transformerManager.transform(cn); for (MethodNode mn : cn.methods) { String methodName = FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(obfClassName, mn.name, mn.desc); String methodDesc = FMLDeobfuscatingRemapper.INSTANCE.mapMethodDesc(mn.desc); diff --git a/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java b/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java new file mode 100644 index 0000000..2a0a8d0 --- /dev/null +++ b/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java @@ -0,0 +1,50 @@ +package customskinloader.forge.transformer; + +import customskinloader.forge.TransformerManager; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.ClassNode; + +public class FakeInterfacesTransformer { + @TransformerManager.TransformTarget( + className = "net.minecraft.client.Minecraft" + ) + public static class MinecraftTransformer implements TransformerManager.IClassTransformer { + @Override + public void transform(ClassNode cn) { + cn.interfaces.add("customskinloader/fake/itf/IFakeMinecraft"); + } + } + + @TransformerManager.TransformTarget( + className = "net.minecraft.client.renderer.texture.AbstractTexture" + ) + public static class AbstractTextureTransfomer implements TransformerManager.IClassTransformer { + @Override + public void transform(ClassNode cn) { + cn.interfaces.add("net/minecraft/client/renderer/texture/Texture"); + } + } + + @TransformerManager.TransformTarget( + className = "net.minecraft.client.renderer.texture.Texture" + ) + public static class TextureTransformer implements TransformerManager.IClassTransformer { + @Override + public void transform(ClassNode cn) { + if (cn.access == 0) { + cn.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT; + } + } + } + + @TransformerManager.TransformTarget( + className = "net.minecraft.client.renderer.texture.TextureManager" + ) + public static class TextureManagerTransformer implements TransformerManager.IClassTransformer { + @Override + public void transform(ClassNode cn) { + cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_1"); + cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_2"); + } + } +} diff --git a/Forge/source/net/minecraft/client/resources/SkinManager.java b/Forge/source/net/minecraft/client/resources/SkinManager.java index 215208b..e06027e 100644 --- a/Forge/source/net/minecraft/client/resources/SkinManager.java +++ b/Forge/source/net/minecraft/client/resources/SkinManager.java @@ -14,9 +14,6 @@ public class SkinManager { private FakeSkinManager fakeManager; public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { - try { - Class.forName("net.minecraft.client.renderer.texture.ITextureObject", false, SkinManager.class.getClassLoader()); - } catch (ClassNotFoundException ignore) {} this.fakeManager = new FakeSkinManager(textureManagerInstance, skinCacheDirectory, sessionService); } @@ -47,9 +44,13 @@ public class SkinManager { } public interface SkinAvailableCallback { - void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture); + default void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) { + this.onSkinTextureAvailable(typeIn, location, profileTexture); + } - void onSkinTextureAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture); + default void onSkinTextureAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) { + this.skinAvailable(typeIn, location, profileTexture); + } } public interface ISkinAvailableCallback extends SkinAvailableCallback { diff --git a/common.gradle b/common.gradle index 795fc22..04549ed 100644 --- a/common.gradle +++ b/common.gradle @@ -26,9 +26,9 @@ group = config.group archivesBaseName = rootProject.ext.config.name + "_" + config.minecraft_version ext.shortVersion = getShortVersion() -sourceCompatibility = targetCompatibility = 1.6 +sourceCompatibility = targetCompatibility = 1.8 compileJava { - sourceCompatibility = targetCompatibility = 1.6 + sourceCompatibility = targetCompatibility = 1.8 } minecraft {