Update v3.0.7.4

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyRoot.cs

@@ -68,6 +68,23 @@ public XivDependencyRootInfo GetOtherSlot(string slot)
             };
         }
 
+        public bool IsHumanMaterialVersionException()
+        {
+            if (PrimaryType == XivItemType.human)
+            {
+                if(SecondaryType != null && 
+                    (SecondaryType == XivItemType.tail || SecondaryType == XivItemType.body))
+                {
+                    if(PrimaryId == XivRace.Hrothgar_Female.GetRaceCodeInt()
+                        || PrimaryId == XivRace.Hrothgar_Male.GetRaceCodeInt())
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
         /// <summary>
         /// Converts this dependency root into a raw string entry.
         /// </summary>
@@ -733,9 +750,28 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1, ModTr
 
             index = await tx.GetIndexFile(df);
             modlist = await tx.GetModList();
-
             var materials = new HashSet<string>();
-            if (Info.PrimaryType == XivItemType.human && Info.SecondaryType == XivItemType.body)
+
+            if (Info.IsHumanMaterialVersionException())
+            {
+                // Special Hrothgar Cases.
+                var primary = Info.PrimaryId.ToString("D4");
+                var secondary = Info.SecondaryId.Value.ToString("D4");
+                var path = $"chara/human/c{primary}/obj/body/b{secondary}/material/v0001/mt_c{primary}b{secondary}_a.mtrl";
+                if(Info.SecondaryType == XivItemType.tail)
+                {
+                    path = $"chara/human/c{primary}/obj/tail/t{secondary}/material/v0001/mt_c{primary}t{secondary}_a.mtrl";
+                }
+
+                materials.Add(path);
+                for (int i = 2; i <= 5; i++)
+                {
+                    materials.Add(path.Replace("/v0001/", "/v000" + i + "/"));
+                }
+
+                materialVariant = -1;
+            }
+            else if (Info.PrimaryType == XivItemType.human && Info.SecondaryType == XivItemType.body)
             {
                 // Bleargh.  So here's the exception of exception class.  Because the "models" in human body are 
                 // are so sparse and all over the place, relying on them is impossible.  Thankfully, body types only ever
@@ -745,27 +781,12 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1, ModTr
                 var path = $"chara/human/c{primary}/obj/body/b{body}/material/v0001/mt_c{primary}b{body}_a.mtrl";
 
                 // Just validate it exists and call it a day.
-
                 var exists = index.FileExists(path);
                 if (exists)
                 {
                     materials.Add(path);
                 }
 
-                // XXX: I noticed female hrothgar also have patterns so I'm gonna put them here too
-                if (Info.PrimaryId == XivRace.Hrothgar_Male.GetRaceCodeInt()
-                    || Info.PrimaryId == XivRace.Hrothgar_Female.GetRaceCodeInt()
-                    )
-                {
-                    // JK, Hrothgar actually have 5 material sets (that's how their fur pattern stuff is set)
-                    for (int i = 2; i <= 5; i++)
-                    {
-                        var mSet = i.ToString().PadLeft(4, '0');
-                        path = $"chara/human/c{primary}/obj/body/b{body}/material/v{mSet}/mt_c{primary}b{body}_a.mtrl";
-                        materials.Add(path);
-                    }
-                }
-
                 materialVariant = -1;
             }
             else if (Info.PrimaryType == XivItemType.human && Info.SecondaryType != XivItemType.hair && Info.SecondaryId > 100)

xivModdingFramework/Helpers/PenumbraAPI.cs

@@ -72,6 +72,26 @@ private static async Task<bool> Request(string urlPath, object data = null)
         }
 
 
+        public static string GetQuickLauncherGameDirectory()
+        {
+            var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "XIVLauncher", "launcherConfigV3.json");
+            if (!File.Exists(path))
+            {
+                return "";
+            }
+
+            try
+            {
+                var obj = JObject.Parse(File.ReadAllText(path));
+                var st = (string)obj["GamePath"];
+                return st;
+            }
+            catch (Exception ex)
+            {
+                return "";
+            }
+        }
+
         public static string GetPenumbraDirectory()
         {
             var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "XIVLauncher", "pluginConfigs", "Penumbra.json");
@@ -91,6 +111,7 @@ public static string GetPenumbraDirectory()
                 return "";
             }
         }
+
         public static bool IsPenumbraInstalled()
         {
             var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "XIVLauncher", "dalamudConfig.json");

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -2963,7 +2963,7 @@ public static void CheckCommonUserErrors(TTModel model, Action<bool, string> log
                         loggingFunction(true, "Mesh: " + mIdx + " Part: " + pIdx + " has a fully black Vertex Color channel.  This can have unexpected results on in-game rendering.  Was this intended?");
                     }
 
-                    if (fullWhiteColor && m.Material.Contains("_iri_"))
+                    if (fullWhiteColor && m.Material != null && m.Material.Contains("_iri_"))
                     {
                         loggingFunction(true, "Mesh: " + mIdx + " Part: " + pIdx + " has a fully white Vertex Color channel on an Iris material.  This will break Heterochromia and cause discoloration.  Was this intended?");
                     }

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -940,6 +940,7 @@ public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
                     xivMdl.BoneBoundingBoxes.Add(new List<Vector4>() { minPoint, maxPoint });
                 }
 
+                var preBound = br.BaseStream.Position;
                 xivMdl.BonelessPartBoundingBoxes = new List<List<Vector4>>();
                 for (var i = 0; i < xivMdl.ModelData.FurniturePartBoundingBoxCount; i++)
                 {
@@ -955,15 +956,29 @@ public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
                 // Attempts to catch weird broken mod mdls.
                 // This has been known to occur with both certain penumbra MDLs, and very old
                 // TexTools MDLs.
-                if (xivMdl.LoDList[0].VertexDataOffset < br.BaseStream.Position
-                    || (xivMdl.LoDList[0].VertexDataOffset % 8 != br.BaseStream.Position % 8))
+                if (xivMdl.BonelessPartBoundingBoxes.Count != 0)
                 {
+                    if(xivMdl.LoDList[0].VertexDataOffset == preBound)
+                    {
+                        foreach(var bl in xivMdl.BonelessPartBoundingBoxes)
+                        {
+                            bl[0] = new Vector4(0, 0, 0, 1);
+                            bl[1] = new Vector4(0, 0, 0, 1);
+                        }
+                        br.BaseStream.Seek(preBound, SeekOrigin.Begin);
+                    }
+                }
+                else { 
+                    if (xivMdl.LoDList[0].VertexDataOffset < br.BaseStream.Position
+                        || (xivMdl.LoDList[0].VertexDataOffset % 8 != br.BaseStream.Position % 8))
+                    {
 
-                    var delta = (int) (xivMdl.LoDList[0].VertexDataOffset - br.BaseStream.Position);
-                    xivMdl.LoDList[0].VertexDataOffset -= delta;
-                    xivMdl.LoDList[0].IndexDataOffset -= delta;
-                    //var rem = br.ReadBytes(delta);
-                    var z = "z";
+                        var delta = (int)(xivMdl.LoDList[0].VertexDataOffset - br.BaseStream.Position);
+                        xivMdl.LoDList[0].VertexDataOffset -= delta;
+                        xivMdl.LoDList[0].IndexDataOffset -= delta;
+                        //var rem = br.ReadBytes(delta);
+                        var z = "z";
+                    }
                 }