From dc367d4d05536a4de241a136476c44f04e304939 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Tue, 17 Nov 2026 21:08:52 +0100 Subject: [PATCH] Refactor plugin loading API --- Directory.Build.props | 2 +- PkmnLib.Dynamic/Libraries/DynamicLibrary.cs | 14 +++++++++++--- PkmnLib.Dynamic/Libraries/LibraryLoader.cs | 10 +++++++--- .../ScriptHandling/Registry/ScriptRegistry.cs | 15 ++++++++++++--- Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs | 2 +- .../PkmnLib.Plugin.Gen7.csproj | 2 +- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6ba9cc7..9bdf00e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs b/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs index 19c81f6..9b7efcd 100644 --- a/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs +++ b/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs @@ -79,10 +79,18 @@ public class DynamicLibraryImpl : IDynamicLibrary /// Initializes a new instance of the class, with an earlier loaded loadresult. /// [PublicAPI] - public static IDynamicLibrary Create(LibraryLoader.LoadResult load) => + public static IDynamicLibrary Create(LibraryLoader.LoadResult load) => Create(load, load.Helpers); + + /// + /// Initializes a new instance of the class, with an earlier loaded loadresult, + /// and its own environment helpers. The registration of the plugins is shared; the misc library and the + /// evolution library are created for these helpers. + /// + [PublicAPI] + public static IDynamicLibrary Create(LibraryLoader.LoadResult load, PluginEnvironmentHelpers helpers) => new DynamicLibraryImpl(load.StaticLibrary, load.Registry.BattleStatCalculator!, load.Registry.DamageCalculator!, - load.Registry.MiscLibrary!, load.Registry.CaptureLibrary!, load.Resolver, load.Registry.ExplicitAIHandlers, - load.Registry.ExperienceGainCalculator!); + load.Registry.MiscLibraryFactory!(helpers), load.Registry.CaptureLibrary!, load.Resolver, + load.Registry.ExplicitAIHandlers, load.Registry.ExperienceGainCalculator!); private DynamicLibraryImpl(IStaticLibrary staticLibrary, IBattleStatCalculator statCalculator, IDamageCalculator damageCalculator, IMiscLibrary miscLibrary, ICaptureLibrary captureLibrary, diff --git a/PkmnLib.Dynamic/Libraries/LibraryLoader.cs b/PkmnLib.Dynamic/Libraries/LibraryLoader.cs index 2f7495b..c08398f 100644 --- a/PkmnLib.Dynamic/Libraries/LibraryLoader.cs +++ b/PkmnLib.Dynamic/Libraries/LibraryLoader.cs @@ -14,7 +14,11 @@ public static class LibraryLoader /// /// Result of loading plugins. /// - public record LoadResult(ScriptRegistry Registry, ScriptResolver Resolver, IStaticLibrary StaticLibrary); + public record LoadResult( + ScriptRegistry Registry, + ScriptResolver Resolver, + IStaticLibrary StaticLibrary, + PluginEnvironmentHelpers Helpers); /// /// Loads plugins and creates a static library from them. @@ -32,14 +36,14 @@ public static class LibraryLoader throw new InvalidOperationException("Damage calculator not found in plugins."); if (registry.BattleStatCalculator is null) throw new InvalidOperationException("Stat calculator not found in plugins."); - if (registry.MiscLibrary is null) + if (registry.MiscLibraryFactory is null) throw new InvalidOperationException("Misc library not found in plugins."); if (registry.CaptureLibrary is null) throw new InvalidOperationException("Capture library not found in plugins."); if (registry.ExperienceGainCalculator is null) throw new InvalidOperationException("Experience gain calculator not found in plugins."); var scriptResolver = new ScriptResolver(registry.ScriptTypes, registry.ItemScriptTypes); - return new LoadResult(registry, scriptResolver, staticLibrary); + return new LoadResult(registry, scriptResolver, staticLibrary, helpers); } private static StaticLibraryImpl CreateStaticLibrary(IReadOnlyList plugins) diff --git a/PkmnLib.Dynamic/ScriptHandling/Registry/ScriptRegistry.cs b/PkmnLib.Dynamic/ScriptHandling/Registry/ScriptRegistry.cs index 49b8c79..190d938 100644 --- a/PkmnLib.Dynamic/ScriptHandling/Registry/ScriptRegistry.cs +++ b/PkmnLib.Dynamic/ScriptHandling/Registry/ScriptRegistry.cs @@ -2,6 +2,7 @@ using System.Linq.Expressions; using System.Reflection; using PkmnLib.Dynamic.AI.Explicit; using PkmnLib.Dynamic.Libraries; +using PkmnLib.Dynamic.Plugins; using PkmnLib.Static; using PkmnLib.Static.Utils; @@ -17,7 +18,7 @@ public class ScriptRegistry private readonly Dictionary> _itemScriptTypes = new(); private IBattleStatCalculator? _battleStatCalculator; private IDamageCalculator? _damageCalculator; - private IMiscLibrary? _miscLibrary; + private Func? _miscLibraryFactory; private ICaptureLibrary? _captureLibrary; private IExperienceGainCalculator? _experienceGainCalculator; @@ -103,7 +104,15 @@ public class ScriptRegistry /// /// Register a misc library. /// - public void RegisterMiscLibrary(T miscLibrary) where T : IMiscLibrary => _miscLibrary = miscLibrary; + public void RegisterMiscLibrary(T miscLibrary) where T : IMiscLibrary => + _miscLibraryFactory = _ => miscLibrary; + + /// + /// Register a misc library that is created for each dynamic library, from the environment helpers of that + /// library. This allows several libraries with their own date and time to share one registration. + /// + public void RegisterMiscLibrary(Func create) => + _miscLibraryFactory = create; /// /// Register a capture library. @@ -121,7 +130,7 @@ public class ScriptRegistry internal IReadOnlyDictionary> ItemScriptTypes => _itemScriptTypes; internal IBattleStatCalculator? BattleStatCalculator => _battleStatCalculator; internal IDamageCalculator? DamageCalculator => _damageCalculator; - internal IMiscLibrary? MiscLibrary => _miscLibrary; + internal Func? MiscLibraryFactory => _miscLibraryFactory; internal ICaptureLibrary? CaptureLibrary => _captureLibrary; internal IExperienceGainCalculator? ExperienceGainCalculator => _experienceGainCalculator; public ExplicitAIHandlers ExplicitAIHandlers { get; } = new(); diff --git a/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs b/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs index cef9ba8..031c348 100644 --- a/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs +++ b/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs @@ -47,7 +47,7 @@ public class Gen7Plugin : Plugin, IResourceProvider registry.RegisterAssemblyScripts(typeof(Gen7Plugin).Assembly); registry.RegisterBattleStatCalculator(new Gen7BattleStatCalculator()); registry.RegisterDamageCalculator(new Gen7DamageCalculator(Configuration)); - registry.RegisterMiscLibrary(new Gen7MiscLibrary(helpers.DateTimeProvider)); + registry.RegisterMiscLibrary(x => new Gen7MiscLibrary(x.DateTimeProvider)); registry.RegisterCaptureLibrary(new Gen7CaptureLibrary(Configuration)); registry.RegisterExperienceGainCalculator(new Gen7ExperienceGainCalculator()); diff --git a/Plugins/PkmnLib.Plugin.Gen7/PkmnLib.Plugin.Gen7.csproj b/Plugins/PkmnLib.Plugin.Gen7/PkmnLib.Plugin.Gen7.csproj index 74d36ad..df431b0 100644 --- a/Plugins/PkmnLib.Plugin.Gen7/PkmnLib.Plugin.Gen7.csproj +++ b/Plugins/PkmnLib.Plugin.Gen7/PkmnLib.Plugin.Gen7.csproj @@ -8,7 +8,7 @@ + OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all"/>