Fix nullable types.

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

@@ -240,12 +240,27 @@ public class JavaNativeModule {
 		if ((cls.getModifiers() & Modifier.PUBLIC) == 0)
 			throw new IllegalArgumentException("Class must be public");
 		
-		ZenCodeType.Name name = cls.getDeclaredAnnotation(ZenCodeType.Name.class);
-		String className = name == null ? cls.getName() : name.value();
+		String className = cls.getName();
 		boolean isStruct = cls.getAnnotation(ZenCodeType.Struct.class) != null;
 		
 		ZSPackage classPkg = getPackage(className);
+		ZenCodeType.Name name = cls.getDeclaredAnnotation(ZenCodeType.Name.class);
 		className = className.contains(".") ? className.substring(className.lastIndexOf('.') + 1) : className;
+		if (name != null) {
+			String specifiedName = name.value();
+			if (specifiedName.startsWith(".")) {
+				classPkg = getPackage(specifiedName);
+				className = className.substring(className.lastIndexOf('.') + 1);
+			} else if (specifiedName.indexOf('.') >= 0) {
+				if (!specifiedName.startsWith(pkg.fullName))
+					throw new IllegalArgumentException("Specified @Name as " + specifiedName + " but it's not in the module root package");
+				
+				classPkg = getPackage(basePackage + specifiedName.substring(pkg.fullName.length()));
+				className = className.substring(className.lastIndexOf('.') + 1);
+			} else {
+				className = name.value();
+			}
+		}
 		
 		TypeVariableContext context = new TypeVariableContext();
 		TypeVariable<Class<T>>[] javaTypeParameters = cls.getTypeParameters();
@@ -546,6 +561,14 @@ public class JavaNativeModule {
 	}
 	
 	private StoredType loadType(TypeVariableContext context, Type type, boolean nullable, boolean unsigned) {
+		StoredType result = loadType(context, type, unsigned);
+		if (nullable)
+			result = new StoredType(registry.getOptional(result.type), result.getSpecifiedStorage());
+		
+		return result;
+	}
+	
+	private StoredType loadType(TypeVariableContext context, Type type, boolean unsigned) {
 		if (type instanceof Class) {
 			Class<?> classType = (Class<?>) type;
 			if (unsigned) {

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/Globals.java

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.scriptingexample;
 
 import org.openzen.zencode.java.ZenCodeGlobals;
+import static org.openzen.zencode.java.ZenCodeType.*;
 
 /**
  *
@@ -57,6 +58,12 @@ public class Globals implements ZenCodeGlobals {
 		System.out.println("FunctionalInt: " + calculator.doSomething(7, 13));
 	}
 	
+	@Global
+	public static void testOptional(MyOptionalInterface function) {
+		System.out.println("Null: " + function.doSomething(null));
+		System.out.println("Hello: " + function.doSomething("hello"));
+	}
+	
 	public static TestClass bracket(String value) {
 		return new TestClass(value);
 	}
@@ -70,4 +77,9 @@ public class Globals implements ZenCodeGlobals {
 	public static interface MyFunctionalInterfaceInt {
 		int doSomething(int valueA, int valueB);
 	}
+	
+	@FunctionalInterface
+	public static interface MyOptionalInterface {
+		int doSomething(@Nullable String value);
+	}
 }

Validator/src/main/java/org/openzen/zenscript/validator/visitors/ExpressionValidator.java

@@ -286,6 +286,7 @@ public class ExpressionValidator implements ExpressionVisitor<Void> {
 
 	@Override
 	public Void visitFunction(FunctionExpression expression) {
+		
 		// TODO
 		return null;
 	}