Add support for GTAV Enhanced

Author: DRSchlaubi

client/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     alias(libs.plugins.buildconfig)
 }
 
-version = "1.4.1"
+version = "1.5.0"
 
 repositories {
     mavenCentral()

client/src/main/kotlin/Launcher.kt

@@ -7,29 +7,37 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import dev.schlaubi.mastermind.core.KeyBoardListener
 import dev.schlaubi.mastermind.core.Updater
+import dev.schlaubi.mastermind.core.settings.settings
+import dev.schlaubi.mastermind.core.settings.writeSettings
 import dev.schlaubi.mastermind.resources.Res
 import dev.schlaubi.mastermind.resources.icon
 import dev.schlaubi.mastermind.theme.AppTheme
 import dev.schlaubi.mastermind.ui.GTAKiller
+import dev.schlaubi.mastermind.windows_helper.GTAVersion
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.jetbrains.compose.resources.painterResource
 
+private val LOG = KotlinLogging.logger { }
+
 fun main() = application {
     Updater()
+    LaunchedEffect(Unit) {
+        val detectedVersion = GTAVersion.systemDefault()
+        LOG.info { "Detected GTA version: $detectedVersion" }
+
+        if (detectedVersion != null) {
+            writeSettings(settings.copy(gtaVersion = detectedVersion))
+        }
+    }
     Window(title = "GTA Killer", icon = painterResource(Res.drawable.icon), onCloseRequest = ::exitApplication) {
         var loading by remember { mutableStateOf(true) }
-        KeyBoardListener()
         if (loading) {
-
             AppTheme {
                 Scaffold {
                     Column(

client/src/main/kotlin/core/ProcessHandler.kt

@@ -16,17 +16,18 @@ private val _events = MutableSharedFlow<Unit>(extraBufferCapacity = Channel.UNLI
 val gtaKillErrors = _events.asSharedFlow()
 
 suspend fun killGta() {
-    LOG.info { "Trying to kill GTA5.exe" }
+    val version = settings.gtaVersion
+    LOG.info { "Trying to kill ${version.process}" }
 
     val gtaProcess = ProcessHandle.allProcesses()
-        .filter { it.info().command().getOrNull()?.contains("GTA5.exe") == true }
+        .filter { it.info().command().getOrNull()?.contains(version.process) == true }
         .findFirst()
     if (gtaProcess.isPresent) {
         gtaProcess.get().destroyForcibly()
 
         if (settings.autostartGta) {
             LOG.info { "Restarting GTA5.exe" }
-            val gtaPath = WindowsAPI.readGtaLocation() / "PlayGTAV.exe"
+            val gtaPath = WindowsAPI.readGtaLocation(version) / version.startBinary
             Runtime.getRuntime().exec(arrayOf(gtaPath.absolutePathString()))
         }
     } else {

client/src/main/kotlin/core/settings/Settings.kt

@@ -2,6 +2,7 @@ package dev.schlaubi.mastermind.core.settings
 
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.nativeKeyCode
+import dev.schlaubi.mastermind.windows_helper.GTAVersion
 import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
@@ -13,6 +14,7 @@ data class Settings(
     val pastUrls: Set<Url>,
     val userName: String,
     val hotkey: Int = F3_KEY,
+    val gtaVersion: GTAVersion = GTAVersion.LEGACY,
     val autostartGta: Boolean = true,
     val tokens: Map<String, String> = emptyMap()
 )

client/src/main/kotlin/ui/components/settings/Settings.kt

@@ -26,6 +26,7 @@ fun Settings(modifier: Modifier = Modifier) {
             UsernameInput()
             KeyboardInput()
             AutoLaunchGtaSetting()
+            VersionSwitcher()
         }
     }
 }

client/src/main/kotlin/ui/components/settings/VersionSwitcher.kt

@@ -0,0 +1,50 @@
+package dev.schlaubi.mastermind.ui.components.settings
+
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import dev.schlaubi.mastermind.core.settings.settings
+import dev.schlaubi.mastermind.core.settings.writeSettings
+import dev.schlaubi.mastermind.windows_helper.GTAVersion
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun VersionSwitcher(modifier: Modifier = Modifier) {
+    val scope = rememberCoroutineScope()
+    InputWithHeading("Version Switcher", modifier) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterHorizontally),
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            val currentVersion = settings.gtaVersion
+            GTAVersion("Legacy", currentVersion == GTAVersion.LEGACY)
+            Switch(currentVersion == GTAVersion.ENHANCED, {
+                scope.launch(Dispatchers.IO) {
+                    writeSettings(settings.copy(gtaVersion = if (it) GTAVersion.ENHANCED else GTAVersion.LEGACY))
+                }
+            })
+            GTAVersion("Enhanced", currentVersion == GTAVersion.ENHANCED)
+        }
+    }
+}
+
+@Composable
+private fun GTAVersion(name: String, selected: Boolean) {
+    val transition = updateTransition(selected)
+    val opacity = transition.animateFloat { if (it) 1f else 0.5f }
+
+    Text(name, color = contentColorFor(MaterialTheme.colorScheme.surface).copy(alpha = opacity.value))
+}

windows_helper/Cargo.lock

@@ -7,6 +7,7 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
+enum-ordinalize = "4.3.0"
 safer-ffi = "0.1.12"
 windows-registry = "0.5.0"
 mki = "0.2.3"

windows_helper/Cargo.toml

@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.konan.target.HostManager
 plugins {
     java
     kotlin("jvm")
+    alias(libs.plugins.kotlin.serialization)
 }
 
 val jextractOutput: Provider<Directory> = layout.buildDirectory.dir("generated/jextract/main/java")
@@ -16,6 +17,10 @@ sourceSets {
     }
 }
 
+dependencies {
+    implementation(libs.kotlinx.serialization.json)
+}
+
 tasks {
     val compileRust by registering(Exec::class) {
         inputs.dir("src")
@@ -57,6 +62,7 @@ tasks {
             "--library", libraryPath,
             "--output", jextractOutput.get().asFile.absolutePath,
             "--include-function", "read_gta_location",
+            "--include-function", "detect_version",
             "--include-function", "register_keyboard_handler",
             "--include-function", "register_keyboard_hook",
             "--include-function", "spawn_detached_process",