Update v2.1.0.1

Author: KoraLyn

xivModdingFramework/Items/Categories/Gear.cs

@@ -736,6 +736,46 @@ public async Task<List<IItemModel>> GetSameModelList(IItemModel item)
                     && it.ModelInfo.SecondaryID == item.ModelInfo.SecondaryID
                     && it.SecondaryCategory == item.SecondaryCategory).Select(it => it as IItemModel).ToList()
                 );
+
+                // We don't really care which sub-model gets returned here, we just need a path to pull the data file off of.
+                var imc = new Imc(_gameDirectory, item.DataFile);
+
+                // Language doesn't actually matter for the tests we're doing here.
+                var info = await imc.GetFullImcInfo(item);
+                var slot = item.GetItemSlotAbbreviation();
+                var imcEntries = info.GetAllEntries(slot);
+
+                // Need to verify all of our IMC sets are properly represented in the item list.
+                for (int i = 0; i < imcEntries.Count; i++)
+                {
+                    // Already in it.  All set.
+                    if (sameModelItems.Any(x => x.ModelInfo.ImcSubsetID == i)) continue;
+
+                    // Need to create a new item for it.
+                    var npcItem = new XivGear()
+                    {
+                        Name = "NPC Equipment e" + item.ModelInfo.PrimaryID + " " + slot + " IMC Variant " + i,
+                        ModelInfo = new XivGearModelInfo(),
+                        PrimaryCategory = item.PrimaryCategory,
+                        SecondaryCategory = item.SecondaryCategory,
+                        TertiaryCategory = item.TertiaryCategory,
+                        DataFile = item.DataFile,
+                    };
+                    npcItem.ModelInfo.PrimaryID = item.ModelInfo.PrimaryID;
+                    npcItem.ModelInfo.SecondaryID = item.ModelInfo.SecondaryID;
+                    npcItem.ModelInfo.ImcSubsetID = i;
+                    try
+                    {
+                        ((XivGearModelInfo)npcItem.ModelInfo).IsWeapon = ((XivGearModelInfo)item.ModelInfo).IsWeapon;
+                    }
+                    catch
+                    {
+                        // No-op.  Should never actually get here, but safety check on the cast.
+                    }
+
+                    sameModelItems.Add(npcItem);
+                }
+
             }
             else
             {

xivModdingFramework/Models/FileTypes/Dae.cs

@@ -1019,6 +1019,8 @@ public TTModel ReadColladaFile(DirectoryInfo daeLocation, Action<bool, string> l
                 throw ex;
             }
 
+            ModelModifiers.MakeImportReady(ttModel);
+
             return ttModel;
         }
 

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -372,42 +372,6 @@ private async Task ExportMaterialsForModel(TTModel model, string outputFilePath,
             }
         }
 
-        /// <summary>
-        /// Retrieves all items that share the same model.
-        /// </summary>
-        /// <param name="item"></param>
-        /// <param name="language"></param>
-        /// <returns></returns>
-        public async Task<List<IItemModel>> GetSameModelList(IItemModel item, XivLanguage language = XivLanguage.English)
-        {
-            var sameModelItems = new List<IItemModel>();
-            var gear = new Gear(_gameDirectory, language);
-            var character = new Character(_gameDirectory, language);
-            var companions = new Companions(_gameDirectory, language);
-            var ui = new UI(_gameDirectory, language);
-            var housing = new Housing(_gameDirectory, language);
-
-            if (item.PrimaryCategory.Equals(XivStrings.Gear))
-            {
-
-                // Scan the gear list for anything using the same model ID and slot.
-                sameModelItems.AddRange(
-                    (await gear.GetGearList())
-                    .Where(it =>
-                    it.ModelInfo.PrimaryID == item.ModelInfo.PrimaryID
-                    && it.SecondaryCategory == item.SecondaryCategory).Select(it => it as IItemModel).ToList()
-                );
-            }
-            else if (item.PrimaryCategory.Equals(XivStrings.Character))
-            {
-
-                // Character models are assumed to have no shared models,
-                // So return a copy of the original item.
-                sameModelItems.Add((IItemModel)item.Clone());
-            }
-            return sameModelItems;
-        }
-
 
         /// <summary>
         /// Retreives the high level TTModel representation of an underlying MDL file.
@@ -448,15 +412,16 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
             var index = new Index(_gameDirectory);
             var dat = new Dat(_gameDirectory);
             var modding = new Modding(_gameDirectory);
+            var mod = await modding.TryGetModEntry(mdlPath);
+            var modded = mod != null && mod.enabled;
             var getShapeData = true;
 
 
             var offset = await index.GetDataOffset(mdlPath);
 
             if (getOriginal)
             {
-                var mod = await modding.TryGetModEntry(mdlPath);
-                if (mod != null && mod.enabled)
+                if (modded)
                 {
                     offset = mod.data.originalOffset;
                 }
@@ -684,6 +649,13 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
                         lod.MeshCount = 1;
                     }
 
+                    // This is a simple check to identify old mods that may have broken shape data.
+                    // Old mods still have LoD 1+ data.
+                    if (modded  && i > 0 && lod.MeshCount > 0)
+                    {
+                        getShapeData = false;
+                    }
+
                     //Adding to xivMdl
                     xivMdl.LoDList.Add(lod);
                 }
@@ -729,6 +701,7 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
                     }
                 }
 
+
                 // Now that we have the LoD data, we can go back and read the Vertex Data Structures
                 // First we save our current position
                 var savePosition = br.BaseStream.Position;

xivModdingFramework/Models/ModelTextures/ModelTexture.cs

@@ -166,6 +166,23 @@ public static async Task<ModelTextureData> GetModelMaps(Tex tex, XivMtrl mtrl, C
                 specularPixels = texMapData.Specular.Data;
             }
 
+            if(normalPixels == null && diffusePixels == null)
+            {
+                // This material doesn't actually have any readable data.
+
+                var empty = new ModelTextureData
+                {
+                    Width = 0,
+                    Height = 0,
+                    Normal = new byte[0],
+                    Diffuse = new byte[0],
+                    Specular = new byte[0],
+                    Emissive = new byte[0],
+                    Alpha = new byte[0]
+                };
+                return empty;
+            }
+
             var dataLength = normalPixels != null ? normalPixels.Length : diffusePixels.Length;
 
             await Task.Run(() =>

xivModdingFramework/Variants/FileTypes/Imc.cs

@@ -392,6 +392,16 @@ public int SubsetSize
             /// </summary>
             public List<XivImc> DefaultSubset { get; set; }
 
+            // Gets all (non-default) IMC entries for a given slot.
+            public List<XivImc> GetAllEntries(string slot = "")
+            {
+                var ret = new List<XivImc>(SubsetList.Count);
+                for(int i = 0; i < SubsetList.Count; i++)
+                {
+                    ret.Add(GetEntry(i, slot));
+                }
+                return ret;
+            }
 
             /// <summary>
             /// Retrieve a given IMC info. Negative values retrieve the default set.