diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index 77c91125..c9127a46 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -1,5 +1,4 @@ -using System; -using AmongUs.GameOptions; +using AmongUs.GameOptions; using HarmonyLib; using MiraAPI.Events; using MiraAPI.Events.Vanilla.Gameplay; diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index fddb4faa..245e9ec5 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -5,7 +5,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using BepInEx; -using BepInEx.Configuration; using BepInEx.Unity.IL2CPP; using HarmonyLib; using MiraAPI.Colors; @@ -46,11 +45,9 @@ public sealed class MiraPluginManager internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = []; internal MiraPluginInfo[] RegisteredPluginsWithOptions { get; private set; } = []; internal MiraPluginInfo[] PluginsWithOptionsOrGameModes { get; private set; } = []; - internal Dictionary> QueuedRoleRegistrations { get; } = []; + internal static MiraPluginManager Instance { get; } = new(); - internal static ConfigFile MiraApiConfig { get; private set; } = null!; - internal static MiraPluginInfo MiraApiPluginInfo { get; private set; } = null!; private static readonly (string LogContext, TypeRegistrationHandler Handler)[] RegistrationHandlers = [ @@ -95,27 +92,15 @@ public sealed class MiraPluginManager if (IL2CPPChainloader.Instance.Plugins.TryGetValue(MiraApiPlugin.Id, out var newPlugin)) { - var registrationTimer = Stopwatch.StartNew(); - var info = RegisterPlugin(typeof(MiraPluginManager).Assembly, apiPlugin, newPlugin, miraApiPlugin); - - MiraApiConfig = info.PluginConfig; - MiraApiPluginInfo = info; - - registrationTimer.Stop(); - Info($"Registered Mira API as mod in {registrationTimer.ElapsedMilliseconds}ms."); + RegisterPlugin(typeof(MiraPluginManager).Assembly, apiPlugin, newPlugin, miraApiPlugin); } IL2CPPChainloader.Instance.PluginLoad += (pluginInfo, assembly, plugin) => { - if (plugin is not IMiraPlugin miraPlugin || pluginInfo.Metadata.GUID == MiraApiPlugin.Id) + if (plugin is IMiraPlugin miraPlugin && pluginInfo.Metadata.GUID != MiraApiPlugin.Id) { - return; + RegisterPlugin(assembly, miraPlugin, pluginInfo, plugin); } - - var registrationTimer = Stopwatch.StartNew(); - RegisterPlugin(assembly, miraPlugin, pluginInfo, plugin); - registrationTimer.Stop(); - Info($"Registered mod {pluginInfo.Metadata.Name} with Mira API in {registrationTimer.ElapsedMilliseconds}ms."); }; IL2CPPChainloader.Instance.Finished += () => @@ -142,8 +127,9 @@ public sealed class MiraPluginManager PluginsWithOptionsOrGameModes = [.. RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu || m.GameModes.Count > 0)]; } - private MiraPluginInfo RegisterPlugin(Assembly assembly, IMiraPlugin plugin, PluginInfo pluginInfo, BasePlugin basePlugin) + private void RegisterPlugin(Assembly assembly, IMiraPlugin plugin, PluginInfo pluginInfo, BasePlugin basePlugin) { + var registrationTimer = Stopwatch.StartNew(); var info = new MiraPluginInfo(plugin, pluginInfo, assembly); var roles = new List(); @@ -165,7 +151,9 @@ public sealed class MiraPluginManager PresetManager.CreateDefaultPreset(info); PresetManager.LoadPresets(info); - return info; + registrationTimer.Stop(); + + Info($"Registered mod {pluginInfo.Metadata.Name} in {registrationTimer.ElapsedMilliseconds}ms."); } private static void ProcessAssemblyTypes(Assembly assembly, MiraPluginInfo info, BasePlugin basePlugin, IMiraPlugin plugin, List roles) diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs index c234061a..3d303a98 100644 --- a/MiraAPI/Roles/CustomRoleManager.cs +++ b/MiraAPI/Roles/CustomRoleManager.cs @@ -203,7 +203,7 @@ public static class CustomRoleManager } var useTaskHint = customRole.Configuration.RoleHintType is RoleHintType.TaskHint; - var overridesTaskText = customRole.GetType().GetMethod("SpawnTaskHeader")?.DeclaringType == customRole.GetType(); + var overridesTaskText = roleType.GetMethod("SpawnTaskHeader")?.DeclaringType == roleType; if (useTaskHint && !overridesTaskText) { diff --git a/MiraAPI/Utilities/Helpers.cs b/MiraAPI/Utilities/Helpers.cs index e4755255..b515bcea 100644 --- a/MiraAPI/Utilities/Helpers.cs +++ b/MiraAPI/Utilities/Helpers.cs @@ -35,7 +35,7 @@ public static class Helpers "Major Code Smell", "S3011:Reflection should not be used to increase accessibility of classes, methods, or fields", Justification = "Dynamic singleton initialization requires reflection to bypass the private field access modifier because the type is only known at runtime.")] - private const BindingFlags StaticInstanceFlags = BindingFlags.Static | BindingFlags.NonPublic; + private const BindingFlags StaticInstanceFlags = BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly; internal const float MatchInfoGuideBaseScale = 1.3f; private static NumberOption? _advancedSettingsRowPrefab;