Refactor plugin loading API
Build / Build (push) Successful in 1m0s

This commit is contained in:
Deukhoofd committed 2026-11-17 21:08:52 +01:00
1 parent 8254cd8ee3
commit dc367d4d05
6 files changed
+33 -12

No files matched your search

+1 -1
View File
@@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations"/> <PackageReference Include="JetBrains.Annotations" PrivateAssets="all"/>
<PackageReference Include="PolySharp"> <PackageReference Include="PolySharp">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+11 -3
View File
@@ -79,10 +79,18 @@ public class DynamicLibraryImpl : IDynamicLibrary
/// Initializes a new instance of the <see cref="DynamicLibraryImpl"/> class, with an earlier loaded loadresult. /// Initializes a new instance of the <see cref="DynamicLibraryImpl"/> class, with an earlier loaded loadresult.
/// </summary> /// </summary>
[PublicAPI] [PublicAPI]
public static IDynamicLibrary Create(LibraryLoader.LoadResult load) => public static IDynamicLibrary Create(LibraryLoader.LoadResult load) => Create(load, load.Helpers);
/// <summary>
/// Initializes a new instance of the <see cref="DynamicLibraryImpl"/> 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.
/// </summary>
[PublicAPI]
public static IDynamicLibrary Create(LibraryLoader.LoadResult load, PluginEnvironmentHelpers helpers) =>
new DynamicLibraryImpl(load.StaticLibrary, load.Registry.BattleStatCalculator!, load.Registry.DamageCalculator!, new DynamicLibraryImpl(load.StaticLibrary, load.Registry.BattleStatCalculator!, load.Registry.DamageCalculator!,
load.Registry.MiscLibrary!, load.Registry.CaptureLibrary!, load.Resolver, load.Registry.ExplicitAIHandlers, load.Registry.MiscLibraryFactory!(helpers), load.Registry.CaptureLibrary!, load.Resolver,
load.Registry.ExperienceGainCalculator!); load.Registry.ExplicitAIHandlers, load.Registry.ExperienceGainCalculator!);
private DynamicLibraryImpl(IStaticLibrary staticLibrary, IBattleStatCalculator statCalculator, private DynamicLibraryImpl(IStaticLibrary staticLibrary, IBattleStatCalculator statCalculator,
IDamageCalculator damageCalculator, IMiscLibrary miscLibrary, ICaptureLibrary captureLibrary, IDamageCalculator damageCalculator, IMiscLibrary miscLibrary, ICaptureLibrary captureLibrary,
+7 -3
View File
@@ -14,7 +14,11 @@ public static class LibraryLoader
/// <summary> /// <summary>
/// Result of loading plugins. /// Result of loading plugins.
/// </summary> /// </summary>
public record LoadResult(ScriptRegistry Registry, ScriptResolver Resolver, IStaticLibrary StaticLibrary); public record LoadResult(
ScriptRegistry Registry,
ScriptResolver Resolver,
IStaticLibrary StaticLibrary,
PluginEnvironmentHelpers Helpers);
/// <summary> /// <summary>
/// Loads plugins and creates a static library from them. /// 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."); throw new InvalidOperationException("Damage calculator not found in plugins.");
if (registry.BattleStatCalculator is null) if (registry.BattleStatCalculator is null)
throw new InvalidOperationException("Stat calculator not found in plugins."); 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."); throw new InvalidOperationException("Misc library not found in plugins.");
if (registry.CaptureLibrary is null) if (registry.CaptureLibrary is null)
throw new InvalidOperationException("Capture library not found in plugins."); throw new InvalidOperationException("Capture library not found in plugins.");
if (registry.ExperienceGainCalculator is null) if (registry.ExperienceGainCalculator is null)
throw new InvalidOperationException("Experience gain calculator not found in plugins."); throw new InvalidOperationException("Experience gain calculator not found in plugins.");
var scriptResolver = new ScriptResolver(registry.ScriptTypes, registry.ItemScriptTypes); 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<IPlugin> plugins) private static StaticLibraryImpl CreateStaticLibrary(IReadOnlyList<IPlugin> plugins)
@@ -2,6 +2,7 @@ using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using PkmnLib.Dynamic.AI.Explicit; using PkmnLib.Dynamic.AI.Explicit;
using PkmnLib.Dynamic.Libraries; using PkmnLib.Dynamic.Libraries;
using PkmnLib.Dynamic.Plugins;
using PkmnLib.Static; using PkmnLib.Static;
using PkmnLib.Static.Utils; using PkmnLib.Static.Utils;
@@ -17,7 +18,7 @@ public class ScriptRegistry
private readonly Dictionary<StringKey, Func<IItem, ItemScript>> _itemScriptTypes = new(); private readonly Dictionary<StringKey, Func<IItem, ItemScript>> _itemScriptTypes = new();
private IBattleStatCalculator? _battleStatCalculator; private IBattleStatCalculator? _battleStatCalculator;
private IDamageCalculator? _damageCalculator; private IDamageCalculator? _damageCalculator;
private IMiscLibrary? _miscLibrary; private Func<PluginEnvironmentHelpers, IMiscLibrary>? _miscLibraryFactory;
private ICaptureLibrary? _captureLibrary; private ICaptureLibrary? _captureLibrary;
private IExperienceGainCalculator? _experienceGainCalculator; private IExperienceGainCalculator? _experienceGainCalculator;
@@ -103,7 +104,15 @@ public class ScriptRegistry
/// <summary> /// <summary>
/// Register a misc library. /// Register a misc library.
/// </summary> /// </summary>
public void RegisterMiscLibrary<T>(T miscLibrary) where T : IMiscLibrary => _miscLibrary = miscLibrary; public void RegisterMiscLibrary<T>(T miscLibrary) where T : IMiscLibrary =>
_miscLibraryFactory = _ => miscLibrary;
/// <summary>
/// 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.
/// </summary>
public void RegisterMiscLibrary(Func<PluginEnvironmentHelpers, IMiscLibrary> create) =>
_miscLibraryFactory = create;
/// <summary> /// <summary>
/// Register a capture library. /// Register a capture library.
@@ -121,7 +130,7 @@ public class ScriptRegistry
internal IReadOnlyDictionary<StringKey, Func<IItem, ItemScript>> ItemScriptTypes => _itemScriptTypes; internal IReadOnlyDictionary<StringKey, Func<IItem, ItemScript>> ItemScriptTypes => _itemScriptTypes;
internal IBattleStatCalculator? BattleStatCalculator => _battleStatCalculator; internal IBattleStatCalculator? BattleStatCalculator => _battleStatCalculator;
internal IDamageCalculator? DamageCalculator => _damageCalculator; internal IDamageCalculator? DamageCalculator => _damageCalculator;
internal IMiscLibrary? MiscLibrary => _miscLibrary; internal Func<PluginEnvironmentHelpers, IMiscLibrary>? MiscLibraryFactory => _miscLibraryFactory;
internal ICaptureLibrary? CaptureLibrary => _captureLibrary; internal ICaptureLibrary? CaptureLibrary => _captureLibrary;
internal IExperienceGainCalculator? ExperienceGainCalculator => _experienceGainCalculator; internal IExperienceGainCalculator? ExperienceGainCalculator => _experienceGainCalculator;
public ExplicitAIHandlers ExplicitAIHandlers { get; } = new(); public ExplicitAIHandlers ExplicitAIHandlers { get; } = new();
+1 -1
View File
@@ -47,7 +47,7 @@ public class Gen7Plugin : Plugin<Gen7PluginConfiguration>, IResourceProvider
registry.RegisterAssemblyScripts(typeof(Gen7Plugin).Assembly); registry.RegisterAssemblyScripts(typeof(Gen7Plugin).Assembly);
registry.RegisterBattleStatCalculator(new Gen7BattleStatCalculator()); registry.RegisterBattleStatCalculator(new Gen7BattleStatCalculator());
registry.RegisterDamageCalculator(new Gen7DamageCalculator(Configuration)); registry.RegisterDamageCalculator(new Gen7DamageCalculator(Configuration));
registry.RegisterMiscLibrary(new Gen7MiscLibrary(helpers.DateTimeProvider)); registry.RegisterMiscLibrary(x => new Gen7MiscLibrary(x.DateTimeProvider));
registry.RegisterCaptureLibrary(new Gen7CaptureLibrary(Configuration)); registry.RegisterCaptureLibrary(new Gen7CaptureLibrary(Configuration));
registry.RegisterExperienceGainCalculator(new Gen7ExperienceGainCalculator()); registry.RegisterExperienceGainCalculator(new Gen7ExperienceGainCalculator());
@@ -8,7 +8,7 @@
<ProjectReference Include="..\..\PkmnLib.Dynamic\PkmnLib.Dynamic.csproj"/> <ProjectReference Include="..\..\PkmnLib.Dynamic\PkmnLib.Dynamic.csproj"/>
<ProjectReference Include="..\..\PkmnLib.Static\PkmnLib.Static.csproj"/> <ProjectReference Include="..\..\PkmnLib.Static\PkmnLib.Static.csproj"/>
<ProjectReference Include="..\PkmnLib.Plugin.Gen7.SourceGen\PkmnLib.Plugin.Gen7.SourceGen.csproj" <ProjectReference Include="..\PkmnLib.Plugin.Gen7.SourceGen\PkmnLib.Plugin.Gen7.SourceGen.csproj"
OutputItemType="Analyzer" ReferenceOutputAssembly="false"/> OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>