Update v3.0.6.0

Author: Lunaretic

xivModdingFramework/Cache/XivCache.cs

@@ -8,12 +8,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using xivModdingFramework.General.Enums;
+using xivModdingFramework.Helpers;
 using xivModdingFramework.Items;
 using xivModdingFramework.Items.Categories;
 using xivModdingFramework.Items.DataContainers;
 using xivModdingFramework.Items.Enums;
 using xivModdingFramework.Items.Interfaces;
 using xivModdingFramework.Models.DataContainers;
+using xivModdingFramework.Models.FileTypes;
 using xivModdingFramework.Mods;
 using xivModdingFramework.Resources;
 using xivModdingFramework.SqPack.FileTypes;
@@ -75,7 +77,7 @@ public static class XivCache
         private static GameInfo _gameInfo;
         private static DirectoryInfo _dbPath;
         private static DirectoryInfo _rootCachePath;
-        public static readonly Version CacheVersion = new Version("1.0.3.1");
+        public static readonly Version CacheVersion = new Version("1.0.3.3");
         private const string dbFileName = "mod_cache.db";
         private const string rootCacheFileName = "item_sets.db";
         private const string creationScript = "CreateCacheDB.sql";
@@ -585,7 +587,17 @@ private static void CreateCache()
 
         private static async Task MigrateCache(Version lastCacheVersion) {
 
-            // No migration tasks currently.
+            if (lastCacheVersion == null) return;
+            if (lastCacheVersion == new Version("0.0.0.0")) return;
+            if (lastCacheVersion == new Version()) return;
+
+            if (lastCacheVersion < new Version("1.0.3.3"))
+            {
+                // Clear user's Skeletons folder from Pre-DT.
+                var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+                var skelFolder = Path.Combine(cwd, "Skeletons");
+                IOUtil.RecursiveDeleteDirectory(skelFolder);
+            }
 
         }
 

xivModdingFramework/Models/ModelTextures/ModelTexture.cs

@@ -830,12 +830,6 @@ private static ShaderMapperDelegate GetShaderMapper(CustomModelColors colors, Xi
                     var metalness = metalnessConst;
                     var occlusion = 1.0f;
 
-                    // HACKHACK - This is wrong, both according to Shader Decomp and logic/sanity.
-                    // The incoming diffuse *SHOULD* be coming in as sRGB encoded, and get Linear-converted previously.
-                    // But instead, the diffuse appears to be coming in already linear encoded, and gets double converted.
-                    // This effectively undoes one of those conversions.
-                    diffuse = LinearToSrgb(diffuse);
-
                     float skinInfluence = (float)normal.Blue;// * normal.Blue;
                     var sColor = Color4.Lerp(new Color4(1.0f), skinColor, skinInfluence);
                     diffuse *= sColor;
@@ -872,8 +866,6 @@ private static ShaderMapperDelegate GetShaderMapper(CustomModelColors colors, Xi
 
 
                     //diffuse *= diffuseColorMul;
-                    // This is a bit of a hack here and probably not correct.
-                    diffuse *= LinearToSrgb(diffuseColorMul);
 
                     if (!settings.GeneratePbrMaps)
                     {

xivModdingFramework/Mods/EndwalkerUpgrade.cs

@@ -62,14 +62,14 @@ public struct UpgradeInfo
         /// Returns a collection of file upgrade information.
         /// </summary>
         /// <param name="filePaths"></param>
-        /// <param name="source"></param>
+        /// <param name="sourceApplication"></param>
         /// <param name="states"></param>
         /// <param name="progress"></param>
         /// <param name="tx"></param>
         /// <returns></returns>
-        public static async Task<Dictionary<string, UpgradeInfo>> UpdateEndwalkerFiles(IEnumerable<string> paths, string source, bool includePartials = true, IProgress<(int current, int total, string message)> progress = null, ModTransaction tx = null)
+        public static async Task<Dictionary<string, UpgradeInfo>> UpdateEndwalkerFiles(IEnumerable<string> paths, string sourceApplication, bool includePartials = true, IProgress<(int current, int total, string message)> progress = null, ModTransaction tx = null)
         {
-            var filePaths = paths.ToList();
+            var filePaths = new HashSet<string>(paths);
             var ret = new Dictionary<string, UpgradeInfo>();
 
             HashSet<string> _ConvertedTextures = new HashSet<string>();
@@ -80,34 +80,44 @@ public static async Task<Dictionary<string, UpgradeInfo>> UpdateEndwalkerFiles(I
             var fixableMtrlsRegex = new Regex("chara\\/.*\\.mtrl");
             var fixableMtrls = filePaths.Where(x => fixableMtrlsRegex.Match(x).Success).ToList();
 
-            ret = await EndwalkerUpgrade.UpdateEndwalkerMaterials(fixableMtrls, source, tx, progress, _ConvertedTextures);
+            ret = await EndwalkerUpgrade.UpdateEndwalkerMaterials(fixableMtrls, sourceApplication, tx, progress, _ConvertedTextures);
 
             var idx = 0;
             var total = fixableMdls.Count;
             foreach (var path in fixableMdls)
             {
                 progress?.Report((idx, total, "Updating Endwalker Models..."));
                 idx++;
-                await EndwalkerUpgrade.UpdateEndwalkerModel(path, source, tx);
+                await EndwalkerUpgrade.UpdateEndwalkerModel(path, sourceApplication, tx);
             }
 
             if (includePartials)
             {
                 progress?.Report((0, total, "Updating Endwalker partial Hair Mods..."));
-                await EndwalkerUpgrade.UpdateUnclaimedHairTextures(filePaths, source, tx, _ConvertedTextures);
+                await EndwalkerUpgrade.UpdateUnclaimedHairTextures(filePaths.ToList(), sourceApplication, tx, _ConvertedTextures);
 
                 progress?.Report((0, total, "Updating Endwalker partial Eye Mods..."));
                 foreach (var path in filePaths)
                 {
                     try
                     {
-                        await EndwalkerUpgrade.UpdateEyeMask(path, source, tx, _ConvertedTextures);
+                        await EndwalkerUpgrade.UpdateEyeMask(path, sourceApplication, tx, _ConvertedTextures);
                     }
                     catch(Exception ex)
                     {
                         Trace.WriteLine(ex);
                     }
                 }
+
+                progress?.Report((0, total, "Updating Endwalker partial Skin Mods..."));
+                foreach(var path in filePaths)
+                {
+                    if (SkinRepathDict.ContainsKey(path))
+                    {
+                        var target = SkinRepathDict[path];
+                        await Dat.CopyFile(path, target, sourceApplication, true, null, tx);
+                    }
+                }
             }
 
 
@@ -2050,5 +2060,50 @@ public static async Task<FileStorageInformation> ValidateTextureSizes(FileStorag
             return info;
         }
 
+
+        public static readonly Dictionary<string, string> SkinRepathDict = new Dictionary<string, string>()
+        {
+            // Base Game
+            { "chara/human/c0201/obj/body/b0001/texture/--c0201b0001_d.tex", "chara/human/c0201/obj/body/b0001/texture/c0201b0001_base.tex" },
+            { "chara/human/c0401/obj/body/b0001/texture/--c0401b0001_d.tex", "chara/human/c0401/obj/body/b0001/texture/c0401b0001_base.tex" },
+            { "chara/human/c1401/obj/body/b0001/texture/--c1401b0001_d.tex", "chara/human/c1401/obj/body/b0001/texture/c1401b0001_base.tex" },
+            { "chara/human/c1401/obj/body/b0101/texture/--c1401b0101_d.tex", "chara/human/c1401/obj/body/b0101/texture/c1401b0101_base.tex" },
+            { "chara/human/c1801/obj/body/b0001/texture/--c1801b0001_d.tex", "chara/human/c1801/obj/body/b0001/texture/c1801b0001_base.tex" },
+
+            // Base Game Norms
+            { "chara/human/c0201/obj/body/b0001/texture/--c0201b0001_n.tex", "chara/human/c0201/obj/body/b0001/texture/c0201b0001_norm.tex" },
+            { "chara/human/c0401/obj/body/b0001/texture/--c0401b0001_n.tex", "chara/human/c0401/obj/body/b0001/texture/c0401b0001_norm.tex" },
+            { "chara/human/c1401/obj/body/b0001/texture/--c1401b0001_n.tex", "chara/human/c1401/obj/body/b0001/texture/c1401b0001_norm.tex" },
+            { "chara/human/c1401/obj/body/b0101/texture/--c1401b0101_n.tex", "chara/human/c1401/obj/body/b0101/texture/c1401b0101_norm.tex" },
+            { "chara/human/c1801/obj/body/b0001/texture/--c1801b0001_n.tex", "chara/human/c1801/obj/body/b0001/texture/c1801b0001_norm.tex" },
+
+            // Bibo
+            { "chara/bibo/midlander_d.tex", "chara/bibo_mid_base.tex" },
+            { "chara/bibo/raen_d.tex", "chara/bibo_raen_base.tex" },
+            { "chara/bibo/xaela_d.tex", "chara/bibo_xaela_base.tex" },
+            { "chara/bibo/viera_d.tex", "chara/bibo_viera_base.tex" },
+            { "chara/bibo/highlander_d.tex", "chara/bibo_high_base.tex" },
+
+            // Bibo Norms
+            { "chara/bibo/midlander_n.tex", "chara/bibo_mid_norm.tex" },
+            { "chara/bibo/raen_n.tex", "chara/bibo_raen_norm.tex" },
+            { "chara/bibo/xaela_n.tex", "chara/bibo_xaela_norm.tex" },
+            { "chara/bibo/viera_n.tex", "chara/bibo_viera_norm.tex" },
+            { "chara/bibo/highlander_n.tex", "chara/bibo_high_norm.tex" },
+
+            // TBSE
+            { "chara/human/c0101/obj/body/b0001/texture/--c0101b0001_b_d.tex", "chara/human/c0101/obj/body/b0001/texture/c0101b0001_b_d.tex" },
+            { "chara/human/c1301/obj/body/b0001/texture/--c1301b0001_b_d.tex", "chara/human/c1301/obj/body/b0001/texture/c1301b0001_b_d.tex" },
+            { "chara/human/c1301/obj/body/b0101/texture/--c1301b0101_b_d.tex", "chara/human/c1301/obj/body/b0101/texture/c1301b0101_b_d.tex" },
+            { "chara/human/c1701/obj/body/b0001/texture/--c1701b0001_b_d.tex", "chara/human/c1701/obj/body/b0001/texture/c1701b0001_b_d.tex" },
+            { "chara/human/c0301/obj/body/b0001/texture/--c0301b0001_b_d.tex", "chara/human/c0301/obj/body/b0001/texture/c0301b0001_b_d.tex" },
+
+            // TBSE Norms
+            { "chara/human/c0101/obj/body/b0001/texture/--c0101b0001_b_n.tex", "chara/human/c0101/obj/body/b0001/texture/c0101b0001_b_n.tex" },
+            { "chara/human/c1301/obj/body/b0001/texture/--c1301b0001_b_n.tex", "chara/human/c1301/obj/body/b0001/texture/c1301b0001_b_n.tex" },
+            { "chara/human/c1301/obj/body/b0101/texture/--c1301b0101_b_n.tex", "chara/human/c1301/obj/body/b0101/texture/c1301b0101_b_n.tex" },
+            { "chara/human/c1701/obj/body/b0001/texture/--c1701b0001_b_n.tex", "chara/human/c1701/obj/body/b0001/texture/c1701b0001_b_n.tex" },
+            { "chara/human/c0301/obj/body/b0001/texture/--c0301b0001_b_n.tex", "chara/human/c0301/obj/body/b0001/texture/c0301b0001_b_n.tex" },
+        };
     }
 }

xivModdingFramework/Mods/Modpack Upgrader.cs renamed to xivModdingFramework/Mods/ModpackUpgrader.cs

@@ -155,6 +155,8 @@ private static bool AnyChanges(Dictionary<string, FileStorageInformation> origin
                         )));
 
 
+                await ForAllOptions(data, UpdateSkinPaths);
+
                 // Third Round Upgrade - This inspects as-of-yet unupgraded textures for possible jank-upgrades,
                 // Which is to say, upgrades where we can infer their usage and pairing, but the base mtrl was not included.
                 foreach (var p in data.DataPages)
@@ -173,6 +175,7 @@ private static bool AnyChanges(Dictionary<string, FileStorageInformation> origin
                                 {
                                     await EndwalkerUpgrade.UpdateEyeMask(possibleMask, "Unused", null, null, o.StandardData.Files);
                                 }
+
                             }
                         }
                     }
@@ -184,9 +187,11 @@ private static bool AnyChanges(Dictionary<string, FileStorageInformation> origin
             {
                 foreach(var g in p.Groups)
                 {
-                    foreach(var o in g.Options)
+                    if (g == null) continue;
+                    foreach (var o in g.Options)
                     {
-                        if(o.StandardData != null)
+                        if (o == null) continue;
+                        if (o.StandardData != null)
                         {
                             if (!anyChanges)
                             {
@@ -472,5 +477,23 @@ await ForAllOptions(data, async (o) =>
             });
         }
 
+        public static async Task UpdateSkinPaths(WizardStandardOptionData opt)
+        {
+
+            var clone = new Dictionary<string, FileStorageInformation>(opt.Files);
+            foreach(var fkv in clone)
+            {
+                var file = fkv.Key;
+                if (EndwalkerUpgrade.SkinRepathDict.ContainsKey(file))
+                {
+                    var target = SkinRepathDict[file];
+                    if (opt.Files.ContainsKey(target)) continue;
+
+                    // Duplicate the pointer.
+                    opt.Files.Add(target, fkv.Value);
+                }
+            }
+        }
+
     }
 }

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -502,7 +502,7 @@ public static async Task<string> ConvertToDDS(string externalPath, string intern
                 using (var surface = Surface.LoadFromFile(externalPath))
                 {
                     if (surface == null)
-                        throw new FormatException($"Unsupported texture format");
+                        throw new FormatException($"Unsupported texture format or unable to load file: "  + externalPath);
 
                     surface.FlipVertically();