Update v3.0.2.6

TexTools · Jul 3, 2024 · 3a653b0 · 3a653b0
2 parents 52e4c1a + ba855e6
commit 3a653b0
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 7 deletions.
diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,8 +23,8 @@
     <AssemblyTitle>FFXIV_TexTools</AssemblyTitle>
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
-    <AssemblyVersion>3.0.2.5</AssemblyVersion>
-    <FileVersion>3.0.2.5</FileVersion>
+    <AssemblyVersion>3.0.2.6</AssemblyVersion>
+    <FileVersion>3.0.2.6</FileVersion>
     <LangVersion>9.0</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -92,6 +92,8 @@ public partial class MainWindow
         public readonly System.Windows.Forms.IWin32Window Win32Window;
 
         public static readonly string BetaSuffix = null;
+
+        public static string[] _Args;
         public static bool IsBetaVersion {
             get
             {
@@ -282,6 +284,7 @@ private void AutoUpdater_ApplicationExitEvent()
         }
         public MainWindow(string[] args)
         {
+            _Args = args;
             _mainWindow = this;
 
             AutoUpdater.ApplicationExitEvent += AutoUpdater_ApplicationExitEvent;
@@ -520,10 +523,16 @@ await Task.Run(async () =>
                     XivCache.CacheRebuilding += OnCacheRebuild;
 
 
-                    // Disable cache worker entirely for now.
                     await XivCache.SetGameInfo(gameDir, lang, true);
                     CustomizeViewModel.UpdateCacheSettings();
 
+                    var tx = DefaultTransaction;
+
+                    if(!await tx.FileExists(Eqp.DawntrailTestFile, true))
+                    {
+                        this.ShowWarning("Non-Dawntrail Install", "TexTools is currently assigned to a Endwalker or previous install.\n\nMany parts of the application will not operate correctly on old FFXIV installs.");
+                    }
+
                 } catch(Exception ex)
                 {
                     cacheOK = false;

diff --git a/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs b/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
@@ -647,7 +647,7 @@ private async Task<bool> INTERNAL_SetItem(IItem item)
             }
             catch(Exception ex) 
             {
-                this.ShowError("Item Load Error", "An error occurred while loading the item:\n\n" + ex.Message);
+                this.ShowWarning("Item Load Error", "An error occurred while loading the item:\n\n" + ex.Message);
                 return false;
             }
             finally

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditors/EstManipulationEditor.xaml b/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditors/EstManipulationEditor.xaml
@@ -12,6 +12,7 @@
             <RowDefinition Height="40"/>
             <RowDefinition Height="40"/>
             <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100"/>
@@ -22,8 +23,12 @@
 
         <Label Content="Race:" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
         <Label Content="Gender:" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Skeleton:" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
 
         <ComboBox Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Path=Races}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectedValue="{Binding Path=Race}" VerticalAlignment="Center"/>
         <ComboBox Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Path=Genders}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectedValue="{Binding Path=Gender}" VerticalAlignment="Center"/>
+
+
+        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding Path=SkeletonId}" VerticalAlignment="Center"/>
     </Grid>
 </UserControl>
diff --git a/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs b/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs
@@ -227,6 +227,7 @@ public static bool CheckRerunAdminSimple()
                 // Using operating shell and setting the ProcessStartInfo.Verb to “runas” will let it run as admin
                 processStartInfo.UseShellExecute = true;
                 processStartInfo.Verb = "runas";
+                processStartInfo.Arguments = GetRejoinedArgs();
 
                 // Start the application as new process
                 Process.Start(processStartInfo);
@@ -252,8 +253,6 @@ public static void CheckRerunAdmin()
             allSuccess = allSuccess && TestDirectory(Settings.Default.Save_Directory);
             allSuccess = allSuccess && TestDirectory(converterFolder);
 
-
-
             if (!allSuccess && !IsRunningAsAdministrator()) 
             {
                 // Setting up start info of the new process of the same application
@@ -262,6 +261,7 @@ public static void CheckRerunAdmin()
                 // Using operating shell and setting the ProcessStartInfo.Verb to “runas” will let it run as admin
                 processStartInfo.UseShellExecute = true;
                 processStartInfo.Verb = "runas";
+                processStartInfo.Arguments = GetRejoinedArgs();
 
                 // Start the application as new process
                 Process.Start(processStartInfo);
@@ -271,6 +271,23 @@ public static void CheckRerunAdmin()
             }
         }
 
+        private static string GetRejoinedArgs()
+        {
+            var args = MainWindow._Args;
+            if(args == null || args.Length == 0)
+            {
+                return "";
+            }
+
+            var st = "";
+            foreach(var s in args)
+            {
+                st += '"' + s + '"' + ' ';
+            }
+
+            return st;
+        }
+
         private static bool TestDirectory(string path)
         {
             if (string.IsNullOrWhiteSpace(path) || !Directory.Exists(path))

diff --git a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml
@@ -24,6 +24,17 @@
             <Label HorizontalAlignment="Right" VerticalAlignment="Center" FontStyle="Italic" FontSize="10">You may close this window after beginning a transaction.</Label>
         </Grid>
 
+        <Grid x:Name="TxTutorialGrid" Grid.Row="1">
+            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" FontStyle="Italic">
+                Transactions are a scratch-pad like fake-file system ontop of your FFXIV install.
+                <LineBreak/>While using a Transaction, your real FFXIV files will not be altered.
+                <LineBreak/>Likewise, they will not be reflected in game (without being connected to Penumbra).
+                <LineBreak/>
+                <LineBreak/>You may commit your transaction changes to the game files via the [Commit] button,
+                <LineBreak/>otherwise they will be discarded when TexTools is closed or the Transaction cancelled.
+            </TextBlock>
+        </Grid>
+
         <Grid x:Name="TxStatusGrid" Grid.Row="1" IsEnabled="{Binding Path=TxActionEnabled}" >
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"></RowDefinition>

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
+5 −1		xivModdingFramework/Cache/XivDependencyGraph.cs
+2 −0		xivModdingFramework/Models/FileTypes/Eqp.cs
+4 −2		xivModdingFramework/Mods/RootCloner.cs