Replaced MethodIsnNode of ASM with newer constructor to resolve deprecation
This commit is contained in:
parent
6a8effe2b0
commit
7607e6be9b
1 changed files with 4 additions and 8 deletions
|
@ -54,7 +54,7 @@ public class ASMTweaker implements IClassTransformer
|
||||||
public byte[] transform(String name, String transformedName, byte[] basicClass)
|
public byte[] transform(String name, String transformedName, byte[] basicClass)
|
||||||
{
|
{
|
||||||
if ( basicClass == null )
|
if ( basicClass == null )
|
||||||
return basicClass;
|
return null;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -79,9 +79,7 @@ public class ASMTweaker implements IClassTransformer
|
||||||
MethodNode newNode = new MethodNode( Opcodes.ACC_PUBLIC, "func_146977_a_original", mn.desc, mn.signature, new String[0] );
|
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, 0 ) );
|
||||||
newNode.instructions.add( new VarInsnNode( Opcodes.ALOAD, 1 ) );
|
newNode.instructions.add( new VarInsnNode( Opcodes.ALOAD, 1 ) );
|
||||||
//newNode.instructions.add( new MethodInsnNode( Opcodes.INVOKESPECIAL, classNode.name, mn.name, mn.desc, false ) );
|
newNode.instructions.add( new MethodInsnNode( Opcodes.INVOKESPECIAL, classNode.name, mn.name, mn.desc, false ) );
|
||||||
// TODO: Update for newer forge
|
|
||||||
newNode.instructions.add( new MethodInsnNode( Opcodes.INVOKESPECIAL, classNode.name, mn.name, mn.desc ) );
|
|
||||||
newNode.instructions.add( new InsnNode( Opcodes.RETURN ) );
|
newNode.instructions.add( new InsnNode( Opcodes.RETURN ) );
|
||||||
log( newNode.name + newNode.desc + " - New Method" );
|
log( newNode.name + newNode.desc + " - New Method" );
|
||||||
classNode.methods.add( newNode );
|
classNode.methods.add( newNode );
|
||||||
|
@ -103,9 +101,7 @@ public class ASMTweaker implements IClassTransformer
|
||||||
if ( n.name.equals( "func_146977_a" ) || (n.name.equals( "a" ) && n.desc.equals( "(Lzk;)V" )) )
|
if ( n.name.equals( "func_146977_a" ) || (n.name.equals( "a" ) && n.desc.equals( "(Lzk;)V" )) )
|
||||||
{
|
{
|
||||||
log( n.name + n.desc + " - Invoke Virtual" );
|
log( n.name + n.desc + " - Invoke Virtual" );
|
||||||
//mn.instructions.insertBefore( n, new MethodInsnNode( Opcodes.INVOKEVIRTUAL, n.owner, n.name, n.desc, false ) );
|
mn.instructions.insertBefore( n, new MethodInsnNode( Opcodes.INVOKEVIRTUAL, n.owner, n.name, n.desc, false ) );
|
||||||
// TODO: Update for newer forge
|
|
||||||
mn.instructions.insertBefore( n, new MethodInsnNode( Opcodes.INVOKEVIRTUAL, n.owner, n.name, n.desc ) );
|
|
||||||
mn.instructions.remove( in );
|
mn.instructions.remove( in );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -120,7 +116,7 @@ public class ASMTweaker implements IClassTransformer
|
||||||
return writer.toByteArray();
|
return writer.toByteArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Throwable t)
|
catch (Throwable ignored)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue