Changes from tree/gui

.gitignore

@@ -451,5 +451,7 @@ $RECYCLE.BIN/
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json
-!.vscode/launch.json
 !.vscode/extensions.json
+
+## Additions
+Wauncher/Properties/launchSettings.json

Directory.Build.props

@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <AvaloniaVersion>11.1.0</AvaloniaVersion>
+  </PropertyGroup>
+</Project>

Launcher.sln

@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launch
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wauncher", "Wauncher\Wauncher.csproj", "{6F2F5730-8F26-498D-BB71-F0068EB6870B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,6 +19,10 @@ Global
 		{C52CA2D0-3034-4F68-A523-BD7AED0A7479}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C52CA2D0-3034-4F68-A523-BD7AED0A7479}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C52CA2D0-3034-4F68-A523-BD7AED0A7479}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F2F5730-8F26-498D-BB71-F0068EB6870B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F2F5730-8F26-498D-BB71-F0068EB6870B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F2F5730-8F26-498D-BB71-F0068EB6870B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F2F5730-8F26-498D-BB71-F0068EB6870B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Launcher/Launcher.csproj

@@ -19,12 +19,17 @@
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <ApplicationIcon>assets\Launcher.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="Assets\steamhappy.txt" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="assets\Launcher.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Assets\steamhappy.txt" />
   </ItemGroup>

Launcher/Utils/Argument.cs

@@ -11,7 +11,8 @@ public static class Argument
             "--patch-only",
             "--gc",
             "--disable-rpc",
-            "--install-dependencies"
+            "--install-dependencies",
+            "--protocol-command"
         };
 
         private static List<string> _additionalArguments = new();
@@ -39,7 +40,19 @@ public static List<string> GenerateGameArguments(bool passLauncherArguments = fa
             List<string> gameArguments = new();
 
             foreach (string arg in launcherArguments)
-                if ((passLauncherArguments || !_launcherArguments.Contains(arg.ToLowerInvariant()))
+                if (arg.StartsWith("cc://"))
+                {
+                    string protocolArgument = arg.Replace("cc://", "");
+                    string[] protocolArguments = protocolArgument.Split('/');
+                    switch (protocolArguments[0])
+                    {
+                        case "connect":
+                            gameArguments.Add("+" + protocolArguments[0]);
+                            gameArguments.Add(protocolArguments[1]);
+                            break;
+                    }
+                }
+                else if ((passLauncherArguments || !_launcherArguments.Contains(arg.ToLowerInvariant()))
                     && !arg.EndsWith(".exe"))
                     gameArguments.Add(arg.ToLowerInvariant());
 

Launcher/Utils/Console.cs

@@ -10,13 +10,26 @@ public static class ConsoleManager
         [DllImport("user32.dll")]
         private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
 
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern int MessageBox(IntPtr hWnd, string text, string caption, uint type);
+
         private const int SW_HIDE = 0;
+        private const uint MB_ICONERROR = 0x00000010;
 
         private static IntPtr ConsoleHandle = GetConsoleWindow();
 
         public static void HideConsole()
         {
             ShowWindow(ConsoleHandle, SW_HIDE);
         }
+
+        public static void ShowError(string message)
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                MessageBox(IntPtr.Zero, message, "ClassicCounter Error", MB_ICONERROR);
+            }
+        }
     }
 }
+

Launcher/Utils/Discord.cs

@@ -1,6 +1,7 @@
 using DiscordRPC;
 using DiscordRPC.Logging;
 using DiscordRPC.Message;
+using System;
 
 namespace Launcher.Utils
 {
@@ -10,6 +11,8 @@ public static class Discord
         private static DiscordRpcClient _client = new DiscordRpcClient(_appId);
         private static RichPresence _presence = new RichPresence();
         public static string? CurrentUserId { get; private set; } // ! DEPRECATED ! for whitelist check
+        public static string? CurrentUserAvatar { get; private set; }
+        public static string? CurrentUserUsername { get; private set; }
 
         public static void Init()
         {
@@ -58,9 +61,16 @@ public static void SetSmallArtwork(string? key)
         private static void OnReady(object sender, ReadyMessage e)
         {
             CurrentUserId = e.User.ID.ToString(); // ! DEPRECATED ! for passing current uid to api
+            CurrentUserAvatar = e.User.GetAvatarURL(User.AvatarFormat.PNG);
+            CurrentUserUsername = e.User.Username;
+            OnAvatarUpdate?.Invoke(CurrentUserAvatar);
+            OnUsernameUpdate?.Invoke(CurrentUserUsername);
 
             if (Debug.Enabled())
                 Terminal.Debug($"Discord RPC: User is ready => @{e.User.Username} ({e.User.ID})");
         }
+
+        public static event Action<string?>? OnAvatarUpdate;
+        public static event Action<string?>? OnUsernameUpdate;
     }
 }

Launcher/Utils/Game.cs

@@ -37,6 +37,7 @@ public static async Task<bool> Launch()
                 _listener.NewGameState += OnNewGameState;
                 _listener.Start();
 
+                try {
                 await File.WriteAllTextAsync(gameStatePath,
 @"""ClassicCounter""
 {
@@ -61,6 +62,11 @@ await File.WriteAllTextAsync(gameStatePath,
 	}
 }"
                 );
+                }
+                catch
+                {
+                    Terminal.Error($"(!) \"/csgo/cfg/gamestate_integration_cc.cfg\" not found in the current directory!");
+                }
             }
             else if (File.Exists(gameStatePath)) File.Delete(gameStatePath);
 
@@ -74,7 +80,15 @@ await File.WriteAllTextAsync(gameStatePath,
             _process.StartInfo.FileName = $"{directory}\\{gameExe}";
             _process.StartInfo.Arguments = string.Join(" ", arguments);
 
+            if (!File.Exists(_process.StartInfo.FileName))
+            {
+                Terminal.Error($"(!) {gameExe} not found in the current directory!");
+                ConsoleManager.ShowError($"{gameExe} not found in the current directory!\n\nPlease make sure the launcher and game files are in the same folder.");
+                return false;
+            }
+
             return _process.Start();
+
         }
 
         public static async Task Monitor()

Launcher/Utils/Patch.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Collections.Concurrent;
 using System.Security.Cryptography;
 
 namespace Launcher.Utils
@@ -152,23 +153,31 @@ public static async Task<Patches> ValidatePatches(bool validateAll = false)
                         needPak01Update = true;
                     }
 
-                    if (needPak01Update)
+                    if (!needPak01Update)
                     {
                         patches.Remove(dirPatch);
                     }
                 }
 
-                foreach (Patch patch in patches)
+                var concurrentMissing = new ConcurrentBag<Patch>();
+                var concurrentOutdated = new ConcurrentBag<Patch>();
+
+                var parallelOptions = new ParallelOptions
+                {
+                    MaxDegreeOfParallelism = 4
+                };
+
+                await Parallel.ForEachAsync(patches, parallelOptions, async (patch, cancellationToken) =>
                 {
                     string originalFileName = GetOriginalFileName(patch.File);
 
                     // skip dir file (we already checked it)
                     if (originalFileName.Contains("pak01_dir.vpk"))
-                        continue;
+                        return;
 
                     // are you a pak01 file?
                     bool isPak01File = originalFileName.Contains("pak01_");
-                    string path = $"{Directory.GetCurrentDirectory()}/{originalFileName}";
+                    string path = Path.Combine(Directory.GetCurrentDirectory(), originalFileName);
 
                     if (isPak01File && !needPak01Update && !Argument.Exists("--validate-all"))
                     {
@@ -177,23 +186,23 @@ public static async Task<Patches> ValidatePatches(bool validateAll = false)
                             if (Debug.Enabled())
                                 Terminal.Debug($"Missing: {originalFileName}");
 
-                            missing.Add(patch);
-                            continue;
+                            concurrentMissing.Add(patch);
+                            return;
                         }
 
                         if (Debug.Enabled())
                             Terminal.Debug($"Skipping hash check for: {originalFileName} (pak01_dir.vpk up to date)");
 
-                        continue;
+                        return;
                     }
 
                     if (!File.Exists(path))
                     {
                         if (Debug.Enabled())
                             Terminal.Debug($"Missing: {originalFileName}");
 
-                        missing.Add(patch);
-                        continue;
+                        concurrentMissing.Add(patch);
+                        return;
                     }
 
                     if (Debug.Enabled())
@@ -206,9 +215,12 @@ public static async Task<Patches> ValidatePatches(bool validateAll = false)
                             Terminal.Debug($"Outdated: {originalFileName}");
 
                         File.Delete(path);
-                        outdated.Add(patch);
+                        concurrentOutdated.Add(patch);
                     }
-                }
+                });
+
+                missing.AddRange(concurrentMissing);
+                outdated.AddRange(concurrentOutdated);
 
                 // if pak01_dir.vpk needs update, move it to end of lists
                 if (needPak01Update && dirPatch != null)

Wauncher/App.axaml

@@ -0,0 +1,32 @@
+<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"
+             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>
+
+    <Application.Styles>
+        <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>

Wauncher/App.axaml.cs

@@ -0,0 +1,75 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Data.Core.Plugins;
+using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.Input;
+using Launcher.Utils;
+using Wauncher.Utils;
+using Wauncher.ViewModels;
+using Wauncher.Views;
+
+namespace Wauncher
+{
+    public partial class App : Application
+    {
+        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();
+                desktop.MainWindow = new MainWindow
+                {
+                    DataContext = new MainWindowViewModel(),
+                };
+            }
+
+            base.OnFrameworkInitializationCompleted();
+        }
+
+        private void DisableAvaloniaDataAnnotationValidation()
+        {
+            // Get an array of plugins to remove
+            var dataValidationPluginsToRemove =
+                BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
+
+            // remove each entry found
+            foreach (var plugin in dataValidationPluginsToRemove)
+            {
+                BindingPlugins.DataValidators.Remove(plugin);
+            }
+        }
+
+
+        [RelayCommand]
+        public void TrayIconClicked()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop && desktop.MainWindow != null)
+            {
+                desktop.MainWindow.Show();
+                desktop.MainWindow.Activate();
+            }
+        }
+
+        public void ExitApplication_Click(object? sender, System.EventArgs e)
+        {
+            switch (ApplicationLifetime)
+            {
+                case IClassicDesktopStyleApplicationLifetime desktopLifetime:
+                    desktopLifetime.TryShutdown();
+                    break;
+                case IControlledApplicationLifetime controlledLifetime:
+                    controlledLifetime.Shutdown();
+                    break;
+            }
+        }
+    }
+}