initial test, ~40% of the performance was achieved

...I'm stupid

.gitattributes

@@ -5,5 +5,3 @@
 *.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
-*.png filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -13,8 +13,6 @@ replay_pid*
 Thumbs.db
 .DS_Store
 desktop.ini
-.directory
-*/.directory
 
 # Resources that should not be tracked
 assets/mods/basegame/demoworld
@@ -28,7 +26,6 @@ workspace.xml
 # Temporary files
 .tmp*
 tmp_*
-*.bak
 ## Microsoft Office
 ~$*
 ## Generic temp files in Linux

.idea/libraries/KotlinJavaRuntime.xml

@@ -4,9 +4,6 @@
       <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>

.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,24 @@
       <root url="file://$PROJECT_DIR$/lib" />
     </CLASSES>
     <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" />
+      <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/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_X" default="false" project-jdk-name="15-ea" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

COPYING.md

@@ -1,6 +1,6 @@
 *Terrarum*
 
-Copyright (C) 2013-2021 Minjae Song ("CuriousTorvald")
+Copyright (C) 2013-2020 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-2020 Minjae Song ("CuriousTorvald") and the contributors
+Copyright (c) 2017-2019 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
@@ -113,7 +113,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 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.
       
-Kotlin translated and modified code Copyright (C) 2016 Minjae Song ("CuriousTorvald")
+Kotlin translated and modified code Copyright (C) 2016 Minjaesong (Torvald)
   
 ----
 

REFERENCING.md

@@ -1,42 +1,17 @@
-## Prefix-ID Referencing
-
-Every blocks and items have Prefix-ID Referencing scheme, which is defined as follows:
-
-```<Prefix>@<Modname>:<Integer ID>```
-
-where Prefix is predefined (see below), Integer ID is arbitrarily chosen within a domain.
-
-### Prefixes
-|Name|Description|
-|----|-----------|
-|wall|Wall, only used by the Inventory to differentiate walls from blocks (therefore wall shares same "ID Space" with blocks/fluids/wires)|
-|item|Item (Static), uses different "ID Space" with blocks/walls/fluids/wires|
-
-Notes: 
-- BlockCodex and ItemCodex will not store prefix part of the ID, as blocks and walls are identical in properties
-- Wires and Fluids use the same "ID Space" as the tiles; they just happened to exclusive to their own layers.
-  This simplifies many things e.g. only one TileID-to-AtlasTileNumber map is needed and the renderer will
-  greatly benefit from it.
-
-### Predefined Modnames
-
-|Name|Description|
-|----|-----------|
-|dyn|Dynamic Item|
-|actor|Actor As an Item. Integer ID is identical to the actor's Reference ID|
-|virt|Virtual Tile Number|
-
-### Integer ID Domains
-
 |Range|Description|
 |-----|-----------|
-|1..2147483647|Integer ID for dynamic items|
-|0x1000_0000..0x7FFF_FFFF|Reference ID for Actors (1879M possible)|
-|1..2147483647|Integer ID for virtual tiles|
+|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..-1 (all negative numbers)|Faction (2147M possible)|
 
 * dynamic items have own properties that will persist through savegame.
 
-Actor range in-depth
+Actors range in-depth
 
 |Range|Description|
 |-----|-----------|
@@ -44,6 +19,4 @@ Actor range in-depth
 |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
+|0x7000_0000..0x7FFF_FFFF|Rendered as screen overlay, not affected by light nor environment overlays|

assets/mods/basegame/blocks/blocks.csv

@@ -1,5 +1,6 @@
 "id";"drop";"name";"shdr";"shdg";"shdb";"shduv";"str";"dsty";"mate";"solid";"plat";"wall";"grav";"dlfn";"fv";"fr";"lumr";"lumg";"lumb";"lumuv";"colour";"vscs"
 "0";"0";"BLOCK_AIR";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A"
+"1";"1";"BLOCK_MIASMA";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A"
 "16";"17";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"0";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A"
 "17";"17";"BLOCK_STONE_QUARRIED";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"0";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A"
 "18";"18";"BLOCK_STONE_TILE_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"0";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A"
@@ -106,8 +107,8 @@
 "4093";"0";"ACTORBLOCK_ALLOW_MOVE_DOWN";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"1";"0";"N/A";"0";"0";"0";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A"
 "4094";"0";"ACTORBLOCK_NO_PASS_RIGHT";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"0";"0";"N/A";"0";"0";"0";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A"
 "4095";"0";"ACTORBLOCK_NO_PASS_LEFT";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"0";"0";"N/A";"0";"0";"0";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A"
-"65536";"0";"BLOCK_WATER";"0.1016";"0.0744";"0.0508";"0.0826";"100";"1000";"WATR";"0";"0";"0";"0";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"005599A6";"16"
-"65537";"0";"BLOCK_LAVA";"0.9696";"0.9696";"0.9696";"0.9696";"100";"2600";"ROCK";"0";"0";"0";"0";"0";"0";"16";"0.7664";"0.2032";"0.0000";"0.0000";"FF4600E6";"32"
+"4096";"0";"BLOCK_WATER";"0.1016";"0.0744";"0.0508";"0.0826";"100";"1000";"WATR";"0";"0";"0";"0";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"005599A6";"16"
+"4097";"0";"BLOCK_LAVA";"0.9696";"0.9696";"0.9696";"0.9696";"100";"2600";"ROCK";"0";"0";"0";"0";"0";"0";"16";"0.7664";"0.2032";"0.0000";"0.0000";"FF4600E6";"32"
 "-1";"0";"BLOCK_NULL";"4.0000";"4.0000";"4.0000";"4.0000";"-1";"2600";"NULL";"0";"0";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A"
 
 

assets/mods/basegame/blocks/wires.csv

@@ -1,12 +0,0 @@
-"id";"drop";"name";"accept";"inputcount";"inputtype";"outputtype"
-"8192";"8192";"WIRE_RED";"digital_bit";"N/A";"N/A";"N/A"
-"8193";"8193";"WIRE_GREEN";"digital_bit";"N/A";"N/A";"N/A"
-"8194";"8194";"WIRE_BLUE";"digital_bit";"N/A";"N/A";"N/A"
-"8195";"8195";"WIRE_BUNDLE";"digital_3bits";"N/A";"N/A";"N/A"
-"bundlemaker";"bundlemaker";"WIRE_BUNDLEMAKER";"N/A";3;"digital_bit";"digital_3bits"
-
-
-# accept: which wiretype (defined elsewhere) the wires acceps. Use comma to separate multiple. N/A for electronic components (aka "not wires")
-# inputcount: how many sides are input (outputcount is deduced from the inputcount). N/A for wires
-# inputtype: which wiretype it accepts. N/A for wires
-# outputtype: which wiretype it emits. N/A for wires

assets/mods/basegame/items/itemid.csv

@@ -1,7 +1,7 @@
-    "id";"classname"
-"1";"net.torvald.terrarum.modulebasegame.gameitems.PickaxeCopper"
-"2";"net.torvald.terrarum.modulebasegame.gameitems.PickaxeIron"
-"3";"net.torvald.terrarum.modulebasegame.gameitems.PickaxeSteel"
-"4";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire"
-"5";"net.torvald.terrarum.modulebasegame.gameitems.TikiTorchTester"
-"6";"net.torvald.terrarum.modulebasegame.gameitems.ItemCraftingTable"
+   "id";"classname"
+ "8448";"net.torvald.terrarum.modulebasegame.gameitems.PickaxeCopper"
+ "8449";"net.torvald.terrarum.modulebasegame.gameitems.PickaxeIron"
+ "8450";"net.torvald.terrarum.modulebasegame.gameitems.PickaxeSteel"
+ "8466";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire"
+ "8467";"net.torvald.terrarum.modulebasegame.gameitems.TikiTorchTester"
+ "8468";"net.torvald.terrarum.modulebasegame.gameitems.ItemCraftingTable"

assets/mods/basegame/materials/materials.csv

@@ -8,7 +8,7 @@
 "EAUR"; "768";   "0";"8192";  "21";     "1.36";  "1.0";"elven aurichalcum"
 "TIAL"; "900";   "0";"4420";  "33";     "2.16";  "1.0";"titanium alloy (Ti6Al4V)"
 "ADMT";"2000";"4090";"2700";  "71";     "3.42";  "1.0";"adamant"
-"OOZE";  "20";   "0";"1000";   "1";     "0.08";  "0.5";"genetic ooze; data is about human skin"
+"OOZE";  "20";   "0";"1000";   "1";      "N/A";  "0.5";"genetic ooze; data is about human skin"
 "BONE"; "130";   "0";"2000";   "1";     "0.23"; "0.55";"data is that of bovine bone"
 
 # idst: ID_STRING, ALL CAPS

assets/tiling.frag

@@ -17,24 +17,27 @@ uniform sampler2D u_texture;
 
 
 uniform vec2 screenDimension;
-uniform vec2 tilesInAxes; // size of the tilemap texture; vec2(tiles_in_horizontal, tiles_in_vertical)
+uniform vec2 tilesInAxes; // basically a screen dimension; vec2(tiles_in_horizontal, tiles_in_vertical)
 
+uniform ivec2 tilemapDimension;
 uniform sampler2D tilemap; // RGBA8888
 
 uniform sampler2D tilesAtlas; // terrain, wire, fluids, etc.
 uniform sampler2D tilesBlendAtlas; // alternative terrain for the weather mix (e.g. yellowed grass)
 uniform float tilesBlend = 0.0; // percentage of blending [0f..1f]. 0: draws tilesAtlas, 1: draws tilesBlendAtlas
 
-uniform vec2 tilesInAtlas = ivec2(256.0, 256.0);
-uniform vec2 atlasTexSize = ivec2(4096.0, 4096.0);
-vec2 tileSizeInPx = atlasTexSize / tilesInAtlas; // should be like ivec2(16.0, 16.0)
+uniform ivec2 tilesInAtlas = ivec2(256, 256);
+uniform ivec2 atlasTexSize = ivec2(4096, 4096);
+ivec2 tileSizeInPx = atlasTexSize / tilesInAtlas; // should be like ivec2(16, 16)
 
 uniform vec4 colourFilter = vec4(1, 1, 1, 1); // used by WALL to darken it
 
-uniform ivec2 cameraTranslation = ivec2(0, 0); // used to offset the drawing; it's integer because we want the drawing to be pixel-aligned
+uniform ivec2 cameraTranslation = ivec2(0, 0); // used to offset the drawing
 
 uniform float drawBreakage = 1.0; // set it to 0f to not draw breakage, 1f to draw it; NEVER set to any other values.
 
+uniform float zoom = 1.0;
+
 
 ivec2 getTileXY(int tileNumber) {
     return ivec2(tileNumber % int(tilesInAtlas.x), tileNumber / int(tilesInAtlas.x));
@@ -67,8 +70,10 @@ void main() {
 
     // default gl_FragCoord takes half-integer (represeting centre of the pixel) -- could be useful for phys solver?
     // This one, however, takes exact integer by rounding down. //
-    vec2 overscannedScreenDimension = tilesInAxes * tileSizeInPx; // how many tiles will fit into a screen; one used by the tileFromMap; we need this because screen size is not integer multiple of the tile size
+    vec2 overscannedScreenDimension = tilesInAxes * tileSizeInPx; // how many tiles will fit into a screen; one used by the tileFromMap
     vec2 flippedFragCoord = vec2(gl_FragCoord.x, screenDimension.y - gl_FragCoord.y) + cameraTranslation; // NO IVEC2!!; this flips Y
+    //vec2 pxCoord = flippedFragCoord.xy; // TODO do I actually need 'pxCoord'?
+    vec2 zoomVec = vec2(zoom);
 
     // get required tile numbers //
 
@@ -76,19 +81,25 @@ void main() {
     int tile = getTileFromColor(tileFromMap);
     int breakage = getBreakageFromColor(tileFromMap);
     ivec2 tileXY = getTileXY(tile);
-    ivec2 breakageXY = getTileXY(breakage + 5); // +5 is hard-coded constant that depends on the contents of the atlas
+    ivec2 breakageXY = getTileXY(breakage + 5); // +5 is hard-coded constant that depends on the atlas
 
-    // calculate the UV coord value for texture sampling //
+    // cauculate the UV coord value for texture sampling //
+
+    //vec2 coordInTile = mod(pxCoord, tileSizeInPx) / tileSizeInPx; // 0..1 regardless of tile position in atlas  // TODO do I actually need 'pxCoord'?
+    vec2 coordInTile = mod(flippedFragCoord, tileSizeInPx) / tileSizeInPx; // 0..1 regardless of tile position in atlas
 
     // don't really need highp here; read the GLES spec
-    vec2 uvCoordForTile = (mod(flippedFragCoord, tileSizeInPx) / tileSizeInPx) / tilesInAtlas; // 0..0.00390625 regardless of tile position in atlas
-    vec2 uvCoordOffsetTile = tileXY / tilesInAtlas; // where the tile starts in the atlas, using uv coord (0..1)
-    vec2 uvCoordOffsetBreakage = breakageXY / tilesInAtlas;
+    vec2 singleTileSizeInUV = vec2(1) / tilesInAtlas; // constant 0.00390625 for unmodified default uniforms
+
+    vec2 uvCoordForTile = coordInTile * singleTileSizeInUV; // 0..0.00390625 regardless of tile position in atlas
+
+    vec2 uvCoordOffsetTile = tileXY * singleTileSizeInUV; // where the tile starts in the atlas, using uv coord (0..1)
+    vec2 uvCoordOffsetBreakage = breakageXY * singleTileSizeInUV;
 
     // get final UV coord for the actual sampling //
 
-    vec2 finalUVCoordForTile = uvCoordForTile + uvCoordOffsetTile;// where we should be actually looking for in atlas, using UV coord (0..1)
-    vec2 finalUVCoordForBreakage = uvCoordForTile + uvCoordOffsetBreakage;
+    vec2 finalUVCoordForTile = (uvCoordForTile + uvCoordOffsetTile);// where we should be actually looking for in atlas, using UV coord (0..1)
+    vec2 finalUVCoordForBreakage = (uvCoordForTile + uvCoordOffsetBreakage);
 
     // blending a breakage tex with main tex //
 

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.3.10'
 
     repositories {
         mavenCentral()
@@ -27,7 +27,6 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlinx-coroutines-core"
     compile "org.jetbrains.kotlin:kotlin-stdlib"
     compile fileTree(dir: 'lib', include: ['*.jar'])
     implementation 'org.junit:junit-bom:5.2.0'

config_colemak.json

@@ -1,32 +1,32 @@
 {
   "displayfps": 0,
   "usevsync": false,
-  "screenwidth": 1280,
-  "screenheight": 720,
+  "screenwidth": 1110,
+  "screenheight": 740,
   "language": "enUS",
   "notificationshowuptime": 4000,
   "multithread": true,
   "multithreadedlight": false,
   "showhealthmessageonstartup": true,
   "usexinput": true,
-  "config_gamepadkeyn": 3,
-  "config_gamepadkeyw": 2,
-  "config_gamepadkeys": 0,
-  "config_gamepadkeye": 1,
-  "config_gamepadlup": 4,
-  "config_gamepadrup": 5,
-  "config_gamepadselect": 6,
-  "config_gamepadstart": 7,
-  "config_gamepadltrigger": 8,
-  "config_gamepadrtrigger": 9,
-  "config_gamepadlthumb": 10,
-  "config_gamepadrthumb": 11,
-  "config_gamepadaxislx": 1,
-  "config_gamepadaxisly": 0,
-  "config_gamepadaxisrx": 3,
-  "config_gamepadaxisry": 2,
-  "config_gamepadtriggeraxis": 4,
-  "config_gamepadtriggeraxis2": 5,
+  "gamepadkeyn": 3,
+  "gamepadkeyw": 2,
+  "gamepadkeys": 0,
+  "gamepadkeye": 1,
+  "gamepadlup": 4,
+  "gamepadrup": 5,
+  "gamepadselect": 6,
+  "gamepadstart": 7,
+  "gamepadltrigger": 8,
+  "gamepadrtrigger": 9,
+  "gamepadlthumb": 10,
+  "gamepadrthumb": 11,
+  "gamepadaxislx": 1,
+  "gamepadaxisly": 0,
+  "gamepadaxisrx": 3,
+  "gamepadaxisry": 2,
+  "gamepadtriggeraxis": 4,
+  "gamepadtriggeraxis2": 5,
   "gamepadaxiszeropoints": [
     -0.011,
     -0.022,
@@ -34,24 +34,24 @@
     -0.044
   ],
   "gamepadlabelstyle": "msxbone",
-  "config_keyup":34,
-  "config_keyleft":46,
-  "config_keydown":47,
-  "config_keyright":48,
-  "config_keyinventory":45,
-  "config_keyinteract":44,
-  "config_keymovementaux": 29,
-  "config_keyclose": 31,
-  "config_keyzoom": 54,
-  "config_keygamemenu": 61,
-  "config_keyquicksel": 59,
-  "config_keyquickselalt": [
+  "keyup":34,
+  "keyleft":46,
+  "keydown":47,
+  "keyright":48,
+  "keyinventory":45,
+  "keyinteract":44,
+  "keymovementaux": 29,
+  "keyclose": 31,
+  "keyzoom": 54,
+  "keygamemenu": 61,
+  "keyquicksel": 59,
+  "keyquickselalt": [
     67,
     129,
     73
   ],
-  "config_keyjump": 62,
-  "config_keyquickslots": [
+  "keyjump": 62,
+  "keyquickslots": [
     8,
     9,
     10,
@@ -63,8 +63,8 @@
     16,
     7
   ],
-  "config_mouseprimary": 0,
-  "config_mousesecondary": 1,
+  "mouseprimary": 0,
+  "mousesecondary": 1,
   "pcgamepadenv": "console",
   "maxparticles": 768,
   "temperatureunit": 1,

ingamemodule_basegame/ingamemodule_basegame.iml

@@ -8,10 +8,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib" level="project" />
-    <orderEntry type="library" name="com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10" level="project" />
-    <orderEntry type="library" name="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10" level="project" />
-    <orderEntry type="library" name="com.badlogicgames.gdx:gdx-controllers-platform:1.9.10" level="project" />
-    <orderEntry type="library" name="com.badlogicgames.gdx:gdx-controllers-desktop:1.9.10" level="project" />
-    <orderEntry type="library" name="com.badlogicgames.gdx:gdx-platform:1.9.10" level="project" />
   </component>
 </module>