diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj index 6545a2e1..dceb7dc3 100644 --- a/FFXIV_TexTools/FFXIV_TexTools.csproj +++ b/FFXIV_TexTools/FFXIV_TexTools.csproj @@ -23,9 +23,9 @@ FFXIV_TexTools Copyright © 2024 - 3.0.5.2 - 3.0.5.2 - 3.0.5.2 + 3.0.5.3 + 3.0.5.3 + 3.0.5.3 9.0 true diff --git a/FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs b/FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs index d64ce67b..7d2bcc70 100644 --- a/FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs +++ b/FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs @@ -36,6 +36,15 @@ public static async Task UpgradeModpackPrompted(bool includePartials = true) var data = await xivModdingFramework.Mods.ModpackUpgrader.UpgradeModpack(path, includePartials); + if(!data.AnyChanges) + { + FlexibleMessageBox.Show(ViewHelpers.GetWin32Window(MainWindow.GetMainWindow()), + "The upgrader found nothing to upgrade in the modpack.\n\nThis typically means the mod either does not need to be upgraded, must be manually upgraded, or was already upgraded, possibly by another tool (Ex. Penumbra).", + "No Upgrade Needed", + MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + var ext = Path.GetExtension(path); var name = Path.GetFileNameWithoutExtension(path); diff --git a/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs index 33142635..d1bd84c1 100644 --- a/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs +++ b/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs @@ -518,19 +518,6 @@ private async void ShaderComboBox_SelectionChanged(object sender, SelectionChang OnPropertyChanged(nameof(ColorsetEnabled)); - // Create or purge colorset as necessary. - if (ShaderPack != EShaderPack.Character) - { - Material.ColorSetData = new List(); - Material.ColorSetDyeData = new byte[0]; - } else - { - var length = 1024; - var dyeLength = 128; - Material.ColorSetData = new List(new Half[length]); - Material.ColorSetDyeData = new byte[dyeLength]; - } - // Reset shader vars. Material.ShaderKeys = new List(); Material.ShaderConstants = new List(); diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index 1bb577ba..75d4a0ea 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit 1bb577ba7eee0baec86f6079efb9a66d794ed1c8 +Subproject commit 75d4a0eadd6f7a4db89a077a4d457d5470ef08ad