up 修改很多东西

Coloryr · Dec 24, 2024 · 81fad54 · 81fad54
1 parent e58c251
commit 81fad54
Show file tree

Hide file tree

Showing 109 changed files with 1,472 additions and 812 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "svg.preview.background": "transparent"
+}
diff --git a/log.md b/log.md
@@ -5,8 +5,22 @@
 - 加入OpenP2P
 - 加入hal映射
 
+## 已知问题
+- 日志窗口与主窗口启动数据不同步
+- 游戏其他失败后不能再次启动
+- 游戏取消启动处理错误
+
 ## 已完成 Done
-### 2024.12.22
+### 2024.12.24
+- 修复游戏无法启动问题
+- 修复自定义加载器问题
+- 调整启动器背景音乐播放逻辑
+- 调整启动器主界面图标
+- 调整启动器主界面布局
+- 调整Minecraft News显示方式
+- 添加MP3ID3读取
+
+### 2024.12.22(A34)
 - 修复皮肤显示问题
 - 修复登录会产生的崩溃
 

diff --git a/src/ColorMC.Core/CoreMain.cs b/src/ColorMC.Core/CoreMain.cs
@@ -16,7 +16,7 @@ public static class ColorMCCore
 {
     public const int VersionNum = 34;
     public const string TopVersion = "A34";
-    public const string DateVersion = "20241222";
+    public const string DateVersion = "20241224";
 
     /// <summary>
     /// 版本号
@@ -159,7 +159,8 @@ public static class ColorMCCore
     /// 手机端启动
     /// </summary>
     public static Func<LoginObj, GameSettingObj, JavaInfo, List<string>,
-        Dictionary<string, string>, IGameHandel> PhoneGameLaunch { internal get; set; }
+        Dictionary<string, string>, IGameHandel> PhoneGameLaunch
+    { internal get; set; }
     /// <summary>
     /// 手机端Jvm安装
     /// </summary>

diff --git a/src/ColorMC.Core/Game/Mods.cs b/src/ColorMC.Core/Game/Mods.cs
@@ -459,7 +459,7 @@ private static async Task CheckJarInJarAsync(ModObj obj, ZipFile zFile)
             }
             catch
             {
-                
+
             }
         }
 
@@ -577,8 +577,8 @@ private static async Task CheckJarInJarAsync(ModObj obj, ZipFile zFile)
                     istest = true;
                 }
                 catch
-                { 
-                    
+                {
+
                 }
             }
         }
@@ -641,9 +641,9 @@ private static async Task CheckJarInJarAsync(ModObj obj, ZipFile zFile)
 
                     istest = true;
                 }
-                catch 
+                catch
                 {
-                    
+
                 }
             }
         }
@@ -695,8 +695,8 @@ private static async Task CheckJarInJarAsync(ModObj obj, ZipFile zFile)
                     istest = true;
                 }
                 catch
-                { 
-                    
+                {
+
                 }
             }
         }

diff --git a/src/ColorMC.Core/Helpers/CheckHelpers.cs b/src/ColorMC.Core/Helpers/CheckHelpers.cs
@@ -445,6 +445,7 @@ public static async Task<ConcurrentBag<DownloadItemObj>> CheckGameFileAsync(this
                     var item = node.Value;
                     if (item.Path != "mods")
                     {
+                        node = node.Next;
                         array.Remove(item);
                         continue;
                     }

diff --git a/src/ColorMC.Core/Helpers/ModPackHelper.cs b/src/ColorMC.Core/Helpers/ModPackHelper.cs
@@ -434,13 +434,22 @@ public static async Task<GameRes> InstallCurseForgeModPackAsync(InstallModPackZi
             arg.Name = $"{info.Name}-{info.Version}";
         }
 
+        var gameversion = info.Minecraft.Version;
+        if (VersionPath.CheckUpdateAsync(gameversion) == null)
+        {
+            await VersionPath.GetFromWebAsync();
+            if (VersionPath.CheckUpdateAsync(gameversion) == null)
+            {
+                return new();
+            }
+        }
 
         //创建游戏实例
         var game = new GameSettingObj()
         {
             GroupName = arg.Group,
             Name = arg.Name,
-            Version = info.Minecraft.Version,
+            Version = gameversion,
             ModPack = true,
             Loader = loaders,
             ModPackType = SourceType.CurseForge,
@@ -828,14 +837,24 @@ public static async Task<GameRes> InstallModrinthModPackAsync(InstallModPackZipA
             arg.Name = $"{info.Name}-{info.VersionId}";
         }
 
+        var gameversion = info.Dependencies["minecraft"];
+        if (VersionPath.CheckUpdateAsync(gameversion) == null)
+        {
+            await VersionPath.GetFromWebAsync();
+            if (VersionPath.CheckUpdateAsync(gameversion) == null)
+            {
+                return new();
+            }
+        }
+
         //创建游戏实例
         var game = await InstancesPath.CreateGame(new CreateGameArg
         {
             Game = new GameSettingObj()
             {
                 GroupName = arg.Group,
                 Name = arg.Name,
-                Version = info.Dependencies["minecraft"],
+                Version = gameversion,
                 ModPack = true,
                 ModPackType = SourceType.Modrinth,
                 Loader = loaders,

diff --git a/src/ColorMC.Core/Helpers/PathHelper.cs b/src/ColorMC.Core/Helpers/PathHelper.cs
@@ -77,7 +77,7 @@ public static Task<bool> MoveToTrash(string dir)
             }
             catch
             {
-                
+
             }
 
             return false;

diff --git a/src/ColorMC.Core/Hook/Win32.cs b/src/ColorMC.Core/Hook/Win32.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
 namespace ColorMC.Core.Hook;
 

diff --git a/src/ColorMC.Core/Net/Login/LegacyLogin.cs b/src/ColorMC.Core/Net/Login/LegacyLogin.cs
@@ -108,7 +108,7 @@ public static async Task<LegacyLoginRes> AuthenticateAsync(string server, string
                 return new LegacyLoginRes
                 {
                     State = LoginState.Done,
-                    Auth = new() 
+                    Auth = new()
                     {
                         UserName = obj2.SelectedProfile.Name,
                         UUID = obj2.SelectedProfile.Id,

diff --git a/src/ColorMC.Gui/ColorMC.Gui.csproj b/src/ColorMC.Gui/ColorMC.Gui.csproj
@@ -175,6 +175,8 @@
     <None Remove="Resource\Pic\launch.png" />
     <None Remove="Resource\Pic\load.png" />
     <None Remove="Resource\Pic\pic1.png" />
+    <None Remove="Resource\Pic\update.png" />
+    <None Remove="Resource\Pic\update1.png" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="icon.ico" />
@@ -304,6 +306,7 @@
     <AvaloniaResource Include="Resource\Icon\Setting\svg9.svg" />
     <AvaloniaResource Include="Resource\Icon\skin.svg" />
     <AvaloniaResource Include="Resource\Icon\pause.svg" />
+    <EmbeddedResource Include="Resource\Pic\update.png" />
     <EmbeddedResource Include="Resource\Pic\1.png" />
     <EmbeddedResource Include="Resource\Pic\2.png" />
     <EmbeddedResource Include="Resource\Pic\3.png" />
@@ -317,6 +320,7 @@
     <EmbeddedResource Include="Resource\Pic\game.png" />
     <EmbeddedResource Include="Resource\Pic\launch.png" />
     <EmbeddedResource Include="Resource\Pic\load.png" />
+    <EmbeddedResource Include="Resource\Pic\update1.png" />
   </ItemGroup>
   <ItemGroup>
     <!--This helps with theme dll-s trimming.

diff --git a/src/ColorMC.Gui/Manager/ImageManager.cs b/src/ColorMC.Gui/Manager/ImageManager.cs
@@ -6,6 +6,7 @@
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Avalonia.Threading;
 using ColorMC.Core.Helpers;
 using ColorMC.Core.LaunchPath;
 using ColorMC.Core.Net;
@@ -23,7 +24,7 @@ public static class ImageManager
 {
     public static Bitmap GameIcon { get; private set; }
     public static Bitmap LoadIcon { get; private set; }
-    public static WindowIcon Icon { get; private set; }
+    public static WindowIcon WindowIcon { get; private set; }
 
     public static Bitmap? BackBitmap { get; private set; }
     public static SKBitmap? SkinBitmap { get; private set; }
@@ -46,7 +47,7 @@ public static void Init(string dir)
         {
             using var asset1 = AssetLoader.Open(new Uri(SystemInfo.Os == OsType.MacOS
                 ? "resm:ColorMC.Gui.macicon.ico" : "resm:ColorMC.Gui.icon.ico"));
-            Icon = new(asset1!);
+            WindowIcon = new(asset1!);
         }
         {
             using var asset1 = AssetLoader.Open(new Uri("resm:ColorMC.Gui.Resource.Pic.load.png"));
@@ -170,6 +171,16 @@ public static void RemoveSkin()
         CapeBitmap = null;
     }
 
+    public static Bitmap? ReloadImage(GameSettingObj obj)
+    {
+        s_gameIcon.Remove(obj.UUID, out var temp);
+        if (temp != null)
+        {
+            Dispatcher.UIThread.Post(temp.Dispose);
+        }
+        return GetGameIcon(obj);
+    }
+
     public static Bitmap? GetGameIcon(GameSettingObj obj)
     {
         if (s_gameIcon.TryGetValue(obj.UUID, out var image))

diff --git a/src/ColorMC.Gui/Manager/WindowManager.cs b/src/ColorMC.Gui/Manager/WindowManager.cs
@@ -27,6 +27,7 @@
 using ColorMC.Gui.UI.Controls.GameLog;
 using ColorMC.Gui.UI.Controls.Main;
 using ColorMC.Gui.UI.Controls.NetFrp;
+using ColorMC.Gui.UI.Controls.News;
 using ColorMC.Gui.UI.Controls.ServerPack;
 using ColorMC.Gui.UI.Controls.Setting;
 using ColorMC.Gui.UI.Controls.Skin;
@@ -56,6 +57,7 @@ public static class WindowManager
     public static AddJavaControl? AddJavaWindow { get; set; }
     public static CountControl? CountWindow { get; set; }
     public static NetFrpControl? NetFrpWindow { get; set; }
+    public static MinecraftNewsControl? NewsWindow { get; set; }
 
     public static Dictionary<string, GameEditControl> GameEditWindows { get; } = [];
     public static Dictionary<string, GameConfigEditControl> GameConfigEditWindows { get; } = [];
@@ -93,7 +95,7 @@ public static void Init(string path)
             {
                 AllWindow = new();
                 AllWindow.Model.HeadDisplay = false;
-                AllWindow.Opened();
+                AllWindow.TopOpened();
             }
             else if (SystemInfo.Os == OsType.Linux ||
                 (SystemInfo.Os == OsType.Windows && !SystemInfo.IsWin11))
@@ -627,6 +629,19 @@ public static void ShowNetFrp()
         }
     }
 
+    public static void ShowNews()
+    {
+        if (NewsWindow != null)
+        {
+            NewsWindow.Window.TopActivate();
+        }
+        else
+        {
+            NewsWindow = new();
+            AWindow(NewsWindow);
+        }
+    }
+
 
     public static void ShowError(string? data, Exception? e, bool close = false)
     {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 catch
                 {
                 }
             }
@@ Expand Down Expand Up @@
                         istest = true;
                     }
                     catch
-                    {
+                    {
                     }
                 }
             }
@@ Expand Down Expand Up @@
                         istest = true;
                     }
-                    catch
+                    catch
                     {
                     }
                 }
             }
@@ Expand Down Expand Up @@
                         istest = true;
                     }
                     catch
-                    {
+                    {
                     }
                 }
             }
@@ Expand Down @@