Merge branch 'UE4-2014' into feature/Feature-merge_UE4

EliotVU · Jun 14, 2022 · ea3c1aa · ea3c1aa
2 parents 9a65954 + ab49963
commit ea3c1aa
Show file tree

Hide file tree

Showing 25 changed files with 912 additions and 637 deletions.
diff --git a/Benchmark/UnrealTestStream.cs b/Benchmark/UnrealTestStream.cs
@@ -8,16 +8,20 @@ namespace Eliot.UELib.Benchmark
     /// Hackish workaround for the issue with UPackageStream requiring a file and path, so that we can perform stream tests without a package.
     public class UnrealTestStream : UnrealReader, IUnrealStream
     {
+        public uint Version => _Archive.Version;
+        public uint LicenseeVersion { get; }
+        public uint UE4Version { get; }
+        public bool BigEndianCode { get; }
+
+        public UnrealPackage Package => _Archive.Package;
+        public UnrealReader UR => this;
+        public UnrealWriter UW { get; }
+
         public UnrealTestStream(IUnrealArchive archive, Stream baseStream) : base(archive, baseStream)
         {
             _Archive = archive;
         }
 
-        public UnrealPackage Package => _Archive.Package;
-        public UnrealReader UR => this;
-        public UnrealWriter UW { get; }
-        public uint Version => _Archive.Version;
-
         public string ReadASCIIString()
         {
             throw new NotImplementedException();

diff --git a/Test/UnrealStreamTests.cs b/Test/UnrealStreamTests.cs
@@ -25,8 +25,11 @@ public void ReadString()
         {
             using var stream = CreateTempStream();
             using var linker = new UnrealPackage(stream);
-            // The easiest version to test against.
-            linker.Version = 300;
+            linker.Summary = new UnrealPackage.PackageFileSummary()
+            {
+                // The easiest version to test against.
+                Version = 300
+            };
             using var writer = new BinaryWriter(stream);
             // Skip past the signature
             writer.Seek(sizeof(int), SeekOrigin.Begin);
@@ -59,8 +62,11 @@ public void ReadAtomicStruct()
         {
             using var stream = CreateTempStream();
             using var linker = new UnrealPackage(stream);
-            // The easiest version to test against.
-            linker.Version = 300;
+            linker.Summary = new UnrealPackage.PackageFileSummary()
+            {
+                // The easiest version to test against.
+                Version = 300
+            };
             using var writer = new BinaryWriter(stream);
             // Skip past the signature
             writer.Seek(sizeof(int), SeekOrigin.Begin);

diff --git a/src/Core/Classes/Props/UProperty.cs b/src/Core/Classes/Props/UProperty.cs
@@ -31,8 +31,7 @@ public partial class UProperty : UField, IUnrealNetObject
 
         [CanBeNull] public UName CategoryName;
 
-        [Obsolete("See CategoryName")]
-        public int CategoryIndex { get; }
+        [Obsolete("See CategoryName")] public int CategoryIndex { get; }
 
         [CanBeNull] public UEnum ArrayEnum { get; private set; }
 
@@ -115,30 +114,36 @@ protected override void Deserialize()
                 Record(nameof(deusFlags), deusFlags);
             }
 #endif
-            if (!Package.IsConsoleCooked())
+            // FIXME: UE4 version
+            if (!Package.IsConsoleCooked() && _Buffer.UE4Version < 160)
             {
                 CategoryName = _Buffer.ReadNameReference();
                 Record(nameof(CategoryName), CategoryName);
+            }
 
-                if (Package.Version > 400)
-                {
-                    ArrayEnum = GetIndexObject(_Buffer.ReadObjectIndex()) as UEnum;
-                    Record("ArrayEnum", ArrayEnum);
-                }
-                else
-                {
+            if (Package.Version > 400)
+            {
+                ArrayEnum = GetIndexObject(_Buffer.ReadObjectIndex()) as UEnum;
+                Record("ArrayEnum", ArrayEnum);
+            }
 #if THIEF_DS || DEUSEX_IW
-                    if (Package.Build == BuildGeneration.Thief)
-                    {
-                        short deusInheritedOrRuntimeInstiantiated = _Buffer.ReadInt16();
-                        Record(nameof(deusInheritedOrRuntimeInstiantiated), deusInheritedOrRuntimeInstiantiated);
-                        short deusUnkInt16= _Buffer.ReadInt16();
-                        Record(nameof(deusUnkInt16), deusUnkInt16);
-                    }
+            if (Package.Build == BuildGeneration.Thief)
+            {
+                short deusInheritedOrRuntimeInstiantiated = _Buffer.ReadInt16();
+                Record(nameof(deusInheritedOrRuntimeInstiantiated), deusInheritedOrRuntimeInstiantiated);
+                short deusUnkInt16 = _Buffer.ReadInt16();
+                Record(nameof(deusUnkInt16), deusUnkInt16);
+            }
 #endif
-                }
+#if UE4
+            if (_Buffer.UE4Version > 0)
+            {
+                // RepNotify function name
+                var repnotifyFunc = _Buffer.ReadNameReference();
+                Record("RepNotifyFunc", repnotifyFunc);
+                return;
             }
-
+#endif
             if (HasPropertyFlag(PropertyFlagsLO.Net))
             {
                 RepOffset = _Buffer.ReadUShort();
@@ -155,7 +160,8 @@ protected override void Deserialize()
 #endif
             // Appears to be a UE2X feature, it is not present in UE2 builds with no custom LicenseeVersion
             // Albeit DeusEx indicates otherwise?
-            if ((HasPropertyFlag(PropertyFlagsLO.EditorData) && (Package.Build == BuildGeneration.UE2_5 || Package.Build == BuildGeneration.Thief))
+            if ((HasPropertyFlag(PropertyFlagsLO.EditorData) &&
+                 (Package.Build == BuildGeneration.UE2_5 || Package.Build == BuildGeneration.Thief))
                 // No property flag
                 || Package.Build == BuildGeneration.Vengeance)
             {
@@ -169,12 +175,12 @@ protected override void Deserialize()
                 if (_Buffer.Version < 157)
                 {
                     throw new NotSupportedException("< 157 Spellborn packages are not supported");
-                    
+
                     if (133 < _Buffer.Version)
                     {
                         // idk
                     }
-                    
+
                     if (134 < _Buffer.Version)
                     {
                         int unk32 = _Buffer.ReadInt32();

diff --git a/src/Core/Classes/Props/UPropertyDecompiler.cs b/src/Core/Classes/Props/UPropertyDecompiler.cs
@@ -11,28 +11,7 @@ public partial class UProperty
         // Called before the var () is printed.
         public virtual string PreDecompile()
         {
-            string tooltipValue = null;
-            MetaData?.Tags.TryGetValue("ToolTip", out tooltipValue);
-            if (tooltipValue == null)
-            {
-                return string.Empty;
-            }
-
-            var comment = $"{UDecompilingState.Tabs}/** ";
-            // Multiline comment?
-            if (tooltipValue.IndexOf('\n') != -1)
-            {
-                comment +=
-                    " \r\n" +
-                    $"{UDecompilingState.Tabs} *{tooltipValue.Replace("\n", "\n" + UDecompilingState.Tabs + " *")}" +
-                    $"\r\n{UDecompilingState.Tabs}";
-            }
-            else
-            {
-                comment += tooltipValue;
-            }
-
-            return $"{comment} */\r\n";
+            return FormatTooltipMetaData();
         }
 
         public override string Decompile()