diff --git a/Forge/source/customskinloader/forge/ForgeSkinManager.java b/Forge/source/customskinloader/forge/ForgeSkinManager.java deleted file mode 100644 index fee96e1..0000000 --- a/Forge/source/customskinloader/forge/ForgeSkinManager.java +++ /dev/null @@ -1,40 +0,0 @@ -package customskinloader.forge; - -import java.io.File; -import java.util.Map; - -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.mojang.authlib.minecraft.MinecraftSessionService; - -import customskinloader.fake.FakeSkinManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.util.ResourceLocation; - -public class ForgeSkinManager extends SkinManager { - private FakeSkinManager fakeManager;//Fake Skin Manager - - public ForgeSkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { - super(textureManagerInstance, skinCacheDirectory, sessionService); - this.fakeManager=new FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); - } - - @Override - public ResourceLocation loadSkin(MinecraftProfileTexture profileTexture, Type textureType){ - return this.loadSkin(profileTexture, textureType, null); - } - @Override - public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type textureType, final SkinAvailableCallback skinAvailableCallback){ - return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); - } - @Override - public void loadProfileTextures(final GameProfile profile, final SkinAvailableCallback skinAvailableCallback, final boolean requireSecure){ - this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); - } - @Override - public Map loadSkinFromCache(GameProfile profile){ - return this.fakeManager.loadSkinFromCache(profile); - } -} diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index 521a34d..ae57cc8 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -18,6 +18,8 @@ import net.minecraft.launchwrapper.IClassTransformer; import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; import net.minecraftforge.fml.relauncher.FMLRelaunchLog; +import customskinloader.forge.Transformers.*; + public class TransformerManager implements IClassTransformer { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @@ -27,9 +29,13 @@ public class TransformerManager implements IClassTransformer { public String desc(); } public interface IMethodTransformer{ - public void transform(MethodNode mn); + public void transform(ClassNode cn,MethodNode mn); } - private static final IMethodTransformer[] TRANFORMERS={new Transformers.SkinManagerTransformer()}; + private static final IMethodTransformer[] TRANFORMERS={ + new SkinManagerTransformer(), + new SkinManagerLoadSkinTransformer(), + new SkinManagerLoadProfileTexturesTransformer(), + new SkinManagerLoadSkinFromCacheTransformer()}; private Map> map; public TransformerManager(){ map = new HashMap>(); @@ -71,7 +77,7 @@ public class TransformerManager implements IClassTransformer { if (transMap.containsKey(methodName + methodDesc)) { try { FMLRelaunchLog.info("[CSL DEBUG] Transforming method %s in class %s(%s)", methodName + methodDesc, obfClassName, className); - transMap.get(methodName + methodDesc).transform(mn); + transMap.get(methodName + methodDesc).transform(cn,mn); FMLRelaunchLog.info("[CSL DEBUG] Successfully transformed method %s in class %s(%s)", methodName + methodDesc, obfClassName, className); } catch (Exception e) { FMLRelaunchLog.warning("[CSL DEBUG] An error happened when transforming method %s in class %s(%s). The whole class was not modified.", methodName + methodDesc, obfClassName, className); diff --git a/Forge/source/customskinloader/forge/Transformers.java b/Forge/source/customskinloader/forge/Transformers.java index 0001c97..5ba3128 100644 --- a/Forge/source/customskinloader/forge/Transformers.java +++ b/Forge/source/customskinloader/forge/Transformers.java @@ -1,40 +1,86 @@ package customskinloader.forge; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.FieldNode; +import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; import customskinloader.forge.TransformerManager.IMethodTransformer; import customskinloader.forge.TransformerManager.TransformTarget; public class Transformers { - @TransformTarget(className="net.minecraft.client.Minecraft", - methodNames={"func_71384_a","init","startGame"}, - desc="()V") + @TransformTarget(className="net.minecraft.client.resources.SkinManager", + methodNames={""}, + desc="(Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V") public static class SkinManagerTransformer implements IMethodTransformer{ @Override - public void transform(MethodNode mn) { - //TODO transform here - AbstractInsnNode node=mn.instructions.getFirst(); - while(node!=null){ - if(node.getOpcode()==Opcodes.NEW){ - TypeInsnNode typeNode=(TypeInsnNode) node; - if(typeNode.desc.equalsIgnoreCase("net/minecraft/client/resources/SkinManager")){ - typeNode.desc="customskinloader/forge/ForgeSkinManager"; - } - } - if(node.getOpcode()==Opcodes.INVOKESPECIAL){ - MethodInsnNode min=(MethodInsnNode) node; - if(min.owner.equalsIgnoreCase("net/minecraft/client/resources/SkinManager")){ - min.owner="customskinloader/forge/ForgeSkinManager"; - } - } - node=node.getNext(); - } + public void transform(ClassNode cn,MethodNode mn) { + cn.fields.add(new FieldNode(Opcodes.ACC_PRIVATE, "fakeManager", "Lcustomskinloader/fake/FakeSkinManager", null, null)); + mn.instructions.clear(); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0)); + mn.instructions.add(new TypeInsnNode(Opcodes.NEW, "customskinloader/fake/FakeSkinManager")); + mn.instructions.add(new InsnNode(Opcodes.DUP)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,1)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,2)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,3)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKESPECIAL,"customskinloader/fake/FakeSkinManager","", + "(Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V", false)); + mn.instructions.add(new FieldInsnNode(Opcodes.PUTFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager")); + mn.instructions.add(new InsnNode(Opcodes.RETURN)); + } + } + @TransformTarget(className="net.minecraft.client.resources.SkinManager", + methodNames={"func_152789_a","loadSkin"}, + desc="(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;") + public static class SkinManagerLoadSkinTransformer implements IMethodTransformer{ + @Override + public void transform(ClassNode cn,MethodNode mn) { + mn.instructions.clear(); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0)); + mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager")); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,1)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,2)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,3)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,"customskinloader/fake/FakeSkinManager","loadSkin", + "(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;", false)); + mn.instructions.add(new InsnNode(Opcodes.ARETURN)); + } + } + @TransformTarget(className="net.minecraft.client.resources.SkinManager", + methodNames={"func_152790_a","loadProfileTextures"}, + desc="(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V") + public static class SkinManagerLoadProfileTexturesTransformer implements IMethodTransformer{ + @Override + public void transform(ClassNode cn,MethodNode mn) { + mn.instructions.clear(); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0)); + mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager")); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,1)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,2)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,3)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,"customskinloader/fake/FakeSkinManager","loadProfileTextures", + "(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V", false)); + mn.instructions.add(new InsnNode(Opcodes.RETURN)); + } + } + @TransformTarget(className="net.minecraft.client.resources.SkinManager", + methodNames={"func_152788_a","loadSkinFromCache"}, + desc="(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;") + public static class SkinManagerLoadSkinFromCacheTransformer implements IMethodTransformer{ + @Override + public void transform(ClassNode cn,MethodNode mn) { + mn.instructions.clear(); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0)); + mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager")); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,1)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,"customskinloader/fake/FakeSkinManager","loadSkinFromCache", + "(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;", false)); + mn.instructions.add(new InsnNode(Opcodes.ARETURN)); } - } - }