Fixed call super

Author: fan87

Diff for: pom.xml

@@ -24,8 +24,8 @@
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.18.1-R0.1-SNAPSHOT</version>
+            <artifactId>spigot-api</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Diff for: src/main/java/com/dragoncommissions/mixbukkit/api/action/impl/MActionCallSuper.java

@@ -1,17 +1,15 @@
 package com.dragoncommissions.mixbukkit.api.action.impl;
 
 import com.dragoncommissions.mixbukkit.api.MixinPlugin;
-import com.dragoncommissions.mixbukkit.api.ObfMap;
 import com.dragoncommissions.mixbukkit.api.action.MixinAction;
+import com.dragoncommissions.mixbukkit.api.shellcode.impl.inner.IShellCodeMethodInvoke;
 import com.dragoncommissions.mixbukkit.utils.ASMUtils;
-import javassist.bytecode.Descriptor;
 import javassist.bytecode.Opcode;
-import net.minecraft.world.damagesource.DamageSource;
-import org.objectweb.asm.tree.InsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 
 public class MActionCallSuper implements MixinAction {
 
@@ -49,12 +47,15 @@ public void action(Class<?> owner, MethodNode method) {
             throw new IllegalArgumentException("Could not find super method in " + owner.getSimpleName());
         }
         method.instructions.clear();
-        method.instructions.add(ASMUtils.loadVar(Object.class, 0));
-        method.instructions.add(ASMUtils.loadVar(DamageSource.class, 1));
-        method.instructions.add(ASMUtils.loadVar(float.class, 2));
-        String descriptor = ASMUtils.getDescriptor(boolean.class, DamageSource.class, float.class);
-        String mappingName = plugin.getObfMap().resolveMapping(new ObfMap.MethodMapping(superMethod.getDeclaringClass().getName().replace(".", "/"), descriptor, method.name));
-        method.instructions.add(new MethodInsnNode(Opcode.INVOKESPECIAL, superMethod.getDeclaringClass().getName().replace(".", "/"), mappingName, descriptor));
+        int varNum = 0;
+        if (Modifier.isStatic(superMethod.getModifiers())) {
+            method.instructions.add(new VarInsnNode(Opcode.ALOAD, varNum++));
+        }
+        Class<?>[] parameterTypes = superMethod.getParameterTypes();
+        for (int i = 0; i < parameterTypes.length; i++) {
+            method.instructions.add(ASMUtils.loadVar(parameterTypes[i], varNum++));
+        }
+        method.instructions.add(new IShellCodeMethodInvoke(superMethod).generate());
         method.instructions.add(ASMUtils.genReturnNode(superMethod.getReturnType()));
 
     }