More minor improvements to furniture handling in item lists and dependency structures.

Author: Lunaretic

xivModdingFramework/Cache/XivCache.cs

@@ -27,7 +27,7 @@ public static class XivCache
         private static GameInfo _gameInfo;
         private static DirectoryInfo _dbPath;
         private static DirectoryInfo _rootCachePath;
-        public static readonly Version CacheVersion = new Version("1.0.1.1");
+        public static readonly Version CacheVersion = new Version("1.0.1.2");
         private const string dbFileName = "mod_cache.db";
         private const string rootCacheFileName = "item_sets.db";
         private const string creationScript = "CreateCacheDB.sql";
@@ -326,12 +326,13 @@ private static void CreateCache()
                 }
             }
 
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            var backupFile = cwd + "\\Resources\\DB\\" + rootCacheFileName;
+
             if (!File.Exists(_rootCachePath.FullName))
             {
-                // If we don't have a root cache file, we can do a few things...
-                var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
-                var backupFile = cwd + "\\Resources\\DB\\" + rootCacheFileName;
 
+                // If we don't have a root cache file, we can do a few things...
                 if (File.Exists(backupFile))
                 {
                     // Copy the backup over. - Even if the backup is not for the correct patch of 
@@ -358,6 +359,18 @@ private static void CreateCache()
                     }
                 }
             }
+            else if(File.Exists(backupFile))
+            {
+                // If we have both a backup and current file, see if the current is out of date.
+                // (If we just updated textools and the download came with a new file)
+                var backupDate = File.GetLastWriteTime(backupFile);
+                var currentDate = File.GetLastWriteTime(_rootCachePath.FullName);
+                if(backupDate > currentDate)
+                {
+                    // Our backup is newer, copy it through.
+                    File.Copy(backupFile, _rootCachePath.FullName);
+                }
+            }
         }
 
 

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -290,7 +290,9 @@ public string GetSgdName()
                 throw new NotSupportedException("Cannot get SGB File for Non-Furniture item type.");
             }
 
-            var assetFile = $"{Slot}_b0_m{PrimaryId.ToString().PadLeft(4, '0')}.sgb";
+            var slotFake = PrimaryType == XivItemType.indoor ? "fun" : "gar";
+                
+            var assetFile = $"{slotFake}_b0_m{PrimaryId.ToString().PadLeft(4, '0')}.sgb";
             return assetFile;
         }
 
@@ -432,13 +434,10 @@ public XivDependencyRoot(XivDependencyRootInfo info)
                     // initial crawls up the tree are janky.
                     Info.Slot = "top";
                 }
-            } else if(Info.PrimaryType == XivItemType.indoor)
-            {
-                Info.Slot = "fun";
-
-            } else if(Info.PrimaryType == XivItemType.outdoor)
+            } else if(Info.PrimaryType == XivItemType.indoor || Info.PrimaryType == XivItemType.outdoor)
             {
-                Info.Slot = "gar";
+                // No slots here!
+                Info.Slot = null;
             }
         }
 
@@ -1443,8 +1442,6 @@ public static XivDependencyRootInfo ExtractRootInfo(string internalFilePath)
                 {
                     info.PrimaryType = XivItemTypes.FromSystemName(match.Groups[1].Value);
                     info.PrimaryId = Int32.Parse(match.Groups[2].Value);
-
-                    info.Slot = info.PrimaryType == XivItemType.indoor ? "fun" : "gar";
                 }
             }
 

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -4418,8 +4418,6 @@ public async Task<string> GetMdlPath(IItemModel itemModel, XivRace xivRace, stri
             {XivStrings.Accessory, "acc"},
             {XivStrings.Hair, "hir"},
             {XivStrings.Tail, "til"},
-            {XivStrings.Furniture_Indoor, "fun"},
-            {XivStrings.Furniture_Outdoor, "gar"}
 
         };