Finish autodetection of enabled toggles

ResoniteModdingGroup · Nov 26, 2024 · 59fd909 · 59fd909
1 parent 803f1b8
commit 59fd909
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfigurationDefinitionBuilder.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfigurationDefinitionBuilder.cs
@@ -93,16 +93,16 @@ internal void ProcessAttributes()
                 .Do(ProcessField);
         }
 
-        internal bool TryGetEnabledToggle([NotNullWhen(true)] out DefiningConfigKey<bool>? enabledToggleKey, bool remove = true)
+        internal bool TryGetEnabledToggle([NotNullWhen(true)] out DefiningConfigKey<bool>? enabledToggleKey, bool makeInternal = true)
         {
             enabledToggleKey = null;
-            ModConfigurationKey? enabledToggle = null;
+            ModConfigurationKey<bool>? enabledToggle = null;
 
             var potentialKeys = _keys.OfType<ModConfigurationKey<bool>>().ToArray();
 
             foreach (var definitiveEnabledToggle in _definitiveEnabledToggles)
             {
-                if (potentialKeys.FirstOrDefault(key => key.Name.Equals(definitiveEnabledToggle, StringComparison.OrdinalIgnoreCase)) is ModConfigurationKey enabledKey)
+                if (potentialKeys.FirstOrDefault(key => key.Name.Equals(definitiveEnabledToggle, StringComparison.OrdinalIgnoreCase)) is ModConfigurationKey<bool> enabledKey)
                 {
                     enabledToggle = enabledKey;
                     break;
@@ -122,11 +122,16 @@ internal bool TryGetEnabledToggle([NotNullWhen(true)] out DefiningConfigKey<bool
                 enabledToggle = potentialKeys[0];
             }
 
-            enabledToggleKey = (DefiningConfigKey<bool>)enabledToggle.UntypedKey;
-
-            if (remove)
+            if (makeInternal && !enabledToggle.InternalAccessOnly)
+            {
                 _keys.Remove(enabledToggle);
 
+                enabledToggle = new ModConfigurationKey<bool>(enabledToggle.Name, enabledToggle.Description, () => true, true);
+                _keys.Add(enabledToggle);
+            }
+
+            enabledToggleKey = enabledToggle.Key;
+
             return true;
         }
 

diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj b/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.21.0-beta" GeneratePathProperty="true" />
+    <PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.21.2-beta" GeneratePathProperty="true" />
     <PackageReference Include="PolySharp" Version="1.15.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs
@@ -19,11 +19,6 @@ public abstract class ResoniteMod : ResoniteModBase
     {
         private readonly Lazy<ModConfiguration?> _configuration;
 
-        /// <summary>
-        /// Gets the <see cref="MonkeyBase.Enabled">Enabled</see>-Toggle config item for this mod.
-        /// </summary>
-        internal DefiningConfigKey<bool>? EnabledToggle { get; private set; }
-
         /// <inheritdoc/>
         protected override ModConfiguration? Configuration => _configuration.Value;
 

diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteModBase.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteModBase.cs
@@ -54,7 +54,7 @@ public bool Enabled
         }
 
         /// <inheritdoc/>
-        public IDefiningConfigKey<bool>? EnabledToggle { get; }
+        public IDefiningConfigKey<bool>? EnabledToggle { get; protected set; }
 
         /// <inheritdoc/>
         public bool Failed { get; private set; }

diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/RmlMod.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/RmlMod.cs
@@ -81,9 +81,6 @@ public RmlMod(MonkeyLoader.MonkeyLoader loader, string? location, bool isGamePac
 
             resoniteMod.GetConfiguration();
 
-            if (resoniteMod.EnabledToggle is not null)
-                MonkeyToggles.A
-
             // Add dependencies after refactoring MKL
             //foreach (var referencedAssembly in assembly.GetReferencedAssemblies())
             //    dependencies.Add(referencedAssembly.Name, new DependencyReference())