Add option to restart GTA

MGP6775 · Feb 22, 2025 · e5a2d55 · e5a2d55
1 parent ab6e77f
commit e5a2d55
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 41 deletions.
diff --git a/client/src/main/kotlin/core/ProcessHandler.kt b/client/src/main/kotlin/core/ProcessHandler.kt
@@ -1,9 +1,13 @@
 package dev.schlaubi.mastermind.core
 
+import dev.schlaubi.mastermind.core.settings.settings
+import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlin.io.path.absolutePathString
+import kotlin.io.path.div
 import kotlin.jvm.optionals.getOrNull
 
 private val LOG = KotlinLogging.logger { }
@@ -19,6 +23,12 @@ suspend fun killGta() {
         .findFirst()
     if (gtaProcess.isPresent) {
         gtaProcess.get().destroyForcibly()
+
+        if (settings.autostartGta) {
+            LOG.info { "Restarting GTA5.exe" }
+            val gtaPath = WindowsAPI.readGtaLocation() / "PlayGTAV.exe"
+            Runtime.getRuntime().exec(arrayOf(gtaPath.absolutePathString()))
+        }
     } else {
         LOG.error { "GTA5.exe not found" }
         _events.emit(Unit)

diff --git a/client/src/main/kotlin/core/settings/Settings.kt b/client/src/main/kotlin/core/settings/Settings.kt
@@ -1,16 +1,19 @@
 package dev.schlaubi.mastermind.core.settings
 
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.nativeKeyCode
 import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
-const val F3_KEY = 113
+val F3_KEY = Key.F3.nativeKeyCode
 
 @Serializable
 data class Settings(
     val currentUrl: Url?,
     val pastUrls: Set<Url>,
     val userName: String,
     val hotkey: Int = F3_KEY,
+    val autostartGta: Boolean = true,
     val tokens: Map<String, String> = emptyMap()
 )
 

diff --git a/client/src/main/kotlin/ui/components/settings/AutoLaunchGtaSetting.kt b/client/src/main/kotlin/ui/components/settings/AutoLaunchGtaSetting.kt
@@ -0,0 +1,19 @@
+package dev.schlaubi.mastermind.ui.components.settings
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import dev.schlaubi.mastermind.core.settings.settings
+import dev.schlaubi.mastermind.core.settings.writeSettings
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun AutoLaunchGtaSetting() {
+    val scope = rememberCoroutineScope()
+
+    CheckboxWithHeading("Auto-Launch GTA", settings.autostartGta, {
+        scope.launch(Dispatchers.IO) {
+            writeSettings(settings.copy(autostartGta = it))
+        }
+    })
+}
diff --git a/client/src/main/kotlin/ui/components/settings/KeyboardInput.kt b/client/src/main/kotlin/ui/components/settings/KeyboardInput.kt
@@ -5,6 +5,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Keyboard
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.*
+import androidx.compose.ui.input.key.nativeKeyCode
 import dev.schlaubi.mastermind.core.settings.settings
 import dev.schlaubi.mastermind.core.settings.writeSettings
 import dev.schlaubi.mastermind.util.keys
@@ -16,14 +17,14 @@ fun KeyboardInput() {
     val scope = rememberCoroutineScope()
 
     Box {
-        InputWithHeading(
+        TextInputWithHeading(
             { Icon(Icons.Default.Keyboard, null) }, "HotKey", initialValue = "F3",
             isError = isError,
             onValueChange = { isError = it !in keys },
             onSubmit = {
                 if (!isError) {
                     scope.launch {
-                        writeSettings(settings.copy(hotkey = keys[it]!!))
+                        writeSettings(settings.copy(hotkey = keys[it]!!.nativeKeyCode))
                     }
                 }
             }

diff --git a/client/src/main/kotlin/ui/components/settings/Settings.kt b/client/src/main/kotlin/ui/components/settings/Settings.kt
@@ -2,11 +2,9 @@ package dev.schlaubi.mastermind.ui.components.settings
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -27,12 +25,31 @@ fun Settings(modifier: Modifier = Modifier) {
         ) {
             UsernameInput()
             KeyboardInput()
+            AutoLaunchGtaSetting()
         }
     }
 }
 
 @Composable
 fun InputWithHeading(
+    heading: String,
+    modifier: Modifier = Modifier,
+    content: @Composable ColumnScope.() -> Unit
+) {
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(5.dp),
+        modifier = modifier
+    ) {
+        Text(heading, style = MaterialTheme.typography.headlineSmall)
+
+        content()
+    }
+}
+
+@Composable
+fun TextInputWithHeading(
     leadingIcon: @Composable () -> Unit,
     heading: String,
     initialValue: String,
@@ -42,41 +59,40 @@ fun InputWithHeading(
     onValueChange: (String) -> Unit = {},
     onSubmit: (String) -> Unit = {},
     modifier: Modifier = Modifier
-) {
-    var value by remember { mutableStateOf(initialValue) }
+) = InputWithHeading(heading, modifier) {
     val focusRequester = LocalFocusManager.current
+    var value by remember { mutableStateOf(initialValue) }
 
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(5.dp),
-        modifier = modifier
-    ) {
-        Text(heading, style = MaterialTheme.typography.headlineSmall)
-
-        OutlinedTextField(
-            value = value,
-            { value = it; onValueChange(it) },
-            leadingIcon = leadingIcon,
-            trailingIcon = trailingIcon,
-            colors = TextFieldDefaults.colors(),
-            enabled = enabled,
-            isError = isError,
-            maxLines = 1,
-            modifier = Modifier.onKeyEvent {
-                if (it.type != KeyEventType.KeyDown) return@onKeyEvent true
+    OutlinedTextField(
+        value = value,
+        { value = it; onValueChange(it) },
+        leadingIcon = leadingIcon,
+        trailingIcon = trailingIcon,
+        colors = TextFieldDefaults.colors(),
+        enabled = enabled,
+        isError = isError,
+        maxLines = 1,
+        modifier = Modifier.onKeyEvent {
+            if (it.type != KeyEventType.KeyDown) return@onKeyEvent true
 
-                when (it.key) {
-                    Key.Escape -> {
-                        value = initialValue
-                        focusRequester.clearFocus()
-                    }
+            when (it.key) {
+                Key.Escape -> {
+                    value = initialValue
+                    focusRequester.clearFocus()
                 }
+            }
 
-                false
-            }.onFocusChanged {
-                if (!it.isFocused && value != initialValue) {
-                    onSubmit(value)
-                }
-            })
-    }
+            false
+        }.onFocusChanged {
+            if (!it.isFocused && value != initialValue) {
+                onSubmit(value)
+            }
+        })
 }
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun CheckboxWithHeading(heading: String, checked: Boolean, onCheckedChange: (Boolean) -> Unit) =
+    InputWithHeading(heading) {
+        Checkbox(checked, onCheckedChange)
+    }
diff --git a/client/src/main/kotlin/ui/components/settings/UserNameInput.kt b/client/src/main/kotlin/ui/components/settings/UserNameInput.kt
@@ -27,7 +27,7 @@ fun UsernameInput() {
             .collect { loading = false }
     }
 
-    InputWithHeading({
+    TextInputWithHeading({
         if (loading) CircularProgressIndicator(Modifier.size(ButtonDefaults.IconSize)) else Icon(
             Icons.Default.AccountBox, "Username"
         )

diff --git a/windows_helper/src/main/kotlin/Extensions.kt b/windows_helper/src/main/kotlin/Extensions.kt
@@ -3,6 +3,7 @@ package dev.schlaubi.mastermind.windows_helper
 import java.lang.foreign.Arena
 import java.lang.foreign.MemorySegment
 import java.lang.foreign.SegmentAllocator
+import kotlin.io.path.Path
 
 private fun readString(producer: (SegmentAllocator) -> MemorySegment): String = Arena.ofConfined().use { arena ->
     val vec = producer(arena)
@@ -21,7 +22,7 @@ private fun readString(producer: (SegmentAllocator) -> MemorySegment): String =
 
 
 object WindowsAPI : Arena by Arena.ofConfined() {
-    fun readGtaLocation() = readString(WindowsHelper::read_gta_location)
+    fun readGtaLocation() = Path(readString(WindowsHelper::read_gta_location))
 
     fun registerKeyboardHook() = WindowsHelper.register_keyboard_hook()