Get rid of that obsolete usage warning

neos-modding-group · Apr 9, 2022 · 66eaaa5 · 66eaaa5
1 parent 9f40ffd
commit 66eaaa5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/NeosModLoader/ModConfiguration.cs b/NeosModLoader/ModConfiguration.cs
@@ -423,8 +423,7 @@ private bool AnyValuesSet()
 
         internal static ModConfiguration LoadConfigForMod(LoadedNeosMod mod)
         {
-            // intentional call to an obsolete method. This will need reorganizing in the next major version.
-            ModConfigurationDefinition definition = mod.NeosMod.GetConfigurationDefinition();
+            ModConfigurationDefinition definition = mod.NeosMod.BuildConfigurationDefinition();
             if (definition == null)
             {
                 // if there's no definition, then there's nothing for us to do here

diff --git a/NeosModLoader/NeosMod.cs b/NeosModLoader/NeosMod.cs
@@ -28,18 +28,27 @@ public abstract class NeosMod : NeosModBase
         public virtual void OnEngineInit() { }
 
         /// <summary>
-        /// Get the defined configuration for this mod. This should be overridden by your mod if necessary.
+        /// Build the defined configuration for this mod.
         /// </summary>
-        /// <returns>This mod's configuration definition. calls DefineConfiguration(ModConfigurationDefinitionBuilder) by default.</returns>
-        [Obsolete("This method is obsolete. Use DefineConfiguration(ModConfigurationDefinitionBuilder) instead.")] // REMOVE IN NEXT MAJOR VERSION
-        public virtual ModConfigurationDefinition GetConfigurationDefinition()
+        /// <returns>This mod's configuration definition.</returns>
+        internal ModConfigurationDefinition BuildConfigurationDefinition()
         {
             ModConfigurationDefinitionBuilder builder = new(this);
             builder.ProcessAttributes();
             DefineConfiguration(builder);
             return builder.Build();
         }
 
+        /// <summary>
+        /// Get the defined configuration for this mod. This should be overridden by your mod if necessary.
+        /// </summary>
+        /// <returns>This mod's configuration definition. calls DefineConfiguration(ModConfigurationDefinitionBuilder) by default.</returns>
+        [Obsolete("This method is obsolete. Use DefineConfiguration(ModConfigurationDefinitionBuilder) instead.")] // REMOVE IN NEXT MAJOR VERSION
+        public virtual ModConfigurationDefinition GetConfigurationDefinition()
+        {
+            return BuildConfigurationDefinition();
+        }
+
         /// <summary>
         /// Create a configuration definition for this mod.
         /// </summary>