Beta v2.3.4.5b

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -734,7 +734,7 @@ public async Task<List<string>> GetTextureFiles(int materialVariant = -1, IndexF
 
                         if (index.Get8xDataOffset(mat) != 0)
                         {
-                            var _mtrl = new Mtrl(XivCache.GameInfo.GameDirectory, dataFile, XivCache.GameInfo.GameLanguage);
+                            var _mtrl = new Mtrl(XivCache.GameInfo.GameDirectory);
                             mtrlTexs = await _mtrl.GetTexturePathsFromMtrlPath(mat, false, false, index, modlist);
                         }
                     }
@@ -1302,7 +1302,7 @@ public static async Task<List<string>> GetChildFiles(string internalFilePath)
                 try
                 {
                     var dataFile = IOUtil.GetDataFileFromPath(internalFilePath);
-                    var _mtrl = new Mtrl(XivCache.GameInfo.GameDirectory, dataFile, XivCache.GameInfo.GameLanguage);
+                    var _mtrl = new Mtrl(XivCache.GameInfo.GameDirectory);
                     var mtrlChildren = await _mtrl.GetTexturePathsFromMtrlPath(internalFilePath, false, false);
                     return mtrlChildren;
                 } catch

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -47,21 +47,11 @@ public class Mtrl
     {
         private const string MtrlExtension = ".mtrl";
         private readonly DirectoryInfo _gameDirectory;
-        private readonly XivLanguage _language;
-        private XivDataFile _dataFile;
         private static SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(1, 1);
 
-        public Mtrl(DirectoryInfo gameDirectory, XivDataFile dataFile, XivLanguage lang)
+        public Mtrl(DirectoryInfo gameDirectory)
         {
             _gameDirectory = gameDirectory;
-            _language = lang;
-            DataFile = dataFile;
-        }
-
-        public XivDataFile DataFile
-        {
-            get => _dataFile;
-            set => _dataFile = value;
         }
 
 
@@ -405,13 +395,10 @@ public async Task<XivMtrl> GetMtrlData(long mtrlOffset, string mtrlPath, int dxV
             var index = new Index(_gameDirectory);
 
             // Get uncompressed mtrl data
-            var mtrlData = await dat.GetType2Data(mtrlOffset, DataFile);
+            var df = IOUtil.GetDataFileFromPath(mtrlPath);
+            var mtrlData = await dat.GetType2Data(mtrlOffset, df);
 
             XivMtrl xivMtrl = null;
-
-            // Why is there a semaphore here to read an in memory byte block?
-            await _semaphoreSlim.WaitAsync();
-
             try
             {
                 await Task.Run((Func<Task>)(async () =>
@@ -510,7 +497,7 @@ await Task.Run((Func<Task>)(async () =>
                             if (String.IsNullOrEmpty(texturePath)) continue;
 
                             if (await index.FileExists(Path.GetDirectoryName(texturePath).Replace("\\", "/") + "/" + dx11FileName,
-                                DataFile))
+                                df))
                             {
                                 texturePath = texturePath.Insert(texturePath.LastIndexOf("/") + 1, "--");
                             }
@@ -638,7 +625,6 @@ await Task.Run((Func<Task>)(async () =>
             }
             finally
             {
-                _semaphoreSlim.Release();
             }
 
             return xivMtrl;
@@ -1183,7 +1169,6 @@ public static XivDependencyRootInfo GetHairMaterialRoot(XivDependencyRootInfo ro
         }
         public void Dipose()
         {
-            _semaphoreSlim?.Dispose();
         }
 
         /// <summary>