up 修bug

Author: Coloryr

src/ColorMC.Core/Game/GameSchematic.cs

@@ -156,9 +156,51 @@ private static async Task<SchematicObj> ReadNBTAsync(string file)
             Width = (size[0] as NbtInt)!.ValueInt,
             Height = (size[1] as NbtInt)!.ValueInt,
             Length = (size[2] as NbtInt)!.ValueInt,
-            Type = SchematicType.Create
+            Type = SchematicType.Create,
+            Blocks = []
         };
 
+        var orderBlock = new Dictionary<int, string>();
+
+        var types = tag.TryGet<NbtList>("palette");
+        if (types != null)
+        {
+            int index = 0;
+            foreach (var item1 in types)
+            {
+                if (item1 is NbtCompound nbt1)
+                {
+                    orderBlock[index] = nbt1.TryGet<NbtString>("Name")!.Value;
+                }
+                index++;
+            }
+        }
+
+        var group = orderBlock.GroupBy(item2 => item2.Value);
+        foreach (var item1 in group)
+        {
+            item.Blocks.Add(item1.Key, 0);
+        }
+
+        var blocks = tag.TryGet<NbtList>("blocks");
+        if (blocks != null)
+        {
+            foreach (var item1 in blocks)
+            {
+                if (item1 is NbtCompound nbt1)
+                {
+                    var index = nbt1.TryGet<NbtInt>("state")!.ValueInt;
+                    if (orderBlock.TryGetValue(index, out var name))
+                    {
+                        item.Blocks[name]++;
+                    }
+                }
+            }
+        }
+
+        item.BlockCount = item.Blocks.Sum(item => item.Value);
+        item.BlockTypes = item.Blocks.Count;
+
         return item;
     }
 

src/ColorMC.Core/Helpers/AddGameHelper.cs

@@ -368,6 +368,8 @@ private static async Task<GameRes> MMCAsync(string? name, string? group, string
     private static async Task<GameRes> HMCLAsync(string? name, string? group, string file, ZipArchive zip, 
         List<ZipArchiveEntry>? unselect, IOverGameGui? gui, IAddGui? packgui)
     {
+        unselect ??= [];
+
         packgui?.SetState(AddState.ReadInfo);
         HMCLObj? obj = null;
         CurseForgePackObj? obj1 = null;

src/ColorMC.Core/Helpers/GameHelper.cs

@@ -231,7 +231,7 @@ public static void ReadyForgeWrapper()
         {
             Name = "io.github.zekerzhayard:forgewrapper:colormc-1.6.0",
             Local = Path.Combine(LibrariesPath.BaseDir, "io", "github", "zekerzhayard", "forgewrapper",
-            "colormc-1.6.0", "forgewrapper-colormc-1.6.0.jar")
+            "prism-2025-12-07", "ForgeWrapper-prism-2025-12-07.jar")
         };
         var file = new FileInfo(ForgeWrapper.Local);
         if (!file.Exists)
@@ -240,7 +240,7 @@ public static void ReadyForgeWrapper()
             {
                 Directory.CreateDirectory(file.DirectoryName!);
             }
-            PathHelper.WriteBytes(file.FullName, Resource1.ForgeWrapper_colormc_1_6_0);
+            PathHelper.WriteBytes(file.FullName, Resource1.ForgeWrapper_prism_2025_12_07);
         }
     }
 

src/ColorMC.Core/Objs/Minecraft/SchematicObj.cs

@@ -34,6 +34,18 @@ public record SchematicObj
     /// 描述
     /// </summary>
     public string Description { get; set; }
+    /// <summary>
+    /// 方块总数
+    /// </summary>
+    public int BlockCount { get; set; }
+    /// <summary>
+    /// 方块种类
+    /// </summary>
+    public int BlockTypes { get; set; }
+    /// <summary>
+    /// 方块数量
+    /// </summary>
+    public Dictionary<string, int> Blocks;
 
     /// <summary>
     /// 是否已损坏

src/ColorMC.Core/Resource1.Designer.cs

@@ -121,8 +121,8 @@
   <data name="ColorMCASM-1.1-all" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\ColorMCASM-1.1-all.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="ForgeWrapper_colormc_1_6_0" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\ForgeWrapper-colormc-1.6.0.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="ForgeWrapper-prism-2025-12-07" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\ForgeWrapper-prism-2025-12-07.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="OptifineWrapper_1_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\OptifineWrapper-1.1.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

src/ColorMC.Core/Resource1.resx

@@ -48,6 +48,7 @@
     <None Remove="Resource\Icon\Button\AddAccount.svg" />
     <None Remove="Resource\Icon\Button\AddShape.svg" />
     <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\close.svg" />
     <None Remove="Resource\Icon\cog.svg" />
@@ -146,6 +147,7 @@
     <None Remove="Resource\Icon\Item\download.svg" />
     <None Remove="Resource\Icon\Item\DownloadFile.svg" />
     <None Remove="Resource\Icon\Item\Import.svg" />
+    <None Remove="Resource\Icon\Item\Link.svg" />
     <None Remove="Resource\Icon\Item\StarFill.svg" />
     <None Remove="Resource\Icon\LuckBlock\down.svg" />
     <None Remove="Resource\Icon\LuckBlock\Triangle.svg" />
@@ -191,6 +193,7 @@
     <AvaloniaResource Include="Resource\Icon\Button\AddAccount.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\AddShape.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\ArrowRight.svg" />
+    <AvaloniaResource Include="Resource\Icon\Button\Close.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\Cog.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\Counter.svg" />
     <AvaloniaResource Include="Resource\Icon\Button\Delete.svg" />
@@ -284,6 +287,7 @@
     <AvaloniaResource Include="Resource\Icon\Item\Connection.svg" />
     <AvaloniaResource Include="Resource\Icon\Item\DownloadFile.svg" />
     <AvaloniaResource Include="Resource\Icon\Item\Import.svg" />
+    <AvaloniaResource Include="Resource\Icon\Item\Link.svg" />
     <AvaloniaResource Include="Resource\Icon\Item\StarNone.svg" />
     <AvaloniaResource Include="Resource\Icon\Item\StarFill.svg" />
     <AvaloniaResource Include="Resource\Icon\ListGrid\ListInfo.svg" />