I'm trying

dirty way: loads dithered/passthru shader according to the game's config (boolean fxdither)

.gitignore

@@ -1,15 +1,10 @@
 out/*
 bin/*
-build/*
-.gradle/*
 hs_err_pid*
 Thumbs.db
 *.jar
 .DS_Store
 ~$*
-assets/mods/basegame/demoworld
-assets/mods/basegame/demoworld.gz
+assets/modules/basegame/demoworld
+assets/modules/basegame/demoworld.gz
 external_resource_packs.zip
-workspace.xml
-.tmp*
-tmp_*

.idea/compiler.xml

@@ -4,12 +4,6 @@
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
     </annotationProcessing>
-    <bytecodeTargetLevel target="10">
-      <module name="terrarum_main" target="11" />
-      <module name="terrarum_test" target="11" />
-    </bytecodeTargetLevel>
-  </component>
-  <component name="JavacSettings">
-    <option name="PREFER_TARGET_JDK_COMPILER" value="false" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>

.idea/kotlinc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Kotlin2JsCompilerArguments">
-    <option name="sourceMapEmbedSources" />
-  </component>
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>

.idea/libraries/KotlinJavaRuntime.xml

@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="KotlinJavaRuntime">
-    <CLASSES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/lib.xml

@@ -4,10 +4,9 @@
       <root url="file://$PROJECT_DIR$/lib" />
     </CLASSES>
     <JAVADOC>
+      <root url="http://slick.ninjacave.com/javadoc/" />
       <root url="file://$PROJECT_DIR$/lib/javadoc" />
       <root url="http://libgdx.badlogicgames.com/nightlies/docs/api/" />
-      <root url="https://libgdx.badlogicgames.com/ci/nightlies/docs/api/" />
-      <root url="jar://$PROJECT_DIR$/lib/javadoc/gdx-docs.zip!/" />
     </JAVADOC>
     <NATIVE>
       <root url="file://$PROJECT_DIR$/lib" />

.idea/misc.xml

@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/modules.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/Terrarum_renewed.iml" filepath="$PROJECT_DIR$/Terrarum_renewed.iml" />
       <module fileurl="file://$PROJECT_DIR$/ingamemodule_basegame/ingamemodule_basegame.iml" filepath="$PROJECT_DIR$/ingamemodule_basegame/ingamemodule_basegame.iml" />
-      <module fileurl="file://$PROJECT_DIR$//terrarum.iml" filepath="$PROJECT_DIR$//terrarum.iml" group="terrarum" />
     </modules>
   </component>
 </project>

.idea/modules/terrarum.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="terrarum" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules/terrarum_main.iml

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="terrarum:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/AppleJavaExtensions-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../Could not find org.jetbrains.kotlin:kotlin-stdlib:.&#13;&#10;Searched in the following locations: file:/C:/Users/minjaesong/Documents/terrarum/lib/kotlin-stdlib.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/Terrarum_Joise.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/TerrarumSansBitmap.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/opus-wrapper-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/luaj-jse-3.0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jorbis-0.0.17.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jopus.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jogg-0.0.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jnlp.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/icu4j-63_1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/icu4j-63_1-src.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/icu4j-63_1-docs.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gson-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/GetCpuName.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-natives.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-backend-lwjgl3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-backend-lwjgl.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-backend-lwjgl-natives.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/Concentus-1.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/commons-csv-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/commons-codec-1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>

.idea/modules/terrarum_test.iml

@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="terrarum:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/Terrarum_Joise.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/TerrarumSansBitmap.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/opus-wrapper-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/luaj-jse-3.0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jorbis-0.0.17.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jopus.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jogg-0.0.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jnlp.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/icu4j-63_1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/icu4j-63_1-src.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/icu4j-63_1-docs.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gson-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/GetCpuName.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-natives.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-backend-lwjgl3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-backend-lwjgl.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/gdx-backend-lwjgl-natives.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/Concentus-1.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/commons-csv-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/commons-codec-1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/AppleJavaExtensions-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-  <component name="TestModuleProperties" production-module="terrarum_main" />
-</module>

Terrarum_renewed.iml

@@ -19,16 +19,10 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/kotlin-runtime.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/kotlin-reflect.jar!/" />
-          <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
-          <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
-          <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/lib/kotlin-runtime-sources.jar!/" />
-          <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
-          <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
-          <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

assets/18BitColour.frag

@@ -0,0 +1,14 @@
+varying vec4 v_color;
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
+
+void main(void) {
+    vec4 color = texture2D(u_texture, v_texCoords).rgba;
+
+    color.r = floor(63.0 * color.r + 0.5) / 63.0;
+    color.g = floor(63.0 * color.g + 0.5) / 63.0;
+    color.b = floor(63.0 * color.b + 0.5) / 63.0;
+    // a: passthrough
+
+    gl_FragColor = vec4(color.rgb, 0.0);
+}

assets/aaaxmul.frag

@@ -8,13 +8,10 @@ varying vec2 v_texCoords;
 uniform sampler2D u_texture; // world texture, has alpha value that is meaningful
 
 uniform sampler2D tex1; // lightmap texture
-uniform vec2 tex1Offset;
 
 void main() {
 	vec4 colorTex0 = texture2D(u_texture, v_texCoords); // world texture
     vec4 colorTex1 = texture2D(tex1, v_texCoords); // lightmap (RGBA)
 
-    colorTex1 = vec4(colorTex1.www, 1.0);
-
-    gl_FragColor = colorTex0 * colorTex1;
+    gl_FragColor = colorTex0 * vec4(colorTex1.aaa, 1.0);
 }

assets/aonly.frag

@@ -3,6 +3,6 @@ varying vec2 v_texCoords;
 uniform sampler2D u_texture;
 
 void main(void) {
-    vec3 alpha = texture2D(u_texture, v_texCoords).aaa;
-    gl_FragColor = vec4(alpha, 1.0);
+    float alpha = texture2D(u_texture, v_texCoords).a;
+    gl_FragColor = vec4(alpha, alpha, alpha, 1.0);
 }

assets/crt.frag

@@ -11,17 +11,17 @@ uniform sampler2D u_texture;
 uniform vec2 resolution;
 
 uniform vec3 phosphor_colour = vec3(1.3, 0.8567, 0.0);
-vec3 scanline_darkening = vec3(0.66, 0.66, 0.66);
+vec3 scanline_darkening = vec3(0.45, 0.45, 0.45);
 
 // 0: every odd line will get darkened; 1: every even line will get darkened
 uniform float alternative_scanline = 0.0; // 1.0: true
 
-uniform float blur_blend = 0.5;
+uniform float blur_blend = 0.3;
 
 void main(void) {
-    vec4 color = texture2D(u_texture, v_texCoords).rgba;
-    vec4 color_pre =  texture2D(u_texture, (v_texCoords + (vec2(-1.0, 0.0) / resolution))).rgba;
-    vec4 color_next = texture2D(u_texture, (v_texCoords + (vec2( 1.0, 0.0) / resolution))).rgba;
+    vec3 color = texture2D(u_texture, v_texCoords).rgb;
+    vec3 color_pre =  texture2D(u_texture, (gl_FragCoord + vec2(-1.0, 0.0)) / resolution).rgb;
+    vec3 color_next = texture2D(u_texture, (gl_FragCoord + vec2( 1.0, 0.0)) / resolution).rgb;
 
     color = color * (1.0 - blur_blend) + color_pre * (blur_blend / 2.0) + color_next * (blur_blend / 2.0);
 
@@ -34,12 +34,11 @@ void main(void) {
     ) / 8.0;
 
     // out colour
-    vec3 out_color = vec3(color_luminosity) * phosphor_colour;
+    color = vec3(color_luminosity) * phosphor_colour;
 
     if (is_scanline) {
-        out_color = out_color * scanline_darkening;
+        color = color * scanline_darkening;
     }
 
-    gl_FragColor = vec4(out_color, 1);
-    //gl_FragColor = texture2D(u_texture, v_texCoords);
+    gl_FragColor = vec4(color, 1.0);
 }

assets/hicolour.frag

@@ -1,58 +0,0 @@
-#version 120
-#ifdef GL_ES
-    precision mediump float;
-#endif
-
-
-varying vec4 v_color;
-varying vec2 v_texCoords;
-uniform sampler2D u_texture;
-
-
-// "steps" of R, G and B. Must be integer && equal or greater than 2
-uniform float rcount = 32.0;
-uniform float gcount = 32.0;
-uniform float bcount = 32.0;
-uniform float acount = 1.0;
-
-int bayer[14 * 14] = int[](131,187,8,78,50,18,134,89,155,102,29,95,184,73,22,86,113,171,142,105,34,166,9,60,151,128,40,110,168,137,45,28,64,188,82,54,124,189,80,13,156,56,7,61,186,121,154,6,108,177,24,100,38,176,93,123,83,148,96,17,88,133,44,145,69,161,139,72,30,181,115,27,163,47,178,65,164,14,120,48,5,127,153,52,190,58,126,81,116,21,106,77,173,92,191,63,99,12,76,144,4,185,37,149,192,39,135,23,117,31,170,132,35,172,103,66,129,79,3,97,57,159,70,141,53,94,114,20,49,158,19,146,169,122,183,11,104,180,2,165,152,87,182,118,91,42,67,25,84,147,43,85,125,68,16,136,71,10,193,112,160,138,51,111,162,26,194,46,174,107,41,143,33,74,1,101,195,15,75,140,109,90,32,62,157,98,167,119,179,59,36,130,175,55,0,150);
-float bayerSize = 14.0;
-
-
-float bayerDivider = bayerSize * bayerSize;
-
-
-vec4 gammaIn(vec4 col) {
-    return pow(col, vec4(2.2));
-}
-
-vec4 gammaOut(vec4 col) {
-    return pow(col, vec4(1.0 / 2.2));
-}
-
-vec4 nearestColour(vec4 incolor) {
-    vec4 rgbaCounts = vec4(rcount, gcount, bcount, acount);
-
-
-    vec4 color = incolor;
-
-    color.r = floor((rgbaCounts.r - 1.0) * color.r + 0.5) / (rgbaCounts.r - 1.0);
-    color.g = floor((rgbaCounts.g - 1.0) * color.g + 0.5) / (rgbaCounts.g - 1.0);
-    color.b = floor((rgbaCounts.b - 1.0) * color.b + 0.5) / (rgbaCounts.b - 1.0);
-    color.a = 1.0;//floor((rgbaCounts.a - 1.0) * color.a + 0.5) / (rgbaCounts.a - 1.0);
-
-    return color;
-}
-
-void main(void) {
-    float spread = 1.0 / (0.299 * (rcount - 1.0) + 0.587 * (gcount - 1.0) + 0.114 * (bcount - 1.0));  // this spread value is optimised one -- try your own values for various effects!
-
-
-    // create texture coordinates based on pixelSize //
-    vec4 inColor = (texture2D(u_texture, v_texCoords));
-
-    vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));
-
-    gl_FragColor = nearestColour(inColor + spread * (bayer[int(entry.y) * int(bayerSize) + int(entry.x)] / bayerDivider - 0.5));
-
-}

assets/mods/basegame/blocks/Terrain - Air tile must have black transparent tile, NOT white.txt

@@ -1 +0,0 @@
-Air tile (tile 0,0) must have colour of 0x00000000, NOT 0xFFFFFF00. You can modify the tga file directly to correct bad exporter behaviour.

assets/mods/basegame/metadata.properties

@@ -1,42 +0,0 @@
-# The name that will be displayed in game
-propername=Terrarum
-
-# The description
-description=The base game
-
-# Author of the module
-author=Terrarum
-
-# Name of the entry script
-# Entry script must inherit net.torvald.terrarum.ModuleEntryPoint
-entrypoint=net.torvald.terrarum.modulebasegame.EntryPoint
-
-# Release date in YYYY-MM-DD
-releasedate=2017-07-14
-
-# The version, must be ^[0-9]+(\.[0-9]+)*$ in regex
-# e.g.  0.1    0.1.1347
-# e.g.  1      1.0.58385.02
-# e.g.  26558  0.0.0.0.0.1
-version=0.2.0
-
-# External JARs the module might use, separate multiple by semicolon (;)
-libraries=
-
-# Modules that must be pre-installed, separate multiple by semicolon (;)
-# Dependency syntax: "module name space allowed 444.44+"
-# Version number: + means equal or higher, ! means this exact number, - denotes interval, * is wildcard
-#                 the default is equal or lower
-# e.g.  1.4+   would allow 1.4, 0.6, 1.13, 1.42, 1.4.0, 1.4.4456
-# e.g.  10+.2  would allow 10.2, 10.1, 11.0 but would not allow any integer version (v10.0 != v10)
-# e.g.  10.4!  would allow 10.4, 9.4, 8.4, 7.4
-# e.g.  10.3-11.4 would allow 10.3, 10.7, 10.12676, 11.0, 11.4 but not integer v11, 10.3.12 etc.
-# e.g.  13!.5  would allow 13.0, 13.1, 13.2, 13.3, 13.4 and 13.5
-# e.g.  *      would allow any version possible
-# e.g.  *.*    would allow any version on that scheme
-# e.g.  *!     would only allow all integer version
-# NOTE: it's your responsibility that your mod's version scheme would not be a total mess!
-# real world examples:
-#       BaseGame 1.0+; CommandLineRenewed 2!.0+; Basegame 1!.0+; ScreenRecorder *; MyScrRecHack 1.*
-# Can you decode them? This is for hypothetical screen recorder mod.
-dependency=

assets/modules/basegame/items/testpick.nope

@@ -4,10 +4,10 @@
  */
 
 
-import net.torvald.terrarum.Point2d
+import net.torvald.point.Point2d
 import net.torvald.terrarum.Terrarum
-import net.torvald.terrarum.gameactors.AVKey
-import net.torvald.terrarum.gameactors.ActorWBMovable
+import net.torvald.terrarum.modulebasegame.gameactors.AVKey
+import net.torvald.terrarum.modulebasegame.gameactors.ActorWithPhysics
 import net.torvald.terrarum.itemproperties.Calculate
 import net.torvald.terrarum.itemproperties.GameItem
 import net.torvald.terrarum.itemproperties.Material
@@ -55,12 +55,12 @@ class TestPick extends GameItem {
     }
 
     @Override
-    boolean startPrimaryUse(float delta) {
+    boolean primaryUse(float delta) {
         int mouseTileX = Terrarum.getMouseTileX()
         int mouseTileY = Terrarum.getMouseTileY()
 
         def mousePoint = new Point2d(mouseTileX, mouseTileY)
-        def actorvalue = Terrarum.ingame.playableActor.actorValue
+        def actorvalue = Terrarum.ingame.player.actorValue
 
         using = true
 
@@ -80,7 +80,7 @@ class TestPick extends GameItem {
 
         Terrarum.ingame.world.inflictTerrainDamage(
                 mouseTileX, mouseTileY,
-                Calculate.pickaxePower(Terrarum.ingame.playableActor, material) * swingDmgToFrameDmg
+                Calculate.pickaxePower(Terrarum.ingame.player, material) * swingDmgToFrameDmg
         )
 
         return true
@@ -90,7 +90,7 @@ class TestPick extends GameItem {
     boolean endPrimaryUse(float delta) {
         using = false
         // reset action timer to zero
-        Terrarum.ingame.playableActor.actorValue.set(AVKey.__ACTION_TIMER, 0.0)
+        Terrarum.ingame.player.actorValue.set(AVKey.__ACTION_TIMER, 0.0)
         return true
     }
 }