- Additional Safety checks on Disable/Enable all mods and Item Conversions of null material set items.

Author: Lunaretic

xivModdingFramework/Mods/Modding.cs

@@ -436,9 +436,9 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
                 progress?.Report((++modNum, modList.Mods.Count, string.Empty));
             }
 
-            if (includeInternal)
+            if (includeInternal && !enable)
             {
-                // Disable these last, just to avoid any potential strangeness.
+                // Disable these last.
                 var internalEntries = modList.Mods.Where(x => x.IsInternal());
                 foreach (var modEntry in internalEntries)
                 {
@@ -449,6 +449,17 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
 
             SaveModList(modList);
 
+            if (includeInternal && !enable)
+            {
+                // Now go ahead and delete the internal files, to prevent them
+                // being accidentally re-enabled (They should be re-built by the metadata file imports)
+                var internalEntries = modList.Mods.Where(x => x.IsInternal());
+                foreach (var modEntry in internalEntries)
+                {
+                    await DeleteMod(modEntry.fullPath, true);
+                }
+            }
+
 
             // Do these as a batch query at the end.
             progress?.Report((++modNum, modList.Mods.Count, "Adding modified files to Cache Queue..."));

xivModdingFramework/Mods/RootCloner.cs

@@ -356,6 +356,10 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
 
                 // Poke through the variants and adjust any that point to null Material Sets to instead use a valid one.
                 var valid = newMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
+                if(valid <= 0)
+                {
+                    valid = originalMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
+                }
 
                 for(int i = 0; i < newMetadata.ImcEntries.Count; i++)
                 {