FSoftObjectPath serialize as idx in editor; fix silly LocalizationID …

…order mistake
atenfyr · Jan 30, 2025 · 84c5799 · 84c5799
1 parent c98ba52
commit 84c5799
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 14 deletions.
diff --git a/UAssetAPI/PropertyTypes/Objects/SoftObjectPropertyData.cs b/UAssetAPI/PropertyTypes/Objects/SoftObjectPropertyData.cs
@@ -1,4 +1,5 @@
-using UAssetAPI.UnrealTypes;
+using System;
+using UAssetAPI.UnrealTypes;
 
 namespace UAssetAPI.PropertyTypes.Objects;
 
@@ -96,24 +97,58 @@ public FSoftObjectPath(FTopLevelAssetPath assetPath, FString subPathString)
 
     public FSoftObjectPath(AssetBinaryReader reader)
     {
-        if (reader.Asset.ObjectVersionUE5 >= ObjectVersionUE5.FSOFTOBJECTPATH_REMOVE_ASSET_PATH_FNAMES)
+        // ObjectVersionUE5.DATA_RESOURCES empirical
+        if (reader.Asset.ObjectVersionUE5 >= ObjectVersionUE5.DATA_RESOURCES && reader.Asset.SoftPackageReferenceList != null && reader.Asset.SoftPackageReferenceList.Count > 0)
         {
-            AssetPath = new FTopLevelAssetPath(reader.ReadFName(), reader.ReadFName());
-        }
-        else if (reader.Asset.ObjectVersion >= ObjectVersion.VER_UE4_ADDED_SOFT_OBJECT_PATH)
-        {
-            AssetPath = new FTopLevelAssetPath(null, reader.ReadFName());
+            // serialize as idx
+            int idx = reader.ReadInt32();
+            AssetPath = new FTopLevelAssetPath(FName.DefineDummy(reader.Asset, reader.Asset.SoftPackageReferenceList[idx]), null);
         }
         else
         {
-            AssetPath = new FTopLevelAssetPath(null, null);
+            if (reader.Asset.ObjectVersionUE5 >= ObjectVersionUE5.FSOFTOBJECTPATH_REMOVE_ASSET_PATH_FNAMES)
+            {
+                AssetPath = new FTopLevelAssetPath(reader.ReadFName(), reader.ReadFName());
+            }
+            else if (reader.Asset.ObjectVersion >= ObjectVersion.VER_UE4_ADDED_SOFT_OBJECT_PATH)
+            {
+                AssetPath = new FTopLevelAssetPath(null, reader.ReadFName());
+            }
+            else
+            {
+                AssetPath = new FTopLevelAssetPath(null, null);
+            }
+
+            SubPathString = reader.ReadFString();
         }
-
-        SubPathString = reader.ReadFString();
     }
 
     public int Write(AssetBinaryWriter writer)
     {
+        // ObjectVersionUE5.DATA_RESOURCES empirical
+        if (writer.Asset.ObjectVersionUE5 >= ObjectVersionUE5.DATA_RESOURCES && writer.Asset.SoftPackageReferenceList != null && writer.Asset.SoftPackageReferenceList.Count > 0)
+        {
+            // serialize as idx
+            // don't automatically add to soft package reference list
+            FString softName = AssetPath.PackageName?.Value;
+            if (softName == null) throw new FormatException("Attempt to serialize invalid AssetPath as index");
+
+            int idx = -1;
+            for (int i = 0; i < writer.Asset.SoftPackageReferenceList.Count; i++)
+            {
+                FString testingEntry = writer.Asset.SoftPackageReferenceList[i];
+                if (testingEntry == softName)
+                {
+                    idx = i;
+                    break;
+                }
+            }
+            if (idx < 0) throw new FormatException("Failed to find AssetPath in soft package references list");
+
+            writer.Write(idx);
+            return sizeof(int);
+        }
+
         if (writer.Asset.ObjectVersion < ObjectVersion.VER_UE4_ADDED_SOFT_OBJECT_PATH)
             return writer.Write(SubPathString);
 

diff --git a/UAssetAPI/UAsset.cs b/UAssetAPI/UAsset.cs
@@ -2168,15 +2168,15 @@ private byte[] MakeHeader()
             writer.Write((uint)PackageFlags);
             writer.Write(NameCount);
             writer.Write(NameOffset);
-            if (!IsFilterEditorOnly && ObjectVersion >= ObjectVersion.VER_UE4_ADDED_PACKAGE_SUMMARY_LOCALIZATION_ID)
-            {
-                writer.Write(LocalizationId);
-            }
             if (ObjectVersionUE5 >= ObjectVersionUE5.ADD_SOFTOBJECTPATH_LIST)
             {
                 writer.Write(SoftObjectPathsCount);
                 writer.Write(SoftObjectPathsOffset);
             }
+            if (!IsFilterEditorOnly && ObjectVersion >= ObjectVersion.VER_UE4_ADDED_PACKAGE_SUMMARY_LOCALIZATION_ID)
+            {
+                writer.Write(LocalizationId);
+            }
             if (ObjectVersion >= ObjectVersion.VER_UE4_SERIALIZE_TEXT_IN_PACKAGES)
             {
                 writer.Write(GatherableTextDataCount);