- Bugfixes for colorset editor

- Fix for dat file placement potentially writing to improper DAT files.

Author: Lunaretic

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -444,7 +444,7 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
                 return null;
             }
 
-            var mdlData = await dat.GetType3Data(offset, _dataFile);
+            var mdlData = await dat.GetType3Data(offset, IOUtil.GetDataFileFromPath(mdlPath));
 
             var xivMdl = new XivMdl { MdlPath = mdlPath };
             int totalNonNullMaterials = 0;

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -129,7 +129,7 @@ public int CreateNewDat(XivDataFile dataFile, bool alreadyLocked = false)
             }
 
             var index = new Index(_gameDirectory);
-            index.UpdateIndexDatCount(dataFile, nextDatNumber);
+            index.UpdateIndexDatCount(dataFile, nextDatNumber, alreadyLocked);
 
             return nextDatNumber;
         }
@@ -1377,7 +1377,7 @@ private async Task<int> GetFirstDatWithSpace(XivDataFile dataFile, int fileSize
                 targetDat = i;
                 break;
             }
-
+            //sound/battle/enpc/se_enpc_alchemist_goblin_a.scd
             // Didn't find a DAT file with space, gotta create a new one.
             if (targetDat < 0)
             {
@@ -1865,7 +1865,7 @@ public static async Task<Dictionary<long, long>> ComputeOpenSlots(XivDataFile df
             var slots = new Dictionary<long, long>();
             var modlist = await _modding.GetModListAsync();
 
-            var modsByFile = modlist.Mods.Where(x => !String.IsNullOrWhiteSpace(x.fullPath)).GroupBy(x => {
+            var modsByFile = modlist.Mods.Where(x => !String.IsNullOrWhiteSpace(x.fullPath) && x.datFile == df.GetDataFileName()).GroupBy(x => {
                 long offset = x.data.modOffset;
                 var rawOffset = offset / 8;
                 var datNum = (rawOffset & 0xF) >> 1;

xivModdingFramework/SqPack/FileTypes/Index.cs

@@ -62,26 +62,26 @@ public void UpdateIndexDatCount(XivDataFile dataFile, int datNum, bool alreadySe
                 Path.Combine(_gameDirectory.FullName, $"{dataFile.GetDataFileName()}{Index2Extension}")
             };
 
-            foreach (var indexPath in indexPaths)
+            if (!alreadySemaphoreLocked)
             {
-                if (!alreadySemaphoreLocked)
-                {
-                    _semaphoreSlim.Wait();
-                }
-                try
+                _semaphoreSlim.Wait();
+            }
+            try
+            {
+                foreach (var indexPath in indexPaths)
                 {
                     using (var bw = new BinaryWriter(File.OpenWrite(indexPath)))
                     {
                         bw.BaseStream.Seek(1104, SeekOrigin.Begin);
                         bw.Write(datCount);
                     }
                 }
-                finally
+            }
+            finally
+            {
+                if (!alreadySemaphoreLocked)
                 {
-                    if (!alreadySemaphoreLocked)
-                    {
-                        _semaphoreSlim.Release();
-                    }
+                    _semaphoreSlim.Release();
                 }
             }
         }