up 调整界面功能

Author: Coloryr

src/ColorMC.Core/Game/GameArg.cs

@@ -735,7 +735,8 @@ void DoLibItem(FileItemObj item)
         //非自定义加载器
         if (obj.CustomLoader?.CustomJson != true)
         {
-            var game = await obj.CheckGameArgFileAsync();
+            var game = await obj.CheckGameArgFileAsync()
+                ?? throw new LaunchException(LaunchError.LostVersionFile);
             var v2 = obj.IsGameVersionV2();
             arg.JavaVersions.Add(game.JavaVersion!.MajorVersion);
 

src/ColorMC.Core/Helpers/CheckHelpers.cs

@@ -274,20 +274,33 @@ public static ConcurrentBag<FileItemObj> CheckAssets(this AssetsObj obj, Cancell
     /// </summary>
     /// <param name="obj">游戏实例</param>
     /// <returns></returns>
-    public static async Task<GameArgObj> CheckGameArgFileAsync(this GameSettingObj obj)
+    public static Task<GameArgObj?> CheckGameArgFileAsync(this GameSettingObj obj)
     {
-        var game = await VersionPath.CheckUpdateAsync(obj.Version);
+        return CheckGameArgFileAsync(obj.Version);
+    }
+
+    /// <summary>
+    /// 更新游戏arg文件
+    /// </summary>
+    /// <param name="ver"></param>
+    /// <returns></returns>
+    /// <exception cref="LaunchException"></exception>
+    public static async Task<GameArgObj?> CheckGameArgFileAsync(string ver)
+    {
+        var game = await VersionPath.CheckUpdateAsync(ver);
         //不存在游戏
         if (game != null)
         {
             return game;
         }
 
         var var = await VersionPath.GetVersionsAsync();
-        var version = var?.Versions.FirstOrDefault(a => a.Id == obj.Version)
-                      ?? throw new LaunchException(LaunchError.LostVersionFile);
-        return await VersionPath.AddGameAsync(version)
-            ?? throw new LaunchException(LaunchError.LostVersionFile);
+        var version = var?.Versions.FirstOrDefault(a => a.Id == ver);
+        if (version == null)
+        {
+            return null;
+        }
+        return await VersionPath.AddGameAsync(version);
     }
 
     /// <summary>

src/ColorMC.Core/Worker/CurseForgeWork.cs

@@ -89,10 +89,10 @@ public async Task<bool> ReadVersion()
 
         GameVersion = _info.Minecraft.Version;
 
-        if (VersionPath.CheckUpdateAsync(GameVersion) == null)
+        if (CheckHelpers.CheckGameArgFileAsync(GameVersion) == null)
         {
             await VersionPath.GetFromWebAsync();
-            if (VersionPath.CheckUpdateAsync(GameVersion) == null)
+            if (CheckHelpers.CheckGameArgFileAsync(GameVersion) == null)
             {
                 return false;
             }

src/ColorMC.Core/Worker/ModrinthWork.cs

@@ -303,10 +303,10 @@ public async Task<bool> ReadVersion()
 
         GameVersion = _info.Dependencies[Names.NameMinecraftKey];
 
-        if (VersionPath.CheckUpdateAsync(GameVersion) == null)
+        if (CheckHelpers.CheckGameArgFileAsync(GameVersion) == null)
         {
             await VersionPath.GetFromWebAsync();
-            if (VersionPath.CheckUpdateAsync(GameVersion) == null)
+            if (CheckHelpers.CheckGameArgFileAsync(GameVersion) == null)
             {
                 return false;
             }

src/ColorMC.Gui/Objs/Config/GuiConfigObj.cs

@@ -307,6 +307,17 @@ public record LauncherSetting
     public bool FastModrinth { get; set; }
 }
 
+/// <summary>
+/// 界面功能设置
+/// </summary>
+public record WindowUserStateObj
+{ 
+    /// <summary>
+    /// 主窗口状态
+    /// </summary>
+    public ItemsGridType MainWindowState { get; set; }
+}
+
 /// <summary>
 /// Gui配置文件
 /// </summary>
@@ -442,5 +453,9 @@ public record GuiConfigObj
     /// 启动器功能
     /// </summary>
     public LauncherSetting LauncherFunction { get; set; }
+    /// <summary>
+    /// 启动器窗口
+    /// </summary>
+    public WindowUserStateObj WindowState { get; set; }
 }
 

src/ColorMC.Gui/Objs/Results.cs

@@ -274,4 +274,10 @@ public record KeyRes
 {
     public bool Positive;
     public byte Key;
+}
+
+public record SetGamesRes
+{
+    public readonly List<GameItemModel> Removes = [];
+    public readonly List<GameItemModel> Adds = [];
 }

src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml

@@ -171,7 +171,10 @@
                             DockPanel.Dock="Top"
                             IPPort="{Binding Server}"
                             IsVisible="{Binding MotdDisplay}" />
-                        <DockPanel Margin="30,20,0,0" DockPanel.Dock="Top">
+                        <DockPanel
+                            Margin="30,20,0,0"
+                            DockPanel.Dock="Top"
+                            IsVisible="{Binding HaveGame}">
                             <Border
                                 Padding="3"
                                 Background="{setting:Theme RadioGroupBG}"

src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs

@@ -249,6 +249,16 @@ public override void Closed()
 
     public override async void Opened()
     {
+        if (DataContext is MainModel model)
+        {
+            if (ColorMCGui.IsCrash)
+            {
+                model.Window.Show(LangUtils.Get("MainWindow.Text81"));
+            }
+
+            model.Load();
+        }
+
         var config = GuiConfigUtils.Config.ServerCustom;
         if (ColorMCCore.NewStart || config.CustomStart)
         {
@@ -261,12 +271,6 @@ public override async void Opened()
             Start.IsVisible = false;
             Start.Child = null;
         }
-
-        if (ColorMCGui.IsCrash)
-        {
-            var model = (DataContext as MainModel)!;
-            model.Window.Show(LangUtils.Get("MainWindow.Text81"));
-        }
     }
 
     public override async Task<bool> Closing()
@@ -397,4 +401,15 @@ public void ReloadBlock()
             }
         });
     }
+
+    /// <summary>
+    /// 加载卡片
+    /// </summary>
+    public void LoadCard()
+    {
+        if (DataContext is MainModel model)
+        {
+            model.LoadCard();
+        }
+    }
 }

src/ColorMC.Gui/UI/Controls/Main/SimpleControl.axaml

@@ -13,16 +13,16 @@
     mc:Ignorable="d">
     <Border Classes="t2">
         <StackPanel
-            Margin="10"
+            Margin="20"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             RenderOptions.TextRenderingMode="Antialias">
             <Image
-                Width="120"
-                Height="120"
+                Width="100"
+                Height="100"
                 Source="{Binding GameIcon}" />
             <TextBlock
-                Margin="0,10,0,10"
+                Margin="0,5,0,10"
                 HorizontalAlignment="Center"
                 FontSize="20"
                 MaxLines="3"
@@ -97,9 +97,7 @@
                     OffContent="{setting:Localize SettingWindow.Tab4.Text12}"
                     OnContent="{setting:Localize SettingWindow.Tab4.Text12}" />
             </Grid>
-
             <Grid
-                Margin="0,0,0,10"
                 ColumnDefinitions="auto,*,auto,*"
                 IsEnabled="{Binding HaveGame}"
                 IsVisible="{Binding EnableArg}">

src/ColorMC.Gui/UI/Model/Main/GameGroupModel.cs

@@ -9,6 +9,7 @@
 using ColorMC.Core;
 using ColorMC.Core.Objs;
 using ColorMC.Gui.Manager;
+using ColorMC.Gui.Objs;
 using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.UIBinding;
 using ColorMC.Gui.Utils;
@@ -205,7 +206,7 @@ public void Drop(IDataTransfer data)
     /// 设置游戏实例项目
     /// </summary>
     /// <param name="list"></param>
-    public void SetItems(List<GameSettingObj> list)
+    public SetGamesRes? SetItems(List<GameSettingObj> list)
     {
         var remove = new List<Guid>();
         var ins = new List<GameSettingObj>();
@@ -229,28 +230,31 @@ public void SetItems(List<GameSettingObj> list)
             remove.Add(item);
         }
 
+        //完全空的组，不会存在这样的情况
         if (GameList.Count == 0 || GameList.Count - 1 < 0)
         {
-            return;
+            return null;
         }
         GameList.RemoveAt(GameList.Count - 1);
 
+        var res = new SetGamesRes();
+
         foreach (var item in remove)
         {
-            Items.Remove(item);
-            var model = GameList.FirstOrDefault(item1 => item1.Obj.UUID == item);
-            if (model != null)
+            if (Items.Remove(item, out var item1))
             {
-                model.Close();
-                GameList.Remove(model);
+                GameList.Remove(item1);
+                res.Removes.Add(item1);
+                item1.Close();
             }
         }
 
         //筛选添加的内容
         foreach (var item in ins)
         {
-            var model1 = new GameItemModel(Window, Top, item);
-            Items.Add(item.UUID, model1);
+            var model = new GameItemModel(Window, Top, item);
+            Items.Add(item.UUID, model);
+            res.Adds.Add(model);
         }
 
         Task.Run(() =>
@@ -269,6 +273,8 @@ public void SetItems(List<GameSettingObj> list)
                 GameList.Add(_addItem);
             });
         });
+
+        return res;
     }
 
     public override void Close()