WIP: Don't NPE when a Method declares a Native annotation but the Jav…

…aPrepareDefinitionVisitor does not define it

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java

@@ -218,6 +218,10 @@ public Void visitSetter(SetterMember member) {
 	@Override
 	public Void visitOperator(OperatorMember member) {
 		final JavaCompilingMethod javaMethod = class_.getMethod(member);
+		if (!javaMethod.compile) {
+			return null;
+		}
+
 		final MethodMember methodMember = new MethodMember(member.position, member.definition, member.getEffectiveModifiers(), javaMethod.compiled.name, member.header);
 		methodMember.body = member.body;
 		methodMember.annotations = member.annotations;

JavaShared/src/main/java/org/openzen/zenscript/javashared/compiling/JavaCompilingClass.java

@@ -125,29 +125,33 @@ public void addMethod(MethodSymbol method, NativeTag native_) {
 		if (native_ != null && nativeClass != null) {
 			final String signature = getContext().getMethodSignature(method.getHeader());
 			JavaMethod method1 = nativeClass.getMethod(native_.value);
-			addMethod(method, method1.asCompilingMethod(compiled, signature), method1);
-		} else {
-			final JavaNativeMethod.Kind kind = getKind(method);
-			final String descriptor;
-			final String signature;
-			if (kind == JavaNativeMethod.Kind.EXPANSION) {
-				descriptor = getContext().getMethodDescriptorExpansion(method.getHeader(), method.getTargetType());
-				signature = getContext().getMethodSignatureExpansion(method.getHeader(), method.getTargetType());
-			} else {
-				descriptor = getContext().getMethodDescriptor(method.getHeader());
-				signature = getContext().getMethodSignature(method.getHeader());
+			if (method1 != null) {
+				addMethod(method, method1.asCompilingMethod(compiled, signature), method1);
+				return;
 			}
-			JavaNativeMethod javaMethod = new JavaNativeMethod(
-					compiled,
-					kind,
-					method.getID().accept(MethodNamer.INSTANCE),
-					true,
-					descriptor,
-					JavaModifiers.getJavaModifiers(method.getModifiers()),
-					getContext().isGenericReturn(method.getHeader().getReturnType()),
-					method.getHeader().useTypeParameters());
-			addMethod(method, new JavaCompilingMethod(compiled, javaMethod, signature));
+
 		}
+
+		final JavaNativeMethod.Kind kind = getKind(method);
+		final String descriptor;
+		final String signature;
+		if (kind == JavaNativeMethod.Kind.EXPANSION) {
+			descriptor = getContext().getMethodDescriptorExpansion(method.getHeader(), method.getTargetType());
+			signature = getContext().getMethodSignatureExpansion(method.getHeader(), method.getTargetType());
+		} else {
+			descriptor = getContext().getMethodDescriptor(method.getHeader());
+			signature = getContext().getMethodSignature(method.getHeader());
+		}
+		JavaNativeMethod javaMethod = new JavaNativeMethod(
+				compiled,
+				kind,
+				method.getID().accept(MethodNamer.INSTANCE),
+				true,
+				descriptor,
+				JavaModifiers.getJavaModifiers(method.getModifiers()),
+				getContext().isGenericReturn(method.getHeader().getReturnType()),
+				method.getHeader().useTypeParameters());
+		addMethod(method, new JavaCompilingMethod(compiled, javaMethod, signature));
 	}
 
 	public void addDependency(DefinitionSymbol symbol) {