mirror of
https://github.com/xfl03/MCCustomSkinLoader.git
synced 2026-11-20 01:49:37 +00:00
Don't use ClassWriter.COMPUTE_FRAME anymore. (#234)
This commit is contained in:
1 parent
fbec7ce6bb
commit
bd642d0106
2 files changed
+7
-29
No files matched your search
@@ -8,7 +8,6 @@ import customskinloader.forge.transformer.PlayerTabTransformer;
|
||||
import customskinloader.forge.transformer.SkinManagerTransformer;
|
||||
import customskinloader.forge.transformer.SpectatorMenuTransformer;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
@@ -64,33 +63,7 @@ public class LaunchWrapper implements IClassTransformer {
|
||||
cn.methods.addAll(methods);
|
||||
|
||||
//Parse Class Node to bytes
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES) {
|
||||
@Override
|
||||
protected String getCommonSuperClass(final String type1, final String type2) {
|
||||
Class<?> c, d;
|
||||
ClassLoader classLoader = Launch.classLoader;
|
||||
try {
|
||||
c = classLoader.loadClass(type1.replace('/', '.'));
|
||||
d = classLoader.loadClass(type2.replace('/', '.'));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (c.isAssignableFrom(d)) {
|
||||
return type1;
|
||||
}
|
||||
if (d.isAssignableFrom(c)) {
|
||||
return type2;
|
||||
}
|
||||
if (c.isInterface() || d.isInterface()) {
|
||||
return "java/lang/Object";
|
||||
} else {
|
||||
do {
|
||||
c = c.getSuperclass();
|
||||
} while (!c.isAssignableFrom(d));
|
||||
return c.getName().replace('.', '/');
|
||||
}
|
||||
}
|
||||
};
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
cn.accept(cw);
|
||||
return cw.toByteArray();
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ import org.objectweb.asm.tree.FrameNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.IntInsnNode;
|
||||
import org.objectweb.asm.tree.LabelNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.objectweb.asm.tree.TypeInsnNode;
|
||||
@@ -158,6 +157,7 @@ public class SkinManagerTransformer {
|
||||
il.add(new VarInsnNode(Opcodes.ALOAD, 1));
|
||||
il.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "customskinloader/fake/FakeSkinManager", "loadSkinFromCache", "(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;", false));
|
||||
il.add(new InsnNode(Opcodes.ARETURN));
|
||||
il.add(new FrameNode(Opcodes.F_SAME, 0, null, 0, null));
|
||||
mn.instructions.insert(il);
|
||||
return mn;
|
||||
}
|
||||
@@ -222,7 +222,11 @@ public class SkinManagerTransformer {
|
||||
}
|
||||
|
||||
if (val$skinAvailableCallback != null && this$0 != null && val$map != null && this$1 != null) {
|
||||
AbstractInsnNode frame = null;
|
||||
for (AbstractInsnNode ain : mn.instructions.toArray()) {
|
||||
if (ain instanceof FrameNode) {
|
||||
frame = ain;
|
||||
}
|
||||
if (ain.getOpcode() == Opcodes.RETURN) {
|
||||
InsnList il = new InsnList();
|
||||
il.add(new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
@@ -237,6 +241,7 @@ public class SkinManagerTransformer {
|
||||
mn.instructions.insertBefore(ain, il);
|
||||
}
|
||||
}
|
||||
mn.instructions.set(frame, new FrameNode(Opcodes.F_SAME, 0, null, 0, null));
|
||||
}
|
||||
|
||||
return mn;
|
||||
|
||||
Reference in new issue
Block a user