up

Coloryr · Coloryr · commit acc6c80064bd · 2025-12-22T17:39:59.000+08:00
diff --git a/src/ColorMC.Core/ColorMC.Core.csproj b/src/ColorMC.Core/ColorMC.Core.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Tomlyn" Version="0.19.0" />
     <PackageReference Include="Ae.Dns.Client" Version="3.1.0" />
     <PackageReference Include="Ae.Dns.Protocol" Version="3.1.0" />
-	<PackageReference Include="SharpCompress" Version="0.41.0" />
+	<PackageReference Include="SharpCompress" Version="0.42.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ColorMC.Gui/ColorMC.Gui.csproj b/src/ColorMC.Gui/ColorMC.Gui.csproj
@@ -364,7 +364,7 @@
 	<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
     <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.10.2" />
+    <PackageReference Include="DialogHost.Avalonia" Version="0.10.3" />
     <PackageReference Include="Markdig" Version="0.44.0" />
     <PackageReference Include="MinecraftSkinRender" Version="1.0.0" />
     <PackageReference Include="MinecraftSkinRender.Image" Version="1.0.0" />
diff --git a/src/ColorMC.Gui/Manager/GameManager.cs b/src/ColorMC.Gui/Manager/GameManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using ColorMC.Core;
 using ColorMC.Core.Config;
@@ -13,7 +12,6 @@
 using ColorMC.Gui.Joystick;
 using ColorMC.Gui.Objs;
 using ColorMC.Gui.Objs.Config;
-using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.Utils;
 
 namespace ColorMC.Gui.Manager;
@@ -119,7 +117,7 @@ public static bool IsDownload(Guid game, SourceItemObj obj)
                 }
             }
         }
-        
+
         return false;
     }
 
@@ -289,7 +287,7 @@ private static GameModSettingObj MakeMod()
     {
         return new GameModSettingObj
         {
-            
+
         };
     }
 
diff --git a/src/ColorMC.Gui/Manager/UserManager.cs b/src/ColorMC.Gui/Manager/UserManager.cs
@@ -25,6 +25,7 @@ public static void Init()
         if (GuiConfigUtils.Config.LastUser is { } last)
         {
             s_select = AuthDatabase.Get(last.UUID, last.Type);
+            EventManager.OnLastUserChange(s_select != null);
         }
     }
 
diff --git a/src/ColorMC.Gui/Objs/Enums.cs b/src/ColorMC.Gui/Objs/Enums.cs
@@ -222,8 +222,8 @@ public enum LanguageType
 /// </summary>
 public enum ItemsGridType
 {
-    List, 
-    ListInfo, 
-    Grid, 
+    List,
+    ListInfo,
+    Grid,
     GridInfo
 }
diff --git a/src/ColorMC.Gui/Objs/SourceItemObj.cs b/src/ColorMC.Gui/Objs/SourceItemObj.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-using System.Linq;
-using ColorMC.Core.Objs;
+﻿using ColorMC.Core.Objs;
 
 namespace ColorMC.Gui.Objs;
 
diff --git a/src/ColorMC.Gui/UI/Animations/MainMenuIn.cs b/src/ColorMC.Gui/UI/Animations/MainMenuIn.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
diff --git a/src/ColorMC.Gui/UI/Animations/SubPageOut.cs b/src/ColorMC.Gui/UI/Animations/SubPageOut.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddDownloadListControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddDownloadListControl.axaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel;
 using Avalonia.Controls;
-using ColorMC.Gui.Manager;
 using ColorMC.Gui.UI.Model.Add;
 
 namespace ColorMC.Gui.UI.Controls.Add;
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddGameControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddGameControl.axaml.cs
@@ -46,7 +46,7 @@ private async void AnimateSubPageIn()
         _animationCts?.Dispose();
         _animationCts = new CancellationTokenSource();
         var token = _animationCts.Token;
-        
+
         Content1.IsVisible = true;
 
         try
@@ -55,7 +55,7 @@ private async void AnimateSubPageIn()
         }
         catch (OperationCanceledException)
         {
-            
+
         }
     }
 
@@ -80,7 +80,7 @@ private async void AnimateSubPageOut()
         }
         catch (OperationCanceledException)
         {
-            
+
         }
     }
 
@@ -97,13 +97,13 @@ private async void AnimateMainMenuIn()
         // 确保可见
         MainMenuGrid.IsVisible = true;
 
-        try 
-        { 
-            await MainMenuIn.Start(MainMenuGrid, token); 
-        } 
-        catch (OperationCanceledException) 
-        { 
-        
+        try
+        {
+            await MainMenuIn.Start(MainMenuGrid, token);
+        }
+        catch (OperationCanceledException)
+        {
+
         }
     }
 
@@ -130,9 +130,9 @@ private async void AnimateMainMenuOut()
                 MainMenuGrid.IsVisible = false;
             }
         }
-        catch (OperationCanceledException) 
-        { 
-        
+        catch (OperationCanceledException)
+        {
+
         }
     }
 
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddGameTab1Control.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddGameTab1Control.axaml.cs
@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
 
 namespace ColorMC.Gui.UI.Controls.Add;
 
diff --git a/src/ColorMC.Gui/UI/Controls/Collect/CollectControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Collect/CollectControl.axaml.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using ColorMC.Gui.Manager;
 using ColorMC.Gui.UI.Model;
 using ColorMC.Gui.UI.Model.Collect;
diff --git a/src/ColorMC.Gui/UI/Controls/Items/FileItemControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Items/FileItemControl.axaml.cs
@@ -1,13 +1,9 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Threading;
-using ColorMC.Gui.UI.Animations;
 using ColorMC.Gui.UI.Flyouts;
 using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.UIBinding;
-using ColorMC.Gui.Utils;
 
 namespace ColorMC.Gui.UI.Controls.Items;
 
diff --git a/src/ColorMC.Gui/UI/Controls/Items/FileVersionItemControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Items/FileVersionItemControl.axaml.cs
@@ -1,11 +1,7 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Threading;
-using ColorMC.Gui.UI.Animations;
 using ColorMC.Gui.UI.Model.Items;
-using ColorMC.Gui.Utils;
 
 namespace ColorMC.Gui.UI.Controls.Items;
 
diff --git a/src/ColorMC.Gui/UI/Controls/Setting/SettingControl.cs b/src/ColorMC.Gui/UI/Controls/Setting/SettingControl.cs
@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using Avalonia.Controls;
diff --git a/src/ColorMC.Gui/UI/GuiHandle.cs b/src/ColorMC.Gui/UI/GuiHandle.cs
@@ -338,7 +338,7 @@ public ResourceGui(FileItemDownloadModel info)
 
     public void SetNow(int value, int all)
     {
-        
+
     }
 
     public void SetNowProcess(int value, int all)
@@ -350,17 +350,17 @@ public void SetNowProcess(int value, int all)
 
     public void SetNowSub(int value, int all)
     {
-        
+
     }
 
     public void SetState(AddState state)
     {
-        
+
     }
 
     public void SetSubText(string? text)
     {
-        
+
     }
 
     private bool Run()
diff --git a/src/ColorMC.Gui/UI/Model/Add/AddGameModel.cs b/src/ColorMC.Gui/UI/Model/Add/AddGameModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Threading.Tasks;
 using AvaloniaEdit.Utils;
 using ColorMC.Core.LaunchPath;
 using ColorMC.Gui.Manager;
@@ -105,7 +104,7 @@ public AddGameModel(WindowModel model) : base(model)
 
     //    Window.Notify(LanguageUtils.Get("AddGameWindow.Tab1.Text28"));
 
-        
+
     //    Group = dialog.Text1;
     //}
 
@@ -153,7 +152,7 @@ public void GoServer()
         ServerPackDownload();
     }
 
-    private void LoadGroup() 
+    private void LoadGroup()
     {
         GroupList.Clear();
         GroupList.AddRange(InstancesPath.GroupKeys);
diff --git a/src/ColorMC.Gui/UI/Model/Add/AddGameTab1Model.cs b/src/ColorMC.Gui/UI/Model/Add/AddGameTab1Model.cs
@@ -156,8 +156,8 @@ partial void OnVersionTypeChanged(int value)
     /// <param name="value"></param>
     partial void OnLoaderVersionChanged(string? value)
     {
-        if (!IsAutoRename || string.IsNullOrWhiteSpace(Version) 
-            || _loaderTypeList.Count == 0 
+        if (!IsAutoRename || string.IsNullOrWhiteSpace(Version)
+            || _loaderTypeList.Count == 0
             || string.IsNullOrWhiteSpace(value))
         {
             return;
diff --git a/src/ColorMC.Gui/UI/Model/Add/AddResourceControlMutModModel.cs b/src/ColorMC.Gui/UI/Model/Add/AddResourceControlMutModModel.cs
@@ -118,7 +118,7 @@ private async Task<bool> DownloadListItem(ModDependModel task)
         }
     }
 
-    private async Task<bool?> StartListTask(ModDownloadListRes list, ModInfoObj? mod, 
+    private async Task<bool?> StartListTask(ModDownloadListRes list, ModInfoObj? mod,
         SourceType source, string name, string version)
     {
         var self = new FileModVersionModel(name, [version], [new DownloadModObj()
diff --git a/src/ColorMC.Gui/UI/Model/Count/CountModel.cs b/src/ColorMC.Gui/UI/Model/Count/CountModel.cs
@@ -126,11 +126,11 @@ public CountModel(WindowModel model) : base(model)
             _countDone = data.LaunchDoneCount;
             _countError = data.LaunchErrorCount;
             _dateCount = (from item in data.LaunchLogs.Values
-                                        from item1 in item
-                                        where item1.Time.Year == _date.Year &&
-                                        item1.Time.Month == _date.Month &&
-                                        item1.Time.Day == _date.Day
-                                        select item).Count();
+                          from item1 in item
+                          where item1.Time.Year == _date.Year &&
+                          item1.Time.Month == _date.Month &&
+                          item1.Time.Day == _date.Day
+                          select item).Count();
             _time = $"{data.AllTime.TotalHours:0}:{data.AllTime.Minutes}:{data.AllTime.Seconds}";
             TimeSpan temp = TimeSpan.Zero;
             //累计统计时间
diff --git a/src/ColorMC.Gui/UI/Model/Dialog/AddGroupModel.cs b/src/ColorMC.Gui/UI/Model/Dialog/AddGroupModel.cs
@@ -1,11 +1,6 @@
 using System.Collections.ObjectModel;
-using System.Threading.Tasks;
 using ColorMC.Core.LaunchPath;
-using ColorMC.Gui.UIBinding;
-using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using DialogHostAvalonia;
 
 namespace ColorMC.Gui.UI.Model.Dialog;
 
diff --git a/src/ColorMC.Gui/UI/Model/Dialog/FrpAddModel.cs b/src/ColorMC.Gui/UI/Model/Dialog/FrpAddModel.cs
@@ -1,9 +1,6 @@
 using ColorMC.Gui.Objs.Config;
 using ColorMC.Gui.UI.Model.Items;
-using ColorMC.Gui.UI.Model.NetFrp;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using DialogHostAvalonia;
 
 namespace ColorMC.Gui.UI.Model.Dialog;
 
diff --git a/src/ColorMC.Gui/UI/Model/Dialog/LongTextModel.cs b/src/ColorMC.Gui/UI/Model/Dialog/LongTextModel.cs
@@ -1,6 +1,4 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using DialogHostAvalonia;
 
 namespace ColorMC.Gui.UI.Model.Dialog;
 
diff --git a/src/ColorMC.Gui/UI/Model/Dialog/SelectModel.cs b/src/ColorMC.Gui/UI/Model/Dialog/SelectModel.cs
@@ -1,7 +1,5 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using DialogHostAvalonia;
 
 namespace ColorMC.Gui.UI.Model.Dialog;
 
diff --git a/src/ColorMC.Gui/UI/Model/GameConfigEdit/GameConfigEditModel.cs b/src/ColorMC.Gui/UI/Model/GameConfigEdit/GameConfigEditModel.cs
@@ -21,7 +21,6 @@
 using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using DialogHostAvalonia;
 
 namespace ColorMC.Gui.UI.Model.GameConfigEdit;
 
diff --git a/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab5Model.cs b/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab5Model.cs
@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using Avalonia.Input;
 using AvaloniaEdit.Utils;
 using ColorMC.Core.Game;
@@ -14,7 +13,6 @@
 using ColorMC.Gui.UIBinding;
 using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 
 namespace ColorMC.Gui.UI.Model.GameEdit;
 
diff --git a/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab8Model.cs b/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab8Model.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading.Tasks;
 using Avalonia.Input;
 using AvaloniaEdit.Utils;
 using ColorMC.Core.Game;
@@ -12,7 +11,6 @@
 using ColorMC.Gui.UIBinding;
 using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 
 namespace ColorMC.Gui.UI.Model.GameEdit;
 
diff --git a/src/ColorMC.Gui/UI/Model/Items/DnsItemModel.cs b/src/ColorMC.Gui/UI/Model/Items/DnsItemModel.cs
@@ -1,5 +1,3 @@
-using ColorMC.Core.Objs;
-using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace ColorMC.Gui.UI.Model.Items;
diff --git a/src/ColorMC.Gui/UI/Model/Items/FileItemDownloadModel.cs b/src/ColorMC.Gui/UI/Model/Items/FileItemDownloadModel.cs
@@ -1,6 +1,5 @@
 ﻿using System.Threading;
 using System.Threading.Tasks;
-using ColorMC.Gui.Objs;
 using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
diff --git a/src/ColorMC.Gui/UI/Model/Items/FileItemModel.cs b/src/ColorMC.Gui/UI/Model/Items/FileItemModel.cs
diff --git a/src/ColorMC.Gui/UI/Model/Items/FileVersionItemModel.cs b/src/ColorMC.Gui/UI/Model/Items/FileVersionItemModel.cs
diff --git a/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs b/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs
diff --git a/src/ColorMC.Gui/UI/Model/Main/MainModel.cs b/src/ColorMC.Gui/UI/Model/Main/MainModel.cs
diff --git a/src/ColorMC.Gui/UI/Model/Setting/SettingTab3Model.cs b/src/ColorMC.Gui/UI/Model/Setting/SettingTab3Model.cs
diff --git a/src/ColorMC.Gui/UI/Model/Setting/SettingTab6Model.cs b/src/ColorMC.Gui/UI/Model/Setting/SettingTab6Model.cs
diff --git a/src/ColorMC.Gui/UI/Model/User/UsersModel.cs b/src/ColorMC.Gui/UI/Model/User/UsersModel.cs
diff --git a/src/ColorMC.Gui/UIBinding/GameBinding.cs b/src/ColorMC.Gui/UIBinding/GameBinding.cs
diff --git a/src/ColorMC.Gui/Utils/CollectUtils.cs b/src/ColorMC.Gui/Utils/CollectUtils.cs
diff --git a/src/ColorMC.Gui/Utils/GameCloudUtils.cs b/src/ColorMC.Gui/Utils/GameCloudUtils.cs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`		`-using System.Linq;`
`5`	`4`	`using System.Threading;`
`6`	`5`	`using ColorMC.Core;`
`7`	`6`	`using ColorMC.Core.Config;`
`@@ -13,7 +12,6 @@`
`13`	`12`	`using ColorMC.Gui.Joystick;`
`14`	`13`	`using ColorMC.Gui.Objs;`
`15`	`14`	`using ColorMC.Gui.Objs.Config;`
`16`		`-using ColorMC.Gui.UI.Model.Items;`
`17`	`15`	`using ColorMC.Gui.Utils;`
`18`	`16`
`19`	`17`	`namespace ColorMC.Gui.Manager;`
`@@ -119,7 +117,7 @@ public static bool IsDownload(Guid game, SourceItemObj obj)`
`119`	`117`	`}`
`120`	`118`	`}`
`121`	`119`	`}`
`122`		`-`
	`120`	`+`
`123`	`121`	`return false;`
`124`	`122`	`}`
`125`	`123`
`@@ -289,7 +287,7 @@ private static GameModSettingObj MakeMod()`
`289`	`287`	`{`
`290`	`288`	`return new GameModSettingObj`
`291`	`289`	`{`
`292`		`-`
	`290`	`+`
`293`	`291`	`};`
`294`	`292`	`}`
`295`	`293`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public static void Init()`
`25`	`25`	`if (GuiConfigUtils.Config.LastUser is { } last)`
`26`	`26`	`{`
`27`	`27`	`s_select = AuthDatabase.Get(last.UUID, last.Type);`
	`28`	`+ EventManager.OnLastUserChange(s_select != null);`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,8 @@ public enum LanguageType`
`222`	`222`	`/// </summary>`
`223`	`223`	`public enum ItemsGridType`
`224`	`224`	`{`
`225`		`- List,`
`226`		`- ListInfo,`
`227`		`- Grid,`
	`225`	`+ List,`
	`226`	`+ ListInfo,`
	`227`	`+ Grid,`
`228`	`228`	`GridInfo`
`229`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ private async void AnimateSubPageIn()`
`46`	`46`	`_animationCts?.Dispose();`
`47`	`47`	`_animationCts = new CancellationTokenSource();`
`48`	`48`	`var token = _animationCts.Token;`
`49`		`-`
	`49`	`+`
`50`	`50`	`Content1.IsVisible = true;`
`51`	`51`
`52`	`52`	`try`
`@@ -55,7 +55,7 @@ private async void AnimateSubPageIn()`
`55`	`55`	`}`
`56`	`56`	`catch (OperationCanceledException)`
`57`	`57`	`{`
`58`		`-`
	`58`	`+`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`@@ -80,7 +80,7 @@ private async void AnimateSubPageOut()`
`80`	`80`	`}`
`81`	`81`	`catch (OperationCanceledException)`
`82`	`82`	`{`
`83`		`-`
	`83`	`+`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -97,13 +97,13 @@ private async void AnimateMainMenuIn()`
`97`	`97`	`// 确保可见`
`98`	`98`	`MainMenuGrid.IsVisible = true;`
`99`	`99`
`100`		`- try`
`101`		`- {`
`102`		`- await MainMenuIn.Start(MainMenuGrid, token);`
`103`		`- }`
`104`		`- catch (OperationCanceledException)`
`105`		`- {`
`106`		`-`
	`100`	`+ try`
	`101`	`+ {`
	`102`	`+ await MainMenuIn.Start(MainMenuGrid, token);`
	`103`	`+ }`
	`104`	`+ catch (OperationCanceledException)`
	`105`	`+ {`
	`106`	`+`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -130,9 +130,9 @@ private async void AnimateMainMenuOut()`
`130`	`130`	`MainMenuGrid.IsVisible = false;`
`131`	`131`	`}`
`132`	`132`	`}`
`133`		`- catch (OperationCanceledException)`
`134`		`- {`
`135`		`-`
	`133`	`+ catch (OperationCanceledException)`
	`134`	`+ {`
	`135`	`+`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`