TexTypePathList is now programatically generated rather than being a hardcoded list, and no longer based on texture names/suffixes. AVFX textures moved out of the XivMTRL as they're not actually part of MTRL files. (TT adds them back in for item listings on its own.)

Author: Lunaretic

xivModdingFramework/Helpers/IOUtil.cs

@@ -14,11 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using xivModdingFramework.General.Enums;
 using xivModdingFramework.Items.Interfaces;
@@ -140,5 +142,30 @@ public static void ReplaceBytesAt(List<byte> original, byte[] toInject, int inde
                 original[index + i] = toInject[i];
             };
         }
+
+
+
+        /// <summary>
+        /// Resolves what XivDataFile a file lives in based upon its internal FFXIV directory path.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static XivDataFile GetDataFileFromPath(string path)
+        {
+            var files = Enum.GetValues(typeof(XivDataFile));
+            foreach (var f in files)
+            {
+                var file = (XivDataFile)f;
+                var prefix = file.GetFolderKey();
+
+                var match = Regex.Match(path, "^" + prefix);
+                if (match.Success)
+                {
+                    return file;
+                }
+            }
+
+            throw new Exception("Could not resolve data file - Invalid internal FFXIV path.");
+        }
     }
 }

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -21,6 +21,7 @@
 using System.Linq;
 using System.Resources;
 using System.Text.RegularExpressions;
+using xivModdingFramework.General.Enums;
 using xivModdingFramework.Materials.FileTypes;
 using xivModdingFramework.Textures.DataContainers;
 using xivModdingFramework.Textures.Enums;
@@ -259,9 +260,22 @@ public ushort TextureDescriptorCount
         public List<TextureDescriptorStruct> TextureDescriptorList { get; set; }
 
         /// <summary>
-        /// A list of TexTypePath for the mtrl <see cref="TexTypePath"/>
+        /// The TexTools expected list of textures in the item, including colorset 'texture'.
         /// </summary>
-        public List<TexTypePath> TextureTypePathList { get; set; }
+        public List<TexTypePath> TextureTypePathList
+        {
+            get
+            {
+                return GetTextureTypePathList();
+            }
+        }
+
+        /// <summary>
+        /// Whether or not this Material's Variant has VFX associated with it.
+        /// Used to indicate if TexTools should retrieve the VFX textures
+        /// for the Texture Listing.
+        /// </summary>
+        public bool hasVfx { get; set; }
 
         /// <summary>
         /// The internal MTRL path
@@ -559,6 +573,14 @@ public void SetMapInfo(XivTexType MapType, MapInfo info)
             // Detokenize paths
             info.path = DetokenizePath(info.path, info.Usage);
 
+            // Ensure .tex or .atex ending for sanity.
+            var match = Regex.Match(info.path, "\\.a?tex$");
+            if(!match.Success)
+            {
+                info.path = info.path += ".tex";
+            }
+
+
 
 
             var raw = new TextureDescriptorStruct();
@@ -659,6 +681,54 @@ public List<MapInfo> GetAllMapInfos(bool tokenize = true)
             return ret;
         }
 
+        /// <summary>
+        /// Get the 'TexTypePath' List that TT expects to populate the texture listing.
+        /// Generated via using GetAllMapInfos to scan based on actual MTRL settings,
+        /// Rather than file names.
+        /// </summary>
+        /// <returns></returns>
+        public List<TexTypePath> GetTextureTypePathList()
+        {
+            var ret = new List<TexTypePath>();
+            var maps = GetAllMapInfos(false);
+            TexTypePath ttp;
+            foreach (var map in maps)
+            {
+                ttp = new TexTypePath() { DataFile = GetDataFile(), Path = map.path, Type = map.Usage};
+
+                var fName = Path.GetFileNameWithoutExtension(map.path);
+                if (fName != "") {
+                    var name = map.Usage.ToString() + ": " + fName;
+                    ttp.Name = name;
+                }
+
+                ret.Add(ttp);
+            }
+
+
+            // Include the colorset as its own texture if we have one.
+            if (ColorSetCount > 0 && ColorSetData.Count > 0)
+            {
+                ttp = new TexTypePath
+                {
+                    Path = MTRLPath,
+                    Type = XivTexType.ColorSet,
+                    DataFile = GetDataFile()
+                };
+                ret.Add(ttp);
+            }
+
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the Data File this MTRL resides in based on the path of the MTRL file.
+        /// </summary>
+        /// <returns></returns>
+        public XivDataFile GetDataFile()
+        {
+            return Helpers.IOUtil.GetDataFileFromPath(MTRLPath);
+        }
 
         /// <summary>
         /// Retreives the base texture directory this material references.

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -222,19 +222,8 @@ public async Task<XivMtrl> GetMtrlData(IItemModel itemModel, XivRace race, char
             }
 
             var mtrlData = await GetMtrlData(mtrlOffset, mtrlStringPath, dxVersion);
+            mtrlData.hasVfx = true;
 
-            if (mtrlPath.HasVfx)
-            {
-                var atex = new ATex(_gameDirectory, DataFile);
-                try
-                {
-                    mtrlData.TextureTypePathList.AddRange(await atex.GetAtexPaths(itemModel));
-                }
-                catch
-                {
-                    return mtrlData;
-                }                
-            }
 
             return mtrlData;
         }
@@ -338,7 +327,6 @@ await Task.Run((Func<Task>)(async () =>
                             MapCount = br.ReadByte(),
                             ColorSetCount = br.ReadByte(),
                             UnknownDataSize = br.ReadByte(),
-                            TextureTypePathList = new List<TexTypePath>(),
                             MTRLPath = mtrlPath
                         };
 
@@ -428,9 +416,6 @@ await Task.Run((Func<Task>)(async () =>
                             count++;
                         }
 
-                        // add the textures to the TextureTypePathList
-                        xivMtrl.TextureTypePathList.AddRange(await GetTexNames(xivMtrl.TexturePathList, DataFile));
-
                         // get the map path strings
                         xivMtrl.MapPathList = new List<string>(xivMtrl.MapCount);
                         for (var i = 0; i < xivMtrl.MapCount; i++)
@@ -449,18 +434,6 @@ await Task.Run((Func<Task>)(async () =>
                             count++;
                         }
 
-                        // If the mtrl file contains a color set, add it to the TextureTypePathList
-                        if (xivMtrl.ColorSetDataSize > 0)
-                        {
-                            var ttp = new TexTypePath
-                            {
-                                Path = mtrlPath,
-                                Type = XivTexType.ColorSet,
-                                DataFile = DataFile
-                            };
-                            xivMtrl.TextureTypePathList.Add(ttp);
-                        }
-
                         var shaderPathSize = xivMtrl.MaterialDataSize - xivMtrl.TexturePathsDataSize;
 
                         xivMtrl.Shader = Encoding.UTF8.GetString(br.ReadBytes(shaderPathSize)).Replace("\0", "");

xivModdingFramework/Textures/FileTypes/ATex.cs

@@ -81,7 +81,7 @@ public async Task<List<TexTypePath>> GetAtexPaths(IItemModel itemModel)
                 var ttp = new TexTypePath
                 {
                     DataFile = _dataFile,
-                    Name = Path.GetFileNameWithoutExtension(atexPath),
+                    Name = "VFX: " + Path.GetFileNameWithoutExtension(atexPath),
                     Path = atexPath
                 };