Update v2.3.4.18

Author: Lunaretic

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -133,7 +133,14 @@ public void Apply(TTModel ttModel, XivMdl currentMdl = null, XivMdl originalMdl
                     throw new Exception("Cannot copy settings from null MDL.");
                 }
                 ModelModifiers.ClearShapeData(ttModel, loggingFunction);
-                ModelModifiers.MergeShapeData(ttModel, originalMdl, loggingFunction);
+                try
+                {
+                    ModelModifiers.MergeShapeData(ttModel, originalMdl, loggingFunction);
+                }
+                catch
+                {
+                    throw new Exception("Failed to apply the original shape data.\nThis is likely due to changes to the original model without preserving the vertices' order.");
+                }
             }
 
             if (AutoScale)

xivModdingFramework/Mods/FileTypes/TTMP.cs

@@ -192,7 +192,6 @@ public async Task<int> CreateWizardModPack(ModPackData modPackData, IProgress<do
                 var zf = new ZipFile();
                 zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
                 zf.CompressionLevel = Ionic.Zlib.CompressionLevel.None;
-                zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
                 zf.AddFile(_tempMPL, "");
                 zf.AddFile(_tempMPD, "");
                 zf.Save(modPackPath);
@@ -319,7 +318,6 @@ public async Task<int> CreateSimpleModPack(SimpleModPackData modPackData, Direct
                     var zf = new ZipFile();
                     zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
                     zf.CompressionLevel = Ionic.Zlib.CompressionLevel.None;
-                    zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
                     zf.AddFile(_tempMPL, "");
                     zf.AddFile(_tempMPD, "");
                     zf.Save(modPackPath);

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -242,8 +242,18 @@ await Task.Run(async () =>
                             using (var binaryReader = new BinaryReader(File.OpenRead(datFilePath)))
                             {
                                 binaryReader.BaseStream.Seek(24, SeekOrigin.Begin);
-                                var b = binaryReader.ReadByte();
-                                if (b != 0)
+                                bool anyNonZero = false;
+                                for (int byteIdx = 0; byteIdx < 8; byteIdx++)
+                                {
+                                    if (binaryReader.ReadByte() != 0)
+                                    {
+                                        anyNonZero = true;
+                                        break;
+                                    }
+                                }
+
+                                // If there is any data in these bytes, it is an original dat.
+                                if (anyNonZero)
                                 {
                                     datList.Add(datFilePath);
                                 }
@@ -293,8 +303,18 @@ await Task.Run(async () =>
                             using (var binaryReader = new BinaryReader(File.OpenRead(datFilePath)))
                             {
                                 binaryReader.BaseStream.Seek(24, SeekOrigin.Begin);
+                                bool anyNonZero = false;
+                                for (int byteIdx = 0; byteIdx < 8; byteIdx++)
+                                {
+                                    if (binaryReader.ReadByte() != 0)
+                                    {
+                                        anyNonZero = true;
+                                        break;
+                                    }
+                                }
 
-                                if (binaryReader.ReadByte() == 0)
+                                // If it's all zeros, this is a custom modded dat.
+                                if(!anyNonZero)
                                 {
                                     datList.Add(datFilePath);
                                 }