Don't explode the world if Penumbra eats our mod folder, and fix mod tags stuff.

Author: Lunaretic

xivModdingFramework/Mods/FileTypes/PMP.cs

@@ -114,7 +114,11 @@ await IOUtil.UnzipFiles(path, tempFolder, (file) =>
             {
                 if (Path.GetFileName(file).StartsWith("group_") && Path.GetFileName(file).ToLower().EndsWith(".json"))
                 {
-                    groups.Add(JsonConvert.DeserializeObject<PMPGroupJson>(File.ReadAllText(file)));
+                    var group = JsonConvert.DeserializeObject<PMPGroupJson>(File.ReadAllText(file));
+                    if (group != null)
+                    {
+                        groups.Add(group);
+                    }
                 }
             }
 
@@ -137,9 +141,10 @@ await IOUtil.UnzipFiles(path, tempFolder, (file) =>
                 foreach(var o in g.Options)
                 {
                     var op = o as PmpStandardOptionJson;
-                    if(op != null)
+                    if (op != null)
                     {
-                        foreach(var kv in op.Files)
+                        ValidateOption(op);
+                        foreach (var kv in op.Files)
                         {
                             var zipPath = kv.Value;
                             allPmpFiles.Add(zipPath);
@@ -151,6 +156,7 @@ await IOUtil.UnzipFiles(path, tempFolder, (file) =>
             var defOp = pmp.DefaultMod as PmpStandardOptionJson;
             if(defOp != null)
             {
+                ValidateOption(defOp);
                 foreach (var kv in defOp.Files)
                 {
                     var zipPath = kv.Value;
@@ -190,6 +196,26 @@ private static bool IsPmpJsonFile(string file)
             return false;
         }
 
+        /// <summary>
+        /// Preforms basic cleanup-validation on options.
+        /// </summary>
+        /// <param name="op"></param>
+        private static void ValidateOption(PmpStandardOptionJson op)
+        {
+            if (op.Files == null)
+            {
+                op.Files = new Dictionary<string, string>();
+            }
+            if(op.Manipulations == null)
+            {
+                op.Manipulations = new List<PMPManipulationWrapperJson>();
+            }
+            if(op.FileSwaps == null)
+            {
+                op.FileSwaps = new Dictionary<string, string>();
+            }
+        }
+
         /// <summary>
         /// Imports a given PMP File, Penumbra Folder, or Penumbra Folder Root JSON into the game files.
         /// </summary>
@@ -712,6 +738,7 @@ public static async Task CreateSimplePmp(string destination, BaseModpackData mod
                 pmp.Meta.FileVersion = 3;
                 pmp.Meta.Version = modpackMeta.Version.ToString();
                 pmp.Meta.Website = modpackMeta.Url;
+                pmp.Meta.ModTags = pmp.Meta.ModTags ?? new List<string>();
 
 
                 await WritePmp(pmp, workingPath, zip ? destination : null);
@@ -734,6 +761,11 @@ public static async Task WritePmp(PMPJson pmp, string workingDirectory, string z
             var metapath = Path.Combine(workingDirectory, "meta.json");
             var defaultModPath = Path.Combine(workingDirectory, "default_mod.json");
 
+            if(pmp.Meta.ModTags == null)
+            {
+                pmp.Meta.ModTags = new List<string>();
+            }
+
             var metaString = JsonConvert.SerializeObject(pmp.Meta, Formatting.Indented);
             File.WriteAllText(metapath, metaString);
 

xivModdingFramework/Mods/WizardData.cs

@@ -92,6 +92,11 @@ protected override bool CheckHasData()
 
         public void SortManipulations()
         {
+            if(Manipulations == null)
+            {
+                Manipulations = new List<PMPManipulationWrapperJson>();
+            }
+
             Manipulations.Sort((a, b) =>
             {
                 if (a == null || b == null)

xivModdingFramework/SqPack/FileTypes/TransactionDataHandler.cs

@@ -833,20 +833,6 @@ internal void UNSAFE_AddFileInfo(FileStorageInformation storageInfo, XivDataFile
 
             var di = new DirectoryInfo(dir);
 
-            var i = 0;
-            if (di.EnumerateDirectories().Count() > 10)
-            {
-                // Sus...
-                throw new Exception("Target Penumbra Mod Directory seems invalid.  Please select an individual Penumbra mod folder or create a blank folder.");
-            }
-
-            var files = di.EnumerateFiles();
-            if (!files.Any(x => x.Extension.ToLower() == ".json"))
-            {
-                // Sus...
-                throw new Exception("Target Penumbra Mod Directory seems invalid.  Please select an individual Penumbra mod folder or create a blank folder.");
-            }
-
             var dict = await GetFinalWriteList(tx);
 
             var pathName = di.Name;