Fixed compilation with generic arguments

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/CompilerUtils.java

@@ -49,15 +49,16 @@ public class CompilerUtils {
 	}
 
     public static void tagMethodParameters(JavaBytecodeContext context, JavaCompiledModule module, FunctionHeader header, boolean isStatic) {
-		int index = header.getNumberOfTypeParameters();
+		int index = isStatic ? 0 : 1;
 		for (int i = 0; i < header.typeParameters.length; i++) {
 			TypeParameter parameter = header.typeParameters[i];
-			module.setTypeParameterInfo(parameter, new JavaTypeParameterInfo(index++));
+			module.setTypeParameterInfo(parameter, new JavaTypeParameterInfo(index));
+			index++;
 		}
         for (int i = 0; i < header.parameters.length; i++) {
             FunctionParameter parameter = header.parameters[i];
             String parameterType = context.getDescriptor(parameter.type);
-            module.setParameterInfo(parameter, new JavaParameterInfo(isStatic ? index : index + 1, parameterType));
+            module.setParameterInfo(parameter, new JavaParameterInfo(index, parameterType));
 			index++;
         }
     }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaWriter.java

@@ -67,14 +67,15 @@ public class JavaWriter {
 		this.method = method;
 		this.forDefinition = forDefinition;
 		this.position = position;
-		
-		final MethodVisitor methodVisitor = visitor.visitMethod(isExtension ? method.modifiers | Opcodes.ACC_STATIC : method.modifiers, method.name, descriptor, signature, exceptions);
+
+		final int access = isExtension ? method.modifiers | ACC_STATIC : method.modifiers;
+		final MethodVisitor methodVisitor = visitor.visitMethod(access, method.name, descriptor, signature, exceptions);
 		
 		for (String annotation : annotations) {
 			methodVisitor.visitAnnotation(annotation, true).visitEnd();
 		}
 		
-		this.visitor = new LocalVariablesSorter(isExtension ? method.modifiers | Opcodes.ACC_STATIC : method.modifiers, descriptor, methodVisitor);
+		this.visitor = new LocalVariablesSorter(access, descriptor, methodVisitor);
 		this.nameVariables = nameVariables;
 	}