Refactor SerializableStructure.TryRead

cvusmo · Feb 26, 2024 · e9d46bb · e9d46bb
1 parent 1da1d23
commit e9d46bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Source/AssetRipper.Import/AssetCreation/GameAssetFactory.cs b/Source/AssetRipper.Import/AssetCreation/GameAssetFactory.cs
@@ -69,7 +69,7 @@ private static IMonoBehaviour ReadMonoBehaviour(IMonoBehaviour monoBehaviour, Re
 				if (type is not null && TypeTreeNodeStruct.TryMakeFromTypeTree(type.OldType, out TypeTreeNodeStruct rootNode))
 				{
 					structure = SerializableTreeType.FromRootNode(rootNode).CreateSerializableStructure();
-					if (structure.TryRead(ref reader, monoBehaviour.Collection.Version, monoBehaviour.Collection.Flags))
+					if (structure.TryRead(ref reader, monoBehaviour))
 					{
 						monoBehaviour.Structure = structure;
 					}

diff --git a/Source/AssetRipper.Import/Structure/Assembly/Serializable/SerializableStructure.cs b/Source/AssetRipper.Import/Structure/Assembly/Serializable/SerializableStructure.cs
@@ -9,6 +9,7 @@
 using AssetRipper.Import.Structure.Assembly.Mono;
 using AssetRipper.IO.Endian;
 using AssetRipper.IO.Files.SerializedFiles;
+using AssetRipper.SourceGenerated.Classes.ClassID_114;
 using AssetRipper.Yaml;
 
 namespace AssetRipper.Import.Structure.Assembly.Serializable
@@ -142,11 +143,11 @@ private bool IsAvailable(in SerializableType.Field field)
 			return true;
 		}
 
-		public bool TryRead(ref EndianSpanReader reader, UnityVersion version, TransferInstructionFlags flags)
+		public bool TryRead(ref EndianSpanReader reader, IMonoBehaviour monoBehaviour)
 		{
 			try
 			{
-				Read(ref reader, version, flags);
+				Read(ref reader, monoBehaviour.Collection.Version, monoBehaviour.Collection.Flags);
 			}
 			catch (Exception ex)
 			{

diff --git a/Source/AssetRipper.Import/Structure/Assembly/Serializable/UnloadedStructure.cs b/Source/AssetRipper.Import/Structure/Assembly/Serializable/UnloadedStructure.cs
@@ -52,7 +52,7 @@ private void ThrowIfNotStructure()
 		if (structure is not null)
 		{
 			EndianSpanReader reader = new EndianSpanReader(structureData, monoBehaviour.Collection.EndianType);
-			if (structure.TryRead(ref reader, monoBehaviour.Collection.Version, monoBehaviour.Collection.Flags))
+			if (structure.TryRead(ref reader, monoBehaviour))
 			{
 				monoBehaviour.Structure = structure;
 				return structure;