Update 2.3.1.9

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -1816,6 +1816,13 @@ await Task.Run(() => {
                                         var mdlFileHash = HashGenerator.GetHash(mdlFile);
 
                                         var mtrlFile = "mt_" + nRoot.GetBaseFileName(true)  + "_a.mtrl";
+                                        if(secondary == XivItemType.tail)
+                                        {
+                                            // Tail materials don't actually use their slot name, even though their model does,
+                                            // for whatever reason.
+                                            mtrlFile = "mt_" + nRoot.GetBaseFileName(false) + "_a.mtrl";
+                                        }
+
                                         var mtrlFileHash = HashGenerator.GetHash(mtrlFile);
 
                                         var hasModel = Hashes.ContainsKey(mfolderHash) && Hashes[mfolderHash].Contains(mdlFileHash);
@@ -1904,7 +1911,6 @@ public static async Task CacheAllRealRoots()
             types[XivItemType.accessory].Add(XivItemType.none);
             types[XivItemType.outdoor].Add(XivItemType.none);
 
-
             var tasks = new List<Task<List<XivDependencyRootInfo>>>();
             foreach (var kv in types)
             {

xivModdingFramework/Items/Categories/Gear.cs

@@ -745,7 +745,7 @@ await Task.Run(() => Parallel.For(1, 200, (i) =>
             {XivStrings.Body_Hands_Legs, "top"},
             {XivStrings.Body_Legs_Feet, "top"},
             {XivStrings.Body_Hands_Legs_Feet, "top"},
-            {XivStrings.Legs_Feet, "top"},
+            {XivStrings.Legs_Feet, "dwn"},
             {XivStrings.All, "top"},
             {XivStrings.Face, "fac"},
             {XivStrings.Iris, "iri"},

xivModdingFramework/Models/FileTypes/Eqp.cs

@@ -876,10 +876,10 @@ private async Task<ushort> GetRawEquipmentDeformationParameters(int equipmentId,
                 return 0;
             }
 
-            var parameters = new byte[EquipmentParameterEntrySize];
+            var parameters = new byte[EquipmentDeformerParameterEntrySize];
 
 
-            for (var idx = 0; idx < EquipmentParameterEntrySize; idx++)
+            for (var idx = 0; idx < EquipmentDeformerParameterEntrySize; idx++)
             {
                 parameters[idx] = data[offset + idx];
             }
@@ -997,7 +997,7 @@ private byte[] ExpandEqdpBlock(byte[] eqdpData, int setId)
                 }
             }
 
-            ushort nextOffset = (ushort)(lastOffset > 0 ? (lastOffset + blockSize) : 0);
+            ushort nextOffset = (ushort)(lastOffset >= 0 ? (lastOffset + blockSize) : 0);
             IOUtil.ReplaceBytesAt(eqdpData, BitConverter.GetBytes(nextOffset), headerEntryOffset);
 
             // 6 Byte basic header, then block table.

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -2100,7 +2100,6 @@ await Task.Run(async () =>
                 // Time to pull in the Model Modifier for any extra steps before we pass
                 // it to the raw MDL creation function.
 
-                loggingFunction(false, "Merging in existing Attribute & Material Data...");
 
                 XivMdl ogMdl = null;
 
@@ -2116,6 +2115,8 @@ await Task.Run(async () =>
                     ogMdl = currentMdl;
                 }
 
+                loggingFunction(false, "Merging in existing Attribute & Material Data...");
+
                 // Apply our Model Modifier options to the model.
                 options.Apply(ttModel, currentMdl, ogMdl, loggingFunction);
 
@@ -4568,7 +4569,7 @@ public async Task<string> GetMdlPath(IItemModel itemModel, XivRace xivRace, stri
             {XivStrings.Head_Body, "top"},
             {XivStrings.Body_Hands, "top"},
             {XivStrings.Body_Hands_Legs, "top"},
-            {XivStrings.Body_Legs_Feet, "top"},
+            {XivStrings.Body_Legs_Feet, "dwn"},
             {XivStrings.Body_Hands_Legs_Feet, "top"},
             {XivStrings.Legs_Feet, "top"},
             {XivStrings.All, "top"},

xivModdingFramework/Models/FileTypes/Sklb.cs

@@ -298,7 +298,7 @@ private static async Task<string> GetExtraSkelbPath(XivDependencyRootInfo root,
             }
 
             // Hair and face types have a race defined at root level.
-            if ((type == Est.EstType.Face || type == Est.EstType.Hair) && race != XivRace.All_Races)
+            if ((type == Est.EstType.Face || type == Est.EstType.Hair) && race == XivRace.All_Races)
             {
                 var ret = new Dictionary<XivRace, ExtraSkeletonEntry>();
                 race = XivRaces.GetXivRace(root.PrimaryId);

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -686,7 +686,10 @@ public static void MergeShapeData(TTModel ttModel, XivMdl ogMdl, Action<bool, st
                                     // Because we're using the index offset that's relative to the original model's mesh group index list.
                                     var indexId = d.BaseIndex;
 
-                                    ttPart.Replacements.Add(indexId, vertexId);
+                                    if (!ttPart.Replacements.ContainsKey(indexId))
+                                    {
+                                        ttPart.Replacements.Add(indexId, vertexId);
+                                    }
                                 }
                                 newGroup.ShapeParts.Add(ttPart);
                             }

xivModdingFramework/Mods/FileTypes/ItemMetadata.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
@@ -88,6 +89,31 @@ public ItemMetadata(XivDependencyRoot root)
             Root = root;
         }
 
+        /// <summary>
+        /// Validates this metadata file to ensure it is being written to the correct location.
+        /// </summary>
+        public void Validate(string path)
+        {
+            const string prefix = "INVALID METADATA ERROR: ";
+            if (Root == null)
+            {
+                throw new InvalidDataException(prefix + "Internal Root is NULL.");
+            }
+
+            if(Root.Info.GetRootFile() != path)
+            {
+                throw new InvalidDataException(prefix + "Internal file path not match destination file path.");
+            }
+
+            foreach(var entry in EstEntries)
+            {
+                if(entry.Value.SetId != Root.Info.PrimaryId && entry.Value.SetId != Root.Info.SecondaryId)
+                {
+                    throw new InvalidDataException(prefix + "Extra Skeleton Table entries do not match internal set number.");
+                }
+            }
+        }
+
         /// <summary>
         /// Gets the metadata file for an IItem entry
         /// </summary>

xivModdingFramework/Mods/Modding.cs

@@ -379,6 +379,8 @@ public async Task<bool> ToggleModUnsafe(bool enable, Mod mod, bool includeIntern
                         var data = await dat.GetType2Data(mod.fullPath, false);
                         var meta = await ItemMetadata.Deserialize(data);
 
+                        meta.Validate(mod.fullPath);
+
                         // And write that metadata to the actual constituent files.
                         await ItemMetadata.ApplyMetadata(meta);
                     }
@@ -436,9 +438,9 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
                 progress?.Report((++modNum, modList.Mods.Count, string.Empty));
             }
 
-            if (includeInternal)
+            if (includeInternal && !enable)
             {
-                // Disable these last, just to avoid any potential strangeness.
+                // Disable these last.
                 var internalEntries = modList.Mods.Where(x => x.IsInternal());
                 foreach (var modEntry in internalEntries)
                 {
@@ -449,6 +451,17 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
 
             SaveModList(modList);
 
+            if (includeInternal && !enable)
+            {
+                // Now go ahead and delete the internal files, to prevent them
+                // being accidentally re-enabled (They should be re-built by the metadata file imports)
+                var internalEntries = modList.Mods.Where(x => x.IsInternal());
+                foreach (var modEntry in internalEntries)
+                {
+                    await DeleteMod(modEntry.fullPath, true);
+                }
+            }
+
 
             // Do these as a batch query at the end.
             progress?.Report((++modNum, modList.Mods.Count, "Adding modified files to Cache Queue..."));

xivModdingFramework/Mods/RootCloner.cs

@@ -353,6 +353,23 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 {
                     ProgressReporter.Report("Copying metdata...");
                 }
+
+                // Poke through the variants and adjust any that point to null Material Sets to instead use a valid one.
+                var valid = newMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
+                if(valid <= 0)
+                {
+                    valid = originalMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
+                }
+
+                for(int i = 0; i < newMetadata.ImcEntries.Count; i++)
+                {
+                    var entry = newMetadata.ImcEntries[i];
+                    if (entry.MaterialSet == 0)
+                    {
+                        entry.MaterialSet = valid;
+                    }
+                }
+
                 // Save the new Metadata file.
                 await ItemMetadata.SaveMetadata(newMetadata, ApplicationSource);