Some Fix

Author: AXiX-official

UnityAsset.NET/BundleFile/BlocksAndDirectoryInfo.cs

@@ -3,7 +3,7 @@
 
 namespace UnityAsset.NET.BundleFile;
 
-public class BlocksAndDirectoryInfo
+public sealed class BlocksAndDirectoryInfo
 {
     public byte[] UncompressedDataHash;
 
@@ -115,6 +115,11 @@ public void merge()
                 newBlocksInfo.Add(block);
             }
         }
+        
+        if (DirectoryInfo.Sum(x => x.size) != newBlocksInfo.Sum(x => x.uncompressedSize))
+        {
+            throw new Exception("Expected all blocks size bigger than CAB size");
+        }
 
         BlocksInfo = newBlocksInfo;
         Update();

UnityAsset.NET/BundleFile/BundleFile.cs

@@ -115,6 +115,7 @@ public BundleFile(Stream input, bool original = false, string? key = null)
         ReadBlocks(reader);
 
         DataInfo.uncompresseFlags();
+        DataInfo.merge();
         Header.flags &= (ArchiveFlags)~StorageBlockFlags.CompressionTypeMask;
         DataInfo.calculateSize(ref Header.uncompressedBlocksInfoSize,ref Header.compressedBlocksInfoSize);
 
@@ -272,11 +273,7 @@ public void Write(Stream output, string infoPacker = "none", string dataPacker =
             throw new Exception("UnityCN encryption requires lz4 or lz4hc compression type");
         }
 
-        if (dataPacker == "none")
-        {
-            DataInfo.merge();
-        }
-        else
+        if (dataPacker != "none")
         {
             DataInfo.Split();
         }
@@ -336,16 +333,16 @@ public void Write(Stream output, string infoPacker = "none", string dataPacker =
         using AssetWriter writer = new AssetWriter(output);
 
         Header.Write(writer);
-        
-        if (HeaderAligned)
-        {
-            writer.AlignStream(16);
-        }
 
         if (unityCN && UnityCNInfo != null)
         {
             UnityCNInfo.Write(writer);
         }
+        
+        if (HeaderAligned)
+        {
+            writer.AlignStream(16);
+        }
 
         if (!BlocksInfoAtTheEnd)
         {

UnityAsset.NET/BundleFile/CABInfo.cs

@@ -1,4 +1,5 @@
-using UnityAsset.NET.IO;
+using System.Text;
+using UnityAsset.NET.IO;
 
 namespace UnityAsset.NET.BundleFile;
 
@@ -27,11 +28,12 @@ public void Write(AssetWriter writer)
 
     public override string ToString()
     {
-        return 
-            $"offset: 0x{offset:X8} | " + 
-            $"size: 0x{size:X8} | " + 
-            $"flags: {flags} | " + 
-            $"path: {path}";
+        StringBuilder sb = new StringBuilder();
+        sb.AppendFormat("offset: 0x{0:X8} | ", offset);
+        sb.AppendFormat("size: 0x{0:X8} | ", size);
+        sb.AppendFormat("flags: {0} | ", flags);
+        sb.AppendFormat("path: {0}", path);
+        return sb.ToString();
     }
 
     public long CalculateSize()

UnityAsset.NET/BundleFile/Header.cs

@@ -1,4 +1,5 @@
-using UnityAsset.NET.Enums;
+using System.Text;
+using UnityAsset.NET.Enums;
 using UnityAsset.NET.IO;
 
 namespace UnityAsset.NET.BundleFile;
@@ -47,15 +48,16 @@ public void Write(AssetWriter writer)
 
         public override string ToString()
         {
-            return
-                $"signature: {signature} | " +
-                $"version: {version} | " +
-                $"unityVersion: {unityVersion} | " +
-                $"unityRevision: {unityRevision} | " +
-                $"size: 0x{size:X8} | " +
-                $"compressedBlocksInfoSize: 0x{compressedBlocksInfoSize:X8} | " +
-                $"uncompressedBlocksInfoSize: 0x{uncompressedBlocksInfoSize:X8} | " +
-                $"flags: 0x{(int)flags:X8}";
+            StringBuilder sb = new StringBuilder();
+            sb.AppendFormat("signature: {0} | ", signature);
+            sb.AppendFormat("version: {0} | ", version);
+            sb.AppendFormat("unityVersion: {0} | ", unityVersion);
+            sb.AppendFormat("unityRevision: {0} | ", unityRevision);
+            sb.AppendFormat("size: 0x{0:X8} | ", size);
+            sb.AppendFormat("compressedBlocksInfoSize: 0x{0:X8} | ", compressedBlocksInfoSize);
+            sb.AppendFormat("uncompressedBlocksInfoSize: 0x{0:X8} | ", uncompressedBlocksInfoSize);
+            sb.AppendFormat("flags: 0x{0:X8}", (int)flags);
+            return sb.ToString();
         }
 
         public long CalculateSize()

UnityAsset.NET/BundleFile/StorageBlockInfo.cs

@@ -1,4 +1,5 @@
-using UnityAsset.NET.Enums;
+using System.Text;
+using UnityAsset.NET.Enums;
 using UnityAsset.NET.IO;
 
 namespace UnityAsset.NET.BundleFile;
@@ -32,9 +33,10 @@ public void Write(AssetWriter writer)
 
     public override string ToString()
     {
-        return 
-            $"compressedSize: 0x{compressedSize:X8} | " +
-            $"uncompressedSize: 0x{uncompressedSize:X8} | " +
-            $"flags: 0x{(int)flags:X8}";
+        StringBuilder sb = new StringBuilder();
+        sb.AppendFormat("compressedSize: 0x{0:X8} | ", compressedSize);
+        sb.AppendFormat("uncompressedSize: 0x{0:X8} | ", uncompressedSize);
+        sb.AppendFormat("flags: 0x{0:X8}", (int)flags);
+        return sb.ToString();
     }
 }

UnityAsset.NET/IO/AssetReader.cs

@@ -3,7 +3,7 @@
 
 namespace UnityAsset.NET.IO;
 
-public class AssetReader : BinaryReader
+public sealed class AssetReader : BinaryReader
 {
     public bool BigEndian;
 
@@ -92,8 +92,17 @@ public override uint ReadUInt32()
             return base.ReadUInt32();
         }
     }
-    
-    
+
+    public string ReadNullTerminated()
+    {
+        string output = "";
+        char curChar;
+        while ((curChar = ReadChar()) != 0x00)
+        {
+            output += curChar;
+        }
+        return output;
+    }
 
     public string ReadStringToNull(int maxLength = 32767)
     {

UnityAsset.NET/IO/AssetWriter.cs

@@ -3,7 +3,7 @@
 
 namespace UnityAsset.NET.IO;
 
-public class AssetWriter : BinaryWriter
+public sealed class AssetWriter : BinaryWriter
 {
     public bool BigEndian;