Add Assembly/Type/Generic overloads for GetPluginConfig

Dalamud/Configuration/PluginConfigurations.cs

@@ -133,6 +133,32 @@ public T LoadForType<T>(string pluginName) where T : IPluginConfiguration
         // intentionally no type handling - it will break when updating a plugin at runtime
         // and turns out to be unnecessary when we fully qualify the object type
     }
+
+    /// <summary>
+    /// Load Plugin configuration. Deserialized to the specified type.
+    /// </summary>
+    /// <param name="pluginName">Plugin Name.</param>
+    /// <param name="type">Configuration Type.</param>
+    /// <returns>Plugin Configuration.</returns>
+    public IPluginConfiguration? LoadForType(string pluginName, Type type)
+    {
+        if (!typeof(IPluginConfiguration).IsAssignableFrom(type))
+            throw new ArgumentException("Type must be assignable to IPluginConfiguration.", nameof(type));
+
+        if (this.GetConfigFile(pluginName) is not { Exists: true } path)
+            return null;
+
+        return (IPluginConfiguration?)JsonConvert.DeserializeObject(
+            File.ReadAllText(path.FullName),
+            type,
+            new JsonSerializerSettings
+            {
+                Converters =
+                [
+                    DalamudAssemblyTypeNameForcingJsonConverter.Instance,
+                ],
+            });
+    }
 
     /// <summary>
     /// Get FileInfo to plugin config file.

Dalamud/Plugin/DalamudPluginInterface.cs

@@ -384,6 +384,7 @@ public void SavePluginConfig(IPluginConfiguration? currentConfig)
 
     /// <summary>
     /// Get a previously saved plugin configuration or null if none was saved before.
+    /// This uses the first IPluginConfiguration type found in the calling assembly.
     /// </summary>
     /// <returns>A previously saved config or null if none was saved before.</returns>
     public IPluginConfiguration? GetPluginConfig()
@@ -408,6 +409,49 @@ public void SavePluginConfig(IPluginConfiguration? currentConfig)
         // this shouldn't be a thing, I think, but just in case
         return this.configs.Load(this.plugin.InternalName, this.plugin.EffectiveWorkingPluginId);
     }
+
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// This uses the first IPluginConfiguration type found in the specified assembly.
+    /// </summary>
+    /// <param name="assembly">The assembly to search for the configuration type.</param>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    public IPluginConfiguration? GetPluginConfig(Assembly assembly)
+    {
+        foreach (var type in assembly.GetTypes())
+        {
+            if (type.IsAssignableTo(typeof(IPluginConfiguration)))
+            {
+                var mi = this.configs.GetType().GetMethod("LoadForType");
+                var fn = mi!.MakeGenericMethod(type);
+                return (IPluginConfiguration)fn.Invoke(this.configs, new object[] { this.plugin.InternalName });
+            }
+        }
+
+        // this shouldn't be a thing, I think, but just in case
+        return this.configs.Load(this.plugin.InternalName, this.plugin.EffectiveWorkingPluginId);
+    }
+
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// </summary>
+    /// <typeparam name="TPluginConfiguration">The type of the plugin configuration.</typeparam>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    public TPluginConfiguration? GetPluginConfig<TPluginConfiguration>() 
+        where TPluginConfiguration : class, IPluginConfiguration
+    {
+        return this.configs.LoadForType<TPluginConfiguration>(this.plugin.InternalName);
+    }
+
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// </summary>
+    /// <param name="type">The type of the plugin configuration.</param>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    public IPluginConfiguration? GetPluginConfig(Type type)
+    {
+        return this.configs.LoadForType(this.plugin.InternalName, type);
+    }
 
     /// <summary>
     /// Get the config directory.

Dalamud/Plugin/IDalamudPluginInterface.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Reflection;
 
 using Dalamud.Configuration;
 using Dalamud.Game.Text;
@@ -264,10 +265,34 @@ public interface IDalamudPluginInterface
 
     /// <summary>
     /// Get a previously saved plugin configuration or null if none was saved before.
+    /// This uses the first IPluginConfiguration type found in the calling assembly.
     /// </summary>
     /// <returns>A previously saved config or null if none was saved before.</returns>
     IPluginConfiguration? GetPluginConfig();
 
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// This uses the first IPluginConfiguration type found in the specified assembly.
+    /// </summary>
+    /// <param name="assembly">The assembly to search for the configuration type.</param>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    IPluginConfiguration? GetPluginConfig(Assembly assembly);
+
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// </summary>
+    /// <typeparam name="TPluginConfiguration">The type of the plugin configuration.</typeparam>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    TPluginConfiguration? GetPluginConfig<TPluginConfiguration>() 
+        where TPluginConfiguration : class, IPluginConfiguration;
+
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// </summary>
+    /// <param name="type">The type of the plugin configuration.</param>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    IPluginConfiguration? GetPluginConfig(Type type);
+
     /// <summary>
     /// Get the config directory.
     /// </summary>