Bug fixes

Sebane1 · Jan 20, 2023 · 9bf3af8 · 9bf3af8
1 parent 20d0e4d
commit 9bf3af8
Show file tree

Hide file tree

Showing 28 changed files with 19 additions and 16 deletions.
diff --git a/.vs/FFXIVLooseTextureCompiler/FileContentIndex/146c89de-8d4f-441e-8134-50869fa7a35a.vsidx b/.vs/FFXIVLooseTextureCompiler/FileContentIndex/146c89de-8d4f-441e-8134-50869fa7a35a.vsidx
diff --git a/.vs/FFXIVLooseTextureCompiler/FileContentIndex/1de9562c-fc65-4f44-96c0-3037cb4f5386.vsidx b/.vs/FFXIVLooseTextureCompiler/FileContentIndex/1de9562c-fc65-4f44-96c0-3037cb4f5386.vsidx
diff --git a/.vs/FFXIVLooseTextureCompiler/FileContentIndex/29a33569-af4f-45f6-a95f-7adf658f81c2.vsidx b/.vs/FFXIVLooseTextureCompiler/FileContentIndex/29a33569-af4f-45f6-a95f-7adf658f81c2.vsidx
diff --git a/.vs/FFXIVLooseTextureCompiler/FileContentIndex/3643f101-f0b7-464a-89ab-0cbd58fedef3.vsidx b/.vs/FFXIVLooseTextureCompiler/FileContentIndex/3643f101-f0b7-464a-89ab-0cbd58fedef3.vsidx
diff --git a/.vs/FFXIVLooseTextureCompiler/v17/.suo b/.vs/FFXIVLooseTextureCompiler/v17/.suo
diff --git a/FFXIVLooseTextureCompiler/FFXIVLooseTextureCompiler.csproj b/FFXIVLooseTextureCompiler/FFXIVLooseTextureCompiler.csproj
@@ -9,7 +9,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>0.0.0.1</AssemblyVersion>
     <FileVersion>0.0.0.1</FileVersion>
-    <Version>0.0.0.1</Version>
+    <Version>0.0.0.2</Version>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
     <Title>FFXIV Loose Texture Compiler</Title>
     <Copyright>Lawener Industries</Copyright>
@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>none</DebugType>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>none</DebugType>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/FFXIVLooseTextureCompiler/MainForm.cs b/FFXIVLooseTextureCompiler/MainForm.cs
@@ -78,6 +78,7 @@ private void generateButton_Click(object sender, EventArgs e) {
                 if (Directory.Exists(modPath)) {
                     Directory.Delete(modPath, true);
                 }
+                Directory.CreateDirectory(modPath);
                 if (!string.IsNullOrEmpty(diffuseB.FilePath.Text)) {
                     byte[] diffuseData = new byte[0];
                     TextureImporter.PngToTex(diffuseB.FilePath.Text, out diffuseData);
@@ -96,7 +97,7 @@ private void generateButton_Click(object sender, EventArgs e) {
                     group.Options.Add(option);
                     File.WriteAllBytes(normalBodyDiskPath, normalData);
                 }
-                if (!string.IsNullOrEmpty(normalB.FilePath.Text)) {
+                if (!string.IsNullOrEmpty(multiB.FilePath.Text)) {
                     byte[] multiData = new byte[0];
                     TextureImporter.PngToTex(multiB.FilePath.Text, out multiData);
                     Option option = new Option("Multi", 0);
@@ -119,14 +120,14 @@ private void generateButton_Click(object sender, EventArgs e) {
                     byte[] normalData = new byte[0];
                     TextureImporter.PngToTex(normalF.FilePath.Text, out normalData);
                     Option option = new Option("Normal", 0);
-                    option.Files.Add(diffuseFacePath, diffuseFacePath.Replace("/", @"\"));
+                    option.Files.Add(normalFacePath, normalFacePath.Replace("/", @"\"));
                     Directory.CreateDirectory(Path.GetDirectoryName(normalFaceDiskPath));
                     group2.Options.Add(option);
                     File.WriteAllBytes(normalFaceDiskPath, normalData);
                 }
-                if (!string.IsNullOrEmpty(normalF.FilePath.Text)) {
+                if (!string.IsNullOrEmpty(multiF.FilePath.Text)) {
                     byte[] multiData = new byte[0];
-                    TextureImporter.PngToTex(normalF.FilePath.Text, out multiData);
+                    TextureImporter.PngToTex(multiF.FilePath.Text, out multiData);
                     Option option = new Option("Multi", 0);
                     option.Files.Add(multiFacePath, multiFacePath.Replace("/", @"\"));
                     Directory.CreateDirectory(Path.GetDirectoryName(multiFaceDiskPath));

diff --git a/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfo.cs b/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyCopyrightAttribute("Lawener Industries")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.1")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.1")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.2")]
 [assembly: System.Reflection.AssemblyProductAttribute("FFXIVLooseTextureCompiler")]
 [assembly: System.Reflection.AssemblyTitleAttribute("FFXIVLooseTextureCompiler")]
 [assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.1")]

diff --git a/...xtureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfoInputs.cache b/...xtureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1ec1d24522e17ffec63faf1f0f63df8cab34dd28
+bddc6d2272b865abdaeb0643389d5e257780fd91
diff --git a/...reCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.csproj.FileListAbsolute.txt b/...reCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.csproj.FileListAbsolute.txt
@@ -2,7 +2,6 @@ C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\FFXIVLooseTextureCompiler.deps.json
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\FFXIVLooseTextureCompiler.runtimeconfig.json
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\FFXIVLooseTextureCompiler.dll
-C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\FFXIVLooseTextureCompiler.pdb
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.csproj.AssemblyReference.cache
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.csproj.GenerateResource.cache
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.GeneratedMSBuildEditorConfig.editorconfig
@@ -11,7 +10,6 @@ C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.csproj.CoreCompileInputs.cache
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.dll
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\refint\FFXIVLooseTextureCompiler.dll
-C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.pdb
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.genruntimeconfig.cache
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\ref\FFXIVLooseTextureCompiler.dll
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVVoicePackCreator.FilePicker.resources
@@ -50,3 +48,5 @@ C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\runtimes\win-x64\native\WebView2Loader.dll
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\runtimes\win-x86\native\WebView2Loader.dll
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.Properties.Resources.resources
+C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Debug\net7.0-windows\FFXIVLooseTextureCompiler.pdb
+C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Debug\net7.0-windows\FFXIVLooseTextureCompiler.pdb
diff --git a/...Compiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.csproj.GenerateResource.cache b/...Compiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.csproj.GenerateResource.cache
diff --git a/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.dll b/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.dll
diff --git a/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.pdb b/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/FFXIVLooseTextureCompiler.pdb
diff --git a/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/apphost.exe b/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/apphost.exe
diff --git a/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/ref/FFXIVLooseTextureCompiler.dll b/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/ref/FFXIVLooseTextureCompiler.dll
diff --git a/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/refint/FFXIVLooseTextureCompiler.dll b/FFXIVLooseTextureCompiler/obj/Debug/net7.0-windows/refint/FFXIVLooseTextureCompiler.dll
diff --git a/FFXIVLooseTextureCompiler/obj/FFXIVLooseTextureCompiler.csproj.nuget.dgspec.json b/FFXIVLooseTextureCompiler/obj/FFXIVLooseTextureCompiler.csproj.nuget.dgspec.json
@@ -5,7 +5,7 @@
   },
   "projects": {
     "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj": {
-      "version": "0.0.0.1",
+      "version": "0.0.0.2",
       "restore": {
         "projectUniqueName": "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj",
         "projectName": "FFXIVLooseTextureCompiler",

diff --git a/...LooseTextureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfo.cs b/...LooseTextureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyCopyrightAttribute("Lawener Industries")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.1")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.1")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.2")]
 [assembly: System.Reflection.AssemblyProductAttribute("FFXIVLooseTextureCompiler")]
 [assembly: System.Reflection.AssemblyTitleAttribute("FFXIVLooseTextureCompiler")]
 [assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.1")]

diff --git a/...ureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfoInputs.cache b/...ureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.AssemblyInfoInputs.cache
@@ -1 +1 @@
-d5b594b8555c09e37fcac28f3e271b44aa2ec859
+2ce9394f99d6035834e2faec3e6b54cf43d814e9
diff --git a/...Compiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.csproj.FileListAbsolute.txt b/...Compiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.csproj.FileListAbsolute.txt
@@ -48,3 +48,5 @@ C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Release\net7.0-windows\refint\FFXIVLooseTextureCompiler.dll
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Release\net7.0-windows\FFXIVLooseTextureCompiler.genruntimeconfig.cache
 C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Release\net7.0-windows\ref\FFXIVLooseTextureCompiler.dll
+C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\obj\Release\net7.0-windows\FFXIVLooseTextureCompiler.pdb
+C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\bin\Release\net7.0-windows\FFXIVLooseTextureCompiler.pdb
diff --git a/...mpiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.csproj.GenerateResource.cache b/...mpiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.csproj.GenerateResource.cache
diff --git a/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.dll b/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.dll
diff --git a/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.pdb b/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/FFXIVLooseTextureCompiler.pdb
diff --git a/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/apphost.exe b/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/apphost.exe
diff --git a/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/ref/FFXIVLooseTextureCompiler.dll b/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/ref/FFXIVLooseTextureCompiler.dll
diff --git a/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/refint/FFXIVLooseTextureCompiler.dll b/FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/refint/FFXIVLooseTextureCompiler.dll
diff --git a/FFXIVLooseTextureCompiler/obj/project.assets.json b/FFXIVLooseTextureCompiler/obj/project.assets.json
@@ -568,7 +568,7 @@
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
   },
   "project": {
-    "version": "0.0.0.1",
+    "version": "0.0.0.2",
     "restore": {
       "projectUniqueName": "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj",
       "projectName": "FFXIVLooseTextureCompiler",

diff --git a/FFXIVLooseTextureCompiler/obj/project.nuget.cache b/FFXIVLooseTextureCompiler/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "a6fch5Y4V254Ie/jFHWRk47QroPgcQQgyBGZC+yZI2R9yMgsenbgJ3bNeYmp6HNH9ANcll/mjcJUJ59KXqESsQ==",
+  "dgSpecHash": "2BYBmqdCkGR0QleUjBtWk4UYft/4CC/ohnqX21nNP2x78NwtgUY7MoEIm95iAXlwk59OA/N+eceoLzozhj1MZA==",
   "success": true,
   "projectFilePath": "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj",
   "expectedPackageFiles": [