fix: inputstrober not working

Updated funding options to include GitHub Sponsors and a PayPal link.

.gitattributes

@@ -10,6 +10,8 @@
 *.icns filter=lfs diff=lfs merge=lfs -text
 *.jar filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
+*.btxbook filter=lfs diff=lfs merge=lfs -text
+*.btxform filter=lfs diff=lfs merge=lfs -text
 
 *.tga binary diff=hex
 *.kra binary diff=hex

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [curioustorvald]
+custom: ["https://paypal.me/curioustorvald"]

.github/workflows/codeql.yml

@@ -0,0 +1,99 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '41 4 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: java-kotlin
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - name: Run manual build steps
+      if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{matrix.language}}"

.idea/artifacts/SpriteAssemblerApp.xml

@@ -1,7 +1,7 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="SpriteAssemblerApp">
     <output-path>$PROJECT_DIR$/out</output-path>
-    <root id="archive" name="terrarum.terrarum.jar">
+    <root id="archive" name="SpriteAssemblerApp.jar">
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/src/net/torvald/terrarum/spriteassembler/META-INF/MANIFEST.MF" />
       </element>
@@ -31,56 +31,58 @@
       <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/gdx-1.12.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.12.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-linux.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-linux-arm32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-linux-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-macos.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-macos-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-windows.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-linux.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-linux-arm32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-linux-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-macos.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-macos-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-windows.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.3-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-linux.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-macos.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-macos-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-windows.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.3-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-linux.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-linux-arm32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-linux-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-macos.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-macos-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-windows.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.3-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-linux.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-linux-arm32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-linux-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-macos.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-macos-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-windows.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.3-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-linux.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-linux-arm32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-linux-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-macos.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-macos-arm64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-windows.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.3-natives-windows-x86.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jorbis-0.0.17.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/artifacts/TerrarumBuild.xml

@@ -13,8 +13,6 @@
       <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="$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="/" />
@@ -29,14 +27,7 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-math3-3.6.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/JTransforms-3.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/JLargeArrays-1.5.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/aircompressor-0.25.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.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-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.22/kotlin-reflect-1.8.22.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.22/kotlin-test-1.8.22.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.12.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.3.jar" path-in-jar="/" />
@@ -90,6 +81,12 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.1-natives-arm64-v8a.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.1-natives-desktop.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.1-natives-x86_64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/TerranVirtualDisk.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/2.0.0/kotlin-stdlib-jdk8-2.0.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/2.0.0/kotlin-stdlib-jdk7-2.0.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/GetBatteryStatus.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/aircompressor-2.0.2.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/codeStyles/Project.xml

@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="999" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

.idea/kotlinc.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="17" />
+    <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="1.8" />
-    <option name="languageVersion" value="1.8" />
+    <option name="apiVersion" value="2.0" />
+    <option name="languageVersion" value="2.0" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.0" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>

.idea/libraries/GetBatteryStatus.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="GetBatteryStatus">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/GetBatteryStatus.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/KotlinJavaRuntime.xml

@@ -1,26 +1,23 @@
 <component name="libraryTable">
   <library name="KotlinJavaRuntime" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" />
+    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/2.0.0/kotlin-stdlib-jdk8-2.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/2.0.0/kotlin-stdlib-jdk7-2.0.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/2.0.0/kotlin-stdlib-jdk8-2.0.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0-javadoc.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/2.0.0/kotlin-stdlib-jdk7-2.0.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/2.0.0/kotlin-stdlib-jdk8-2.0.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/2.0.0/kotlin-stdlib-jdk7-2.0.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/TerranVirtualDisk.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="TerranVirtualDisk">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/TerranVirtualDisk.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/TerranVirtualDisk-src.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/io_airlift_aircompressor.xml

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

.idea/libraries/jetbrains_kotlin_reflect.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="jetbrains.kotlin.reflect" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.8.22" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.22/kotlin-reflect-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/jetbrains_kotlin_test.xml

@@ -1,26 +0,0 @@
-<component name="libraryTable">
-  <library name="jetbrains.kotlin.test" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/jetbrains_kotlin_test1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="jetbrains.kotlin.test1" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-test:1.8.22" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.22/kotlin-test-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <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_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressKotlinCodeStyleNotification">

.idea/runConfigurations/Build_Version_Number.xml

@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build Version Number" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="net.torvald.terrarum.PrebuildKt" />
     <module name="TerrarumBuild" />
     <method v="2">

.idea/runConfigurations/QuickDirtyLint.xml

@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="QuickDirtyLint" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="net.torvald.terrarum.QuickDirtyLintKt" />
     <module name="TerrarumBuild" />
     <method v="2">

.idea/runConfigurations/SpriteAssemblerApp.xml

@@ -3,7 +3,6 @@
     <option name="JAR_PATH" value="$PROJECT_DIR$/out/SpriteAssemblerApp.jar" />
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <module name="TerrarumBuild" />
     <method v="2">

.idea/runConfigurations/Terrarum.xml

@@ -3,7 +3,6 @@
     <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
     <option name="VM_PARAMETERS" value="-ea -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <module name="TerrarumBuild" />
     <method v="2">

.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml

@@ -3,7 +3,6 @@
     <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
     <option name="VM_PARAMETERS" value="-Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <module name="TerrarumBuild" />
     <method v="2">

.idea/runConfigurations/Terrarum__no_prebuild__release_mode_assets_.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terrarum (no prebuild, release-mode assets)" type="JarApplication">
+    <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
+    <option name="VM_PARAMETERS" value="-ea -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
+    <option name="PROGRAM_PARAMETERS" value="--assets buildapp/out/assets.tevd" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
+    <module name="TerrarumBuild" />
+    <method v="2">
+      <option name="BuildArtifacts" enabled="true">
+        <artifact name="TerrarumBuild" />
+      </option>
+      <option name="RunConfigurationTask" enabled="false" run_configuration_name="QuickDirtyLint" run_configuration_type="Application" />
+    </method>
+  </configuration>
+</component>

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Terrarum.wiki" vcs="Git" />
   </component>
 </project>

CLAUDE.md

@@ -0,0 +1,176 @@
+# Terrarum
+
+A modular 2D side-scrolling tilemap platformer engine and game, built on LibGDX with Kotlin/Java. GPL-3.0.
+
+## Build & Run
+
+- **IDE**: IntelliJ IDEA (project files: `Terrarum_renewed.iml`, `TerrarumBuild.iml`)
+- **JDK**: 21
+- **Language**: Kotlin + Java mixed; Kotlin is primary, `App.java` and `FrameBufferManager.java` are Java
+- **Dependencies**: All libraries are in `lib/` (fat-jar approach, no Maven/Gradle). Includes LibGDX, GraalVM JS (modified), dyn4j (Vector2 only), custom bitmap font lib
+- **Entry point**: `net.torvald.terrarum.Principii.main()` (Java) which launches `App` (the LibGDX `ApplicationListener`)
+- **Distribution**: `buildapp/` scripts produce per-platform bundles with jlink'd runtimes
+- **Assets**: `assets/` for development, `assets_release/` for distribution. Custom `.tevd` archive format for release assets (`AssetCache.kt`)
+
+## Project Structure
+
+```
+src/net/torvald/terrarum/
+  App.java                  -- Main application class (LibGDX ApplicationListener). GL thread, render loop, splash screen
+  CommonResourcePool.kt     -- Thread-safe GL resource loading with dispatch queues
+  ModMgr.kt                 -- Module manager. Scans/loads game modules, provides getGdxFile/getJavaClass
+  IngameInstance.kt          -- Base class for game screens (show/hide/render/resize lifecycle)
+  Terrarum.kt               -- Game-level singleton (ingame instance management, extension functions)
+  GameUpdateGovernor.kt      -- Update/render tick governors (ConsistentUpdateRate, Anarchy)
+  MusicService.kt            -- Music playback management
+
+  modulebasegame/
+    EntryPoint.kt            -- Basegame module entry point (registers items, fixtures, blocks, weather)
+    TitleScreen.kt           -- Title screen (demo world rendering, async loading)
+    TerrarumIngame.kt        -- Main gameplay screen
+    IngameRenderer.kt        -- World rendering pipeline (FBO composition, lightmap, blur, shadows)
+    BuildingMaker.kt         -- Building editor screen
+
+  worlddrawer/
+    WorldCamera.kt           -- Camera position tracking (follows player, interpolated movement)
+    LightmapRenderer.kt      -- Per-tile RGB+UV light calculation and rasterisation
+    BlocksDrawer.kt          -- Tile rendering
+    FeaturesDrawer.kt        -- Wire/feature overlay rendering
+
+  gamecontroller/
+    IME.kt                   -- Input Method Engine (GraalVM JS keyboard layouts, loaded on daemon thread)
+
+  weather/
+    WeatherMixer.kt          -- Weather state machine, skybox rendering
+    SkyboxModelHosek.kt      -- Physically-based sky model
+```
+
+## Architecture: Threading & GL Dispatch
+
+All OpenGL calls (Texture, ShaderProgram, FrameBuffer creation) **must** happen on the GL thread. The codebase uses a dispatch mechanism to safely create GL resources from background threads.
+
+### CommonResourcePool (the dispatch hub)
+
+```
+Background Thread                          GL Thread (App.render)
+     |                                          |
+     |-- addToLoadingList("name", { Texture() })|
+     |-- loadAll()                              |
+     |     |                                    |
+     |     +-- if on GL thread: run directly    |
+     |     +-- if not: enqueue to               |
+     |         glDispatchQueue + latch.await()  |
+     |                                     CommonResourcePool.update()
+     |                                          |-- poll glDispatchQueue
+     |                                          |   run loadfun, latch.countDown()
+     |                                          |-- poll glRunnableQueue
+     |                                          |   run block, latch.countDown()
+     |                                          |-- poll slowLoadingQueue (one per tick)
+     |                                          |
+     +-- latch released, continues <------------+
+```
+
+Key methods:
+- `loadAll()` -- batch load; blocks background thread until GL thread processes
+- `loadAllSlowly()` -- timesliced; one resource per tick via `update()`
+- `runOnGLThread { }` -- run arbitrary block on GL thread, blocking caller
+- `update()` -- called every tick from `App.render()`, processes all queues
+- `getOrPut(name, loadfun, killfun)` -- thread-safe get-or-create with GL dispatch
+
+### App.java Boot Sequence
+
+```
+create()
+  -> postInit()          [GL thread, synchronous]
+       |-- load shaders, fonts, audio device, IME
+       |-- CommonResourcePool.setGLThread(currentThread)
+       |-- spawn Terrarum-PostInitLoader thread:
+       |     ModMgr.invoke()           // module entry points (dispatched to GL via runOnGLThread)
+       |     CommonResourcePool.loadAllSlowly()  // timesliced resource loading
+       |     loadingThreadDone = true
+       +-- return (non-blocking)
+
+render() loop [GL thread]
+  while currentScreen == null:
+       |-- drawSplash()
+       |-- CommonResourcePool.update()   // process GL dispatch queues
+       |-- when loadingThreadDone && loaded:
+       |     postLoadInit()              // tile atlas, audio mixer, Terrarum.initialise()
+       |     setScreen(titleScreen)      // transitions to title screen
+```
+
+### TitleScreen Async Loading
+
+`TitleScreen.show()` returns immediately after starting a background thread. The splash screen continues displaying until all loading completes.
+
+```
+show()
+  |-- quick GL setup (viewport, input processor, FBO, savegame list)
+  |-- spawn Terrarum-TitleScreenLoader thread:
+  |     load demo world, compute camera nodes, bogoflops, audio reset
+  |     backgroundLoadDone = true
+  +-- return
+
+renderImpl() [GL thread, every frame]
+  if !loadDone:
+       |-- App.drawSplash()
+       |-- processGLLoadStep()  // state machine, one step per frame:
+       |     0: wait for backgroundLoadDone
+       |     1: SkyboxModelHosek.loadlut()
+       |     2: IngameRenderer.setRenderedWorld + WeatherMixer init
+       |     3: load halfgrad texture
+       |     4: UIFakeGradOverlay
+       |     5: UIFakeBlurOverlay
+       |     6: UIRemoCon
+       |     7: MusicService.enterScene, gameUpdateGovernor.reset(), loadDone=true
+  else:
+       normal title screen rendering (world + UI via IngameRenderer)
+```
+
+### IME Loading
+
+`IME.kt` object `init {}` spawns a `Terrarum-IMELoader` daemon thread for GraalVM JS context binding and key layout/IME file scanning. Icon texture loading remains synchronous (requires GL thread).
+
+### ModMgr Class Initialisation
+
+`ModMgr.kt` object `init {}` only does metadata loading and class instantiation (fast). The heavy `invoke()` method runs entry points wrapped in `CommonResourcePool.runOnGLThread { }` to avoid GL calls on the wrong thread. This separation prevents `<clinit>` lock deadlocks where a background thread holding the class init lock blocks on a GL dispatch latch while the GL thread tries to access the same class.
+
+## Architecture: Rendering Pipeline
+
+### IngameRenderer
+
+Singleton object. Lazily initialised on first `invoke()` call via `invokeInit()`.
+
+Render path (per frame):
+1. `LightmapRenderer.recalculate()` -- every 3 frames, computes per-tile RGBA light values
+2. `prepLightmapRGBA()` -- Kawase blur on lightmap into `lightmapFbo`
+3. `BlocksDrawer.renderData()` -- prepare tile draw data
+4. `drawToRGB()` -- render world tiles + actors into `fboRGB` (with shadow FBOs)
+5. `drawToA()` -- render alpha/glow channel
+6. Composite: sky -> world -> light multiply -> emissive blend -> vibrancy -> UI
+7. Output to `App.renderFBO`, then `TerrarumPostProcessor.draw()` applies final effects
+
+**Critical ordering in `resize()`**: `BlocksDrawer.resize()` and `LightmapRenderer.resize()` must be called **before** `lightmapFbo` creation, because `lightmapFbo` dimensions derive from `LightmapRenderer.lightBuffer` size.
+
+### WorldCamera
+
+Follows an `ActorWithBody` (player or camera actor). Position interpolated per frame. `WorldCamera.x/y` = top-left corner of visible area. `gdxCamX/Y` = centre of visible area. `moveCameraToWorldCoord()` positions the IngameRenderer camera for world-space drawing; `setCameraPosition(0,0)` positions it for screen-space drawing.
+
+### FBO Extension Functions
+
+- `FrameBuffer.inAction(camera, batch) { }` -- bind FBO, set camera to FBO dimensions (Y-down), run block, restore camera to screen dimensions
+- `FrameBuffer.inActionF(camera, batch) { }` -- same but Y-up (for flipped FBO content)
+
+Both save/restore `camera.position` and call `setToOrtho` with `App.scr.wf/hf` on exit.
+
+## Key Conventions
+
+- **GL thread safety**: Any code creating `Texture`, `TextureRegion`, `TextureRegionPack`, `ShaderProgram`, `FrameBuffer`, or `Pixmap` must run on the GL thread. Use `CommonResourcePool.runOnGLThread { }` when on a background thread.
+- **Kotlin `object` singletons**: First access triggers `<clinit>`. Keep `init {}` blocks fast (no blocking, no GL dispatch). Defer heavy work to explicit `invoke()` methods.
+- **`ConcurrentHashMap` cannot store null values**. Use `HashMap` for maps that need nullable values (e.g. `poolKillFun`).
+- **`@Volatile`** for cross-thread boolean flags (`loadDone`, `backgroundLoadDone`, etc.)
+- **`lateinit var` guards**: Use `::prop.isInitialized` checks in `resize()` and `dispose()` for properties set during async loading steps.
+- **`ConsistentUpdateRate`**: Accumulates delta time; may call `updateFunction` multiple times before `renderFunction`. Call `.reset()` before transitioning to active rendering to avoid catch-up storms.
+- **Textures**: Use TGA format. Images with semitransparency must be TGA; opaque images may be PNG.
+- **Coordinate system**: Y-down (camera `setToOrtho(true, ...)`). `setCameraPosition(0, 0)` places origin at screen top-left, which is not LibGDX nor OpenGL works natively, hence the existence of `FlippingSpriteBatch`. If the user reports renders are flipped vertically, try draw()/drawFlipped() accordingly.
+- **ROUNDWORLD**: World wraps horizontally. `WorldCamera.x` uses `fmod worldWidth`. Lightmap and tile drawing account for wrapping.

ModuleComputers/ModuleComputers.iml

@@ -13,11 +13,9 @@
     <orderEntry type="library" scope="PROVIDED" name="TerrarumSansBitmap" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx.backend.lwjgl3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.reflect" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="io.airlift.aircompressor" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test1" level="project" />
     <orderEntry type="library" name="gdx-platform-1.12.1-natives-arm64-v8a" level="project" />
+    <orderEntry type="library" name="TerranVirtualDisk" level="project" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>

ModuleComputers/src/net/torvald/terrarum/modulecomputers/EntryPoint.kt

@@ -1,5 +1,7 @@
 package net.torvald.terrarum.modulecomputers
 
+import net.torvald.terrarum.CommonResourcePool
+import net.torvald.terrarum.ItemSheet
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.ModuleEntryPoint
 
@@ -11,7 +13,17 @@ class EntryPoint : ModuleEntryPoint() {
     private val moduleName = "dwarventech"
 
     override fun invoke() {
+
+        // load common resources to the AssetsManager
+        CommonResourcePool.addToLoadingList("$moduleName.items") {
+            ItemSheet(ModMgr.getGdxFile(moduleName, "items/items.tga"))
+        }
+        CommonResourcePool.loadAll()
+
+
         ModMgr.GameItemLoader.invoke(moduleName)
+        ModMgr.GameBlockLoader.invoke(moduleName)
+        ModMgr.GameWatchdogLoader.register(moduleName, NetFrameWatchdog())
         println("[${moduleName[0].toUpperCase()}${moduleName.substring(1)}] Dirtboard(tm) go drrrrr")
     }
 

ModuleComputers/src/net/torvald/terrarum/modulecomputers/NetFrameWatchdog.kt

@@ -0,0 +1,17 @@
+package net.torvald.terrarum.modulecomputers
+
+import net.torvald.terrarum.App
+import net.torvald.terrarum.gameworld.GameWorld
+import net.torvald.terrarum.modulebasegame.TerrarumWorldWatchdog
+import net.torvald.terrarum.modulebasegame.gameworld.NetRunner
+
+/**
+ * Created by minjaesong on 2025-03-02.
+ */
+class NetFrameWatchdog : TerrarumWorldWatchdog(App.TICK_SPEED * 60) {
+    override fun invoke(world: GameWorld) {
+        (world.extraFields["tokenring"] as? NetRunner)?.let {
+            it.purgeDeadFrames()
+        }
+    }
+}

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

@@ -0,0 +1,135 @@
+package net.torvald.terrarum.modulecomputers.gameactors
+
+import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
+import net.torvald.terrarum.langpack.Lang
+import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
+import net.torvald.terrarum.modulebasegame.gameactors.Electric
+import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
+import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
+
+/**
+ * Created by minjaesong on 2025-03-30.
+ */
+class FixtureComputerConsole : Electric {
+
+    @Transient override val spawnNeedsStableFloor = true
+    @Transient override val spawnNeedsWall = false
+
+    constructor() : super(
+        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 2),
+        nameFun = { Lang["ITEM_COMPUTER_CONSOLE"] }
+    )
+
+    init {
+        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_operator_terminal.tga")
+        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 2*TILE_SIZE)).let {
+            it.setRowsAndFrames(1,1)
+        }
+
+        setWireSinkAt(0, 1, "io_bus")
+        setWireSinkAt(1, 1, "power_low")
+    }
+}
+
+/**
+ * Created by minjaesong on 2025-03-30.
+ */
+class FixtureComputerProcessor : Electric {
+
+    @Transient override val spawnNeedsStableFloor = true
+    @Transient override val spawnNeedsWall = false
+
+    constructor() : super(
+        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
+        nameFun = { Lang["ITEM_COMPUTER_PROCESSOR"] }
+    )
+
+    init {
+        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_cpu.tga")
+        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 3*TILE_SIZE)).let {
+            it.setRowsAndFrames(1,1)
+        }
+
+        setWireSinkAt(0, 0, "memory_bus")
+        setWireSinkAt(0, 1, "serial")
+        setWireSinkAt(1, 1, "serial")
+        setWireSinkAt(0, 2, "io_bus")
+        setWireSinkAt(1, 2, "power_low")
+    }
+}
+
+/**
+ * Created by minjaesong on 2025-04-01.
+ */
+class FixtureNetworkInterface : Electric {
+
+    @Transient override val spawnNeedsStableFloor = true
+    @Transient override val spawnNeedsWall = false
+
+    constructor() : super(
+        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
+        nameFun = { Lang["ITEM_NETWORK_INTERFACE"] }
+    )
+
+    init {
+        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_interface.tga")
+        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 3*TILE_SIZE)).let {
+            it.setRowsAndFrames(1,1)
+        }
+
+        setWireSinkAt(0, 0, "token_ring")
+        setWireSinkAt(1, 0, "token_ring")
+        setWireSinkAt(0, 2, "serial")
+        setWireSinkAt(1, 2, "power_low")
+    }
+}
+
+/**
+ * Created by minjaesong on 2025-04-01.
+ */
+class FixtureNetworkBridge : Electric {
+
+    @Transient override val spawnNeedsStableFloor = true
+    @Transient override val spawnNeedsWall = false
+
+    constructor() : super(
+        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
+        nameFun = { Lang["ITEM_NETWORK_BRIDGE"] }
+    )
+
+    init {
+        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_bridge.tga")
+        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 3*TILE_SIZE)).let {
+            it.setRowsAndFrames(1,1)
+        }
+
+        setWireSinkAt(0, 0, "token_ring")
+        setWireSinkAt(1, 0, "token_ring")
+        setWireSinkAt(0, 1, "token_ring")
+        setWireSinkAt(1, 1, "token_ring")
+        setWireSinkAt(1, 2, "power_low")
+    }
+}
+
+/**
+ * Created by minjaesong on 2025-04-01.
+ */
+class FixtureMemoryCabinet : Electric {
+
+    @Transient override val spawnNeedsStableFloor = true
+    @Transient override val spawnNeedsWall = false
+
+    constructor() : super(
+        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
+        nameFun = { Lang["ITEM_MEMORY_CABINET"] }
+    )
+
+    init {
+        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_memory_stack_1.tga")
+        makeNewSprite(TextureRegionPack(itemImage.texture, 1*TILE_SIZE, 3*TILE_SIZE)).let {
+            it.setRowsAndFrames(1,1)
+        }
+
+        setWireSinkAt(0, 0, "memory_bus")
+    }
+}

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

@@ -0,0 +1,289 @@
+package net.torvald.terrarum.modulecomputers.gameactors
+
+import com.badlogic.gdx.utils.Queue
+import net.torvald.random.HQRNG
+import net.torvald.terrarum.INGAME
+import net.torvald.terrarum.Point2i
+import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
+import net.torvald.terrarum.modulebasegame.gameactors.Electric
+import net.torvald.terrarum.modulebasegame.gameworld.NetFrame
+import net.torvald.terrarum.modulebasegame.gameworld.NetRunner
+import net.torvald.terrarum.ui.UICanvas
+import org.dyn4j.geometry.Vector2
+import kotlin.math.sign
+
+/**
+ * Created by minjaesong on 2025-03-01.
+ */
+open class FixtureRingBusCore : Electric {
+
+    @Transient private val rng = HQRNG()
+
+    val mac = rng.nextInt()
+
+    companion object {
+        const val INITIAL_LISTENING_TIMEOUT = 300
+        const val SIGNAL_TOO_WEAK_THRESHOLD = 1.0 / 16.0
+    }
+
+    private constructor() : super()
+
+    private var portEmit = Point2i(0, 0)
+    private var portSink = Point2i(1, 0)
+    
+    constructor(portEmit: Point2i, portSink: Point2i, blockBox: BlockBox, nameFun: () -> String) : super(
+        blockBox0 = blockBox,
+        nameFun = nameFun,
+    ) {
+        this.portEmit = portEmit
+        this.portSink = portSink
+    }
+
+    private fun setEmitterAndSink() {
+        clearStatus()
+        setWireEmitterAt(portEmit.x, portEmit.y, "10base2")
+        setWireSinkAt(portSink.x, portSink.y, "10base2")
+    }
+
+    init {
+        setEmitterAndSink()
+
+        if (!INGAME.world.extraFields.containsKey("tokenring")) {
+            INGAME.world.extraFields["tokenring"] = NetRunner()
+        }
+    }
+
+    override fun reload() {
+        super.reload()
+        setEmitterAndSink()
+        if (!INGAME.world.extraFields.containsKey("tokenring")) {
+            INGAME.world.extraFields["tokenring"] = NetRunner()
+        }
+    }
+
+    internal val msgQueue = Queue<Pair<Int, ByteArray>>()
+    internal val msgLog = Queue<Pair<Int, NetFrame>>()
+
+    private var statusAbort = false
+    private var activeMonitorStatus = 0 // 0: unknown, 1: known and not me, 2: known and it's me
+
+    private var lastAccessTime = -1L
+
+    open protected val ringBusFirmware = RingBusFirmware(0)
+
+    private enum class RingBusState {
+        NORMAL,
+        ABORT, // will "eat away" any receiving frames unless the frame is a ballot frame
+        ELECTING,
+        IVE_GOT_ELECTED
+    }
+
+    private var currentState = RingBusState.NORMAL
+
+    override fun updateSignal() {
+        val time_t = INGAME.world.worldTime.TIME_T
+        if (lastAccessTime == -1L) lastAccessTime = time_t
+
+        // monitor the input port
+        val inn = getWireStateAt(1, 0, "10base2")
+
+        // if a signal is there
+        if (inn.x >= SIGNAL_TOO_WEAK_THRESHOLD) {
+            lastAccessTime = time_t
+            val frameNumber = (inn.y + (0.5 * inn.y.sign)).toInt()
+
+            if (frameNumber != 0) { // frame number must be non-zero
+                processFrameBasedOnState(frameNumber)
+            } else {
+                setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
+            }
+        } else {
+            handleNoSignal(time_t)
+        }
+    }
+
+    private fun processFrameBasedOnState(frameNumber: Int) {
+        try {
+            val frame = getFrameByNumber(frameNumber)
+
+            when (currentState) {
+                RingBusState.NORMAL -> handleNormalState(frame, frameNumber)
+                RingBusState.ABORT -> handleAbortState(frame, frameNumber)
+                RingBusState.ELECTING -> handleElectingState(frame, frameNumber)
+                RingBusState.IVE_GOT_ELECTED -> handleIveGotElectedState(frame, frameNumber)
+            }
+        } catch (e: NullPointerException) {
+            handleFrameLoss()
+        }
+    }
+
+    private fun handleNormalState(frame: NetFrame, frameNumber: Int) {
+        if (msgQueue.notEmpty() || frame.shouldIintercept(mac)) {
+            val newFrame = doSomethingWithFrame(frame) ?: frameNumber
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
+
+            if (newFrame != frameNumber) {
+                frame.discardFrame()
+            }
+        } else {
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
+        }
+    }
+
+    private fun handleAbortState(frame: NetFrame, frameNumber: Int) {
+        if (frame.getFrameType() == "token") {
+            currentState = RingBusState.NORMAL
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
+        } else if (frame.getFrameType() == "abort") {
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
+        } else {
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
+        }
+    }
+
+    private fun handleElectingState(frame: NetFrame, frameNumber: Int) {
+        if (frame.getFrameType() == "ballot") {
+            if (frame.getBallot() < mac) {
+                frame.setBallot(mac)
+            }
+
+            if (frame.getSender() == mac && frame.getBallot() == mac) {
+                currentState = RingBusState.IVE_GOT_ELECTED
+                // elected Active Monitor sends out the first token
+                val newFrame = emitNewFrame(NetFrame.makeToken(mac))
+                setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
+            } else {
+                setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
+            }
+        } else {
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
+        }
+    }
+
+    private fun handleIveGotElectedState(frame: NetFrame, frameNumber: Int) {
+        if (frame.getFrameType() == "abort") {
+            // immediately return to normal state
+            val newFrame = emitNewFrame(NetFrame.makeToken(mac))
+            currentState = RingBusState.NORMAL
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
+        } else {
+            // make sure to skip a turn after the election, even if the NIC has something to send out
+            currentState = RingBusState.NORMAL
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
+        }
+    }
+
+    private fun handleFrameLoss() {
+        emitNewFrame(NetFrame.makeAbort(mac))
+        currentState = RingBusState.ABORT
+    }
+
+    private fun handleNoSignal(time_t: Long) {
+        setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
+
+        if (time_t - lastAccessTime > INITIAL_LISTENING_TIMEOUT) {
+            currentState = RingBusState.ELECTING
+            emitNewFrame(NetFrame.makeBallot(mac))
+            lastAccessTime = time_t
+        }
+    }
+
+    protected fun doSomethingWithFrame(incomingFrame: NetFrame): Int? {
+        return when (incomingFrame.getFrameType()) {
+            "token" -> doSomethingWithToken(incomingFrame)
+            "data" -> doSomethingWithData(incomingFrame)
+            "ack" -> doSomethingWithAck(incomingFrame)
+            "ballot" -> doSomethingWithBallot(incomingFrame)
+            "abort" -> 0
+            else -> null /* returns the frame untouched */
+        }
+    }
+
+    private fun getFrameByNumber(number: Int) = (INGAME.world.extraFields["tokenring"] as NetRunner)[number]
+
+    private fun emitNewFrame(frame: NetFrame): Int {
+        return (INGAME.world.extraFields["tokenring"] as NetRunner).addFrame(frame).also {
+            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, it.toDouble()))
+        }
+    }
+
+    protected fun doSomethingWithToken(incomingFrame: NetFrame): Int? {
+        if (msgQueue.isEmpty) return null
+
+        val (recipient, msgByte) = msgQueue.removeFirst()
+
+        return emitNewFrame(NetFrame.makeData(mac, recipient, msgByte))
+    }
+
+    protected fun doSomethingWithData(incomingFrame: NetFrame): Int? {
+        val rec = incomingFrame.getDataRecipient()
+        // if the message is for me, put incoming message into queue, then send out ack
+        if (rec == mac) {
+            msgLog.addLast(rec to incomingFrame)
+
+            val datagramme = incomingFrame.getDataContents()
+
+            val (ret, nextMsg) = if (datagramme == null) (-1 to null) else ringBusFirmware.workWithDataFrame(mac, datagramme)
+
+            // make ack
+            return emitNewFrame(NetFrame.makeAck(mac, incomingFrame.getSender(), ret))
+        }
+        else return null
+    }
+
+    protected fun doSomethingWithAck(incomingFrame: NetFrame): Int? {
+        if (msgQueue.isEmpty) return null
+
+        val topMsg = msgQueue.first()
+
+        // if the ACK is sent to me...
+        if (incomingFrame.getDataRecipient() == mac && incomingFrame.getSender() == topMsg.first) {
+
+            // ack or nak?
+            val successful = (incomingFrame.getAckStatus() == 0)
+
+            // if successful, remove the message from the queue, then send out empty token
+            // if failed, keep the message, then send out empty token anyway
+            if (successful) {
+                msgQueue.removeFirst()
+            }
+
+            // make an empty token
+            return emitNewFrame(NetFrame.makeToken(mac))
+        }
+        else return null
+    }
+
+    protected fun doSomethingWithBallot(incomingFrame: NetFrame): Int? {
+        val ballotStatus = incomingFrame.getFrameNumber()
+
+        // frame is in election phase
+        if (ballotStatus == 0) {
+            // if i'm also in the election phase, participate
+            if (activeMonitorStatus == 0) {
+                if (incomingFrame.getBallot() < mac) {
+                    incomingFrame.setBallot(mac)
+                }
+
+                // check if the election must be finished
+                if (incomingFrame.getSender() == mac && incomingFrame.getBallot() == mac) {
+                    activeMonitorStatus = 2
+
+                    // send out first empty token
+                    return emitNewFrame(NetFrame.makeToken(mac))
+                }
+            }
+            // if i'm in the winner announcement phase, kill the frame
+            else {
+                incomingFrame.discardFrame()
+                return 0
+            }
+        }
+        // frame is in winner announcement phase
+        else if (ballotStatus == 1) {
+            activeMonitorStatus = 1
+        }
+
+        return null
+    }
+}

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

@@ -0,0 +1,62 @@
+package net.torvald.terrarum.modulecomputers.gameactors
+
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
+import net.torvald.terrarum.App
+import net.torvald.terrarum.Point2i
+import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
+import net.torvald.terrarum.langpack.Lang
+import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
+import net.torvald.terrarum.modulebasegame.gameworld.NetFrame.Companion.toMAC
+import net.torvald.terrarum.modulecomputers.ui.UIRingBusAnalyser
+import net.torvald.terrarum.modulecomputers.ui.UIRingBusExerciser
+
+/**
+ * Created by minjaesong on 2025-03-03.
+ */
+class FixtureRingBusExerciser : FixtureRingBusCore {
+
+    constructor() : super(
+        portEmit = Point2i(0, 0),
+        portSink = Point2i(1, 0),
+        blockBox = BlockBox(BlockBox.NO_COLLISION, 2, 2),
+        nameFun = { Lang["ITEM_DEBUG_RING_BUS_EXERCISER"] }
+    ) {
+        this.mainUI = UIRingBusExerciser(this)
+    }
+
+    override fun drawBody(frameDelta: Float, batch: SpriteBatch) {
+        super.drawBody(frameDelta, batch)
+
+        // draw its own MAC address
+        drawUsingDrawFunInGoodPosition(frameDelta) { x, y ->
+            App.fontSmallNumbers.draw(batch, super.mac.toMAC(), x, y + 2*TILE_SIZE - 12)
+        }
+    }
+}
+
+
+
+/**
+ * Created by minjaesong on 2025-03-03.
+ */
+class FixtureRingBusAnalyser : FixtureRingBusCore {
+
+    constructor() : super(
+        portEmit = Point2i(0, 0),
+        portSink = Point2i(1, 0),
+        blockBox = BlockBox(BlockBox.NO_COLLISION, 2, 1),
+        nameFun = { Lang["ITEM_DEBUG_RING_BUS_ANALYSER"] },
+    ) {
+        this.mainUI = UIRingBusAnalyser(this)
+    }
+
+    override fun drawBody(frameDelta: Float, batch: SpriteBatch) {
+        super.drawBody(frameDelta, batch)
+
+        // draw its own MAC address
+        drawUsingDrawFunInGoodPosition(frameDelta) { x, y ->
+            App.fontSmallNumbers.draw(batch, super.mac.toMAC(), x, y + 1*TILE_SIZE - 12)
+        }
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package net.torvald.terrarum.modulecomputers.gameactors
+
+import net.torvald.terrarum.serialise.*
+
+
+open class RingBusFirmware(val devtype: Int) {
+
+    fun workWithDataFrame(hostMAC: Int, datagramme: ByteArray): Pair<Int, ByteArray?> {
+        if (datagramme.size < 12) return -1 to null
+
+        val protocol = datagramme[0].toUint()
+        val mode = datagramme[1].toUint()
+        val arg1 = datagramme.toBigInt16(2)
+        val recipient = datagramme.toBigInt32(4)
+        val sender = datagramme.toBigInt32(8)
+        val body = datagramme.sliceArray(12 until datagramme.size)
+
+        return invoke(hostMAC, protocol, mode, arg1, recipient, sender, body, datagramme)
+    }
+
+    open fun invoke(hostMAC: Int, protocol: Int, mode: Int, arg1: Int, recipient: Int, sender: Int, body: ByteArray, datagramme: ByteArray): Pair<Int, ByteArray?> {
+        return when (protocol) {
+            1 -> 0 to echo(recipient, sender, body)
+            2 -> 0 to blockTransfer(arg1, recipient, sender, body)
+            4 -> 0 to deviceDiscovery(hostMAC, datagramme)
+            else -> -1 to null
+        }
+    }
+
+    open fun echo(recipient: Int, sender: Int, body: ByteArray): ByteArray {
+        return ByteArray(8 + body.size).makeEmptyPacket(1, 1, 0, recipient, sender).also {
+            it.writeBigInt48(System.currentTimeMillis(), 12)
+            System.arraycopy(body, 6, this, 6, body.size - 6)
+        }
+    }
+
+    open fun blockTransfer(sequence: Int, recipient: Int, sender: Int, body: ByteArray): ByteArray {
+        return ByteArray(12).makeEmptyPacket(2, 1, sequence, recipient, sender) // always ACK
+    }
+
+    open fun deviceDiscovery(host: Int, wholeMessage: ByteArray): ByteArray {
+        return ByteArray(wholeMessage.size + 6).also {
+            System.arraycopy(wholeMessage, 0, it, 0, wholeMessage.size)
+            it[it.size - 5] = devtype.toByte()
+            it.writeBigInt32(host, it.size - 4)
+        }
+    }
+
+
+
+    private fun ByteArray.makeEmptyPacket(protocol: Int, mode: Int, arg1: Int, recipient: Int, sender: Int): ByteArray {
+        this[0] = protocol.toByte()
+        this[1] = mode.toByte()
+        this.writeBigInt16(arg1, 2)
+        this.writeBigInt32(recipient, 4)
+        this.writeBigInt32(sender, 8)
+
+        return this
+    }
+}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemComputerConsole.kt

@@ -0,0 +1,89 @@
+package net.torvald.terrarum.modulecomputers.gameitems
+
+import net.torvald.terrarum.gameitems.ItemID
+import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
+
+/**
+ * Created by minjaesong on 2025-03-30.
+ */
+class ItemComputerConsole(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureComputerConsole") {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 80.0
+    override val canBeDynamic = false
+    override val materialId = "STAL"
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_operator_terminal.tga")
+    }
+    override var baseToolSize: Double? = baseMass
+    override var originalName = "ITEM_COMPUTER_CONSOLE"
+
+}
+
+/**
+ * Created by minjaesong on 2025-03-30.
+ */
+class ItemComputerProcessor(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureComputerProcessor") {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 200.0
+    override val canBeDynamic = false
+    override val materialId = "STAL"
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_cpu.tga")
+    }
+    override var baseToolSize: Double? = baseMass
+    override var originalName = "ITEM_COMPUTER_PROCESSOR"
+
+}
+
+/**
+ * Created by minjaesong on 2025-04-01.
+ */
+class ItemNetworkInterface(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureNetworkInterface") {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 200.0
+    override val canBeDynamic = false
+    override val materialId = "STAL"
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_interface.tga")
+    }
+    override var baseToolSize: Double? = baseMass
+    override var originalName = "ITEM_NETWORK_INTERFACE"
+
+}
+
+/**
+ * Created by minjaesong on 2025-04-01.
+ */
+class ItemNetworkBridge(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureNetworkBridge") {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 200.0
+    override val canBeDynamic = false
+    override val materialId = "STAL"
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_bridge.tga")
+    }
+    override var baseToolSize: Double? = baseMass
+    override var originalName = "ITEM_NETWORK_BRIDGE"
+
+}
+
+/**
+ * Created by minjaesong on 2025-04-01.
+ */
+class ItemMemoryCabinet(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureMemoryCabinet") {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 80.0
+    override val canBeDynamic = false
+    override val materialId = "STAL"
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_memory_stack_1.tga")
+    }
+    override var baseToolSize: Double? = baseMass
+    override var originalName = "ITEM_MEMORY_CABINET"
+
+}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemHomeComputer.kt

@@ -21,8 +21,9 @@ class ItemHomeComputer(originalID: ItemID) : FixtureItemBase(originalID, "net.to
     override var baseMass = 20.0
     override val canBeDynamic = false
     override val materialId = ""
-    override val itemImage: TextureRegion
-        get() = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE)
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE)
+    }
     override var baseToolSize: Double? = baseMass
     override var originalName = "ITEM_DESKTOP_COMPUTER"
 }

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt

@@ -34,8 +34,9 @@ class ItemWearableWorldRadar(originalID: String) {// : GameItem(originalID) {
     override val isUnique = false
     override val isDynamic = true
     override val materialId = ""
-    override val itemImage: TextureRegion
-        get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
+    init {
+        itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
+    }
 
     override var baseToolSize: Double? = baseMass
 

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/WirePieceNetworkBus.kt

@@ -0,0 +1,79 @@
+package net.torvald.terrarum.modulecomputers.gameitems
+
+import net.torvald.terrarum.CommonResourcePool
+import net.torvald.terrarum.WireCodex
+import net.torvald.terrarum.gameactors.ActorWithBody
+import net.torvald.terrarum.gameitems.FixtureInteractionBlocked
+import net.torvald.terrarum.gameitems.GameItem
+import net.torvald.terrarum.gameitems.ItemID
+import net.torvald.terrarum.modulebasegame.gameitems.BlockBase
+
+/**
+ * Created by minjaesong on 2025-03-30.
+ */
+class WirePieceNetworkBus(originalID: ItemID, private val atlasID: String, private val sheetX: Int, private val sheetY: Int)
+    : GameItem(originalID), FixtureInteractionBlocked {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 0.001
+    override var baseToolSize: Double? = null
+    override var inventoryCategory = Category.WIRE
+    override val canBeDynamic = false
+    override val materialId = ""
+    init {
+        itemImage = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY)
+    }
+
+    init {
+        equipPosition = GameItem.EquipPosition.HAND_GRIP
+        originalName = "ITEM_NETWORK_BUS_WIRE"
+        tags.addAll(WireCodex[originalID].tags)
+    }
+
+    override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
+        return BlockBase.wireStartPrimaryUse(actor,this, delta)
+    }
+
+    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
+        BlockBase.wireEffectWhenEquipped(this, delta)
+    }
+
+    override fun effectOnUnequip(actor: ActorWithBody) {
+        BlockBase.wireEffectWhenUnequipped(this)
+    }
+}
+
+/**
+ * Created by minjaesong on 2025-03-30.
+ */
+class WirePieceIOBus(originalID: ItemID, private val atlasID: String, private val sheetX: Int, private val sheetY: Int)
+    : GameItem(originalID), FixtureInteractionBlocked {
+
+    override var dynamicID: ItemID = originalID
+    override var baseMass = 0.001
+    override var baseToolSize: Double? = null
+    override var inventoryCategory = Category.WIRE
+    override val canBeDynamic = false
+    override val materialId = ""
+    init {
+        itemImage = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY)
+    }
+
+    init {
+        equipPosition = GameItem.EquipPosition.HAND_GRIP
+        originalName = "ITEM_IO_BUS_WIRE"
+        tags.addAll(WireCodex[originalID].tags)
+    }
+
+    override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
+        return BlockBase.wireStartPrimaryUse(actor,this, delta)
+    }
+
+    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
+        BlockBase.wireEffectWhenEquipped(this, delta)
+    }
+
+    override fun effectOnUnequip(actor: ActorWithBody) {
+        BlockBase.wireEffectWhenUnequipped(this)
+    }
+}

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

@@ -0,0 +1,101 @@
+package net.torvald.terrarum.modulecomputers.ui
+
+import com.badlogic.gdx.graphics.Color
+import com.badlogic.gdx.graphics.OrthographicCamera
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
+import net.torvald.terrarum.App
+import net.torvald.terrarum.ifNaN
+import net.torvald.terrarum.modulecomputers.gameactors.FixtureRingBusCore
+import net.torvald.terrarum.ui.UICanvas
+import net.torvald.terrarum.ui.UIItemVertSlider
+import net.torvald.terrarum.ui.Toolkit
+import kotlin.math.roundToInt
+
+class UIRingBusAnalyser(val host: FixtureRingBusCore) : UICanvas() {
+
+    override var width = Toolkit.drawWidth
+    override var height = App.scr.height
+
+    private val analyserPosX = 10
+    private val analyserPosY = 10
+    private val analyserWidth = width - 20
+    private val analyserHeight = height - 20
+
+    private val TEXT_LINE_HEIGHT = 24
+    private var analysisTextBuffer = ArrayList<String>()
+
+    private val analyserScroll = UIItemVertSlider(this,
+        analyserPosX - 18,
+        analyserPosY + 1,
+        0.0, 0.0, 1.0, analyserHeight - 2, analyserHeight - 2
+    )
+
+    init {
+        addUIitem(analyserScroll)
+        refreshAnalysis()
+    }
+
+    private fun refreshAnalysis() {
+        analysisTextBuffer.clear()
+
+        host.msgLog.forEach { frame ->
+            analysisTextBuffer.add(frame.toString())
+        }
+
+        // update scrollbar
+        analyserScroll.handleHeight = if (analysisTextBuffer.isEmpty())
+            analyserHeight
+        else
+            (analyserHeight.toFloat() / analysisTextBuffer.size.times(TEXT_LINE_HEIGHT))
+                .times(analyserHeight)
+                .roundToInt()
+                .coerceIn(12, analyserHeight)
+    }
+
+    private fun drawAnalysis(batch: SpriteBatch) {
+        val scroll = (analyserScroll.value * analysisTextBuffer.size.times(TEXT_LINE_HEIGHT)
+            .minus(analyserHeight - 3))
+            .ifNaN(0.0)
+            .roundToInt()
+            .coerceAtLeast(0)
+
+        analysisTextBuffer.forEachIndexed { index, s ->
+            App.fontGame.draw(batch, s,
+                analyserPosX + 6f,
+                analyserPosY + 3f + index * TEXT_LINE_HEIGHT - scroll
+            )
+        }
+    }
+
+    override fun updateImpl(delta: Float) {
+        refreshAnalysis()
+        uiItems.forEach { it.update(delta) }
+    }
+
+    override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
+        // Draw background box
+        batch.color = Color(0x7F)
+        Toolkit.fillArea(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
+        batch.color = Toolkit.Theme.COL_INACTIVE
+        Toolkit.drawBoxBorder(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
+
+        // Draw text content
+        batch.color = Color.WHITE
+        drawAnalysis(batch)
+
+        // Draw UI elements
+        uiItems.forEach { it.render(frameDelta, batch, camera) }
+    }
+
+    override fun doOpening(delta: Float) {
+        refreshAnalysis()
+    }
+
+    override fun doClosing(delta: Float) {
+        // nothing needed
+    }
+
+    override fun dispose() {
+
+    }
+}

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

@@ -0,0 +1,101 @@
+package net.torvald.terrarum.modulecomputers.ui
+
+import com.badlogic.gdx.graphics.Color
+import com.badlogic.gdx.graphics.OrthographicCamera
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
+import net.torvald.terrarum.App
+import net.torvald.terrarum.ifNaN
+import net.torvald.terrarum.modulecomputers.gameactors.FixtureRingBusCore
+import net.torvald.terrarum.ui.UICanvas
+import net.torvald.terrarum.ui.UIItemVertSlider
+import net.torvald.terrarum.ui.Toolkit
+import kotlin.math.roundToInt
+
+class UIRingBusExerciser(val host: FixtureRingBusCore) : UICanvas() {
+
+    override var width = Toolkit.drawWidth
+    override var height = App.scr.height
+
+    private val analyserPosX = 10
+    private val analyserPosY = 10
+    private val analyserWidth = width - 20
+    private val analyserHeight = height - 20
+
+    private val TEXT_LINE_HEIGHT = 24
+    private var analysisTextBuffer = ArrayList<String>()
+
+    private val analyserScroll = UIItemVertSlider(this,
+        analyserPosX - 18,
+        analyserPosY + 1,
+        0.0, 0.0, 1.0, analyserHeight - 2, analyserHeight - 2
+    )
+
+    init {
+        addUIitem(analyserScroll)
+        refreshAnalysis()
+    }
+
+    private fun refreshAnalysis() {
+        analysisTextBuffer.clear()
+
+        host.msgLog.forEach { frame ->
+            analysisTextBuffer.add(frame.toString())
+        }
+
+        // update scrollbar
+        analyserScroll.handleHeight = if (analysisTextBuffer.isEmpty())
+            analyserHeight
+        else
+            (analyserHeight.toFloat() / analysisTextBuffer.size.times(TEXT_LINE_HEIGHT))
+                .times(analyserHeight)
+                .roundToInt()
+                .coerceIn(12, analyserHeight)
+    }
+
+    private fun drawAnalysis(batch: SpriteBatch) {
+        val scroll = (analyserScroll.value * analysisTextBuffer.size.times(TEXT_LINE_HEIGHT)
+            .minus(analyserHeight - 3))
+            .ifNaN(0.0)
+            .roundToInt()
+            .coerceAtLeast(0)
+
+        analysisTextBuffer.forEachIndexed { index, s ->
+            App.fontGame.draw(batch, s,
+                analyserPosX + 6f,
+                analyserPosY + 3f + index * TEXT_LINE_HEIGHT - scroll
+            )
+        }
+    }
+
+    override fun updateImpl(delta: Float) {
+        refreshAnalysis()
+        uiItems.forEach { it.update(delta) }
+    }
+
+    override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
+        // Draw background box
+        batch.color = Color(0x7F)
+        Toolkit.fillArea(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
+        batch.color = Toolkit.Theme.COL_INACTIVE
+        Toolkit.drawBoxBorder(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
+
+        // Draw text content
+        batch.color = Color.WHITE
+        drawAnalysis(batch)
+
+        // Draw UI elements
+        uiItems.forEach { it.render(frameDelta, batch, camera) }
+    }
+
+    override fun doOpening(delta: Float) {
+        refreshAnalysis()
+    }
+
+    override fun doClosing(delta: Float) {
+        // nothing needed
+    }
+
+    override fun dispose() {
+
+    }
+}

MusicPlayer/MusicPlayer.iml

@@ -7,13 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test" level="project" />
     <orderEntry type="module" module-name="TerrarumBuild" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="io.airlift.aircompressor" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="TerrarumSansBitmap" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="apache.commons.math3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test1" level="project" />
     <orderEntry type="library" name="gdx-platform-1.12.1-natives-arm64-v8a" level="project" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>

MusicPlayer/src/net/torvald/terrarum/musicplayer/EntryPoint.kt

@@ -1,17 +1,16 @@
 package net.torvald.terrarum.musicplayer
 
-import net.torvald.terrarum.IngameInstance
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.ModuleEntryPoint
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
-import net.torvald.terrarum.musicplayer.gui.MusicPlayer
+import net.torvald.terrarum.musicplayer.gui.MusicPlayerControl
 
 /**
  * Created by minjaesong on 2023-12-23.
  */
 class EntryPoint : ModuleEntryPoint() {
     override fun invoke() {
-        ModMgr.GameExtraGuiLoader.register { ingame: TerrarumIngame ->  MusicPlayer(ingame) }
+        ModMgr.GameExtraGuiLoader.register { ingame: TerrarumIngame ->  MusicPlayerControl(ingame) }
     }
 
     override fun dispose() {

MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayerControl.kt

@@ -10,12 +10,13 @@ import com.badlogic.gdx.utils.JsonValue
 import com.jme3.math.FastMath
 import net.torvald.reflection.extortField
 import net.torvald.terrarum.*
-import net.torvald.terrarum.App.printdbg
 import net.torvald.terrarum.audio.*
+import net.torvald.terrarum.audio.audiobank.MusicContainer
 import net.torvald.terrarum.gameworld.fmod
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameactors.PlaysMusic
 import net.torvald.terrarum.ui.BasicDebugInfoWindow
+import net.torvald.terrarum.ui.BasicDebugInfoWindow.Companion.toIntAndFrac
 import net.torvald.terrarum.ui.MouseLatch
 import net.torvald.terrarum.ui.Toolkit
 import net.torvald.terrarum.ui.UICanvas
@@ -32,7 +33,7 @@ import kotlin.math.*
  *
  * Created by minjaesong on 2023-12-23.
  */
-class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
+class MusicPlayerControl(private val ingame: TerrarumIngame) : UICanvas() {
 
     private val STRIP_W = 9f
     private val METERS_WIDTH = 2 * STRIP_W
@@ -59,6 +60,9 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     private val controlButtons = ModMgr.getGdxFile("musicplayer", "gui/control_buttons.tga").let {
         TextureRegionPack(it, BUTTON_WIDTH, BUTTON_HEIGHT)
     }
+    private val progressSheet = ModMgr.getGdxFile("musicplayer", "gui/progress.tga").let {
+        TextureRegionPack(it, BUTTON_WIDTH, BUTTON_HEIGHT)
+    }
 
     private val MODE_IDLE = 0
     private val MODE_PLAYING = 1
@@ -94,21 +98,19 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     private var currentlySelectedAlbum: AlbumProp? = null
 
     /** Returns the internal playlist of the MusicGovernor */
-    private val songsInGovernor: List<MusicContainer>
-        get() = ingame.musicGovernor.extortField<List<MusicContainer>>("songs")!!
+    private val songsInGovernorrrrrrrrrr: List<MusicContainer>
+        get() = ingame.musicStreamer.extortField<List<MusicContainer>>("songs")!!
 
-    private val shouldPlayerBeDisabled: Boolean
+    // the value must be "latched" to stay consistent
+    private fun getCurrentPlaylist() = MusicService.currentPlaylist
+
+    /*private val shouldPlayerBeDisabled: Boolean
         get() {
-            return App.audioMixer.dynamicTracks.any { it.isPlaying && it.trackingTarget is PlaysMusic }
-        }
+            return MusicService.transactionLocked
+            //return App.audioMixer.dynamicTracks.any { it.isPlaying && it.trackingTarget is PlaysMusic }
+        }*/
 
-    /** Returns the playlist name from the MusicGovernor. Getting the value from the MusicGovernor
-     * is recommended as an ingame interaction may cancel the playback from the playlist from the MusicPlayer
-     * (e.g. interacting with a jukebox) */
-    private val internalPlaylistName: String
-        get() = ingame.musicGovernor.playlistName
-
-    fun registerPlaylist(path: String, fileToName: JsonValue?, shuffled: Boolean, diskJockeyingMode: String) {
+    private fun registerPlaylist(path: String, fileToName: JsonValue?, shuffled: Boolean, diskJockeyingMode: String): TerrarumMusicPlaylist {
         fun String.isNum(): Boolean {
             try {
                 this.toInt()
@@ -119,7 +121,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
             }
         }
 
-        ingame.musicGovernor.queueDirectory(path, shuffled, diskJockeyingMode) { filename ->
+        val playlist = TerrarumMusicPlaylist.fromDirectory(path, shuffled, diskJockeyingMode) { filename ->
             fileToName?.get(filename).let {
                 if (it == null)
                     filename.substringBeforeLast('.').replace('_', ' ').split(" ").map { it.capitalize() }.let {
@@ -135,19 +137,9 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
             }
         }
 
-        ingame.musicGovernor.addMusicStartHook { music ->
-            setMusicName(music.name)
-            if (mode <= MODE_PLAYING)
-                transitionRequest = MODE_PLAYING
-        }
+        setPlaylistDisplayVars(playlist)
 
-        ingame.musicGovernor.addMusicStopHook { music ->
-            setIntermission()
-            if (mode <= MODE_PLAYING)
-                transitionRequest = MODE_IDLE
-        }
-
-        setPlaylistDisplayVars(songsInGovernor)
+        return playlist
     }
 
     private var currentMusicName = ""
@@ -184,8 +176,11 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     private var mouseOnButton: Int? = null
     private var mouseOnList: Int? = null
 
+    private var transactionLocked = MusicService.transactionLocked
+
     override fun updateImpl(delta: Float) {
-        val shouldPlayerBeDisabled = shouldPlayerBeDisabled
+        transactionLocked = MusicService.transactionLocked // the value need to be "latched"
+        val currentPlaylist = getCurrentPlaylist()
 
         // process transition request
         if (transitionRequest != null) {
@@ -304,9 +299,13 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         else {
             mouseOnButton = null
         }
+        //// manually nullify the buttons that does nothing when locked
+        if (transactionLocked && mode < MODE_SHOW_LIST && (mouseOnButton == 1 || mouseOnButton == 3)) {
+            mouseOnButton = null
+        }
 
         // mouse is over which list
-        mouseOnList = if (mode >= MODE_SHOW_LIST &&
+        mouseOnList = if (!transactionLocked && mode >= MODE_SHOW_LIST &&
             relativeMouseY.toFloat() in _posY + 9.._posY + 9 + PLAYLIST_LINES*PLAYLIST_LINE_HEIGHT &&
             relativeMouseX.toFloat() in _posX.._posX + width) {
 
@@ -315,7 +314,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         else null
 
 
-        // make button work
+        // make buttons work
         if (mouseUp) mouseLatch.latch {
             if (mouseOnButton != null) {
                 when (mouseOnButton) {
@@ -326,8 +325,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                         if (mode < MODE_SHOW_LIST) {
                             if (!transitionOngoing) {
                                 transitionRequest = MODE_SHOW_LIST
-                                currentListMode =
-                                    0 // no list transition anim is needed this time, just set the variable
+                                currentListMode = 0 // no list transition anim is needed this time, just set the variable
                                 resetAlbumlistScroll()
                             }
                         }
@@ -337,20 +335,15 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                         }
                         else {
                             if (!transitionOngoing)
-                                transitionRequest = App.audioMixer.musicTrack.isPlaying.toInt() * MODE_MOUSE_UP
+                                transitionRequest = MODE_MOUSE_UP
                         }
                     }
 
                     1 -> { // prev
                         // prev song
                         if (mode < MODE_SHOW_LIST) {
-                            getPrevSongFromPlaylist()?.let { ingame.musicGovernor.unshiftPlaylist(it) }
-                            if (!shouldPlayerBeDisabled) {
-                                App.audioMixer.requestFadeOut(
-                                    App.audioMixer.musicTrack,
-                                    AudioMixer.DEFAULT_FADEOUT_LEN / 3f
-                                ) {
-                                    ingame.musicGovernor.startMusic(this) // required for "intermittent" mode
+                            if (!transactionLocked) {
+                                MusicService.playPrevSongInPlaylist(true) {
                                     iHitTheStopButton = false
                                     stopRequested = false
                                 }
@@ -370,32 +363,45 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                     }
 
                     2 -> { // stop
-                        if (mode < MODE_SHOW_LIST) { // disable stop button entirely on MODE_SHOW_LIST
+                        /*if (mode < MODE_SHOW_LIST) { // disable stop button entirely on MODE_SHOW_LIST
+                            // when the button is STOP
                             if (App.audioMixer.musicTrack.isPlaying) {
-                                val thisMusic = App.audioMixer.musicTrack.currentTrack
+                                // FIXME the olde way -- must be replaced with one that utilises MusicService
+                                /*val thisMusic = App.audioMixer.musicTrack.currentTrack
                                 App.audioMixer.requestFadeOut(App.audioMixer.musicTrack, AudioMixer.DEFAULT_FADEOUT_LEN / 3f)
                                 App.audioMixer.musicTrack.nextTrack = null
-                                ingame.musicGovernor.stopMusic(this)
-                                thisMusic?.let { ingame.musicGovernor.queueMusicToPlayNext(it) }
-                                iHitTheStopButton = true
+                                ingame.backgroundMusicPlayer.stopMusic(this)
+                                if (thisMusic is MusicContainer) thisMusic.let { ingame.backgroundMusicPlayer.queueMusicToPlayNext(it) }
+                                iHitTheStopButton = true*/
+
+                                MusicService.stopPlaylistPlayback(true) {
+                                    iHitTheStopButton = true
+                                }
                             }
-                            else if (!shouldPlayerBeDisabled) {
-                                ingame.musicGovernor.startMusic(this)
+                            // when the button is PLAY
+                            else if (!App.audioMixer.musicTrack.isPlaying) {
+                                // FIXME the olde way -- must be replaced with one that utilises MusicService
+                                /*ingame.backgroundMusicPlayer.startMusic(this)
                                 iHitTheStopButton = false
-                                stopRequested = false
+                                stopRequested = false*/
+
+                                MusicService.resumePlaylistPlayback(
+                                    /* onSuccess: () -> Unit */{
+                                        iHitTheStopButton = false
+                                        stopRequested = false
+                                    },
+                                    /* onFailure: (Throwable) -> Unit */ {
+                                    }
+                                )
                             }
-                        }
+                        }*/
                     }
 
                     3 -> { // next
                         // next song
                         if (mode < MODE_SHOW_LIST) {
-                            if (!shouldPlayerBeDisabled) {
-                                App.audioMixer.requestFadeOut(
-                                    App.audioMixer.musicTrack,
-                                    AudioMixer.DEFAULT_FADEOUT_LEN / 3f
-                                ) {
-                                    ingame.musicGovernor.startMusic(this) // required for "intermittent" mode, does seemingly nothing on "continuous" mode
+                            if (!transactionLocked) {
+                                MusicService.playNextSongInPlaylist(true) {
                                     iHitTheStopButton = false
                                     stopRequested = false
                                 }
@@ -418,8 +424,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                         if (mode < MODE_SHOW_LIST) {
                             if (!transitionOngoing) {
                                 transitionRequest = MODE_SHOW_LIST
-                                currentListMode =
-                                    1 // no list transition anim is needed this time, just set the variable
+                                currentListMode = 1 // no list transition anim is needed this time, just set the variable
                                 resetPlaylistScroll()
                             }
                         }
@@ -429,33 +434,29 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                         }
                         else {
                             if (!transitionOngoing)
-                                transitionRequest = App.audioMixer.musicTrack.isPlaying.toInt() * MODE_MOUSE_UP
+                                transitionRequest = MODE_MOUSE_UP
                         }
                     }
                 }
             }
-            // make playlist clicking work
+            // make playlist clicking (change song within the playlist) work
             else if (listViewPanelScroll == 1f && mouseOnList != null) {
                 val index = playlistScroll + mouseOnList!!
-                val list = songsInGovernor
-                if (index < list.size) {
-                    // if selected song != currently playing
-                    if (App.audioMixer.musicTrack.currentTrack == null || list[index] != App.audioMixer.musicTrack.currentTrack) {
-                        // rebuild playlist
-                        ingame.musicGovernor.queueIndexFromPlaylist(index)
-
-                        // fade out
-                        App.audioMixer.requestFadeOut(App.audioMixer.musicTrack, AudioMixer.DEFAULT_FADEOUT_LEN / 3f) {
-                            if (!shouldPlayerBeDisabled) {
-                                ingame.musicGovernor.startMusic(this) // required for "intermittent" mode
-                                iHitTheStopButton = false
-                                stopRequested = false
+                if (currentPlaylist != null) {
+                    if (index < currentPlaylist.musicList.size) {
+                        // if selected song != currently playing
+                        if (App.audioMixer.musicTrack.currentTrack == null || currentPlaylist.musicList[index] != App.audioMixer.musicTrack.currentTrack) {
+                            if (!transactionLocked) {
+                                MusicService.playNthSongInPlaylist(index, true) {
+                                    iHitTheStopButton = false
+                                    stopRequested = false
+                                }
                             }
                         }
                     }
                 }
             }
-            // make album list clicking work
+            // make album list clicking (send new playlist to the MusicService) work
             else if (listViewPanelScroll == 0f && mouseOnList != null) {
                 val index = albumlistScroll + mouseOnList!!
                 val list = albumsList//.map { albumPropCache[it] }
@@ -463,16 +464,12 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                 if (index < list.size) {
                     // if selected album is not the same album currently playing, queue that album immediately
                     // (navigating into the selected album involves too much complication :p)
-                    if (ingame.musicGovernor.playlistSource != albumsList[index].canonicalPath) {
-                        // fade out
-                        App.audioMixer.requestFadeOut(App.audioMixer.musicTrack, AudioMixer.DEFAULT_FADEOUT_LEN / 3f) {
-                            loadNewAlbum(albumsList[index])
-                            if (!shouldPlayerBeDisabled) {
-                                ingame.musicGovernor.startMusic(this) // required for "intermittent" mode
-                                iHitTheStopButton = false
-                                stopRequested = false
+                    if (MusicService.currentPlaylist?.source != albumsList[index].canonicalPath) {
+                        if (!transactionLocked) {
+                            val playlist = loadNewAlbum(albumsList[index])
+                            MusicService.putNewPlaylistAndResumePlayback(playlist, true) {
+                                resetPlaylistScroll(App.audioMixer.musicTrack.nextTrack as? MusicContainer)
                             }
-                            resetPlaylistScroll(App.audioMixer.musicTrack.nextTrack)
                         }
                     }
                 }
@@ -486,28 +483,32 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
 
 //        printdbg(this, "mode = $mode; req = $transitionRequest")
 
-        if (shouldPlayerBeDisabled || iHitTheStopButton) {
-            if (!stopRequested) {
-                stopRequested = true
-                ingame.musicGovernor.stopMusic(this)
-            }
+
+        // update music name disp
+        val musicTrack = App.audioMixer.musicTrack
+        val musicTrackPlaying = musicTrack.isPlaying
+        val musicNow = musicTrack.currentTrack
+        //// music changed, do something
+        if ((oldMusicTrackPlaying && !musicTrack.isPlaying) || (oldSong != null && musicNow == null)) {
+            setIntermission()
+            if (mode <= MODE_PLAYING && !transitionOngoing) transitionRequest = MODE_IDLE
         }
-        else if (ingame.musicGovernor.playCaller is PlaysMusic && !jukeboxStopMonitorAlert && !App.audioMixer.musicTrack.isPlaying) {
-            jukeboxStopMonitorAlert = true
-            val interval = ingame.musicGovernor.getRandomMusicInterval()
-            ingame.musicGovernor.stopMusic(this, false, interval)
-        }
-        else if (App.audioMixer.musicTrack.isPlaying) {
-            jukeboxStopMonitorAlert = false
+        else if ((!oldMusicTrackPlaying && musicTrack.isPlaying && musicNow != null) || (oldSong == null && musicNow != null) || (musicNow != oldSong && musicNow != null)) {
+            setMusicName(musicNow.name)
+            if (mode <= MODE_PLAYING && !transitionOngoing) transitionRequest = MODE_PLAYING
         }
+        oldSong = musicNow
+        oldMusicTrackPlaying = musicTrackPlaying
     }
 
-    private var jukeboxStopMonitorAlert = true
+    private var oldSong: AudioBank? = null
+    private var oldMusicTrackPlaying = false
+
     private var iHitTheStopButton = false
     private var stopRequested = false
 
     private fun resetAlbumlistScroll() {
-        val currentlyPlaying = albumsList.indexOfFirst { it.canonicalPath.replace('\\', '/') == ingame.musicGovernor.playlistSource }
+        val currentlyPlaying = albumsList.indexOfFirst { it.canonicalPath.replace('\\', '/') == MusicService.currentPlaylist?.source }
         if (currentlyPlaying >= 0) {
             albumlistScroll = (currentlyPlaying / PLAYLIST_LINES) * PLAYLIST_LINES
         }
@@ -517,27 +518,21 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     }
 
     private fun resetPlaylistScroll(song: MusicContainer? = null) {
-        val currentlyPlaying = songsInGovernor.indexOf(song ?: App.audioMixer.musicTrack.currentTrack)
-        if (currentlyPlaying >= 0) {
-            playlistScroll = (currentlyPlaying / PLAYLIST_LINES) * PLAYLIST_LINES
+        val currentPlaylist = getCurrentPlaylist()
+        if (currentPlaylist != null) {
+            val currentlyPlaying = currentPlaylist.musicList.indexOf(song ?: App.audioMixer.musicTrack.currentTrack)
+            if (currentlyPlaying >= 0) {
+                playlistScroll = (currentlyPlaying / PLAYLIST_LINES) * PLAYLIST_LINES
+            }
+            else {
+                playlistScroll = 0
+            }
         }
         else {
             playlistScroll = 0
         }
     }
 
-    private fun getPrevSongFromPlaylist(): MusicContainer? {
-        val list = songsInGovernor.slice(songsInGovernor.indices) // make copy of the list
-        val nowPlaying = App.audioMixer.musicTrack.currentTrack ?: return null
-
-        // find current index
-        val currentIndex = list.indexOfFirst { it == nowPlaying }
-        if (currentIndex < 0) return null
-
-        val prevIndex = (currentIndex - 1).fmod(list.size)
-        return list[prevIndex]
-    }
-
 //    private fun smoothstep(x: Float) = (x*x*(3f-2f*x)).coerceIn(0f, 1f)
 //    private fun smootherstep(x: Float) = (x*x*x*(x*(6f*x-15f)+10f)).coerceIn(0f, 1f)
 
@@ -697,6 +692,39 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         drawControls(frameDelta, batch, _posX, posYforControls)
         drawList(camera, frameDelta, batch, _posX, _posY)
 
+
+        // debug codes
+        //// transaction state
+        /*if (transactionLocked) {
+            batch.color = Color.RED
+            Toolkit.drawTextCentered(batch, App.fontSmallNumbers, "LOCKED", Toolkit.drawWidth, 0, _posY.toInt() + height + 5)
+        }
+        else {
+            batch.color = Color.WHITE
+            Toolkit.drawTextCentered(batch, App.fontSmallNumbers, "UNLOCKED", Toolkit.drawWidth, 0, _posY.toInt() + height + 5)
+        }
+        //// MusicService internal state
+        batch.color = Color.WHITE
+        val musicState = MusicService.currentPlaybackState.get()
+        val str = "State: $musicState Wait: ${MusicService.waitAkku.toIntAndFrac(2)}/${MusicService.waitTime}"
+        Toolkit.drawTextCentered(batch, App.fontSmallNumbers, str, Toolkit.drawWidth, 0, _posY.toInt() + height + 18)
+        //// playlist internal indices
+        MusicService.currentPlaylist?.let {
+            val indices = it.extortField<ArrayList<Int>>("internalIndices")!!
+            val currentIndex = it.extortField<Int>("currentIndexCursor")!!
+
+            for (k in 0 until indices.size) {
+                batch.color = if (k == currentIndex) Color.RED else Color.WHITE
+                App.fontSmallNumbers.draw(batch, "${indices[k]+1}", 28f + 18f * (k), App.scr.hf - 16f)
+            }
+        }
+        batch.color = Color.LIGHT_GRAY
+        App.fontSmallNumbers.draw(batch, "Playlist InternalIndices", 10f, App.scr.hf - 30f)
+        App.fontSmallNumbers.draw(batch, "..", 10f, App.scr.hf - 16f)
+        */
+        // end of debug codes
+
+
         batch.color = Color.WHITE
 
 
@@ -786,9 +814,9 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         albumlistNameOverflown.clear()
     }
     
-    private fun setPlaylistDisplayVars(plist: List<MusicContainer>) {
+    private fun setPlaylistDisplayVars(plist: TerrarumMusicPlaylist) {
         resetPlaylistDisplay()
-        plist.forEachIndexed { i, music ->
+        plist.musicList.forEachIndexed { i, music ->
             val len = App.fontGameFBO.getWidth(music.name)
             val overflown = (len >= playlistNameLenMax)
             playlistRealNameLen[i] = len
@@ -810,26 +838,47 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     private fun drawPlayList(camera: OrthographicCamera, delta: Float, batch: SpriteBatch, x: Float, y: Float, alpha: Float, scale: Float) {
         batch.end()
 
-        playlistFBOs.forEachIndexed { i, it ->
-            val pnum = i + playlistScroll
-            it.inAction(camera, batch) {
-                batch.inUse {
-                    batch.color = Color.WHITE
-                    gdxClearAndEnableBlend(0f, 0f, 0f, 0f)
-                    blendNormalStraightAlpha(batch)
+        val currentPlaylist = getCurrentPlaylist()
 
-                    // draw text
-                    App.fontGameFBO.draw(batch, if (pnum in songsInGovernor.indices) songsInGovernor[pnum].name else "", maskOffWidth - playlistNameScrolls[pnum], (PLAYLIST_LINE_HEIGHT - 24) / 2)
+        if (currentPlaylist != null) {
+            playlistFBOs.forEachIndexed { i, it ->
+                val pnum = i + playlistScroll
+                it.inAction(camera, batch) {
+                    batch.inUse {
+                        batch.color = Color.WHITE
+                        gdxClearAndEnableBlend(0f, 0f, 0f, 0f)
+                        blendNormalStraightAlpha(batch)
 
-                    // mask off the area
-                    batch.color = Color.WHITE
-                    blendAlphaMask(batch)
-                    batch.draw(textmask.get(0, 0), 0f, 0f, maskOffWidth.toFloat(), PLAYLIST_LINE_HEIGHT)
-                    batch.draw(textmask.get(1, 0), maskOffWidth.toFloat(), 0f, PLAYLIST_NAME_LEN - 2f * maskOffWidth, PLAYLIST_LINE_HEIGHT)
-                    batch.draw(textmask.get(2, 0), PLAYLIST_NAME_LEN - maskOffWidth.toFloat(), 0f, maskOffWidth.toFloat(), PLAYLIST_LINE_HEIGHT)
+                        // draw text
+                        App.fontGameFBO.draw(
+                            batch,
+                            if (pnum in currentPlaylist.musicList.indices) currentPlaylist.musicList[pnum].name else "",
+                            maskOffWidth - playlistNameScrolls[pnum],
+                            (PLAYLIST_LINE_HEIGHT - 24) / 2
+                        )
 
-                    blendNormalStraightAlpha(batch) // qnd hack to make sure this line gets called, otherwise the screen briefly goes blank when the playlist view is closed
-                    Toolkit.fillArea(batch, 999f, 999f, 1f, 1f)
+                        // mask off the area
+                        batch.color = Color.WHITE
+                        blendAlphaMask(batch)
+                        batch.draw(textmask.get(0, 0), 0f, 0f, maskOffWidth.toFloat(), PLAYLIST_LINE_HEIGHT)
+                        batch.draw(
+                            textmask.get(1, 0),
+                            maskOffWidth.toFloat(),
+                            0f,
+                            PLAYLIST_NAME_LEN - 2f * maskOffWidth,
+                            PLAYLIST_LINE_HEIGHT
+                        )
+                        batch.draw(
+                            textmask.get(2, 0),
+                            PLAYLIST_NAME_LEN - maskOffWidth.toFloat(),
+                            0f,
+                            maskOffWidth.toFloat(),
+                            PLAYLIST_LINE_HEIGHT
+                        )
+
+                        blendNormalStraightAlpha(batch) // qnd hack to make sure this line gets called, otherwise the screen briefly goes blank when the playlist view is closed
+                        Toolkit.fillArea(batch, 999f, 999f, 1f, 1f)
+                    }
                 }
             }
         }
@@ -838,37 +887,40 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         blendNormalStraightAlpha(batch)
         if (alpha > 0f) {
             playlistFBOs.forEachIndexed { i, it ->
-                val alpha2 = alpha + (playListAnimAkku[i] * 0.2f)
-                val pnum = i + playlistScroll
 
-                val m1 = songsInGovernor.getOrNull(pnum)
-                val m2 = App.audioMixer.musicTrack.currentTrack
-                val currentlyPlaying = if (m1 == null || m2 == null) false else (m1 == m2)
+                if (currentPlaylist != null) {
+                    val alpha2 = alpha + (playListAnimAkku[i] * 0.2f)
+                    val pnum = i + playlistScroll
 
-                // print number
+                    val m1 = currentPlaylist.musicList.getOrNull(pnum)
+                    val m2 = App.audioMixer.musicTrack.currentTrack
+                    val currentlyPlaying = if (m1 == null || m2 == null) false else (m1 == m2)
 
-                // print bars instead of numbers if the song is currently being played
-                if (currentlyPlaying) {
-                    val xoff = 6
-                    val yoff = 5 + 7 + (PLAYLIST_LINE_HEIGHT - 24) / 2
-                    // it will set the colour on its own
-                    drawFreqMeter(batch, x + xoff, y + yoff + PLAYLIST_LINE_HEIGHT * i * scale, alpha)
+                    // print number
+
+                    // print bars instead of numbers if the song is currently being played
+                    if (currentlyPlaying) {
+                        val xoff = 6
+                        val yoff = 5 + 7 + (PLAYLIST_LINE_HEIGHT - 24) / 2
+                        // it will set the colour on its own
+                        drawFreqMeter(batch, x + xoff, y + yoff + PLAYLIST_LINE_HEIGHT * i * scale, alpha)
+                    }
+                    else {
+                        val xoff = maskOffWidth + (if (pnum < 9) 3 else 0)
+                        val yoff = 7 + (PLAYLIST_LINE_HEIGHT - 24) / 2
+                        batch.color = Color(1f, 1f, 1f, alpha * 0.75f)
+                        App.fontSmallNumbers.draw(
+                            batch,
+                            if (pnum in currentPlaylist.musicList.indices) "${pnum + 1}" else "",
+                            x + xoff,
+                            y + yoff + PLAYLIST_LINE_HEIGHT * i * scale
+                        )
+                    }
+
+                    // print the name
+                    batch.color = Color(1f, 1f, 1f, alpha2)
+                    batch.draw(it.colorBufferTexture, x + PLAYLIST_LEFT_GAP * scale, y + PLAYLIST_LINE_HEIGHT * i * scale, it.width * scale, it.height * scale)
                 }
-                else {
-                    val xoff = maskOffWidth + (if (pnum < 9) 3 else 0)
-                    val yoff = 7 + (PLAYLIST_LINE_HEIGHT - 24) / 2
-                    batch.color = Color(1f, 1f, 1f, alpha * 0.75f)
-                    App.fontSmallNumbers.draw(
-                        batch,
-                        if (pnum in songsInGovernor.indices) "${pnum + 1}" else "",
-                        x + xoff,
-                        y + yoff + PLAYLIST_LINE_HEIGHT * i * scale
-                    )
-                }
-
-                // print the name
-                batch.color = Color(1f, 1f, 1f, alpha2)
-                batch.draw(it.colorBufferTexture, x + PLAYLIST_LEFT_GAP * scale, y + PLAYLIST_LINE_HEIGHT * i * scale, it.width * scale, it.height * scale)
 
                 // separator
                 batch.color = Color(1f, 1f, 1f, alpha * 0.25f)
@@ -877,7 +929,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
 
             // print the album name
             batch.color = Color(1f, 1f, 1f, alpha * 0.75f)
-            Toolkit.drawTextCentered(batch, App.fontGame, internalPlaylistName, width, x.roundToInt(), 3 + (y + PLAYLIST_LINE_HEIGHT * PLAYLIST_LINES * scale).roundToInt())
+            Toolkit.drawTextCentered(batch, App.fontGame, MusicService.currentPlaylist?.name ?: "(null)", width, x.roundToInt(), 3 + (y + PLAYLIST_LINE_HEIGHT * PLAYLIST_LINES * scale).roundToInt())
         }
     }
 
@@ -918,7 +970,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                 val pnum = i + albumlistScroll
 
                 val currentlyPlaying = if (pnum in albumsList.indices) {
-                    val m1 = ingame.musicGovernor.playlistSource
+                    val m1 = MusicService.currentPlaylist?.source
                     val m2 = albumsList[pnum].canonicalPath.replace('\\', '/')
                     (m1 == m2)
                 }
@@ -983,7 +1035,9 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     }
 
     private val playControlAnimAkku = FloatArray(5) // how many control buttons?
-    private val playControlAnimLength = 0.2f
+    private val playControlAnimLength = 0.16f
+
+    private val colInactive = Color(0xaaaaaaff.toInt())
 
     private fun drawControls(delta: Float, batch: SpriteBatch, posX: Float, posY: Float) {
         val (alpha, reverse) = if (mode < MODE_MOUSE_UP && modeNext == MODE_MOUSE_UP)
@@ -1004,20 +1058,21 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                 else
                     0f
 
+        val baseCol = if (transactionLocked) colInactive else Color.WHITE
+
         if (alpha > 0f) {
             val alpha0 = alpha.coerceIn(0f, 1f).organicOvershoot().coerceAtMost(1f)
             val internalWidth =minOf(widthForMouseUp.toFloat(), width - 20f)
             val separation = internalWidth / 5f
             val anchorX = Toolkit.hdrawWidthf
             val posY = posY + 12f
+            val alphaBase2 = 0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f)
             for (i in 0..4) {
-                val alphaBase  = 0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f) + (playControlAnimAkku[i] * 0.2f)
-                val alphaBase2 = 0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f)
+                val animAkku = if (i == 2) 0f else playControlAnimAkku[i] // disable mouseUp for the progress ring
+                val alphaBase  = 0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f) + (animAkku * 0.2f)
 
                 val offset = i - 2
                 val posX = anchorX + offset * separation
-
-
                 val btnX = (posX - BUTTON_WIDTH / 2).roundToFloat()
                 val btnY = posY.roundToFloat()
 
@@ -1025,10 +1080,10 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                 // prev/next button
                 if (i == 1 || i == 3) {
                     // prev/next song button
-                    batch.color = Color(1f, 1f, 1f, alphaBase * (1f - buttonFadePerc))
+                    batch.color = baseCol * Color(1f, 1f, 1f, alphaBase * (1f - buttonFadePerc))
                     batch.draw(controlButtons.get(i, 0), btnX, btnY)
                     // prev/next page button
-                    batch.color = Color(1f, 1f, 1f, alphaBase * buttonFadePerc)
+                    batch.color = baseCol * Color(1f, 1f, 1f, alphaBase * buttonFadePerc)
                     batch.draw(controlButtons.get(i, 1), btnX, btnY)
                 }
                 // stop button
@@ -1036,13 +1091,24 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                     // get correct stop/play button
                     val iconY = if (!App.audioMixer.musicTrack.isPlaying) 1 else 0
                     // fade if avaliable
-                    batch.color = Color(1f, 1f, 1f, alphaBase * (1f - buttonFadePerc))
+                    batch.color = baseCol * Color(1f, 1f, 1f, alphaBase * (1f - buttonFadePerc))
                     batch.draw(controlButtons.get(i, iconY), btnX, btnY)
-                    // page number with fade
 
+                    // progress ring
+                    val perc = ((App.audioMixer.musicTrack.currentTrack?.currentPositionInSamples()?.toFloat() ?: 0f) /
+                            (App.audioMixer.musicTrack.currentTrack?.totalSizeInSamples ?: Long.MAX_VALUE)).coerceAtMost(1f)
+                    val progress = (perc * 64).roundToInt() - 1
+                    if (progress >= 0) {
+                        val prx = progress % 8
+                        val pry = progress / 8
+                        batch.color = baseCol * Color(1f, 1f, 1f, alphaBase * (1f - buttonFadePerc))
+                        batch.draw(progressSheet.get(prx, pry), btnX, btnY)
+                    }
+
+                    // page number with fade
                     for (mode in 0..1) {
                         val alphaNum = if (mode == 0) 1f - listViewPanelScroll else listViewPanelScroll
-                        batch.color = Color(1f, 1f, 1f, alphaBase2 * buttonFadePerc * alphaNum) // don't use mouse-up effect
+                        batch.color = baseCol * Color(1f, 1f, 1f, alphaBase2 * buttonFadePerc * alphaNum) // don't use mouse-up effect
                         val (thisPage, totalPage) = if (mode == 0)
                             albumlistScroll.div(PLAYLIST_LINES).plus(1) to albumsList.size.toFloat().div(PLAYLIST_LINES).ceilToInt()
                         else
@@ -1058,11 +1124,10 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                 }
                 // else button
                 else {
-                    batch.color = Color(1f, 1f, 1f, alphaBase)
+                    batch.color = baseCol * Color(1f, 1f, 1f, alphaBase)
                     batch.draw(controlButtons.get(i, 0), btnX, btnY)
                 }
 
-
                 // update playControlAnimAkku
                 if (mouseOnButton == i && mode >= MODE_MOUSE_UP && modeNext >= MODE_MOUSE_UP)
                     playControlAnimAkku[i] = (playControlAnimAkku[i] + (delta / playControlAnimLength)).coerceIn(0f, 1f)
@@ -1070,6 +1135,9 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
                     playControlAnimAkku[i] = (playControlAnimAkku[i] - (delta / playControlAnimLength)).coerceIn(0f, 1f)
             }
 //            printdbg(this, "playControlAnimAkku=${playControlAnimAkku.joinToString()}")
+
+
+
         }
     }
 
@@ -1135,7 +1203,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         // apply slope to the fft bins, also converts fullscale to decibels
         for (bin in binHeights.indices) {
             val freqR = (TerrarumAudioMixerTrack.SAMPLING_RATED / FFTSIZE) * (bin + 1)
-            val magn0 = fftOut.reim[2 * bin].absoluteValue / FFTSIZE * (freqR / 20.0) // apply slope
+            val magn0 = fftOut.reim[2 * bin].absoluteValue / FFTSIZE * freqR.sqrt() // apply slope
             val magn = FastMath.interpolateLinear(FFT_SMOOTHING_FACTOR, magn0, oldFFTmagn[bin])
             val magnLog = fullscaleToDecibels(magn) - dbOffset
 
@@ -1278,22 +1346,12 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         val albumArt: TextureRegion? = null
     )
 
-    private fun loadNewAlbum(albumDir: File) {
+    private fun loadNewAlbum(albumDir: File): TerrarumMusicPlaylist {
         val albumProp = albumPropCache[albumDir]
 
-        App.audioMixer.musicTrack.let { track ->
-            track.doGaplessPlayback = (albumProp.diskJockeyingMode == "continuous")
-            if (track.doGaplessPlayback) {
-                track.pullNextTrack = {
-                    track.currentTrack = ingame.musicGovernor.pullNextMusicTrack(true)
-                    setMusicName(track.currentTrack?.name ?: "")
-                }
-            }
-        }
-
         currentlySelectedAlbum = albumProp
 
-        registerPlaylist(albumDir.absolutePath, albumProp.fileToName, albumProp.shuffled, albumProp.diskJockeyingMode)
+        return registerPlaylist(albumDir.absolutePath, albumProp.fileToName, albumProp.shuffled, albumProp.diskJockeyingMode)
 
         // scroll playlist to the page current song is
     }
@@ -1307,4 +1365,13 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
             }
         }
     }
-}
+}
+
+private operator fun Color.times(other: Color): Color {
+    return Color(
+        this.r * other.r,
+        this.g * other.g,
+        this.b * other.b,
+        this.a * other.a,
+    )
+}

README.md

@@ -1,6 +1,6 @@
 ## Aperçu ##
 
-This project is to create a modular game engine that accommodates a 2D side-scrolling tilemap platformer, and a game that runs on top of it.
+The goal of this project is to create a modular game engine that accommodates a 2D side-scrolling tilemap platformer, and a game that runs on top of it.
 
 The project is divided into two parts: **Terrarum the Game Engine** and **Terrarum the actual game**.
 

TerrarumBuild.iml

@@ -18,16 +18,15 @@
     <orderEntry type="library" name="gdx-controllers-desktop-2.2.1" level="project" />
     <orderEntry type="library" name="jxinput-1.0.0" level="project" />
     <orderEntry type="library" name="graalvm-js 22.3.1" level="project" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="badlogicgames.gdx" level="project" />
     <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" />
     <orderEntry type="library" name="apache.commons.math3" level="project" />
     <orderEntry type="library" name="github.wendykierp.JTransforms" level="project" />
     <orderEntry type="library" name="io.airlift.aircompressor" level="project" />
-    <orderEntry type="library" name="jetbrains.kotlin.test1" level="project" />
     <orderEntry type="library" name="gdx-platform-1.12.1-natives-arm64-v8a" level="project" />
+    <orderEntry type="library" name="TerranVirtualDisk" level="project" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="library" name="GetBatteryStatus" level="project" />
   </component>
 </module>

assets/keylayout/de_din.key

@@ -0,0 +1,256 @@
+{"n":"DE DIN T2","capslock":"caps","l":"iso","t":[[""],[undefined],
+[undefined],
+["<HOME>"],
+[undefined],
+["<CALL>"],
+["<ENDCALL>"],
+["0","=","}","}"],
+["1","!","’","¹"],
+["2","\"","²","²"],
+["3","§","³","³"],
+["4","$","—","—"],
+["5","%","¡","¡"],
+["6","&","¿","¿"],
+["7","/","{","{"],
+["8","(","[","["],
+["9",")","]","]"],
+["*"],
+["#"],
+["<UP>"],
+["<DOWN>"],
+["<LEFT>"],
+["<RIGHT>"],
+["<CENTER>"],
+["<VOL_UP>"],
+["<VOL_DOWN>"],
+["<POWER>"],
+["<CAMERA>"],
+["<CLEAR>"],
+["a","A","æ","Æ"],
+["b","B","‹","‹"],
+["c","C","©","©"],
+["d","D","‘","“"],
+["e","E","€","¤"],
+["f","F","′","′"],
+["g","G","″","″"],
+["h","H","ẞ","ẞ"],
+["i","I","\u0303","\u0303"],
+["j","J","\u0327","\u0327"],
+["k","K","\u0326","\u0326"],
+["l","L","\u0328","\u0328"],
+["m","M","µ","µ"],
+["n","N","–","–"],
+["o","O","\u030A","\u030A"],
+["p","P","\u0309","\u0309"],
+["q","Q","@","@"],
+["r","R","\u0308","\u0308"],
+["s","S","‚","„"],
+["t","T","\u0304","\u0304"],
+["u","U","\u0306","\u0306"],
+["v","V","«","«"],
+["w","W","\u030C","\u030C"],
+["x","X","»","»"],
+["z","Z","\u030B","\u030B"],
+["y","Y","›","›"],
+[",",";","‑","‑"],
+[".",":","·","·"],
+["<ALT_L>"],
+["<ALT_R>"],
+["<SHIFT_L>"],
+["<SHIFT_R>"],
+["<TAB>"],
+[" "," ","\u00A0","\u00A0"],
+["<SYM>"],
+["<EXPLORER>"],
+["<ENVELOPE>"],
+["\n"],
+["\x08"],
+["\u0302","°","×","×"],
+["ß","?","\\","\\"],
+["\u0301","\u0300","\u0307","\u0307"],
+["ü","Ü","\u031B","\u031B"],
+["+","*","~","¤"],
+["#","'","®","®"],
+["ö","Ö","\u0323","\u0323"],
+["ä",'Ä',"\u0335","\u0335"],
+["-","_","\u00AD","\u00AD"],
+["<AT>"],
+["<NUM_LOCK>"],
+["<HEADSETHOOK>"],
+["<FOCUS>"],
+["+"],
+["<MENU>"],
+["<NOTIFICATION>"],
+["<SEARCH>"],
+["<PLAY_PAUSE>"],
+["<STOP>"],
+["<NEXT>"],
+["<PREV>"],
+["<REW>"],
+["<FFWD>"],
+["<MUTE>"],
+["<PAGE_UP>"],
+["<PAGE_DOWN>"],
+["<PICTSYMBOLS>"],
+["<SWITCH_CHARSET>"],
+["<:A:>"],
+["<:B:>"],
+["<:C:>"],
+["<:X:>"],
+["<:Y:>"],
+["<:Z:>"],
+["<:L1:>"],
+["<:R1:>"],
+["<:L2:>"],
+["<:R2:>"],
+["<:TL:>"],
+["<:TR:>"],
+["<:START:>"],
+["<:SELECT:>"],
+["<:MODE:>"],
+["<ESC>"],
+["<DEL>"],
+[undefined],
+[undefined],
+["<CAPS_LOCK>"],
+["<SCROLL_LOCK>"],
+[undefined],
+[undefined],
+[undefined],
+["<PRINT_SCREEN_SYS_RQ>"],
+["<PAUSE_BREAK>"],
+[undefined],
+["<END>"],
+["<INSERT>"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["<CTRL_L>"],
+["<CTRL_R>"],
+["<F1>"],
+["<F2>"],
+["<F3>"],
+["<F4>"],
+["<F5>"],
+["<F6>"],
+["<F7>"],
+["<F8>"],
+["<F9>"],
+["<F10>"],
+["<F11>"],
+["<F12>"],
+["<NUM_LOCK>"],
+["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],
+["<:CIRCLE:>"]
+]}

assets/keylayout/en_intl_colemak_dh_iso.key

@@ -0,0 +1,256 @@
+{"n":"Colemak Mod\u2013DH ISO","capslock":"back","l":"iso","t":[[""],[undefined],
+[undefined],
+["<HOME>"],
+[undefined],
+["<CALL>"],
+["<ENDCALL>"],
+["0",")","’","”"],
+["1","!","¡","¹"],
+["2","@","º","²"],
+["3","#","ª","³"],
+["4","$","¢","£"],
+["5","%","€","¥"],
+["6","^","ħ","Ħ"],
+["7","&","ð","Ð"],
+["8","*","þ","Þ"],
+["9","(","‘","“"],
+["*"],
+["#"],
+["<UP>"],
+["<DOWN>"],
+["<LEFT>"],
+["<RIGHT>"],
+["<CENTER>"],
+["<VOL_UP>"],
+["<VOL_DOWN>"],
+["<POWER>"],
+["<CAMERA>"],
+["<CLEAR>"],
+["a","A","á","Á"],
+["\\","|","¬","¦"],
+["d","D","\u0308","°"],
+["s","S","ß","ẞ"],
+["f","F","ã","Ã"],
+["t","T","\u0301","\u030B"],
+["g","G","\u0328","¶"],
+["m","M","\u0304","µ"],
+["u","U","ú","Ú"],
+["n","N","ñ","Ñ"],
+["e","E","é","É"],
+["i","I","í","Í"],
+["h","H","\u030C","±"],
+["k","K","\u030A","№"],
+["y","Y","ü","Ü"],
+[";",":","ö","Ö"],
+["q","Q","ä","Ä"],
+["p","P","ø","Ø"],
+["r","R","\u0300","®"],
+["b","B","\u0306","©"],
+["l","L","ł","Ł"],
+["v","V","œ","Œ"],
+["w","W","å","Å"],
+["c","C","ç","Ç"],
+["j","J","đ","Đ"],
+["x","X","\u0302","¤"],
+[",","<","\u0327","·"],
+[".",">","\u0307","…"],
+["<ALT_L>"],
+["<ALT_R>"],
+["<SHIFT_L>"],
+["<SHIFT_R>"],
+["<TAB>"],
+[" "," ","\u00A0","\u00A0"],
+["<SYM>"],
+["<EXPLORER>"],
+["<ENVELOPE>"],
+["\n"],
+["\x08"],
+["`","~","\u0300","\u0303"],
+["-","_","–","—"],
+["=","+","×","÷"],
+["[","{","«","‹"],
+["]","}","»","›"],
+["#","~"],
+["o","O","ó","Ó"],
+["'",'"',"õ","Õ"],
+["/","?","¿","§"],
+["<AT>"],
+["<NUM_LOCK>"],
+["<HEADSETHOOK>"],
+["<FOCUS>"],
+["+"],
+["<MENU>"],
+["<NOTIFICATION>"],
+["<SEARCH>"],
+["<PLAY_PAUSE>"],
+["<STOP>"],
+["<NEXT>"],
+["<PREV>"],
+["<REW>"],
+["<FFWD>"],
+["<MUTE>"],
+["<PAGE_UP>"],
+["<PAGE_DOWN>"],
+["<PICTSYMBOLS>"],
+["<SWITCH_CHARSET>"],
+["<:A:>"],
+["<:B:>"],
+["<:C:>"],
+["<:X:>"],
+["<:Y:>"],
+["<:Z:>"],
+["<:L1:>"],
+["<:R1:>"],
+["<:L2:>"],
+["<:R2:>"],
+["<:TL:>"],
+["<:TR:>"],
+["<:START:>"],
+["<:SELECT:>"],
+["<:MODE:>"],
+["<ESC>"],
+["<DEL>"],
+[undefined],
+[undefined],
+["<CAPS_LOCK>"],
+["<SCROLL_LOCK>"],
+[undefined],
+[undefined],
+[undefined],
+["<PRINT_SCREEN_SYS_RQ>"],
+["<PAUSE_BREAK>"],
+[undefined],
+["<END>"],
+["<INSERT>"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["<CTRL_L>"],
+["<CTRL_R>"],
+["<F1>"],
+["<F2>"],
+["<F3>"],
+["<F4>"],
+["<F5>"],
+["<F6>"],
+["<F7>"],
+["<F8>"],
+["<F9>"],
+["<F10>"],
+["<F11>"],
+["<F12>"],
+["<NUM_LOCK>"],
+["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],
+["z","Z","æ","Æ"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["<:CIRCLE:>"]
+]}