Added Signature to JavaField constructor

Was an instance field all along, but always set to null

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaField.java

@@ -13,12 +13,17 @@ public class JavaField {
 	public final JavaClass cls;
 	public final String name;
 	public final String descriptor;
-	public final String signature = null; // TODO: calculate signature too
+	public final String signature; // TODO: calculate signature too
 	
 	public JavaField(JavaClass cls, String name, String descriptor) {
+		this(cls, name, descriptor, null);
+	}
+
+	public JavaField(JavaClass cls, String name, String descriptor, String signature) {
 		this.cls = cls;
 		this.name = name;
 		this.descriptor = descriptor;
+		this.signature = signature;
 	}
 	
 	public String getMapping(JavaClass definition) {

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

@@ -76,13 +76,13 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 			System.out.println("Class " + cls.fullName + " not empty because of const " + member.name);
 		
 		cls.empty = false;
-		module.setFieldInfo(member, new JavaField(cls, member.name, context.getDescriptor(member.getType())));
+		module.setFieldInfo(member, new JavaField(cls, member.name, context.getDescriptor(member.getType()), context.getSignature(member.getType())));
 		return null;
 	}
 	
 	@Override
 	public Void visitField(FieldMember member) {
-		JavaField field = new JavaField(cls, member.name, context.getDescriptor(member.getType()));
+		JavaField field = new JavaField(cls, member.name, context.getDescriptor(member.getType()), context.getSignature(member.getType()));
 		module.setFieldInfo(member, field);
 		if (member.hasAutoGetter()) {
 			visitGetter(member.autoGetter);

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

@@ -61,7 +61,7 @@ public class JavaPrepareExpansionMethodVisitor implements MemberVisitor<Void> {
 	
 	@Override
 	public Void visitConst(ConstMember member) {
-		JavaField field = new JavaField(cls, member.name, context.getDescriptor(member.getType()));
+		JavaField field = new JavaField(cls, member.name, context.getDescriptor(member.getType()), context.getSignature(member.getType()));
 		module.setFieldInfo(member, field);
 		
 		if (DEBUG_EMPTY && cls.empty)
@@ -74,7 +74,7 @@ public class JavaPrepareExpansionMethodVisitor implements MemberVisitor<Void> {
 	@Override
 	public Void visitField(FieldMember member) {
 		// TODO: expansion fields
-		JavaField field = new JavaField(cls, member.name, context.getDescriptor(member.getType()));
+		JavaField field = new JavaField(cls, member.name, context.getDescriptor(member.getType()), context.getSignature(member.getType()));
 		module.setFieldInfo(member, field);
 		
 		if (member.hasAutoGetter() || member.hasAutoSetter())