Fixed Bridge methods IncompatibleClassChangeError

Reason was that it tried to invokeInterface whereas a bridge redirects to a local (virtual) method.
The local method was flagged incorrectly as the same type as the bridger which would be interface, hence the error

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

@@ -1940,7 +1940,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 				}
 			}
 			
-			bridgeWriter.invokeVirtual(new JavaMethod(JavaClass.fromInternalName(className, JavaClass.Kind.CLASS), methodInfo.kind, methodInfo.name, methodInfo.compile, signature, methodInfo.modifiers, methodInfo.genericResult));
+			bridgeWriter.invokeVirtual(new JavaMethod(JavaClass.fromInternalName(className, JavaClass.Kind.CLASS), JavaMethod.Kind.INSTANCE, methodInfo.name, methodInfo.compile, signature, methodInfo.modifiers, methodInfo.genericResult));
 			if(expression.header.getReturnType().type != BasicTypeID.VOID) {
 				bridgeWriter.returnType(context.getType(expression.header.getReturnType()));
 			}

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

@@ -878,7 +878,7 @@ public class JavaNativeModule {
             TypeVariable variable = (TypeVariable) type;
             return registry.getGeneric(context.get(variable)).stored();
         }else if(type instanceof AnnotatedType){
-		    final TypeID baseType;
+		    final StoredType storedType;
 		    if(type instanceof AnnotatedParameterizedType) {
                 AnnotatedParameterizedType parameterizedType = (AnnotatedParameterizedType) type;
                 final Type rawType = ((ParameterizedType) parameterizedType.getType()).getRawType();
@@ -889,22 +889,22 @@ public class JavaNativeModule {
                 }
             
                 if(rawType == Map.class) {
-                    baseType = registry.getAssociative(codeParameters[0], codeParameters[1]);
+                    storedType = registry.getAssociative(codeParameters[0], codeParameters[1]).stored();
                 } else {
                     HighLevelDefinition definition = addClass((Class<?>) rawType);
-                    baseType = registry.getForDefinition(definition, codeParameters);
+                    storedType = registry.getForDefinition(definition, codeParameters).stored();
                 }
             } else {
-		        baseType = loadType(context, (AnnotatedElement) ((AnnotatedType) type).getType(), unsigned).type;
+		        storedType = loadType(context, (AnnotatedElement) ((AnnotatedType) type).getType(), unsigned);
             }
             
 		    if(type.isAnnotationPresent(ZenCodeStorageTag.class)) {
 		        //Replace with switch if more StorageTagTypes are added
                 if(type.getAnnotation(ZenCodeStorageTag.class).value() == StorageTagType.STATIC) {
-                    return baseType.stored(StaticStorageTag.INSTANCE);
+                    return storedType.type.stored(StorageTag.union(CodePosition.BUILTIN, storedType.getSpecifiedStorage(), StaticStorageTag.INSTANCE));
                 }
             }
-		    return baseType.stored();
+		    return storedType;
 		    
         } else {
 			throw new IllegalArgumentException("Could not analyze type: " + type);