diff --git a/AI/AIRunner/Program.cs b/AI/AIRunner/Program.cs index 9fe10ee..5901bc0 100644 --- a/AI/AIRunner/Program.cs +++ b/AI/AIRunner/Program.cs @@ -2,6 +2,7 @@ using System.CommandLine.Parsing; using PkmnLib.Dynamic.AI; using PkmnLib.Dynamic.Libraries; +using PkmnLib.Dynamic.Plugins; using PkmnLib.Plugin.Gen7; using PkmnLib.Static.Utils; using Serilog; @@ -24,7 +25,10 @@ internal static class Program AILogging.LogHandler = Log.Debug; var library = DynamicLibraryImpl.Create([ new Gen7Plugin(), - ]); + ], new PluginEnvironmentHelpers + { + DateTimeProvider = () => DateTimeOffset.Now, + }); _availableAIs = PokemonAI.InstantiateAis(library); var testCommand = new Command("test", "Run two AIs against each other") diff --git a/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs b/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs index 349e4a7..6eac13a 100644 --- a/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs +++ b/PkmnLib.Dynamic/Libraries/DynamicLibrary.cs @@ -68,9 +68,9 @@ public class DynamicLibraryImpl : IDynamicLibrary /// Initializes a new instance of the class, with the given /// plugins and static library. /// - public static IDynamicLibrary Create(IEnumerable plugins) + public static IDynamicLibrary Create(IEnumerable plugins, PluginEnvironmentHelpers helpers) { - var load = LibraryLoader.LoadPlugins(plugins); + var load = LibraryLoader.LoadPlugins(plugins, helpers); return new DynamicLibraryImpl(load.StaticLibrary, load.Registry.BattleStatCalculator!, load.Registry.DamageCalculator!, load.Registry.MiscLibrary!, load.Registry.CaptureLibrary!, load.Resolver, diff --git a/PkmnLib.Dynamic/Libraries/LibraryLoader.cs b/PkmnLib.Dynamic/Libraries/LibraryLoader.cs index 3401efe..2f7495b 100644 --- a/PkmnLib.Dynamic/Libraries/LibraryLoader.cs +++ b/PkmnLib.Dynamic/Libraries/LibraryLoader.cs @@ -19,14 +19,14 @@ public static class LibraryLoader /// /// Loads plugins and creates a static library from them. /// - public static LoadResult LoadPlugins(IEnumerable plugins) + public static LoadResult LoadPlugins(IEnumerable plugins, PluginEnvironmentHelpers helpers) { var registry = new ScriptRegistry(); var orderedPlugins = plugins.OrderBy(x => x.LoadOrder).ToList(); var staticLibrary = CreateStaticLibrary(orderedPlugins); foreach (var plugin in orderedPlugins) { - plugin.Register(registry); + plugin.Register(registry, helpers); } if (registry.DamageCalculator is null) throw new InvalidOperationException("Damage calculator not found in plugins."); diff --git a/PkmnLib.Dynamic/Plugins/Plugin.cs b/PkmnLib.Dynamic/Plugins/Plugin.cs index 74086c9..b81a812 100644 --- a/PkmnLib.Dynamic/Plugins/Plugin.cs +++ b/PkmnLib.Dynamic/Plugins/Plugin.cs @@ -26,7 +26,7 @@ public interface IPlugin /// /// Run the registration of the plugin when we're building the library. /// - void Register(ScriptRegistry registry); + void Register(ScriptRegistry registry, PluginEnvironmentHelpers helpers); } /// @@ -59,7 +59,7 @@ public abstract class Plugin : IPlugin where TConfiguration : IP /// /// Run the registration of the plugin when we're building the library. /// - public abstract void Register(ScriptRegistry registry); + public abstract void Register(ScriptRegistry registry, PluginEnvironmentHelpers helpers); } /// diff --git a/PkmnLib.Dynamic/Plugins/PluginEnvironmentHelpers.cs b/PkmnLib.Dynamic/Plugins/PluginEnvironmentHelpers.cs new file mode 100644 index 0000000..e120125 --- /dev/null +++ b/PkmnLib.Dynamic/Plugins/PluginEnvironmentHelpers.cs @@ -0,0 +1,18 @@ +namespace PkmnLib.Dynamic.Plugins; + +/// +/// Helper functions to get information about the environment we're running in, such as the current date time. +/// +public class PluginEnvironmentHelpers +{ + /// + /// A delegate that provides the current date and time. + /// + public delegate DateTimeOffset DateTimeProviderDelegate(); + + /// + /// A function to get the current date and time. This can be replaced in cases where the date and time + /// may not be the same as the system time. + /// + public required DateTimeProviderDelegate DateTimeProvider { get; init; } +} \ No newline at end of file diff --git a/PkmnLib.Dynamic/StaticHelpers.cs b/PkmnLib.Dynamic/StaticHelpers.cs deleted file mode 100644 index b1a2abf..0000000 --- a/PkmnLib.Dynamic/StaticHelpers.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace PkmnLib.Dynamic; - -/// -/// A static helper class that contains functions that are used in multiple places. -/// -public static class StaticHelpers -{ - /// - /// A delegate that provides the current date and time. - /// - public delegate DateTimeOffset DateTimeProviderDelegate(); - - /// - /// A function to get the current date and time. This can be replaced in cases where the date and time - /// may not be the same as the system time. - /// - [PublicAPI] - public static DateTimeProviderDelegate DateTimeProvider { get; set; } = () => DateTimeOffset.Now; - - /// - /// Get the current date and time. - /// - public static DateTimeOffset GetCurrentDateTime() => DateTimeProvider(); -} \ No newline at end of file diff --git a/PkmnLib.Tests/Integration/IntegrationTestRunner.cs b/PkmnLib.Tests/Integration/IntegrationTestRunner.cs index 914a9dd..a6bf3cf 100644 --- a/PkmnLib.Tests/Integration/IntegrationTestRunner.cs +++ b/PkmnLib.Tests/Integration/IntegrationTestRunner.cs @@ -1,6 +1,7 @@ using System.Text.Json; using EnumerableAsyncProcessor.Extensions; using PkmnLib.Dynamic.Libraries; +using PkmnLib.Dynamic.Plugins; using PkmnLib.Dynamic.Models; using PkmnLib.Plugin.Gen7; using PkmnLib.Static.Species; @@ -45,7 +46,10 @@ public class IntegrationTestRunner { DamageCalculatorHasRandomness = true, }), - ]); + ], new PluginEnvironmentHelpers + { + DateTimeProvider = () => DateTimeOffset.Now, + }); } else { @@ -54,7 +58,10 @@ public class IntegrationTestRunner { DamageCalculatorHasRandomness = false, }), - ]); + ], new PluginEnvironmentHelpers + { + DateTimeProvider = () => DateTimeOffset.Now, + }); } await TestContext.Current!.OutputWriter.WriteLineAsync("File: " + $"file://{test.FileName}"); diff --git a/PkmnLib.Tests/Integration/LibraryHelpers.cs b/PkmnLib.Tests/Integration/LibraryHelpers.cs index 0871d10..da7738e 100644 --- a/PkmnLib.Tests/Integration/LibraryHelpers.cs +++ b/PkmnLib.Tests/Integration/LibraryHelpers.cs @@ -1,4 +1,5 @@ using PkmnLib.Dynamic.Libraries; +using PkmnLib.Dynamic.Plugins; using PkmnLib.Plugin.Gen7; namespace PkmnLib.Tests.Integration; @@ -12,7 +13,10 @@ public static class LibraryHelpers { DamageCalculatorHasRandomness = false, }), - ]); + ], new PluginEnvironmentHelpers + { + DateTimeProvider = () => DateTimeOffset.Now, + }); return dynamicLibrary; } } \ No newline at end of file diff --git a/Plugins/PkmnLib.Plugin.Gen7.Tests/LibraryHelpers.cs b/Plugins/PkmnLib.Plugin.Gen7.Tests/LibraryHelpers.cs index 04ab417..c64f74f 100644 --- a/Plugins/PkmnLib.Plugin.Gen7.Tests/LibraryHelpers.cs +++ b/Plugins/PkmnLib.Plugin.Gen7.Tests/LibraryHelpers.cs @@ -1,4 +1,5 @@ using PkmnLib.Dynamic.Libraries; +using PkmnLib.Dynamic.Plugins; namespace PkmnLib.Plugin.Gen7.Tests; @@ -11,7 +12,10 @@ public static class LibraryHelpers { DamageCalculatorHasRandomness = false, }), - ]); + ], new PluginEnvironmentHelpers + { + DateTimeProvider = () => DateTimeOffset.Now, + }); return dynamicLibrary; } } \ No newline at end of file diff --git a/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs b/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs index a5314af..cef9ba8 100644 --- a/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs +++ b/Plugins/PkmnLib.Plugin.Gen7/Gen7Plugin.cs @@ -42,12 +42,12 @@ public class Gen7Plugin : Plugin, IResourceProvider public override uint LoadOrder => 0; /// - public override void Register(ScriptRegistry registry) + public override void Register(ScriptRegistry registry, PluginEnvironmentHelpers helpers) { registry.RegisterAssemblyScripts(typeof(Gen7Plugin).Assembly); registry.RegisterBattleStatCalculator(new Gen7BattleStatCalculator()); registry.RegisterDamageCalculator(new Gen7DamageCalculator(Configuration)); - registry.RegisterMiscLibrary(new Gen7MiscLibrary()); + registry.RegisterMiscLibrary(new Gen7MiscLibrary(helpers.DateTimeProvider)); registry.RegisterCaptureLibrary(new Gen7CaptureLibrary(Configuration)); registry.RegisterExperienceGainCalculator(new Gen7ExperienceGainCalculator()); diff --git a/Plugins/PkmnLib.Plugin.Gen7/Libraries/Battling/Gen7MiscLibrary.cs b/Plugins/PkmnLib.Plugin.Gen7/Libraries/Battling/Gen7MiscLibrary.cs index ad8d8c7..9f9dee3 100644 --- a/Plugins/PkmnLib.Plugin.Gen7/Libraries/Battling/Gen7MiscLibrary.cs +++ b/Plugins/PkmnLib.Plugin.Gen7/Libraries/Battling/Gen7MiscLibrary.cs @@ -1,10 +1,11 @@ using PkmnLib.Dynamic; using PkmnLib.Dynamic.Libraries; +using PkmnLib.Dynamic.Plugins; using PkmnLib.Static.Moves; namespace PkmnLib.Plugin.Gen7.Libraries.Battling; -public class Gen7MiscLibrary : IMiscLibrary +public class Gen7MiscLibrary(PluginEnvironmentHelpers.DateTimeProviderDelegate dateTimeProvider) : IMiscLibrary { private readonly IMoveData _struggleData = new MoveDataImpl("struggle", new TypeIdentifier(0, "none"), MoveCategory.Physical, 50, 255, 255, MoveTarget.Any, 0, @@ -21,7 +22,7 @@ public class Gen7MiscLibrary : IMiscLibrary /// public TimeOfDay GetTimeOfDay() { - var time = StaticHelpers.GetCurrentDateTime().LocalDateTime; + var time = dateTimeProvider().LocalDateTime; var hour = time.Hour; return hour switch {