Merge pull request #11 from Yuuki-Walsh/master

Import / Export PNG support

Author: KoraLyn

xivModdingFramework/Helpers/IOUtil.cs

@@ -123,37 +123,5 @@ public static string MakeItemSavePath(IItem item, DirectoryInfo saveDirectory, X
 
             return path;
         }
-
-        /// <summary>
-        /// Determines whether a DDS file exists for the given item
-        /// </summary>
-        /// <param name="item">The item to check</param>
-        /// <param name="saveDirectory">The save directory where the DDS should be located</param>
-        /// <param name="fileName">The name of the file</param>
-        /// <returns>True if the DDS file exists, false otherwise</returns>
-        public static bool DDSFileExists(IItem item, DirectoryInfo saveDirectory, string fileName, XivRace race = XivRace.All_Races)
-        {
-            var path = MakeItemSavePath(item, saveDirectory, race);
-
-            var fullPath = new DirectoryInfo($"{path}\\{fileName}.dds");
-
-            return File.Exists(fullPath.FullName);
-        }
-
-        /// <summary>
-        /// Determines whether a BMP file exists for the given item
-        /// </summary>
-        /// <param name="item">The item to check</param>
-        /// <param name="saveDirectory">The save directory where the BMP should be located</param>
-        /// <param name="fileName">The name of the file</param>
-        /// <returns>True if the BMP file exists, false otherwise</returns>
-        public static bool BMPFileExists(IItem item, DirectoryInfo saveDirectory, string fileName, XivRace race = XivRace.All_Races)
-        {
-            var path = MakeItemSavePath(item, saveDirectory, race);
-
-            var fullPath = new DirectoryInfo($"{path}\\{fileName}.bmp");
-
-            return File.Exists(fullPath.FullName);
-        }
     }
 }

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -663,13 +663,13 @@ public async Task<int> TexDDSImporter(XivTex xivTex, IItem item, DirectoryInfo d
             return offset;
         }
 
-        public async Task<int> TexBMPImporter(XivTex xivTex, IItem item, DirectoryInfo bmpFileDirectory, string source)
+        public async Task<int> TexImporter(XivTex xivTex, IItem item, DirectoryInfo fileDirectory, string source)
         {
             var offset = 0;
 
             var modding = new Modding(_gameDirectory);
 
-            if (File.Exists(bmpFileDirectory.FullName))
+            if (File.Exists(fileDirectory.FullName))
             {
                 // Check if the texture being imported has been imported before
                 var modEntry = await modding.TryGetModEntry(xivTex.TextureTypeAndPath.Path);
@@ -679,7 +679,7 @@ public async Task<int> TexBMPImporter(XivTex xivTex, IItem item, DirectoryInfo b
                 switch (xivTex.TextureFormat)
                 {
                     case XivTexFormat.DXT1:
-                        compressionFormat = CompressionFormat.BC1;
+                        compressionFormat = CompressionFormat.BC1a;
                         break;
                     case XivTexFormat.DXT5:
                         compressionFormat = CompressionFormat.BC3;
@@ -691,8 +691,11 @@ public async Task<int> TexBMPImporter(XivTex xivTex, IItem item, DirectoryInfo b
                         throw new Exception($"Format {xivTex.TextureFormat} is not currently supported for BMP import\n\nPlease use the DDS import option instead.");
                 }
 
-                using (var surface = Surface.LoadFromFile(bmpFileDirectory.FullName))
+                using (var surface = Surface.LoadFromFile(fileDirectory.FullName))
                 {
+                    if (surface == null)
+                        throw new FormatException($"Unsupported texture format");
+
                     surface.FlipVertically();
 
                     using (var compressor = new Compressor())
@@ -805,7 +808,7 @@ public async Task<int> TexBMPImporter(XivTex xivTex, IItem item, DirectoryInfo b
             }
             else
             {
-                throw new IOException($"Could not find file: {bmpFileDirectory.FullName}");
+                throw new IOException($"Could not find file: {fileDirectory.FullName}");
             }
 
             return offset;