shallow shadow improvements

.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

.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="/" />
@@ -30,13 +28,7 @@
       <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 +82,11 @@
       <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="/" />
     </root>
   </artifact>
 </component>

.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/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">

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/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
 

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,
+    )
+}

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:>"]
+]}

assets/keylayout/fr_fr_bepo.key

@@ -1,4 +1,4 @@
-{"n":"FR Bépo","capslock":"shift","t":[[""],[undefined],
+{"n":"FR Bépo","capslock":"shift","l":"iso","t":[[""],[undefined], // NOTE: ISO key that's between LSHIFT and Z (called NUBS on QMK) is not recognised by GDX; NUHS is same as BACKSLASH
 [undefined],
 ["<HOME>"],
 [undefined],
@@ -51,7 +51,7 @@
 ["é","É","\u0301","\u0301"],// W
 ["y","Y","{","‘"],// X
 ["\u0302","!","¡","¡"],// Y
-["w","W","\\","‚"],// Z
+["à","À","\\","‚"],// Z
 ["g","G","µ","†"],// <
 ["h","H","\u0323","‡"],// >
 ["<ALT_L>"],
@@ -70,7 +70,7 @@
 ["%","`","‰","″"],// =
 ["z","Z","\u0336","\u0336"],// [
 ["w","W"],// ]
-["ê","Ê","/","^"],// \
+["ç","Ç","🄯","🄯"],// \
 ["n","N","\u0303","\u0303"],// ;
 ["m",'M',"\u0304","\u0304"],// '
 ["f","F","\u0328","\u0328"],// ?
@@ -237,7 +237,7 @@
 [undefined],
 [undefined],
 [undefined],
-[undefined],
+["ê","Ê","/","^"], // the custom "WORLD_1" key (the NUBS key) I made up
 [undefined],
 [undefined],
 [undefined],

assets/locales/en/terrarum.json

@@ -32,13 +32,14 @@
   "MENU_LABEL_STREAMING": "Livestreaming",
   "MENU_LABEL_SYSTEM_INFO": "System Info",
   "MENU_MODULES" : "Modules",
-  "MENU_OPTIONS_ATLAS_TEXTURE_SIZE": "Atlas Texture Size",
+  "MENU_OPTIONS_ALWAYS": "Always",
   "MENU_OPTIONS_AUDIO_BUFFER_SIZE": "Audio Buffer Size",
   "MENU_OPTIONS_AUTOSAVE": "Autosave",
   "MENU_OPTIONS_BLUR": "Blur",
   "MENU_OPTIONS_DEBUG_CONSOLE": "Debug Console",
   "MENU_OPTIONS_DITHER": "Dithering",
   "MENU_OPTIONS_ENABLE_SCRIPT_MODS": "Enable Script Mods",
+  "MENU_OPTIONS_HIDE": "Hide",
   "MENU_OPTIONS_JVM_HEAP_MAX": "Max Heap Memory",
   "MENU_OPTIONS_LIGHT_UPDATE_PASSES": "Light Calculation Depth",
   "MENU_OPTIONS_MASTER_VOLUME": "Master Volume",
@@ -49,6 +50,7 @@
   "MENU_OPTIONS_SAVEFORMAT": "Savegame Format",
   "MENU_OPTIONS_SAVEFORMAT_FAST": "Faster Load",
   "MENU_OPTIONS_SAVEFORMAT_SMALL": "Smaller Size",
+  "MENU_OPTIONS_SHOW_TIMEPIECE": "Show Timepiece",
   "MENU_OPTIONS_SPEAKER_HEADPHONE": "Headphone",
   "MENU_OPTIONS_SPEAKER_SETUP": "Speaker Setup",
   "MENU_OPTIONS_SPEAKER_STEREO": "Stereo",

assets/locales/koKR/terrarum.json

@@ -32,13 +32,14 @@
   "MENU_LABEL_STREAMING": "실시간 방송",
   "MENU_LABEL_SYSTEM_INFO": "시스템 정보",
   "MENU_MODULES" : "모듈",
-  "MENU_OPTIONS_ATLAS_TEXTURE_SIZE": "아틀라스 텍스처 크기",
+  "MENU_OPTIONS_ALWAYS": "항상",
   "MENU_OPTIONS_AUDIO_BUFFER_SIZE": "오디오 버퍼 크기",
   "MENU_OPTIONS_AUTOSAVE": "자동 저장",
   "MENU_OPTIONS_BLUR": "흐림",
   "MENU_OPTIONS_DEBUG_CONSOLE": "디버그 콘솔",
   "MENU_OPTIONS_DITHER": "디더링",
   "MENU_OPTIONS_ENABLE_SCRIPT_MODS": "스크립트 모드 활성화",
+  "MENU_OPTIONS_HIDE": "숨기기",
   "MENU_OPTIONS_JVM_HEAP_MAX": "최대 힙 메모리",
   "MENU_OPTIONS_LIGHT_UPDATE_PASSES": "빛 계산 반복 횟수",
   "MENU_OPTIONS_MASTER_VOLUME": "마스터 음량",
@@ -49,6 +50,7 @@
   "MENU_OPTIONS_SAVEFORMAT": "게임 저장 형식",
   "MENU_OPTIONS_SAVEFORMAT_FAST": "빠른 불러오기",
   "MENU_OPTIONS_SAVEFORMAT_SMALL": "작은 용량",
+  "MENU_OPTIONS_SHOW_TIMEPIECE": "현재 시간 표시",
   "MENU_OPTIONS_SPEAKER_HEADPHONE": "헤드폰",
   "MENU_OPTIONS_SPEAKER_SETUP": "스피커 구성",
   "MENU_OPTIONS_SPEAKER_STEREO": "스테레오",