Preview 1.84.4

CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs

@@ -4,6 +4,7 @@
 using CollapseLauncher.RepairManagement;
 using Hi3Helper;
 using Hi3Helper.EncTool;
+using Hi3Helper.EncTool.Enc;
 using Hi3Helper.EncTool.Parser.KianaDispatch;
 using Hi3Helper.UABT;
 using System;
@@ -161,7 +162,7 @@ private IEnumerable<CacheAsset> EnumerateCacheTextAsset(CacheAssetType type, IEn
         {
             // Set isFirst flag as true if type is Data and
             // also convert type as lowered string.
-            bool isFirst = type == CacheAssetType.Data;
+            bool isFirst               = type == CacheAssetType.Data;
             bool isNeedReadLuckyNumber = type == CacheAssetType.Data;
 
             foreach (string line in enumerator)
@@ -178,9 +179,8 @@ private IEnumerable<CacheAsset> EnumerateCacheTextAsset(CacheAssetType type, IEn
                 }
 
                 // Get the lucky number if it does so 👀
-                if (isNeedReadLuckyNumber && int.TryParse(line, null, out int luckyNumber))
+                if (isNeedReadLuckyNumber && int.TryParse(line, null, out int _))
                 {
-                    LuckyNumber = luckyNumber;
                     isNeedReadLuckyNumber = false;
                     continue;
                 }
@@ -297,7 +297,7 @@ await Parallel.ForEachAsync(EnumerateCacheTextAsset(type, dataTextAsset.GetStrin
             return (count, size);
         }
 
-        private byte[] GetAssetIndexSalt(string data)
+        private static byte[] GetAssetIndexSalt(string data)
         {
             // Get the salt from the string and return as byte[]
             byte[] key;
@@ -314,8 +314,15 @@ private byte[] GetAssetIndexSalt(string data)
                 key = MetadataHelper.CurrentMasterKey?.Key;
             }
 
-            MhyEncTool saltTool = new(data, key);
-            return saltTool.GetSalt();
+            byte[] saltBytes = new byte[8];
+            if (!MhyEncTool.TryGetSalt(data,
+                                       key,
+                                       saltBytes,
+                                       out _,
+                                       out Exception exception))
+                throw exception;
+
+            return saltBytes;
         }
 
         private string GetAssetBasePathByType(CacheAssetType type) => Path.Combine(GamePath!, type == CacheAssetType.Data ? "Data" : "Resources");
@@ -328,7 +335,5 @@ private static bool IsValidRegionFile(string input, string lang)
                    input.Contains($"{CacheRegionalCheckName}_{lang}");
             // If none, then pass it as true (non-regional string)
         }
-
-        public KianaDispatch GetCurrentGateway() => GameGateway;
     }
 }

CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs

@@ -3,6 +3,7 @@
 using CollapseLauncher.Helper.Update;
 using CollapseLauncher.Plugins;
 using DiscordRPC;
+using DiscordRPC.Entities;
 using DiscordRPC.Message;
 using Hi3Helper;
 using System;
@@ -139,9 +140,9 @@ private void EnablePresence(ulong applicationId)
             Logger.LogWriteLine("Discord Presence is Enabled!");
         }
 
-        private void OnReady(object? _, ReadyMessage msg)
+        private void OnReady(object? sender, ReadyMessage? msg)
         {
-            Logger.LogWriteLine($"Connected to Discord with user {msg.User.Username}");
+            Logger.LogWriteLine($"Connected to Discord with user {msg?.User?.Username}");
             if (!_firstTimeConnect)
             {
                 // Restart Discord RPC client
@@ -161,9 +162,9 @@ private void OnReady(object? _, ReadyMessage msg)
             }
         }
 
-        private static void OnPresenceUpdate(object? _, PresenceMessage msg)
+        private static void OnPresenceUpdate(object? sender, PresenceMessage? msg)
         {
-            if (msg.Presence == null)
+            if (msg?.Presence == null)
             {
                 Logger.LogWriteLine("Activity cleared!");
             }

CollapseLauncher/Classes/EventsManagement/BackgroundActivityManager.cs

@@ -7,13 +7,11 @@
 using CollapseLauncher.Plugins;
 using Hi3Helper;
 using Hi3Helper.Data;
-using Hi3Helper.Shared.Region;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Numerics;
 
 // ReSharper disable StringLiteralTypo

CollapseLauncher/Classes/Extension/TaskExtensions.cs

@@ -205,19 +205,15 @@ internal static async Task InitPluginComAsync<T>(this T initializableInterface,
             throw new COMException($"Initialization for {nameof(T)} has failed with return code: {returnCode}", initTask.Exception);
         }
 
+        // ReSharper disable once InconsistentNaming
         private static readonly Guid IInitializableIid = new(ComInterfaceId.ExInitializable);
         private static IInitializableTask GetInitializableTask<T>(T instance)
             where T : class
         {
-            if (!ComMarshal<T>.TryCastComObjectAs(instance,
-                                                  in IInitializableIid,
-                                                  out IInitializableTask? initTask,
-                                                  out Exception? ex))
-            {
-                throw ex;
-            }
-
-            return initTask;
+            return !ComMarshal<T>.TryCastComObjectAs(instance,
+                                                      in IInitializableIid,
+                                                      out IInitializableTask? initTask,
+                                                      out Exception? ex) ? throw ex : initTask;
         }
 
         internal static async Task GetResultFromAction<T>(this Task<T> task, Action<T> getResultAction)

CollapseLauncher/Classes/Extension/UIElementExtensions.UnsafeAccessorExtensions.cs

@@ -15,7 +15,31 @@ public static partial class UIElementExtensions
         /// <param name="element">The <seealso cref="UIElement"/> member of an element</param>
         /// <param name="inputCursor">The cursor you want to set. Use <see cref="InputSystemCursor.Create"/> to choose the cursor you want to set.</param>
         [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "set_ProtectedCursor")]
-        internal static extern void SetCursor(this UIElement element, InputCursor inputCursor);
+        private static extern void SetCursorInner(this UIElement element, InputCursor inputCursor);
+
+        /// <summary>
+        /// Set the cursor for the element.
+        /// </summary>
+        /// <param name="element">The <seealso cref="UIElement"/> member of an element</param>
+        /// <param name="inputCursor">The cursor you want to set. Use <see cref="InputSystemCursor.Create"/> to choose the cursor you want to set.</param>
+        internal static T SetCursor<T>(this T element, InputCursor inputCursor)
+            where T : UIElement
+        {
+            element.SetCursorInner(inputCursor);
+            return element;
+        }
+
+        /// <summary>
+        /// Set the cursor for the element.
+        /// </summary>
+        /// <param name="element">The <seealso cref="UIElement"/> member of an element</param>
+        /// <param name="inputCursor">The cursor you want to set. Use <see cref="InputSystemCursor.Create"/> to choose the cursor you want to set.</param>
+        internal static T SetCursor<T>(this T element, InputSystemCursorShape inputCursor)
+            where T : UIElement
+        {
+            element.SetCursorInner(InputSystemCursor.Create(inputCursor));
+            return element;
+        }
 
         /// <summary>
         /// Set the cursor for the element.
@@ -28,6 +52,17 @@ internal static T WithCursor<T>(this T element, InputCursor inputCursor) where T
             return element;
         }
 
+        /// <summary>
+        /// Set the cursor for the element.
+        /// </summary>
+        /// <param name="element">The <seealso cref="UIElement"/> member of an element</param>
+        /// <param name="inputCursor">The cursor you want to set. Use <see cref="InputSystemCursor.Create"/> to choose the cursor you want to set.</param>
+        internal static T WithCursor<T>(this T element, InputSystemCursorShape inputCursor) where T : UIElement
+        {
+            element.SetCursor(inputCursor);
+            return element;
+        }
+
         [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposedFlags")]
         private static extern ref int GetObjectReferenceDisposeFlags(this IObjectReference obj);
 

CollapseLauncher/Classes/Extension/VelopackLocatorExtension.cs

@@ -5,9 +5,7 @@
 using Hi3Helper.SentryHelper;
 using Hi3Helper.Shared.Region;
 using Hi3Helper.Win32.ShellLinkCOM;
-using NuGet.Versioning;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -34,12 +32,8 @@ internal static void StartUpdaterHook(string aumid)
             // its custom AUMID
             IVelopackLogger? logger = ILoggerHelper.GetILogger("Velopack").ToVelopackLogger();
 
-            Process currentProcess = Process.GetCurrentProcess();
-
-            WindowsVelopackLocator locator =
-                new(currentProcess.MainModule!.FileName,
-                    (uint)currentProcess.Id,
-                    logger);
+            DefaultProcessImpl     procDefault = new(logger);
+            WindowsVelopackLocator locator     = new(procDefault, logger);
             // HACK: Always ensure to set the AUMID field null so it won't
             //       set the AUMID to its own.
             locator.GetLocatorAumidField() = null;
@@ -168,7 +162,7 @@ public static void TryCleanupFallbackUpdate(SemanticVersion newVersion)
 
                     // Try open the shortcut and check whether this shortcut is actually pointing to
                     // CollapseLauncher.exe file
-                    using ShellLink shellLink = new(thisUserStartMenuShortcut);
+                    ShellLink shellLink = new(thisUserStartMenuShortcut);
                     // Try to get the target path and its filename
                     string shortcutTargetPath = shellLink.Target;
                     if (!shortcutTargetPath.Equals(currentExecutedPath, StringComparison.OrdinalIgnoreCase))

CollapseLauncher/Classes/Extension/WriteableBitmapExtension.cs

@@ -1,6 +1,5 @@
 using Hi3Helper;
 using Hi3Helper.SentryHelper;
-using Hi3Helper.Win32.ManagedTools;
 using Hi3Helper.Win32.Native.Interfaces;
 using Hi3Helper.Win32.WinRT.IBufferCOM;
 using Microsoft.UI.Xaml.Media.Imaging;
@@ -9,29 +8,27 @@
 #pragma warning disable IDE0130
 
 #nullable enable
-namespace CollapseLauncher.Extension
+namespace CollapseLauncher.Extension;
+
+internal static class WriteableBitmapExtension
 {
-    internal static class WriteableBitmapExtension
+    internal static nint GetBufferPointer(this WriteableBitmap writeableBitmap, out uint length)
     {
-        internal static nint GetBufferPointer(this WriteableBitmap writeableBitmap, out uint length)
+        length = writeableBitmap.PixelBuffer.Length;
+        try
         {
-            length = writeableBitmap.PixelBuffer.Length;
             IBufferByteAccess byteAccess = writeableBitmap.PixelBuffer.AsBufferByteAccess();
-            try
-            {
-                byteAccess.Buffer(out nint bufferP);
-                return bufferP;
-            }
-            finally
-            {
-                if (!ComMarshal<IBufferByteAccess>.TryReleaseComObject(byteAccess, out Exception? ex))
-                {
-                    SentryHelper.ExceptionHandler(ex, SentryHelper.ExceptionType.UnhandledOther);
-                    Logger.LogWriteLine($"Cannot free the instance of IBufferByteAccess from WriteableBitmap\r\n{ex}",
-                                        LogType.Error,
-                                        true);
-                }
-            }
+            byteAccess.Buffer(out nint bufferP);
+            return bufferP;
+        }
+        catch (Exception ex)
+        {
+            SentryHelper.ExceptionHandler(ex, SentryHelper.ExceptionType.UnhandledOther);
+            Logger.LogWriteLine($"Cannot free the instance of IBufferByteAccess from WriteableBitmap\r\n{ex}",
+                                LogType.Error,
+                                true);
         }
+
+        return nint.Zero;
     }
 }

CollapseLauncher/Classes/FileDialog/FileDialogHelper.cs

@@ -22,7 +22,7 @@ internal static class FileDialogHelper
         /// <param name="title">The title of the folder dialog</param>
         /// <param name="checkOverride">Override path check and returns the actual string</param>
         /// <returns>If <seealso cref="string"/> is empty, then it's cancelled. Otherwise, returns a selected path</returns>
-        internal static async Task<string> GetRestrictedFolderPathDialog(string? title = null, Func<string, Task<string>>? checkOverride = null)
+        internal static async Task<string> GetRestrictedFolderPathDialog(string? title = null, Func<string, Task<string?>>? checkOverride = null)
         {
         StartGet:
             string dirPath = await FileDialogNative.GetFolderPicker(title);

CollapseLauncher/Classes/FileMigrationProcess/FileMigrationProcess.cs

@@ -94,18 +94,18 @@ private async Task<string> StartRoutineInner(FileMigrationProcessUIRef uiRef)
 
         private async Task<string> MoveFile(FileMigrationProcessUIRef uiRef)
         {
-            FileInfo inputPathInfo = new FileInfo(InputPath);
-            FileInfo outputPathInfo = new FileInfo(OutputPath);
+            FileInfo inputPathInfo  = new(InputPath);
+            FileInfo outputPathInfo = new(OutputPath);
 
-            var inputPathDir = FileDialogHelper.IsRootPath(InputPath)
+            string inputPathDir = FileDialogHelper.IsRootPath(InputPath)
                 ? Path.GetPathRoot(InputPath)
                 : Path.GetDirectoryName(inputPathInfo.FullName);
 
             if (string.IsNullOrEmpty(inputPathDir))
-                throw new InvalidOperationException(string.Format(Locale.Current.Lang?._Dialogs?.InvalidGameDirNewTitleFormat,
+                throw new InvalidOperationException(string.Format(Locale.Current.Lang?._Dialogs?.InvalidGameDirNewTitleFormat ?? "",
                                                                   InputPath));
 
-            DirectoryInfo outputPathDirInfo = new DirectoryInfo(inputPathDir);
+            DirectoryInfo outputPathDirInfo = new(inputPathDir);
             outputPathDirInfo.Create();
 
             // Update path display
@@ -129,8 +129,8 @@ private async Task<string> MoveFile(FileMigrationProcessUIRef uiRef)
 
         private async Task<string> MoveDirectory(FileMigrationProcessUIRef uiRef)
         {
-            DirectoryInfo inputPathInfo = new DirectoryInfo(InputPath);
-            DirectoryInfo outputPathInfo = new DirectoryInfo(OutputPath);
+            DirectoryInfo inputPathInfo  = new(InputPath);
+            DirectoryInfo outputPathInfo = new(OutputPath);
             outputPathInfo.Create();
 
             bool isMoveBackward = inputPathInfo.FullName.StartsWith(outputPathInfo.FullName, StringComparison.OrdinalIgnoreCase) &&
@@ -148,7 +148,7 @@ private async Task<string> MoveDirectory(FileMigrationProcessUIRef uiRef)
             // reduce massive seeking, hence improving speed.
             bool isBothSsd = DriveTypeChecker.IsDriveSsd(InputPath) &&
                              DriveTypeChecker.IsDriveSsd(OutputPath);
-            ParallelOptions parallelOptions = new ParallelOptions
+            ParallelOptions parallelOptions = new()
             {
                 CancellationToken = TokenSource?.Token ?? CancellationToken.None,
                 MaxDegreeOfParallelism = isBothSsd ? LauncherConfig.AppCurrentThread : 1
@@ -238,7 +238,7 @@ async ValueTask Impl(FileInfo inputFileInfo, CancellationToken cancellationToken
                 else
                 {
                     Logger.LogWriteLine($"[FileMigrationProcess::MoveDirectory()] Moving directory content across different drives from: {inputFileInfo.FullName} to {outputNewFilePath}", LogType.Default, true);
-                    FileInfo outputFileInfo = new FileInfo(outputNewFilePath);
+                    FileInfo outputFileInfo = new(outputNewFilePath);
                     await MoveWriteFile(uiRef, inputFileInfo, outputFileInfo, cancellationToken);
                 }
             }

CollapseLauncher/Classes/GameManagement/GameSettings/DummyGameSettings.cs

@@ -7,11 +7,6 @@ namespace CollapseLauncher.GameSettings;
 
 internal class DummyGameSettings : SettingsBase
 {
-    public DummyGameSettings()
-    {
-
-    }
-
     public override string GetLaunchArguments(GamePresetProperty property)
     {
         StringBuilder parameter = new(1024);

CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/Settings.cs

@@ -5,6 +5,8 @@
 using System.Drawing;
 using System.Text;
 // ReSharper disable IdentifierTypo
+// ReSharper disable GrammarMistakeInComment
+// ReSharper disable StringLiteralTypo
 
 namespace CollapseLauncher.GameSettings.Genshin
 {

CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/ScreenSettingData.cs

@@ -132,7 +132,7 @@ public static ScreenSettingData Load(IGameSettings gameSettings)
                     $"{ex}", ex));
             }
 
-            return new ScreenSettingData();
+            return new ScreenSettingData(gameSettings);
         }
 
         public override void Save()