0.5.2

Cargo.toml

@@ -1,16 +1,22 @@
 [package]
 name = "gta-tools"
-version = "0.4.2"
+version = "0.5.2"
 edition = "2024"
 
 [dependencies]
 catppuccin-egui = { version = "5.5.0", default-features = false, features = [
     "egui31",
 ] }
-chrono = "0.4.40"
+chrono = { version = "0.4.40", default-features = false, features = ["clock"] }
 dirs = "6.0.0"
-eframe = "0.31.1"
-egui_extras = { version = "0.31.1", features = ["image"] }
+eframe = { version = "0.31.1", default-features = false, features = [
+    "glow",
+    "default_fonts",
+] }
+egui_extras = { version = "0.31.1", default-features = false, features = [
+    "image",
+    "svg",
+] }
 image = { version = "0.25.6", default-features = false, features = ["png"] }
 open = "5.3.2"
 semver = "1.0.26"
@@ -25,6 +31,7 @@ windows = { version = "0.61.1", features = [
     "Win32_UI_Shell",
     "Win32_UI_WindowsAndMessaging",
     "Win32_Security",
+    "Win32_NetworkManagement_WindowsFirewall",
 ] }
 winreg = "0.55.0"
 
@@ -33,6 +40,5 @@ static_vcruntime = "2.0.0"
 winresource = "0.1.20"
 
 [profile.release]
-strip = true
 lto = true
 codegen-units = 1

README.md

@@ -1,4 +1,4 @@
 # GTA Tools
-A toolset of convenient things for GTA 5 Online.
+A toolset of convenient things for GTA V Online.
 
-![](https://i.vgy.me/n6CrZi.png)
+![](https://i.vgy.me/s6bf1g.png)

assets/circle.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <circle
+       style="fill:#ffffff"
+       id="path1"
+       cx="256"
+       cy="256"
+       r="256" />
+  </g>
+</svg>

src/features/anti_afk.rs

@@ -1,13 +1,12 @@
-#![allow(clippy::cast_possible_truncation)]
-
-use crate::util::{self, consts::GTA_WINDOW_TITLE};
+use crate::util::{self, consts::game::WINDOW_TITLE};
 use std::time::{Duration, Instant};
 use windows::Win32::UI::Input::KeyboardAndMouse::{
-    KEYBD_EVENT_FLAGS, MAP_VIRTUAL_KEY_TYPE, MapVirtualKeyW, VK_NUMPAD4, VK_NUMPAD6, keybd_event,
+    INPUT, INPUT_KEYBOARD, KEYBD_EVENT_FLAGS, KEYBDINPUT, KEYEVENTF_KEYUP, MAPVK_VK_TO_VSC,
+    MapVirtualKeyW, SendInput, VIRTUAL_KEY, VK_NUMPAD4, VK_NUMPAD6,
 };
 
-pub const INTERVAL: Duration = Duration::from_secs(60);
-const PRESS_KEYS: [u8; 2] = [VK_NUMPAD4.0 as u8, VK_NUMPAD6.0 as u8];
+const INTERVAL: Duration = Duration::from_secs(60);
+const PRESS_KEYS: [VIRTUAL_KEY; 2] = [VK_NUMPAD4, VK_NUMPAD6];
 
 #[derive(Debug)]
 pub struct AntiAfk {
@@ -25,32 +24,39 @@ impl Default for AntiAfk {
 }
 
 impl AntiAfk {
-    pub fn activate(&mut self) {
-        if can_activate() {
-            send(&PRESS_KEYS);
+    pub fn can_activate(&self) -> bool {
+        use util::win::{is_any_key_pressed, is_cursor_visible, is_window_focused};
+        is_window_focused(WINDOW_TITLE) && !is_any_key_pressed(&PRESS_KEYS) && !is_cursor_visible()
     }
+
+    pub fn should_activate(&self) -> bool {
+        self.enabled && self.interval.elapsed() >= INTERVAL
+    }
+
+    pub fn activate(&mut self) {
+        send(&PRESS_KEYS);
         self.interval = Instant::now();
     }
 }
 
-pub fn can_activate() -> bool {
-    use util::win::{is_any_key_pressed, is_cursor_visible, is_window_focused};
-    is_window_focused(GTA_WINDOW_TITLE) && !is_any_key_pressed(&PRESS_KEYS) && !is_cursor_visible()
-}
-
-pub fn send(vk_codes: &[u8]) {
-    vk_codes.iter().for_each(|vk_code: &u8| unsafe {
-        keybd_event(
-            *vk_code,
-            u8::try_from(MapVirtualKeyW(u32::from(*vk_code), MAP_VIRTUAL_KEY_TYPE(0))).unwrap(),
-            KEYBD_EVENT_FLAGS(0),
-            0,
-        );
-        keybd_event(
-            *vk_code,
-            u8::try_from(MapVirtualKeyW(u32::from(*vk_code), MAP_VIRTUAL_KEY_TYPE(0))).unwrap(),
-            KEYBD_EVENT_FLAGS(2),
-            0,
-        );
-    });
+fn send(vk_codes: &[VIRTUAL_KEY]) {
+    let mut inputs = Vec::new();
+    for &vk_code in vk_codes {
+        let scan_code = unsafe { MapVirtualKeyW(u32::from(vk_code.0), MAPVK_VK_TO_VSC) as u16 };
+        for event in [KEYBD_EVENT_FLAGS(0), KEYEVENTF_KEYUP] {
+            let mut input = INPUT {
+                r#type: INPUT_KEYBOARD,
+                ..Default::default()
+            };
+            input.Anonymous.ki = KEYBDINPUT {
+                wVk: vk_code,
+                wScan: scan_code,
+                dwFlags: event,
+                time: 0,
+                dwExtraInfo: 0,
+            };
+            inputs.push(input);
+        }
+        unsafe { SendInput(&inputs, size_of::<INPUT>() as i32) };
+    }
 }

src/features/empty_session.rs

@@ -1,5 +1,5 @@
 use crate::util::{
-    consts::{ENHANCED, LEGACY},
+    consts::game::{EXE_ENHANCED, EXE_LEGACY},
     countdown::Countdown,
 };
 use std::time::{Duration, Instant};
@@ -9,7 +9,7 @@ use windows::Win32::{
     System::Threading::{OpenProcess, PROCESS_SUSPEND_RESUME},
 };
 
-pub const INTERVAL: Duration = Duration::from_secs(10);
+const INTERVAL: Duration = Duration::from_secs(10);
 
 #[derive(Debug)]
 pub struct EmptySession {
@@ -28,10 +28,24 @@ impl Default for EmptySession {
     }
 }
 
+impl EmptySession {
+    pub fn run_timers(&mut self, game_handle: &mut HANDLE) {
+        if self.disabled {
+            self.countdown.count();
+        } else {
+            self.countdown.reset();
+        }
+        if self.interval.elapsed() >= INTERVAL {
+            deactivate(game_handle);
+            self.disabled = false;
+        }
+    }
+}
+
 #[link(name = "ntdll")]
 unsafe extern "system" {
-    pub unsafe fn NtSuspendProcess(ProcessHandle: HANDLE) -> NTSTATUS;
-    pub unsafe fn NtResumeProcess(ProcessHandle: HANDLE) -> NTSTATUS;
+    unsafe fn NtSuspendProcess(ProcessHandle: HANDLE) -> NTSTATUS;
+    unsafe fn NtResumeProcess(ProcessHandle: HANDLE) -> NTSTATUS;
 }
 
 fn get_gta_pid(sysinfo: &mut System) -> u32 {
@@ -39,29 +53,29 @@ fn get_gta_pid(sysinfo: &mut System) -> u32 {
     if let Some((pid, _)) = sysinfo
         .processes()
         .iter()
-        .find(|(_, p)| p.name() == ENHANCED || p.name() == LEGACY)
+        .find(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
     {
         return pid.as_u32();
     }
     u32::MAX
 }
 
-pub fn activate(handle: &mut HANDLE, sysinfo: &mut System) {
+pub fn activate(game_handle: &mut HANDLE, sysinfo: &mut System) {
     let pid = get_gta_pid(sysinfo);
     if pid == u32::MAX {
         return;
     }
     unsafe {
-        *handle = OpenProcess(PROCESS_SUSPEND_RESUME, false, pid).unwrap();
-        let _ = NtSuspendProcess(*handle);
+        *game_handle = OpenProcess(PROCESS_SUSPEND_RESUME, false, pid).unwrap();
+        let _ = NtSuspendProcess(*game_handle);
     }
 }
 
-pub fn deactivate(handle: &mut HANDLE) {
+pub fn deactivate(game_handle: &mut HANDLE) {
     unsafe {
-        if !handle.is_invalid() {
-            let _ = NtResumeProcess(*handle);
-            let _ = CloseHandle(*handle);
+        if !game_handle.is_invalid() {
+            let _ = NtResumeProcess(*game_handle);
+            let _ = CloseHandle(*game_handle);
         }
     }
 }

src/features/force_close.rs

@@ -1,38 +1,62 @@
-use crate::util::consts::{ENHANCED, LEGACY};
-use std::time::Instant;
+use crate::util::consts::game::{EXE_ENHANCED, EXE_LEGACY};
+use std::time::{Duration, Instant};
 use sysinfo::System;
 
+const INTERVAL: Duration = Duration::from_secs(3);
+
 #[derive(Debug)]
 pub struct ForceClose {
     pub button_text: String,
-    pub prompting: bool,
-    pub interval: Instant,
+    timer: Instant,
+    counting: bool,
+    current_frame: bool,
 }
 
 impl Default for ForceClose {
     fn default() -> Self {
         Self {
             button_text: "Force close game".to_owned(),
-            prompting: false,
-            interval: Instant::now(),
+            timer: Instant::now(),
+            counting: false,
+            current_frame: false,
         }
     }
 }
 
 impl ForceClose {
-    pub fn prompting(&mut self) {
+    pub fn prompt(&mut self, force_close_button_clicked: bool, sysinfo: &mut System) {
+        if force_close_button_clicked && !self.counting {
             self.button_text = "Are you sure?".to_owned();
-        self.prompting = true;
-        self.interval = Instant::now();
+            self.timer = Instant::now();
+            self.counting = true;
+            self.current_frame = true;
+        }
+        if self.counting && self.timer.elapsed() >= INTERVAL {
+            self.reset();
+        } else if force_close_button_clicked && !self.current_frame {
+            activate(sysinfo);
+            self.reset();
+        }
+        self.finish_current_frame();
+    }
+
+    fn reset(&mut self) {
+        *self = Self::default();
+    }
+
+    fn finish_current_frame(&mut self) {
+        if self.current_frame {
+            self.current_frame = false;
+        }
     }
 }
 
-pub fn activate(sysinfo: &mut System) {
+fn activate(sysinfo: &mut System) {
     sysinfo.refresh_all();
     sysinfo
         .processes()
         .iter()
-        .filter(|(_, p)| p.name() == ENHANCED || p.name() == LEGACY)
+        .filter(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
         .for_each(|(_, p)| {
             p.kill();
         });

src/features/game_networking.rs

@@ -1,72 +1,146 @@
-#![allow(clippy::zombie_processes)]
-
-use crate::util::consts::{ENHANCED, LEGACY};
-use std::{os::windows::process::CommandExt, path::Path, process::Command};
+use crate::util::consts::game::{EXE_ENHANCED, EXE_LEGACY};
+use std::{
+    path::Path,
+    time::{Duration, Instant},
+};
 use sysinfo::System;
-use windows::Win32::System::Threading::CREATE_NO_WINDOW;
+use windows::{
+    Win32::{
+        NetworkManagement::WindowsFirewall::{
+            INetFwPolicy2, INetFwRule, NET_FW_ACTION_BLOCK, NET_FW_IP_PROTOCOL_ANY,
+            NET_FW_RULE_DIR_IN, NET_FW_RULE_DIR_OUT, NetFwPolicy2, NetFwRule,
+        },
+        System::Com::{
+            CLSCTX_INPROC_SERVER, COINIT_MULTITHREADED, CoCreateInstance, CoInitializeEx,
+            CoUninitialize,
+        },
+    },
+    core::BSTR,
+};
 
-const FILTER_NAME: &str = "[GTA Tools] Block all traffic for GTA V";
+const FILTER_NAME_IN: &str = "[GTA Tools] Block all inbound traffic for GTA V";
+const FILTER_NAME_OUT: &str = "[GTA Tools] Block all outbound traffic for GTA V";
+
+const INTERVAL: Duration = Duration::from_secs(3);
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum BlockedStatus {
+    Blocked,
+    Failed,
+    Unblocked,
+}
+
+impl From<bool> for BlockedStatus {
+    fn from(value: bool) -> Self {
+        if value {
+            Self::Blocked
+        } else {
+            Self::Unblocked
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct GameNetworking {
+    com_initialized: bool,
+    pub blocked_status: BlockedStatus,
+    timer: Instant,
+    counting: bool,
+}
+
+impl Default for GameNetworking {
+    fn default() -> Self {
+        Self {
+            blocked_status: Self::is_blocked().into(),
+            com_initialized: unsafe { CoInitializeEx(None, COINIT_MULTITHREADED) }.is_ok(),
+            timer: Instant::now(),
+            counting: false,
+        }
+    }
+}
+
+impl Drop for GameNetworking {
+    fn drop(&mut self) {
+        unsafe {
+            if self.com_initialized {
+                CoUninitialize();
+            }
+        }
+    }
+}
+
+impl GameNetworking {
+    pub fn block_all(&mut self, sysinfo: &mut System) {
+        let Some(exe_path) = get_game_exe_path(sysinfo) else {
+            self.blocked_status = BlockedStatus::Failed;
+            return;
+        };
+        let policy: INetFwPolicy2 =
+            unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER).unwrap() };
+        let rules = unsafe { policy.Rules().unwrap() };
+        let exe_path = BSTR::from(exe_path.to_string_lossy().to_string());
+        for filter in [
+            (FILTER_NAME_IN, NET_FW_RULE_DIR_IN),
+            (FILTER_NAME_OUT, NET_FW_RULE_DIR_OUT),
+        ] {
+            let _ = unsafe { rules.Remove(&BSTR::from(filter.0)) };
+            unsafe {
+                let rule: INetFwRule =
+                    CoCreateInstance(&NetFwRule, None, CLSCTX_INPROC_SERVER).unwrap();
+                rule.SetName(&BSTR::from(filter.0)).unwrap();
+                rule.SetApplicationName(&exe_path).unwrap();
+                rule.SetDirection(filter.1).unwrap();
+                rule.SetEnabled(true.into()).unwrap();
+                rule.SetAction(NET_FW_ACTION_BLOCK).unwrap();
+                rule.SetProtocol(NET_FW_IP_PROTOCOL_ANY.0).unwrap();
+                rules.Add(&rule).unwrap();
+            }
+        }
+        self.blocked_status = Self::is_blocked().into();
+    }
+
+    pub fn unblock_all(&mut self) {
+        let policy: INetFwPolicy2 =
+            unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER).unwrap() };
+        let rules = unsafe { policy.Rules().unwrap() };
+        unsafe { rules.Remove(&BSTR::from(FILTER_NAME_IN)).unwrap() };
+        unsafe { rules.Remove(&BSTR::from(FILTER_NAME_OUT)).unwrap() };
+        self.blocked_status = Self::is_blocked().into();
+    }
+
+    fn is_blocked() -> bool {
+        let policy: INetFwPolicy2 =
+            unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER).unwrap() };
+        let rules = unsafe { policy.Rules().unwrap() };
+        let in_rule_exists = unsafe { rules.Item(&BSTR::from(FILTER_NAME_IN)).is_ok() };
+        let out_rule_exists = unsafe { rules.Item(&BSTR::from(FILTER_NAME_OUT)).is_ok() };
+        in_rule_exists || out_rule_exists
+    }
+
+    pub fn if_failed_return_to_unblocked(&mut self) {
+        if self.blocked_status == BlockedStatus::Failed && !self.counting {
+            self.counting = true;
+            self.timer = Instant::now();
+        }
+        if self.blocked_status == BlockedStatus::Failed
+            && self.counting
+            && self.timer.elapsed() >= INTERVAL
+        {
+            self.counting = false;
+            self.blocked_status = BlockedStatus::Unblocked;
+        }
+    }
+}
 
 fn get_game_exe_path(sysinfo: &mut System) -> Option<&Path> {
     sysinfo.refresh_all();
     if let Some((_, process)) = sysinfo
         .processes()
         .iter()
-        .find(|(_, p)| p.name() == ENHANCED || p.name() == LEGACY)
+        .find(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
     {
         process.exe()
     } else {
         None
     }
 }
-
-pub fn block_all(sysinfo: &mut System) {
-    let Some(exe_path) = get_game_exe_path(sysinfo) else {
-        return;
-    };
-    let exe_path = exe_path.display();
-    Command::new("netsh")
-        .args([
-            "advfirewall",
-            "firewall",
-            "add",
-            "rule",
-            &format!("name={FILTER_NAME}"),
-            "dir=out",
-            "action=block",
-            "protocol=ANY",
-            &format!("program={exe_path}"),
-        ])
-        .creation_flags(CREATE_NO_WINDOW.0)
-        .spawn()
-        .unwrap();
-    Command::new("netsh")
-        .args([
-            "advfirewall",
-            "firewall",
-            "add",
-            "rule",
-            &format!("name={FILTER_NAME}"),
-            "dir=in",
-            "action=block",
-            "protocol=ANY",
-            &format!("program={exe_path}"),
-        ])
-        .creation_flags(CREATE_NO_WINDOW.0)
-        .spawn()
-        .unwrap();
-}
-
-pub fn unblock_all() {
-    Command::new("netsh")
-        .args([
-            "advfirewall",
-            "firewall",
-            "delete",
-            "rule",
-            &format!("name={FILTER_NAME}"),
-        ])
-        .creation_flags(CREATE_NO_WINDOW.0)
-        .spawn()
-        .unwrap();
-}

src/features/launch.rs

@@ -1,27 +1,18 @@
 use serde::{Deserialize, Serialize};
-use std::{fmt::Display, path::PathBuf, process::Command};
-use strum::EnumIter;
+use std::{path::PathBuf, process::Command};
+use strum::{Display, EnumIter};
 use winreg::{RegKey, enums::HKEY_LOCAL_MACHINE};
 
-#[derive(Clone, Copy, Default, Debug, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+#[derive(Clone, Copy, Default, Debug, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
 pub enum Platform {
     #[default]
     Steam,
+    #[strum(to_string = "Rockstar Games")]
     Rockstar,
+    #[strum(to_string = "Epic Games")]
     Epic,
 }
 
-impl Display for Platform {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let x = match self {
-            Self::Steam => "Steam",
-            Self::Rockstar => "Rockstar Games",
-            Self::Epic => "Epic Games",
-        };
-        write!(f, "{x}")
-    }
-}
-
 #[derive(Debug, Default)]
 pub struct Launch {
     pub selected: Platform,

src/gui/app.rs

@@ -1,92 +1,60 @@
 use crate::{
-    features::{
-        self, anti_afk::AntiAfk, empty_session::EmptySession, force_close::ForceClose,
-        launch::Launch,
-    },
-    gui::{
-        settings::{self, Settings},
-        tools,
-    },
-    util::{
-        self,
-        consts::{APP_STORAGE_PATH, ENHANCED, GTA_WINDOW_TITLE, LEGACY},
-        meta::Meta,
-        persistent_state::PersistentState,
-    },
+    features,
+    gui::{settings::Settings, tools},
+    util::{consts::game::WINDOW_TITLE, meta::Meta, persistent_state::PersistentState, win},
 };
 use eframe::egui;
 use std::time::{Duration, Instant};
+use strum::{Display, EnumIter};
 
 pub const WINDOW_SIZE: [f32; 2] = [240.0, 240.0];
 
-#[derive(Debug, Default, PartialEq, Eq)]
-pub enum Stage {
+#[derive(Clone, Copy, Debug, Default, Display, PartialEq, Eq, EnumIter)]
+enum Stage {
     #[default]
     Main,
     Settings,
     About,
 }
 
-#[allow(clippy::struct_excessive_bools)]
 #[derive(Debug, Default)]
 pub struct Flags {
     pub elevated: bool,
-    debug: bool,
+    pub debug: bool,
     closing: bool,
-    current_frame: bool,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct App {
-    meta: Meta,
+    pub meta: Meta,
     pub settings: Settings,
     stage: Stage,
     pub flags: Flags,
     pub sysinfo: sysinfo::System,
-    pub game_handle: windows::Win32::Foundation::HANDLE,
-    pub launch: Launch,
-    force_close: ForceClose,
-    empty_session: EmptySession,
-    anti_afk: AntiAfk,
-}
-
-impl Default for App {
-    fn default() -> Self {
-        Self {
-            meta: Meta::default(),
-            settings: Settings::default(),
-            stage: Stage::default(),
-            flags: Flags::default(),
-            sysinfo: sysinfo::System::new_all(),
-            game_handle: windows::Win32::Foundation::HANDLE::default(),
-            launch: Launch::default(),
-            force_close: ForceClose::default(),
-            empty_session: EmptySession::default(),
-            anti_afk: AntiAfk::default(),
-        }
-    }
+    game_handle: windows::Win32::Foundation::HANDLE,
+    pub anti_afk: features::anti_afk::AntiAfk,
+    empty_session: features::empty_session::EmptySession,
+    force_close: features::force_close::ForceClose,
+    game_networking: features::game_networking::GameNetworking,
+    pub launch: features::launch::Launch,
 }
 
 impl eframe::App for App {
     fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        catppuccin_egui::set_theme(ctx, self.settings.theme.into());
-        self.run_timers();
+        ctx.request_repaint_after(Duration::from_millis(100));
+        self.empty_session.run_timers(&mut self.game_handle);
         egui::TopBottomPanel::bottom("bottom_panel")
             .exact_height(25.0)
             .show(ctx, |ui| {
                 ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| {
-                    ui.selectable_value(&mut self.stage, Stage::Main, "Main");
-                    ui.selectable_value(&mut self.stage, Stage::Settings, "Settings");
-                    ui.selectable_value(&mut self.stage, Stage::About, "About");
+                    tools::build_menu::<Stage>(ui, &mut self.stage);
                     ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
                         let button = ui
                             .add_enabled(!self.flags.elevated, egui::Button::new("Elevate"))
                             .on_hover_text("Relaunch ourselves as administrator.")
                             .on_disabled_hover_text("We are already running elevated.");
                         if button.clicked() {
-                            util::win::elevate(util::win::ElevationExitMethod::Gentle(
-                                &mut self.flags.closing,
-                            ));
+                            win::elevate(win::ElevationExitMethod::Gentle(&mut self.flags.closing));
                         }
                     });
                 });
@@ -95,53 +63,17 @@ impl eframe::App for App {
             egui::ScrollArea::vertical()
                 .auto_shrink([false, true])
                 .show(ui, |ui| match self.stage {
-                    Stage::Main => {
-                        self.show_game(ctx, ui);
-                        self.show_session(ctx, ui);
-                        self.show_network(ctx, ui);
-                    }
-                    Stage::Settings => self.show_settings(ctx, ui),
-                    Stage::About => self.show_about(ctx, ui),
+                    Stage::Main => self.show_main_stage(ctx, ui),
+                    Stage::Settings => self.show_settings_stage(ctx, ui),
+                    Stage::About => self.show_about_stage(ctx, ui),
                 });
         });
-        if tools::check_debug_keycombo_pressed(ctx) {
+        if tools::debug_keycombo_pressed(ctx) || tools::debug_viewport_close_pressed(ctx) {
             self.flags.debug = !self.flags.debug;
         }
-        if tools::check_debug_viewport_close_button_pressed(ctx) {
-            self.flags.debug = false;
-        }
         if self.flags.debug {
-            let main_rect = ctx.input(|i| {
-                i.viewport()
-                    .clone()
-                    .outer_rect
-                    .unwrap_or(egui::Rect::EVERYTHING)
-            });
-            let position = [main_rect.right(), main_rect.min.y];
-            ctx.show_viewport_immediate(
-                egui::ViewportId::from_hash_of("debug_viewport"),
-                egui::ViewportBuilder::default()
-                    .with_title("GTA Tools Debug")
-                    .with_minimize_button(false)
-                    .with_maximize_button(false)
-                    .with_inner_size(WINDOW_SIZE)
-                    .with_position(position)
-                    .with_icon(tools::load_icon()),
-                |ctx, _class| {
-                    if tools::check_debug_keycombo_pressed(ctx) {
-                        self.flags.debug = !self.flags.debug;
+            self.show_debug_viewport(ctx);
         }
-                    egui::CentralPanel::default().show(ctx, |ui| {
-                        egui::ScrollArea::both()
-                            .auto_shrink([false, true])
-                            .show(ui, |ui| {
-                                self.show_debug(ctx, ui);
-                            });
-                    });
-                },
-            );
-        }
-        ctx.request_repaint_after(Duration::from_millis(100));
         if self.flags.closing {
             ctx.send_viewport_cmd(egui::ViewportCommand::Close);
         }
@@ -149,42 +81,28 @@ impl eframe::App for App {
 }
 
 impl App {
-    fn show_game(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+    fn show_game_section(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
         tools::header(ui, "Game");
         ui.horizontal(|ui| {
             if ui.button("Launch").clicked() {
                 features::launch::launch(&self.launch.selected);
             }
-            tools::build_combo_box::<features::launch::Platform>(
-                ui,
-                &mut self.launch.selected,
-                "Launch",
-            );
+            egui::ComboBox::from_id_salt("Launch")
+                .selected_text(self.launch.selected.to_string())
+                .width(120.0)
+                .show_ui(ui, |ui| {
+                    tools::build_menu(ui, &mut self.launch.selected);
+                });
         });
         let force_close_button = ui.add_sized(
             [104.0, 0.0],
             egui::Button::new(&self.force_close.button_text),
         );
-        if force_close_button.clicked() && !self.force_close.prompting {
-            self.force_close.prompting();
-            self.flags.current_frame = true;
-        }
-        if self.force_close.prompting
-            && self.force_close.interval.elapsed() <= Duration::from_secs(3)
-        {
-            if force_close_button.clicked() && !self.flags.current_frame {
-                features::force_close::activate(&mut self.sysinfo);
-                self.force_close = ForceClose::default();
-            }
-        } else {
-            self.force_close = ForceClose::default();
-        }
-        if self.flags.current_frame {
-            self.flags.current_frame = false;
-        }
+        self.force_close
+            .prompt(force_close_button.clicked(), &mut self.sysinfo);
     }
 
-    fn show_session(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+    fn show_session_section(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
         tools::header(ui, "Session");
         ui.add_enabled_ui(!self.empty_session.disabled, |ui| {
             ui.horizontal(|ui| {
@@ -202,7 +120,7 @@ impl App {
             if self.anti_afk.enabled {
                 ui.add_space(8.0);
                 ui.add_enabled_ui(false, |ui| {
-                    ui.label(if util::win::is_window_focused(GTA_WINDOW_TITLE) {
+                    ui.label(if win::is_window_focused(WINDOW_TITLE) {
                         "GTA is focused."
                     } else {
                         "GTA is not focused!"
@@ -210,34 +128,44 @@ impl App {
                 });
             }
         });
-        if self.anti_afk.enabled && self.anti_afk.interval.elapsed() >= features::anti_afk::INTERVAL
-        {
+        if self.anti_afk.can_activate() && self.anti_afk.should_activate() {
             self.anti_afk.activate();
         }
     }
 
-    fn show_network(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+    fn show_network_section(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
         tools::header(ui, "Network");
         egui::Frame::new()
             .outer_margin(egui::vec2(0.0, -2.0))
             .show(ui, |ui| {
                 let response = ui.add_enabled_ui(self.flags.elevated, |ui| {
+                    let label = ui.horizontal(|ui| {
                         let label = ui.label("Game's network access");
+                        ui.add_space(1.0);
+                        ui.add(
+                            egui::Image::new(egui::include_image!("../../assets/circle.svg"))
+                                .max_size([4.0, 4.0].into())
+                                .tint(self.game_networking.blocked_status.to_color32()),
+                        )
+                        .on_hover_text("This turns yellow if GTA Tools\ncannot find your game.");
+                        self.game_networking.if_failed_return_to_unblocked();
+                        label
+                    });
                     ui.horizontal(|ui| {
-                        let available_width = label.rect.width();
+                        let available_width = label.inner.rect.width();
                         let spacing = ui.spacing().item_spacing.x;
                         let button_width = (available_width - spacing) / 2.0;
                         if ui
                             .add_sized([button_width, 18.0], egui::Button::new("Block"))
                             .clicked()
                         {
-                            features::game_networking::block_all(&mut self.sysinfo);
+                            self.game_networking.block_all(&mut self.sysinfo);
                         }
                         if ui
                             .add_sized([button_width, 18.0], egui::Button::new("Unblock"))
                             .clicked()
                         {
-                            features::game_networking::unblock_all();
+                            self.game_networking.unblock_all();
                         }
                     });
                 });
@@ -247,7 +175,29 @@ impl App {
             });
     }
 
-    fn show_about(&self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+    fn show_main_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) {
+        self.show_game_section(ctx, ui);
+        self.show_session_section(ctx, ui);
+        self.show_network_section(ctx, ui);
+    }
+
+    fn show_settings_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) {
+        ui.horizontal(|ui| {
+            let selection = self.settings.theme;
+            ui.label("Theme");
+            egui::ComboBox::from_id_salt("Theme")
+                .selected_text(self.settings.theme.to_string())
+                .show_ui(ui, |ui| {
+                    tools::build_menu(ui, &mut self.settings.theme);
+                });
+            if selection != self.settings.theme {
+                catppuccin_egui::set_theme(ctx, self.settings.theme.into());
+            }
+        });
+        ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
+    }
+
+    fn show_about_stage(&self, _ctx: &egui::Context, ui: &mut egui::Ui) {
         ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
             ui.horizontal(|ui| {
                 ui.horizontal(|ui| {
@@ -282,68 +232,16 @@ impl App {
             )));
         });
     }
-
-    fn show_settings(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
-        ui.horizontal(|ui| {
-            ui.label("Theme");
-            tools::build_combo_box::<settings::Theme>(ui, &mut self.settings.theme, "Theme");
-        });
-        ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
-    }
-
-    fn show_debug(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
-        if ui.button("open storage path").clicked() {
-            open::that_detached(APP_STORAGE_PATH.as_path()).unwrap();
-        }
-        ui.collapsing("anti afk", |ui| {
-            ui.label(format!(
-                "timer: {}",
-                self.anti_afk.interval.elapsed().as_secs()
-            ));
-            ui.label(format!(
-                "can activate: {}",
-                features::anti_afk::can_activate()
-            ));
-        });
-        ui.collapsing("sysinfo", |ui| {
-            if ui.button("refresh all").clicked() {
-                self.sysinfo.refresh_all();
-            }
-            let pid = self
-                .sysinfo
-                .processes()
-                .iter()
-                .find(|(_, p)| p.name() == ENHANCED || p.name() == LEGACY)
-                .map_or_else(
-                    || "no pid found!".to_owned(),
-                    |(pid, _)| pid.as_u32().to_string(),
-                );
-            ui.label(format!("gta pid: {pid}"));
-        });
-        ui.collapsing("app state", |ui| ui.label(format!("{self:#?}")));
-    }
-
-    fn run_timers(&mut self) {
-        if self.empty_session.disabled {
-            self.empty_session.countdown.count();
-        } else {
-            self.empty_session.countdown.reset();
-        }
-        if self.empty_session.interval.elapsed() >= features::empty_session::INTERVAL {
-            features::empty_session::deactivate(&mut self.game_handle);
-            self.empty_session.disabled = false;
-        }
-    }
 }
 
 impl Drop for App {
     fn drop(&mut self) {
         // save any persistent state to config file
-        let persistent_state = PersistentState {
+        PersistentState {
             launcher: self.launch.selected,
             settings: self.settings.clone(),
-        };
-        persistent_state.set();
+        }
+        .set();
         // make sure we are not suspending game
         features::empty_session::deactivate(&mut self.game_handle);
     }

src/gui/colours.rs

@@ -0,0 +1,22 @@
+use crate::features::game_networking::BlockedStatus;
+use eframe::egui;
+
+pub const RED: egui::Color32 = egui::Color32::from_rgb(255, 128, 128);
+pub const YELLOW: egui::Color32 = egui::Color32::from_rgb(255, 255, 128);
+pub const GREEN: egui::Color32 = egui::Color32::from_rgb(128, 255, 128);
+
+impl From<BlockedStatus> for egui::Color32 {
+    fn from(value: BlockedStatus) -> Self {
+        match value {
+            BlockedStatus::Blocked => RED,
+            BlockedStatus::Failed => YELLOW,
+            BlockedStatus::Unblocked => GREEN,
+        }
+    }
+}
+
+impl BlockedStatus {
+    pub fn to_color32(self) -> egui::Color32 {
+        self.into()
+    }
+}

src/gui/debug.rs

@@ -0,0 +1,85 @@
+use crate::{
+    gui::{
+        app::{App, WINDOW_SIZE},
+        tools,
+    },
+    util::consts::{
+        APP_STORAGE_PATH,
+        game::{EXE_ENHANCED, EXE_LEGACY},
+    },
+};
+use eframe::egui;
+
+impl App {
+    pub fn show_debug_viewport(&mut self, ctx: &egui::Context) {
+        let main = ctx.input(|i| i.viewport().outer_rect.unwrap_or(egui::Rect::EVERYTHING));
+        let builder = egui::ViewportBuilder::default()
+            .with_title("GTA Tools Debug")
+            .with_minimize_button(false)
+            .with_maximize_button(false)
+            .with_inner_size(WINDOW_SIZE)
+            .with_position([main.right() - 12.0, main.min.y])
+            .with_icon(tools::load_icon());
+        ctx.show_viewport_immediate(
+            egui::ViewportId::from_hash_of("debug_viewport"),
+            builder,
+            |ctx, _class| {
+                if tools::debug_keycombo_pressed(ctx) {
+                    self.flags.debug = !self.flags.debug;
+                }
+                egui::CentralPanel::default().show(ctx, |ui| {
+                    egui::ScrollArea::both()
+                        .auto_shrink([false, true])
+                        .show(ui, |ui| {
+                            ui.collapsing("misc", |ui| {
+                                if ui.button("open storage path").clicked() {
+                                    open::that_detached(APP_STORAGE_PATH.as_path()).unwrap();
+                                }
+                                ui.checkbox(
+                                    &mut self.meta.newer_version_available,
+                                    "spoof new version available",
+                                )
+                                .on_hover_text("(this could already be checked if\nthere actually IS a new version)");
+                                ui.scope(|ui| {
+                                    use windows::Win32::UI::WindowsAndMessaging::{GetForegroundWindow, GetWindowTextW};
+                                    let mut buffer = [0; 512];
+                                    let current_title = unsafe {
+                                        let hwnd = GetForegroundWindow();
+                                        let length = GetWindowTextW(hwnd, &mut buffer);
+                                        String::from_utf16_lossy(&buffer[..length as usize])
+                                    };
+                                    ui.label(format!("focused: \"{current_title}\""));
+                                });
+                            });
+                            ui.collapsing("anti afk", |ui| {
+                                ui.label(format!(
+                                    "timer: {}",
+                                    self.anti_afk.interval.elapsed().as_secs()
+                                ));
+                                ui.label(format!(
+                                    "can activate: {}",
+                                    self.anti_afk.can_activate()
+                                ));
+                            });
+                            ui.collapsing("sysinfo", |ui| {
+                                if ui.button("refresh all").clicked() {
+                                    self.sysinfo.refresh_all();
+                                }
+                                let pid = self
+                                    .sysinfo
+                                    .processes()
+                                    .iter()
+                                    .find(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
+                                    .map_or_else(
+                                        || "no pid found!".to_owned(),
+                                        |(pid, _)| pid.as_u32().to_string(),
+                                    );
+                                ui.label(format!("gta pid: {pid}"));
+                            });
+                            ui.collapsing("app state", |ui| ui.label(format!("{self:#?}")));
+                        });
+                });
+            },
+        );
+    }
+}

src/gui/mod.rs

@@ -1,4 +1,6 @@
 mod app;
+mod colours;
+mod debug;
 pub mod run;
 pub mod settings;
 mod tools;

src/gui/run.rs

@@ -21,26 +21,36 @@ fn panic_hook(panic_info: &std::panic::PanicHookInfo<'_>) {
     file.write_all(message.as_bytes()).unwrap();
 }
 
-#[allow(clippy::unnecessary_wraps)]
 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 App early to modify some things before returning it
     let mut app = Box::<App>::default();
+    // load previously selected launch platform & settings from persistent state
     if let Some(persistent_state) = PersistentState::get() {
         app.launch.selected = persistent_state.launcher;
         app.settings = persistent_state.settings;
     }
+    // check if we're elevated. if not, and the user wants an elevated launch - relaunch elevated
     let elevated = util::win::is_elevated();
     if app.settings.start_elevated && !elevated {
         util::win::elevate(util::win::ElevationExitMethod::Forced);
     }
     app.flags.elevated = elevated;
+    // refresh sysinfo because it initializes with nothing
+    app.sysinfo.refresh_all();
+    // enable image loading support in egui
     egui_extras::install_image_loaders(&cc.egui_ctx);
+    // set our initial theme, from earlier loaded settings
+    catppuccin_egui::set_theme(&cc.egui_ctx, app.settings.theme.into());
+    // apply some global styling that we like
     cc.egui_ctx.style_mut(|style| {
         style.spacing.item_spacing = egui::vec2(4.0, 4.0);
         style.interaction.selectable_labels = false;
     });
+    // load any extra fonts that we need
     let mut fonts = egui::FontDefinitions::default();
     fonts.font_data.insert(
         "Ubuntu-Regular".to_owned(),
@@ -51,6 +61,7 @@ fn app_creator(
         vec!["Ubuntu-Regular".to_owned()],
     );
     cc.egui_ctx.set_fonts(fonts);
+    // finally return the App
     Ok(app)
 }
 

src/gui/settings.rs

@@ -1,13 +1,15 @@
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
-use strum::EnumIter;
+use strum::{Display, EnumIter};
 
-#[allow(clippy::enum_variant_names)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+#[derive(Clone, Copy, Debug, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
 pub enum Theme {
+    #[strum(to_string = "Catppuccin Latte")]
     CatppuccinLatte,
+    #[strum(to_string = "Catppuccin Frappe")]
     CatppuccinFrappe,
+    #[strum(to_string = "Catppuccin Macchiato")]
     CatppuccinMacchiato,
+    #[strum(to_string = "Catppuccin Mocha")]
     CatppuccinMocha,
 }
 
@@ -22,24 +24,6 @@ impl From<Theme> for catppuccin_egui::Theme {
     }
 }
 
-impl Display for Theme {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let x = match self {
-            Self::CatppuccinLatte => "Catppuccin Latte",
-            Self::CatppuccinFrappe => "Catppuccin Frappe",
-            Self::CatppuccinMacchiato => "Catppuccin Macchiato",
-            Self::CatppuccinMocha => "Catppuccin Mocha",
-        };
-        write!(f, "{x}")
-    }
-}
-
-impl Theme {
-    pub fn to_catppuccin(self) -> catppuccin_egui::Theme {
-        self.into()
-    }
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Settings {
     pub theme: Theme,

src/gui/tools.rs

@@ -21,24 +21,20 @@ pub fn header(ui: &mut egui::Ui, text: &str) {
     });
 }
 
-pub fn build_combo_box<E>(ui: &mut egui::Ui, current_value: &mut E, label: impl std::hash::Hash)
+pub fn build_menu<E>(ui: &mut egui::Ui, current_value: &mut E)
 where
     E: strum::IntoEnumIterator + std::fmt::Display + std::cmp::PartialEq + Copy,
 {
-    egui::ComboBox::from_id_salt(label)
-        .selected_text(current_value.to_string())
-        .show_ui(ui, |ui| {
-            E::iter().for_each(|v| {
-                ui.selectable_value(current_value, v, v.to_string());
-            });
+    E::iter().for_each(|variant| {
+        ui.selectable_value(current_value, variant, variant.to_string());
     });
 }
 
-pub fn check_debug_keycombo_pressed(ctx: &egui::Context) -> bool {
+pub fn debug_keycombo_pressed(ctx: &egui::Context) -> bool {
     ctx.input(|i| i.modifiers.all() && i.key_pressed(egui::Key::D))
 }
 
-pub fn check_debug_viewport_close_button_pressed(ctx: &egui::Context) -> bool {
+pub fn debug_viewport_close_pressed(ctx: &egui::Context) -> bool {
     ctx.input(|i| {
         i.raw
             .viewports

src/util/consts.rs

@@ -1,9 +1,10 @@
 use std::{path::PathBuf, sync::LazyLock};
 
-pub const ENHANCED: &str = "GTA5_Enhanced.exe";
-pub const LEGACY: &str = "GTA5.exe";
-
-pub const GTA_WINDOW_TITLE: &str = "Grand Theft Auto V";
-
 pub static APP_STORAGE_PATH: LazyLock<PathBuf> =
     LazyLock::new(|| dirs::config_local_dir().unwrap().join("GTA Tools"));
+
+pub mod game {
+    pub const EXE_ENHANCED: &str = "GTA5_Enhanced.exe";
+    pub const EXE_LEGACY: &str = "GTA5.exe";
+    pub const WINDOW_TITLE: &str = "Grand Theft Auto V";
+}

src/util/countdown.rs

@@ -2,11 +2,11 @@ use std::time::{Duration, Instant};
 
 #[derive(Debug)]
 pub struct Countdown {
-    pub i: u64,
-    pub i_original: u64,
+    i: u64,
+    i_original: u64,
     pub i_string: String,
-    pub interval: Instant,
-    pub first_count: bool,
+    interval: Instant,
+    first_count: bool,
 }
 
 impl Countdown {

src/util/mod.rs

@@ -1,4 +1,4 @@
-pub mod codeberg;
+mod codeberg;
 pub mod consts;
 pub mod countdown;
 pub mod meta;

src/util/win.rs

@@ -4,7 +4,7 @@ use windows::{
         Security::{GetTokenInformation, TOKEN_ELEVATION, TOKEN_QUERY, TokenElevation},
         System::Threading::{GetCurrentProcess, OpenProcessToken},
         UI::{
-            Input::KeyboardAndMouse::GetAsyncKeyState,
+            Input::KeyboardAndMouse::{GetAsyncKeyState, VIRTUAL_KEY},
             Shell::ShellExecuteW,
             WindowsAndMessaging::{
                 CURSOR_SHOWING, CURSORINFO, GetCursorInfo, GetForegroundWindow, GetWindowTextW,
@@ -31,7 +31,6 @@ pub fn is_cursor_visible() -> bool {
     ci.flags == CURSOR_SHOWING
 }
 
-#[allow(clippy::cast_sign_loss)]
 pub fn is_window_focused(target_title: &str) -> bool {
     let mut buffer = [0; 512];
     unsafe {
@@ -42,9 +41,9 @@ pub fn is_window_focused(target_title: &str) -> bool {
     }
 }
 
-pub fn is_any_key_pressed(keys: &[u8]) -> bool {
+pub fn is_any_key_pressed(keys: &[VIRTUAL_KEY]) -> bool {
     keys.iter()
-        .any(|&key| unsafe { (GetAsyncKeyState(i32::from(key)) & i16::MIN) != 0 })
+        .any(|&key| unsafe { (GetAsyncKeyState(i32::from(key.0)) & i16::MIN) != 0 })
 }
 
 pub fn elevate(closing: ElevationExitMethod) {