Various penumbra upgrade tweaks.

Author: Lunaretic

xivModdingFramework/Helpers/IOUtil.cs

@@ -429,6 +429,8 @@ public static void RecursiveDeleteDirectory(DirectoryInfo baseDir)
 
             try
             {
+                if (!baseDir.Exists)
+                    return;
                 baseDir.Delete(true);
             }
             catch

xivModdingFramework/Mods/EndwalkerUpgrade.cs

@@ -1798,7 +1798,10 @@ public static async Task UpgradeRemainingTextures(Dictionary<string, FileStorage
 
                         var data = await ResolveFile(upgrade.Files["mask_old"], files, null);
                         data = await UpgradeMaskTex(data);
-                        await WriteFile(data, upgrade.Files["mask_new"], files, null);
+                        if (data != null)
+                        {
+                            await WriteFile(data, upgrade.Files["mask_new"], files, null);
+                        }
                     }
                 }
                 else if (upgrade.Usage == EUpgradeTextureUsage.GearMaskLegacy)
@@ -1807,8 +1810,11 @@ public static async Task UpgradeRemainingTextures(Dictionary<string, FileStorage
                     {
 
                         var data = await ResolveFile(upgrade.Files["mask_old"], files, null);
-                        data = await UpgradeMaskTex(data, true);
-                        await WriteFile(data, upgrade.Files["mask_new"], files, null);
+                        if (data != null)
+                        {
+                            data = await UpgradeMaskTex(data, true);
+                            await WriteFile(data, upgrade.Files["mask_new"], files, null);
+                        }
                     }
                 }
             }

xivModdingFramework/Mods/ModpackUpgrader.cs

@@ -209,11 +209,15 @@ private static bool AnyChanges(Dictionary<string, FileStorageInformation> origin
             return (data, anyChanges);
         }
 
-        public static async Task<bool> UpgradeModpack(string path, string newPath, bool includePartials = true)
+        public static async Task<bool> UpgradeModpack(string path, string newPath, bool includePartials = true, bool rewriteOnNoChanges = false)
         {
             var data = await UpgradeModpack(path, includePartials);
 
-            await data.Data.WriteModpack(newPath, true);
+            if (data.AnyChanges || rewriteOnNoChanges)
+            {
+                await data.Data.WriteModpack(newPath, true);
+            }
+
             return data.AnyChanges;
         }
 

xivModdingFramework/SqPack/FileTypes/TransactionDataHandler.cs

@@ -63,6 +63,7 @@ public bool LiveGameFile
         {
             get
             {
+                if (RealPath == null) return false;
                 return RealPath.StartsWith(XivCache.GameInfo.GameDirectory.FullName) && RealPath.EndsWith(Dat.DatExtension) && StorageType == EFileStorageType.CompressedBlob;
             }
         }