Update v3.0.8.2

Lunaretic · Lunaretic · commit 656c473117d3 · 2024-07-24T15:14:08.000-04:00
diff --git a/xivModdingFramework/Models/FileTypes/Sklb.cs b/xivModdingFramework/Models/FileTypes/Sklb.cs
@@ -49,7 +49,7 @@ namespace xivModdingFramework.Models.FileTypes
     /// </summary>
     public static class Sklb
     {
-        private const string SkeletonsFolder = "Skeletons";
+        public const string SkeletonsFolder = "Skeletons";
 
         /// <summary>
         /// Retrieves the base racial or body skeleton for a given model file, parsing it from the base
diff --git a/xivModdingFramework/Models/Helpers/ModelModifiers.cs b/xivModdingFramework/Models/Helpers/ModelModifiers.cs
@@ -1131,6 +1131,11 @@ public static async Task RaceConvert(TTModel incomingModel, XivRace targetRace,
         /// <param name="loggingFunction"></param>
         public static async Task RaceConvertRecursive(TTModel model, XivRace targetRace, XivRace originalRace, Action<bool, string> loggingFunction = null, ModTransaction tx = null)
         {
+            await INTERNAL_RaceConvertRecursive(model, targetRace, originalRace, loggingFunction, tx);
+            await CalculateTangents(model, loggingFunction, true);
+        }
+        private static async Task INTERNAL_RaceConvertRecursive(TTModel model, XivRace targetRace, XivRace originalRace, Action<bool, string> loggingFunction = null, ModTransaction tx = null)
+        { 
             try
             {
                 if (originalRace.IsDirectParentOf(targetRace))
diff --git a/xivModdingFramework/Mods/ModTransaction.cs b/xivModdingFramework/Mods/ModTransaction.cs
@@ -386,13 +386,13 @@ public async Task<IndexFile> GetIndexFile(XivDataFile dataFile)
         {
             while (_LoadingIndexFiles)
             {
-                Thread.Sleep(1);
+                await Task.Delay(10);
             }
-            
-            if(!_IndexFiles.ContainsKey(dataFile))
+
+            _LoadingIndexFiles = true;
+            try
             {
-                _LoadingIndexFiles = true;
-                try
+                if (!_IndexFiles.ContainsKey(dataFile))
                 {
                     if (!_ReadOnly)
                     {
@@ -421,12 +421,12 @@ public async Task<IndexFile> GetIndexFile(XivDataFile dataFile)
 
                     var idx = await Index.INTERNAL_GetIndexFile(dataFile, false, ReadOnly);
                     _IndexFiles.Add(dataFile, idx);
-                }
-                finally
-                {
-                    _LoadingIndexFiles = false;
-                }
 
+                }
+            }
+            finally
+            {
+                _LoadingIndexFiles = false;
             }
             return _IndexFiles[dataFile];
         }
diff --git a/xivModdingFramework/xivModdingFramework.csproj b/xivModdingFramework/xivModdingFramework.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="SharpDX" Version="4.2.0" />
     <PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
     <PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ namespace xivModdingFramework.Models.FileTypes`
`49`	`49`	`/// </summary>`
`50`	`50`	`public static class Sklb`
`51`	`51`	`{`
`52`		`- private const string SkeletonsFolder = "Skeletons";`
	`52`	`+ public const string SkeletonsFolder = "Skeletons";`
`53`	`53`
`54`	`54`	`/// <summary>`
`55`	`55`	`/// Retrieves the base racial or body skeleton for a given model file, parsing it from the base`
Original file line number	Diff line number	Diff line change
`@@ -1131,6 +1131,11 @@ public static async Task RaceConvert(TTModel incomingModel, XivRace targetRace,`
`1131`	`1131`	`/// <param name="loggingFunction"></param>`
`1132`	`1132`	`public static async Task RaceConvertRecursive(TTModel model, XivRace targetRace, XivRace originalRace, Action<bool, string> loggingFunction = null, ModTransaction tx = null)`
`1133`	`1133`	`{`
	`1134`	`+ await INTERNAL_RaceConvertRecursive(model, targetRace, originalRace, loggingFunction, tx);`
	`1135`	`+ await CalculateTangents(model, loggingFunction, true);`
	`1136`	`+ }`
	`1137`	`+ private static async Task INTERNAL_RaceConvertRecursive(TTModel model, XivRace targetRace, XivRace originalRace, Action<bool, string> loggingFunction = null, ModTransaction tx = null)`
	`1138`	`+ {`
`1134`	`1139`	`try`
`1135`	`1140`	`{`
`1136`	`1141`	`if (originalRace.IsDirectParentOf(targetRace))`
Original file line number	Diff line number	Diff line change
`@@ -386,13 +386,13 @@ public async Task<IndexFile> GetIndexFile(XivDataFile dataFile)`
`386`	`386`	`{`
`387`	`387`	`while (_LoadingIndexFiles)`
`388`	`388`	`{`
`389`		`- Thread.Sleep(1);`
	`389`	`+ await Task.Delay(10);`
`390`	`390`	`}`
`391`		`-`
`392`		`- if(!_IndexFiles.ContainsKey(dataFile))`
	`391`	`+`
	`392`	`+ _LoadingIndexFiles = true;`
	`393`	`+ try`
`393`	`394`	`{`
`394`		`- _LoadingIndexFiles = true;`
`395`		`- try`
	`395`	`+ if (!_IndexFiles.ContainsKey(dataFile))`
`396`	`396`	`{`
`397`	`397`	`if (!_ReadOnly)`
`398`	`398`	`{`
`@@ -421,12 +421,12 @@ public async Task<IndexFile> GetIndexFile(XivDataFile dataFile)`
`421`	`421`
`422`	`422`	`var idx = await Index.INTERNAL_GetIndexFile(dataFile, false, ReadOnly);`
`423`	`423`	`_IndexFiles.Add(dataFile, idx);`
`424`		`- }`
`425`		`- finally`
`426`		`- {`
`427`		`- _LoadingIndexFiles = false;`
`428`		`- }`
`429`	`424`
	`425`	`+ }`
	`426`	`+ }`
	`427`	`+ finally`
	`428`	`+ {`
	`429`	`+ _LoadingIndexFiles = false;`
`430`	`430`	`}`
`431`	`431`	`return _IndexFiles[dataFile];`
`432`	`432`	`}`