- Fix auto getters & setters for static fields not being static

- Fix getters for globals not having their corresponding fields registered correctly in the native implementation
- Added java sources for JavaScripting

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

@@ -5,11 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.member;
 
-import java.lang.reflect.Modifier;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression;
@@ -65,8 +65,9 @@ public class FieldMember extends PropertyMember {
 				parameters[i] = registry.getGeneric(definition.typeParameters[i]);
 		}
 		
+		int autoMemberModifiers = modifiers & Modifiers.STATIC;
 		if (autoGetterAccess != 0) {
-			this.autoGetter = new GetterMember(position, definition, autoGetterAccess, name, type, null);
+			this.autoGetter = new GetterMember(position, definition, autoGetterAccess | autoMemberModifiers, name, type, null);
 			this.autoGetter.setBody(new ReturnStatement(position, new GetFieldExpression(
 					position,
 					new ThisExpression(position, thisType),
@@ -75,7 +76,7 @@ public class FieldMember extends PropertyMember {
 			this.autoGetter = null;
 		}
 		if (autoSetterAccess != 0) {
-			this.autoSetter = new SetterMember(position, definition, autoSetterAccess, name, type, null);
+			this.autoSetter = new SetterMember(position, definition, autoSetterAccess | autoMemberModifiers, name, type, null);
 			this.autoSetter.setBody(new ExpressionStatement(position, new SetFieldExpression(
 					position,
 					new ThisExpression(position, thisType),

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

@@ -167,7 +167,9 @@ public class JavaNativeModule {
 			String name = global.value().isEmpty() ? field.getName() : global.value();
 			FieldMember fieldMember = new FieldMember(CodePosition.NATIVE, definition, Modifiers.PUBLIC | Modifiers.STATIC, name, thisType, type, registry, Modifiers.PUBLIC, 0, null);
 			definition.addMember(fieldMember);
-			compiled.setFieldInfo(fieldMember, new JavaField(jcls, name, getDescriptor(field.getType())));
+			JavaField javaField = new JavaField(jcls, name, getDescriptor(field.getType()));
+			compiled.setFieldInfo(fieldMember, javaField);
+			compiled.setFieldInfo(fieldMember.autoGetter, javaField);
 			globals.put(name, new ExpressionSymbol((position, scope) -> new StaticGetterExpression(CodePosition.BUILTIN, fieldMember.autoGetter.ref(thisType, GenericMapper.EMPTY))));
 		}
 		

JavaScripting/build.gradle

@@ -12,7 +12,9 @@ jar {
 	dependsOn javaScriptingProjects.collect{ it+":compileJava"}
     from files(javaScriptingProjects.collect{ project(it).sourceSets.main.output })
 }
-
+sourcesJar {
+    from files(javaScriptingProjects.collect { project(it).sourceSets.main.allSource })
+}
 install {
 	repositories.mavenInstaller {
 		pom.artifactId = 'zencode-javascripting'

ScriptingExample/scripts/integration.zs

@@ -15,3 +15,5 @@ class TestOperators {
 
 val testInstance = new TestOperators();
 //testInstance("something");
+
+something.dump();

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

@@ -14,6 +14,9 @@ import org.openzen.zencode.java.ZenCodeGlobals;
 public class Globals implements ZenCodeGlobals {
 	private Globals() {}
 	
+	@Global
+	public static TestClass something = new TestClass("hello");
+	
 	@Global
 	public static void println(String message) {
 		System.out.println(message);

common.gradle

@@ -6,7 +6,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 String mavenGroupId = 'org.openzen.zencode'
-String mavenVersion = '0.3.0'
+String mavenVersion = '0.3.1'
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -23,11 +23,13 @@ String mavenArtifactId = name
 
 group = mavenGroupId
 version = mavenVersion
-
 task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') {
     classifier = 'sources'
     from sourceSets.main.allSource
 }
+artifacts {
+	archives sourcesJar
+}
 
 configure(install.repositories.mavenInstaller) {
     pom.project {