Merge remote-tracking branch 'Stan/development' into development

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/GetterMember.java

@@ -108,7 +108,7 @@ public class GetterMember extends PropertyMember {
 	}
 
 	@Override
-	public DefinitionMemberRef ref(StoredType type, GenericMapper mapper) {
+	public GetterMemberRef ref(StoredType type, GenericMapper mapper) {
 		return new GetterMemberRef(type, this, mapper);
 	}
 	

CompilerShared/src/main/java/org/openzen/zenscript/compiler/ModuleSpace.java

@@ -33,6 +33,7 @@ public final class ModuleSpace {
 	private final Map<String, ISymbol> globals = new HashMap<>();
 	private final AnnotationDefinition[] annotations;
 	private final StorageType[] storageTypes;
+	private final Map<String, SemanticModule> modules = new HashMap<>();
 	
 	public ModuleSpace(GlobalTypeRegistry registry, List<AnnotationDefinition> annotations, StorageType[] storageTypes) {
 		this.registry = registry;
@@ -44,6 +45,7 @@ public final class ModuleSpace {
 	}
 	
 	public void addModule(String name, SemanticModule dependency) throws CompileException {
+		modules.put(name, dependency);
 		rootPackage.add(name, dependency.modulePackage);
 		dependency.definitions.registerExpansionsTo(expansions);
 		
@@ -59,6 +61,10 @@ public final class ModuleSpace {
 		globals.put(name, global);
 	}
 	
+	public SemanticModule getModule(String name) {
+		return modules.get(name);
+	}
+	
 	public ZSPackage collectPackages() {
 		return rootPackage;
 	}

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareDefinitionVisitor.java

@@ -73,8 +73,8 @@ public class JavaPrepareDefinitionVisitor implements DefinitionVisitor<JavaClass
 			list.addMethod("constructor", JavaMethod.getNativeConstructor(arrayList, "()V"));
 			list.addInstanceMethod("add", "add", "(Ljava/lang/Object;)Z"); List<?> l;
 			list.addInstanceMethod("insert", "add", "(Ljava/lang/Object;I)V");
-			list.addInstanceMethod("remove", "remove", "(java/lang/Object;)Z");
-			list.addInstanceMethod("indexOf", "indexOf", "(java/lang/Object;)I");
+			list.addInstanceMethod("remove", "remove", "(Ljava/lang/Object;)Z");
+			list.addInstanceMethod("indexOf", "indexOf", "(Ljava/lang/Object;)I");
 			list.addInstanceMethod("lastIndexOf", "lastIndexOf", "(Ljava/lang/Object;)I");
 			list.addInstanceMethod("getAtIndex", "get", "(I)Ljava/lang/Object;");
 			list.addInstanceMethod("setAtIndex", "set", "(ILjava/lang/Object;)Ljava/lang/Object;");