up not done

Author: Coloryr

src/.editorconfig

@@ -81,6 +81,7 @@ csharp_space_around_binary_operators = before_and_after
 csharp_indent_labels = one_less_than_current
 csharp_prefer_system_threading_lock = true:suggestion
 csharp_prefer_static_anonymous_function = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 
 [*.vb]
 #### 命名样式 ####
@@ -147,4 +148,5 @@ dotnet_style_allow_multiple_blank_lines_experimental = true:silent
 dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
 tab_width = 4
 indent_size = 4
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_diagnostic.CA2208.severity = none

src/ColorMC.Core/ColorMC.Core.csproj

@@ -14,17 +14,10 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>embedded</DebugType>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\Language\core_en-us.json" />
-    <None Remove="Resources\Language\core_zh-cn.json" />
-    <None Remove="Resources\Language\en-us" />
-    <None Remove="Resources\Language\zh-cn" />
-  </ItemGroup>
-
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Language\core_zh-cn.json" />
-    <EmbeddedResource Include="Resources\Language\core_en-us.json" />
+    <Compile Remove="Resources\Language\**" />
+    <EmbeddedResource Remove="Resources\Language\**" />
+    <None Remove="Resources\Language\**" />
   </ItemGroup>
 
   <ItemGroup>

src/ColorMC.Core/Config/ConfigUtils.cs src/ColorMC.Core/Config/ConfigLoad.cssrc/ColorMC.Core/Config/ConfigUtils.cs renamed to src/ColorMC.Core/Config/ConfigLoad.cs

@@ -7,7 +7,7 @@ namespace ColorMC.Core.Config;
 /// <summary>
 /// 配置文件
 /// </summary>
-public static class ConfigUtils
+public static class ConfigLoad
 {
     /// <summary>
     /// 配置文件
@@ -36,8 +36,6 @@ internal static void Init()
     /// <returns>是否加载成功</returns>
     public static bool Load(string local, bool quit = false)
     {
-        Logs.Info(LanguageHelper.Get("Core.Info4"));
-
         using var data = PathHelper.OpenRead(local);
         ConfigObj? obj = null;
         if (data == null)
@@ -60,7 +58,7 @@ public static bool Load(string local, bool quit = false)
             }
             catch (Exception e)
             {
-                ColorMCCore.OnError(LanguageHelper.Get("Core.Error1"), e, true);
+                ColorMCCore.OnError(new ConfigLoadErrorEventArgs(e));
             }
         }
 
@@ -71,7 +69,6 @@ public static bool Load(string local, bool quit = false)
             {
                 return false;
             }
-            Logs.Warn(LanguageHelper.Get("Core.Info6"));
 
             Config = MakeDefaultConfig();
         }
@@ -95,8 +92,6 @@ public static bool Load(string local, bool quit = false)
             Config.Version = ColorMCCore.Version;
         }
 
-        LanguageHelper.Change(Config.Language);
-
         Save();
 
         return true;
@@ -107,7 +102,6 @@ public static bool Load(string local, bool quit = false)
     /// </summary>
     public static void Save()
     {
-        Logs.Info(LanguageHelper.Get("Core.Info5"));
         ConfigSave.AddItem(ConfigSaveObj.Build(Names.NameConfigFile, s_local, Config, JsonType.ConfigObj));
     }
 
@@ -116,7 +110,6 @@ public static void Save()
     /// </summary>
     public static void SaveNow()
     {
-        Logs.Info(LanguageHelper.Get("Core.Info5"));
         File.WriteAllText(s_local, JsonUtils.ToString(Config, JsonType.ConfigObj));
     }
 

src/ColorMC.Core/Config/ConfigSave.cs

@@ -96,7 +96,7 @@ private static void Save()
             }
             catch (Exception e)
             {
-                Logs.Error(LanguageHelper.Get("Core.Error2"), e);
+                ColorMCCore.OnError(new ConfigSaveErrorEventArgs(e));
             }
         }
     }

src/ColorMC.Core/CoreMain.cs

@@ -2,7 +2,6 @@
 using ColorMC.Core.Config;
 using ColorMC.Core.Downloader;
 using ColorMC.Core.Game;
-using ColorMC.Core.Helpers;
 using ColorMC.Core.LaunchPath;
 using ColorMC.Core.Net;
 using ColorMC.Core.Objs;
@@ -91,22 +90,6 @@ public static class ColorMCCore
     /// <param name="now">目前进度</param>
     public delegate void PackUpdate(int size, int now);
     /// <summary>
-    /// 下载器状态更新
-    /// </summary>
-    /// <param name="state">状态</param>
-    public delegate void DownloadUpdate(int thread, bool state, int count);
-    /// <summary>
-    /// 下载任务状态更新
-    /// </summary>
-    /// <param name="type">更新类型</param>
-    /// <param name="type">更新数据</param>
-    public delegate void DownloadTaskUpdate(UpdateType type, int data);
-    /// <summary>
-    /// 下载项目状态更新
-    /// </summary>
-    /// <param name="obj">项目</param>
-    public delegate void DownloadItemUpdate(int thread, FileItemObj obj);
-    /// <summary>
     /// 压缩包导入状态改变
     /// </summary>
     /// <param name="state">状态</param>
@@ -128,53 +111,45 @@ public static class ColorMCCore
     /// <summary>
     /// 显示下载窗口
     /// </summary>
-    public static Func<DownloadArg>? OnDownload { get; set; }
-
+    public static event Action<DownloadEventArgs>? Download;
     /// <summary>
     /// 错误显示回调
-    /// 标题 错误 关闭程序
     /// </summary>
-    public static event Action<string?, Exception?, bool>? Error;
+    public static event Action<CoreErrorEventArgs>? Error;
     /// <summary>
     /// 游戏日志回调
     /// </summary>
-    public static event Action<GameSettingObj, GameLogItemObj?>? GameLog;
-    /// <summary>
-    /// 语言重载
-    /// </summary>
-    public static event Action<LanguageType>? LanguageReload;
+    public static event Action<GameLogEventArgs>? GameLog;
     /// <summary>
     /// 游戏退出事件
     /// </summary>
-    public static event Action<GameSettingObj, LoginObj, int> GameExit;
-    /// <summary>
-    /// 游戏实例数量修改事件
-    /// </summary>
-    public static event Action? InstanceChange;
+    public static event Action<GameExitEventArgs> GameExit;
     /// <summary>
-    /// 游戏实例图标修改事件
+    /// 游戏实例事件
     /// </summary>
-    public static event Action<GameSettingObj>? InstanceIconChange;
+    public static event Action<InstanceChangeEventArgs>? InstanceChange;
     /// <summary>
     /// 是否为新运行
     /// </summary>
     public static bool NewStart { get; internal set; }
+
     /// <summary>
     /// 停止事件
     /// </summary>
     internal static event Action? Stop;
     /// <summary>
-    /// 游戏窗口句柄
-    /// </summary>
-    internal static readonly ConcurrentDictionary<string, GameHandel> Games = [];
-    /// <summary>
     /// 启动器核心参数
     /// </summary>
     internal static CoreInitArg CoreArg;
+
+    /// <summary>
+    /// 游戏窗口句柄
+    /// </summary>
+    private static readonly ConcurrentDictionary<string, GameHandel> s_games = [];
     /// <summary>
     /// 游戏日志
     /// </summary>
-    internal static readonly ConcurrentDictionary<string, GameRuntimeLog> GameLogs = [];
+    private static readonly ConcurrentDictionary<string, GameRuntimeLog> s_gameLogs = [];
 
     /// <summary>
     /// 初始化阶段1
@@ -184,21 +159,15 @@ public static void Init(CoreInitArg arg)
     {
         if (string.IsNullOrWhiteSpace(arg.Local))
         {
-            throw new Exception("Local is empty");
+            throw new ArgumentNullException(nameof(arg.Local));
         }
         CoreArg = arg;
 
         BaseDir = arg.Local;
         Directory.CreateDirectory(BaseDir);
 
-        LanguageHelper.Load(LanguageType.zh_cn);
-        Logs.Init();
-        ConfigUtils.Init();
+        ConfigLoad.Init();
         CoreHttpClient.Init();
-
-        Logs.Info(LanguageHelper.Get("Core.Info1"));
-        Logs.Info(SystemInfo.SystemName);
-        Logs.Info(SystemInfo.System);
     }
 
     /// <summary>
@@ -212,8 +181,6 @@ public static void Init1()
         AuthDatabase.Init();
         JvmPath.Init();
         MinecraftPath.Init(BaseDir);
-
-        Logs.Info(LanguageHelper.Get("Core.Info3"));
     }
 
     /// <summary>
@@ -230,7 +197,7 @@ public static void Close()
     /// <param name="uuid"></param>
     public static void KillGame(string uuid)
     {
-        if (Games.TryGetValue(uuid, out var handel))
+        if (s_games.TryGetValue(uuid, out var handel))
         {
             handel.Kill();
         }
@@ -239,13 +206,13 @@ public static void KillGame(string uuid)
     /// <summary>
     /// 启动器产生错误，并打开窗口显示
     /// </summary>
-    /// <param name="text"></param>
+    /// <param name="type"></param>
     /// <param name="e"></param>
     /// <param name="close"></param>
-    internal static void OnError(string text, Exception? e, bool close)
+    /// <param name="show"></param>
+    internal static void OnError(CoreErrorEventArgs args)
     {
-        Error?.Invoke(text, e, close);
-        Logs.Error(text, e);
+        Error?.Invoke(args);
     }
 
     /// <summary>
@@ -255,10 +222,10 @@ internal static void OnError(string text, Exception? e, bool close)
     /// <param name="text"></param>
     internal static void OnGameLog(GameSettingObj obj, string? text)
     {
-        if (GameLogs.TryGetValue(obj.UUID, out var log))
+        if (s_gameLogs.TryGetValue(obj.UUID, out var log))
         {
             var item = log.AddLog(text);
-            GameLog?.Invoke(obj, item);
+            GameLog?.Invoke(new GameLogEventArgs(obj, item));
         }
     }
 
@@ -268,25 +235,16 @@ internal static void OnGameLog(GameSettingObj obj, string? text)
     /// <param name="obj"></param>
     internal static void GameLogClear(GameSettingObj obj)
     {
-        if (GameLogs.TryGetValue(obj.UUID, out var log))
+        if (s_gameLogs.TryGetValue(obj.UUID, out var log))
         {
             log.Clear();
         }
         else
         {
-            GameLogs.TryAdd(obj.UUID, new());
+            s_gameLogs.TryAdd(obj.UUID, new());
         }
     }
 
-    /// <summary>
-    /// 语言重载
-    /// </summary>
-    /// <param name="type"></param>
-    internal static void OnLanguageReload(LanguageType type)
-    {
-        LanguageReload?.Invoke(type);
-    }
-
     /// <summary>
     /// 游戏退出
     /// </summary>
@@ -295,8 +253,8 @@ internal static void OnLanguageReload(LanguageType type)
     /// <param name="code"></param>
     public static void OnGameExit(GameSettingObj obj, LoginObj obj1, int code)
     {
-        Games.TryRemove(obj.UUID, out _);
-        GameExit?.Invoke(obj, obj1, code);
+        s_games.TryRemove(obj.UUID, out _);
+        GameExit?.Invoke(new GameExitEventArgs(obj, obj1, code));
     }
 
     /// <summary>
@@ -306,7 +264,7 @@ public static void OnGameExit(GameSettingObj obj, LoginObj obj1, int code)
     /// <returns>实例日志</returns>
     public static GameRuntimeLog? GetGameRuntimeLog(GameSettingObj obj)
     {
-        if (GameLogs.TryGetValue(obj.UUID, out var log))
+        if (s_gameLogs.TryGetValue(obj.UUID, out var log))
         {
             return log;
         }
@@ -321,9 +279,9 @@ public static void OnGameExit(GameSettingObj obj, LoginObj obj1, int code)
     /// <param name="handel"></param>
     internal static void AddGameHandel(string uuid, GameHandel handel)
     {
-        if (!Games.TryAdd(uuid, handel))
+        if (!s_games.TryAdd(uuid, handel))
         {
-            Games[uuid] = handel;
+            s_games[uuid] = handel;
         }
     }
 
@@ -332,7 +290,7 @@ internal static void AddGameHandel(string uuid, GameHandel handel)
     /// </summary>
     internal static void OnInstanceChange()
     {
-        InstanceChange?.Invoke();
+        InstanceChange?.Invoke(new InstanceChangeEventArgs(InstanceChangeType.NumberChange));
     }
 
     /// <summary>
@@ -341,6 +299,17 @@ internal static void OnInstanceChange()
     /// <param name="obj"></param>
     internal static void OnInstanceIconChange(GameSettingObj obj)
     {
-        InstanceIconChange?.Invoke(obj);
+        InstanceChange?.Invoke(new InstanceChangeEventArgs(InstanceChangeType.IconChange, obj));
+    }
+
+    /// <summary>
+    /// 获取下载窗口句柄
+    /// </summary>
+    /// <returns></returns>
+    internal static DownloadEventArgs OnDownloadGui()
+    {
+        var arg = new DownloadEventArgs();
+        Download?.Invoke(arg);
+        return arg;
     }
 }

src/ColorMC.Core/Downloader/DownloadItem.cs

@@ -0,0 +1,18 @@
+using ColorMC.Core.Objs;
+
+namespace ColorMC.Core.Downloader;
+
+/// <summary>
+/// 下载项目
+/// </summary>
+internal record DownloadItem
+{
+    /// <summary>
+    /// 下载任务
+    /// </summary>
+    public DownloadTask Task;
+    /// <summary>
+    /// 下载项目
+    /// </summary>
+    public FileItemObj File;
+}