diff --git a/build.properties b/build.properties index a722f6ad..575d8274 100644 --- a/build.properties +++ b/build.properties @@ -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 # diff --git a/src/main/java/appeng/transformer/asm/ASMTweaker.java b/src/main/java/appeng/transformer/asm/ASMTweaker.java index da9d5975..58d83349 100644 --- a/src/main/java/appeng/transformer/asm/ASMTweaker.java +++ b/src/main/java/appeng/transformer/asm/ASMTweaker.java @@ -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; }