From e0339160e908276a97963fd498f9e785a88ee690 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 8 Jun 2024 16:25:08 +0200
Subject: [PATCH] Start removing MetaManipulation functions.

---
 Penumbra/Meta/Manipulations/MetaDictionary.cs | 40 +++++++++----------
 .../Manager/OptionEditor/ModGroupEditor.cs    |  3 +-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Penumbra/Meta/Manipulations/MetaDictionary.cs b/Penumbra/Meta/Manipulations/MetaDictionary.cs
index b0b7f011..b9d7990d 100644
--- a/Penumbra/Meta/Manipulations/MetaDictionary.cs
+++ b/Penumbra/Meta/Manipulations/MetaDictionary.cs
@@ -124,28 +124,28 @@ public sealed class MetaDictionary : IEnumerable<MetaManipulation>
         return true;
     }
 
-    public bool Remove(MetaManipulation manip)
+    public void UnionWith(MetaDictionary manips)
     {
-        var ret = manip.ManipulationType switch
-        {
-            MetaManipulation.Type.Imc       => _imc.Remove(manip.Imc.Identifier),
-            MetaManipulation.Type.Eqdp      => _eqdp.Remove(manip.Eqdp.Identifier),
-            MetaManipulation.Type.Eqp       => _eqp.Remove(manip.Eqp.Identifier),
-            MetaManipulation.Type.Est       => _est.Remove(manip.Est.Identifier),
-            MetaManipulation.Type.Gmp       => _gmp.Remove(manip.Gmp.Identifier),
-            MetaManipulation.Type.Rsp       => _rsp.Remove(manip.Rsp.Identifier),
-            MetaManipulation.Type.GlobalEqp => _globalEqp.Remove(manip.GlobalEqp),
-            _                               => false,
-        };
-        if (ret)
-            --Count;
-        return ret;
-    }
+        foreach (var (identifier, entry) in manips._imc)
+            TryAdd(identifier, entry);
 
-    public void UnionWith(IEnumerable<MetaManipulation> manips)
-    {
-        foreach (var manip in manips)
-            Add(manip);
+        foreach (var (identifier, entry) in manips._eqp)
+            TryAdd(identifier, entry);
+
+        foreach (var (identifier, entry) in manips._eqdp)
+            TryAdd(identifier, entry);
+
+        foreach (var (identifier, entry) in manips._gmp)
+            TryAdd(identifier, entry);
+
+        foreach (var (identifier, entry) in manips._rsp)
+            TryAdd(identifier, entry);
+
+        foreach (var (identifier, entry) in manips._est)
+            TryAdd(identifier, entry);
+
+        foreach (var identifier in manips._globalEqp)
+            TryAdd(identifier);
     }
 
     public bool TryGetValue(MetaManipulation identifier, out MetaManipulation oldValue)
diff --git a/Penumbra/Mods/Manager/OptionEditor/ModGroupEditor.cs b/Penumbra/Mods/Manager/OptionEditor/ModGroupEditor.cs
index 01092862..594ec9d2 100644
--- a/Penumbra/Mods/Manager/OptionEditor/ModGroupEditor.cs
+++ b/Penumbra/Mods/Manager/OptionEditor/ModGroupEditor.cs
@@ -144,8 +144,7 @@ public class ModGroupEditor(
     /// <summary> Set the meta manipulations for a given option. Replaces existing manipulations. </summary>
     public void SetManipulations(IModDataContainer subMod, MetaDictionary manipulations, SaveType saveType = SaveType.Queue)
     {
-        if (subMod.Manipulations.Count == manipulations.Count
-         && subMod.Manipulations.All(m => manipulations.TryGetValue(m, out var old) && old.EntryEquals(m)))
+        if (subMod.Manipulations.Equals(manipulations))
             return;
 
         communicator.ModOptionChanged.Invoke(ModOptionChangeType.PrepareChange, (Mod)subMod.Mod, subMod.Group, null, subMod, -1);