diff --git a/build/build.properties b/build/build.properties index 075f681..ed4e5eb 100644 --- a/build/build.properties +++ b/build/build.properties @@ -1,4 +1,4 @@ mc_version=1.7.10 -forge_version=10.13.0.1170 +forge_version=10.13.1.1217 ccl_version=1.1.1.88 mod_version=1.1.0 diff --git a/src/codechicken/multipart/asm/ASMMixinCompiler.scala b/src/codechicken/multipart/asm/ASMMixinCompiler.scala index 741ee09..1b19661 100644 --- a/src/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/src/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -439,9 +439,10 @@ object ASMMixinCompiler replace(superInsn(minsn)) case INVOKEVIRTUAL => if (minsn.owner.equals(cnode.name)) { - if (methodSigs.contains(minsn.name + minsn.desc)) //call the interface method + if (methodSigs.contains(minsn.name + minsn.desc)) {//call the interface method minsn.setOpcode(INVOKEINTERFACE) - else { + minsn.itf = true + }else { //cast to parent class and call val mType = Type.getMethodType(minsn.desc) val instanceEntry = stack.peek(width(mType.getArgumentTypes)) diff --git a/src/codechicken/multipart/asm/ASMMixinFactory.scala b/src/codechicken/multipart/asm/ASMMixinFactory.scala index 3bee4e7..506246a 100644 --- a/src/codechicken/multipart/asm/ASMMixinFactory.scala +++ b/src/codechicken/multipart/asm/ASMMixinFactory.scala @@ -89,7 +89,7 @@ object ASMMixinFactory extends IMultipartFactory def constructor(clazz:Class[_]):Constructor = { val name = uniqueName("TileMultipart_gen") - val cw = new CC_ClassWriter(ASM4) + val cw = new CC_ClassWriter(0) val superName = classOf[Constructor].getName.replace('.', '/') val className = clazz.getName.replace('.', '/') var mv:MethodVisitor = null @@ -194,7 +194,7 @@ object ASMMixinFactory extends IMultipartFactory } if((inode.access&ACC_INTERFACE) == 0) throw new IllegalArgumentException(s_interface+" is not an interface.") - val cw = new CC_ClassWriter(ASM4) + val cw = new CC_ClassWriter(0) var mv:MethodVisitor = null var fv:FieldVisitor = null