up

Coloryr · Jul 24, 2024 · af68854 · af68854
1 parent 7911b0e
commit af68854
Show file tree

Hide file tree

Showing 51 changed files with 467 additions and 244 deletions.
diff --git a/TODO b/TODO
@@ -1,6 +1,9 @@
 ⚫计划中
   添加窗口状态保存
 
+⚫2024.7.24
+√ 修复返回错误
+
 ⚫2024.7.23(A27.1)
 √ 添加账户重复使用不再提醒
 √ 添加多个实例同时启动

diff --git a/src/ColorMC.Core/LaunchPath/InstancesPath.cs b/src/ColorMC.Core/LaunchPath/InstancesPath.cs
@@ -1050,26 +1050,26 @@ await Task.Run(() =>
     /// <param name="obj">游戏实例</param>
     /// <param name="path">自定义加载器路径</param>
     /// <returns></returns>
-    public static async Task<(bool, string?)> SetGameLoader(this GameSettingObj obj, string path)
+    public static async Task<MessageRes> SetGameLoader(this GameSettingObj obj, string path)
     {
         if (!File.Exists(path))
         {
-            return (false, LanguageHelper.Get("Core.Game.Error16"));
+            return new() { Message = LanguageHelper.Get("Core.Game.Error16") };
         }
 
         var list = await DownloadItemHelper.DecodeLoaderJarAsync(obj, path);
 
         if (list == null)
         {
-            return (false, LanguageHelper.Get("Core.Game.Error17"));
+            return new() { Message = LanguageHelper.Get("Core.Game.Error17") };
         }
 
         var local = obj.GetGameLoaderFile();
         PathHelper.Delete(local);
 
         PathHelper.CopyFile(path, local);
 
-        return (true, null);
+        return new() { State = true };
     }
 
     /// <summary>

diff --git a/src/ColorMC.CustomGui/UIModel.cs b/src/ColorMC.CustomGui/UIModel.cs
@@ -61,9 +61,9 @@ public async Task Launch()
         Model.Progress("正在启动游戏");
         var res = await GameBinding.Launch(Model, SelectGame.Obj, hide: true);
         Model.ProgressClose();
-        if (!res.Item1)
+        if (!res.Res)
         {
-            Model.Show("游戏启动失败\n" + res.Item2);
+            Model.Show("游戏启动失败\n" + res.Message);
         }
     }
 

diff --git a/src/ColorMC.Gui/App.axaml.cs b/src/ColorMC.Gui/App.axaml.cs
@@ -13,7 +13,6 @@
 using ColorMC.Core.Helpers;
 using ColorMC.Core.Objs;
 using ColorMC.Core.Utils;
-using ColorMC.Gui.LaunchPath;
 using ColorMC.Gui.Manager;
 using ColorMC.Gui.Objs;
 using ColorMC.Gui.Player;

diff --git a/src/ColorMC.Gui/Utils/Hook/INative.cs → src/ColorMC.Gui/Hook/INative.cs b/src/ColorMC.Gui/Utils/Hook/INative.cs → src/ColorMC.Gui/Hook/INative.cs
@@ -1,7 +1,7 @@
 using System;
 using ColorMC.Gui.Objs;
 
-namespace ColorMC.Gui.Utils.Hook;
+namespace ColorMC.Gui.Hook;
 
 public interface INative
 {

diff --git a/src/ColorMC.Gui/Utils/Hook/Win32Native.cs → src/ColorMC.Gui/Hook/Win32Native.cs b/src/ColorMC.Gui/Utils/Hook/Win32Native.cs → src/ColorMC.Gui/Hook/Win32Native.cs
@@ -6,8 +6,9 @@
 using Avalonia.Input;
 using Avalonia.Win32.Input;
 using ColorMC.Gui.Objs;
+using ColorMC.Gui.Utils;
 
-namespace ColorMC.Gui.Utils.Hook;
+namespace ColorMC.Gui.Hook;
 
 public class Win32Native : INative
 {

diff --git a/src/ColorMC.Gui/Utils/Hook/X11Hook.cs → src/ColorMC.Gui/Hook/X11Hook.cs b/src/ColorMC.Gui/Utils/Hook/X11Hook.cs → src/ColorMC.Gui/Hook/X11Hook.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using X11;
 
-namespace ColorMC.Gui.Utils.Hook;
+namespace ColorMC.Gui.Hook;
 
 internal partial class X11Hook
 {

diff --git a/...ColorMC.Gui/Utils/Hook/X11KeyTransform.cs → src/ColorMC.Gui/Hook/X11KeyTransform.cs b/...ColorMC.Gui/Utils/Hook/X11KeyTransform.cs → src/ColorMC.Gui/Hook/X11KeyTransform.cs
diff --git a/src/ColorMC.Gui/Utils/Hook/X11Native.cs → src/ColorMC.Gui/Hook/X11Native.cs b/src/ColorMC.Gui/Utils/Hook/X11Native.cs → src/ColorMC.Gui/Hook/X11Native.cs
diff --git a/src/ColorMC.Gui/Net/Apis/OpenFrpApi.cs b/src/ColorMC.Gui/Net/Apis/OpenFrpApi.cs
@@ -6,8 +6,8 @@
 using ColorMC.Core.Net;
 using ColorMC.Core.Objs;
 using ColorMC.Core.Utils;
-using ColorMC.Gui.LaunchPath;
 using ColorMC.Gui.Objs.Frp;
+using ColorMC.Gui.Utils;
 using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.Tar;
 using ICSharpCode.SharpZipLib.Zip;

diff --git a/src/ColorMC.Gui/Net/Apis/SakuraFrpApi.cs b/src/ColorMC.Gui/Net/Apis/SakuraFrpApi.cs
@@ -6,8 +6,8 @@
 using ColorMC.Core.Net;
 using ColorMC.Core.Objs;
 using ColorMC.Core.Utils;
-using ColorMC.Gui.LaunchPath;
 using ColorMC.Gui.Objs.Frp;
+using ColorMC.Gui.Utils;
 using Newtonsoft.Json;
 
 namespace ColorMC.Gui.Net.Apis;

diff --git a/src/ColorMC.Gui/Objs/JavaInfoObj.cs b/src/ColorMC.Gui/Objs/JavaInfoObj.cs
diff --git a/src/ColorMC.Gui/Objs/Result.cs b/src/ColorMC.Gui/Objs/Result.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ColorMC.Core.Objs;
+using ColorMC.Core.Objs.Login;
+
+namespace ColorMC.Gui.Objs;
+
+public record FrpLaunchRes
+{
+    public bool Res;
+    public Process? Process;
+    public string? IP;
+}
+
+public record GameLaunchOneRes
+{
+    public bool Res;
+    public string? Message;
+    public bool LoginFail;
+    public LoginObj? User;
+}
+
+public record GameLaunchListRes
+{
+    public List<string>? Done;
+    public string? Message;
+    public Dictionary<string, LaunchState> Fail;
+    public LoginObj? User;
+}
diff --git a/src/ColorMC.Gui/Objs/ModelObj.cs → src/ColorMC.Gui/Objs/SkinModelObj.cs b/src/ColorMC.Gui/Objs/ModelObj.cs → src/ColorMC.Gui/Objs/SkinModelObj.cs
@@ -3,7 +3,7 @@
 /// <summary>
 /// 一个方块模型数据
 /// </summary>
-public record CubeModelItem
+public record CubeModelItemObj
 {
     public float[] Model;
     public ushort[] Point;
@@ -12,21 +12,21 @@ public record CubeModelItem
 /// <summary>
 /// 一个史蒂夫模型数据
 /// </summary>
-public record SteveModel
+public record SteveModelObj
 {
-    public CubeModelItem Head;
-    public CubeModelItem Body;
-    public CubeModelItem LeftArm;
-    public CubeModelItem RightArm;
-    public CubeModelItem LeftLeg;
-    public CubeModelItem RightLeg;
-    public CubeModelItem Cape;
+    public CubeModelItemObj Head;
+    public CubeModelItemObj Body;
+    public CubeModelItemObj LeftArm;
+    public CubeModelItemObj RightArm;
+    public CubeModelItemObj LeftLeg;
+    public CubeModelItemObj RightLeg;
+    public CubeModelItemObj Cape;
 }
 
 /// <summary>
 /// 模型贴图数据
 /// </summary>
-public record SteveTexture
+public record SteveTextureObj
 {
     public float[] Head;
     public float[] Body;

diff --git a/src/ColorMC.Gui/Skin/Steve3DModel.cs b/src/ColorMC.Gui/Skin/Steve3DModel.cs
@@ -13,7 +13,7 @@ public class Steve3DModel
     /// </summary>
     /// <param name="type">类型</param>
     /// <returns></returns>
-    public SteveModel GetSteve(SkinType type)
+    public SteveModelObj GetSteve(SkinType type)
     {
         return new()
         {
@@ -96,9 +96,9 @@ public SteveModel GetSteve(SkinType type)
     /// </summary>
     /// <param name="type">类型</param>
     /// <returns></returns>
-    public SteveModel GetSteveTop(SkinType type)
+    public SteveModelObj GetSteveTop(SkinType type)
     {
-        var model = new SteveModel
+        var model = new SteveModelObj
         {
             Head = new()
             {

diff --git a/src/ColorMC.Gui/Skin/Steve3DTexture.cs b/src/ColorMC.Gui/Skin/Steve3DTexture.cs
@@ -12,9 +12,9 @@ public class Steve3DTexture
     /// </summary>
     /// <param name="type">类型</param>
     /// <returns></returns>
-    public SteveTexture GetSteveTextureTop(SkinType type)
+    public SteveTextureObj GetSteveTextureTop(SkinType type)
     {
-        SteveTexture tex = new()
+        SteveTextureObj tex = new()
         {
             Head = GetTex(_headTex, type, 32f, 0f),
         };
@@ -36,9 +36,9 @@ public SteveTexture GetSteveTextureTop(SkinType type)
     /// </summary>
     /// <param name="type">类型</param>
     /// <returns></returns>
-    public SteveTexture GetSteveTexture(SkinType type)
+    public SteveTextureObj GetSteveTexture(SkinType type)
     {
-        SteveTexture tex = new()
+        SteveTextureObj tex = new()
         {
             Head = GetTex(_headTex, type),
             Body = GetTex(_bodyTex, type, 16f, 16f),

diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddJavaControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddJavaControl.axaml.cs
@@ -2,9 +2,9 @@
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
 using ColorMC.Gui.Manager;
-using ColorMC.Gui.Objs;
 using ColorMC.Gui.UI.Model;
 using ColorMC.Gui.UI.Model.Add;
+using ColorMC.Gui.UI.Model.Items;
 
 namespace ColorMC.Gui.UI.Controls.Add;
 
@@ -58,7 +58,7 @@ public override Bitmap GetIcon()
 
     private void JavaFiles_DoubleTapped(object? sender, TappedEventArgs e)
     {
-        if (JavaFiles.SelectedItem is not JavaDownloadObj obj)
+        if (JavaFiles.SelectedItem is not JavaDownloadModel obj)
             return;
 
         (DataContext as AddJavaControlModel)!.Install(obj);

diff --git a/src/ColorMC.Gui/UI/Controls/Setting/Tab2Control.axaml b/src/ColorMC.Gui/UI/Controls/Setting/Tab2Control.axaml
@@ -7,7 +7,7 @@
     xmlns:model="clr-namespace:ColorMC.Gui.UI.Model.Setting"
     xmlns:setting="clr-namespace:ColorMC.Gui.Utils"
     xmlns:svg="clr-namespace:ColorMC.Gui.UI.Views.Svg"
-    xmlns:view="clr-namespace:ColorMC.Gui.Objs"
+    xmlns:view="clr-namespace:ColorMC.Gui.UI.Model.Items"
     d:DesignWidth="800"
     x:DataType="model:SettingModel"
     mc:Ignorable="d">
@@ -110,7 +110,7 @@
                                 ItemsSource="{Binding FontList}"
                                 SelectedItem="{Binding FontItem}">
                                 <ComboBox.ItemTemplate>
-                                    <DataTemplate DataType="view:FontDisplayObj">
+                                    <DataTemplate DataType="view:FontDisplayModel">
                                         <StackPanel>
                                             <TextBlock FontFamily="{Binding FontFamily}" Text="{Binding FontName}" />
                                         </StackPanel>
@@ -140,7 +140,7 @@
                             ItemsSource="{Binding FontList}"
                             SelectedItem="{Binding FontItem}">
                             <ComboBox.ItemTemplate>
-                                <DataTemplate DataType="view:FontDisplayObj">
+                                <DataTemplate DataType="view:FontDisplayModel">
                                     <StackPanel>
                                         <TextBlock FontFamily="{Binding FontFamily}" Text="{Binding FontName}" />
                                     </StackPanel>

diff --git a/src/ColorMC.Gui/UI/Controls/Skin/SkinRender.cs b/src/ColorMC.Gui/UI/Controls/Skin/SkinRender.cs
@@ -445,7 +445,7 @@ private void LoadSkin(GlInterface gl)
         model.IsLoading = false;
     }
 
-    private unsafe void PutVAO(GlInterface gl, VAOItem vao, CubeModelItem model, float[] uv)
+    private unsafe void PutVAO(GlInterface gl, VAOItem vao, CubeModelItemObj model, float[] uv)
     {
         float[] vertices =
         [

diff --git a/src/ColorMC.Gui/UI/Flyouts/SettingFlyout1.cs b/src/ColorMC.Gui/UI/Flyouts/SettingFlyout1.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Linq;
 using Avalonia.Controls;
-using ColorMC.Gui.Objs;
+using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.UI.Model.Setting;
 using ColorMC.Gui.UIBinding;
 
@@ -11,7 +11,7 @@ public class SettingFlyout1
 {
     public SettingFlyout1(Control con, SettingModel model, IList list)
     {
-        var java = list.Cast<JavaDisplayObj>();
+        var java = list.Cast<JavaDisplayModel>();
 
         _ = new FlyoutsControl(
         [

diff --git a/src/ColorMC.Gui/UI/Model/Add/AddControlModel.cs b/src/ColorMC.Gui/UI/Model/Add/AddControlModel.cs
@@ -12,7 +12,6 @@
 using ColorMC.Core.Objs.Modrinth;
 using ColorMC.Core.Objs.OptiFine;
 using ColorMC.Core.Utils;
-using ColorMC.Gui.Objs;
 using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.UI.Windows;
 using ColorMC.Gui.UIBinding;
@@ -42,7 +41,7 @@ public partial class AddControlModel : GameModel, IAddWindow
     /// <summary>
     /// 显示的文件列表
     /// </summary>
-    public ObservableCollection<FileDisplayObj> FileList { get; init; } = [];
+    public ObservableCollection<FileDisplayModel> FileList { get; init; } = [];
     /// <summary>
     /// 显示的项目列表
     /// </summary>
@@ -129,7 +128,7 @@ public partial class AddControlModel : GameModel, IAddWindow
     /// 项目
     /// </summary>
     [ObservableProperty]
-    private FileDisplayObj? _file;
+    private FileDisplayModel? _file;
     /// <summary>
     /// 下载的模组
     /// </summary>
@@ -940,7 +939,7 @@ public void Install()
     /// 开始下载文件
     /// </summary>
     /// <param name="data"></param>
-    public async void Install1(FileDisplayObj data)
+    public async void Install1(FileDisplayModel data)
     {
         var type = SourceTypeList[DownloadSource];
         if (Set)
@@ -1135,7 +1134,7 @@ private async void LoadFile(string? id = null)
     {
         FileList.Clear();
 
-        List<FileDisplayObj>? list = null;
+        List<FileDisplayModel>? list = null;
         var type = SourceTypeList[DownloadSource];
         if (type == SourceType.McMod)
         {
@@ -1337,7 +1336,7 @@ private void ClearList()
 
     public override void Close()
     {
-        if (Display)
+        if (VersionDisplay || OptifineDisplay || ModDownloadDisplay)
         {
             Model.PopBack();
         }

diff --git a/src/ColorMC.Gui/UI/Model/Add/AddGameTab1Model.cs b/src/ColorMC.Gui/UI/Model/Add/AddGameTab1Model.cs
@@ -291,7 +291,7 @@ public async Task AddGame()
             if (game.Loader == Loaders.Custom && !string.IsNullOrWhiteSpace(LoaderLocal))
             {
                 var res1 = await GameBinding.SetGameLoader(game, LoaderLocal);
-                if (!res1.Item1)
+                if (!res1.State)
                 {
                     Model.ShowOk(App.Lang("AddGameWindow.Tab1.Error18"), Done);
                     return;