Update 2.3.1.0

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -2173,7 +2173,7 @@ await Task.Run(async () =>
         /// </summary>
         /// <param name="ttModel">The ttModel to import</param>
         /// <param name="ogMdl">The currently modified Mdl file.</param>
-        private async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action<bool, string> loggingFunction = null)
+        internal async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action<bool, string> loggingFunction = null)
         {
             if (loggingFunction == null)
             {

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -1001,7 +1001,7 @@ public static void ApplyRacialDeform(TTModel model, XivRace targetRace, bool inv
                 if (missingDeforms.Any())
                 {
                     // Get the skeleton for this model so we can use it to analyze missing bones.
-                    var dict = model.ResolveBoneHeirarchy(loggingFunction);
+                    var dict = model.ResolveBoneHeirarchy(null, XivRace.All_Races, null, loggingFunction);
 
 
                     // For a bone to be missing in the deformation data completely, it has to have come from a different skeleton, which

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -37,7 +37,7 @@ public class ItemMetadata
         /// <summary>
         /// The dependency root that this item meta data entry refers to.
         /// </summary>
-        public readonly XivDependencyRoot Root;
+        public XivDependencyRoot Root;
 
         /// <summary>
         /// Returns if this metadata object actually contains any metadata or not.
@@ -134,8 +134,8 @@ public static async Task<ItemMetadata> GetMetadata(XivDependencyRoot root)
                 var data = await _dat.GetType2Data(filePath, false);
 
                 // Run it through the binary deserializer and we're good.
-                //return await Deserialize(data);
-                return await CreateFromRaw(root);
+                return await Deserialize(data);
+                //return await CreateFromRaw(root);
             } else
             {
                 // This is the fun part where we get to pull the Metadata from all the disparate files around the FFXIV File System.

xivModdingFramework/Mods/FileTypes/ItemMetadata.cs

@@ -161,29 +161,35 @@ public void CreateModlist()
         /// <returns>The mod entry if found, null otherwise</returns>
         public Task<Mod> TryGetModEntry(string internalFilePath)
         {
-            if(String.IsNullOrWhiteSpace(internalFilePath))
+            try
             {
-                return null;
-            }
+                if (String.IsNullOrWhiteSpace(internalFilePath))
+                {
+                    return null;
+                }
 
-            return Task.Run(() =>
-            {
-                internalFilePath = internalFilePath.Replace("\\", "/");
+                return Task.Run(() =>
+                {
+                    internalFilePath = internalFilePath.Replace("\\", "/");
 
-                var modList = GetModList();
+                    var modList = GetModList();
 
-                if (modList == null) return null;
+                    if (modList == null) return null;
 
-                foreach (var modEntry in modList.Mods)
-                {
-                    if (modEntry.fullPath.Equals(internalFilePath))
+                    foreach (var modEntry in modList.Mods)
                     {
-                        return modEntry;
+                        if (modEntry.fullPath.Equals(internalFilePath))
+                        {
+                            return modEntry;
+                        }
                     }
-                }
 
+                    return null;
+                });
+            } catch(Exception ex)
+            {
                 return null;
-            });
+            }
         }
 
         /// <summary>