mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-20 04:09:45 +00:00
Update Forge, fix compatibility issue with ASM5
This commit is contained in:
1 parent
9b6e3286f6
commit
f677fb51f6
3 files changed
+6
-5
No files matched your search
@@ -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
|
||||
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user