Merge pull request #194 from FireBall1725/rv2

Downgraded forge to 1208 to fix compatiblity with forge multiparts
This commit is contained in:
Chris 2014-09-29 19:11:07 -07:00
commit 35f6c84d9f
2 changed files with 7 additions and 3 deletions

View file

@ -8,7 +8,7 @@ archivesBaseName=appliedenergistics2
# Versions #
#########################################################
minecraft_version=1.7.10
forge_version=10.13.1.1217
forge_version=10.13.0.1208
#########################################################
# APIs used for development #

View file

@ -79,7 +79,9 @@ public class ASMTweaker implements IClassTransformer
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, 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 ) );
log( newNode.name + newNode.desc + " - New Method" );
classNode.methods.add( newNode );
@ -101,7 +103,9 @@ public class ASMTweaker implements IClassTransformer
if ( n.name.equals( "func_146977_a" ) || (n.name.equals( "a" ) && n.desc.equals( "(Lzk;)V" )) )
{
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 );
break;
}