Update 2.1.0.3

TexTools · Jul 26, 2020 · 3148cf6 · 3148cf6
2 parents d7d2b9c + 966e375
commit 3148cf6
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 50 deletions.
diff --git a/FFXIV_TexTools/App.config b/FFXIV_TexTools/App.config
@@ -37,17 +37,20 @@
             <setting name="Default_Race" serializeAs="String">
                 <value>Hyur Midlander</value>
             </setting>
-            <setting name="Skin_Color" serializeAs="String">
-                <value>#FFFFFFFF</value>
+            <setting name="Hair_Highlight_Color" serializeAs="String">
+                <value>#FF4D7EF0</value>
             </setting>
-            <setting name="Hair_Color" serializeAs="String">
+            <setting name="Eye_Color" serializeAs="String">
                 <value>#FF603913</value>
             </setting>
-            <setting name="Iris_Color" serializeAs="String">
-                <value>#FF603913</value>
+            <setting name="Lip_Color" serializeAs="String">
+                <value>#FFAD6969</value>
             </setting>
-            <setting name="Etc_Color" serializeAs="String">
-                <value>#FF603913</value>
+            <setting name="Tattoo_Color" serializeAs="String">
+                <value>#FF00FF42</value>
+            </setting>
+            <setting name="Furniture_Color" serializeAs="String">
+                <value>#FF8D3CCC</value>
             </setting>
             <setting name="Cull_Mode" serializeAs="String">
                 <value>Back</value>
@@ -88,6 +91,18 @@
             <setting name="ExportTexPNG" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="Skin_Color" serializeAs="String">
+                <value>#FFFFFFFF</value>
+            </setting>
+            <setting name="Hair_Color" serializeAs="String">
+                <value>#FF603913</value>
+            </setting>
+            <setting name="Iris_Color" serializeAs="String">
+                <value>#FF603913</value>
+            </setting>
+            <setting name="Etc_Color" serializeAs="String">
+                <value>#FF603913</value>
+            </setting>
         </FFXIV_TexTools.Properties.Settings>
     </userSettings>
   <runtime>

diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -69,11 +69,33 @@ public static MainWindow GetMainWindow()
 
         public event EventHandler TreeRefreshRequested;
 
+        private bool _UPDATING = false;
+        private void AutoUpdater_ApplicationExitEvent()
+        {
+            _UPDATING = true;
+        }
         public MainWindow(string[] args)
         {
-
             _mainWindow = this;
+            AutoUpdater.ApplicationExitEvent += AutoUpdater_ApplicationExitEvent;
+
             CheckForUpdates();
+
+            // This slightly unusual contrivance is to ensure that we actually exit program on updates
+            // *before* performing the rest of the startup initialization.  If we let it continue
+            // some odd things can result.
+
+            // In particular, threads can be spawned that may keep the application files locked when 
+            // the updater wants to replace them, and/or new installs can error out on the culture info
+            // lines below, due to not having valid settings after Application.Shutdown() was already called.
+            if(_UPDATING)
+            {
+                if (Application.Current != null) { 
+                    Application.Current.Shutdown();
+                }
+                return;
+            }
+
             CheckForSettingsUpdate();
             LanguageSelection();
 

diff --git a/FFXIV_TexTools/Properties/AssemblyInfo.cs b/FFXIV_TexTools/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.2")]
-[assembly: AssemblyFileVersion("2.1.0.2")]
+[assembly: AssemblyVersion("2.1.0.3")]
+[assembly: AssemblyFileVersion("2.1.0.3")]
diff --git a/FFXIV_TexTools/Properties/Settings.Designer.cs b/FFXIV_TexTools/Properties/Settings.Designer.cs
diff --git a/FFXIV_TexTools/Properties/Settings.settings b/FFXIV_TexTools/Properties/Settings.settings
@@ -29,12 +29,6 @@
     <Setting Name="Default_Race" Type="System.String" Scope="User">
       <Value Profile="(Default)">Hyur Midlander</Value>
     </Setting>
-    <Setting Name="Skin_Color" Type="System.String" Scope="User">
-      <Value Profile="(Default)">#FFCC9578</Value>
-    </Setting>
-    <Setting Name="Hair_Color" Type="System.String" Scope="User">
-      <Value Profile="(Default)">#FF82400D</Value>
-    </Setting>
     <Setting Name="Hair_Highlight_Color" Type="System.String" Scope="User">
       <Value Profile="(Default)">#FF4D7EF0</Value>
     </Setting>
@@ -89,5 +83,17 @@
     <Setting Name="ExportTexPNG" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="Skin_Color" Type="System.String" Scope="User">
+      <Value Profile="(Default)">#FFFFFFFF</Value>
+    </Setting>
+    <Setting Name="Hair_Color" Type="System.String" Scope="User">
+      <Value Profile="(Default)">#FF603913</Value>
+    </Setting>
+    <Setting Name="Iris_Color" Type="System.String" Scope="User">
+      <Value Profile="(Default)">#FF603913</Value>
+    </Setting>
+    <Setting Name="Etc_Color" Type="System.String" Scope="User">
+      <Value Profile="(Default)">#FF603913</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/FFXIV_TexTools/ViewModels/ModListViewModel.cs b/FFXIV_TexTools/ViewModels/ModListViewModel.cs
@@ -546,15 +546,7 @@ where mod.name.Equals(selectedItem.Name)
                          select mod).ToList();
                 }
 
-                if (modItems.Count > 10)
-                {
-                    tex = new Tex(_gameDirectory, selectedItem.DataFile);
-                    await tex.GetIndexFileDictionary();
-                }
-                else
-                {
-                    tex = new Tex(_gameDirectory);
-                }
+                tex = new Tex(_gameDirectory);
 
                 var modNum = 0;
 

diff --git a/FFXIV_TexTools/Views/ProblemCheckView.xaml.cs b/FFXIV_TexTools/Views/ProblemCheckView.xaml.cs
@@ -273,6 +273,10 @@ private Task CheckMods(IProgress<(int current, int total)> progress)
             try
             {
                 modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));
+
+                // Someone somehow had their entire modlist filled with 0's causing the deserealization to 
+                // just return null so this was added to still detect that as a corrupted modlist
+                if (modList == null) throw new Exception("How did this even happen?");
             }
             catch
             {

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
+21 −6		xivModdingFramework/Materials/FileTypes/Mtrl.cs
+33 −0		xivModdingFramework/Models/DataContainers/TTModel.cs
+25 −13		xivModdingFramework/Models/FileTypes/Mdl.cs
+36 −0		xivModdingFramework/Models/Helpers/ModelModifiers.cs
+10 −6		xivModdingFramework/Models/ModelTextures/ModelTexture.cs