control panel cleanup

assets/locales/en/terrarum.json

@@ -14,6 +14,7 @@
   "MENU_IO_IMPORT": "Import",
   "MENU_IO_MANUAL_SAVE": "Manual Save",
   "MENU_LABEL_AMBIENT_SOUNDS": "Ambient Sounds",
+  "MENU_LABEL_AUDIO_ENGINE": "Audio Engine",
   "MENU_LABEL_COPYRIGHT": "Copyright",
   "MENU_LABEL_DELETE": "Delete",
   "MENU_LABEL_EXTRA_JVM_ARGUMENTS": "Extra Arguments",
@@ -40,6 +41,7 @@
   "MENU_OPTIONS_JVM_HEAP_MAX": "Max Heap Memory",
   "MENU_OPTIONS_LIGHT_UPDATE_PASSES": "Light Calculation Depth",
   "MENU_OPTIONS_MASTER_VOLUME": "Master Volume",
+  "MENU_OPTIONS_NONE" : "None",
   "MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION": "Show notification for",
   "MENU_OPTIONS_PARTICLES": "Particles",
   "MENU_OPTIONS_PERFORMANCE": "Performance",
@@ -47,7 +49,6 @@
   "MENU_OPTIONS_SAVEFORMAT_FAST": "Faster Load",
   "MENU_OPTIONS_SAVEFORMAT_SMALL": "Smaller Size",
   "MENU_OPTIONS_STREAMERS_LAYOUT": "Chat Overlay",
-  "MENU_OPTIONS_NONE" : "None",
 
   "MENU_CREDIT_GPL_DNT" : "GPL",
   "MENU_LABEL_JVM_DNT" : "JVM",

assets/locales/koKR/terrarum.json

@@ -14,6 +14,7 @@
   "MENU_IO_IMPORT": "가져오기",
   "MENU_IO_MANUAL_SAVE": "수동 저장",
   "MENU_LABEL_AMBIENT_SOUNDS": "환경음",
+  "MENU_LABEL_AUDIO_ENGINE": "오디오 엔진",
   "MENU_LABEL_COPYRIGHT": "저작권",
   "MENU_LABEL_DELETE": "삭제",
   "MENU_LABEL_EXTRA_JVM_ARGUMENTS": "추가 명령 인수",
@@ -40,12 +41,12 @@
   "MENU_OPTIONS_JVM_HEAP_MAX": "최대 힙 메모리",
   "MENU_OPTIONS_LIGHT_UPDATE_PASSES": "빛 계산 반복 횟수",
   "MENU_OPTIONS_MASTER_VOLUME": "마스터 음량",
+  "MENU_OPTIONS_NONE" : "없음",
   "MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION": "알림 표시 시간",
   "MENU_OPTIONS_PARTICLES": "입자 수",
   "MENU_OPTIONS_PERFORMANCE": "성능",
   "MENU_OPTIONS_SAVEFORMAT": "게임 저장 형식",
   "MENU_OPTIONS_SAVEFORMAT_FAST": "빠른 불러오기",
   "MENU_OPTIONS_SAVEFORMAT_SMALL": "작은 용량",
-  "MENU_OPTIONS_STREAMERS_LAYOUT": "채팅창 오버레이",
-  "MENU_OPTIONS_NONE" : "없음"
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "채팅창 오버레이"
 }

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt

@@ -21,7 +21,7 @@ class FixtureJukebox : Electric {
 
     constructor() : super(
         BlockBox(BlockBox.NO_COLLISION, 2, 3),
-        nameFun = { Lang["ITEM_LOGIC_SIGNAL_EMITTER"] }
+        nameFun = { Lang["ITEM_JUKEBOX"] }
     )
 
     @Transient private var discCurrentlyPlaying: Int? = null

src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt

@@ -30,6 +30,7 @@ class UIGraphicsControlPanel(remoCon: UIRemoCon?) : UICanvas() {
                 arrayOf("fx_dither", { Lang["MENU_OPTIONS_DITHER"] }, "toggle"),
                 arrayOf("fx_backgroundblur", { Lang["MENU_OPTIONS_BLUR"] }, "toggle"),
                 arrayOf("maxparticles", { Lang["MENU_OPTIONS_PARTICLES"] }, "spinner,256,1024,256"),
+                arrayOf("lightpasses", { Lang["MENU_OPTIONS_LIGHT_UPDATE_PASSES"] }, "spinner,2,4,1"),
             arrayOf("", { Lang["MENU_OPTIONS_DISPLAY"] }, "h1"),
                 arrayOf("screenwidth,screenheight", { Lang["MENU_OPTIONS_RESOLUTION"] }, "typeinres"),
                 arrayOf("fullscreen", { Lang["MENU_OPTIONS_FULLSCREEN"] }, "toggle"),

src/net/torvald/terrarum/modulebasegame/ui/UIPerformanceControlPanel.kt

@@ -20,9 +20,6 @@ class UIPerformanceControlPanel(remoCon: UIRemoCon?) : UICanvas() {
                 arrayOf("autosaveinterval", { Lang["MENU_OPTIONS_AUTOSAVE"] + " (${Lang["CONTEXT_TIME_MINUTE_PLURAL"]})" }, "spinnerimul,5,120,5,60000"),
                 arrayOf("notificationshowuptime", { Lang["MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION"] + " (${Lang["CONTEXT_TIME_SECOND_PLURAL"]})" }, "spinnerimul,2,10,1,1000"),
                 arrayOf("savegamecomp", { Lang["MENU_OPTIONS_SAVEFORMAT"] }, "textsel,zstd=MENU_OPTIONS_SAVEFORMAT_SMALL,snappy=MENU_OPTIONS_SAVEFORMAT_FAST"),
-            arrayOf("", { Lang["MENU_LABEL_GRAPHICS"] }, "h1"),
-                arrayOf("atlastexsize", { Lang["MENU_OPTIONS_ATLAS_TEXTURE_SIZE"] }, "spinnersel,1024,2048,4096,8192"),
-                arrayOf("lightpasses", { Lang["MENU_OPTIONS_LIGHT_UPDATE_PASSES"] }, "spinner,2,4,1"),
             arrayOf("", { Lang["MENU_MODULES"] }, "h1"),
                 arrayOf("enablescriptmods", { Lang["MENU_OPTIONS_ENABLE_SCRIPT_MODS"] }, "toggle"),
                 arrayOf("", { "(${Lang["MENU_LABEL_RESTART_REQUIRED"]})" }, "p"),

src/net/torvald/terrarum/modulebasegame/ui/UISoundControlPanel.kt

@@ -27,7 +27,7 @@ class UISoundControlPanel(remoCon: UIRemoCon?) : UICanvas() {
                 arrayOf("sfxvolume", { Lang["CREDITS_SFX"] }, "sliderd,0,1"),
                 arrayOf("", { "" }, "pp"),
                 arrayOf("guivolume", { Lang["MENU_LABEL_INTERFACE"] }, "sliderd,0,1"),
-            arrayOf("", { Lang["MENU_LABEL_HARDWARE"] }, "h1"),
+            arrayOf("", { Lang["MENU_LABEL_AUDIO_ENGINE"] }, "h1"),
                 arrayOf("audio_buffer_size", { Lang["MENU_OPTIONS_AUDIO_BUFFER_SIZE"] }, "spinnersel,128,256,512,1024,2048"),
                 arrayOf("", { "(${Lang["MENU_LABEL_RESTART_REQUIRED"]})" }, "p"),
                 arrayOf("", { "${Lang["MENU_LABEL_AUDIO_BUFFER_INSTRUCTION"]}" }, "p"),