character import wip

todo: make delete character work

.idea/artifacts/TerrarumBuild.xml

@@ -13,6 +13,10 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-controllers-desktop-2.2.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/GetCpuName.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/jxinput-1.0.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.8.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/prtree.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/Terrarum_Joise.jar" path-in-jar="/" />
@@ -72,21 +76,17 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.11.0-natives-armeabi-v7a.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.11.0-natives-desktop.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.11.0-natives-x86_64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.21/kotlin-test-1.8.21.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.21/kotlin-reflect-1.8.21.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-22.3.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-71.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/js-22.3.1-edit.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.21/kotlin-test-1.8.21.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-22.3.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-22.3.1-edit.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-22.3.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-71.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-22.3.1-edit.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/js-22.3.1-edit.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-22.3.1.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/libraries/io_github_classgraph.xml

@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="io.github.classgraph" type="repository">
+    <properties maven-id="io.github.classgraph:classgraph:4.8.157" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/classgraph-4.8.157.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/lib/classgraph-4.8.157-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/classgraph-4.8.157-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/runConfigurations/Principii.xml

@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Principii" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="net.torvald.terrarum.Principii" />
+    <module name="TerrarumBuild" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="net.torvald.terrarum.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="BuildArtifacts" enabled="true">
+        <artifact name="ModuleComputers" />
+        <artifact name="TerrarumBuild" />
+      </option>
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

ModuleComputers/ModuleComputers.iml

@@ -16,5 +16,6 @@
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="jetbrains.kotlin.reflect" level="project" />
     <orderEntry type="library" name="jetbrains.kotlin.test" level="project" />
+    <orderEntry type="library" name="io.github.classgraph" level="project" />
   </component>
 </module>

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt

@@ -1,26 +1,17 @@
 package net.torvald.terrarum.modulecomputers.gameactors
 
-import com.badlogic.gdx.Gdx
-import com.badlogic.gdx.Input
-import com.badlogic.gdx.graphics.*
-import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import com.badlogic.gdx.graphics.glutils.FrameBuffer
 import com.badlogic.gdx.utils.Disposable
-import kotlin.coroutines.*
 import net.torvald.terrarum.*
 import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
 import net.torvald.terrarum.gameactors.AVKey
-import net.torvald.terrarum.langpack.Lang
 import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
 import net.torvald.terrarum.modulebasegame.gameactors.FixtureBase
 import net.torvald.terrarum.modulebasegame.gameactors.FixtureInventory
-import net.torvald.terrarum.ui.Toolkit
-import net.torvald.terrarum.ui.UICanvas
+import net.torvald.terrarum.modulecomputers.ui.UIHomeComputer
 import net.torvald.tsvm.*
 import net.torvald.tsvm.peripheral.AdapterConfig
 import net.torvald.tsvm.peripheral.GraphicsAdapter
 import net.torvald.tsvm.peripheral.VMProgramRom
-import net.torvald.unicode.*
 
 /**
  * Created by minjaesong on 2021-12-04.
@@ -131,84 +122,3 @@ class FixtureHomeComputer : FixtureBase {
     }
 }
 
-internal class UIHomeComputer : UICanvas(
-        toggleKeyLiteral = Input.Keys.ESCAPE, // FIXME why do I have specify ESC for it to function? ESC should be work as the default key
-        toggleButtonLiteral = App.getConfigInt("control_gamepad_start"),
-) {
-    override var width = 640
-    override var height = 480
-    override var openCloseTime = 0f
-
-    private val drawOffX = (width - 560).div(2).toFloat()
-    private val drawOffY = (height - 448).div(2).toFloat()
-
-    private var batch: FlippingSpriteBatch
-    private var camera: OrthographicCamera
-
-    internal lateinit var vm: VM
-    internal lateinit var fixture: FixtureHomeComputer
-
-    init {
-        batch = FlippingSpriteBatch()
-        camera = OrthographicCamera(width.toFloat(), height.toFloat())
-        //val m = Matrix4()
-        //m.setToOrtho2D(0f, 0f, width.toFloat(), height.toFloat())
-        batch.projectionMatrix = camera.combined
-    }
-
-    private val fbo = FrameBuffer(Pixmap.Format.RGBA8888, width, height, false)
-
-    private val controlHelp =
-            "${getKeycapPC(App.getConfigInt("control_key_inventory"))} ${Lang["GAME_ACTION_CLOSE"]}\u3000 " +
-            "$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_T$KEYCAP_R Terminate\u3000" +
-            "$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_R$KEYCAP_S Reset\u3000" +
-            "$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_R$KEYCAP_Q SysRq"
-
-    override fun updateUI(delta: Float) {
-    }
-
-    override fun renderUI(otherBatch: SpriteBatch, otherCamera: Camera) {
-        otherBatch.end()
-
-        fbo.inAction(camera, batch) {
-            Gdx.gl.glClearColor(0f,0f,0f,1f)
-            Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT) // to hide the crap might be there
-
-            (vm.peripheralTable[1].peripheral as? GraphicsAdapter)?.let { gpu ->
-                val clearCol = gpu.getBackgroundColour()
-                Gdx.gl.glClearColor(clearCol.r, clearCol.g, clearCol.b, clearCol.a)
-                Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT)
-
-                gpu.render(Gdx.graphics.deltaTime, batch, drawOffX, drawOffY, true, fbo) // gpu.render will internally end() the fbo then begin() again before using the batch I've fed in
-            }
-        }
-
-        otherBatch.begin()
-        otherBatch.shader = null
-        blendNormalStraightAlpha(otherBatch)
-        otherBatch.color = Color.WHITE
-        otherBatch.draw(fbo.colorBufferTexture, posX.toFloat(), posY.toFloat(), width.toFloat(), height.toFloat())
-        otherBatch.color = Toolkit.Theme.COL_INACTIVE
-        Toolkit.drawBoxBorder(otherBatch, posX - 1, posY - 1, width + 2, height + 2)
-
-        App.fontGame.draw(otherBatch, controlHelp, posX, posY + height + 4)
-    }
-
-    override fun doOpening(delta: Float) {
-        fixture.startVM()
-    }
-
-    override fun doClosing(delta: Float) {
-    }
-
-    override fun endOpening(delta: Float) {
-    }
-
-    override fun endClosing(delta: Float) {
-    }
-
-    override fun dispose() {
-        fbo.dispose()
-    }
-
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/ui/UIHomeComputer.kt

@@ -0,0 +1,90 @@
+package net.torvald.terrarum.modulecomputers.ui
+
+import com.badlogic.gdx.Gdx
+import com.badlogic.gdx.Input
+import com.badlogic.gdx.graphics.*
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
+import com.badlogic.gdx.graphics.glutils.FrameBuffer
+import net.torvald.terrarum.*
+import net.torvald.terrarum.langpack.Lang
+import net.torvald.terrarum.modulecomputers.gameactors.FixtureHomeComputer
+import net.torvald.terrarum.ui.Toolkit
+import net.torvald.terrarum.ui.UICanvas
+import net.torvald.tsvm.VM
+import net.torvald.tsvm.peripheral.GraphicsAdapter
+import net.torvald.unicode.*
+
+internal class UIHomeComputer : UICanvas(
+        toggleKeyLiteral = null,
+        toggleButtonLiteral = "control_gamepad_start",
+) {
+    override var width = 640
+    override var height = 480
+    override var openCloseTime = 0f
+
+    private val drawOffX = (width - 560).div(2).toFloat()
+    private val drawOffY = (height - 448).div(2).toFloat()
+
+    private var batch: FlippingSpriteBatch
+    private var camera: OrthographicCamera
+
+    internal lateinit var vm: VM
+    internal lateinit var fixture: FixtureHomeComputer
+
+    init {
+        batch = FlippingSpriteBatch()
+        camera = OrthographicCamera(width.toFloat(), height.toFloat())
+        //val m = Matrix4()
+        //m.setToOrtho2D(0f, 0f, width.toFloat(), height.toFloat())
+        batch.projectionMatrix = camera.combined
+    }
+
+    private val fbo = FrameBuffer(Pixmap.Format.RGBA8888, width, height, false)
+
+    private val controlHelp =
+            "${getKeycapPC(ControlPresets.getKey("control_key_inventory"))} ${Lang["GAME_ACTION_CLOSE"]}\u3000 " +
+            "$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_T$KEYCAP_R Terminate\u3000" +
+            "$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_R$KEYCAP_S Reset\u3000" +
+            "$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_R$KEYCAP_Q SysRq"
+
+    override fun updateUI(delta: Float) {
+    }
+
+    override fun renderUI(otherBatch: SpriteBatch, otherCamera: Camera) {
+        otherBatch.end()
+
+        fbo.inAction(camera, batch) {
+            Gdx.gl.glClearColor(0f,0f,0f,1f)
+            Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT) // to hide the crap might be there
+
+            (vm.peripheralTable[1].peripheral as? GraphicsAdapter)?.let { gpu ->
+                val clearCol = gpu.getBackgroundColour()
+                Gdx.gl.glClearColor(clearCol.r, clearCol.g, clearCol.b, clearCol.a)
+                Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT)
+
+                gpu.render(Gdx.graphics.deltaTime, batch, drawOffX, drawOffY, true, fbo) // gpu.render will internally end() the fbo then begin() again before using the batch I've fed in
+            }
+        }
+
+        otherBatch.begin()
+        otherBatch.shader = null
+        blendNormalStraightAlpha(otherBatch)
+        otherBatch.color = Color.WHITE
+        otherBatch.draw(fbo.colorBufferTexture, posX.toFloat(), posY.toFloat(), width.toFloat(), height.toFloat())
+        otherBatch.color = Toolkit.Theme.COL_INACTIVE
+        Toolkit.drawBoxBorder(otherBatch, posX - 1, posY - 1, width + 2, height + 2)
+
+        App.fontGame.draw(otherBatch, controlHelp, posX, posY + height + 4)
+    }
+
+    override fun doOpening(delta: Float) {
+        super.doOpening(delta)
+        fixture.startVM()
+    }
+
+
+    override fun dispose() {
+        fbo.dispose()
+    }
+
+}

TerrarumBuild.iml

@@ -24,5 +24,6 @@
     <orderEntry type="library" name="badlogicgames.gdx.backend.lwjgl3" level="project" />
     <orderEntry type="library" name="jetbrains.kotlin.reflect" level="project" />
     <orderEntry type="library" name="jetbrains.kotlin.test" level="project" />
+    <orderEntry type="library" name="io.github.classgraph" level="project" />
   </component>
 </module>

assets/keylayout/bg_bg_bds.ime

@@ -379,11 +379,11 @@ let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x
 return Object.freeze({"n":"\uDBBF\uDFC1Бъл. Многоезична\uDBBF\uDFC0","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":dislplayKeyLayouts,
 "l":"bgBG",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin + 2*altgrin
 
-    let s = states.keylayouts[headkey][layer]
+    let s = (states.keylayouts[headkey][layer] || states.keylayouts[headkey][1*shiftin]) || states.keylayouts[headkey][0]
 
     // typing seq for diacritics: diacritics THEN a character
     if (isDiacritics(s)) {

assets/keylayout/el_gr_phonetic.ime

@@ -58,7 +58,7 @@ let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x
 return Object.freeze({"n":"Ελ. Φωνητικό","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "tf":states.layouttable,
 "l":"elGR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin,lowlayerkey)=>{
     let layer = 1*shiftin + 2*altgrin
 

assets/keylayout/hi_in_inscript.ime

@@ -0,0 +1,283 @@
+let states = {"keylayouts":[[""],[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["0",")","\u0966",")"],
+["1","\u090D","\u0967","!"],
+["2","\u0945","\u0968","@"],
+["3","\u094D\u0930","\u0969","#"],
+["4","\u0930\u094D","\u096A","$"],
+["5","\u091C\u094D\u091E","\u096B","%"],
+["6","\u0924\u094D\u0930","\u096C","^"],
+["7","\u0915\u094D\u0937","\u096D","&"],
+["8","\u0936\u094D\u0930","\u096E","*"],
+["9","(","\u096F","("],
+["*"],
+["#"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["\u094B","\u0913"],
+["\u0935","\u0934"],
+["\u092E","\u0923","\u0954","\u0923"],
+["\u094D","\u0905"],
+["\u093E","\u0906"],
+["\u093F","\u0907","\u0962","\u090C"],
+["\u0941","\u0909"],
+["\u092A","\u092B","\u092A","\u095E"],
+["\u0917","\u0918","\u095A","\u0918"],
+["\u0930","\u0931"],
+["\u0915","\u0916","\u0958","\u0959"],
+["\u0924","\u0925"],
+["\u0938","\u0936"],
+["\u0932","\u0933"],
+["\u0926","\u0927"],
+["\u091C","\u091D","\u095B","\u091D"],
+["\u094C","\u0914"],
+["\u0940","\u0908","\u0963","\u0961"],
+["\u0947","\u090F"],
+["\u0942","\u090A"],
+["\u0939","\u0919"],
+["\u0928","\u0929"],
+["\u0948","\u0910"],
+["\u0902","\u0901","\u0902","\u0950"],
+["\u092C","\u092D"],
+["\u0946","\u090E","\u0953","\u090E"],
+[",","\u0937","\u0970","\u0970"],
+[".","\u0964","\u0965","\u093D"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[" "],
+[undefined],
+[undefined],
+[undefined],
+["\n"],
+["\x08"],
+["\u094A","\u0912"],
+["-","\u0903"],
+["\u0943","\u090B","\u0944","\u0960"],
+["\u0921","\u0922","\u095C","\u095D"],
+["\u093C","\u091E"],
+["\u0949","\u0911"],
+["\u091A","\u091B","\u0952","\u091B"],
+["\u091F","\u0920","\u0951","\u0920"],
+["\u092F","\u095F"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["0"],
+["1"],
+["2"],
+["3"],
+["4"],
+["5"],
+["6"],
+["7"],
+["8"],
+["9"],
+["/"],
+["*"],
+["-"],
+["+"],
+["."],
+["."],
+["\n"],
+["="],
+["("],
+[")"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined]
+],
+"code":""} // practically unused as long as there are no diacritics on the keyboard
+let reset = () => {
+    states.code = 0
+}
+let inRange = (s,a,b) => (a <= s && s <= b)
+return Object.freeze({"n":"इनस्क्रिप्ट","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
+"t":states.keylayouts.slice(0,10).concat([["3","\uDBBF\uDE01\u094D\u0930","\u0969","#"], ["4","\u0930\u094D\uDBBF\uDE01","\u096A","$"]], states.keylayouts.slice(12)),
+"l":"hiIN",
+// return: [delete count, composed output]
+"accept":(headkey,shiftin,altgrin)=>{
+    let layer = 1*shiftin + 2*altgrin
+
+    let s = (states.keylayouts[headkey][layer] || states.keylayouts[headkey][1*shiftin]) || states.keylayouts[headkey][0]
+
+    return ['0', s]
+},
+"backspace":()=>{
+    reset()
+    return ''
+},
+"end":()=>{
+    reset()
+    return ''
+},
+"reset":()=>{ reset() },
+"composing":()=>(states.code!='')
+})

assets/keylayout/ko_kr_2set_ksx5002.ime

@@ -346,12 +346,12 @@ let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" :
 return Object.freeze({"n":"두벌식 표준","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 "l":"koKR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
 
     if (isHangul(s)) {
         let bufIndex = (isJongseongConsonant(s) && isConsonant(states.buf[0]) && undefined !== states.buf[1]) ? 2 :

assets/keylayout/ko_kr_2set_ksx5002_alt.ime

@@ -346,12 +346,12 @@ let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" :
 return Object.freeze({"n":"두벌식 수정 표준","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 "l":"koKR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
 
     if (isHangul(s)) {
         let bufIndex = (isJongseongConsonant(s) && isConsonant(states.buf[0]) && undefined !== states.buf[1]) ? 2 :

assets/keylayout/ko_kr_3set_390.ime

@@ -375,12 +375,12 @@ let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" :
 return Object.freeze({"n":"세벌식 3-90","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 "l":"koKR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
     let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
 
     if (isHangul(s)) {

assets/keylayout/ko_kr_3set_391.ime

@@ -375,12 +375,12 @@ let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" :
 return Object.freeze({"n":"세벌식 공자판","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 "l":"koKR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
     let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
 
     if (isHangul(s)) {

assets/keylayout/ko_kr_3set_shin_03.ime

@@ -385,12 +385,12 @@ let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" :
 return Object.freeze({"n":"신세벌식 ’03","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 "l":"koKR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
     let s2 = states.keylayouts[headkey][2]
     let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
 

assets/keylayout/ko_kr_3set_shin_p2.ime

@@ -385,12 +385,12 @@ let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" :
 return Object.freeze({"n":"신세벌식 P2","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 "l":"koKR",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
     let s2 = states.keylayouts[headkey][2]
     let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
 

assets/keylayout/ru_ru_jcuken.ime

@@ -375,11 +375,11 @@ let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x
 return Object.freeze({"n":"ЙЦУКЕН Многоязычна","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts,
 "l":"ruRU",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin + 2*altgrin
 
-    let s = states.keylayouts[headkey][layer]
+    let s = (states.keylayouts[headkey][layer] || states.keylayouts[headkey][1*shiftin]) || states.keylayouts[headkey][0]
 
     // typing seq for diacritics: diacritics THEN a character
     if (isDiacritics(s)) {

assets/keylayout/ru_ru_jcuken_apple.ime

@@ -27,7 +27,7 @@ let states = {"keylayouts":[[""],[undefined],
 [undefined],
 [undefined],
 ["ф","Ф","ƒ","ƒ"],
-["и","И"],
+["и","И","и","И"],
 ["с","С","≠","≠"],
 ["в","В","ћ","Ћ"],
 ["у","У","ќ","Ќ"],
@@ -69,10 +69,10 @@ let states = {"keylayouts":[[""],[undefined],
 ["-","_","—","–"],
 ["=","+","»","«"],
 ["х","Х","“","“"],
-["ъ","Ъ"],
-["ё","Ё"],
+["ъ","Ъ","ъ","Ъ"],
+["ё","Ё","ё","Ё"],
 ["ж","Ж","…","…"],
-["э",'Э'],
+["э",'Э',"э",'Э'],
 ["/","?","„","„"],
 [undefined],
 [undefined],
@@ -263,12 +263,12 @@ let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x
 return Object.freeze({"n":"ЙЦУКЕН (Рус. Apple)","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts,
 "l":"ruRU",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin + 2*altgrin
     states.code = 1
 
-    let s = states.keylayouts[headkey][layer]
+    let s = (states.keylayouts[headkey][layer] || states.keylayouts[headkey][1*shiftin]) || states.keylayouts[headkey][0]
 
     if (isDiacritics(s)) {
         return ['1', '']

assets/keylayout/ru_ru_phonetic.ime

@@ -33,7 +33,7 @@ let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x
 return Object.freeze({"n":"Рус. Фонетическая","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "tf":states.layouttable,
 "l":"ruRU",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin,lowlayerkey)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1

assets/keylayout/ta_in_tamil99.ime

@@ -0,0 +1,290 @@
+let states = {"keylayouts":[[""],[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["0",")"],
+["1","!"],
+["2","@"],
+["3","#"],
+["4","$"],
+["5","%"],
+["6","^"],
+["7","&"],
+["8","*"],
+["9","("],
+["*"],
+["#"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["\u0B85","\u0BF9"],
+["\u0B99","\u0BF7"],
+["\u0B92","\u0BF5","\u0BCA"],
+["\u0B89","\u0BF8","\u0BC1"],
+["\u0B8A","\u0B9C","\u0BC2"],
+["\u0BCD","\u0B83"],
+["\u0B8E","\u0B8E","\u0BC6"],
+["\u0B95","\u0B95"],
+["\u0BA9","\u0BA9"],
+["\u0BAA","\u0BAA"],
+["\u0BAE",'"'],
+["\u0BA4",":"],
+["\u0BB0","/"],
+["\u0BB2","\u0BB2"],
+["\u0B9F","["],
+["\u0BA3","]"],
+["\u0B86","\u0BB8","\u0BBE"],
+["\u0B90","\u0BB9","\u0BC8"],
+["\u0B87","\u0BFA","\u0BBF"],
+["\u0B8F","\u0B95\u0BCD\u0BB7","\u0BC7"],
+["\u0BB1","\u0BB1"],
+["\u0BB5","\u0BF6"],
+["\u0B88","\u0BB7","\u0BC0"],
+["\u0B93","\u0BF4","\u0BCB"],
+["\u0BB3","\u0BB8\u0BCD\u0BB0\u0BC0"],
+["\u0B94","\u0BF3","\u0BCC"],
+[",","<"],
+[".",">"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[" "],
+[undefined],
+[undefined],
+[undefined],
+["\n"],
+["\x08"],
+["`","~"],
+["-","_"],
+["=","+"],
+["\u0B9A","{"],
+["\u0B9E","}"],
+["\\","|"],
+["\u0BA8",";"],
+["\u0BAF","'"],
+["\u0BB4","?"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["0"],
+["1"],
+["2"],
+["3"],
+["4"],
+["5"],
+["6"],
+["7"],
+["8"],
+["9"],
+["/"],
+["*"],
+["-"],
+["+"],
+["."],
+["."],
+["\n"],
+["="],
+["("],
+[")"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined]
+],
+"code":""} // the last character typed
+let reset = () => {
+    states.code = ""
+}
+let inRange = (s,a,b) => (a <= s && s <= b)
+let isConsonant = (s) => s !== undefined && (inRange(s, 0x0B95, 0x0BB9) || s == 0x0BD0 || inRange(s, 0x0BE6, 0x0BFA)) // determines the behaviour of the vowel key
+return Object.freeze({"n":"தமிழ் 99","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
+"t":states.keylayouts,
+"l":"taIN",
+// return: [delete count, composed output]
+"accept":(headkey,shiftin,altgrin)=>{
+    let layer = 1*shiftin
+
+    let s = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
+
+    if (layer == 0 && states.code != "" && isConsonant(states.code.charCodeAt(states.code.length - 1))) {
+        s = states.keylayouts[headkey][2] || states.keylayouts[headkey][0]
+    }
+
+    states.code = s
+
+    return ['0', s]
+},
+"backspace":()=>{
+    reset()
+    return ''
+},
+"end":()=>{
+    reset()
+    return ''
+},
+"reset":()=>{ reset() },
+"composing":()=>(states.code!='')
+})

assets/keylayout/th_th_kedmanee.ime

@@ -269,12 +269,12 @@ let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x
 return Object.freeze({"n":"แป้นพิมพ์เกษมณี","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts,
 "l":"thTH",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin + 2*altgrin // use AltGr to type conventional numbers
     states.code = 0
 
-    let s = states.keylayouts[headkey][layer]
+    let s = (states.keylayouts[headkey][layer] || states.keylayouts[headkey][1*shiftin]) || states.keylayouts[headkey][0]
     return ['0', s]
 },
 "backspace":()=>{

assets/keylayout/th_th_pattachote.ime

@@ -269,12 +269,12 @@ let isDiacritics = (s) => s !== undefined && (inRange(s.charCodeAt(0), 0x0E31, 0
 return Object.freeze({"n":"แป้นพิมพ์ปัตตะโชติ","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts,
 "l":"thTH",
-// return: [displayed output, composed output]
+// return: [delete count, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin + 2*altgrin // use AltGr to type conventional numbers
     states.code = 0
 
-    let s = states.keylayouts[headkey][layer]
+    let s = (states.keylayouts[headkey][layer] || states.keylayouts[headkey][1*shiftin]) || states.keylayouts[headkey][0]
     return ['0', s]
 },
 "backspace":()=>{

assets/keylayout/zh_cn_cangjie5.ime

@@ -276,7 +276,7 @@ return Object.freeze({"n":"五仓简体 Qwerty","v":"many","c":"CuriousTo\uA75Bv
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
 
-    let cjkey = states.keylayouts[headkey][layer]
+    let cjkey = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
     let cjkeyAsc = cjkey.codePointAt(0)
 
     if (states.code == 1 && 48 <= cjkeyAsc && cjkeyAsc <= 57) {

assets/keylayout/zh_tw_cangjie5.ime

@@ -276,7 +276,7 @@ return Object.freeze({"n":"五倉正體 Qwerty","v":"many","c":"CuriousTo\uA75Bv
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
 
-    let cjkey = states.keylayouts[headkey][layer]
+    let cjkey = states.keylayouts[headkey][layer] || states.keylayouts[headkey][0]
     let cjkeyAsc = cjkey.codePointAt(0)
 
     if (states.code == 1 && 48 <= cjkeyAsc && cjkeyAsc <= 57) {

assets/locales/de/input.json

@@ -0,0 +1,4 @@
+{
+  "INPUT_KEYBOARD_DEFAULT_LAYOUT": "en_intl_qwertz",
+  "INPUT_KEYBOARD_DEFAULT_IME": "none"
+}

assets/locales/en/terrarum.json

@@ -1,30 +1,43 @@
 {
+  "APP_WARNING_HEALTH_AND_SAFETY": "WARNING-HEALTH AND SAFETY",
   "CONTEXT_CHARACTER": "Character",
-  "MENU_LABEL_COPYRIGHT": "Copyright",
+  "CONTEXT_TIME_MINUTE_PLURAL": "Minutes",
+  "CONTEXT_TIME_SECOND_PLURAL": "Seconds",
   "COPYRIGHT_ALL_RIGHTS_RESERVED": "All rights reserved",
   "COPYRIGHT_GNU_GPL_3": "Distributed under GNU GPL 3",
-  "APP_WARNING_HEALTH_AND_SAFETY": "WARNING-HEALTH AND SAFETY",
-  "MENU_LABEL_PRESS_START_SYMBOL": "Press >",
-  "MENU_MODULES" : "Modules",
-  "MENU_CREDIT_GPL_DNT" : "GPL",
   "GAME_ACTION_MOVE_VERB" : "Move",
   "GAME_ACTION_ZOOM" : "Zoom",
-  "MENU_LABEL_RESET" : "Reset",
-  "GAME_32BIT_WARNING1": "It looks like you’re running a 32-Bit version of Java.",
-  "GAME_32BIT_WARNING2": "Please download and install the latest 64-Bit Java at:",
-  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
-  "MENU_OPTION_STREAMERS_LAYOUT": "Chat Overlay",
-  "MENU_LABEL_RESTART_REQUIRED": "Restart Required",
-  "MENU_LABEL_KEYBOARD_LAYOUT": "Keyboard Layout",
-  "MENU_LABEL_IME": "IME",
-  "MENU_OPTIONS_DITHER": "Dithering",
-  "MENU_OPTIONS_BLUR": "Blur",
-  "MENU_OPTIONS_PARTICLES": "Particles",
+  "MENU_IO_AUTOSAVE": "Autosave",
+  "MENU_IO_CLEAR": "Clear",
   "MENU_IO_IMPORT": "Import",
-  "APP_NOMODULE_1": "No Module is currently loaded.",
-  "APP_NOMODULE_2": "Please configure your Load Order and restart:",
-  "MENU_LABEL_KEYCONFIG_HELP1": "Click On the Keycap to Assign Actions",
+  "MENU_IO_MANUAL_SAVE": "Manual Save",
+  "MENU_LABEL_COPYRIGHT": "Copyright",
+  "MENU_LABEL_DELETE": "Delete",
+  "MENU_LABEL_EXTRA_JVM_ARGUMENTS": "Extra Arguments",
+  "MENU_LABEL_IME": "IME",
   "MENU_LABEL_IME_TOGGLE": "Toggle IME",
-  "MENU_LABEL_PASTE_FROM_CLIPBOARD": "Paste from Cliboard",
-  "MENU_OPTIONS_PERFORMANCE": "Performance"
+  "MENU_LABEL_KEYBOARD_LAYOUT": "Keyboard Layout",
+  "MENU_LABEL_PASTE": "Paste",
+  "MENU_LABEL_PASTE_FROM_CLIPBOARD": "Paste from Clipboard",
+  "MENU_LABEL_PRESS_START_SYMBOL": "Press >",
+  "MENU_LABEL_RESET" : "Reset",
+  "MENU_LABEL_RESTART_REQUIRED": "Restart Required",
+  "MENU_LABEL_STREAMING": "Livestreaming",
+  "MENU_LABEL_SYSTEM_INFO": "System Info",
+  "MENU_MODULES" : "Modules",
+  "MENU_OPTIONS_ATLAS_TEXTURE_SIZE": "Atlas Texture Size",
+  "MENU_OPTIONS_AUTOSAVE": "Autosave",
+  "MENU_OPTIONS_BLUR": "Blur",
+  "MENU_OPTIONS_DEBUG_CONSOLE": "Debug Console",
+  "MENU_OPTIONS_DITHER": "Dithering",
+  "MENU_OPTIONS_JVM_HEAP_MAX": "Max Heap Memory",
+  "MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION": "Show notification for",
+  "MENU_OPTIONS_PARTICLES": "Particles",
+  "MENU_OPTIONS_PERFORMANCE": "Performance",
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "Chat Overlay",
+  "MENU_OPTIONS_NONE" : "None",
+
+  "MENU_CREDIT_GPL_DNT" : "GPL",
+  "MENU_LABEL_JVM_DNT" : "JVM",
+  "MENU_OPTIONS_FILTERING_HQ2X_DNT" : "Hq2x"
 }

assets/locales/en/terrarum_sentences.json

@@ -0,0 +1,16 @@
+{
+  "GAME_32BIT_WARNING1": "It looks like you’re running a 32-Bit version of Java.",
+  "GAME_32BIT_WARNING2": "Please download and install the latest 64-Bit Java at:",
+  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
+  "GAME_APPLE_ROSETTA_WARNING1": "It seems you are using a Mac with Apple Silicon but running the x86 build of the game.",
+  "GAME_APPLE_ROSETTA_WARNING2": "Please use the native build for improved performance and gameplay experiences.",
+  "APP_NOMODULE_1": "No Module is currently loaded.",
+  "APP_NOMODULE_2": "Please configure your Load Order and restart:",
+  "MENU_LABEL_KEYCONFIG_HELP1": "Click On the Keycap to Assign Actions",
+  "GAME_PREV_SAVE_WAS_LOADED1": "The most recently saved game was corrupted.",
+  "GAME_PREV_SAVE_WAS_LOADED2": "The previously saved game was loaded.",
+  "GAME_MORE_RECENT_AUTOSAVE1": "The Autosave is more recent than the manual save.",
+  "GAME_MORE_RECENT_AUTOSAVE2": "Please select the saved game you wish to play:",
+  "MENU_LABEL_SAVE_WILL_BE_DELETED": "The selected save file will be deleted.",
+  "MENU_LABEL_UNSAVED_PROGRESS_WILL_BE_LOST": "Unsaved progress will be lost."
+}

assets/locales/hiIN/terrarum.json

@@ -9,7 +9,7 @@
   "GAME_ACTION_MOVE_VERB" : "हिलना",
   "GAME_ACTION_ZOOM" : "ज़ूम",
   "MENU_LABEL_RESET" : "रीसेट",
-  "MENU_OPTION_STREAMERS_LAYOUT": "Chat Overlay",
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "Chat Overlay",
   "MENU_LABEL_RESTART_REQUIRED": "पुनः शुरआत जरुरी है",
   "MENU_LABEL_KEYBOARD_LAYOUT": "कीबोर्ड विन्यास",
   "MENU_LABEL_IME": "इनपुट विधि",

assets/locales/isIC/Polyglot-100_isIC.json

@@ -2335,7 +2335,7 @@
             },
             {
                 "n": "MENU_OPTIONS",
-                "s": "Stillingar "
+                "s": "Valkostir "
             },
             {
                 "n": "MENU_OPTIONS_ADVANCEDGRAPHICS",
@@ -2395,11 +2395,11 @@
             },
             {
                 "n": "MENU_OPTIONS_GAMEPLAY",
-                "s": "Gameplay Options"
+                "s": "Leikvalkostir"
             },
             {
                 "n": "MENU_OPTIONS_GRAPHICS",
-                "s": "Grafíkstillingar"
+                "s": "Grafíkvalkostir"
             },
             {
                 "n": "MENU_OPTIONS_HUD",

assets/locales/isIC/terrarum.json

@@ -15,5 +15,15 @@
   "MENU_OPTIONS_DITHER": "Dither",
   "MENU_OPTIONS_BLUR": "Óskýrt",
   "MENU_OPTIONS_PARTICLES": "Eind",
-  "MENU_IO_IMPORT": "Flytja inn"
+  "MENU_IO_IMPORT": "Flytja inn",
+  "APP_NOMODULE_1": "Engin eining er hlaðin eins og er.",
+  "APP_NOMODULE_2": "Vinsamlega stilltu hleðslupöntunina þína og endurræstu:",
+  "MENU_LABEL_KEYCONFIG_HELP1": "Smelltu á lyklalokið til að úthluta aðgerðum",
+  "MENU_LABEL_IME_TOGGLE": "Breyttu IME",
+  "MENU_LABEL_PASTE_FROM_CLIPBOARD": "Límdu frá klemmuspjald",
+  "MENU_OPTIONS_PERFORMANCE": "Afköst",
+  "MENU_LABEL_DELETE": "Eyða",
+  "MENU_OPTIONS_JVM_HEAP_MAX": "Hámarks hrúguminni",
+  "MENU_OPTIONS_AUTOSAVE": "Sjálfvirk vistun",
+  "CONTEXT_TIME_MINUTE_PLURAL": "Mínútur"
 }

assets/locales/koKR/terrarum.json

@@ -1,29 +1,39 @@
 {
+  "APP_WARNING_HEALTH_AND_SAFETY": "경고—건강과 안전을 위하여",
   "CONTEXT_CHARACTER": "캐릭터",
-  "MENU_LABEL_COPYRIGHT": "저작권",
+  "CONTEXT_TIME_MINUTE_PLURAL": "분",
+  "CONTEXT_TIME_SECOND_PLURAL": "초",
   "COPYRIGHT_ALL_RIGHTS_RESERVED": "모든 권리 보유",
   "COPYRIGHT_GNU_GPL_3": "GNU GPL 3에 따라 배포됨",
-  "APP_WARNING_HEALTH_AND_SAFETY": "경고—건강과 안전을 위하여",
-  "MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요",
-  "MENU_MODULES" : "모듈",
   "GAME_ACTION_MOVE_VERB" : "이동하기",
   "GAME_ACTION_ZOOM" : "확대·축소",
-  "MENU_LABEL_RESET" : "재설정",
-  "GAME_32BIT_WARNING1": "32비트 버전의 Java를 사용중인 것 같습니다.",
-  "GAME_32BIT_WARNING2": "아래 링크에서 최신 64비트 Java를 내려받아 설치해주세요.",
-  "GAME_32BIT_WARNING3": "https://www.java.com/ko/download/",
-  "MENU_OPTION_STREAMERS_LAYOUT": "채팅창 오버레이",
-  "MENU_LABEL_RESTART_REQUIRED": "재시작 필요",
-  "MENU_LABEL_KEYBOARD_LAYOUT": "자판 배열",
-  "MENU_LABEL_IME": "입력기",
-  "MENU_OPTIONS_DITHER": "디더링",
-  "MENU_OPTIONS_BLUR": "흐림",
-  "MENU_OPTIONS_PARTICLES": "입자 수",
+  "MENU_IO_AUTOSAVE": "자동 저장",
+  "MENU_IO_CLEAR": "지우기",
   "MENU_IO_IMPORT": "가져오기",
-  "APP_NOMODULE_1": "현재 불러와진 모듈이 없습니다.",
-  "APP_NOMODULE_2": "다음의 파일에서 불러오기 순서를 설정하고 게임을 재시작하십시오.",
-  "MENU_LABEL_KEYCONFIG_HELP1": "키캡을 클릭해 컨트롤을 배정하십시오",
+  "MENU_IO_MANUAL_SAVE": "수동 저장",
+  "MENU_LABEL_COPYRIGHT": "저작권",
+  "MENU_LABEL_DELETE": "삭제",
+  "MENU_LABEL_EXTRA_JVM_ARGUMENTS": "추가 명령 인수",
+  "MENU_LABEL_IME": "입력기",
   "MENU_LABEL_IME_TOGGLE": "입력기 켜고 끄기",
+  "MENU_LABEL_KEYBOARD_LAYOUT": "자판 배열",
+  "MENU_LABEL_PASTE": "붙여넣기",
   "MENU_LABEL_PASTE_FROM_CLIPBOARD": "복사한 텍스트 붙여넣기",
-  "MENU_OPTIONS_PERFORMANCE": "성능"
+  "MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요",
+  "MENU_LABEL_RESET" : "재설정",
+  "MENU_LABEL_RESTART_REQUIRED": "재시작 필요",
+  "MENU_LABEL_STREAMING": "실시간 방송",
+  "MENU_LABEL_SYSTEM_INFO": "시스템 정보",
+  "MENU_MODULES" : "모듈",
+  "MENU_OPTIONS_ATLAS_TEXTURE_SIZE": "아틀라스 텍스처 크기",
+  "MENU_OPTIONS_AUTOSAVE": "자동 저장",
+  "MENU_OPTIONS_BLUR": "흐림",
+  "MENU_OPTIONS_DEBUG_CONSOLE": "디버그 콘솔",
+  "MENU_OPTIONS_DITHER": "디더링",
+  "MENU_OPTIONS_JVM_HEAP_MAX": "최대 힙 메모리",
+  "MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION": "알림 표시 시간",
+  "MENU_OPTIONS_PARTICLES": "입자 수",
+  "MENU_OPTIONS_PERFORMANCE": "성능",
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "채팅창 오버레이",
+  "MENU_OPTIONS_NONE" : "없음"
 }

assets/locales/koKR/terrarum_sentences.json

@@ -0,0 +1,16 @@
+{
+  "GAME_32BIT_WARNING1": "32비트 버전의 Java를 사용중인 것 같습니다.",
+  "GAME_32BIT_WARNING2": "아래 링크에서 최신 64비트 Java를 내려받아 설치해주세요.",
+  "GAME_32BIT_WARNING3": "https://www.java.com/ko/download/",
+  "GAME_APPLE_ROSETTA_WARNING1": "Apple Silicon이 탑재된 Mac을 사용 중이지만 x86 빌드의 게임을 실행 중입니다.",
+  "GAME_APPLE_ROSETTA_WARNING2": "최적의 성능과 게임 경험을 위해 Apple Silicon용 빌드의 게임을 이용해 주십시오.",
+  "APP_NOMODULE_1": "현재 불러와진 모듈이 없습니다.",
+  "APP_NOMODULE_2": "다음의 파일에서 불러오기 순서를 설정하고 게임을 재시작하십시오.",
+  "MENU_LABEL_KEYCONFIG_HELP1": "키캡을 클릭해 컨트롤을 배정하십시오",
+  "GAME_PREV_SAVE_WAS_LOADED1": "가장 최근에 저장된 게임이 손상되었습니다.",
+  "GAME_PREV_SAVE_WAS_LOADED2": "이전에 저장된 게임을 불러왔습니다.",
+  "GAME_MORE_RECENT_AUTOSAVE1": "자동 저장된 게임이 수동으로 저장한 게임보다 더 최신입니다.",
+  "GAME_MORE_RECENT_AUTOSAVE2": "불러올 게임을 선택해 주십시오.",
+  "MENU_LABEL_SAVE_WILL_BE_DELETED": "선택된 세이브가 삭제됩니다.",
+  "MENU_LABEL_UNSAVED_PROGRESS_WILL_BE_LOST": "저장하지 않은 진행 상황을 잃게 됩니다."
+}

assets/locales/zhCN/terrarum.json

@@ -15,7 +15,7 @@
   "GAME_32BIT_WARNING1": "看起来您正在运行32位版本的Java。",
   "GAME_32BIT_WARNING2": "请下载并安装最新的64位Java :",
   "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
-  "MENU_OPTION_STREAMERS_LAYOUT": "聊天叠加",
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "聊天叠加",
   "MENU_LABEL_RESTART_REQUIRED": "需要重新启动",
   "MENU_LABEL_KEYBOARD_LAYOUT": "键盘布局",
   "MENU_LABEL_IME": "输入法",

assets/locales/zhTW/terrarum.json

@@ -11,7 +11,7 @@
   "GAME_32BIT_WARNING1": "看起來您正在運行32位版本的Java。",
   "GAME_32BIT_WARNING2": "請下載並安裝最新的64位Java :",
   "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
-  "MENU_OPTION_STREAMERS_LAYOUT": "聊天疊加",
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "聊天疊加",
   "MENU_LABEL_RESTART_REQUIRED": "需要重新啟動",
   "MENU_LABEL_KEYBOARD_LAYOUT": "鍵盤配置",
   "MENU_LABEL_IME": "輸入法",

assets/mods/basegame/blocks/blocks.csv

@@ -1,5 +1,5 @@
 "id";"drop";"spawn";"name";"shdr";"shdg";"shdb";"shduv";"str";"dsty";"mate";"solid";"wall";"grav";"dlfn";"fv";"fr";"lumr";"lumg";"lumb";"lumuv";"colour";"vscs";"refl";"tags"
-"0";"0";"0";"BLOCK_AIR";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";""
+"0";"0";"0";"BLOCK_AIR";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"INCONSEQUENTIAL"
 "16";"17";"17";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURAL"
 "17";"17";"17";"BLOCK_STONE_QUARRIED";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK"
 "18";"18";"18";"BLOCK_STONE_TILE_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.18";"STONE"
@@ -23,12 +23,12 @@
 "65";"65";"65";"BLOCK_TRUNK_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"19";"1200";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
 "66";"66";"66";"BLOCK_TRUNK_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"15";"670";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
 "67";"67";"67";"BLOCK_TRUNK_BLOODROSE";"0.0312";"0.0312";"0.0312";"0.0312";"17";"900";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
-"80";"80";"80";"BLOCK_SAND";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL"
-"81";"81";"81";"BLOCK_SAND_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL"
-"82";"82";"82";"BLOCK_SAND_RED";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL"
-"83";"83";"83";"BLOCK_SAND_DESERT";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL"
-"84";"84";"84";"BLOCK_SAND_BLACK";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL"
-"85";"85";"85";"BLOCK_SAND_GREEN";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL"
+"80";"80";"80";"BLOCK_SAND";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
+"81";"81";"81";"BLOCK_SAND_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
+"82";"82";"82";"BLOCK_SAND_RED";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
+"83";"83";"83";"BLOCK_SAND_DESERT";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
+"84";"84";"84";"BLOCK_SAND_BLACK";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
+"85";"85";"85";"BLOCK_SAND_GREEN";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
 "96";"96";"96";"BLOCK_GRAVEL";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"GRVL";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GRAVEL,NATURAL"
 "97";"97";"97";"BLOCK_GRAVEL_GREY";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"GRVL";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GRAVEL,NATURAL"
 "112";"112";"112";"BLOCK_ORE_MALACHITE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"OORE";"1";"0";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ORE,NATURAL"
@@ -44,10 +44,10 @@
 "132";"132";"132";"BLOCK_GEM_DIAMOND";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"OGEM";"1";"0";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GEM,NATURAL"
 "133";"133";"133";"BLOCK_GEM_AMETHYST";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"OGEM";"1";"0";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GEM,NATURAL"
 "134";"134";"134";"BLOCK_GEM_QUARTZ";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"OGEM";"1";"0";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GEM,NATURAL"
-"144";"144";"144";"BLOCK_SNOW";"0.1252";"0.1252";"0.1252";"0.1252";"24";"500";"SNOW";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"SNOW,NATURAL"
-"145";"N/A";"N/A";"BLOCK_ICE_FRAGILE";"0.0508";"0.0508";"0.0508";"0.0508";"5";"930";"ICEI";"1";"0";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ICE,NATURAL,FRAGIEL"
-"146";"146";"146";"BLOCK_ICE_NATURAL";"0.1016";"0.1016";"0.1016";"0.1016";"35";"930";"ICEI";"1";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ICE,NATURAL"
-"147";"147";"147";"BLOCK_ICE_CLEAR_MAGICAL";"0.1252";"0.1252";"0.1252";"0.1252";"48";"3720";"ICEX";"1";"1";"N/A";"0";"0";"4";"0.0744";"0.1252";"0.2268";"0.0000";"N/A";"N/A";"0.0";"ICE"
+"144";"144";"144";"BLOCK_SNOW";"0.1252";"0.1252";"0.1252";"0.1252";"24";"500";"SNOW";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"SNOW,NATURAL,COLD"
+"145";"N/A";"N/A";"BLOCK_ICE_FRAGILE";"0.0508";"0.0508";"0.0508";"0.0508";"5";"930";"ICEI";"1";"0";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ICE,NATURAL,FRAGILE,COLD"
+"146";"146";"146";"BLOCK_ICE_NATURAL";"0.1016";"0.1016";"0.1016";"0.1016";"35";"930";"ICEI";"1";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ICE,NATURAL,COLD"
+"147";"147";"147";"BLOCK_ICE_CLEAR_MAGICAL";"0.1252";"0.1252";"0.1252";"0.1252";"48";"3720";"ICEX";"1";"1";"N/A";"0";"0";"4";"0.0744";"0.1252";"0.2268";"0.0000";"N/A";"N/A";"0.0";"ICE,COLD"
 "148";"148";"148";"BLOCK_GLASS_CRUDE";"0.0876";"0.0424";"0.0876";"0.1252";"5";"2500";"GLAS";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GLASS"
 "149";"149";"149";"BLOCK_GLASS_CLEAN";"0.0424";"0.0424";"0.0424";"0.0636";"5";"2203";"GLAS";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GLASS"
 "160";"160";"160";"BLOCK_PLATFORM_STONE";"0.0312";"0.0312";"0.0312";"0.0312";"5";"2400";"ROCK";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM"
@@ -188,6 +188,7 @@
 ## Some tags are reserved for internal use, which are:
 ## - INTERNAL: denotes that the tile is internal-use. Will not be rendered unless debug window is on.
 ## - DORENDER: this internal tile must go through the standard-issue tile drawing routine.
+## - INCONSEQUENTIAL: denotes that this tile can be overwritten without dropping it. Usually used with flower tiles.
 #
 #
 ## References ##

assets/mods/basegame/commands.csv

@@ -22,6 +22,8 @@ Seed
 SetAV
 SetBulletin
 SetScale
+SetSol
+SetTurb
 SetTime
 SetTimeDelta
 SpawnPhysTestBall
@@ -30,4 +32,5 @@ Teleport
 ToggleNoClip
 Zoom
 DynToStatic
-DebugFillInventory
+DebugFillInventory
+Uuid

assets/mods/basegame/items/itemid.csv

@@ -8,10 +8,13 @@ id;classname
 8;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalEmitter
 9;net.torvald.terrarum.modulebasegame.gameitems.WireCutterAll
 10;net.torvald.terrarum.modulebasegame.gameitems.ItemTypewriter
+11;net.torvald.terrarum.modulebasegame.gameitems.ItemWallCalendar
 
 256;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorOak
 257;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorEbony
 258;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorBirch
 259;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorRosewood
 
+320;net.torvald.terrarum.modulebasegame.gameitems.ItemWorldPortal
+
 999999;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry

assets/mods/basegame/locales/en/calendar.json

@@ -0,0 +1,34 @@
+{
+  "MENU_CALENDAR_CALENDAR": "Calendar",
+  "MENU_CALENDAR_EVENTS": "Events",
+  "MENU_CALENDAR_ADD_NEW_EVENT": "Add New Event",
+  "CONTEXT_CALENDAR_SEASON_SPRING": "Spring",
+  "CONTEXT_CALENDAR_SEASON_SUMMER": "Summer",
+  "CONTEXT_CALENDAR_SEASON_AUTUMN": "Autumn",
+  "CONTEXT_CALENDAR_SEASON_WINTER": "Winter",
+  "CONTEXT_CALENDAR_SEASON_SPRI": "Spri",
+  "CONTEXT_CALENDAR_SEASON_SUMM": "Summ",
+  "CONTEXT_CALENDAR_SEASON_AUTM": "Autm",
+  "CONTEXT_CALENDAR_SEASON_WINT": "Wint",
+  "CONTEXT_CALENDAR_DATE_FORMAT_Y": "Year {0}",
+  "CONTEXT_CALENDAR_DATE_FORMAT_YMD": "Year {0} {1} {2}",
+  "CONTEXT_CALENDAR_DATE_FORMAT_YMD_DDD": "Year {0} {1} {2} {3}",
+
+  "CONTEXT_CALENDAR_DAY_MONDAG_DNT": "Mondag",
+  "CONTEXT_CALENDAR_DAY_TYSDAG_DNT": "Tysdag",
+  "CONTEXT_CALENDAR_DAY_MIDTVEKE_DNT": "Midtveke",
+  "CONTEXT_CALENDAR_DAY_TORSDAG_DNT": "Torsdag",
+  "CONTEXT_CALENDAR_DAY_FREDAG_DNT": "Fredag",
+  "CONTEXT_CALENDAR_DAY_LAURDAG_DNT": "Laurdag",
+  "CONTEXT_CALENDAR_DAY_SUNDAG_DNT": "Sundag",
+  "CONTEXT_CALENDAR_DAY_VERDDAG_DNT": "Verddag",
+  "CONTEXT_CALENDAR_DAY_MON_DNT": "Mon",
+  "CONTEXT_CALENDAR_DAY_TYS_DNT": "Tys",
+  "CONTEXT_CALENDAR_DAY_MID_DNT": "Mid",
+  "CONTEXT_CALENDAR_DAY_TOR_DNT": "Tor",
+  "CONTEXT_CALENDAR_DAY_FRE_DNT": "Fre",
+  "CONTEXT_CALENDAR_DAY_LAU_DNT": "Lau",
+  "CONTEXT_CALENDAR_DAY_SUN_DNT": "Sun",
+  "CONTEXT_CALENDAR_DAY_VER_DNT": "Ver",
+  "CONTEXT_CALENDAR_DATE_FORMAT_YMD_SHORT_DNT": "ɣ{0}-{1}-{2}"
+}

assets/mods/basegame/locales/en/game.json

@@ -1,20 +1,24 @@
 {
+  "CONTEXT_GENERATOR_SEED": "Seed",
+  "CONTEXT_ITEM_MAP": "Map",
+  "CONTEXT_ITEM_TOOL_PLURAL": "Tools",
+  "CONTEXT_PLACE_COORDINATE": "Coordinate",
+  "CONTEXT_WORLD_COUNT": "Worlds: ",
   "CONTEXT_WORLD_NEW": "New World",
   "MENU_LABEL_DELETE_WORLD": "Delete World",
-  "CONTEXT_WORLD_COUNT": "Worlds: ",
-  "GAME_INVENTORY_INGREDIENTS": "Ingredients",
-  "GAME_INVENTORY_POTIONS": "Potions",
-  "GAME_INVENTORY_BLOCKS": "Blocks",
-  "GAME_INVENTORY_WALLS": "Walls",
-  "CONTEXT_ITEM_TOOL_PLURAL": "Tools",
-  "GAME_INVENTORY_FAVORITES": "Favorites",
-  "GAME_INVENTORY_REGISTER": "Register",
-  "CONTEXT_ITEM_MAP": "Map",
   "MENU_LABEL_MENU": "Menu",
-  "CONTEXT_GENERATOR_SEED": "Seed",
+  "MENU_LABEL_PREV_SAVES": "Previous Saves",
+  "MENU_LABEL_RENAME": "Rename",
+  "GAME_ACTION_CRAFT": "Craft",
   "GAME_ACTION_GRAPPLE": "Grapple",
   "GAME_ACTION_QUICKSEL": "Quick Select",
-  "GAME_ACTION_CRAFT": "Craft",
+  "GAME_ACTION_TELEPORT": "Teleport",
+  "GAME_CRAFTABLE_ITEMS": "Craftable Items",
   "GAME_CRAFTING": "Crafting",
-  "GAME_CRAFTABLE_ITEMS": "Craftable Items"
+  "GAME_INVENTORY_BLOCKS": "Blocks",
+  "GAME_INVENTORY_FAVORITES": "Favorites",
+  "GAME_INVENTORY_INGREDIENTS": "Ingredients",
+  "GAME_INVENTORY_POTIONS": "Potions",
+  "GAME_INVENTORY_REGISTER": "Register",
+  "GAME_INVENTORY_WALLS": "Walls"
 }

assets/mods/basegame/locales/en/items.json

@@ -1,18 +1,20 @@
 {
+  "BLOCK_STONE_DEEP": "Deepstone",
+  "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding",
+  "BLOCK_STONE_MARBLE": "Marble",
+
+  "ITEM_CALENDAR": "Calendar",
+  "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
+  "ITEM_STORAGE_CHEST": "Storage Chest",
+  "ITEM_TIKI_TORCH": "Tiki Torch",
+  "ITEM_TYPEWRITER": "Typewriter",
+  "ITEM_WIRE": "Wire",
+  "ITEM_WIRE_CUTTER": "Wire Cutter",
+
   "ACTORBLOCK_ALLOW_MOVE_DOWN": "Urist Arôlcustith",
   "ACTORBLOCK_FULL_COLLISION": "Urist Berdanrifot",
   "ACTORBLOCK_NO_COLLISION": "Urist Zafal",
   "ACTORBLOCK_NO_PASS_RIGHT": "Urist McPassLeft",
   "ACTORBLOCK_NO_PASS_LEFT": "Urist McPassRight",
-  "ACTORBLOCK_TILING_PLACEHOLDER": "Urist Berdanurdim",
-
-  "BLOCK_STONE_DEEP": "Deepstone",
-  "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding",
-  "BLOCK_STONE_MARBLE": "Marble",
-
-  "ITEM_STORAGE_CHEST": "Storage Chest",
-  "ITEM_WIRE": "Wire",
-  "ITEM_WIRE_CUTTER": "Wire Cutter",
-  "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
-  "ITEM_TIKI_TORCH": "Tiki Torch"
+  "ACTORBLOCK_TILING_PLACEHOLDER": "Urist Berdanurdim"
 }

assets/mods/basegame/locales/en/sentences.json

@@ -0,0 +1,5 @@
+{
+  "CONTEXT_THIS_IS_A_WORLD_CURRENTLY_PLAYING": "This is a world currently playing.",
+  "CONTEXT_IMPORT_AVATAR_INSTRUCTION_1": "Copy the Avatar Code into the clipboard, then hit the Paste button below.",
+  "CONTEXT_IMPORT_AVATAR_INSTRUCTION_2": ""
+}

assets/mods/basegame/locales/koKR/calendar.json

@@ -0,0 +1,16 @@
+{
+  "MENU_CALENDAR_CALENDAR": "달력",
+  "MENU_CALENDAR_EVENTS": "일정",
+  "MENU_CALENDAR_ADD_NEW_EVENT": "새 일정 추가",
+  "CONTEXT_CALENDAR_SEASON_SPRING": "봄",
+  "CONTEXT_CALENDAR_SEASON_SUMMER": "여름",
+  "CONTEXT_CALENDAR_SEASON_AUTUMN": "가을",
+  "CONTEXT_CALENDAR_SEASON_WINTER": "겨울",
+  "CONTEXT_CALENDAR_SEASON_SPRI": "봄",
+  "CONTEXT_CALENDAR_SEASON_SUMM": "여름",
+  "CONTEXT_CALENDAR_SEASON_AUTM": "가을",
+  "CONTEXT_CALENDAR_SEASON_WINT": "겨울",
+  "CONTEXT_CALENDAR_DATE_FORMAT_Y": "{0}년",
+  "CONTEXT_CALENDAR_DATE_FORMAT_YMD": "{0}년 {1} {2}일",
+  "CONTEXT_CALENDAR_DATE_FORMAT_YMD_DDD": "{0}년 {1} {2}일 {3}"
+}

assets/mods/basegame/locales/koKR/game.json

@@ -1,21 +1,25 @@
 {
+  "CONTEXT_GENERATOR_SEED": "시드",
+  "CONTEXT_ITEM_MAP": "지도",
+  "CONTEXT_ITEM_TOOL_PLURAL": "도구",
+  "CONTEXT_PLACE_COORDINATE": "좌표",
+  "CONTEXT_WORLD_COUNT": "새계: ",
   "CONTEXT_WORLD_NEW": "새 세계",
   "MENU_LABEL_DELETE_WORLD": "새계 삭제",
-  "CONTEXT_WORLD_COUNT": "새계: ",
-  "MENU_MONITOR_CALI_TITLE": "모니터 확인",
-  "GAME_INVENTORY_INGREDIENTS": "재료",
-  "GAME_INVENTORY_POTIONS": "물약",
-  "GAME_INVENTORY_BLOCKS": "블록",
-  "GAME_INVENTORY_WALLS": "벽지",
-  "CONTEXT_ITEM_TOOL_PLURAL": "도구",
-  "GAME_INVENTORY_FAVORITES": "즐겨찾기",
-  "GAME_INVENTORY_REGISTER": "등록하기",
   "MENU_LABEL_MENU": "메뉴",
-  "CONTEXT_ITEM_MAP": "지도",
-  "CONTEXT_GENERATOR_SEED": "시드",
+  "MENU_LABEL_PREV_SAVES": "이전 세이브",
+  "MENU_LABEL_RENAME": "이름 바꾸기",
+  "MENU_MONITOR_CALI_TITLE": "모니터 확인",
+  "GAME_ACTION_CRAFT": "제작하기",
   "GAME_ACTION_GRAPPLE": "매달리기",
   "GAME_ACTION_QUICKSEL": "빠른 선택",
-  "GAME_ACTION_CRAFT": "제작하기",
+  "GAME_ACTION_TELEPORT": "텔레포트하기",
+  "GAME_CRAFTABLE_ITEMS": "제작 가능한 아이템",
   "GAME_CRAFTING": "제작",
-  "GAME_CRAFTABLE_ITEMS": "제작 가능한 아이템"
+  "GAME_INVENTORY_BLOCKS": "블록",
+  "GAME_INVENTORY_FAVORITES": "즐겨찾기",
+  "GAME_INVENTORY_INGREDIENTS": "재료",
+  "GAME_INVENTORY_POTIONS": "물약",
+  "GAME_INVENTORY_REGISTER": "등록하기",
+  "GAME_INVENTORY_WALLS": "벽지"
 }

assets/mods/basegame/locales/koKR/items.json

@@ -3,9 +3,11 @@
   "BLOCK_SCAFFOLDING_NORMAL": "발판",
   "BLOCK_STONE_MARBLE": "대리석",
 
-  "ITEM_STORAGE_CHEST": "보관상자",
-  "ITEM_WIRE": "전선",
-  "ITEM_WIRE_CUTTER": "전선 절단기",
+  "ITEM_CALENDAR": "달력",
   "ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기",
-  "ITEM_TIKI_TORCH": "티키 토치"
+  "ITEM_STORAGE_CHEST": "보관상자",
+  "ITEM_TIKI_TORCH": "티키 토치",
+  "ITEM_TYPEWRITER": "타자기",
+  "ITEM_WIRE": "전선",
+  "ITEM_WIRE_CUTTER": "전선 절단기"
 }

assets/mods/basegame/locales/koKR/sentences.json

@@ -0,0 +1,5 @@
+{
+  "CONTEXT_THIS_IS_A_WORLD_CURRENTLY_PLAYING": "현재 플레이 중인 월드입니다.",
+  "CONTEXT_IMPORT_AVATAR_INSTRUCTION_1": "아바타 코드를 클립보드에 복사한 다음, 아래의 붙여넣기 버튼을 눌러주세요.",
+  "CONTEXT_IMPORT_AVATAR_INSTRUCTION_2": ""
+}

assets/mods/basegame/weathers/WeatherGeneric.json

@@ -1,7 +1,22 @@
 {
   "skyboxGradColourMap": "generic_skybox.tga",
+  "daylightClut": "clut_daylight.tga",
   "classification": "generic",
-  "extraImages": [
-
-  ]
+  "cloudChance": 250,
+  "cloudGamma": [0.48, 1.8],
+  "cloudGammaVariance": [0.1, 0.1],
+  "windSpeed": 10.25,
+  "windSpeedVariance": 1.0,
+  "clouds": {
+    "cumulonimbus": {
+      "filename": "cloud_large.png", "tw": 2048, "th": 1024, "probability": 0.2,
+      "baseScale": 2.0, "scaleVariance": 0.3333333,
+      "altLow": 80, "altHigh": 120
+    },
+    "cumulus": {
+      "filename": "cloud_normal.png", "tw": 1024, "th": 512, "probability": 1.0,
+      "baseScale": 1.0, "scaleVariance": 0.6,
+      "altLow": 80, "altHigh": 800
+    }
+  }
 }

assets/mods/basegame/weathers/WeatherGenericRain.json.asrtinears

@@ -1,10 +0,0 @@
-{
-  "globalLight": "generic_light.tga",
-  "skyboxGradColourMap": "generic_skybox.tga",
-  "classification": "genericrain",
-  "extraImages": [
-    "raindrop.tga"
-  ],
-  "mixFrom": "__CURRENTWEATHER",
-  "mixPercentage": 80.0
-}

assets/mods/basegame/weathers/WeatherOvercast.json

@@ -0,0 +1,27 @@
+{
+  "skyboxGradColourMap": "generic_skybox.tga",
+  "daylightClut": "clut_daylight.tga",
+  "classification": "overcast",
+  "cloudChance": 300,
+  "cloudGamma": [2.2, 2.0],
+  "cloudGammaVariance": [0.1, 0.1],
+  "windSpeed": 10.45,
+  "windSpeedVariance": 1.0,
+  "clouds": {
+    "cumulus": {
+      "filename": "cloud_normal.png", "tw": 1024, "th": 512, "probability": 0.1,
+      "baseScale": 0.8, "scaleVariance": 0.6,
+      "altLow": 80, "altHigh": 800
+    },
+    "cumulonimbus": {
+      "filename": "cloud_large.png", "tw": 2048, "th": 1024, "probability": 0.4,
+      "baseScale": 2.0, "scaleVariance": 0.3333333,
+      "altLow": 90, "altHigh": 120
+    },
+    "nimbostratus": {
+      "filename": "cloud_wide.png", "tw": 4096, "th": 1024, "probability": 1.0,
+      "baseScale": 4.0, "scaleVariance": 0.1,
+      "altLow": 100, "altHigh": 100
+    }
+  }
+}

assets/mods/basegame/weathers/cloud_texture_instruction.md

@@ -0,0 +1,26 @@
+## actually blending
+1. On Krita, load the cloudmap
+2. Select and isolate suitable piece of the cloud
+3. With liquefying brush, make the bottom flat
+4. On new tab, load the solidmap
+5. Resize the solidmap to 1024x1024
+6. Rotate the solidmap by 30 deg or so
+7. Overlay the processed solidmap to the cloudmap, opacity=30%
+8. With airbrush tool, manually add the shade (see cloud_normal.kra to get the gist of it)
+
+### cloudmap
+1. On GIMP, prepare 4096x4096 canvas
+2. Create Simplex Noise with following parameters:
+    - Scale: arbitrary (0.05 - 0.2)
+    - Iterations: MAX
+    - Seed: anything but 0
+
+### solidmap
+1. On GIMP, prepare 4096x4096 canvas
+2. Create Solid Noise with following parameters:
+    - XY Size: 16.0
+    - Detail: MAX
+    - Tileable: check
+    - Turbulent: check
+    - Seed: anything but 0
+

assets/mods/basegame/wires/wires.csv

@@ -1,11 +1,11 @@
 id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;inventoryimg;branching
-8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,1,9;1
-8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,1,10;1
-8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,1,11;1
-#8195;8195;WIRE_BUNDLE;signal;digital_3bits;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,1,2;1
-8196;8196;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,2,9;1
-8197;8197;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,3,9;1
-8198;8198;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items16,4,9;1
+8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,4;1
+8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,1,4;1
+8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,2,4;1
+#8195;8195;WIRE_BUNDLE;signal;digital_3bits;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,0;1
+8196;8196;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1
+8197;8197;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1
+8198;8198;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1
 
 
 # accept: which wiretype (defined elsewhere) the wires acceps. Use comma to separate multiple. N/A for electronic components (aka not wires)

buildapp/build_app_linux_arm.sh

@@ -23,12 +23,14 @@ cp $SRCFILES/AppRun $DESTDIR/AppRun
 chmod +x $DESTDIR/AppRun
 
 # Copy over a Java runtime
-cp -r "../out/$RUNTIME" $DESTDIR/
+mkdir $DESTDIR/out
+cp -r "../out/$RUNTIME" $DESTDIR/out/
+mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/Terrarum
 
 # Copy over all the assets and a jarfile
 cp -r "../assets_release" $DESTDIR/
 mv $DESTDIR/assets_release $DESTDIR/assets
-cp -r "../out/TerrarumBuild.jar" $DESTDIR/assets/
+cp "../out/TerrarumBuild.jar" $DESTDIR/out/
 
 # Pack everything to AppImage
 ARCH=arm_aarch64 "./$APPIMAGETOOL" $DESTDIR "out/$DESTDIR.AppImage" || { echo 'Building AppImage failed' >&2; exit 1; }

buildapp/build_app_linux_x86.sh

@@ -23,12 +23,14 @@ cp $SRCFILES/AppRun $DESTDIR/AppRun
 chmod +x $DESTDIR/AppRun
 
 # Copy over a Java runtime
-cp -r "../out/$RUNTIME" $DESTDIR/
+mkdir $DESTDIR/out
+cp -r "../out/$RUNTIME" $DESTDIR/out/
+mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/Terrarum
 
 # Copy over all the assets and a jarfile
 cp -r "../assets_release" $DESTDIR/
 mv $DESTDIR/assets_release $DESTDIR/assets
-cp -r "../out/TerrarumBuild.jar" $DESTDIR/assets/
+cp "../out/TerrarumBuild.jar" $DESTDIR/out/
 
 # Pack everything to AppImage
 "./$APPIMAGETOOL" $DESTDIR "out/$DESTDIR.AppImage" || { echo 'Building AppImage failed' >&2; exit 1; }

buildapp/build_app_mac_arm.sh

@@ -3,7 +3,8 @@ if (( $EUID == 0 )); then echo "The build process is not meant to be run with ro
 
 cd "${0%/*}"
 SRCFILES="terrarummac_arm"
-DESTDIR="out/TerrarumMac.arm.app"
+APPDIR="./TerrarumMac.arm.app"
+DESTDIR="out/$APPDIR"
 RUNTIME="runtime-osx-arm"
 
 if [ ! -d "../assets_release" ]; then
@@ -25,11 +26,17 @@ cp $SRCFILES/Terrarum.sh $DESTDIR/Contents/MacOS/
 chmod +x $DESTDIR/Contents/MacOS/Terrarum.sh
 
 # Copy over a Java runtime
-cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/
+mkdir $DESTDIR/Contents/MacOS/out
+cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/
+mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/Terrarum
 
 # Copy over all the assets and a jarfile
 cp -r "../assets_release" $DESTDIR/Contents/MacOS/
 mv $DESTDIR/Contents/MacOS/assets_release $DESTDIR/Contents/MacOS/assets
-cp -r "../out/TerrarumBuild.jar" $DESTDIR/Contents/MacOS/assets/
+cp "../out/TerrarumBuild.jar" $DESTDIR/Contents/MacOS/out/
+
+cd "out"
+rm $APPDIR.zip
+7z a -tzip $APPDIR.zip $APPDIR
 
 echo "Build successful: $DESTDIR"

buildapp/build_app_mac_x86.sh

@@ -3,7 +3,8 @@ if (( $EUID == 0 )); then echo "The build process is not meant to be run with ro
 
 cd "${0%/*}"
 SRCFILES="terrarummac_x86"
-DESTDIR="out/TerrarumMac.x86.app"
+APPDIR="./TerrarumMac.x86.app"
+DESTDIR="out/$APPDIR"
 RUNTIME="runtime-osx-x86"
 
 if [ ! -d "../assets_release" ]; then
@@ -25,11 +26,17 @@ cp $SRCFILES/Terrarum.sh $DESTDIR/Contents/MacOS/
 chmod +x $DESTDIR/Contents/MacOS/Terrarum.sh
 
 # Copy over a Java runtime
-cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/
+mkdir $DESTDIR/Contents/MacOS/out
+cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/
+mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/Terrarum
 
 # Copy over all the assets and a jarfile
 cp -r "../assets_release" $DESTDIR/Contents/MacOS/
 mv $DESTDIR/Contents/MacOS/assets_release $DESTDIR/Contents/MacOS/assets
-cp -r "../out/TerrarumBuild.jar" $DESTDIR/Contents/MacOS/assets/
+cp "../out/TerrarumBuild.jar" $DESTDIR/Contents/MacOS/out/
+
+cd "out"
+rm $APPDIR.zip
+7z a -tzip $APPDIR.zip $APPDIR
 
 echo "Build successful: $DESTDIR"

buildapp/build_app_windows_x86.sh

@@ -16,17 +16,26 @@ rm -rf $DESTDIR || true
 mkdir $DESTDIR
 
 # Prepare an application
-cp $SRCFILES/Terrarum.bat $DESTDIR/
+if ! command -v x86_64-w64-mingw32-gcc  &> /dev/null
+then
+    echo 'Mingw32 not found; please install mingw64-cross-gcc (or similar) to your system' >&2; exit 1;
+fi
+
+x86_64-w64-mingw32-gcc -Os -s -o $DESTDIR/Terrarum.exe $SRCFILES/Terrarum.c || { echo 'Building EXE failed' >&2; exit 1; }
+# TODO add icon to the exe (use x86_64-w64-mingw32-windres?)
 
 # Copy over a Java runtime
-cp -r "../out/$RUNTIME" $DESTDIR/
+mkdir $DESTDIR/out
+cp -r "../out/$RUNTIME" $DESTDIR/out/
+mv $DESTDIR/out/$RUNTIME/bin/java.exe $DESTDIR/out/$RUNTIME/bin/Terrarum.exe
 
 # Copy over all the assets and a jarfile
 cp -r "../assets_release" $DESTDIR/
 mv $DESTDIR/assets_release $DESTDIR/assets
-cp -r "../out/TerrarumBuild.jar" $DESTDIR/assets/
+cp  "../out/TerrarumBuild.jar" $DESTDIR/out/
 
 # Temporary solution: zip everything
+rm "out/TerrarumWindows.x86.zip"
 zip -r -9 -l "out/TerrarumWindows.x86.zip" $DESTDIR
 rm -rf $DESTDIR || true
 echo "Build successful: $DESTDIR"

buildapp/make_assets_release.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+if (( $EUID == 0 )); then echo "The build process is not meant to be run with root privilege, exiting now." >&2; exit 1; fi
+
+cd "${0%/*}"
+DESTDIR="../assets_release"
+
+rm -r $DESTDIR
+cp -r "../assets" $DESTDIR
+
+rm $DESTDIR/loopey.wav
+rm $DESTDIR/ktGrepExample.kts
+rm $DESTDIR/batchtest.txt
+rm $DESTDIR/test_texture.tga
+rm $DESTDIR/worldbacktest.tga
+rm -r $DESTDIR/books
+rm $DESTDIR/clut/skybox.tga
+rm $DESTDIR/graphics/*.bat
+rm $DESTDIR/keylayout/*.not_ime
+rm $DESTDIR/mods/basegame/blocks/*.gz
+rm $DESTDIR/mods/basegame/blocks/*.txt
+rm $DESTDIR/mods/basegame/weathers/*.txt
+rm $DESTDIR/mods/basegame/weathers/*.md
+rm $DESTDIR/mods/basegame/weathers/*.kra
+rm -r $DESTDIR/mods/basegame/sounds
+rm -r $DESTDIR/mods/dwarventech
+
+
+

buildapp/terrarumlinux_arm/AppRun

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd "${0%/*}"
-./runtime-linux-arm/bin/java -Xms1G -Xmx6G -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./assets/TerrarumBuild.jar
+./out/runtime-linux-arm/bin/Terrarum -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar

buildapp/terrarumlinux_x86/AppRun

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd "${0%/*}"
-./runtime-linux-x86/bin/java -Xms1G -Xmx6G -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./assets/TerrarumBuild.jar
+./out/runtime-linux-x86/bin/Terrarum -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar

buildapp/terrarummac_arm/Terrarum.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd "${0%/*}"
-./runtime-osx-arm/bin/java -XstartOnFirstThread -Xms1G -Xmx6G -jar ./assets/TerrarumBuild.jar
+./out/runtime-osx-arm/bin/Terrarum -jar ./out/TerrarumBuild.jar

buildapp/terrarummac_x86/Terrarum.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd "${0%/*}"
-./runtime-osx-x86/bin/java -XstartOnFirstThread -Xms1G -Xmx6G -jar ./assets/TerrarumBuild.jar
+./out/runtime-osx-x86/bin/Terrarum -jar ./out/TerrarumBuild.jar

buildapp/terrarumwindows_x86/Terrarum.bat

@@ -1,2 +0,0 @@
-cd /D "%~dp0"
-.\runtime-windows-x86\bin\java -Xms1G -Xmx6G -jar .\assets\TerrarumBuild.jar

buildapp/terrarumwindows_x86/Terrarum.c

@@ -0,0 +1,11 @@
+#include <windows.h>
+#include <stdio.h>
+#include <tchar.h>
+
+int main() {
+
+    ShellExecute(NULL, "open", "\".\\out\\runtime-windows-x86\\bin\\Terrarum.exe\"", "-jar \".\\out\\TerrarumBuild.jar\"", NULL, SW_HIDE);
+    return 0;
+
+    //return system(".\\out\\runtime-windows-x86\\bin\\Terrarum.exe -jar .\\out\\TerrarumBuild.jar");
+}

lib/android-lint/lint-31.0.1.pom

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.android.tools.lint</groupId>
+  <artifactId>lint</artifactId>
+  <version>31.0.1</version>
+  <name>com.android.tools.lint.lint</name>
+  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
+  <url>http://tools.android.com/</url>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-api</artifactId>
+      <version>31.0.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-checks</artifactId>
+      <version>31.0.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.external.com-intellij</groupId>
+      <artifactId>intellij-core</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.external.com-intellij</groupId>
+      <artifactId>kotlin-compiler</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.external.org-jetbrains</groupId>
+      <artifactId>uast</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>protos</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>shared</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>tracker</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>manifest-merger</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>31.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>31.0.1-jre</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.kxml</groupId>
+      <artifactId>kxml2</artifactId>
+      <version>2.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-reflect</artifactId>
+      <version>1.7.10</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>1.7.10</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>