- Enable force-scanning for all possible furniture roots.

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -278,6 +278,22 @@ public string GetRacialModelName(XivRace race)
         {
             return GetRacialModelName(Int32.Parse(XivRaces.GetRaceCode(race)));
         }
+
+        /// <summary>
+        /// Calculates and returns the SGD file name for this root.
+        /// </summary>
+        /// <returns></returns>
+        public string GetSgdName()
+        {
+            if (PrimaryType != XivItemType.indoor && PrimaryType != XivItemType.outdoor)
+            {
+                throw new NotSupportedException("Cannot get SGB File for Non-Furniture item type.");
+            }
+
+            var assetFile = $"{Slot}_b0_m{PrimaryId.ToString().PadLeft(4, '0')}.sgb";
+            return assetFile;
+        }
+
         public string GetRacialModelName(int raceRaw)
         {
             if (SecondaryType != null)
@@ -1592,29 +1608,48 @@ await Task.Run(() => {
 
                         if (secondary == XivItemType.none)
                         {
-                            var folder = root.GetRootFolder() + "model";
-                            var folderHash = HashGenerator.GetHash(folder);
-                            var slots = XivItemTypes.GetAvailableSlots(root.PrimaryType);
+                            if (primary == XivItemType.indoor || primary == XivItemType.outdoor)
+                            {
+                                // For furniture, they're valid as long as they have an SGD file we can find.
+                                root.Slot = primary == XivItemType.indoor ? "fun" : "gar";
+
+                                var folder = root.GetRootFolder() + "asset";
+                                var file = root.GetSgdName();
 
-                            // For these, just let the EDP module verify if there are any races availble for the item?
-                            foreach (var slot in slots)
+                                var folderHash = HashGenerator.GetHash(folder);
+                                var fileHash = HashGenerator.GetHash(file);
+                                var key = fileHash.ToString() + folderHash.ToString();
+                                if (combinedHashes.ContainsKey(key))
+                                {
+                                    result.Add((XivDependencyRootInfo)root.Clone());
+                                }
+                            }
+                            else
                             {
-                                root.Slot = slot;
+                                var folder = root.GetRootFolder() + "model";
+                                var folderHash = HashGenerator.GetHash(folder);
+                                var slots = XivItemTypes.GetAvailableSlots(root.PrimaryType);
 
-                                // Check every possible race code, not just playables?
-                                //for (int s = 0; s < 10000; p++)
-                                foreach(var race in races)
+                                // For these, just let the EDP module verify if there are any races availble for the item?
+                                foreach (var slot in slots)
                                 {
-                                    //var modelName = root.GetRacialModelName(s);
-                                    var modelName = root.GetRacialModelName(race);
-                                    var fileHash = HashGenerator.GetHash(modelName);
-                                    var key = fileHash.ToString() + folderHash.ToString();
-                                    if (combinedHashes.ContainsKey(key))
-                                    {
-                                        result.Add((XivDependencyRootInfo)root.Clone());
+                                    root.Slot = slot;
 
-                                        // We don't care how many models there are, just that there *are* any models.
-                                        break;
+                                    // Check every possible race code, not just playables?
+                                    //for (int s = 0; s < 10000; p++)
+                                    foreach (var race in races)
+                                    {
+                                        //var modelName = root.GetRacialModelName(s);
+                                        var modelName = root.GetRacialModelName(race);
+                                        var fileHash = HashGenerator.GetHash(modelName);
+                                        var key = fileHash.ToString() + folderHash.ToString();
+                                        if (combinedHashes.ContainsKey(key))
+                                        {
+                                            result.Add((XivDependencyRootInfo)root.Clone());
+
+                                            // We don't care how many models there are, just that there *are* any models.
+                                            break;
+                                        }
                                     }
                                 }
                             }
@@ -1634,13 +1669,6 @@ await Task.Run(() => {
                                     slots = XivItemTypes.GetAvailableSlots(XivItemType.equipment);
                                 }
 
-                                // For these, just let the EDP module verify if there are any races availble for the item?
-
-                                if (root.PrimaryId == 201 && root.SecondaryId == 56 && root.PrimaryType == XivItemType.weapon)
-                                {
-                                    var z = "d";
-                                }
-
                                 if (slots.Count == 0)
                                 {
                                     slots.Add("");
@@ -1695,6 +1723,13 @@ public static async Task CacheAllRealRoots()
                 mergedDict.Add(kv.Key, new XivDependencyRootInfo());
             }
 
+            var bgcHashes = await index.GetFileDictionary(XivDataFile._01_Bgcommon);
+
+            var bgcHashDict = new Dictionary<string, XivDependencyRootInfo>();
+            foreach (var kv in bgcHashes)
+            {
+                bgcHashDict.Add(kv.Key, new XivDependencyRootInfo());
+            }
 
             var types = new Dictionary<XivItemType, List<XivItemType>>();
             foreach (var type in DependencySupportedTypes)
@@ -1711,6 +1746,8 @@ public static async Task CacheAllRealRoots()
             types[XivItemType.demihuman].Add(XivItemType.equipment);
             types[XivItemType.equipment].Add(XivItemType.none);
             types[XivItemType.accessory].Add(XivItemType.none);
+            types[XivItemType.indoor].Add(XivItemType.none);
+            types[XivItemType.outdoor].Add(XivItemType.none);
 
 
 
@@ -1720,10 +1757,14 @@ public static async Task CacheAllRealRoots()
                 var primary = kv.Key;
                 foreach (var secondary in kv.Value)
                 {
-                    // Apparently despite all documentation, Dictionary.HasKey() is not actually
-                    // thread safe? Or at least, we'll hit random failures to find dictionary keys if
-                    // we don't clone the dictionary here.   Unsure why.
-                    tasks.Add(TestAllRoots(mergedDict, primary, secondary));
+                    if (primary == XivItemType.indoor || primary == XivItemType.outdoor)
+                    {
+                        tasks.Add(TestAllRoots(bgcHashDict, primary, secondary));
+                    }
+                    else
+                    {
+                        tasks.Add(TestAllRoots(mergedDict, primary, secondary));
+                    }
                 }
             }
             try