I'm trying

.gitattributes

@@ -3,6 +3,3 @@
 *.tga filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.opus filter=lfs diff=lfs merge=lfs -text
-*.pdf filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.kra filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,45 +1,10 @@
-# Build-related
 out/*
 bin/*
-build/*
-.gradle/*
-TerrarumBuild.jar
-
-# Java native errors
 hs_err_pid*
-replay_pid*
-
-# OS files
 Thumbs.db
+*.jar
 .DS_Store
-desktop.ini
-.directory
-*/.directory
-
-# Resources that should not be tracked
-assets/mods/basegame/demoworld
-external_resource_packs
-#assets/mods/basegame/demoworld.gz
-external_resource_packs.zip
-
-# IntelliJ
-workspace.xml
-
-# Temporary files
-.tmp*
-tmp_*
-*.bak
-## Microsoft Office
 ~$*
-## Generic temp files in Linux
-*~
-## Vim temp files
-*.swp
-*.swo
-
-# Eclipse MAT heap files
-*.hprof
-*.bin
-*.index
-*.threads
-*_Leak_Suspects.zip
+assets/modules/basegame/demoworld
+assets/modules/basegame/demoworld.gz
+external_resource_packs.zip

.idea/artifacts/TerrarumBuild.xml

@@ -5,10 +5,7 @@
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
       </element>
-      <element id="library" level="project" name="KotlinJavaRuntime" />
-      <element id="library" level="project" name="lib" />
-      <element id="module-output" name="ingamemodule_basegame" />
-      <element id="module-output" name="terrarum" />
+      <element id="module-output" name="Terrarum_renewed" />
     </root>
   </artifact>
 </component>

.idea/compiler.xml

@@ -4,9 +4,6 @@
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
     </annotationProcessing>
-    <bytecodeTargetLevel target="8" />
-  </component>
-  <component name="JavacSettings">
-    <option name="PREFER_TARGET_JDK_COMPILER" value="false" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,23 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ArrayEquality" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ConstantConditionIf" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="CsvValidation" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ExplicitThis" enabled="false" level="INFORMATION" enabled_by_default="false" />
-    <inspection_tool class="KotlinDoubleNegation" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NullChecksToSafeCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="RedundantCompanionReference" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="RedundantExplicitType" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="RedundantGetter" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="RedundantSetter" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="RedundantUnitExpression" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="RedundantUnitReturnType" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="RemoveCurlyBracesFromTemplate" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="RemoveEmptyPrimaryConstructor" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="RemoveEmptySecondaryConstructorBody" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="RemoveRedundantBackticks" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="RemoveRedundantQualifierName" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="RemoveSingleExpressionStringTemplate" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.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,18 +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!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlinx-coroutines-core-1.0.1.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlinx-coroutines-io-jvm-0.1.1.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlinx-coroutines-jdk8-1.0.1.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/com_badlogicgames_gdx_gdx_backend_lwjgl3_1_9_10.xml

@@ -1,53 +0,0 @@
-<component name="libraryTable">
-  <library name="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10" type="repository">
-    <properties maven-id="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-natives-macos.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-natives-macos.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-natives-macos.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-natives-macos.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-natives-macos.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/com_badlogicgames_gdx_gdx_backend_lwjgl_1_9_10.xml

@@ -1,41 +0,0 @@
-<component name="libraryTable">
-  <library name="com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10" type="repository">
-    <properties maven-id="com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-2.9.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-platform-2.9.3-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-platform-2.9.3-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-platform-2.9.3-natives-osx.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jinput-2.0.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jutils-1.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jinput-platform-2.0.5-natives-linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jinput-platform-2.0.5-natives-windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jinput-platform-2.0.5-natives-osx.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl_util-2.9.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-2.9.3-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jinput-2.0.5-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jutils-1.0.0-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl_util-2.9.3-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl-2.9.3-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jinput-2.0.5-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jutils-1.0.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/lwjgl_util-2.9.3-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/com_badlogicgames_gdx_gdx_controllers_desktop_1_9_10.xml

@@ -1,20 +0,0 @@
-<component name="libraryTable">
-  <library name="com.badlogicgames.gdx:gdx-controllers-desktop:1.9.10" type="repository">
-    <properties maven-id="com.badlogicgames.gdx:gdx-controllers-desktop:1.9.10" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/com_badlogicgames_gdx_gdx_controllers_platform_1_9_10.xml

@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="com.badlogicgames.gdx:gdx-controllers-platform:1.9.10" type="repository">
-    <properties maven-id="com.badlogicgames.gdx:gdx-controllers-platform:1.9.10" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-platform-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/com_badlogicgames_gdx_gdx_platform_1_9_10.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="com.badlogicgames.gdx:gdx-platform:1.9.10" type="repository">
-    <properties maven-id="com.badlogicgames.gdx:gdx-platform:1.9.10" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/gdx-platform-1.9.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/lib.xml

@@ -4,17 +4,22 @@
       <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/" />
     </JAVADOC>
     <NATIVE>
       <root url="file://$PROJECT_DIR$/lib" />
+      <root url="file://$PROJECT_DIR$/lib/x86" />
+      <root url="file://$PROJECT_DIR$/lib/x86_64" />
     </NATIVE>
     <SOURCES>
+      <root url="file://$PROJECT_DIR$/lib/source" />
       <root url="jar://$PROJECT_DIR$/lib/Terrarum_Joise.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/source/gdx-backend-lwjgl-sources.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/TerrarumSansBitmap.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/prtree.jar!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/source" recursive="false" type="SOURCES" />
   </library>
 </component>

.idea/markdown-exported-files.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownExportedFiles">
-    <htmlFiles />
-    <imageFiles />
-    <otherFiles />
-  </component>
-</project>

.idea/markdown-navigator/profiles_settings.xml

@@ -1,3 +1,3 @@
 <component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" plain-text-search-scope="Project Files" />
+  <settings default="" pdf-export="" />
 </component>

.idea/misc.xml

@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_242" 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>

COPYING.md

@@ -1,6 +1,6 @@
 *Terrarum*
 
-Copyright (C) 2013-2020 Minjaesong (Torvald)
+Copyright (C) 2013-2018 Minjaesong (Torvald) 
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 *Terrarum Sans Bitmap*
 
-Copyright (c) 2017-2019 Minjae Song (Torvald) and the contributors
+Copyright (c) 2017 Minjae Song (Torvald) and the contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -66,7 +66,7 @@ limitations under the License.
 *Accidental Noise Library*
 
 Joise is a derivative work based on Josua Tippetts' C++ library:
-<http://accidentalnoise.sourceforge.net/index.html>
+http://accidentalnoise.sourceforge.net/index.html
 
 Copyright (C) 2011 Joshua Tippetts
 
@@ -90,7 +90,7 @@ Copyright (C) 2011 Joshua Tippetts
 
 *Vector2.java*, *Epsilon.java*
 
-Copyright (c) 2010-2015 William Bittle  <http://www.dyn4j.org/>
+Copyright (c) 2010-2015 William Bittle  http://www.dyn4j.org/
 All rights reserved.
   
 Redistribution and use in source and binary forms, with or without modification, are permitted
@@ -127,7 +127,7 @@ Ambient sound recordings:
     crickets_02.ogg
 
 Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld
-Sound from <http://www.freesound.org/people/klankbeeld/>
+Sound from http://www.freesound.org/people/klankbeeld/
 
 ----
 
@@ -155,39 +155,6 @@ THE SOFTWARE.
 
 ----
 
-PRTree, a Priority R-Tree, a spatial index for java code
-
-Copyright (c) 2008-2012 Robert Olofsson.
-All rights reserved. 
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met: 
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer. 
-
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution. 
-
-3. Neither the name of the authors nor the names of its contributors 
-   may be used to endorse or promote products derived from this software 
-   without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE 
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
-SUCH DAMAGE.
-
-----
 
 Some of the resources were created by _raxod502_.
 
@@ -209,4 +176,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

REFERENCING.md

@@ -3,11 +3,10 @@
 |0..4095|Tiles (4096 possible)|
 |4096..8191|Walls (4096 possible)|
 |8192..8447|Wires (256 possible)|
-|8448..0x0F_FFFF|Items (static) (1M possible)|
-|0x10_0000..0x0FFF_FFFF|Items (dynamic\*) (267M possible)|
-|0x1000_0000..0x7FFF_FFFF|Actors (1879M possible)|
-|-1..-65536|Virtual Tiles|
-|-2147483648..-65537 (all negative numbers)|Faction (2147M possible)|
+|8448..32767|Items (static) (24320 possible)|
+|32768..0x0FFF_FFFF|Items (dynamic\*) (268M possible)|
+|0x1000_0000..0x7FFF_FFFF|Actors|
+|-2147483648..-1 (all negative numbers)|Faction|
 
 * dynamic items have own properties that will persist through savegame.
 
@@ -15,10 +14,7 @@ Actors range in-depth
 
 |Range|Description|
 |-----|-----------|
-|0x1000_0000..0x1FFF_FFFF|Rendered behind (e.g. tapestries)|
-|0x2000_0000..0x4FFF_FFFF|Regular actors (e.g. almost all of them)|
-|0x5000_0000..0x5FFF_FFFF|Special (e.g. weapon swung, bullets, dropped item, particles)|
-|0x6000_0000..0x6FFF_FFFF|Rendered front (e.g. fake tile)|
-|0x7000_0000..0x7FFF_FFFF|Rendered as screen overlay, not affected by light nor environment overlays|
-
-Actor IDs are assigned in 256 groups, single actor can have 256 sub-actors
+|0x1000_0000..0x1FFF_FFFF|Rendered behind (e.g. tapestries)
+|0x2000_0000..0x5FFF_FFFF|Regular actors (e.g. almost all of them)
+|0x6000_0000..0x6FFF_FFFF|Special (e.g. weapon swung, bullets, dropped item, particles)
+|0x7000_0000..0x7FFF_FFFF|Rendered front (e.g. fake tile)

SYSTEM_REQUIREMENTS.md

@@ -1,11 +1,11 @@
 ## Minimum requirements ##
 
 * Processor with 2.4 GHz speed
-* GeForce MX 150
-* 4 GB of RAM
+* GPU that can support OpenGL 2.1, is capable of 4K texture
+* 6 GB of RAM
 * 4 GB of free disk space
 * Windows Vista/Mac OS X Lion or higher (Mac OS X Snow Leopard is incompatible with a shader the game uses)
-* PC: Java 8
+* PC: Java 8, Up-to-date graphics driver
 
 ## Recommended requirements ##
 
@@ -14,13 +14,12 @@
 * 8 GB of RAM
 * 8 GB of free disk space
 * Windows Vista/Mac OS X Lion or higher
-* PC: Java 8
+* PC: Java 8, Up-to-date graphics driver
 
-## Tested environments ##
+## Tested environment ##
 
 (to devs: please extend this list with your test results!)
 
-* MacBookPro9,2 (MacBook Pro 13 inch mid-2012) -- shader don't work
-* Intel 6700K, nVidia GTX970, Windows 10 -- fully works
-* Intel 6600, nVidia GT 710, Windows 8 -- unplayable framerate
-* Intel 8265U, Intel UHD620/nVidia MX 250, Windows 10 -- fully works with Intel iGPU (24 fps), fully works with MX 250 (66 fps)
+* MacBookPro9,2 (MacBook Pro 13 inch mid-2012)
+* Intel 6700K, nVidia GTX970, Windows 10
+

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/4096_bayer_skyboxfill.frag

@@ -20,8 +20,6 @@ uniform float rcount = 64.0; // it even works on 256.0!
 uniform float gcount = 64.0; // using 64: has less banding and most monitors are internally 6-bit
 uniform float bcount = 64.0;
 
-// inverted zoom; this value must set to (1f/zoom)
-uniform float zoomInv = 1.0;
 
 /*int bayer[7 * 7] = int[](
 32,42,10,27,37,5,15,
@@ -74,13 +72,12 @@ void main(void) {
 
     float scale = v_texCoords.y * (1.0 - parallax_size) + (parallax_size / 2.0) + (parallax * parallax_size / 2.0);
 
-    float zoomSamplePoint = (1.0 - zoomInv) / 2.0; // will never quite exceed 0.5
 
-    // I don't even know if it works, and also not sure if I actually want it
-    vec3 newBottom = mix(bottomColor, topColor, zoomSamplePoint);
-    vec3 newTop = mix(topColor, bottomColor, zoomSamplePoint);
+    float inR = mix(bottomColor.r, topColor.r, scale);
+    float inG = mix(bottomColor.g, topColor.g, scale);
+    float inB = mix(bottomColor.b, topColor.b, scale);
 
-    vec4 inColor = vec4(mix(newBottom, newTop, scale), 1.0);
+    vec4 inColor = vec4(inR, inG, inB, 1.0);
 
     vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));
 

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/blendGlow.frag

@@ -1,4 +1,4 @@
-#version 120
+#version 100
 #ifdef GL_ES
     precision mediump float;
 #endif

assets/books/userguide_ENG.tex

@@ -71,7 +71,7 @@ The control is omnidirectional. In other words, \emph{not} cell-based.
 	\subsubsection{ISO\slash ANSI\slash JIS pedalboards}
 	Your default moving around uses ESDF (qwerty)\slash FRST (colemak)\slash .OEW (dvorak) pedals for default `WASD', in order for you to provide more modifier pedals---QAZ (qwerty\slash colemak), /A; (dvorak)---that are pressed with your little finger and more comfort to some pedalboards with Topre actuators.\footnote{Writers of this book would recommend you to use pedalboard with Cherry MX Red actuators, though any decent pedalboard should be sufficient.}
 	
-	\subsubsection{gamepads}
+	\subsubsection{Joypads}
 	Your moving around uses left stick, and direction of the movement is \emph{not} limited to 8 directions, hence the term, “omni\-direc\-tion\-al”.
 
 \section{World}

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/graphics/! PSD to TGA imagemagick.bat

@@ -1,15 +0,0 @@
-SET basefilename=%~d1%~p1%~n1
-SET inputextension=%~x1
-rem inputextension should be dot-psd
-rem color space must be Lab16
-
-IF "%inputextension%" NEQ ".psd" goto fail
-
-convert %1 -colorspace sRGB -write mpr:temp -background black -alpha Remove mpr:temp -compose Copy_Opacity -composite "%basefilename%.tga"
-
-exit
-
-:fail
-echo "File not PSD"
-pause
-exit /b 1

assets/hicolour.frag

@@ -1,59 +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 = 64.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));
-
-    vec4 outColor = nearestColour(inColor + spread * (bayer[int(entry.y) * int(bayerSize) + int(entry.x)] / bayerDivider - 0.5));
-
-    gl_FragColor = outColor;
-}

assets/keylayout.json

@@ -0,0 +1,52 @@
+{
+  "qwerty": {
+    "layout": "1234567890-=QWERTYUIOP[]ASDFGHJKL;'ZXCVBNM,./",
+    "capslock": "Caps",
+    "name": "QWERTY"
+  },
+  "qwertz": {
+    "layout": "1234567890-=QWERTZUIOP[]ASDFGHJKL;'YXCVBNM,./",
+    "capslock": "Caps",
+    "name": "QWERTZ"
+  },
+  "azerty": {
+    "layout": "1234567890-=AZERTYUIOP[]QSDFGHJKL;'WXCVBNM,./",
+    "capslock": "Caps",
+    "name": "AZERTY"
+  },
+  "colemak": {
+    "layout": "1234567890-=QWFPGJLUY;[]ARSTDHNEIO'ZXCVBKM,./",
+    "capslock": "Back",
+    "name": "Colemak"
+  },
+  "workman": {
+    "layout": "1234567890-=QDRWBJFUP;[]ASHTGYNEOI'ZXMCVKL,./",
+    "capslock": "Back",
+    "name": "Workman"
+  },
+  "dvorak": {
+    "layout": "1234567890[]',.PYFGCRL/=AOEUIDHTNS-;QJKXBMWVZ",
+    "capslock": "Caps",
+    "name": "Dvorak"
+  },
+  "bepo": {
+    "layout": "1234567890=%BÉPOÈ!VDLJZWAUIE,CTSRNMÀYX.K'QGHF",
+    "capslock": "Caps",
+    "name": "Bépo"
+  },
+  "turk-f": {
+    "layout": "1234567890/-FGĞIODRNHPQWUİEAÜTKMLYŞJÖVCÇZSB.,",
+    "capslock": "Caps",
+    "name": "F klavye"
+  },
+  "qwerty-jis-apple": {
+    "layout": "1234567890-=QWERTYUIOP[]ASDFGHJKL;'ZXCVBNM,./",
+    "capslock": "Ctrl",
+    "name": "Apple 日本語"
+  },
+  "hhkb": {
+    "layout": "1234567890-=QWERTYUIOP[]ASDFGHJKL;'ZXCVBNM,./",
+    "capslock": "Ctrl",
+    "name": "HHKB2"
+  }
+}

assets/keylayout/colemak.properties

@@ -1,6 +0,0 @@
-layout_name=Colemak
-ROW1=4s;4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0;4qMINUS;4qEQUALS;6qBACKSPACE
-ROW2=6qTAB;4qQ;4qW;4qF;4qP;4qG;4qJ;4qL;4qU;4qY;4qSEMICOLON;4qLEFT_BRACKET;4qRIGHT_BRACKET;4qBACKSLASH
-ROW3=7qCAPS_LOCK;4qA;4qR;4qS;4qT;4qD;4qH;4qN;4qE;4qI;4qO;4qAPOSTROPHE;7qENTER
-ROW4=9qSHIFT_LEFT;4qZ;4qX;4qC;4qV;4qB;4qK;4qM;4qCOMMA;4qPERIOD;4qSLASH;9qSHIFT_RIGHT
-ROW5=15s;28qSPACE

assets/keylayout/dvorak.properties

@@ -1,6 +0,0 @@
-layout_name=Dvorak Simplified
-ROW1=4s;4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0;4qLEFT_BRACKET;4qRIGHT_BRACKET;6qBACKSPACE
-ROW2=6qTAB;4qAPOSTROPHE;4qCOMMA;4qPERIOD;4qP;4qY;4qF;4qG;4qC;4qR;4qL;4qSLASH;4qEQUALS;4qBACKSLASH
-ROW3=7qCAPS_LOCK;4qA;4qO;4qE;4qU;4qI;4qD;4qH;4qT;4qN;4qS;4qMINUS;7qENTER
-ROW4=9qSHIFT_LEFT;4qSEMICOLON;4qQ;4qJ;4qK;4qX;4qB;4qM;4qW;4qV;4qZ;9qSHIFT_RIGHT
-ROW5=15s;28qSPACE

assets/keylayout/malt89.properties

@@ -1,6 +0,0 @@
-layout_name=Maltron 89
-ROW1=4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;10s;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0
-ROW2=4qQ;4qP;4qY;4qC;4qB;10s;4qV;4qM;4qU;4qZ;4qL
-ROW3=4qA;4qN;4qI;4qS;4qF;10s;4qD;4qT;4qH;4qO;4qR
-ROW4=4qCOMMA;4qPERIOD;4qJ;4qG;4qSEMICOLON;10s;4qAPOSTROPHE;4qW;4qK;4qX;4qNULL
-ROW5=4qSHIFT_LEFT;4qBACKSLASH;4qLEFT_BRACKET;4qMINUS;3s;4qE;4s;4qENTER;3s;4qEQUALS;4qRIGHT_BACKET;4qSLASH;4qSHIFT_RIGHT

assets/keylayout/qwerty.properties

@@ -1,13 +0,0 @@
-! generic QWERTY keyboard
-
-! row format: (n)q(keyname)
-!             n: width of a key, 4 for regular key (1.0u). Value smaller than 4 will break the UI, so DON'T
-!             keyname: name of the key that is recognised by the UI parser.
-! each key in the row is separated by one semicolon.
-
-layout_name=QWERTY
-ROW1=4s;4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0;4qMINUS;4qEQUALS;6qBACKSPACE
-ROW2=6qTAB;4qQ;4qW;4qE;4qR;4qT;4qY;4qU;4qI;4qO;4qP;4qLEFT_BRACKET;4qRIGHT_BRACKET;4qBACKSLASH
-ROW3=7qCAPS_LOCK;4qA;4qS;4qD;4qF;4qG;4qH;4qJ;4qK;4qL;4qSEMICOLON;4qAPOSTROPHE;7qENTER
-ROW4=9qSHIFT_LEFT;4qZ;4qX;4qC;4qV;4qB;4qN;4qM;4qCOMMA;4qPERIOD;4qSLASH;9qSHIFT_RIGHT
-ROW5=15s;28qSPACE

assets/locales/bgBG/terrarum.json

@@ -1,7 +1,3 @@
 {
-  "APP_WARNING_HEALTH_AND_SAFETY": "ВНИМАНИЕ-ЗДРАВЕ И БЕЗОПАСНОСТ",
-  "MENU_LABEL_PRESS_START_SYMBOL": "атисни >",
-  "COPYRIGHT_ALL_RIGHTS_RESERVED": "Всички права запазени",
-  "COPYRIGHT_GNU_GPL_3": "Разпределени под GNU GPL 3",
   "MENU_MODULES" : "Модули"
 }

assets/locales/csCZ/terrarum.json

@@ -1,7 +1,3 @@
 {
-  "COPYRIGHT_ALL_RIGHTS_RESERVED": "Všechna práva vyhrazena",
-  "COPYRIGHT_GNU_GPL_3": "Šířen pod licencí GNU GPL 3",
-  "APP_WARNING_HEALTH_AND_SAFETY": "POZOR-ZDRAVÍ A BEZPEČNOST",
-  "MENU_LABEL_PRESS_START_SYMBOL": "Stiskněte >",
   "MENU_MODULES" : "Moduly"
 }

assets/locales/daDK/terrarum.json

@@ -1,7 +1,3 @@
 {
-  "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheder forbeholdes",
-  "COPYRIGHT_GNU_GPL_3": "Distribueret under GNU GPL 3",
-  "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-SUNDHED OG SIKKERHED",
-  "MENU_LABEL_PRESS_START_SYMBOL": "Tryk >",
   "MENU_MODULES" : "Moduler"
 }