diff --git a/MiraAPI/MiraApiPlugin.cs b/MiraAPI/MiraApiPlugin.cs index 5def08da..dc926b2e 100644 --- a/MiraAPI/MiraApiPlugin.cs +++ b/MiraAPI/MiraApiPlugin.cs @@ -61,7 +61,6 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin /// public static bool IsDevBuild => Version.Contains("ci", StringComparison.OrdinalIgnoreCase) || Version.Contains("dev", StringComparison.OrdinalIgnoreCase); - private static MiraPluginManager? PluginManager { get; set; } internal Harmony Harmony { get; } = new(Id); internal static ConfigEntry WikiSortingGroup { get; private set; } @@ -99,8 +98,7 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin ReactorCredits.Register("Mira API", Version, IsDevBuild, ReactorCredits.AlwaysShow); - PluginManager = new MiraPluginManager(); - PluginManager.Initialize(this, this); + MiraPluginManager.Instance.Initialize(this, this); MiraLocaleManager.Register("mira.api", typeof(MiraApiPlugin).Assembly); LocalizationManager.Register(new MiraLocalizationProvider()); diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 3214b099..ab411e99 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -33,6 +33,10 @@ namespace MiraAPI.PluginLoading; /// public sealed class MiraPluginManager { + private MiraPluginManager() + { + } + private readonly Dictionary _registeredPlugins = []; internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = []; @@ -40,13 +44,12 @@ public sealed class MiraPluginManager internal MiraPluginInfo[] PluginsWithOptionsOrGameModes { get; private set; } = []; internal Dictionary> QueuedRoleRegistrations { get; } = []; - internal static MiraPluginManager Instance { get; private set; } = new(); + internal static MiraPluginManager Instance { get; } = new(); internal static ConfigFile MiraApiConfig { get; private set; } = null!; internal static MiraPluginInfo MiraApiPluginInfo { get; private set; } = null!; internal void Initialize(BasePlugin miraApiPlugin, IMiraPlugin apiPlugin) { - Instance = this; CustomGameModeManager.RegisterDefaultMode(); CustomGameModeManager.GetAndSetGameMode();