refactor

Author: AXiX-official

README.md

@@ -3,23 +3,34 @@
 [![MIT](https://img.shields.io/github/license/AXiX-official/UnityAsset.NET)](https://github.com/AXiX-official/UnityAsset.NET/master/LICENSE)
 [![NuGet Stats](https://img.shields.io/nuget/v/UnityAsset.NET.svg)](https://www.nuget.org/packages/UnityAsset.NET)
 
-A .NET library for reading and modifying Unity assets and bundles.
+A work-in-progress .NET library for parsing/serializing/patching Unity Engine asset files.
+
+Only support Unity 2017.x or later.
 
 ## Features
 
-For now, it can only do a few simple things in the outer layer of the bundlefile
+### BundleFile
+
+- [x] Parse/Serialize
+- [ ] Patch
+- [ ] Calculate/Patch crc32
+
+### SerializedFile
 
-- Read and write uncompressed/lz4-compressed/lzma-compressed Unity bundlefile
-- Handling UnityCN encryption
-- Calculate and fix the CRC32 value of bundlefile
+- [x] Parse/Serialize
+- [ ] Patch
+
+### Asset
+
+- [x] Parse/Serialize
+- [ ] Patch
 
 ## Acknowledgements
 
-This project uses code from the following open source projects:
+This project stands on the shoulders of these amazing open-source projects:
 
 - [Studio](https://github.com/RazTools/Studio) by [Razmoth](https://github.com/RazTools)
 - [AssetStudio](https://github.com/aelurum/AssetStudio) by [aelurum](https://github.com/aelurum)
 - [AssetsTools.NET](https://github.com/nesrak1/AssetsTools.NET) by [nesrak1](https://github.com/nesrak1)
 - [UnityPy](https://github.com/K0lb3/UnityPy) by [K0lb3](https://github.com/K0lb3)
-
-We are grateful to the developers of these projects for their work.
+- [RustyAssetBundleEXtractor](https://github.com/UniversalGameExtraction/RustyAssetBundleEXtractor) by [UniversalGameExtraction](https://github.com/UniversalGameExtraction)

UnityAsset.NET/Asset.cs

@@ -1,6 +1,6 @@
 using System.Collections.Specialized;
+using UnityAsset.NET.Files.SerializedFiles;
 using UnityAsset.NET.IO;
-using UnityAsset.NET.SerializedFiles;
 
 namespace UnityAsset.NET;
 

UnityAsset.NET/CRC32.cs

@@ -1,4 +1,5 @@
-namespace UnityAsset.NET;
+using System.Runtime.CompilerServices;
+namespace UnityAsset.NET;
 
 public static class CRC32
 {
@@ -491,17 +492,17 @@ public static class CRC32
         71007118, 2857626143, 1470763626, 4190274555, 3490330377, 2120394392, 4035494306, 1591758899, 1999168705,
         3644880208, 616140069, 2328960180, 2736367686, 225524183
     ];
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static byte HIBYTE(uint X) => (byte)((X >> 8) & 0xFF);
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static byte LOBYTE(uint X) => (byte)(X & 0xFF);
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static uint HIWORD(uint X) => (X >> 16) & 0xFFFF;
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static uint LOWORD(uint X) => X & 0xFFFF;
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static uint MAKEWORD(uint X, uint Y) => (Y << 8) | X;
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static uint MAKELONG(uint X, uint Y) => (Y << 16) | X;
 
     private static byte RF(uint X)
@@ -515,13 +516,13 @@ private static byte RF(uint X)
         }
         return 0;
     }
-
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static byte F(uint X) => HIBYTE(HIWORD(Crc32Table[X]));
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static byte G(uint X) => LOBYTE(HIWORD(Crc32Table[X]));
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static byte H(uint X) => HIBYTE(LOWORD(Crc32Table[X]));
-    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static byte I(uint X) => LOBYTE(LOWORD(Crc32Table[X]));
 
     public static byte[] rCRC(uint targetCrc, uint originalCrc)
@@ -552,7 +553,7 @@ public static byte[] rCRC(uint targetCrc, uint originalCrc)
         return new byte[] { d, c, b, a };
     }
 
-    public static uint CalculateCRC32(byte[] data, uint initialCrc = 0)
+    public static uint CalculateCRC32(ReadOnlySpan<byte> data, uint initialCrc = 0)
     {
         uint crc = ~initialCrc;
         var len = data.Length;
@@ -576,10 +577,4 @@ public static uint CalculateCRC32(byte[] data, uint initialCrc = 0)
         }
         return ~crc;
     }
-    
-    public static uint CalculateCRC32(Stream data, uint initialCrc = 0)
-    {
-        data.Position = 0;
-        return CalculateCRC32(new BinaryReader(data).ReadBytes((int)data.Length), initialCrc);
-    }
 }

UnityAsset.NET/CabFileWrapper.cs

@@ -0,0 +1,12 @@
+using UnityAsset.NET.Files.SerializedFiles;
+
+namespace UnityAsset.NET.Files;
+
+public static class BundleFileExtension
+{
+    public static List<Asset> Assets(this BundleFile bf) =>
+        bf.Files
+            .Where(file => file.File is SerializedFile)
+            .SelectMany(file => ((SerializedFile)file.File).Assets)
+            .ToList();
+}

UnityAsset.NET/Files/BundleFileExtension.cs

@@ -1,33 +1,33 @@
 using System.Text;
 using UnityAsset.NET.IO;
 
-namespace UnityAsset.NET.BundleFiles;
+namespace UnityAsset.NET.Files.BundleFiles;
 
-public sealed class BlocksAndCabsInfo
+public sealed class BlocksAndDirectoryInfo
 {
     public byte[] UncompressedDataHash;
     public List<StorageBlockInfo> BlocksInfo;
-    public List<CabInfo> DirectoryInfo;
+    public List<FileEntry> DirectoryInfo;
 
-    public BlocksAndCabsInfo(byte[] uncompressedDataHash,
+    public BlocksAndDirectoryInfo(byte[] uncompressedDataHash,
                               List<StorageBlockInfo> blocksInfo, 
-                              List<CabInfo> directoryInfo)
+                              List<FileEntry> directoryInfo)
     {
         UncompressedDataHash = uncompressedDataHash;
         BlocksInfo = blocksInfo;
         DirectoryInfo = directoryInfo;
     }
 
-    public static BlocksAndCabsInfo Parse(ref DataBuffer db) => new (
+    public static BlocksAndDirectoryInfo Parse(ref DataBuffer db) => new (
         db.ReadBytes(16),
         db.ReadList(db.ReadInt32(), StorageBlockInfo.Parse),
-        db.ReadList(db.ReadInt32(), CabInfo.Parse)
+        db.ReadList(db.ReadInt32(), FileEntry.Parse)
     );
 
     public void Serialize(ref DataBuffer db) {
         db.WriteBytes(UncompressedDataHash);
         db.WriteListWithCount(BlocksInfo, (ref DataBuffer d, StorageBlockInfo info) => info.Serialize(ref d));
-        db.WriteListWithCount(DirectoryInfo, (ref DataBuffer d, CabInfo info) => info.Serialize(ref d));
+        db.WriteListWithCount(DirectoryInfo, (ref DataBuffer d, FileEntry info) => info.Serialize(ref d));
     }
 
     public long SerializeSize => UncompressedDataHash.Length + 8 + 
@@ -39,14 +39,10 @@ public override string ToString()
         StringBuilder sb = new StringBuilder();
         sb.AppendLine($"UncompressedDataHash: {BitConverter.ToString(UncompressedDataHash)}");
         for (int i = 0; i  < BlocksInfo.Count; ++i)
-        {
             sb.Append($"Block {i}: {BlocksInfo[i]}");
-        }
         sb.AppendLine();
         for (int i = 0; i  < DirectoryInfo.Count; ++i)
-        {
             sb.Append($"Directory {i}: {DirectoryInfo[i]}");
-        }
         sb.AppendLine();
         return sb.ToString();
     }