Sync commit - working on making things

Author: Mgamerz

LegendaryExplorer/LegendaryExplorerCore/Packages/CloningImportingAndRelinking/EntryImporter.cs

@@ -864,8 +864,15 @@ public static bool ReplaceExportDataWithAnother(ExportEntry incomingExport, Expo
             using var res = new EndianReader(MemoryManager.GetMemoryStream()) { Endian = targetExport.FileRef.Endian };
             if (incomingExport.HasStack)
             {
-                res.Writer.Write(incomingExport.DataReadOnly.Slice(0, 8));
-                res.Writer.WriteFromBuffer(GetStackDummy(targetExport.Game));
+                // Seems like this doesn't work, maybe stack has already been written
+                // or is overwritten somewhere.
+                // 12/30/2025 - Use StateFrame to copy stack over
+                var stateFrame = StateFrame.FromExport(incomingExport);
+                var stateFrameBytes = stateFrame.ToBytes(targetExport.FileRef);
+                res.Writer.Write(stateFrameBytes);
+                res.Writer.Write(incomingExport.NetIndex); // Write NetIndex
+                // res.Writer.Write(incomingExport.DataReadOnly.Slice(0, 8));
+                // res.Writer.WriteFromBuffer(GetStackDummy(targetExport.Game));
             }
             else
             {

LegendaryExplorer/LegendaryExplorerCore/Packages/ExportEntry.cs

@@ -945,6 +945,23 @@ public void WritePrePropsAndProperties(byte[] prePropBytes, PropertyCollection p
             Data = m.ToArray();
         }
 
+        ///// <summary>
+        ///// Used for writing StateFrame pre-prop binary.
+        ///// </summary>
+        ///// <param name="bin"></param>
+        ///// <param name="props"></param>
+        ///// <param name="binStart"></param>
+        //public void WritePrePropsAndProperties(ObjectBinary bin, PropertyCollection props, int binStart = -1)
+        //{
+        //    MemoryStream ms = MemoryManager.GetMemoryStream(_data.Length);
+        //    var m = new EndianReader(ms) { Endian = _fileRef.Endian };
+        //    bin.WriteTo(m.Writer, _fileRef);
+        //    props.WriteTo(m.Writer, _fileRef);
+        //    binStart = binStart == -1 ? propsEnd() : binStart; // this allows us to precompute the starting position, which can avoid issues during relink as props may not have resolved yet
+        //    m.Writer.Write(_data, binStart, _data.Length - binStart);
+        //    Data = m.ToArray();
+        //}
+
         public int GetPropertyStart()
         {
             if (HasStack)

LegendaryExplorer/LegendaryExplorerCore/Packages/PackageResynthesizer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using LegendaryExplorerCore.DebugTools;
 using LegendaryExplorerCore.Diagnostics;
@@ -169,7 +168,6 @@ private static void CopyPackageHeader(IMEPackage package, IMEPackage newPackage)
             {
                 meNewPackage.AdditionalPackagesToCook.AddRange(mePackage.AdditionalPackagesToCook);
             }
-            // Todo: Generations?
         }
 
         private static void PortOrdering(EntryOrdering ordering, IMEPackage newPackage, IEntry parent, ESynthesisMode mode, List<ImportEntry> importsToConvert = null)
@@ -269,6 +267,15 @@ private static void PortOrdering(EntryOrdering ordering, IMEPackage newPackage,
                         EntryImporter.ImportAndRelinkEntries(EntryImporter.PortingOption.ReplaceSingular,
                             ordering.Entry, newPackage, destExp, true,
                             new RelinkerOptionsPackage() { RelinkAllowDifferingClassesInRelink = true, ImportExportDependencies = false }, out _);
+
+
+                        // Restore NetIndex and LatentAction
+                        //destExp.NetIndex = oExp.NetIndex;
+                        //if (destExp.HasStack)
+                        //{
+                        //    StateFrame oStack = StateFrame.FromExport(oExp);
+                        //    destExp.WritePrePropsAndProperties(oStack, destExp.GetProperties());
+                        //}
                     }
                 }
             }