Part of the fix for ResoniteModdingGroup/MonkeyLoader.GamePacks.Reson…

…iteModLoader#4
MonkeyModdingTroop · May 2, 2024 · 37af2c4 · 37af2c4
1 parent 679dd1d
commit 37af2c4
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/MonkeyLoader/Configuration/ConfigSection.cs b/MonkeyLoader/Configuration/ConfigSection.cs
@@ -1,6 +1,7 @@
 using HarmonyLib;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NuGet.Packaging;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -23,7 +24,7 @@ public abstract class ConfigSection
         /// <summary>
         /// Stores the <see cref="IDefiningConfigKey"/>s tracked by this section.
         /// </summary>
-        protected readonly HashSet<IDefiningConfigKey> keys;
+        protected readonly HashSet<IDefiningConfigKey> keys = new();
 
         private readonly Lazy<string> _fullId;
 
@@ -98,11 +99,6 @@ public abstract class ConfigSection
         /// </summary>
         protected ConfigSection()
         {
-            keys = new(GetConfigKeys());
-
-            foreach (var key in keys)
-                key.Section = this;
-
             _fullId = new(() => $"{Config.Owner.Id}.{Id}");
         }
 
@@ -185,6 +181,18 @@ public bool TryGetDefinedKey<T>(ITypedConfigKey<T> typedTemplateKey, [NotNullWhe
         public bool TryGetDefinedKey(IConfigKey templateKey, [NotNullWhen(true)] out IDefiningConfigKey? definingKey)
             => Config.TryGetDefiningKey(templateKey.AsUntyped, out definingKey) && keys.Contains(definingKey);
 
+        internal void InitializeKeys()
+        {
+            var keysToAdd = GetConfigKeys().ToArray();
+            keys.AddRange(keysToAdd);
+
+            foreach (var key in keysToAdd)
+                key.Section = this;
+
+            foreach (var key in keysToAdd)
+                Config.RegisterConfigKey(key);
+        }
+
         internal void Load(JObject source, JsonSerializer jsonSerializer)
         {
             if (source.Count > 0)