Update 2.3.1.4

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -1436,6 +1436,10 @@ private static async Task<List<XivDependencyRoot>> GetModdedRoots(string interna
         /// <returns></returns>
         public static XivDependencyRootInfo ExtractRootInfoFilenameOnly(string filenameWithoutExtension)
         {
+            if(String.IsNullOrEmpty(filenameWithoutExtension))
+            {
+                return new XivDependencyRootInfo();
+            }
             var regex = new Regex("([a-z])([0-9]{4})([a-z])([0-9]{4})");
             var match = regex.Match(filenameWithoutExtension);
             if(!match.Success)

xivModdingFramework/Models/FileTypes/Sklb.cs

@@ -105,6 +105,7 @@ public static async Task<string> GetExtraSkeletonFile(string fullMdlPath)
             var race = XivRaces.GetXivRace(fullMdlPath.Substring(1, 4));
 
             return await GetExtraSkeletonFile(root.Info, race);
+            
         }
 
 
@@ -137,7 +138,18 @@ public static async Task<string> GetExtraSkeletonFile(XivDependencyRootInfo root
             {
                 return parsedFile;
             }
-            await ExtractAndParseSkel(file);
+
+            try
+            {
+                // In some cases, the extra skeleton doesn't actually exist, despite the 
+                // game files saying it should.  In these cases, SE actually intends to 
+                // default to the base skel.
+                await ExtractAndParseSkel(file);
+            }
+            catch
+            {
+                return null;
+            }
             return parsedFile;
         }
 

xivModdingFramework/Mods/RootCloner.cs

@@ -91,6 +91,24 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 newMetadata.Root = Destination.Info.ToFullRoot();
                 var originalDestinationMetadata = await ItemMetadata.GetMetadata(Destination);
 
+                // Set 0 needs special handling.
+                if(Source.Info.PrimaryType == XivItemType.equipment && Source.Info.PrimaryId == 0)
+                {
+                    var set1Root = new XivDependencyRoot(Source.Info.PrimaryType, 1, null, null, Source.Info.Slot);
+                    var set1Metadata = await ItemMetadata.GetMetadata(set1Root);
+
+                    newMetadata.EqpEntry = set1Metadata.EqpEntry;
+
+                    if (Source.Info.Slot == "met")
+                    {
+                        newMetadata.GmpEntry = set1Metadata.GmpEntry;
+                    }
+                } else if (Destination.Info.PrimaryType == XivItemType.equipment && Destination.Info.PrimaryId == 0)
+                {
+                    newMetadata.EqpEntry = null;
+                    newMetadata.GmpEntry = null;
+                }
+
 
                 // Now figure out the path names for all of our new paths.
                 // These dictionarys map Old Path => New Path
@@ -143,13 +161,14 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                     newMaterialPaths.Select(x => x.Value)).Union(
                     newAvfxPaths.Select(x => x.Value)).Union(
                     newTexturePaths.Select(x => x.Value));
-
                 var allFiles = new HashSet<string>();
                 foreach (var f in files)
                 {
                     allFiles.Add(f);
                 }
 
+                allFiles.Add(Destination.Info.GetRootFile());
+
                 if (ProgressReporter != null)
                 {
                     ProgressReporter.Report("Getting modlist...");
@@ -386,11 +405,11 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 {
                     if (allFiles.Contains(mod.fullPath))
                     {
-                        // Don't claim common path items into our modpack.
-                        if (!mod.fullPath.StartsWith(CommonPath))
-                        {
-                            mod.modPack = modPack;
-                        }
+                        // Ensure all of our modified files are attributed correctly.
+                        mod.name = iName;
+                        mod.category = iCat;
+                        mod.source = ApplicationSource;
+                        mod.modPack = modPack;
                     }
                 }
 
@@ -414,9 +433,16 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
 
         private static string UpdatePath(XivDependencyRoot Source, XivDependencyRoot Destination, string path)
         {
-            // Things that live in the common folder get to stay there/don't get copied.
-            if (path.StartsWith(CommonPath)) return path;
+            // For common path items, copy them to our own personal mimic of the path.
+            if (path.StartsWith(CommonPath))
+            {
+                var len = CommonPath.Length;
+                var afterCommon = path.Substring(len);
+                path = Destination.Info.GetRootFolder() + "common/" + afterCommon;
+                return path;
+            }
 
+            // Things that live in the common folder get to stay there/don't get copied.
 
             var file = UpdateFileName(Source, Destination, path);
             var folder = UpdateFolder(Source, Destination, path);
@@ -426,6 +452,8 @@ private static string UpdatePath(XivDependencyRoot Source, XivDependencyRoot Des
 
         private static string UpdateFolder(XivDependencyRoot Source, XivDependencyRoot Destination, string path)
         {
+
+
             // So first off, just copy anything from the old root folder to the new one.
             var match = RemoveRootPathRegex.Match(path);
             if(match.Success)