not done

Author: Coloryr

docs/Core.md

@@ -164,7 +164,7 @@ var game = await InstancesPath.CreateGame(new()
 //上一步登录的账户
 var auth = AuthDatabase.Auths.First().Value;
 //启动游戏
-var handel = await game.StartGameAsync(new()
+var handle = await game.StartGameAsync(new()
 {
     Auth = auth
 }, CancellationToken.None);

nuget/Avalonia.HtmlRenderer.11.3.9.nupkg

@@ -2,7 +2,7 @@
 using ColorMC.Core.Config;
 using ColorMC.Core.Downloader;
 using ColorMC.Core.Game;
-using ColorMC.Core.GuiHandel;
+using ColorMC.Core.GuiHandle;
 using ColorMC.Core.LaunchPath;
 using ColorMC.Core.Net;
 using ColorMC.Core.Objs;
@@ -64,7 +64,7 @@ public static class ColorMCCore
     /// <summary>
     /// 游戏窗口句柄
     /// </summary>
-    private static readonly ConcurrentDictionary<string, GameHandel> s_games = [];
+    private static readonly ConcurrentDictionary<string, GameHandle> s_games = [];
     /// <summary>
     /// 游戏日志
     /// </summary>
@@ -221,7 +221,7 @@ public static void OnGameExit(GameSettingObj obj, LoginObj obj1, int code)
     /// </summary>
     /// <param name="uuid"></param>
     /// <param name="handel"></param>
-    internal static void AddGameHandel(string uuid, GameHandel handel)
+    internal static void AddGameHandel(string uuid, GameHandle handel)
     {
         if (!s_games.TryAdd(uuid, handel))
         {
@@ -250,13 +250,13 @@ internal static void OnInstanceIconChange(GameSettingObj obj)
     /// 获取下载窗口句柄
     /// </summary>
     /// <returns></returns>
-    internal static IDownloadGuiHandel? OnDownloadGui()
+    internal static IDownloadGui? OnDownloadGui()
     {
         var arg = new DownloadEventArgs
         {
             Thread = ConfigLoad.Config.Http.DownloadThread
         };
         Download?.Invoke(arg);
-        return arg.GuiHandel;
+        return arg.GuiHandle;
     }
 }

src/ColorMC.Core/CoreMain.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using ColorMC.Core.Config;
-using ColorMC.Core.GuiHandel;
+using ColorMC.Core.GuiHandle;
 using ColorMC.Core.Objs;
 
 namespace ColorMC.Core.Downloader;
@@ -108,22 +108,22 @@ public static void Resume()
     /// </summary>
     /// <param name="list">下载列表</param>
     /// <returns>是否成功</returns>
-    public static async Task<bool> StartAsync(ICollection<FileItemObj> list)
+    public static async Task<bool> StartAsync(ICollection<FileItemObj> list, IProgressGui? gui = null)
     {
         if (s_stop)
         {
             return false;
         }
         var arg = ColorMCCore.OnDownloadGui();
 
-        return await StartAsync(list, arg);
+        return await StartAsync(list, arg, gui);
     }
 
     /// <summary>
     /// 进行下一个任务
     /// </summary>
     /// <param name="arg">下载参数</param>
-    internal static void TaskDone(IDownloadGuiHandel? arg, DownloadTask task)
+    internal static void TaskDone(IDownloadGui? arg, DownloadTask task)
     {
         s_tasks.Remove(task);
 
@@ -145,11 +145,11 @@ internal static void TaskDone(IDownloadGuiHandel? arg, DownloadTask task)
     /// 开始下载
     /// </summary>
     /// <param name="list">下载列表</param>
-    /// <param name="arg">下载参数</param>
+    /// <param name="gui">下载参数</param>
     /// <returns>是否完成</returns>
-    private static Task<bool> StartAsync(ICollection<FileItemObj> list, IDownloadGuiHandel? arg)
+    private static Task<bool> StartAsync(ICollection<FileItemObj> list, IDownloadGui? gui, IProgressGui? pgui)
     {
-        var task = new DownloadTask(arg);
+        var task = new DownloadTask(gui, pgui);
         s_tasks.Add(task);
 
         var names = new List<string>();
@@ -172,7 +172,7 @@ private static Task<bool> StartAsync(ICollection<FileItemObj> list, IDownloadGui
 
         Start();
 
-        arg?.Update(s_threads.Count, true, s_tasks.Count);
+        gui?.Update(s_threads.Count, true, s_tasks.Count);
 
         return task.WaitDone();
     }

src/ColorMC.Core/Downloader/DownloadManager.cs

@@ -1,13 +1,13 @@
-using ColorMC.Core.GuiHandel;
+using ColorMC.Core.GuiHandle;
 using ColorMC.Core.Objs;
 
 namespace ColorMC.Core.Downloader;
 
 /// <remarks>
 /// 下载任务
 /// </remarks>
-/// <param name="arg">GUI下载参数</param>
-internal class DownloadTask(IDownloadGuiHandel? arg)
+/// <param name="gui">GUI下载参数</param>
+internal class DownloadTask(IDownloadGui? gui, IProgressGui? pgui)
 {
     /// <summary>
     /// 任务是否已经取消
@@ -44,7 +44,7 @@ internal class DownloadTask(IDownloadGuiHandel? arg)
     public void SetSize(int size)
     {
         _allSize = size;
-        arg?.UpdateTask(UpdateType.AddItems, _allSize);
+        gui?.UpdateTask(UpdateType.AddItems, _allSize);
     }
 
     /// <summary>
@@ -74,7 +74,7 @@ public void Cancel()
         _cancel.Cancel();
         _semaphore.Release();
 
-        DownloadManager.TaskDone(arg, this);
+        DownloadManager.TaskDone(gui, this);
     }
 
     /// <summary>
@@ -83,7 +83,8 @@ public void Cancel()
     public void Done()
     {
         _doneSize++;
-        arg?.UpdateTask(UpdateType.ItemDone, 1);
+        gui?.UpdateTask(UpdateType.ItemDone, 1);
+        pgui?.SetNowProcess(_doneSize + _errorSize, _allSize);
 
         ItemDone();
     }
@@ -94,7 +95,8 @@ public void Done()
     public void Error()
     {
         _errorSize++;
-        arg?.UpdateTask(UpdateType.ItemDone, 1);
+        gui?.UpdateTask(UpdateType.ItemDone, 1);
+        pgui?.SetNowProcess(_doneSize + _errorSize, _allSize);
 
         ItemDone();
     }
@@ -108,7 +110,7 @@ private void ItemDone()
         {
             //任务结束
             _semaphore.Release();
-            DownloadManager.TaskDone(arg, this);
+            DownloadManager.TaskDone(gui, this);
         }
     }
 
@@ -119,6 +121,6 @@ private void ItemDone()
     /// <param name="obj">下载文件</param>
     public void UpdateItem(int index, FileItemObj obj)
     {
-        arg?.UpdateItem(index, obj);
+        gui?.UpdateItem(index, obj);
     }
 }

src/ColorMC.Core/Downloader/DownloadTask.cs

@@ -1,4 +1,4 @@
-using ColorMC.Core.GuiHandel;
+using ColorMC.Core.GuiHandle;
 using ColorMC.Core.Net.Apis;
 using ColorMC.Core.Net.Login;
 using ColorMC.Core.Objs;

src/ColorMC.Core/Game/GameAuth.cs

@@ -9,7 +9,7 @@ namespace ColorMC.Core.Game;
 /// <summary>
 /// 游戏句柄
 /// </summary>
-public class GameHandel
+public class GameHandle
 {
     /// <summary>
     /// 游戏进程
@@ -26,7 +26,7 @@ public class GameHandel
     /// <summary>
     /// 游戏实例主窗口句柄
     /// </summary>
-    public IntPtr Handel => Process.MainWindowHandle;
+    public IntPtr Handle => Process.MainWindowHandle;
     /// <summary>
     /// 是否为管理员启动，且无法获取句柄
     /// </summary>
@@ -38,7 +38,7 @@ public class GameHandel
     /// 游戏句柄
     /// </summary>
     /// <param name="run">游戏运行参数</param>
-    public GameHandel(GameRunObj run)
+    public GameHandle(GameRunObj run)
     {
         _game = run.Obj;
 

src/ColorMC.Core/Game/GameHandel.cs src/ColorMC.Core/Game/GameHandle.cssrc/ColorMC.Core/Game/GameHandel.cs renamed to src/ColorMC.Core/Game/GameHandle.cs

@@ -220,7 +220,7 @@ private static async Task<string> FindJavaAsync(GameSettingObj obj, GameLaunchAr
             list1?.ForEach(item => JvmPath.AddItem(item.Type + "_" + item.Version, item.Path));
         }
 
-        JavaInfo? jvm = null;
+        JavaInfoObj? jvm = null;
         if (!string.IsNullOrWhiteSpace(obj.JvmName))
         {
             jvm = JvmPath.GetInfo(obj.JvmName);
@@ -466,12 +466,12 @@ public static async Task<Dictionary<GameSettingObj, GameLaunchRes>>
             //启动进程
             var stopwatch = new Stopwatch();
             stopwatch.Start();
-            var handel = new GameHandel(item1);
+            var handel = new GameHandle(item1);
             stopwatch.Stop();
             ColorMCCore.OnGameLog(item1.Obj, GameSystemLog.LaunchTime, stopwatch.Elapsed.ToString(), "");
 
             ColorMCCore.AddGameHandel(item1.Obj.UUID, handel);
-            list.Add(item1.Obj, new GameLaunchRes { Handel = handel });
+            list.Add(item1.Obj, new GameLaunchRes { Handle = handel });
         }
 
         return list;
@@ -574,7 +574,7 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
     /// <param name="token">取消Token</param>
     /// <exception cref="LaunchException">启动错误</exception>
     /// <returns>游戏句柄</returns>
-    public static async Task<GameHandel?> StartGameAsync(this GameSettingObj obj, GameLaunchArg larg,
+    public static async Task<GameHandle?> StartGameAsync(this GameSettingObj obj, GameLaunchArg larg,
         CancellationToken token)
     {
         ColorMCCore.GameLogClear(obj);
@@ -709,7 +709,7 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
         //启动进程
         stopwatch.Reset();
         stopwatch.Start();
-        var handel = new GameHandel(new GameRunObj
+        var handel = new GameHandle(new GameRunObj
         {
             Obj = obj,
             Arg = arg,

src/ColorMC.Core/Game/GameLaunch.cs

@@ -1,5 +1,5 @@
 using System.Collections.Concurrent;
-using ColorMC.Core.GuiHandel;
+using ColorMC.Core.GuiHandle;
 using ColorMC.Core.Helpers;
 using ColorMC.Core.LaunchPath;
 using ColorMC.Core.Nbt;

src/ColorMC.Core/Game/GameSaves.cs

@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using ColorMC.Core.Config;
 using ColorMC.Core.Downloader;
-using ColorMC.Core.GuiHandel;
+using ColorMC.Core.GuiHandle;
 using ColorMC.Core.Helpers;
 using ColorMC.Core.LaunchPath;
 using ColorMC.Core.Net;