Fix launcher errors causing exception thrown, add another method of finding Steam path

README.md

@@ -1,9 +1,9 @@
 <p align="center">
- <h2 align="center">ClassicCounter Launcher</h2>
+ <h2 align="center">ClassicCounter Wauncher</h2>
  <p align="center">
-   Launcher for ClassicCounter with Discord RPC, Auto-Updates and More!
+   Wauncher for ClassicCounter with Discord RPC, a Server List, Friends List, Auto-Updates and More!
    <br/>
-   Written in C# using .NET 8.
+   Written in C# using .NET 8 and Avalonia.
  </p>
 </p>
 
@@ -13,29 +13,39 @@
 [![MIT License][license-shield]][license-url]
 
 > [!IMPORTANT]
-> .NET Runtime 8 is required to run the launcher. Download it from [**here**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.11-windows-x64-installer).
+> .NET Runtime 8 is required to run the Wauncher. Download it from [**here**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.11-windows-x64-installer).
 
-## Arguments
-- `--debug-mode` - Enables debug mode, prints additional info.
-- `--disable-rpc` - Disables Discord RPC.
-- `--gc` - Launches the Game with custom Game Coordinator.
-- `--install-dependencies` - Launches setup process for required Game dependencies.
-- `--patch-only` - Will only check for patches, won't open the game.
-- `--skip-updates` - Skips checking for launcher updates.
-- `--skip-validating` - Skips validating patches.
-- `--validate-all` - Validates all game files.
+> [!IMPORTANT]
+> Wauncher is still a work in progress. Some features are unfinished and you may run into bugs or changes between builds.
+
+## Settings
+- `Minimize to System Tray` keeps the launcher running in the background when in-game.
+- `Skip Updates` lets you launch the game even when Wauncher detects available updates.
+- `Discord RPC` controls whether Wauncher updates your Discord presence. In some cases, Discord may still show "Counter-Strike: Global Offensive" even when RPC is disabled.
+- `Launch Options` lets you pass extra game launch flags such as `-high` or `+fps_max 300`.
+- `Verify Game Files` checks your installation and repairs any missing or damaged game files automatically.
 
-> [!CAUTION]
-> **Using `--skip-updates` or `--skip-validating` is NOT recommended!**  
-> **An outdated launcher or patches might cause issues.**
+## Build / Publish
+- Build: `dotnet build Wauncher/Wauncher.csproj -c Release`
+- Publish: `dotnet publish Wauncher/Wauncher.csproj -c Release -r win-x64 --self-contained false`
+- Quick publish script: `publish.bat` (builds + hashes + optional copy target)
 
 ## Packages Used
+- [AsyncImageLoader.Avalonia](https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia) by [AvaloniaUtils](https://github.com/AvaloniaUtils)
+- [Avalonia](https://github.com/AvaloniaUI/Avalonia) by [AvaloniaUI](https://github.com/AvaloniaUI)
+- [Avalonia.Desktop](https://github.com/AvaloniaUI/Avalonia) by [AvaloniaUI](https://github.com/AvaloniaUI)
+- [Avalonia.Themes.Fluent](https://github.com/AvaloniaUI/Avalonia) by [AvaloniaUI](https://github.com/AvaloniaUI)
+- [Avalonia.Fonts.Inter](https://github.com/AvaloniaUI/Avalonia) by [AvaloniaUI](https://github.com/AvaloniaUI)
+- [Avalonia.Diagnostics](https://github.com/AvaloniaUI/Avalonia) by [AvaloniaUI](https://github.com/AvaloniaUI)
+- [CommunityToolkit.Mvvm](https://github.com/CommunityToolkit/dotnet) by [CommunityToolkit](https://github.com/CommunityToolkit)
 - [CSGSI](https://github.com/rakijah/CSGSI) by [rakijah](https://github.com/rakijah)
 - [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) by [Lachee](https://github.com/Lachee)
 - [Downloader](https://github.com/bezzad/Downloader) by [bezzad](https://github.com/bezzad)
 - [Gameloop.Vdf](https://github.com/shravan2x/Gameloop.Vdf) by [shravan2x](https://github.com/shravan2x)
 - [Refit](https://github.com/reactiveui/refit) by [ReactiveUI](https://github.com/reactiveui)
+- [Refit.Newtonsoft.Json](https://github.com/reactiveui/refit) by [ReactiveUI](https://github.com/reactiveui)
 - [Spectre.Console](https://github.com/spectreconsole/spectre.console) by [Spectre Console](https://github.com/spectreconsole)
+- [Svg.Controls.Skia.Avalonia](https://github.com/wieslawsoltes/Svg.Skia) by [wieslawsoltes](https://github.com/wieslawsoltes)
 
 [downloads-shield]: https://img.shields.io/github/downloads/classiccounter/launcher/total.svg?style=for-the-badge
 [downloads-url]: https://github.com/classiccounter/launcher/releases/latest

Wauncher/App.axaml

@@ -1,32 +1,48 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="Wauncher.App"
-			 x:CompileBindings="True"
-			 x:DataType="local:App"
+             x:CompileBindings="True"
+             x:DataType="local:App"
              xmlns:local="using:Wauncher"
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
-
-    <Application.DataTemplates>
-        <local:ViewLocator/>
-    </Application.DataTemplates>
-  
+             xmlns:themes="using:Avalonia.Styling"
+             xmlns:fluent="using:Avalonia.Themes.Fluent">
+
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
     <Application.Styles>
-        <FluentTheme />
-		<StyleInclude Source="/Assets/Styles.axaml"/>
+        <FluentTheme>
+            <FluentTheme.Palettes>
+                <fluent:ColorPaletteResources x:Key="Light" Accent="#22C55E" />
+                <fluent:ColorPaletteResources x:Key="Dark" Accent="#22C55E" />
+            </FluentTheme.Palettes>
+        </FluentTheme>
+        <StyleInclude Source="/Assets/Styles.axaml"/>
     </Application.Styles>
-
-	<TrayIcon.Icons>
-		<TrayIcons>
-			<TrayIcon Icon="/Assets/Wauncher.ico" ToolTipText="Wauncher" Command="{Binding TrayIconClickedCommand}">
-				<TrayIcon.Menu>
-					<NativeMenu>
-						<NativeMenuItem Header="Discord RPC is running" IsEnabled="False"/>
-						<NativeMenuItemSeparator />
-						<NativeMenuItem Header="E_xit" Click="ExitApplication_Click"/>
-					</NativeMenu>
-				</TrayIcon.Menu>
-			</TrayIcon>
-		</TrayIcons>
-	</TrayIcon.Icons>
-</Application>
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <SolidColorBrush x:Key="AppTitleBarBrush">#CC3A3A3A</SolidColorBrush>
+            <SolidColorBrush x:Key="AppPrimaryText">White</SolidColorBrush>
+            <SolidColorBrush x:Key="AppMutedText">#88FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppSectionLabel">#55FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppBodyText">#CCFFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppBulletText">#AAFFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppDivider">#22FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppDivider2">#33FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppInputBg">#33FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppServerHover">#22FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppServerPressed">#11FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppIconBtnBg">#44FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppIconBtnHover">#99FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppIconBtnPressed">#33FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppIconBtnBorder">#22FFFFFF</SolidColorBrush>
+            <SolidColorBrush x:Key="AppRightPanelBg">#223A3A3A</SolidColorBrush>
+            <SolidColorBrush x:Key="AppServerListBg">#FF3A3A3A</SolidColorBrush>
+            <SolidColorBrush x:Key="AppGreetingName">White</SolidColorBrush>
+            <SolidColorBrush x:Key="AppLinkText">#6CB5F5</SolidColorBrush>
+        </ResourceDictionary>
+    </Application.Resources>
+
+</Application>

Wauncher/App.axaml.cs

@@ -1,75 +1,207 @@
-using Avalonia;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using CommunityToolkit.Mvvm.Input;
-using Launcher.Utils;
 using Wauncher.Utils;
+using System.Diagnostics;
 using Wauncher.ViewModels;
 using Wauncher.Views;
 
 namespace Wauncher
 {
     public partial class App : Application
     {
+        private TrayIcon? _trayIcon = null;
+        private NativeMenuItem? _discordRpcMenuItem = null;
+
         public override void Initialize()
         {
             AvaloniaXamlLoader.Load(this);
-            Discord.Init();
             ProtocolManager.RegisterURIHandler();
         }
 
         public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-                // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-                DisableAvaloniaDataAnnotationValidation();
+                DisableAvaloniaDataAnnotationValidation();
+
+                if (!Steam.IsInstalled())
+                {
+                    ConsoleManager.ShowError(
+                        "Steam is required to use Wauncher.\n\nPlease install Steam and relaunch.");
+                    Environment.Exit(1);
+                    return;
+                }
+
+                if (!IsSteamRunning())
+                {
+                    ConsoleManager.ShowError(
+                        "Steam must be open before using Wauncher.\n\nPlease open Steam, then relaunch Wauncher.");
+                    Environment.Exit(2);
+                    return;
+                }
+
+                if (Game.IsRunning())
+                {
+                    ConsoleManager.ShowError(
+                        "ClassicCounter is already running.\n\nPlease close the game before opening Wauncher again.");
+                    Environment.Exit(3);
+                    return;
+                }
+
+                bool hasRecentSteamUser = Steam.GetRecentLoggedInSteamID(false).GetAwaiter().GetResult();
+                if (!hasRecentSteamUser)
+                {
+                    ConsoleManager.ShowError(
+                        "Steam is open, but no logged-in Steam account was detected.\n\nPlease sign in to Steam and relaunch Wauncher.");
+                    Environment.Exit(4);
+                    return;
+                }
+
+                // Always init so Discord username/avatar callbacks fire for the greeting.
+                // Presence is only pushed via Update() when RPC is enabled.
+                try
+                {
+                    if (DependencyChecks.IsDiscordInstalled())
+                        Discord.Init();
+                }
+                catch
+                {
+                    // Discord integration is optional.
+                }
+
                 desktop.MainWindow = new MainWindow
                 {
                     DataContext = new MainWindowViewModel(),
                 };
+                desktop.Exit += (_, _) => _trayIcon?.Dispose();
             }
 
+            SetupTrayIcon();
             base.OnFrameworkInitializationCompleted();
         }
 
-        private void DisableAvaloniaDataAnnotationValidation()
+        private static bool IsSteamRunning()
         {
-            // Get an array of plugins to remove
-            var dataValidationPluginsToRemove =
-                BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-            // remove each entry found
-            foreach (var plugin in dataValidationPluginsToRemove)
+            try
             {
-                BindingPlugins.DataValidators.Remove(plugin);
+                return Process.GetProcessesByName("steam").Length > 0;
+            }
+            catch
+            {
+                return false;
             }
         }
 
+        private void SetupTrayIcon()
+        {
+            var settings = SettingsWindowViewModel.LoadGlobal();
 
-        [RelayCommand]
-        public void TrayIconClicked()
+            _discordRpcMenuItem = new NativeMenuItem
+            {
+                Header = settings.DiscordRpc ? "Discord RPC ON" : "Discord RPC OFF"
+            };
+            _discordRpcMenuItem.Click += DiscordRpc_Click;
+
+            var exitItem = new NativeMenuItem { Header = "Exit" };
+            exitItem.Click += (_, _) =>
+            {
+                if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime d)
+                {
+                    if (d.MainWindow is Views.MainWindow mw)
+                        mw.ForceQuit();
+                    d.TryShutdown();
+                }
+            };
+
+            var menu = new NativeMenu();
+            menu.Items.Add(_discordRpcMenuItem);
+            menu.Items.Add(new NativeMenuItemSeparator());
+            menu.Items.Add(exitItem);
+
+            _trayIcon = new TrayIcon
+            {
+                ToolTipText = "ClassicCounter",
+                Menu = menu,
+            };
+
+            try
+            {
+                var uri = new Uri("avares://Wauncher/Assets/Wauncher.ico");
+                using var stream = AssetLoader.Open(uri);
+                _trayIcon.Icon = new WindowIcon(stream);
+            }
+            catch { }
+
+            _trayIcon.Clicked += (_, _) => ShowMainWindow();
+
+            // Live sync
+            SettingsWindowViewModel.DiscordRpcChanged += enabled => ApplyDiscordRpc(enabled);
+        }
+
+        private void ShowMainWindow()
         {
-            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop && desktop.MainWindow != null)
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop
+                && desktop.MainWindow != null)
             {
                 desktop.MainWindow.Show();
+                desktop.MainWindow.WindowState = Avalonia.Controls.WindowState.Normal;
                 desktop.MainWindow.Activate();
             }
         }
 
-        public void ExitApplication_Click(object? sender, System.EventArgs e)
+        public void DiscordRpc_Click(object? sender, EventArgs e)
+        {
+            var settings = SettingsWindowViewModel.LoadGlobal();
+            settings.DiscordRpc = !settings.DiscordRpc; // auto-saves via OnDiscordRpcChanged
+            ApplyDiscordRpc(settings.DiscordRpc);
+        }
+
+        private void ApplyDiscordRpc(bool enabled)
         {
-            switch (ApplicationLifetime)
+            if (!DependencyChecks.IsDiscordInstalled())
             {
-                case IClassicDesktopStyleApplicationLifetime desktopLifetime:
-                    desktopLifetime.TryShutdown();
-                    break;
-                case IControlledApplicationLifetime controlledLifetime:
-                    controlledLifetime.Shutdown();
-                    break;
+                if (_discordRpcMenuItem != null)
+                    _discordRpcMenuItem.Header = "Discord RPC (Discord not installed)";
+                return;
             }
+
+            if (enabled)
+            {
+                Discord.SetDetails("In Main Menu");
+                Discord.SetState(null);
+                Discord.Update();
+            }
+            else
+            {
+                Discord.Deinitialize();
+            }
+
+            if (_discordRpcMenuItem != null)
+                _discordRpcMenuItem.Header = enabled ? "Discord RPC ON" : "Discord RPC OFF";
+        }
+
+        [RelayCommand]
+        public void TrayIconClicked() => ShowMainWindow();
+
+        public void ExitApplication_Click(object? sender, EventArgs e)
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime d)
+                d.TryShutdown();
+        }
+
+        private void DisableAvaloniaDataAnnotationValidation()
+        {
+            var toRemove = BindingPlugins.DataValidators
+                .OfType<DataAnnotationsValidationPlugin>().ToArray();
+            foreach (var plugin in toRemove)
+                BindingPlugins.DataValidators.Remove(plugin);
         }
     }
-}
+}
+