- Better detection for DX9/11 conversion textures in materials.

- Some sanity checks on standard modpack creation to not crash if a file doesn't exist.

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -67,19 +67,25 @@ public static async Task<List<IItemModel>> GetSharedMaterialItems(this IItemMode
             var sameModelItems = new List<IItemModel>();
             sameModelItems = await item.GetSharedModelItems();
 
-            var imc = new Imc(XivCache.GameInfo.GameDirectory);
-            var originalInfo = await imc.GetImcInfo(item);
-
             var sameMaterialItems = new List<IItemModel>();
-            foreach (var i in sameModelItems)
+            try
             {
-                var info = await imc.GetImcInfo(i);
-                if (info.Variant == originalInfo.Variant)
+                var imc = new Imc(XivCache.GameInfo.GameDirectory);
+                var originalInfo = await imc.GetImcInfo(item);
+                foreach (var i in sameModelItems)
                 {
-                    sameMaterialItems.Add(i);
+                    var info = await imc.GetImcInfo(i);
+                    if (info.Variant == originalInfo.Variant)
+                    {
+                        sameMaterialItems.Add(i);
+                    }
                 }
+            } catch
+            {
+                // No IMC file exists for this item.
+                // It is by requirement the only item of its type then.
+                sameMaterialItems.Add((IItemModel) item.Clone());
             }
-
             sameMaterialItems = sameMaterialItems.OrderBy(x => x.Name, new ItemNameComparer()).ToList();
             return sameMaterialItems;
         }

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -275,21 +275,25 @@ public async Task<List<string>> GetTexturePathsFromMtrlPath(string mtrlPath, boo
             using (var br = new BinaryReader(new MemoryStream(mtrlData)))
             {
                 // Texture count position.
-                br.BaseStream.Seek(12, SeekOrigin.Begin);
+                br.BaseStream.Seek(8, SeekOrigin.Begin);
+                var materialDataSize = br.ReadUInt16();
+                var pathsDataSize = br.ReadUInt16();
                 var textureCount = br.ReadByte();
                 var mapCount = br.ReadByte();
                 var cSetCount = br.ReadByte();
+                var dxInfoDataSize = br.ReadByte();
 
                 var offset = 0;
 
                 var dataOffsetBase = 16 + (mapCount * 4) + (cSetCount * 4) + (textureCount * 4);
 
-
+                var textureDxInfo = new Dictionary<string, ushort>();
                 for(int i = 0; i < textureCount; i++)
                 {
                     // Jump to the texture name offset.
                     br.BaseStream.Seek(16 + offset, SeekOrigin.Begin);
                     var textureNameOffset = br.ReadInt16();
+                    var texDxInfo = br.ReadUInt16();
 
                     // Jump to the texture name.
                     br.BaseStream.Seek(dataOffsetBase + textureNameOffset, SeekOrigin.Begin);
@@ -308,11 +312,53 @@ public async Task<List<string>> GetTexturePathsFromMtrlPath(string mtrlPath, boo
                     {
                         uniqueTextures.Add(st);
                     }
+                    textureDxInfo[st] = texDxInfo;
 
                     // Bump to next texture name offset.
                     offset += 4;
                 }
+
+
+                if (dxInfoDataSize > 0)
+                {
+                    var dxInfoOffset = dataOffsetBase + materialDataSize;
+                    br.BaseStream.Seek(dxInfoOffset, SeekOrigin.Begin);
+                    var dxInfoByte = br.ReadByte();
+
+                    // This is an old DX9 Style material with DX11 conversion textures.
+                    // Make sure we have both texture versions referenced.
+                    if((dxInfoByte & 12) != 12)
+                    {
+                        List<string> add = new List<string>();
+                        foreach(var texture in uniqueTextures)
+                        {
+                            // If this is a texture that has a DX Conversion.
+                            if (textureDxInfo[texture] != 0)
+                            {
+                                if (texture.Contains("--"))
+                                {
+                                    add.Add(texture.Replace("--", ""));
+                                }
+                                else
+                                {
+                                    add.Add(texture.Insert(texture.LastIndexOf("/") + 1, "--"));
+                                }
+                            }
+                            else
+                            {
+                                // This texture does not have a DX 11 conversion texture.
+                            }
+                        }
+
+                        foreach(var s in add)
+                        {
+                            uniqueTextures.Add(s);
+                        }
+                    }
+                }
             }
+
+
             return uniqueTextures.ToList();
         }
 
@@ -324,7 +370,6 @@ public async Task<List<string>> GetTexturePathsFromMtrlPath(string mtrlPath, boo
         /// <returns>XivMtrl containing all the mtrl data</returns>
         public async Task<XivMtrl> GetMtrlData(int mtrlOffset, string mtrlPath, int dxVersion)
         {
-            await GetTexturePathsFromMtrlPath(mtrlPath);
             var dat = new Dat(_gameDirectory);
             var index = new Index(_gameDirectory);