merge main

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/crashlogs/platform/MirroredAPI.kt

@@ -21,6 +21,6 @@ package com.movtery.zalithlauncher.crashlogs.platform
 import com.movtery.zalithlauncher.crashlogs.AbstractAPI
 
 object MirroredAPI: AbstractAPI(
-    api = "https://api.mclogs.lemwood.icu/1/log",
+    api = "https://api.logshare.cn/1/log",
     root = "https://mclogs.lemwood.icu"
 )

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/launch/JvmLauncher.kt

@@ -60,7 +60,8 @@ open class JvmLauncher(
             jvmArgs = argList,
             userHome = jvmLaunchInfo.userHome,
             userArgs = AllSettings.jvmArgs.getValue(),
-            screenSize = screenSize
+            screenSize = screenSize,
+            useLocalLanguage = false
         )
     }
 

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/launch/Launcher.kt

@@ -74,7 +74,8 @@ abstract class Launcher(
         jvmArgs: List<String>,
         userHome: String? = null,
         userArgs: String,
-        screenSize: IntSize
+        screenSize: IntSize,
+        useLocalLanguage: Boolean = true
     ): Int {
         ZLNativeInvoker.staticLauncher = this
 
@@ -93,19 +94,26 @@ abstract class Launcher(
             jvmArgs = jvmArgs,
             userHome = userHome,
             userArgs = userArgs,
-            screenSize = screenSize
+            screenSize = screenSize,
+            useLocalLanguage = useLocalLanguage
         )
     }
 
     //伪 suspend 函数，等待 JVM 的退出代码
     private suspend fun launchJavaVM(
         context: Context,
         jvmArgs: List<String>,
-        userHome: String? = null,
+        userHome: String?,
         userArgs: String,
-        screenSize: IntSize
+        screenSize: IntSize,
+        useLocalLanguage: Boolean
     ): Int {
-        val args = getJavaArgs(userHome, userArgs, screenSize).toMutableList()
+        val args = getJavaArgs(
+            userHome = userHome,
+            userArgumentsString = userArgs,
+            screenSize = screenSize,
+            useLocalLanguage = useLocalLanguage
+        ).toMutableList()
         progressFinalUserArgs(args)
 
         args.addAll(jvmArgs)
@@ -141,7 +149,8 @@ abstract class Launcher(
     private fun getJavaArgs(
         userHome: String? = null,
         userArgumentsString: String,
-        screenSize: IntSize
+        screenSize: IntSize,
+        useLocalLanguage: Boolean
     ): List<String> {
         val userArguments = parseJavaArguments(userArgumentsString).toMutableList()
         val resolvFile = ensureDNSConfig()
@@ -151,7 +160,9 @@ abstract class Launcher(
             put("java.io.tmpdir", PathManager.DIR_CACHE.absolutePath)
             put("jna.boot.library.path", PathManager.DIR_NATIVE_LIB)
             put("user.home", userHome ?: GamePathManager.getUserHome())
-            put("user.language", System.getProperty("user.language"))
+            if (useLocalLanguage) {
+                put("user.language", System.getProperty("user.language"))
+            }
             put("user.country", Locale.getDefault().country)
             put("user.timezone", TimeZone.getDefault().id)
             put("os.name", "Linux")

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/setting/AllSettings.kt

@@ -233,6 +233,11 @@ object AllSettings : SettingsRegistry() {
      */
     val gamepadDeadZoneScale = intSetting("gamepadDeadZoneScale", 100, 50..200)
 
+    /**
+     * 手柄映射配置
+     */
+    val gamepadMappingConfig = stringSetting("gamepadMappingConfig", "default")
+
     /**
      * 摇杆控制模式
      */

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/control/gamepad/GamepadEvents.kt

@@ -213,7 +213,7 @@ fun GamepadKeyListener(
                             lastPressKey.remove(event.code)
                         }
                     } else {
-                        gamepadViewModel.findByCode(event.code, inGame)?.let { targets ->
+                        gamepadViewModel.currentMapping?.findByCode(event.code, inGame)?.let { targets ->
                             val currentEvents = targets.map { guessEvent(it) }
                             lastPressKey[event.code] = currentEvents
                             currentOnKeyEvent(currentEvents, true)
@@ -227,7 +227,7 @@ fun GamepadKeyListener(
                             lastPressDpad.remove(event.direction)
                         }
                     } else {
-                        gamepadViewModel.findByDpad(event.direction, inGame)?.let { targets ->
+                        gamepadViewModel.currentMapping?.findByDpad(event.direction, inGame)?.let { targets ->
                             val currentEvents = targets.map { guessEvent(it) }
                             lastPressDpad[event.direction] = currentEvents
                             currentOnKeyEvent(currentEvents, true)

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/control/gamepad/GamepadMappingList.kt

@@ -0,0 +1,125 @@
+package com.movtery.zalithlauncher.ui.control.gamepad
+
+import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class GamepadMappingList(
+    val name: String,
+    val list: MutableList<GamepadMapping>
+) : Parcelable {
+    /**
+     * 手柄与键盘按键映射绑定
+     */
+    @IgnoredOnParcel
+    private val allKeyMappings = mutableMapOf<Int, TargetKeys>()
+    @IgnoredOnParcel
+    private val allDpadMappings = mutableMapOf<DpadDirection, TargetKeys>()
+
+    /**
+     * 便于记录目标键盘映射的数据类
+     */
+    data class TargetKeys(
+        val inGame: Set<String>,
+        val inMenu: Set<String>
+    ) {
+        fun getKeys(isInGame: Boolean) = if (isInGame) inGame else inMenu
+    }
+
+    fun load() {
+        allKeyMappings.clear()
+        allDpadMappings.clear()
+
+        list.forEach { mapping ->
+            addInMappingsMap(mapping)
+        }
+    }
+
+    private fun addInMappingsMap(mapping: GamepadMapping) {
+        val target = TargetKeys(mapping.targetsInGame, mapping.targetsInMenu)
+        mapping.dpadDirection?.let {
+            allDpadMappings[it] = target
+        } ?: run {
+            allKeyMappings[mapping.key] = target
+        }
+    }
+
+    /**
+     * 重置手柄与键盘按键映射绑定
+     */
+    fun resetMapping(gamepadMap: GamepadMap, inGame: Boolean) =
+        applyMapping(gamepadMap, inGame, useDefault = true)
+
+    /**
+     * 为指定手柄映射设置目标键盘映射
+     */
+    fun saveMapping(gamepadMap: GamepadMap, targets: Set<String>, inGame: Boolean) =
+        applyMapping(gamepadMap, inGame, customTargets = targets)
+
+    /**
+     * 保存或重置手柄与键盘按键映射绑定
+     * @param gamepadMap 手柄映射对象
+     * @param inGame 是否为游戏内映射（true 为游戏内，false 为菜单内）
+     * @param customTargets 自定义目标键
+     * @param useDefault 是否使用默认按键
+     */
+    private fun applyMapping(
+        gamepadMap: GamepadMap,
+        inGame: Boolean,
+        customTargets: Set<String>? = null,
+        useDefault: Boolean = false
+    ) {
+        val dpad = gamepadMap.dpadDirection
+        val existing = if (dpad != null) allDpadMappings[dpad] else allKeyMappings[gamepadMap.gamepad]
+
+        val (targetsInGame, targetsInMenu) = if (inGame) {
+            val newTargets = customTargets ?: if (useDefault) gamepadMap.defaultKeysInGame else emptySet()
+            newTargets to (existing?.inMenu ?: emptySet())
+        } else {
+            (existing?.inGame ?: emptySet()) to (customTargets ?: if (useDefault) gamepadMap.defaultKeysInMenu else emptySet())
+        }
+
+        val mapping = GamepadMapping(
+            key = gamepadMap.gamepad,
+            dpadDirection = dpad,
+            targetsInGame = targetsInGame,
+            targetsInMenu = targetsInMenu
+        )
+        addInMappingsMap(mapping)
+        if (
+            list.removeIf { mapping0 ->
+                mapping0.key == mapping.key
+            }
+        ) {
+            list.add(mapping)
+        }
+        save()
+    }
+
+    /**
+     * 根据手柄按键键值获取对应的键盘映射代码
+     * @return 若未找到，则返回null
+     */
+    fun findByCode(key: Int, inGame: Boolean) =
+        allKeyMappings[key]?.getKeys(inGame)
+
+    /**
+     * 根据手柄方向键获取对应的键盘映射代码
+     * @return 若未找到，则返回null
+     */
+    fun findByDpad(dir: DpadDirection, inGame: Boolean) =
+        allDpadMappings[dir]?.getKeys(inGame)
+
+    /**
+     * 根据手柄映射获取对应的键盘映射代码
+     * @return 若未找到，则返回null
+     */
+    fun findByMap(map: GamepadMap, inGame: Boolean) =
+        (map.dpadDirection?.let { allDpadMappings[it] } ?: allKeyMappings[map.gamepad])
+            ?.getKeys(inGame)
+
+    fun save() {
+        keyMappingListMMKV().encode(name, this)
+    }
+}

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/control/gamepad/_MMKV.kt

@@ -30,4 +30,9 @@ fun remapperMMKV(): MMKV = MMKV.mmkvWithID("GamepadRemapper", MMKV.MULTI_PROCESS
  */
 fun keyMappingMMKV(): MMKV = MMKV.mmkvWithID("GamepadKeyMapping", MMKV.MULTI_PROCESS_MODE)
 
+/**
+ * 手柄按键映射配置列表保存 MMKV
+ */
+fun keyMappingListMMKV(): MMKV = MMKV.mmkvWithID("GamepadKeyMappingList", MMKV.MULTI_PROCESS_MODE)
+