up 整合包下载

Coloryr · Coloryr · commit 16bd9201321e · 2026-03-05T11:43:37.000+08:00
diff --git a/log.md b/log.md
@@ -8,10 +8,14 @@
 ## 计划中 Planning
 - 调整代码
 - 新界面
+- 压缩包子文件夹识别
 
 ## 已知问题 Known issue
 
 ## 已完成 Done
+### 2026.3.2
+- 添加hmcl服务器整合包的下载
+
 ### 2026.2.26
 - 更换SVG图标
 - 添加HMCL在线包支持
diff --git a/src/ColorMC.Core/Game/GameLaunch.cs b/src/ColorMC.Core/Game/GameLaunch.cs
@@ -68,7 +68,7 @@ private static async Task AuthLoginAsync(GameSettingObj obj, GameLaunchArg larg,
     /// <exception cref="LaunchException"></exception>
     private static async Task PackUpdateAsync(GameSettingObj obj, GameLaunchArg larg, CancellationToken token)
     {
-        if (obj.ModPackType != SourceType.ColorMC || string.IsNullOrWhiteSpace(obj.ServerUrl))
+        if (obj.ModPackType != SourceType.ServerPack || string.IsNullOrWhiteSpace(obj.ServerUrl))
         {
             return;
         }
diff --git a/src/ColorMC.Core/Game/ServerPack.cs b/src/ColorMC.Core/Game/ServerPack.cs
@@ -101,7 +101,7 @@ public static async Task<bool> UpdateAsync(this ServerPackObj obj, IUpdateGui? g
                         Name = item.File,
                         Local = Path.Combine(path, item.File),
                         Sha256 = item.Sha256,
-                        Url = obj.Game.ServerUrl + item.Url
+                        Url = item.Url
                     });
                 }
                 else
@@ -142,7 +142,7 @@ public static async Task<bool> UpdateAsync(this ServerPackObj obj, IUpdateGui? g
                     Name = item.File,
                     Local = Path.Combine(path, item.File),
                     Sha256 = item.Sha256,
-                    Url = obj.Game.ServerUrl + item.Url
+                    Url = item.Url
                 });
             }
         }, token);
@@ -162,7 +162,8 @@ public static async Task<bool> UpdateAsync(this ServerPackObj obj, IUpdateGui? g
                         Name = item.FileName,
                         Local = Path.Combine(path1, item.FileName),
                         Sha256 = item.Sha256,
-                        Url = obj.Game.ServerUrl + item.Url,
+                        Sha1 = item.Sha1,
+                        Url = item.Url,
                         Overwrite = true,
                         Later = (stream) =>
                         {
@@ -184,8 +185,9 @@ public static async Task<bool> UpdateAsync(this ServerPackObj obj, IUpdateGui? g
                         Name = item.Group + item.FileName,
                         Local = Path.GetFullPath(path + "/" + item.Group + item.FileName),
                         Sha256 = item.Sha256,
+                        Sha1 = item.Sha1,
                         Overwrite = true,
-                        Url = obj.Game.ServerUrl + item.Url
+                        Url = item.Url
                     });
                 }
             }
diff --git a/src/ColorMC.Core/Helpers/GameHelper.cs b/src/ColorMC.Core/Helpers/GameHelper.cs
@@ -6,6 +6,7 @@
 using ColorMC.Core.Objs.Loader;
 using ColorMC.Core.Objs.Minecraft;
 using ColorMC.Core.Objs.OtherLaunch;
+using ColorMC.Core.Objs.ServerPack;
 using ColorMC.Core.Utils;
 using SharpCompress.Archives.Zip;
 
@@ -1126,14 +1127,70 @@ public static GameSettingObj ToColorMC(this HMCLServerObj obj)
             Modpack = true
         };
 
-        if (!string.IsNullOrWhiteSpace(obj.Author))
+        //if (!string.IsNullOrWhiteSpace(obj.Author))
+        //{
+        //    game.Name += "-" + obj.Author;
+        //}
+        //if (!string.IsNullOrWhiteSpace(obj.Version))
+        //{
+        //    game.Name += "-" + obj.Version;
+        //}
+        foreach (var item in obj.Addons)
         {
-            game.Name += "-" + obj.Author;
+            if (item.Id == "game")
+            {
+                game.Version = item.Version;
+            }
+            else if (item.Id == "forge")
+            {
+                game.Loader = Loaders.Forge;
+                game.LoaderVersion = item.Version;
+            }
+            else if (item.Id == "neoforge")
+            {
+                game.Loader = Loaders.NeoForge;
+                game.LoaderVersion = item.Version;
+            }
+            else if (item.Id == "fabric")
+            {
+                game.Loader = Loaders.Fabric;
+                game.LoaderVersion = item.Version;
+            }
+            else if (item.Id == "quilt")
+            {
+                game.Loader = Loaders.Quilt;
+                game.LoaderVersion = item.Version;
+            }
         }
-        if (!string.IsNullOrWhiteSpace(obj.Version))
+
+        return game;
+    }
+
+    /// <summary>
+    /// HMCL配置转ColorMC
+    /// </summary>
+    /// <param name="obj">HMCL储存</param>
+    /// <returns>游戏实例</returns>
+    public static ServerPackObj ToServerPack(this HMCLServerObj obj)
+    {
+        var game = new ServerPackObj()
         {
-            game.Name += "-" + obj.Version;
-        }
+            Name = obj.Name,
+            Loader = Loaders.Normal,
+            PackVersion = obj.Version,
+            Mod = [],
+            Resourcepack = [],
+            Config = []
+        };
+
+        //if (!string.IsNullOrWhiteSpace(obj.Author))
+        //{
+        //    game.Name += "-" + obj.Author;
+        //}
+        //if (!string.IsNullOrWhiteSpace(obj.Version))
+        //{
+        //    game.Name += "-" + obj.Version;
+        //}
         foreach (var item in obj.Addons)
         {
             if (item.Id == "game")
@@ -1162,6 +1219,24 @@ public static GameSettingObj ToColorMC(this HMCLServerObj obj)
             }
         }
 
+        var url = obj.FileApi;
+        if (!url.EndsWith('/'))
+        {
+            url += '/';
+        }
+
+        foreach (var item in obj.Files)
+        {
+            var file1 = Path.GetFileName(item.Path);
+            game.Config.Add(new ConfigPackObj
+            {
+                Group = item.Path.Replace(file1, ""),
+                FileName = file1,
+                Sha1 = item.Hash,
+                Url = url + Names.NameOverrideDir + "/" + item.Path
+            });
+        }
+
         return game;
     }
 }
diff --git a/src/ColorMC.Core/Objs/Enums.cs b/src/ColorMC.Core/Objs/Enums.cs
@@ -97,7 +97,7 @@ public enum CustomLoaderType
 /// </summary>
 public enum SourceType
 {
-    CurseForge, Modrinth, McMod, ColorMC
+    CurseForge, Modrinth, McMod, ServerPack
 }
 
 /// <summary>
diff --git a/src/ColorMC.Core/Objs/ServerPack/ConfigPackObj.cs b/src/ColorMC.Core/Objs/ServerPack/ConfigPackObj.cs
@@ -18,6 +18,10 @@ public record ConfigPackObj
     /// </summary>
     public string Sha256 { get; set; }
     /// <summary>
+    /// 校验
+    /// </summary>
+    public string Sha1 { get; set; }
+    /// <summary>
     /// 是否为压缩包打包
     /// </summary>
     public bool IsZip { get; set; }
diff --git a/src/ColorMC.Core/Objs/ServerPack/ServerPackObj.cs b/src/ColorMC.Core/Objs/ServerPack/ServerPackObj.cs
@@ -12,6 +12,10 @@ public record ServerPackObj
     /// </summary>
     public string Text { get; set; }
     /// <summary>
+    /// 服务器包版本
+    /// </summary>
+    public string PackVersion { get; set; }
+    /// <summary>
     /// Mod列表
     /// </summary>
     public List<ServerModItemObj> Mod { get; set; }
@@ -24,8 +28,42 @@ public record ServerPackObj
     /// </summary>
     public List<ConfigPackObj> Config { get; set; }
     /// <summary>
-    /// 游戏实例
+    /// 实例名字
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// 游戏版本
+    /// </summary>
+    public string Version { get; set; }
+    /// <summary>
+    /// 加载器类型
+    /// </summary>
+    public Loaders Loader { get; set; }
+    /// <summary>
+    /// 加载器版本
+    /// </summary>
+    public string? LoaderVersion { get; set; }
+    /// <summary>
+    /// 游戏发布类型
     /// </summary>
-    [JsonIgnore]
-    public GameSettingObj Game { get; set; }
+    public GameType GameType { get; set; }
+    /// <summary>
+    /// Jvm参数
+    /// </summary>
+    public RunArgObj? JvmArg { get; set; }
+    /// <summary>
+    /// 窗口设置
+    /// </summary>
+    public WindowSettingObj? Window { get; set; }
+    /// <summary>
+    /// 加入服务器设置
+    /// </summary>
+    public ServerObj? StartServer { get; set; }
+    /// <summary>
+    /// 高级Jvm设置
+    /// </summary>
+    public AdvanceJvmObj? AdvanceJvm { get; set; }
+
+    [JsonInclude]
+    public GameSettingObj Game;
 }
diff --git a/src/ColorMC.Gui/ColorMC.Gui.csproj b/src/ColorMC.Gui/ColorMC.Gui.csproj
@@ -50,6 +50,8 @@
     <None Remove="Resource\Icon\Button\ArrowRight.svg" />
     <None Remove="Resource\Icon\Button\Close.svg" />
     <None Remove="Resource\Icon\Button\Cog.svg" />
+    <None Remove="Resource\Icon\Button\Pause.svg" />
+    <None Remove="Resource\Icon\Button\Play.svg" />
     <None Remove="Resource\Icon\close.svg" />
     <None Remove="Resource\Icon\cog.svg" />
     <None Remove="Resource\Icon\collection.svg" />
@@ -197,7 +199,9 @@
     <AvaloniaResource Include="Resource\Icon\Button\Cog.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\Counter.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\Delete.svg" />
+    <AvaloniaResource Include="Resource\Icon\Button\Pause.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\Pencil.svg" />
+    <AvaloniaResource Include="Resource\Icon\Button\Play.svg" />
     <AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonFrown.svg" />
     <AvaloniaResource Include="Resource\Icon\GroupIcon\Adjust.svg" />
     <AvaloniaResource Include="Resource\Icon\GroupIcon\Animation.svg" />
diff --git a/src/ColorMC.Gui/Resource/Language/zh-cn.json b/src/ColorMC.Gui/Resource/Language/zh-cn.json
@@ -480,6 +480,8 @@
 	"GameEditWindow.Tab1.Text45": "版本读取失败",
 	"GameEditWindow.Tab1.Text46": "游戏实例正在下载资源，无法删除",
 	"GameEditWindow.Tab1.Text47": "其他设置",
+	"GameEditWindow.Tab1.Text48": "服务器包",
+	"GameEditWindow.Tab1.Text49": "服务器包地址",
 	"GameEditWindow.Tab2.Text13": "以下设定只应用于游戏实例 {0}",
 	"GameEditWindow.Tab2.Text22": "设置启动使用的Java",
 	"GameEditWindow.Tab2.Text23": "指定Java路径",
diff --git a/src/ColorMC.Gui/UI/Controls/GameEdit/Tab1Control.axaml b/src/ColorMC.Gui/UI/Controls/GameEdit/Tab1Control.axaml
@@ -141,6 +141,11 @@
                             Margin="0,0,5,0"
                             Content="{setting:Localize GameEditWindow.Tab1.Text3}"
                             IsChecked="{Binding Modpack}" />
+                        <CheckBox
+                            Margin="0,0,5,0"
+                            Content="{setting:Localize GameEditWindow.Tab1.Text48}"
+                            IsChecked="{Binding ServerPack}"
+                            IsEnabled="{Binding Modpack}" />
                         <Button
                             Width="100"
                             Height="35"
@@ -152,7 +157,10 @@
                             IsEnabled="{Binding Modpack}"
                             ToolTip.Tip="{setting:Localize ToolTip.Text51}" />
                     </StackPanel>
-                    <Grid ColumnDefinitions="auto,*,auto,*">
+                    <Grid
+                        ColumnDefinitions="auto,*,auto,*"
+                        IsEnabled="{Binding Modpack}"
+                        IsVisible="{Binding !ServerPack}">
                         <TextBlock Margin="0,0,5,0" Text="{setting:Localize GameEditWindow.Tab1.Text8}" />
                         <TextBox
                             Grid.Column="1"
@@ -171,6 +179,10 @@
                             Text="{Binding FID}"
                             Watermark="{setting:Localize GameEditWindow.Tab1.Text9}" />
                     </Grid>
+                    <DockPanel IsEnabled="{Binding Modpack}" IsVisible="{Binding ServerPack}">
+                        <TextBlock Margin="0,0,5,0" Text="{setting:Localize GameEditWindow.Tab1.Text49}" />
+                        <TextBox Text="{Binding ServerPackUrl}" />
+                    </DockPanel>
                 </StackPanel>
             </Border>
             <Border Margin="10,5,10,3" Classes="t2">
diff --git a/src/ColorMC.Gui/UI/Model/Add/AddGameModel.cs b/src/ColorMC.Gui/UI/Model/Add/AddGameModel.cs
@@ -101,8 +101,6 @@ public void GoModPack()
     [RelayCommand]
     public void GoCloud()
     {
-        Main = false;
-        Window.PushBack(BackMain);
         GameCloudDownload();
     }
 
@@ -112,8 +110,6 @@ public void GoCloud()
     [RelayCommand]
     public void GoServer()
     {
-        Main = false;
-        Window.PushBack(BackMain);
         ServerPackDownload();
     }
 
@@ -312,14 +308,9 @@ public async void ServerPackDownload()
 
         string url = dialog.Text1;
 
-        if (!url.EndsWith('/'))
-        {
-            url += '/';
-        }
         //下载服务器包
         var dialog1 = Window.ShowProgress(LangUtils.Get("AddGameWindow.Tab1.Text36"));
-        var res1 = await GameBinding.DownloadServerPackAsync(Window, dialog1, Name, Group, url,
-            new OverGameGui(Window));
+        var res1 = await GameBinding.DownloadServerPackAsync(dialog1, Group, url, new OverGameGui(Window));
         Window.CloseDialog(dialog1);
         if (!res1.State)
         {
diff --git a/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab1Model.cs b/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab1Model.cs
diff --git a/src/ColorMC.Gui/UIBinding/GameBinding.cs b/src/ColorMC.Gui/UIBinding/GameBinding.cs

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private static async Task AuthLoginAsync(GameSettingObj obj, GameLaunchArg larg,`
`68`	`68`	`/// <exception cref="LaunchException"></exception>`
`69`	`69`	`private static async Task PackUpdateAsync(GameSettingObj obj, GameLaunchArg larg, CancellationToken token)`
`70`	`70`	`{`
`71`		`- if (obj.ModPackType != SourceType.ColorMC \|\| string.IsNullOrWhiteSpace(obj.ServerUrl))`
	`71`	`+ if (obj.ModPackType != SourceType.ServerPack \|\| string.IsNullOrWhiteSpace(obj.ServerUrl))`
`72`	`72`	`{`
`73`	`73`	`return;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public enum CustomLoaderType`
`97`	`97`	`/// </summary>`
`98`	`98`	`public enum SourceType`
`99`	`99`	`{`
`100`		`- CurseForge, Modrinth, McMod, ColorMC`
	`100`	`+ CurseForge, Modrinth, McMod, ServerPack`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/// <summary>`