- Colorset length now automatically calculated when writing MTRL files.

- Colorset Dye data may now be imported/exported for all items, rather than only MTRLs that initially had it.

Author: Lunaretic

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -58,7 +58,11 @@ public class XivMtrl
         /// <remarks>
         /// Can be 0 if there is no ColorSet Data
         /// </remarks>
-        public ushort ColorSetDataSize { get; set; }
+        public ushort ColorSetDataSize { get {
+            var size = ColorSetData.Count * 2;
+            size += ColorSetExtraData == null ? 0 : ColorSetExtraData.Length;
+            return (ushort) size;
+        } }
 
         /// <summary>
         /// The size of the Material Data section
@@ -442,7 +446,6 @@ public void SetShaderInfo(ShaderInfo info, bool forced = false)
                 ColorSetCount = 1;
                 ColorSetData = new List<Half>();
                 ColorSetExtraData = null;
-                ColorSetDataSize = 0;
             } else
             {
                 if(ColorSetCount == 0 || ColorSetData == null || ColorSetData.Count != 256)
@@ -454,9 +457,6 @@ public void SetShaderInfo(ShaderInfo info, bool forced = false)
                 {
                     ColorSetExtraData = Tex.GetColorsetExtraDataFromDDS(Tex.GetDefaultTexturePath(XivTexType.ColorSet));
                 }
-
-                // Standard Colorset Size. -- This could really be generated automatically later.
-                ColorSetDataSize = 544;
             }
 
 

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -331,15 +331,15 @@ await Task.Run((Func<Task>)(async () =>
                         {
                             Signature = br.ReadInt32(),
                             FileSize = br.ReadInt16(),
-                            ColorSetDataSize = br.ReadUInt16(),
-                            MaterialDataSize = br.ReadUInt16(),
-                            TexturePathsDataSize = br.ReadUInt16(),
-                            TextureCount = br.ReadByte(),
-                            MapCount = br.ReadByte(),
-                            ColorSetCount = br.ReadByte(),
-                            UnknownDataSize = br.ReadByte(),
-                            MTRLPath = mtrlPath
                         };
+                        var colorSetDataSize = br.ReadUInt16();
+                        xivMtrl.MaterialDataSize = br.ReadUInt16();
+                        xivMtrl.TexturePathsDataSize = br.ReadUInt16();
+                        xivMtrl.TextureCount = br.ReadByte();
+                        xivMtrl.MapCount = br.ReadByte();
+                        xivMtrl.ColorSetCount = br.ReadByte();
+                        xivMtrl.UnknownDataSize = br.ReadByte();
+                        xivMtrl.MTRLPath = mtrlPath;
 
                         var pathSizeList = new List<int>();
 
@@ -453,7 +453,7 @@ await Task.Run((Func<Task>)(async () =>
 
                         xivMtrl.ColorSetData = new List<Half>();
                         xivMtrl.ColorSetExtraData = null;
-                        if (xivMtrl.ColorSetDataSize > 0)
+                        if (colorSetDataSize > 0)
                         {
                             // Color Data is always 512 (6 x 14 = 64 x 8bpp = 512)
                             var colorDataSize = 512;
@@ -464,7 +464,7 @@ await Task.Run((Func<Task>)(async () =>
                             }
 
                             // If the color set is 544 in length, it has an extra 32 bytes at the end
-                            if (xivMtrl.ColorSetDataSize == 544)
+                            if (colorSetDataSize == 544)
                             {
                                 xivMtrl.ColorSetExtraData = br.ReadBytes(32);
                             }
@@ -594,16 +594,14 @@ public Task<XivTex> MtrlToXivTex(XivMtrl xivMtrl, TexTypePath ttp)
         /// <param name="race">The selected race for the item</param>
         public void SaveColorSetExtraData(IItem item, XivMtrl xivMtrl, DirectoryInfo saveDirectory, XivRace race)
         {
-            if (xivMtrl.ColorSetExtraData != null)
-            {
-                var path = IOUtil.MakeItemSavePath(item, saveDirectory, race);
+            var toWrite = xivMtrl.ColorSetExtraData != null ? xivMtrl.ColorSetExtraData : new byte[32];
+            var path = IOUtil.MakeItemSavePath(item, saveDirectory, race);
 
-                Directory.CreateDirectory(path);
+            Directory.CreateDirectory(path);
 
-                var savePath = Path.Combine(path, Path.GetFileNameWithoutExtension(xivMtrl.MTRLPath) + ".dat");
+            var savePath = Path.Combine(path, Path.GetFileNameWithoutExtension(xivMtrl.MTRLPath) + ".dat");
 
-                File.WriteAllBytes(savePath, xivMtrl.ColorSetExtraData);
-            }
+            File.WriteAllBytes(savePath, toWrite);
         }
 
 
@@ -757,6 +755,7 @@ public byte[] CreateMtrlFile(XivMtrl xivMtrl, IItem item)
             // Write the actual string list (including padding).
             mtrlBytes.AddRange(stringListBytes);
 
+            // Don't know what these (4) bytes do, but hey, whatever.
             mtrlBytes.AddRange(xivMtrl.Unknown2);
 
             foreach (var colorSetHalf in xivMtrl.ColorSetData)

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -1098,9 +1098,12 @@ public byte[] DDStoMtrlData(XivMtrl xivMtrl, DirectoryInfo ddsFileDirectory, IIt
 
             var colorSetExtraData = new byte[32];
             // If the colorset size is 544, it contains extra data that must be imported
-            if (xivMtrl.ColorSetDataSize == 544)
+            try
             {
                 colorSetExtraData = GetColorsetExtraDataFromDDS(ddsFileDirectory);
+            } catch
+            {
+                colorSetExtraData = new byte[32];
             }
 
             // Replace the color set data with the imported data