Merge branch 'furniture_dependencies' into develop

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.0");
+        public static readonly Version CacheVersion = new Version("1.0.1.1");
         private const string dbFileName = "mod_cache.db";
         private const string rootCacheFileName = "item_sets.db";
         private const string creationScript = "CreateCacheDB.sql";
@@ -437,7 +437,7 @@ private static async Task RebuildFurnitureCache()
                     {
 
                         var query = @"
-                            insert into housing ( name,  category,  subcategory,  primary_id,  icon_id,  root) 
+                            insert into furniture ( name,  category,  subcategory,  primary_id,  icon_id,  root) 
                                           values($name, $category, $subcategory, $primary_id, $icon_id, $root)";
 
                         var root = item.GetRootInfo();
@@ -724,7 +724,7 @@ internal static async Task<List<XivFurniture>> GetCachedFurnitureList(string sub
                 where.Value = "%" + substring + "%";
             }
 
-            return await BuildListFromTable("housing", where, async (reader) =>
+            return await BuildListFromTable("furniture", where, async (reader) =>
             {
                 return MakeFurniture(reader);
             });

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -374,16 +374,29 @@ await Task.Run(() => Parallel.ForEach(housingDictionary.Values, (housingItem) =>
             return furnitureList;
         }
 
+        public async Task<Dictionary<string, string>> GetFurnitureModelParts(IItemModel itemModel)
+        {
+
+            return await GetFurnitureModelParts(itemModel.ModelInfo.PrimaryID, itemModel.SecondaryCategory);
+        }
+
+
+        public async Task<Dictionary<string, string>> GetFurnitureModelParts(int modelID, XivItemType type)
+        {
+            var cat = type == XivItemType.indoor ? XivStrings.Furniture_Indoor : XivStrings.Furniture_Outdoor;
+            return await GetFurnitureModelParts(modelID, cat);
+        }
+
         /// <summary>
         /// Gets the parts list for furniture
         /// </summary>
         /// <param name="itemModel">The item to get the parts for</param>
         /// <returns>A dictionary containing the part string and mdl path string</returns>
-        public async Task<Dictionary<string, string>> GetFurnitureModelParts(IItemModel itemModel)
+        public async Task<Dictionary<string, string>> GetFurnitureModelParts(int modelID, string category)
         {
             var furniturePartDict = new Dictionary<string, string>();
 
-            var assets = await GetFurnitureAssets(itemModel.ModelInfo.PrimaryID, itemModel.SecondaryCategory);
+            var assets = await GetFurnitureAssets(modelID, category);
 
             foreach (var mdl in assets.MdlList)
             {
@@ -432,11 +445,11 @@ public async Task<Dictionary<string, string>> GetFurnitureModelParts(IItemModel
             return furniturePartDict;
         }
 
-        /// <summary>
-        /// Gets the assets for furniture
-        /// </summary>
-        /// <param name="modelID">The model id to get the assets for</param>
-        /// <returns>A HousingAssets object containing the asset info</returns>
+            /// <summary>
+            /// Gets the assets for furniture
+            /// </summary>
+            /// <param name="modelID">The model id to get the assets for</param>
+            /// <returns>A HousingAssets object containing the asset info</returns>
         private async Task<HousingAssets> GetFurnitureAssets(int modelID, string category)
         {
             var index = new Index(_gameDirectory);

xivModdingFramework/Items/Categories/Housing.cs

@@ -76,17 +76,21 @@ internal static IItemModel FromDependencyRoot(XivDependencyRoot root)
             item.ModelInfo = new XivModelInfo();
             item.ModelInfo.PrimaryID = root.Info.PrimaryId;
             item.ModelInfo.SecondaryID = (int)root.Info.SecondaryId;
-            item.Name = root.Info.GetBaseFileName();
             item.PrimaryCategory = XivStrings.Character;
 
             if (root.Info.Slot != null)
             {
                 item.SecondaryCategory = Mdl.SlotAbbreviationDictionary.FirstOrDefault(x => x.Value == root.Info.Slot).Key;
+
+                //var race = XivRaces.GetXivRace(root.Info.PrimaryId.ToString().PadLeft(4, '0')).GetDisplayName();
+                item.Name = item.SecondaryCategory + " - " + root.Info.GetBaseFileName();
             } else
             {
+                item.Name = root.Info.GetBaseFileName();
                 item.SecondaryCategory = XivStrings.Body;
             }
 
+
             return item;
         }
 

xivModdingFramework/Items/DataContainers/XivCharacter.cs

@@ -73,7 +73,6 @@ internal static IItemModel FromDependencyRoot(XivDependencyRoot root)
             var item = new XivFurniture();
             item.ModelInfo = new XivModelInfo();
             item.ModelInfo.PrimaryID = root.Info.PrimaryId;
-            item.ModelInfo.SecondaryID = (int)root.Info.SecondaryId;
             item.Name = root.Info.GetBaseFileName();
             item.PrimaryCategory = XivStrings.Housing;
             if (root.Info.PrimaryType == Enums.XivItemType.indoor)

xivModdingFramework/Items/DataContainers/XivFurniture.cs

@@ -43,8 +43,8 @@ public enum XivItemType
         [Description("")] decal,
         [Description("")] ui,
         [Description("")] furniture, // This one's a little vague and encompasses really all of /bgcommon/
-        [Description("")] indoor,     // These are the clearer versions, but only used by the dependency graph.
-        [Description("")] outdoor
+        [Description("indoor")] indoor,     // These are the clearer versions, but only used by the dependency graph.
+        [Description("outdoor")] outdoor
     }
 
     public static class XivItemTypes {

xivModdingFramework/Items/Enums/XivItemType.cs

@@ -260,12 +260,14 @@ public async Task<XivMtrl> GetMtrlData(IItemModel itemModel, XivRace race, strin
             return mtrlData;
         }
 
+        private static Regex _dummyTextureRegex = new Regex("^bgcommon/texture/dummy_[a-z]\\.tex$");
+
         /// <summary>
         /// Retrieves the list of texture paths used by the given mtrl path (significantly faster than loading the entire material and scanning it).
         /// </summary>
         /// <param name="mtrlPath"></param>
         /// <returns></returns>
-        public async Task<List<string>> GetTexturePathsFromMtrlPath(string mtrlPath, bool forceOriginal = false)
+        public async Task<List<string>> GetTexturePathsFromMtrlPath(string mtrlPath, bool includeDummies = false, bool forceOriginal = false)
         {
             var dat = new Dat(_gameDirectory);
             var mtrlData = await dat.GetType2Data(mtrlPath, forceOriginal);
@@ -358,8 +360,16 @@ public async Task<List<string>> GetTexturePathsFromMtrlPath(string mtrlPath, boo
                 }
             }
 
+            var rem = new List<string>();
+            List<string> ret;
+            if (includeDummies)
+            {
+                ret = uniqueTextures.ToList();
+            } else {
+                ret = uniqueTextures.Where(x => !_dummyTextureRegex.IsMatch(x)).ToList();
+            }
 
-            return uniqueTextures.ToList();
+            return ret;
         }
 
         /// <summary>

xivModdingFramework/Materials/FileTypes/Mtrl.cs

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

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -34,7 +34,7 @@ CREATE TABLE "ui" (
 );
 
 -- All /bgcommon/ stuff.
-CREATE TABLE "housing" (
+CREATE TABLE "furniture" (
 	"name" TEXT NOT NULL,
 	"category" TEXT NOT NULL,
 	"subcategory" TEXT,