- Allow writing any DDS type for direct DDS imports.

- Allow writing Type 2 files with headers larger than 256 bytes.

Author: Lunaretic

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -696,16 +696,17 @@ public async Task<byte[]> CreateType2Data(byte[] dataToCreate)
             headerData.InsertRange(12, BitConverter.GetBytes(totalCompSize / 128));
             headerData.InsertRange(16, BitConverter.GetBytes(totalCompSize / 128));
 
-            var headerSize = 128;
-
-            if (headerData.Count > 128)
+            var headerSize = headerData.Count;
+            var rem = headerSize % 128;
+            if(rem != 0)
             {
-                headerData.RemoveRange(0, 4);
-                headerData.InsertRange(0, BitConverter.GetBytes(256));
-                headerSize = 256;
+                headerSize += (128 - rem);
             }
-            var headerPadding = headerSize - headerData.Count;
 
+            headerData.RemoveRange(0, 4);
+            headerData.InsertRange(0, BitConverter.GetBytes(headerSize));
+
+            var headerPadding = rem == 0 ? 0 : 128 - rem;
             headerData.AddRange(new byte[headerPadding]);
 
             newData.AddRange(headerData);

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -712,7 +712,6 @@ public XivTexFormat GetDDSTexFormat(BinaryReader ddsStream)
         /// <returns></returns>
         public async Task<byte[]> MakeTexData(string internalPath, string externalPath, XivTexFormat texFormat = XivTexFormat.INVALID )
         {
-            
             // Ensure file exists.
             if (!File.Exists(externalPath))
             {
@@ -748,7 +747,7 @@ public async Task<byte[]> MakeTexData(string internalPath, string externalPath,
                 }
 
                 // Check if the texture being imported has been imported before
-                CompressionFormat compressionFormat;
+                CompressionFormat compressionFormat = CompressionFormat.BGRA;
 
                 switch (texFormat)
                 {
@@ -762,33 +761,40 @@ public async Task<byte[]> MakeTexData(string internalPath, string externalPath,
                         compressionFormat = CompressionFormat.BGRA;
                         break;
                     default:
-                        throw new Exception($"Format {texFormat} is not currently supported for BMP import\n\nPlease use the DDS import option instead.");
+                        if (!isDds)
+                        {
+                            throw new Exception($"Format {texFormat} is not currently supported for BMP import\n\nPlease use the DDS import option instead.");
+                        }
+                        break;
                 }
 
-                using (var surface = Surface.LoadFromFile(externalPath))
+                if (!isDds)
                 {
-                    if (surface == null)
-                        throw new FormatException($"Unsupported texture format");
+                    using (var surface = Surface.LoadFromFile(externalPath))
+                    {
+                        if (surface == null)
+                            throw new FormatException($"Unsupported texture format");
 
-                    surface.FlipVertically();
+                        surface.FlipVertically();
 
-                    var maxMipCount = 1;
-                    if (root != null)
-                    {
-                        // For things that have real roots (things that have actual models/aren't UI textures), we always want mipMaps, even if the existing texture only has one.
-                        // (Ex. The Default Mat-Add textures)
-                        maxMipCount = -1;
-                    }
+                        var maxMipCount = 1;
+                        if (root != null)
+                        {
+                            // For things that have real roots (things that have actual models/aren't UI textures), we always want mipMaps, even if the existing texture only has one.
+                            // (Ex. The Default Mat-Add textures)
+                            maxMipCount = -1;
+                        }
 
-                    using (var compressor = new Compressor())
-                    {
-                        // UI/Paintings only have a single mipmap and will crash if more are generated, for everything else generate max levels
-                        compressor.Input.SetMipmapGeneration(true, maxMipCount);
-                        compressor.Input.SetData(surface);
-                        compressor.Compression.Format = compressionFormat;
-                        compressor.Compression.SetBGRAPixelFormat();
+                        using (var compressor = new Compressor())
+                        {
+                            // UI/Paintings only have a single mipmap and will crash if more are generated, for everything else generate max levels
+                            compressor.Input.SetMipmapGeneration(true, maxMipCount);
+                            compressor.Input.SetData(surface);
+                            compressor.Compression.Format = compressionFormat;
+                            compressor.Compression.SetBGRAPixelFormat();
 
-                        compressor.Process(out ddsContainer);
+                            compressor.Process(out ddsContainer);
+                        }
                     }
                 }