Merge pull request #1366 from ZalithLauncher/fix/launch_config

fix(启动): 启动过程中使用Intent传递当前账号

Author: MovTery

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/account/Account.kt

@@ -18,6 +18,7 @@
 
 package com.movtery.zalithlauncher.game.account
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.movtery.zalithlauncher.game.account.wardrobe.CapeFileDownloader
@@ -30,12 +31,14 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.util.UUID
 
 private const val TAG = "Account"
 
+@Parcelize
 @Entity(tableName = "accounts")
 data class Account(
     /**
@@ -55,7 +58,7 @@ data class Account(
     var otherPassword: String? = null,
     var accountType: String? = null,
     var skinModelType: SkinModelType = SkinModelType.NONE
-) {
+): Parcelable {
     val hasSkinFile: Boolean
         get() = getSkinFile().exists()
 

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/account/wardrobe/SkinModelType.kt

@@ -18,10 +18,18 @@
 
 package com.movtery.zalithlauncher.game.account.wardrobe
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
 /**
  * 皮肤模型枚举
  */
-enum class SkinModelType(val string: String, val targetParity: Int, val modelType: String) {
+@Parcelize
+enum class SkinModelType(
+    val string: String,
+    val targetParity: Int,
+    val modelType: String
+): Parcelable {
     /** 未设定 */
     NONE("none", -1, ""),
     /** 粗臂类型 */

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

@@ -20,6 +20,7 @@ package com.movtery.zalithlauncher.game.launch
 
 import android.app.Activity
 import android.os.Build
+import android.os.Parcelable
 import android.widget.Toast
 import androidx.compose.ui.unit.IntSize
 import com.movtery.zalithlauncher.BuildConfig
@@ -31,7 +32,6 @@ import com.movtery.zalithlauncher.bridge.ZLBridge
 import com.movtery.zalithlauncher.context.readAssetFile
 import com.movtery.zalithlauncher.game.account.Account
 import com.movtery.zalithlauncher.game.account.AccountType
-import com.movtery.zalithlauncher.game.account.AccountsManager
 import com.movtery.zalithlauncher.game.account.offline.OfflineYggdrasilServer
 import com.movtery.zalithlauncher.game.addons.modloader.ModLoader
 import com.movtery.zalithlauncher.game.download.game.parseLibraryComponents
@@ -56,6 +56,7 @@ import com.movtery.zalithlauncher.utils.file.ensureDirectorySilently
 import com.movtery.zalithlauncher.utils.logging.Logger
 import com.movtery.zalithlauncher.utils.string.isBiggerTo
 import com.movtery.zalithlauncher.utils.string.isEqualTo
+import kotlinx.parcelize.Parcelize
 import org.lwjgl.glfw.CallbackBridge
 import java.io.File
 import javax.microedition.khronos.egl.EGL10
@@ -64,15 +65,31 @@ import javax.microedition.khronos.egl.EGLContext
 
 private const val TAG = "GameLauncher"
 
+@Parcelize
+class LaunchConfig(
+    val version: Version,
+    val account: Account,
+): Parcelable
+
 class GameLauncher(
     private val activity: Activity,
-    private val version: Version,
+    config: LaunchConfig,
     onExit: (code: Int, isSignal: Boolean) -> Unit,
     openPath: (folder: File) -> Unit
 ) : Launcher(onExit, openPath) {
     private lateinit var gameManifest: GameManifest
     private val offlineServer = OfflineYggdrasilServer(0)
 
+    private val version = config.version
+    private val usingAccount = if (version.offlineAccountLogin) {
+        //使用临时离线账号启动游戏
+        config.account.copy(
+            accountType = AccountType.LOCAL.tag
+        )
+    } else {
+        config.account
+    }
+
     override fun exit() {
         offlineServer.stop()
     }
@@ -95,30 +112,19 @@ class GameLauncher(
 
         CallbackBridge.nativeSetUseInputStackQueue(gameManifest.arguments != null)
 
-        val currentAccount = AccountsManager.currentAccountFlow.value!!
-        val account = if (version.offlineAccountLogin) {
-            //使用临时离线账号启动游戏
-            currentAccount.copy(
-                accountType = AccountType.LOCAL.tag
-            )
-        } else {
-            currentAccount
-        }
         val customArgs = version.getJvmArgs().takeIf { it.isNotBlank() } ?: AllSettings.jvmArgs.getValue()
         val javaRuntime = getRuntime()
 
         printLauncherInfo(
             javaArguments = customArgs.takeIf { it.isNotEmpty() } ?: "NONE",
             javaRuntime = javaRuntime,
-            account = account
         )
 
         return launchGame(
             screenSize = screenSize,
-            account = account,
             clientJar = clientJar,
             javaRuntime = javaRuntime,
-            customArgs = customArgs
+            customArgs = customArgs,
         )
     }
 
@@ -193,7 +199,6 @@ class GameLauncher(
 
     private suspend fun launchGame(
         screenSize: IntSize,
-        account: Account,
         clientJar: File,
         javaRuntime: String,
         customArgs: String
@@ -210,7 +215,7 @@ class GameLauncher(
 
         val launchArgs = LaunchArgs(
             runtimeLibraryPath = runtimeLibraryPath,
-            account = account,
+            account = usingAccount,
             offlineServer = offlineServer,
             gameDirPath = gameDirPath,
             version = version,
@@ -247,7 +252,6 @@ class GameLauncher(
     private fun printLauncherInfo(
         javaArguments: String,
         javaRuntime: String,
-        account: Account
     ) {
         var mcInfo = version.getVersionName()
         version.getVersionInfo()?.let { info -> mcInfo = info.getInfoString() }
@@ -267,7 +271,7 @@ class GameLauncher(
         append("▷ Game Path: ${version.getGameDir().absolutePath} (Isolation: ${version.isIsolation()})")
         append("▷ Custom Java arguments: $javaArguments")
         append("▷ Java Runtime: $javaRuntime")
-        append("▷ Account: ${account.username} (${account.accountType})")
+        append("▷ Account: ${usingAccount.username} (${usingAccount.accountType})")
     }
 
     /**

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

@@ -77,6 +77,7 @@ object LaunchGame {
         val downloadTask = createDownloadTask(
             context = context,
             version = version,
+            account = account,
             exitActivity = exitActivity,
             waitForVulkanChecker = waitForVulkanChecker,
             submitError = submitError
@@ -108,6 +109,7 @@ object LaunchGame {
     private fun createDownloadTask(
         context: Context,
         version: Version,
+        account: Account,
         exitActivity: () -> Unit,
         waitForVulkanChecker: suspend () -> Unit,
         submitError: (ErrorViewModel.ThrowableMessage) -> Unit
@@ -124,7 +126,7 @@ object LaunchGame {
                 task.updateMessage(R.string.game_vulkan_check_title)
                 checkVulkanCapabilities(version, waitForVulkanChecker)
 
-                runGame(context, version)
+                runGame(context, version, account)
                 exitActivity()
             },
             onError = { message ->

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

@@ -28,16 +28,15 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.unit.IntRect
 import androidx.compose.ui.unit.IntSize
 import com.movtery.zalithlauncher.bridge.ZLBridge
-import com.movtery.zalithlauncher.game.account.AccountsManager
 import com.movtery.zalithlauncher.game.control.ControlManager
 import com.movtery.zalithlauncher.game.input.EfficientAndroidLWJGLKeycode
 import com.movtery.zalithlauncher.game.input.LWJGLCharSender
 import com.movtery.zalithlauncher.game.keycodes.LwjglGlfwKeycode
 import com.movtery.zalithlauncher.game.launch.GameLauncher
+import com.movtery.zalithlauncher.game.launch.LaunchConfig
 import com.movtery.zalithlauncher.game.launch.MCOptions
 import com.movtery.zalithlauncher.game.launch.loadLanguage
 import com.movtery.zalithlauncher.game.version.installed.GraphicsApi
-import com.movtery.zalithlauncher.game.version.installed.Version
 import com.movtery.zalithlauncher.game.version.installed.utils.isLowerVer
 import com.movtery.zalithlauncher.setting.AllSettings
 import com.movtery.zalithlauncher.terracotta.Terracotta
@@ -56,7 +55,7 @@ import org.lwjgl.glfw.CallbackBridge
 
 class GameHandler(
     val activity: Activity,
-    private val version: Version,
+    config: LaunchConfig,
     errorViewModel: ErrorViewModel,
     eventViewModel: EventViewModel,
     private val gamepadViewModel: GamepadViewModel,
@@ -69,6 +68,9 @@ class GameHandler(
     launcher = gameLauncher,
     onExit = onExit
 ) {
+    private val version = config.version
+    private val account = config.account
+
     private val _inputArea = MutableStateFlow<IntRect?>(null)
     override val inputArea = _inputArea.asStateFlow()
 
@@ -216,9 +218,7 @@ class GameHandler(
             textInputMode = textInputMode,
             isTouchProxyEnabled = version.enableTouchProxy,
             onInputAreaRectUpdated = { _inputArea.value = it },
-            getAccountName = {
-                AccountsManager.currentAccountFlow.value?.username //不太可能为空，启动前拦截了这个情况
-            },
+            getAccountName = { account.username },
             eventViewModel = eventViewModel,
             gamepadViewModel = gamepadViewModel,
             submitError = {

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/activities/VMActivity.kt

@@ -65,6 +65,7 @@ import com.movtery.zalithlauncher.bridge.LoggerBridge
 import com.movtery.zalithlauncher.bridge.ZLBridge
 import com.movtery.zalithlauncher.bridge.ZLBridgeStates
 import com.movtery.zalithlauncher.coroutine.DataBridge
+import com.movtery.zalithlauncher.game.account.Account
 import com.movtery.zalithlauncher.game.input.AWTCharSender
 import com.movtery.zalithlauncher.game.input.CharacterSenderStrategy
 import com.movtery.zalithlauncher.game.input.LWJGLCharSender
@@ -73,6 +74,7 @@ import com.movtery.zalithlauncher.game.launch.GameLauncher
 import com.movtery.zalithlauncher.game.launch.GameService
 import com.movtery.zalithlauncher.game.launch.JvmLaunchInfo
 import com.movtery.zalithlauncher.game.launch.JvmLauncher
+import com.movtery.zalithlauncher.game.launch.LaunchConfig
 import com.movtery.zalithlauncher.game.launch.Launcher
 import com.movtery.zalithlauncher.game.launch.handler.AbstractHandler
 import com.movtery.zalithlauncher.game.launch.handler.GameHandler
@@ -111,7 +113,7 @@ import android.graphics.Color as NativeColor
 
 private const val INTENT_RUN_GAME = "BUNDLE_RUN_GAME"
 private const val INTENT_RUN_JAR = "INTENT_RUN_JAR"
-private const val INTENT_VERSION = "INTENT_VERSION"
+private const val INTENT_GAME_CONFIG = "INTENT_GAME_CONFIG"
 private const val INTENT_JAR_INFO = "INTENT_JAR_INFO"
 
 data class LaunchSession(
@@ -171,12 +173,12 @@ class VMViewModel : ViewModel() {
 
         _session = when {
             bundle.getBoolean(INTENT_RUN_GAME) -> {
-                val version: Version = bundle.getParcelableSafely(INTENT_VERSION, Version::class.java)
-                    ?: throw IllegalStateException("No launch version has been set.")
+                val config: LaunchConfig = bundle.getParcelableSafely(INTENT_GAME_CONFIG, LaunchConfig::class.java)
+                    ?: throw IllegalStateException("No launch config has been set.")
 
                 val launcher = GameLauncher(
                     activity = activity,
-                    version = version,
+                    config = config,
                     onExit = { code, isSignal ->
                         if (code == 0) {
                             val finishedCount = AllSettings.finishedGame.getValue()
@@ -199,7 +201,7 @@ class VMViewModel : ViewModel() {
                     launcher = launcher,
                     handler = GameHandler(
                         activity = activity,
-                        version = version,
+                        config = config,
                         errorViewModel = errorViewModel,
                         eventViewModel = eventViewModel,
                         gamepadViewModel = gamepadViewModel,
@@ -737,10 +739,14 @@ class VMActivity : BaseAppCompatActivity(), SurfaceTextureListener, SurfaceHolde
  * 让VMActivity进入运行游戏模式
  * @param version 指定版本
  */
-fun runGame(context: Context, version: Version) {
+fun runGame(
+    context: Context,
+    version: Version,
+    account: Account,
+) {
     val intent = Intent(context, VMActivity::class.java).apply {
         putExtra(INTENT_RUN_GAME, true)
-        putExtra(INTENT_VERSION, version)
+        putExtra(INTENT_GAME_CONFIG, LaunchConfig(version, account))
     }
     context.startActivity(intent)
 }