Beta v2.3.3.4

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -629,7 +629,10 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1, Index
                             mdlMats = await XivCache.GetChildFiles(model);
                         } else
                         {
-                            mdlMats = await _mdl.GetReferencedMaterialPaths(model, -1, false, false, index, modlist);
+                            if (index.Get8xDataOffset(model) != 0)
+                            {
+                                mdlMats = await _mdl.GetReferencedMaterialPaths(model, -1, false, false, index, modlist);
+                            }
                         }
 
                         if (materialVariant <= 0)
@@ -718,15 +721,19 @@ public async Task<List<string>> GetTextureFiles(int materialVariant = -1, IndexF
             {
                 foreach (var mat in materials)
                 {
-                    List<string> mtrlTexs = null;
+                    List<string> mtrlTexs = new List<string>();
                     if (index == null)
                     {
                         mtrlTexs = await XivCache.GetChildFiles(mat);
                     } else
                     {
                         var dataFile = IOUtil.GetDataFileFromPath(mat);
-                        var _mtrl = new Mtrl(XivCache.GameInfo.GameDirectory, dataFile, XivCache.GameInfo.GameLanguage);
-                        mtrlTexs = await _mtrl.GetTexturePathsFromMtrlPath(mat, false, false, index, modlist);
+
+                        if (index.Get8xDataOffset(mat) != 0)
+                        {
+                            var _mtrl = new Mtrl(XivCache.GameInfo.GameDirectory, dataFile, XivCache.GameInfo.GameLanguage);
+                            mtrlTexs = await _mtrl.GetTexturePathsFromMtrlPath(mat, false, false, index, modlist);
+                        }
                     }
 
                     foreach (var tex in mtrlTexs)

xivModdingFramework/Mods/FileTypes/TTMP.cs

@@ -642,6 +642,7 @@ await Task.Run(async () =>
                         Dictionary<XivDependencyRoot, (XivDependencyRoot Root, int Variant)> rootConversions = null;
                         try
                         {
+                            progress.Report((count, totalFiles, "Waiting on Destination Item Selection..."));
                             rootConversions = await GetRootConversionsFunction(filePaths, modifiedIndexFiles, modList);
                         } catch(OperationCanceledException ex)
                         {
@@ -656,7 +657,7 @@ await Task.Run(async () =>
 
                         if (rootConversions != null && rootConversions.Count > 0)
                         {
-                            progress.Report((count, totalFiles, "Updating Destination Items..."));
+                            progress.Report((0, 0, "Updating Destination Items..."));
                             // If we have roots to convert, we get to do some extra work here.
 
                             // We currently have all the files loaded into our in-memory indices in their default locations.