0.7.0

note: even if this raises binary size by a significant amount, it should in theory be more reliable, so it is a worthy sacrifice.

.gitignore

@@ -1,2 +1,3 @@
 /target
 .vscode
+.idea

Cargo.toml

@@ -1,43 +1,40 @@
 [package]
 name = "gta-tools"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2024"
 
 [dependencies]
-catppuccin-egui = { version = "5.5.0", default-features = false, features = [
+catppuccin-egui = { version = "5.6.0", default-features = false, features = [
-    "egui31",
+    "egui32",
 ] }
-eframe = { version = "0.31.1", default-features = false, features = [
+chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
+eframe = { version = "0.32.2", default-features = false, features = [
     "glow",
     "default_fonts",
 ] }
-egui_extras = { version = "0.31.1", default-features = false, features = [
+egui_extras = { version = "0.32.2", default-features = false, features = [
     "image",
     "svg",
 ] }
-image = { version = "0.25.6", default-features = false, features = ["png"] }
+image = { version = "0.25.8", default-features = false, features = ["png"] }
-nyquest = { version = "0.1.1", features = ["blocking", "json"] }
-nyquest-backend-winrt = { version = "0.1.0", features = ["blocking"] }
 open = "5.3.2"
 semver = "1.0.26"
 serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.140"
+serde_json = "1.0.143"
-strum = { version = "0.27.1", features = ["derive"] }
+strum = { version = "0.27.2", features = ["derive"] }
-sysinfo = "0.35.0"
+sysinfo = "0.37.0"
-windows = { version = "0.61.1", features = [
+ureq = { version = "3.1.0", features = ["json"] }
-    "Win32_UI_Input_KeyboardAndMouse",
+windows = { version = "0.62.0", features = [
+    "Win32_NetworkManagement_WindowsFirewall",
+    "Win32_Security",
+    "Win32_System_Com",
     "Win32_System_Threading",
+    "Win32_UI_Input_KeyboardAndMouse",
     "Win32_UI_Shell",
     "Win32_UI_WindowsAndMessaging",
-    "Win32_Security",
-    "Win32_NetworkManagement_WindowsFirewall",
 ] }
 winreg = "0.55.0"
 
 [build-dependencies]
 static_vcruntime = "2.0.0"
-winresource = "0.1.20"
+winresource = "0.1.23"
-
-[profile.release]
-lto = true
-codegen-units = 1

README.md

@@ -2,7 +2,7 @@
 
 A toolset of convenient things for GTA V Online.
 
-![](https://i.vgy.me/aQ1qgw.png)
+![](https://i.vgy.me/aQ1qgw.png) ![](https://i.vgy.me/OrzaR8.png) 
 
 ## Installing
 
@@ -14,7 +14,7 @@ You will need the Rust toolchain, which can be obtained [here](https://rustup.rs
 
 ## Guide
 
-Almost every[^1] feature of GTA Tools is Legacy/Enhanced-agnostic. Some functionality of GTA Tools requires administrator access. If necessary, GTA Tools can either be started as admin manually, or, the user can simply use the <kbd>Elevate</kbd> button to relaunch GTA Tools as admin.
+Every feature of GTA Tools is Legacy/Enhanced-agnostic. Some functionality of GTA Tools requires administrator access. If necessary, GTA Tools can either be started as admin manually, or, the user can simply use the <kbd>Elevate</kbd> button to relaunch GTA Tools as admin.
 
 It is recommended to use an up-to-date version of GTA Tools from [releases](https://codeberg.org/futile/gta-tools/releases). You can check for updates to your existing installation by going to the <kbd>About</kbd> page of GTA Tools and hovering the <kbd>↓</kbd> button near the version number.
 
@@ -22,7 +22,7 @@ It is recommended to use an up-to-date version of GTA Tools from [releases](http
 
 This section is quite simple.
 
-There is a <kbd>Launch</kbd>[^1] feature, which will start your game on the chosen launcher (I am unsure if launching Epic Games works, let me know).
+There is a <kbd>Launch</kbd>[^1] feature, which will start your game on the chosen launcher and game version.
 
 There is also a <kbd>Force close game</kbd> feature, which simply kills all game processes. This *does not* touch Rockstar Games Launcher or any other processes, only ones named `GTA5_Enhanced.exe` or `GTA5.exe`.
 
@@ -38,8 +38,8 @@ The first being <kbd>Empty current session</kbd>, which "removes everyone" from
 
 The other feature is <kbd>Anti AFK</kbd>, which, when toggled, prevents you from getting kicked for idling by pressing keys on your keyboard every 60 seconds. At present, those keys are `VK_NUMPAD4` & `VK_NUMPAD6`, due to being a relatively good balance of keys that the game actually registers but don't interrupt gameplay too much if they activate while you're playing. You *must* be tabbed into GTA V for <kbd>Anti AFK</kbd> to work. While toggled, <kbd>Anti AFK</kbd> will only activate when all of the following conditions are true:
 * The `Grand Theft Auto V` window is currently focused
-* None of the designated keys are currently being pressed[^2]
+* None of the designated keys are currently being pressed[^1]
-* The mouse cursor is not currently visible[^3]
+* The mouse cursor is not currently visible[^2]
 
 #### Network
 
@@ -56,6 +56,5 @@ This feature is primarily useful for **replay glitching**, which is an exploit t
 5. At this point, <kbd>Unblock</kbd> the game's internet access and load back into online
 6. Finally, spend any amount of money, and you should receive the finale cut, but also be able to go play the finale again immediately
 
-[^1]: <kbd>Launch</kbd> only launches Enhanced installations of the game.
+[^1]: Otherwise, if you are, for example, using those keys to fly a plane, <kbd>Anti AFK</kbd> activating could cancel the input.
-[^2]: Otherwise, if you are, for example, using those keys to fly a plane, <kbd>Anti AFK</kbd> activating could cancel the input.
+[^2]: Specifically, the Windows mouse cursor, not the in-game mouse cursor. This check is mostly used to prevent typing while you are in the Rockstar overlay.
-[^3]: Specifically, the Windows mouse cursor, not the in-game mouse cursor. This check is mostly used to prevent typing while you are in the Rockstar overlay.

src/features/launch.rs

@@ -1,3 +1,4 @@
+use crate::gui::settings::LaunchVersion;
 use serde::{Deserialize, Serialize};
 use std::{path::PathBuf, process::Command};
 use strum::{Display, EnumIter};
@@ -18,16 +19,24 @@ pub struct Launch {
     pub selected: Platform,
 }
 
-pub fn launch(platform: &Platform) {
+pub fn launch(platform: &Platform, version: &LaunchVersion) {
     match platform {
         Platform::Steam => {
-            let _ = open::that_detached("steam://run/3240220");
+            let steam_url = if *version == LaunchVersion::Enhanced {
+                "steam://run/3240220"
+            } else {
+                "steam://run/271590"
+            };
+            let _ = open::that_detached(steam_url);
         }
         Platform::Rockstar => {
             let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
-            let Ok(gta_v_enhanced) =
+            let rockstar_url = if *version == LaunchVersion::Enhanced {
-                hklm.open_subkey(r"SOFTWARE\WOW6432Node\Rockstar Games\GTAV Enhanced")
+                r"SOFTWARE\WOW6432Node\Rockstar Games\GTAV Enhanced"
-            else {
+            } else {
+                r"SOFTWARE\WOW6432Node\Rockstar Games\Grand Theft Auto V"
+            };
+            let Ok(gta_v_enhanced) = hklm.open_subkey(rockstar_url) else {
                 return;
             };
             let Ok(install_folder): Result<String, std::io::Error> =
@@ -40,9 +49,12 @@ pub fn launch(platform: &Platform) {
             let _ = Command::new(play_gtav_path).spawn();
         }
         Platform::Epic => {
-            let _ = open::that_detached(
+            let epic_url = if *version == LaunchVersion::Enhanced {
-                "com.epicgames.launcher://apps/331226ba7c944720baa99103cb1fe80c?action=launch&silent=true",
+                "com.epicgames.launcher://apps/8769e24080ea413b8ebca3f1b8c50951?action=launch&silent=true"
-            );
+            } else {
+                "com.epicgames.launcher://apps/9d2d0eb64d5c44529cece33fe2a46482?action=launch&silent=true"
+            };
+            let _ = open::that_detached(epic_url);
         }
     }
 }

src/gui/app.rs

@@ -1,10 +1,6 @@
 use crate::{
     features,
-    gui::{
+    gui::{colours, settings::Settings, tools, ui_ext::UiExt},
-        settings::{Settings, Theme},
-        tools,
-        ui_ext::UiExt,
-    },
     util::{consts::game::WINDOW_TITLE, meta::Meta, persistent_state::PersistentState, win},
 };
 use eframe::egui;
@@ -99,7 +95,7 @@ impl App {
         ui.header("Game");
         ui.horizontal(|ui| {
             if ui.button("Launch").clicked() {
-                features::launch::launch(&self.launch.selected);
+                features::launch::launch(&self.launch.selected, &self.settings.launch_version);
             }
             egui::ComboBox::from_id_salt("Launch")
                 .selected_text(self.launch.selected.to_string())
@@ -194,6 +190,14 @@ impl App {
     }
 
     fn show_settings_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) {
+        ui.horizontal(|ui| {
+            ui.label("Launch version");
+            egui::ComboBox::from_id_salt("Launch version")
+                .selected_text(self.settings.launch_version.to_string())
+                .show_ui(ui, |ui| {
+                    ui.build_menu(&mut self.settings.launch_version);
+                });
+        });
         ui.horizontal(|ui| {
             let selection = self.settings.theme;
             ui.label("Theme");
@@ -205,13 +209,6 @@ impl App {
             if selection != self.settings.theme {
                 catppuccin_egui::set_theme(ctx, self.settings.theme.into());
             }
-            if ui
-                .add_visible(self.settings.theme == Theme::Auto, egui::Button::new("⟲"))
-                .on_hover_text("Refresh theme")
-                .clicked()
-            {
-                catppuccin_egui::set_theme(ctx, self.settings.theme.into());
-            }
         });
         ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
     }
@@ -222,9 +219,12 @@ impl App {
                 ui.horizontal(|ui| {
                     ui.spacing_mut().item_spacing.x = 0.0;
                     ui.label("with ");
+                    ui.style_mut().visuals.hyperlink_color = colours::RED;
                     ui.hyperlink_to("❤", "https://codeberg.org/futile/gta-tools");
                     ui.label(" from ");
-                    ui.hyperlink_to("futile", "http://futile.eu");
+                    ui.style_mut().visuals.hyperlink_color =
+                        catppuccin_egui::Theme::from(self.settings.theme).text;
+                    ui.hyperlink_to("futile", "https://futile.eu");
                 });
                 ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
                     ui.label(format!(

src/gui/debug.rs

@@ -5,8 +5,8 @@ use crate::{
         ui_ext::UiExt,
     },
     util::consts::{
-        APP_STORAGE_PATH,
         game::{EXE_ENHANCED, EXE_LEGACY},
+        path,
     },
 };
 use eframe::egui;
@@ -15,7 +15,7 @@ impl App {
     fn add_debug_viewport_contents(&mut self, ui: &mut egui::Ui) {
         ui.collapsing("misc", |ui| {
             if ui.button("open storage path").clicked() {
-                open::that_detached(APP_STORAGE_PATH.as_path()).unwrap();
+                open::that_detached(path::APP_STORAGE.as_path()).unwrap();
             }
             ui.checkbox(
                 &mut self.meta.newer_version_available,
@@ -42,6 +42,12 @@ impl App {
                         ui.build_menu(&mut self.game_networking.blocked_status);
                     });
             });
+            if ui
+                .add(egui::Button::new("force refresh theme"))
+                .clicked()
+            {
+                catppuccin_egui::set_theme(ui.ctx(), self.settings.theme.into());
+            }
         });
         ui.collapsing("anti afk", |ui| {
             ui.label(format!(

src/gui/run.rs

@@ -3,38 +3,13 @@ use crate::{
         app::{App, WINDOW_SIZE},
         tools,
     },
-    util::{consts::APP_STORAGE_PATH, persistent_state::PersistentState, win},
+    util::{persistent_state::PersistentState, win},
 };
 use eframe::egui;
-use std::{
-    fs::File,
-    io::Write,
-    time::{SystemTime, UNIX_EPOCH},
-};
-
-fn panic_hook(panic_info: &std::panic::PanicHookInfo<'_>) {
-    let log_path = APP_STORAGE_PATH.join("panic.log");
-    let mut file = File::options()
-        .create(true)
-        .append(true)
-        .open(log_path)
-        .unwrap();
-    let timestamp = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap()
-        .as_secs();
-    let backtrace = std::backtrace::Backtrace::capture();
-    let message = format!("[{timestamp}]\n{panic_info}\nstack backtrace:\n{backtrace}\n");
-    file.write_all(message.as_bytes()).unwrap();
-}
 
 fn app_creator(
     cc: &eframe::CreationContext<'_>,
 ) -> Result<Box<dyn eframe::App>, Box<dyn std::error::Error + Send + Sync>> {
-    // use our own panic hook which logs all panics to a file
-    std::panic::set_hook(Box::new(panic_hook));
-    // initialize http client (nyquest) for windows
-    nyquest_backend_winrt::register();
     // initialize App early to modify some things before returning it
     let mut app = Box::new(App::default());
     // load previously selected launch platform & settings from persistent state

src/gui/settings.rs

@@ -2,6 +2,13 @@ use crate::util::win;
 use serde::{Deserialize, Serialize};
 use strum::{Display, EnumIter};
 
+#[derive(Clone, Copy, Debug, Default, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+pub enum LaunchVersion {
+    #[default]
+    Enhanced,
+    Legacy,
+}
+
 #[derive(Clone, Copy, Debug, Default, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
 pub enum Theme {
     #[default]
@@ -37,6 +44,7 @@ impl From<Theme> for catppuccin_egui::Theme {
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub struct Settings {
+    pub launch_version: LaunchVersion,
     pub theme: Theme,
     pub start_elevated: bool,
 }

src/main.rs

@@ -1,12 +1,26 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 #[cfg(not(target_os = "windows"))]
-compile_error!("This application must be compiled on Windows.");
+compile_error!("This application must be compiled for Windows.");
 
 mod features;
 mod gui;
 mod util;
 
+fn init_storage() {
+    if !crate::util::consts::path::APP_STORAGE.exists() {
+        std::fs::create_dir(crate::util::consts::path::APP_STORAGE.as_path()).unwrap();
+    }
+}
+
+fn panic_hook(panic_info: &std::panic::PanicHookInfo<'_>) {
+    let backtrace = std::backtrace::Backtrace::capture();
+    let message = format!("{panic_info}\nstack backtrace:\n{backtrace}\n");
+    crate::util::log::log(crate::util::log::LogLevel::Panic, &message);
+}
+
 fn main() {
+    init_storage();
+    std::panic::set_hook(Box::new(panic_hook));
     gui::run::run();
 }

src/util.rs

@@ -1,6 +1,7 @@
 mod codeberg;
 pub mod consts;
 pub mod countdown;
+pub mod log;
 pub mod meta;
 pub mod persistent_state;
 pub mod win;

src/util/codeberg.rs

@@ -1,6 +1,6 @@
-use nyquest::{ClientBuilder, blocking::Request};
 use semver::Version;
 use serde::Deserialize;
+use std::time::Duration;
 
 const APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
 const CODEBERG_ENDPOINT_ROOT: &str = "https://codeberg.org/api/v1";
@@ -31,18 +31,20 @@ struct Asset {
     browser_download_url: String,
 }
 
-pub fn get_latest_release() -> Option<Release> {
+pub fn get_latest_release() -> Result<Release, Box<dyn std::error::Error>> {
     let request_url = format!("{CODEBERG_ENDPOINT_ROOT}/repos/futile/gta-tools/releases/latest");
-    let client = ClientBuilder::default()
+    let mut response = ureq::get(request_url)
+        .config()
+        .timeout_global(Some(Duration::from_secs(10)))
         .user_agent(APP_USER_AGENT)
-        .build_blocking()
+        .build()
-        .unwrap();
+        .call()?;
-    let response = client.request(Request::get(request_url)).unwrap();
+    let body = response.body_mut();
-    let json = response.json::<LatestRelease>().ok()?;
+    let json = body.read_json::<LatestRelease>()?;
     let tag_name = json.tag_name;
     let browser_download_url = &json.assets[0].browser_download_url;
-    Some(Release {
+    Ok(Release {
-        version: Version::parse(&tag_name).ok()?,
+        version: Version::parse(&tag_name)?,
         download_url: browser_download_url.to_owned(),
     })
 }

src/util/consts.rs

@@ -1,8 +1,12 @@
+pub mod path {
     use std::{env, path::PathBuf, sync::LazyLock};
-
+    pub static APP_STORAGE: LazyLock<PathBuf> = LazyLock::new(|| {
-pub static APP_STORAGE_PATH: LazyLock<PathBuf> = LazyLock::new(|| {
+        PathBuf::from(env::var("LOCALAPPDATA").unwrap_or_else(|_| String::from(".")))
-    PathBuf::from(env::var("LOCALAPPDATA").unwrap_or_else(|_| String::from("."))).join("GTA Tools")
+            .join("GTA Tools")
     });
+    pub static APP_CONFIG: LazyLock<PathBuf> = LazyLock::new(|| APP_STORAGE.join("config.json"));
+    pub static APP_LOG: LazyLock<PathBuf> = LazyLock::new(|| APP_STORAGE.join("gta-tools.log"));
+}
 
 pub mod game {
     pub const EXE_ENHANCED: &str = "GTA5_Enhanced.exe";

src/util/log.rs

@@ -0,0 +1,20 @@
+use crate::util::consts::path;
+use std::{fs::File, io::Write};
+use strum::Display;
+
+#[derive(Display)]
+pub enum LogLevel {
+    Error,
+    Panic,
+}
+
+pub fn log(level: LogLevel, message: &str) {
+    let mut file = File::options()
+        .create(true)
+        .append(true)
+        .open(path::APP_LOG.as_path())
+        .unwrap();
+    let timestamp = chrono::Local::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, false);
+    let message = format!("[{timestamp}] [{level}]\n{message}\n\n");
+    file.write_all(message.as_bytes()).unwrap();
+}

src/util/meta.rs

@@ -1,4 +1,4 @@
-use crate::util::codeberg;
+use crate::{util::codeberg, util::log};
 use semver::Version;
 
 #[derive(Debug)]
@@ -11,7 +11,11 @@ pub struct Meta {
 impl Default for Meta {
     fn default() -> Self {
         let current_version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
-        let latest_release = codeberg::get_latest_release().unwrap_or_default();
+        let latest_release = codeberg::get_latest_release().unwrap_or_else(|why| {
+            let message = format!("failed to get latest codeberg release:\n{why}");
+            log::log(log::LogLevel::Error, &message);
+            codeberg::Release::default()
+        });
         let newer_version_available = matches!(
             &current_version.cmp_precedence(&latest_release.version),
             std::cmp::Ordering::Less

src/util/persistent_state.rs

@@ -1,14 +1,10 @@
-use crate::{features::launch::Platform, gui::settings::Settings, util::consts::APP_STORAGE_PATH};
+use crate::{features::launch::Platform, gui::settings::Settings, util::consts::path};
 use serde::{Deserialize, Serialize};
 use std::{
     fs::{self, File},
     io::Write,
-    path::PathBuf,
-    sync::LazyLock,
 };
 
-static CONFIG_PATH: LazyLock<PathBuf> = LazyLock::new(|| APP_STORAGE_PATH.join("config.json"));
-
 #[derive(Serialize, Deserialize)]
 pub struct PersistentState {
     pub launcher: Platform,
@@ -17,18 +13,13 @@ pub struct PersistentState {
 
 impl PersistentState {
     pub fn get() -> Option<Self> {
-        fs::read_to_string(CONFIG_PATH.as_path())
+        fs::read_to_string(path::APP_CONFIG.as_path())
             .ok()
             .and_then(|config| serde_json::from_str::<Self>(&config).ok())
     }
 
     pub fn set(&self) {
-        let config_path = CONFIG_PATH.as_path();
+        let mut config_file = File::create(path::APP_CONFIG.as_path()).unwrap();
-        let config_path_parent = config_path.parent().unwrap();
-        if !config_path_parent.exists() {
-            fs::create_dir(config_path_parent).unwrap();
-        }
-        let mut config_file = File::create(config_path).unwrap();
         let json = serde_json::to_string_pretty(&self).unwrap();
         config_file.write_all(json.as_bytes()).unwrap();
     }