PMP DefaultSettings -> ulong

Author: helpful-fox-senko-san

xivModdingFramework/Mods/FileTypes/PMP.cs

@@ -350,18 +350,19 @@ private static void ValidateOption(PmpStandardOptionJson op)
                     var selected = group.DefaultSettings;
 
                     // If the user selected custom settings, use those.
-                    if (group.SelectedSettings >= 0)
+                    if (group.SelectedSettings.HasValue)
                     {
-                        selected = group.SelectedSettings;
+                        selected = group.SelectedSettings.Value;
                     }
 
                     if (group.Type == "Single")
                     {
-                        if (selected < 0 || selected >= group.Options.Count)
+                        var selectedIdx = (int)selected;
+                        if (selected < 0 || selectedIdx >= group.Options.Count)
                         {
                             selected = 0;
                         }
-                        var groupRes = await ImportOption(group.Options[selected], unzippedPath, tx, progress, groupIdx, optionIdx);
+                        var groupRes = await ImportOption(group.Options[selectedIdx], unzippedPath, tx, progress, groupIdx, optionIdx);
                         UnionDict(imported, groupRes.Imported);
                         notImported.UnionWith(groupRes.NotImported);
                     }
@@ -373,7 +374,7 @@ private static void ValidateOption(PmpStandardOptionJson op)
                         foreach(var op in ordered)
                         {
                             var i = group.Options.IndexOf(op);
-                            var value = 1 << i;
+                            var value = 1UL << i;
                             if ((selected & value) > 0)
                             {
                                 var groupRes = await ImportOption(group.Options[i], unzippedPath, tx, progress, groupIdx, optionIdx);
@@ -393,7 +394,7 @@ private static void ValidateOption(PmpStandardOptionJson op)
                         // Bitmask options.
                         for (int i = 0; i < group.Options.Count; i++)
                         {
-                            var value = 1 << i;
+                            var value = 1UL << i;
                             if ((selected & value) > 0)
                             {
                                 var disableOpt = group.Options[i] as PmpDisableImcOptionJson;
@@ -1334,10 +1335,10 @@ public class PMPGroupJson
         public string Type = "";
 
         // Only used internally when the user is selecting options during install/application.
-        [JsonIgnore] public int SelectedSettings = -1;
+        [JsonIgnore] public ulong? SelectedSettings = null;
 
         // Either single Index or Bitflag.
-        public int DefaultSettings;
+        public ulong DefaultSettings;
 
         public List<PMPOptionJson> Options = new List<PMPOptionJson>();
     }

xivModdingFramework/Mods/WizardData.cs

@@ -569,7 +569,7 @@ public class WizardGroupEntry
         internal string FolderPath;
 
         // Int or Bitflag depending on OptionType.
-        public int Selection
+        public ulong Selection
         {
             get
             {
@@ -580,18 +580,17 @@ public int Selection
                     {
                         return 0;
                     }
-                    return Options.IndexOf(op);
+                    return (ulong)Options.IndexOf(op);
                 }
                 else
                 {
-                    var total = 0;
+                    ulong total = 0;
                     for (int i = 0; i < Options.Count; i++)
                     {
                         if (Options[i].Selected)
                         {
-                            uint mask = 1;
-                            uint shifted = mask << i;
-                            total |= (int)shifted;
+                            var bit = 1UL << i;
+                            total |= bit;
                         }
                     }
                     return total;
@@ -796,11 +795,11 @@ public static async Task<WizardGroupEntry> FromPMPGroup(PMPGroupJson pGroup, str
 
                 if (group.OptionType == EOptionType.Single)
                 {
-                    wizOp.Selected = pGroup.DefaultSettings == idx;
+                    wizOp.Selected = pGroup.DefaultSettings == (ulong)idx;
                 }
                 else
                 {
-                    var bit = 1 << idx;
+                    var bit = 1UL << idx;
                     wizOp.Selected = (pGroup.DefaultSettings & bit) != 0;
                 }
                 group.Options.Add(wizOp);