fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fight the Fight...

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-11 10:41:05 -06:00
parent 49f3b3ce0b
commit e1436db4e9
3 changed files with 60 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transformer/AppEngASMTransformer.java
+55 -52
View File
@@ -4,6 +4,7 @@ import java.util.Iterator;
import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.IClassTransformer;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter; import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
@@ -15,9 +16,13 @@ import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.VarInsnNode; import org.objectweb.asm.tree.VarInsnNode;
import appeng.core.AELog;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import cpw.mods.fml.relauncher.FMLRelaunchLog;
public class AppEngASMTransformer implements IClassTransformer public class AppEngASMTransformer implements IClassTransformer
{ {
@@ -31,88 +36,86 @@ public class AppEngASMTransformer implements IClassTransformer
@Override @Override
public byte[] transform(String name, String transformedName, byte[] basicClass) public byte[] transform(String name, String transformedName, byte[] basicClass)
{ {
if ( publicShit.containsKey( transformedName ) ) try
{ {
ClassNode classNode = new ClassNode(); if ( transformedName != null && publicShit.containsKey( transformedName ) )
ClassReader classReader = new ClassReader( basicClass );
classReader.accept( classNode, 0 );
for (String Set : publicShit.get( transformedName ))
{ {
makePublic( classNode, Set ); ClassNode classNode = new ClassNode();
} ClassReader classReader = new ClassReader( basicClass );
classReader.accept( classNode, 0 );
// CALL VIRUAL! for (String Set : publicShit.get( transformedName ))
if ( transformedName.equals( "net.minecraft.client.gui.inventory.GuiContainer" ) )
{
for (MethodNode mn : classNode.methods)
{ {
if ( mn.name.equals( "func_146977_a" ) || (mn.name.equals( "a" ) && mn.desc.equals( "(Lzk;)V" )) ) makePublic( classNode, Set );
{
MethodNode newNode = new MethodNode( Opcodes.ACC_PUBLIC, "func_146977_a_original", mn.desc, mn.signature, new String[0] );
newNode.instructions.add( new VarInsnNode( Opcodes.ALOAD, 0 ) );
newNode.instructions.add( new VarInsnNode( Opcodes.ALOAD, 1 ) );
newNode.instructions.add( new MethodInsnNode( Opcodes.INVOKESPECIAL, classNode.name, mn.name, mn.desc ) );
newNode.instructions.add( new InsnNode( Opcodes.RETURN ) );
classNode.methods.add( newNode );
break;
}
} }
for (MethodNode mn : classNode.methods) // CALL VIRUAL!
if ( transformedName.equals( "net.minecraft.client.gui.inventory.GuiContainer" ) )
{ {
if ( mn.name.equals( "drawScreen" ) || (mn.name.equals( "a" ) && mn.desc.equals( "(IIF)V" )) ) for (MethodNode mn : classNode.methods)
{ {
Iterator<AbstractInsnNode> i = mn.instructions.iterator(); if ( mn.name.equals( "func_146977_a" ) || (mn.name.equals( "a" ) && mn.desc.equals( "(Lzk;)V" )) )
while (i.hasNext())
{ {
AbstractInsnNode in = i.next(); MethodNode newNode = new MethodNode( Opcodes.ACC_PUBLIC, "func_146977_a_original", mn.desc, mn.signature, new String[0] );
if ( in.getOpcode() == Opcodes.INVOKESPECIAL ) newNode.instructions.add( new VarInsnNode( Opcodes.ALOAD, 0 ) );
newNode.instructions.add( new VarInsnNode( Opcodes.ALOAD, 1 ) );
newNode.instructions.add( new MethodInsnNode( Opcodes.INVOKESPECIAL, classNode.name, mn.name, mn.desc ) );
newNode.instructions.add( new InsnNode( Opcodes.RETURN ) );
log(newNode.name+newNode.desc+" - New Method");
classNode.methods.add( newNode );
break;
}
}
for (MethodNode mn : classNode.methods)
{
if ( mn.name.equals( "drawScreen" ) || (mn.name.equals( "a" ) && mn.desc.equals( "(IIF)V" )) )
{
Iterator<AbstractInsnNode> i = mn.instructions.iterator();
while (i.hasNext())
{ {
MethodInsnNode n = (MethodInsnNode) in; AbstractInsnNode in = i.next();
if ( n.name.equals( "func_146977_a" ) || (n.name.equals( "a" ) && n.desc.equals( "(Lzk;)V" )) ) if ( in.getOpcode() == Opcodes.INVOKESPECIAL )
{ {
mn.instructions.insertBefore( n, new MethodInsnNode( Opcodes.INVOKEVIRTUAL, n.owner, n.name, n.desc ) ); MethodInsnNode n = (MethodInsnNode) in;
mn.instructions.remove( in ); if ( n.name.equals( "func_146977_a" ) || (n.name.equals( "a" ) && n.desc.equals( "(Lzk;)V" )) )
break; {
log(n.name+n.desc+" - Invoke Virtual");
mn.instructions.insertBefore( n, new MethodInsnNode( Opcodes.INVOKEVIRTUAL, n.owner, n.name, n.desc ) );
mn.instructions.remove( in );
break;
}
} }
} }
} }
} }
} }
}
ClassWriter writer = new ClassWriter( ClassWriter.COMPUTE_MAXS ); ClassWriter writer = new ClassWriter( ClassWriter.COMPUTE_MAXS );
classNode.accept( writer ); classNode.accept( writer );
return writer.toByteArray(); return writer.toByteArray();
}
} }
catch( Throwable t ) {}
return basicClass; return basicClass;
} }
private void log(String string)
{
FMLRelaunchLog.log("AE2-CORE", Level.INFO, string );
}
private void makePublic(ClassNode classNode, String set) private void makePublic(ClassNode classNode, String set)
{ {
for (MethodNode mn : classNode.methods) for (MethodNode mn : classNode.methods)
{ {
if ( mn.name.equals( set ) ) if ( mn.name.equals( set ) )
{ {
mn.access = getFixedAccess( mn.access ); mn.access = Opcodes.ACC_PUBLIC;
log(mn.name+mn.desc+" - Public");
} }
} }
for (FieldNode mn : classNode.fields)
{
if ( mn.name.equals( set ) )
{
mn.access = getFixedAccess( mn.access );
}
}
} }
private int getFixedAccess(int access)
{
return Opcodes.ACC_PUBLIC;
}
} }
transformer/AppEngATTransformer.java
-14
View File
@@ -1,14 +0,0 @@
package appeng.transformer;
import net.minecraft.launchwrapper.IClassTransformer;
public class AppEngATTransformer implements IClassTransformer
{
@Override
public byte[] transform(String name, String transformedName, byte[] basicClass)
{
return basicClass;
}
}
transformer/AppEngCore.java
+2 -3
View File
@@ -44,7 +44,7 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
@Override @Override
public String[] getASMTransformerClass() public String[] getASMTransformerClass()
{ {
return new String[] { "appeng.transformer.AppEngASMTransformer" }; return null;//return new String[] { "appeng.transformer.AppEngASMTransformer" };
} }
@Override @Override
@@ -97,7 +97,6 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
@Override @Override
public String getAccessTransformerClass() public String getAccessTransformerClass()
{ {
// TODO Auto-generated method stub return "appeng.transformer.AppEngASMTransformer" ;
return null;
} }
} }