WIP Anim API

.github/workflows/main.yaml

@@ -6,11 +6,11 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.nuget/packages
@@ -20,7 +20,7 @@ jobs:
             ${{ runner.os }}-nuget-
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 8.0.x
 
@@ -29,17 +29,17 @@ jobs:
         with:
           verbosity: Diagnostic
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: MiraAPI.dll
           path: MiraAPI/bin/Release/net6.0/MiraAPI.dll
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: AllOfUs.MiraAPI.nupkg
           path: MiraAPI/bin/Release/AllOfUs.MiraAPI.*.nupkg
           
-      - uses: softprops/action-gh-release@v2
+      - uses: softprops/action-gh-release@v1
         if: github.ref_type == 'tag'
         with:
           draft: true

AmongUs.props

@@ -2,7 +2,7 @@
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.10.29" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.8.13" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" />

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.1.9</VersionPrefix>
+        <VersionPrefix>0.1.4</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -9,14 +9,13 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Freezer;
 
+[RegisterButton]
 public class FreezeButton : CustomActionButton<PlayerControl>
 {
     public override string Name => "Freeze";
-
     public override float Cooldown => OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeDuration;
-
+    public override float EffectDuration => 0f;
     public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
-
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
 
     protected override void OnClick()

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -6,19 +6,22 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
 
+[RegisterButton]
 public class MeetingButton : CustomActionButton
 {
     public override string Name => "Call Meeting";
 
     public override float Cooldown => 15;
 
+    public override float EffectDuration => 0;
+
     public override int MaxUses => 3;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
 
     public override bool Enabled(RoleBehaviour? role)
     {
-        return PlayerControl.LocalPlayer != null && PlayerControl.LocalPlayer.HasModifier<CaptainModifier>();
+        return PlayerControl.LocalPlayer.HasModifier<CaptainModifier>();
     }
 
     protected override void OnClick()

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -8,7 +8,7 @@ using System.Collections;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
-
+[RegisterButton]
 public class TeleportButton : CustomActionButton
 {
     public override string Name => "Teleport";
@@ -16,17 +16,16 @@ public class TeleportButton : CustomActionButton
     public override float Cooldown => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportCooldown.Value;
 
     public override float EffectDuration => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportDuration;
-    public override int MaxUses => 2;
+
+    public override int MaxUses => 0;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
-
     public static bool IsZoom { get; private set; }
 
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is TeleporterRole;
     }
-
     protected override void OnClick()
     {
         Coroutines.Start(ZoomOutCoroutine());

MiraAPI.Example/ExampleEventHandlers.cs

@@ -1,59 +0,0 @@
-using MiraAPI.Events;
-using MiraAPI.Events.Mira;
-using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Events.Vanilla.Map;
-using MiraAPI.Events.Vanilla.Player;
-using MiraAPI.Example.Buttons.Freezer;
-using Reactor.Utilities;
-
-namespace MiraAPI.Example;
-
-public static class ExampleEventHandlers
-{
-    public static void Initialize()
-    {
-        // Register event handlers here
-        MiraEventManager.RegisterEventHandler<MiraButtonClickEvent<FreezeButton>>(FreezeButtonClickHandler, 1);
-        MiraEventManager.RegisterEventHandler<MiraButtonCancelledEvent<FreezeButton>>(FreezeButtonCancelledHandler);
-        MiraEventManager.RegisterEventHandler<UpdateSystemEvent>(UpdateSystemEventHandler);
-
-        MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
-        {
-            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
-        });
-
-        MiraEventManager.RegisterEventHandler<AfterMurderEvent>(@event =>
-        {
-            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} has killed {@event.Target.Data.PlayerName}");
-        });
-
-        MiraEventManager.RegisterEventHandler<CompleteTaskEvent>(@event =>
-        {
-            Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
-        });
-    }
-
-    public static void UpdateSystemEventHandler(UpdateSystemEvent @event)
-    {
-        Logger<ExamplePlugin>.Error(@event.SystemType.ToString());
-    }
-
-    // Example event handler
-    public static void FreezeButtonClickHandler(MiraButtonClickEvent<FreezeButton> @event)
-    {
-        Logger<ExamplePlugin>.Warning("Freeze button clicked!");
-
-        if (PlayerControl.LocalPlayer.Data.PlayerName == "stupid")
-        {
-            @event.Cancel();
-            @event.Button.SetTimer(15f);
-        }
-    }
-
-    // Example event handler
-    public static void FreezeButtonCancelledHandler(MiraButtonCancelledEvent<FreezeButton> @event)
-    {
-        Logger<ExamplePlugin>.Warning("Freeze button cancelled!");
-        @event.Button.OverrideName("Freeze Canceled");
-    }
-}

MiraAPI.Example/ExamplePlugin.cs

@@ -21,7 +21,6 @@ public partial class ExamplePlugin : BasePlugin, IMiraPlugin
     public ConfigFile GetConfigFile() => Config;
     public override void Load()
     {
-        ExampleEventHandlers.Initialize();
         Harmony.PatchAll();
     }
 }

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -3,6 +3,7 @@ using MiraAPI.Modifiers.Types;
 
 namespace MiraAPI.Example.Modifiers;
 
+[RegisterModifier]
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";

MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs

@@ -6,6 +6,7 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers.Freezer;
 
+[RegisterModifier]
 public class FreezeModifier : TimedModifier
 {
     public override string ModifierName => "Freezed";

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,23 +0,0 @@
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
-
-namespace MiraAPI.Example.Modifiers;
-
-public class HighPriorityModifier : GameModifier
-{
-    public override string ModifierName => "High Priority";
-    public override int GetAssignmentChance()
-    {
-        return 100;
-    }
-
-    public override int GetAmountPerGame()
-    {
-        return 1;
-    }
-
-    public override int Priority()
-    {
-        return 100;
-    }
-}

MiraAPI.Example/Options/ExampleOptions2.cs

@@ -14,16 +14,16 @@ public class ExampleOptions2 : AbstractOptionGroup
 
     public ModdedToggleOption ToggleOpt2 { get; } = new("Toggle Option 2", false)
     {
-        Visible = () => OptionGroupSingleton<ExampleOptions2>.Instance.ToggleOpt1, // implicit cast from ModdedToggleOption to bool
+        Visible = () => OptionGroupSingleton<ExampleOptions2>.Instance.ToggleOpt1.Value,
     };
 
-    public ModdedEnumOption<TestingData> EnumOpt { get; } = new("Enum Opt", 0)
+    public ModdedEnumOption EnumOpt { get; } = new("Enum Opt", 0, typeof(TestingData))
     {
         ChangedEvent = x => Logger<ExamplePlugin>.Info($"changed Enum Opt to {x}"),
     };
 }
 
-public enum TestingData : ulong
+public enum TestingData
 {
     Happy,
     Sad,

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,9 +1,11 @@
 using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
 using TMPro;
 using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class ChameloenRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Chamelon";
@@ -11,11 +13,8 @@ public class ChameloenRole : CrewmateRole, ICustomRole
     public string RoleDescription => RoleLongDescription;
     public Color RoleColor => Palette.AcceptedGreen;
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        OptionsScreenshot = ExampleAssets.Banner,
-    };
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+    public int MaxPlayers => 2;
 
     public void PlayerControlFixedUpdate(PlayerControl playerControl)
     {
@@ -44,4 +43,4 @@ public class ChameloenRole : CrewmateRole, ICustomRole
             }
         }
     }
-}
+}

MiraAPI.Example/Roles/FreezerRole.cs

@@ -1,8 +1,11 @@
-using MiraAPI.Roles;
+using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
 using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class FreezerRole : ImpostorRole, ICustomRole
 {
     public string RoleName => "Freezer";
@@ -10,10 +13,7 @@ public class FreezerRole : ImpostorRole, ICustomRole
     public string RoleDescription => RoleLongDescription;
     public Color RoleColor => Palette.Blue;
     public ModdedRoleTeams Team => ModdedRoleTeams.Impostor;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        OptionsScreenshot = ExampleAssets.Banner,
-        MaxRoleCount = 2,
-    };
+    [HideFromIl2Cpp]
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+    public int MaxPlayers => 2;
 }

MiraAPI.Example/Roles/NeutralKillerRole.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class NeutralKillerRole : ImpostorRole, ICustomRole
 {
     public string RoleName => "Neutral Killer";
@@ -10,13 +11,9 @@ public class NeutralKillerRole : ImpostorRole, ICustomRole
     public string RoleLongDescription => RoleDescription;
     public Color RoleColor => Color.magenta;
     public ModdedRoleTeams Team => ModdedRoleTeams.Neutral;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        UseVanillaKillButton = true,
-        CanGetKilled = true,
-        CanUseVent = true,
-    };
+    public bool UseVanillaKillButton => true;
+    public bool CanGetKilled => true;
+    public bool CanUseVent => true;
 
     public override void SpawnTaskHeader(PlayerControl playerControl)
     {

MiraAPI.Example/Roles/TeleporterRole.cs

@@ -1,8 +1,11 @@
-using MiraAPI.Roles;
+using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
 using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class TeleporterRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Teleporter";
@@ -10,17 +13,6 @@ public class TeleporterRole : CrewmateRole, ICustomRole
     public string RoleDescription => RoleLongDescription;
     public Color RoleColor => new Color32(221, 176, 152, 255);
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        OptionsScreenshot = ExampleAssets.Banner,
-        CanModifyChance = false,
-        DefaultChance = 73,
-        DefaultRoleCount = 4,
-    };
-
-    public bool CanLocalPlayerSeeRole(PlayerControl player)
-    {
-        return true;
-    }
+    [HideFromIl2Cpp]
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
 }

MiraAPI/Animations/AnimationPresetManager.cs

@@ -0,0 +1,46 @@
+using MiraAPI.Animations;
+using System;
+using System.Collections.Generic;
+
+namespace MiraAPI.Modifiers;
+
+/// <summary>
+/// The manager for handling modifiers.
+/// </summary>
+public static class AnimationPresetManager
+{
+    private static uint _nextId;
+
+    /// <summary>
+    /// Gets registered Animation Presets.
+    /// </summary>
+    public static List<CustomAnimationPreset> Presets { get; internal set; } = new List<CustomAnimationPreset>();
+
+    private static uint GetNextId()
+    {
+        _nextId++;
+        return _nextId;
+    }
+
+    /// <summary>
+    /// Get Animation Preset by ID.
+    /// </summary>
+    /// <param name="id">The id of the preset you want to find.</param>
+    /// <returns>The animation preset.</returns>
+    public static CustomAnimationPreset? GetPresetById(uint id)
+    {
+        return Presets.Find(p => p.Id == id);
+    }
+
+    internal static void RegisterPreset(Type modifierType)
+    {
+        if (!typeof(CustomAnimationPreset).IsAssignableFrom(modifierType))
+        {
+            return;
+        }
+
+        CustomAnimationPreset preset = (CustomAnimationPreset)Activator.CreateInstance(modifierType);
+        preset.Id = GetNextId();
+        Presets.Add(preset);
+    }
+}

MiraAPI/Animations/CustomAnimationPreset.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+
+namespace MiraAPI.Animations;
+
+/// <summary>
+/// Configure an animation's settings using presets.
+/// </summary>
+/// <param name="clip">The animation clip the preset will use.</param>
+public abstract class CustomAnimationPreset(AnimationClip clip)
+{
+    internal uint Id;
+
+    internal void PlayAnimation(PlayerControl source)
+    {
+
+    }
+
+    /// <summary>
+    /// Check whether the local player should be able to see this animation.
+    /// </summary>
+    /// <param name="source">The player who the animation is being triggered upon.</param>
+    /// <returns>Whether the local player can see the animation or not.</returns>
+    public abstract bool AnimationVisible(PlayerControl source);
+}

MiraAPI/Animations/CustomAnimator.cs

@@ -0,0 +1,38 @@
+using MiraAPI.Animations.Presets;
+using MiraAPI.Modifiers;
+using MiraAPI.Networking;
+using MiraAPI.Utilities;
+using Reactor.Networking.Attributes;
+using Reactor.Utilities.Attributes;
+using System;
+using UnityEngine;
+
+namespace MiraAPI.Animations;
+
+[RegisterInIl2Cpp]
+public class CustomAnimator(IntPtr cppPtr) : MonoBehaviour(cppPtr)
+{
+    private PlayerControl _player;
+
+    private void Start()
+    {
+        _player = gameObject.GetComponent<PlayerControl>();
+
+        _player.GetCustomAnimator()?.TriggerCustomAnimation(new LocalAnimationPreset(new AnimationClip()));
+    }
+
+    public void TriggerCustomAnimation(CustomAnimationPreset preset) => RpcTriggerCustomAnimation(_player, preset.Id);
+
+
+    [MethodRpc((uint)MiraRpc.TriggerAnimation)]
+    internal static void RpcTriggerCustomAnimation(PlayerControl source, uint presetId)
+    {
+        CustomAnimationPreset preset = AnimationPresetManager.GetPresetById(presetId);
+        if (preset is null) return;
+
+        if (preset.AnimationVisible(source))
+        {
+            preset.PlayAnimation(source);
+        }
+    }
+}

MiraAPI/Animations/Presets/LocalAnimationPreset.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+namespace MiraAPI.Animations.Presets;
+public class LocalAnimationPreset(AnimationClip clip) : CustomAnimationPreset(clip)
+{
+    /// <inheritdoc/>
+    public override bool AnimationVisible(PlayerControl source)
+    {
+        return source.AmOwner;
+    }
+}

MiraAPI/Animations/RegisterAnimationPresetAttribute.cs

@@ -0,0 +1,6 @@
+using System;
+
+namespace MiraAPI.Animations;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class RegisterAnimationPresetAttribute : Attribute;

MiraAPI/Events/Mira/MiraButtonCancelledEvent.cs

@@ -1,44 +0,0 @@
-using MiraAPI.Hud;
-
-namespace MiraAPI.Events.Mira;
-
-/// <summary>
-/// Invoked when a Mira Button click is cancelled. Do not use for vanilla buttons.
-/// </summary>
-/// <typeparam name="T">The Mira Button type.</typeparam>
-public sealed class MiraButtonCancelledEvent<T> : MiraEvent where T : CustomActionButton
-{
-    /// <summary>
-    /// Gets Mira Button whose click was cancelled.
-    /// </summary>
-    public T Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MiraButtonCancelledEvent{T}"/> class.
-    /// </summary>
-    /// <param name="button">The Mira Button whose click was cancelled.</param>
-    public MiraButtonCancelledEvent(T button)
-    {
-        Button = button;
-    }
-}
-
-/// <summary>
-/// Invoked when a Mira Button click is cancelled. Do not use for vanilla buttons.
-/// </summary>
-public sealed class MiraButtonCancelledEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets Mira Button whose click was cancelled.
-    /// </summary>
-    public CustomActionButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MiraButtonCancelledEvent"/> class.
-    /// </summary>
-    /// <param name="button">The Mira Button whose click was cancelled.</param>
-    public MiraButtonCancelledEvent(CustomActionButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/Events/Mira/MiraButtonClickEvent.cs

@@ -1,51 +0,0 @@
-using MiraAPI.Hud;
-
-namespace MiraAPI.Events.Mira;
-
-/// <summary>
-/// Button click event for Mira Buttons only. Do not use for vanilla buttons.
-/// </summary>
-/// <typeparam name="T">The Mira Button type.</typeparam>
-public sealed class MiraButtonClickEvent<T> : MiraCancelableEvent where T : CustomActionButton
-{
-    /// <summary>
-    /// Gets Mira Button that was clicked.
-    /// </summary>
-    public T Button { get; }
-
-    /// <summary>
-    /// Gets the generic click event that is invoked before this button-specific event.
-    /// </summary>
-    public MiraButtonClickEvent GenericClickEvent { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MiraButtonClickEvent{T}"/> class.
-    /// </summary>
-    /// <param name="button">The Mira Button that was clicked.</param>
-    /// <param name="genericClickEvent">The generic click event invoked before button-specific events.</param>
-    public MiraButtonClickEvent(T button, MiraButtonClickEvent genericClickEvent)
-    {
-        GenericClickEvent = genericClickEvent;
-        Button = button;
-    }
-}
-
-/// <summary>
-/// Button click event for Mira Buttons only. Do not use for vanilla buttons.
-/// </summary>
-public sealed class MiraButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets Mira Button that was clicked.
-    /// </summary>
-    public CustomActionButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MiraButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The Mira Button that was clicked.</param>
-    public MiraButtonClickEvent(CustomActionButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/Events/MiraCancelableEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events;
-
-/// <summary>
-/// Abstract class for Mira Events that can be cancelled.
-/// </summary>
-public abstract class MiraCancelableEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets a value indicating whether the event is cancelled.
-    /// </summary>
-    public bool IsCancelled { get; private set; }
-
-    /// <summary>
-    /// Cancels the event.
-    /// </summary>
-    public void Cancel()
-    {
-        IsCancelled = true;
-    }
-
-    /// <summary>
-    /// Uncancels the event.
-    /// </summary>
-    public void UnCancel()
-    {
-        IsCancelled = false;
-    }
-}

MiraAPI/Events/MiraEvent.cs

@@ -1,6 +0,0 @@
-namespace MiraAPI.Events;
-
-/// <summary>
-/// Abstract class for Mira Events.
-/// </summary>
-public abstract class MiraEvent;

MiraAPI/Events/MiraEventManager.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MiraAPI.Events;
-
-/// <summary>
-/// Mira Event manager.
-/// </summary>
-public static class MiraEventManager
-{
-    private static readonly Dictionary<Type, List<MiraEventWrapper>> EventWrappers = [];
-
-    /// <summary>
-    /// Invoke an event.
-    /// </summary>
-    /// <param name="eventInstance">The event instance.</param>
-    /// <typeparam name="T">Type of Event.</typeparam>
-    /// <returns>If there was an event handler invoked for this event, return true. Otherwise, return false.</returns>
-    public static bool InvokeEvent<T>(T eventInstance) where T : MiraEvent
-    {
-        EventWrappers.TryGetValue(typeof(T), out var handlers);
-        if (handlers == null)
-        {
-            return false;
-        }
-
-        foreach (var handler in handlers)
-        {
-            ((Action<T>)handler.EventHandler).Invoke(eventInstance);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// Invoke an event and use a specific type to find the handlers.
-    /// </summary>
-    /// <param name="eventInstance">The event instance.</param>
-    /// <param name="type">The type to use for handler lookup.</param>
-    /// <returns>If there was an event handler invoked for this event, return true. Otherwise, return false.</returns>
-    public static bool InvokeEvent(MiraEvent eventInstance, Type type)
-    {
-        EventWrappers.TryGetValue(type, out var handlers);
-        if (handlers == null)
-        {
-            return false;
-        }
-
-        foreach (var handler in handlers)
-        {
-            handler.EventHandler.DynamicInvoke(eventInstance);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// Register an event.
-    /// </summary>
-    /// <param name="handler">The callback method/handler for the event.</param>
-    /// <param name="priority">The priority of the event handler. Higher values are called first.</param>
-    /// <typeparam name="T">Type of event.</typeparam>
-    public static void RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
-    {
-        if (!EventWrappers.ContainsKey(typeof(T)))
-        {
-            EventWrappers.Add(typeof(T), []);
-        }
-
-        var handlers = EventWrappers[typeof(T)];
-        handlers.Add(new MiraEventWrapper(handler, priority));
-    }
-
-    internal static void SortAllHandlers()
-    {
-        foreach (var handlers in EventWrappers.Values)
-        {
-            handlers.Sort((a, b) => a.Priority.CompareTo(b.Priority));
-        }
-    }
-}

MiraAPI/Events/MiraEventWrapper.cs

@@ -1,30 +0,0 @@
-using System;
-
-namespace MiraAPI.Events;
-
-/// <summary>
-/// Wrapper for event handlers.
-/// </summary>
-public class MiraEventWrapper
-{
-    /// <summary>
-    /// Gets the event handler delegate.
-    /// </summary>
-    public Delegate EventHandler { get; }
-
-    /// <summary>
-    /// Gets the priority of the handler. Higher values are called first.
-    /// </summary>
-    public int Priority { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MiraEventWrapper"/> class.
-    /// </summary>
-    /// <param name="eventHandler">The action for the event handler.</param>
-    /// <param name="priority">The priority of the handler.</param>
-    public MiraEventWrapper(Delegate eventHandler, int priority)
-    {
-        EventHandler = eventHandler;
-        Priority = priority;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Event that is invoked after a player is murdered. Only called after a successful murder. This event is not cancelable.
-/// </summary>
-public class AfterMurderEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the player that killed the target.
-    /// </summary>
-    public PlayerControl Source { get; }
-
-    /// <summary>
-    /// Gets the player that was killed.
-    /// </summary>
-    public PlayerControl Target { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The killed player.</param>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target)
-    {
-        Source = source;
-        Target = target;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Event that is invoked before a player is murdered. This event is cancelable.
-/// </summary>
-public sealed class BeforeMurderEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the player that is killing the target.
-    /// </summary>
-    public PlayerControl Source { get; }
-
-    /// <summary>
-    /// Gets the player that is being killed.
-    /// </summary>
-    public PlayerControl Target { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
-    /// </summary>
-    /// <param name="source">The player that is killing the target.</param>
-    /// <param name="target">The player that is being killed.</param>
-    public BeforeMurderEvent(PlayerControl source, PlayerControl target)
-    {
-        Source = source;
-        Target = target;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/GameEndEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// The event that is invoked when the end game screen is shown. Non cancelable.
-/// </summary>
-public class GameEndEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the instance of the EndGameManager.
-    /// </summary>
-    public EndGameManager EndGameManager { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="GameEndEvent"/> class.
-    /// </summary>
-    /// <param name="manager">The instance of the EndGameManager.</param>
-    public GameEndEvent(EndGameManager manager)
-    {
-        EndGameManager = manager;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/IntroBeginEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// The event that is invoked when the intro cutscene is shown. Non cancelable.
-/// </summary>
-public class IntroBeginEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the instance of the IntroCutscene.
-    /// </summary>
-    public IntroCutscene IntroCutscene { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="IntroBeginEvent"/> class.
-    /// </summary>
-    /// <param name="introCutscene">The intro cutscene.</param>
-    public IntroBeginEvent(IntroCutscene introCutscene)
-    {
-        IntroCutscene = introCutscene;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/SetRoleEvent.cs

@@ -1,30 +0,0 @@
-using AmongUs.GameOptions;
-
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Event that is invoked after a player's role is set. This event is not cancelable.
-/// </summary>
-public class SetRoleEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the player whos role was changed.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the role that the player was set to.
-    /// </summary>
-    public RoleTypes Role { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SetRoleEvent"/> class.
-    /// </summary>
-    /// <param name="player">The player.</param>
-    /// <param name="role">The new role.</param>
-    public SetRoleEvent(PlayerControl player, RoleTypes role)
-    {
-        Player = player;
-        Role = role;
-    }
-}

MiraAPI/Events/Vanilla/Map/CloseDoorsEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Map;
-
-/// <summary>
-/// Event fired when a player closes the doors in a room.
-/// </summary>
-public class CloseDoorsEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the room that the doors were closed in.
-    /// </summary>
-    public SystemTypes Room { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CloseDoorsEvent"/> class.
-    /// </summary>
-    /// <param name="room">The room that was closed.</param>
-    public CloseDoorsEvent(SystemTypes room)
-    {
-        Room = room;
-    }
-}

MiraAPI/Events/Vanilla/Map/PlayerOpenSabotageEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Map;
-
-/// <summary>
-/// Sabotage from Vanilla Among Us.
-/// </summary>
-public class PlayerOpenSabotageEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the MapBehaviour.
-    /// </summary>
-    public MapBehaviour MapBehaviour { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PlayerOpenSabotageEvent"/> class.
-    /// </summary>
-    /// <param name="mapBehaviour">The MapBehaviour.</param>
-    public PlayerOpenSabotageEvent(MapBehaviour mapBehaviour)
-    {
-        MapBehaviour = mapBehaviour;
-    }
-}

MiraAPI/Events/Vanilla/Map/UpdateSystemEvent.cs

@@ -1,34 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Map;
-
-/// <summary>
-/// Cancelable event that is invoked before a system is updated. Usually used for sabotage events.
-/// </summary>
-public class UpdateSystemEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the type of system that will be updated.
-    /// </summary>
-    public SystemTypes SystemType { get; }
-
-    /// <summary>
-    /// Gets the player that is updating the system.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the byte amount the system is being updated by.
-    /// </summary>
-    public byte Amount { get; }
-
-    /// <summary>
-    ///  Initializes a new instance of the <see cref="UpdateSystemEvent"/> class.
-    /// </summary>
-    /// <param name="systemType">The SystemType being updated.</param>
-    /// <param name="amount">Amount to update System to.</param>
-    public UpdateSystemEvent(SystemTypes systemType, PlayerControl player, byte amount)
-    {
-        SystemType = systemType;
-        Player = player;
-        Amount = amount;
-    }
-}

MiraAPI/Events/Vanilla/Meeting/EjectionEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Meeting;
-
-/// <summary>
-/// The event that is invoked when a player is ejected. Non-cancelable.
-/// </summary>
-public class EjectionEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the instance of the ExileController.
-    /// </summary>
-    public ExileController ExileController { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="EjectionEvent"/> class.
-    /// </summary>
-    /// <param name="controller">The exile controller.</param>
-    public EjectionEvent(ExileController controller)
-    {
-        ExileController = controller;
-    }
-}

MiraAPI/Events/Vanilla/Meeting/StartMeetingEvent.cs

@@ -1,35 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Meeting;
-
-/// <summary>
-/// The event that is invoked when a meeting is called.
-/// </summary>
-public class StartMeetingEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the player that is calling the meeting.
-    /// </summary>
-    public PlayerControl Reporter { get; }
-
-    /// <summary>
-    /// Gets the player that is being reported. Will be null for emergency meeting.
-    /// </summary>
-    public NetworkedPlayerInfo? Target { get; }
-
-    /// <summary>
-    /// Gets the body that is being reported. Will be null for emergency meeting.
-    /// </summary>
-    public DeadBody? Body { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StartMeetingEvent"/> class.
-    /// </summary>
-    /// <param name="reporter">The player who reported the body.</param>
-    /// <param name="target">The player being reported.</param>
-    /// <param name="body">The body being reported.</param>
-    public StartMeetingEvent(PlayerControl reporter, NetworkedPlayerInfo? target, DeadBody? body)
-    {
-        Reporter = reporter;
-        Target = target;
-        Body = body;
-    }
-}

MiraAPI/Events/Vanilla/Player/CompleteTaskEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Player;
-
-/// <summary>
-/// The event that is invoked when a player completes a task. Non cancelable.
-/// </summary>
-public class CompleteTaskEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the instance of the <see cref="PlayerControl"/>.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the instance of the <see cref="PlayerTask"/> that the player completed.
-    /// </summary>
-    public PlayerTask Task { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CompleteTaskEvent"/> class.
-    /// </summary>
-    /// <param name="player">The player who completed the task.</param>
-    /// <param name="task">The task that the player completed.</param>
-    public CompleteTaskEvent(PlayerControl player, PlayerTask task)
-    {
-        Player = player;
-        Task = task;
-    }
-}

MiraAPI/Events/Vanilla/Player/PlayerDeathEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Player;
-
-/// <summary>
-/// Event that is invoked when a player dies. Non cancelable.
-/// </summary>
-public class PlayerDeathEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the player who died.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the reason the player died.
-    /// </summary>
-    public DeathReason DeathReason { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PlayerDeathEvent"/> class.
-    /// </summary>
-    /// <param name="player">The player who died.</param>
-    /// <param name="reason">The reason the player died.</param>
-    public PlayerDeathEvent(PlayerControl player, DeathReason reason)
-    {
-        Player = player;
-        DeathReason = reason;
-    }
-}

MiraAPI/Events/Vanilla/Player/PlayerJoinEvent.cs

@@ -1,23 +0,0 @@
-using InnerNet;
-
-namespace MiraAPI.Events.Vanilla.Player;
-
-/// <summary>
-/// Event that is invoked when a player joins the lobby. Non cancelable.
-/// </summary>
-public class PlayerJoinEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the player who joined.
-    /// </summary>
-    public ClientData ClientData { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PlayerJoinEvent"/> class.
-    /// </summary>
-    /// <param name="data">The data of the player who joined.</param>
-    public PlayerJoinEvent(ClientData data)
-    {
-        ClientData = data;
-    }
-}

MiraAPI/Events/Vanilla/Player/PlayerLeaveEvent.cs

@@ -1,30 +0,0 @@
-using InnerNet;
-
-namespace MiraAPI.Events.Vanilla.Player;
-
-/// <summary>
-/// Event that is invoked when a player leaves the game. Non cancelable.
-/// </summary>
-public class PlayerLeaveEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the player who left.
-    /// </summary>
-    public ClientData ClientData { get; }
-
-    /// <summary>
-    /// Gets the reason why the player left.
-    /// </summary>
-    public DisconnectReasons Reason { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PlayerLeaveEvent"/> class.
-    /// </summary>
-    /// <param name="data">The data of the player who left.</param>
-    /// <param name="reason">The reason why the player left.</param>
-    public PlayerLeaveEvent(ClientData data, DisconnectReasons reason)
-    {
-        ClientData = data;
-        Reason = reason;
-    }
-}

MiraAPI/Events/Vanilla/Usables/EnterVentEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Usables;
-
-/// <summary>
-/// Event that is invoked when a player enters a vent. This event is cancelable.
-/// </summary>
-public class EnterVentEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the player that is entering the vent.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the vent that the player is entering.
-    /// </summary>
-    public Vent? Vent { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="EnterVentEvent"/> class.
-    /// </summary>
-    /// <param name="player">The player that is entering the vent.</param>
-    /// <param name="vent">The vent being entered.</param>
-    public EnterVentEvent(PlayerControl player, Vent? vent)
-    {
-        Player = player;
-        Vent = vent;
-    }
-}

MiraAPI/Events/Vanilla/Usables/ExitVentEvent.cs

@@ -1,28 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Usables;
-
-/// <summary>
-/// Event that is invoked when a player exits a vent. This event is cancelable.
-/// </summary>
-public class ExitVentEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the player that is exiting the vent.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the vent that the player is exiting.
-    /// </summary>
-    public Vent? Vent { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExitVentEvent"/> class.
-    /// </summary>
-    /// <param name="player">The player who is exiting the vent.</param>
-    /// <param name="vent">The vent being exited from.</param>
-    public ExitVentEvent(PlayerControl player, Vent? vent)
-    {
-        Player = player;
-        Vent = vent;
-    }
-}

MiraAPI/Events/Vanilla/Usables/PlayerCanUseEvent.cs

@@ -1,15 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Usables;
-
-/// <summary>
-/// Event for if a <see cref="PlayerControl"/> can use an <see cref="IUsable"/> from Vanilla Among Us. Will always be ran locally.
-/// </summary>
-public class PlayerCanUseEvent : PlayerUseEvent
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PlayerCanUseEvent"/> class.
-    /// </summary>
-    /// <param name="usable">The IUsable.</param>
-    public PlayerCanUseEvent(IUsable usable) : base(usable)
-    {
-    }
-}

MiraAPI/Events/Vanilla/Usables/PlayerUseEvent.cs

@@ -1,34 +0,0 @@
-namespace MiraAPI.Events.Vanilla;
-
-/// <summary>
-/// Event for <see cref="PlayerControl"/> using a <see cref="IUsable"/> from Vanilla Among Us. Will always be ran locally.
-/// </summary>
-public class PlayerUseEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the instance of <see cref="IUsable"/> that was used.
-    /// </summary>
-    public IUsable Usable { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the IUsable is a <see cref="Console"/>, <see cref="MapConsole"/>, or <see cref="SystemConsole"/>.
-    /// </summary>
-    public bool IsPrimaryConsole { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the IUsable is a <see cref="Vent"/>.
-    /// </summary>
-    public bool IsVent { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PlayerUseEvent"/> class.
-    /// </summary>
-    /// <param name="usable">The IUsable.</param>
-    public PlayerUseEvent(IUsable usable)
-    {
-        Usable = usable;
-
-        IsPrimaryConsole = usable.TryCast<Console>() || usable.TryCast<SystemConsole>() || usable.TryCast<MapConsole>();
-        IsVent = usable.TryCast<Vent>();
-    }
-}

MiraAPI/GameModes/DefaultMode.cs

@@ -1,5 +1,6 @@
 namespace MiraAPI.GameModes;
 
+[RegisterGameMode]
 public class DefaultMode : CustomGameMode
 {
     public override string Name => "Default";

MiraAPI/GameModes/RegisterGameModeAttribute.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace MiraAPI.GameModes;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class RegisterGameModeAttribute : Attribute
+{
+    private static readonly HashSet<Assembly> RegisteredAssemblies = [];
+
+    internal static void Register(Assembly assembly)
+    {
+        if (!RegisteredAssemblies.Add(assembly))
+        {
+            return;
+        }
+
+        foreach (var type in assembly.GetTypes())
+        {
+            var attribute = type.GetCustomAttribute<RegisterGameModeAttribute>();
+            if (attribute != null)
+            {
+                CustomGameModeManager.RegisterGameMode(type);
+            }
+        }
+    }
+}

MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs

@@ -27,8 +27,10 @@ public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? va
     /// <inheritdoc />
     public override object GetValue()
     {
-        return HolderOption is ModdedEnumOption opt
-            ? Enum.ToObject(enumType, opt.Value)
-            : throw new InvalidOperationException($"HolderOption for option \"{Title}\" with EnumType ${enumType.FullName} is not a ModdedEnumOption");
+        if (HolderOption is ModdedEnumOption opt)
+        {
+            return Enum.ToObject(enumType, opt.Value);
+        }
+        throw new InvalidOperationException($"HolderOption for option \"{Title}\" with EnumType ${enumType.FullName} is not a ModdedEnumOption");
     }
 }

MiraAPI/GameOptions/IModdedOption.cs

@@ -6,13 +6,13 @@ using UnityEngine;
 
 namespace MiraAPI.GameOptions;
 
-public interface IModdedOption
+internal interface IModdedOption
 {
     uint Id { get; }
     string Title { get; }
     StringNames StringName { get; }
     IMiraPlugin? ParentMod { get; set; }
-    BaseGameSetting Data { get; }
+    BaseGameSetting? Data { get; }
     Type? AdvancedRole { get; set; }
     OptionBehaviour? OptionBehaviour { get; }
     Func<bool> Visible { get; set; }

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -31,6 +31,7 @@ public static class ModdedOptionsManager
     {
         if (Activator.CreateInstance(type) is not AbstractOptionGroup group)
         {
+            Logger<MiraApiPlugin>.Error($"Failed to create group from {type.Name}");
             return false;
         }
 
@@ -44,10 +45,6 @@ public static class ModdedOptionsManager
         TypeToGroup.Add(type, group);
         pluginInfo.OptionGroups.Add(group);
 
-        typeof(OptionGroupSingleton<>).MakeGenericType(type)
-            .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-            .SetValue(null, group);
-
         return true;
     }
 

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Globalization;
 using System.Linq;
-using System.Text;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Networking;
 using Reactor.Localization.Utilities;
@@ -88,7 +86,7 @@ public class ModdedEnumOption : ModdedOption<int>
     /// <inheritdoc />
     protected override void OnValueChanged(int newValue)
     {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
         if (!OptionBehaviour)
         {
             return;
@@ -100,96 +98,3 @@ public class ModdedEnumOption : ModdedOption<int>
         }
     }
 }
-
-
-/// <summary>
-/// An option for selecting an enum value.
-/// </summary>
-/// <typeparam name="T">The enum type.</typeparam>
-public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
-{
-    /// <summary>
-    /// Gets the string values of the enum.
-    /// </summary>
-    public string[]? Values { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedEnumOption{T}"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="defaultValue">The default value as an int.</param>
-    /// <param name="enumType">The Enum type.</param>
-    /// <param name="values">An option list of string values to use in place of the enum name.</param>
-    /// <param name="roleType">An optional role type to specify for a specific role.</param>
-    public ModdedEnumOption(string title, T defaultValue, string[]? values = null, Type? roleType = null) : base(title, defaultValue, roleType)
-    {
-        Values = values ?? Enum.GetNames(typeof(T));
-        Data = ScriptableObject.CreateInstance<StringGameSetting>();
-        var data = (StringGameSetting)Data;
-
-        data.Title = StringName;
-        data.Type = global::OptionTypes.String;
-        data.Values = values is null ?
-            Enum.GetNames(typeof(T)).Select(CustomStringName.CreateAndRegister).ToArray()
-            : values.Select(CustomStringName.CreateAndRegister).ToArray();
-
-        data.Index = Convert.ToInt32(Value);
-    }
-
-    /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
-    {
-        var stringOption = Object.Instantiate(stringOpt, container);
-
-        stringOption.SetUpFromData(Data, 20);
-        stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
-
-        // SetUpFromData method doesnt work correctly so we must set the values manually
-        stringOption.Title = StringName;
-        stringOption.Values = (Data as StringGameSetting)?.Values ?? new Il2CppStructArray<StringNames>(0);
-        stringOption.Value = Convert.ToInt32(Value);
-
-        OptionBehaviour = stringOption;
-
-        return stringOption;
-    }
-
-    /// <inheritdoc />
-    public override float GetFloatData()
-    {
-        return Convert.ToSingle(Value);
-    }
-
-    /// <inheritdoc />
-    public override NetData GetNetData()
-    {
-        return new NetData(Id, Encoding.Unicode.GetBytes(Convert.ToString(Value)));
-    }
-
-    /// <inheritdoc />
-    public override void HandleNetData(byte[] data)
-    {
-        SetValue((T)Enum.Parse(typeof(T), Encoding.Unicode.GetString(data)));
-    }
-
-    /// <inheritdoc />
-    public override T GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
-    {
-        return (T)Enum.Parse(typeof(T), optionBehaviour.GetInt().ToString());
-    }
-
-    /// <inheritdoc />
-    protected override void OnValueChanged(T newValue)
-    {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(Convert.ToInt32(newValue)), false);
-        if (!OptionBehaviour)
-        {
-            return;
-        }
-
-        if (OptionBehaviour is StringOption opt)
-        {
-            opt.Value = Convert.ToInt32(newValue);
-        }
-    }
-}

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -134,7 +134,7 @@ public class ModdedNumberOption : ModdedOption<float>
     protected override void OnValueChanged(float newValue)
     {
         Value = Mathf.Clamp(newValue, Min, Max);
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(
             StringName,
             Data?.GetValueString(Value),
             false);
@@ -144,14 +144,4 @@ public class ModdedNumberOption : ModdedOption<float>
             opt.Value = Value;
         }
     }
-
-    /// <summary>
-    /// Implicitly converts the option to an int.
-    /// </summary>
-    /// <param name="option">The option.</param>
-    /// <returns>Integer value.</returns>
-    public static implicit operator int(ModdedNumberOption option)
-    {
-        return (int)option.Value;
-    }
 }

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -35,7 +35,7 @@ public abstract class ModdedOption<T> : IModdedOption
     /// <summary>
     /// Gets the BaseGameSetting data of the option.
     /// </summary>
-    public BaseGameSetting Data { get; protected init; }
+    public BaseGameSetting? Data { get; protected init; }
 
     /// <summary>
     /// Gets or sets the parent mod of the option.
@@ -194,14 +194,4 @@ public abstract class ModdedOption<T> : IModdedOption
         NumberOption numberOpt,
         StringOption stringOpt,
         Transform container);
-
-    /// <summary>
-    /// Implicitly converts the option to type of <typeparamref name="T"/>.
-    /// </summary>
-    /// <param name="option">The option.</param>
-    /// <returns>Value of type <typeparamref name="T"/>.</returns>
-    public static implicit operator T(ModdedOption<T> option)
-    {
-        return option.Value;
-    }
 }

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -69,7 +69,7 @@ public class ModdedToggleOption : ModdedOption<bool>
     /// <inheritdoc />
     protected override void OnValueChanged(bool newValue)
     {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
         if (!OptionBehaviour)
         {
             return;

MiraAPI/Hud/CustomActionButton.cs

@@ -1,12 +1,7 @@
-using MiraAPI.Events;
-using MiraAPI.Events.Mira;
-using MiraAPI.Patches;
-using MiraAPI.Utilities.Assets;
-using System;
+using MiraAPI.Utilities.Assets;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
-using Object = UnityEngine.Object;
 
 namespace MiraAPI.Hud;
 
@@ -20,35 +15,30 @@ public abstract class CustomActionButton
     /// </summary>
     public abstract string Name { get; }
 
-    /// <summary>
-    /// Gets the initial cooldown duration in seconds.
-    /// </summary>
-    public virtual float InitialCooldown => Cooldown;
-
     /// <summary>
     /// Gets the button's cooldown duration in seconds.
     /// </summary>
     public abstract float Cooldown { get; }
 
+    /// <summary>
+    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
+    /// </summary>
+    public abstract float EffectDuration { get; }
+
+    /// <summary>
+    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
+    /// </summary>
+    public abstract int MaxUses { get; }
+
     /// <summary>
     /// Gets the sprite of the button. Use <see cref="LoadableResourceAsset"/> to load a sprite from a resource path. Use <see cref="LoadableBundleAsset{T}"/> to load a sprite from an asset bundle.
     /// </summary>
     public abstract LoadableAsset<Sprite> Sprite { get; }
 
-    /// <summary>
-    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
-    /// </summary>
-    public virtual float EffectDuration => 0;
-
-    /// <summary>
-    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
-    /// </summary>
-    public virtual int MaxUses => 0;
-
     /// <summary>
     /// Gets the location of the button on the screen.
     /// </summary>
-    public virtual ButtonLocation Location { get; private set; } = ButtonLocation.BottomLeft;
+    public virtual ButtonLocation Location => ButtonLocation.BottomLeft;
 
     /// <summary>
     /// Gets a value indicating whether the button has an effect ability.
@@ -80,11 +70,7 @@ public abstract class CustomActionButton
     /// </summary>
     protected ActionButton? Button { get; private set; }
 
-    /// <summary>
-    /// The method used to create the button.
-    /// </summary>
-    /// <param name="parent">The parent of the button.</param>
-    public virtual void CreateButton(Transform parent)
+    internal void CreateButton(Transform parent)
     {
         if (Button)
         {
@@ -92,7 +78,7 @@ public abstract class CustomActionButton
         }
 
         UsesLeft = MaxUses;
-        Timer = AmongUsClient.Instance?.NetworkMode == NetworkModes.FreePlay ? 0 : InitialCooldown;
+        Timer = Cooldown;
         EffectActive = false;
 
         Button = Object.Instantiate(HudManager.Instance.AbilityButton, parent);
@@ -109,87 +95,13 @@ public abstract class CustomActionButton
 
         var pb = Button.GetComponent<PassiveButton>();
         pb.OnClick = new Button.ButtonClickedEvent();
-        pb.OnClick.AddListener((UnityAction)(() =>
-        {
-            // Invoke the generic button click event.
-            var genericEvent = new MiraButtonClickEvent(this);
-            MiraEventManager.InvokeEvent(genericEvent);
-            if (genericEvent.IsCancelled)
-            {
-                MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this));
-            }
-
-            // Invoke the button click event for specific button.
-            var eventType = CustomButtonManager.ButtonEventTypes[GetType()];
-            var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, this, genericEvent)!;
-            var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType);
-            if (@event.IsCancelled)
-            {
-                var cancelEventType = CustomButtonManager.ButtonCancelledEventTypes[GetType()];
-                var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, this)!;
-                MiraEventManager.InvokeEvent(cancelEvent, cancelEventType);
-            }
-
-            if (specificInvoked)
-            {
-                if (!@event.IsCancelled)
-                {
-                    ClickHandler();
-                }
-            }
-            else
-            {
-                if (!genericEvent.IsCancelled)
-                {
-                    ClickHandler();
-                }
-            }
-        }));
-    }
-
-    /// <summary>
-    /// Allows you to change the button's location.
-    /// </summary>
-    /// <param name="location">The new location.</param>
-    /// <param name="moveButton">Whether the button's position should change ingame.</param>
-    public virtual void SetButtonLocation(ButtonLocation location, bool moveButton = true)
-    {
-        if (!HudManager.InstanceExists || Button == null)
-        {
-            return;
-        }
-
-        this.Location = location;
-
-        if (!moveButton) return;
-
-        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
-        {
-            return;
-        }
-
-        switch (location)
-        {
-            case ButtonLocation.BottomLeft:
-                var gridArrange = HudManagerPatches._bottomLeft.GetComponent<GridArrange>();
-                var aspectPosition = HudManagerPatches._bottomLeft.GetComponent<AspectPosition>();
-
-                Button.transform.SetParent(HudManagerPatches._bottomLeft.transform);
-
-                gridArrange.Start();
-                gridArrange.ArrangeChilds();
-                aspectPosition.AdjustPosition();
-                break;
-            case ButtonLocation.BottomRight:
-                Button.transform.SetParent(HudManagerPatches._bottomRight);
-                break;
-        }
+        pb.OnClick.AddListener((UnityAction)ClickHandler);
     }
 
     /// <summary>
     /// A utility function to reset the cooldown and/or effect of the button.
     /// </summary>
-    public virtual void ResetCooldownAndOrEffect()
+    public void ResetCooldownAndOrEffect()
     {
         Timer = Cooldown;
         if (EffectActive)
@@ -204,7 +116,7 @@ public abstract class CustomActionButton
     /// A utility function to override the sprite of the button.
     /// </summary>
     /// <param name="sprite">The new sprite to override with.</param>
-    public virtual void OverrideSprite(Sprite sprite)
+    public void OverrideSprite(Sprite sprite)
     {
         if (Button != null)
         {
@@ -216,7 +128,7 @@ public abstract class CustomActionButton
     /// A utility function to override the name of the button.
     /// </summary>
     /// <param name="name">The new name to override with.</param>
-    public virtual void OverrideName(string name)
+    public void OverrideName(string name)
     {
         Button?.OverrideText(name);
     }
@@ -225,7 +137,7 @@ public abstract class CustomActionButton
     /// Set the button's timer.
     /// </summary>
     /// <param name="time">The time you want to set to.</param>
-    public virtual void SetTimer(float time)
+    public void SetTimer(float time)
     {
         Timer = Mathf.Clamp(time, -1, float.MaxValue);
     }
@@ -234,7 +146,7 @@ public abstract class CustomActionButton
     /// Increase the button's timer.
     /// </summary>
     /// <param name="amount">The amount you want to increase by.</param>
-    public virtual void IncreaseTimer(float amount)
+    public void IncreaseTimer(float amount)
     {
         SetTimer(Timer + amount);
     }
@@ -243,7 +155,7 @@ public abstract class CustomActionButton
     /// Decrease the button's timer.
     /// </summary>
     /// <param name="amount">The amount you want to decrease by.</param>
-    public virtual void DecreaseTimer(float amount)
+    public void DecreaseTimer(float amount)
     {
         SetTimer(Timer - amount);
     }
@@ -252,17 +164,16 @@ public abstract class CustomActionButton
     /// Set the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to set to.</param>
-    public virtual void SetUses(int amount)
+    public void SetUses(int amount)
     {
         UsesLeft = Mathf.Clamp(amount, 0, int.MaxValue);
-        Button?.SetUsesRemaining(UsesLeft);
     }
 
     /// <summary>
     /// Increase the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to increase by. Default: 1.</param>
-    public virtual void IncreaseUses(int amount = 1)
+    public void IncreaseUses(int amount = 1)
     {
         SetUses(UsesLeft + amount);
     }
@@ -271,7 +182,7 @@ public abstract class CustomActionButton
     /// Decrease the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to decrease by. Default: 1.</param>
-    public virtual void DecreaseUses(int amount = 1)
+    public void DecreaseUses(int amount = 1)
     {
         SetUses(UsesLeft - amount);
     }
@@ -333,7 +244,7 @@ public abstract class CustomActionButton
     /// This method takes into account cooldowns, effects, and uses, before calling the <see cref="OnClick"/> method.
     /// It can be overridden for custom behavior.
     /// </summary>
-    public virtual void ClickHandler()
+    protected virtual void ClickHandler()
     {
         if (!CanUse())
         {
@@ -344,11 +255,6 @@ public abstract class CustomActionButton
         {
             UsesLeft--;
             Button?.SetUsesRemaining(UsesLeft);
-
-            if (Button != null)
-            {
-                Button.usesRemainingSprite.color = UsesLeft == 0 ? Color.red : Color.white;
-            }
         }
 
         OnClick();
@@ -421,7 +327,7 @@ public abstract class CustomActionButton<T> : CustomActionButton where T : MonoB
     /// <returns>True if the target object is valid, false otherwise.</returns>
     public virtual bool IsTargetValid(T? target)
     {
-        return target != null;
+        return target;
     }
 
     /// <summary>
@@ -448,15 +354,6 @@ public abstract class CustomActionButton<T> : CustomActionButton where T : MonoB
         Target = IsTargetValid(newTarget) ? newTarget : null;
         SetOutline(true);
 
-        return base.CanUse() && Target != null;
-    }
-
-    /// <summary>
-    /// Use this to reset the button's target after used.
-    /// </summary>
-    public virtual void ResetTarget()
-    {
-        Target = null;
-        SetOutline(false);
+        return base.CanUse() && Target;
     }
 }

MiraAPI/Hud/CustomButtonManager.cs

@@ -1,42 +1,31 @@
-using MiraAPI.Events.Mira;
-using MiraAPI.PluginLoading;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Reflection;
+using Reactor.Utilities;
 
 namespace MiraAPI.Hud;
 
-/// <summary>
-/// Custom button manager for handling custom buttons.
-/// </summary>
-public static class CustomButtonManager
+internal static class CustomButtonManager
 {
-    /// <summary>
-    /// Gets a list of all registered custom buttons.
-    /// </summary>
-    public static ReadOnlyCollection<CustomActionButton> Buttons { get; internal set; } = new([]);
-
     internal static readonly List<CustomActionButton> CustomButtons = [];
-    internal static readonly Dictionary<Type, Type> ButtonEventTypes = [];
-    internal static readonly Dictionary<Type, Type> ButtonCancelledEventTypes = [];
 
-    internal static bool RegisterButton(Type buttonType, MiraPluginInfo pluginInfo)
+    internal static void RegisterButton(Type buttonType)
     {
-        if (!buttonType.IsAssignableTo(typeof(CustomActionButton)) || Activator.CreateInstance(buttonType) is not CustomActionButton button)
+        if (!typeof(CustomActionButton).IsAssignableFrom(buttonType))
         {
-            return false;
+            Logger<MiraApiPlugin>.Error($"{buttonType?.Name} does not inherit from CustomActionButton.");
+            return;
+        }
+
+        if (Activator.CreateInstance(buttonType) is not CustomActionButton button)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to create button from {buttonType.Name}");
+            return;
         }
 
         CustomButtons.Add(button);
-        pluginInfo.Buttons.Add(button);
         typeof(CustomButtonSingleton<>).MakeGenericType(buttonType)
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
             .SetValue(null, button);
-
-        ButtonEventTypes.Add(buttonType, typeof(MiraButtonClickEvent<>).MakeGenericType(buttonType));
-        ButtonCancelledEventTypes.Add(buttonType, typeof(MiraButtonCancelledEvent<>).MakeGenericType(buttonType));
-
-        return true;
     }
 }

MiraAPI/Hud/CustomPlayerMenu.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.GameOptions;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Patches.Stubs;
-using Reactor.Utilities.Attributes;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
-using UnityEngine.Events;
-
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// Custom Player Menu using the ShapeshifterPanel as a base.
-/// </summary>
-/// <param name="il2CppPtr">Used by Il2Cpp. Do not use constructor, this is a MonoBehaviour.</param>
-[RegisterInIl2Cpp]
-public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
-{
-    public ShapeshifterPanel PanelPrefab;
-
-    public float XStart = -0.8f;
-
-    public float YStart = 2.15f;
-
-    public float XOffset = 1.95f;
-
-    public float YOffset = -0.65f;
-
-    public UiElement BackButton;
-
-    public UiElement DefaultButtonSelected;
-
-    public List<ShapeshifterPanel> potentialVictims;
-
-    /// <summary>
-    /// Creates a CustomPlayerMenu.
-    /// </summary>
-    /// <returns>New CustomPlayerMenu object.</returns>
-    public static CustomPlayerMenu Create()
-    {
-        var shapeShifterRole = RoleManager.Instance.GetRole(RoleTypes.Shapeshifter);
-
-        var ogMenu = shapeShifterRole.TryCast<ShapeshifterRole>().ShapeshifterMenu;
-        var newMenu = Instantiate(ogMenu);
-        var customMenu = newMenu.gameObject.AddComponent<CustomPlayerMenu>();
-
-        customMenu.PanelPrefab = newMenu.PanelPrefab;
-        customMenu.XStart = newMenu.XStart;
-        customMenu.YStart = newMenu.YStart;
-        customMenu.XOffset = newMenu.XOffset;
-        customMenu.YOffset = newMenu.YOffset;
-        customMenu.BackButton = newMenu.BackButton;
-        var back = customMenu.BackButton.GetComponent<PassiveButton>();
-        back.OnClick.RemoveAllListeners();
-        back.OnClick.AddListener((UnityAction)(() =>
-        {
-            Instance.Close();
-        }));
-
-        customMenu.CloseSound = newMenu.CloseSound;
-        customMenu.logger = newMenu.logger;
-        customMenu.OpenSound = newMenu.OpenSound;
-
-        newMenu.DestroyImmediate();
-
-        customMenu.transform.SetParent(Camera.main.transform, false);
-        customMenu.transform.localPosition = new Vector3(0f, 0f, -50f);
-        return customMenu;
-    }
-
-    private void OnDisable()
-    {
-        ControllerManager.Instance.CloseOverlayMenu(name);
-    }
-
-    public override void Begin(PlayerTask task)
-    {
-        throw new NotImplementedException("Use the other Begin method.");
-    }
-
-    /// <summary>
-    /// Begins/opens the custom player menu.
-    /// </summary>
-    /// <param name="playerMatch">Function to determine if player should show in the custom menu.</param>
-    /// <param name="onClick">Onclick action for player.</param>
-    [HideFromIl2Cpp]
-    public void Begin(Func<PlayerControl, bool> playerMatch, Action<PlayerControl> onClick)
-    {
-        MinigameStubs.Begin(this, null);
-
-        DestroyableSingleton<DebugAnalytics>.Instance.Analytics.MinigameOpened(PlayerControl.LocalPlayer.Data, TaskType);
-        var list = PlayerControl.AllPlayerControls.ToArray().Where(playerMatch).ToList();
-        potentialVictims = [];
-        var list2 = new Il2CppSystem.Collections.Generic.List<UiElement>();
-
-        for (var i = 0; i < list.Count; i++)
-        {
-            var player = list[i];
-            var num = i % 3;
-            var num2 = i / 3;
-            var flag = PlayerControl.LocalPlayer.Data.Role.NameColor == player.Data.Role.NameColor;
-            var shapeshifterPanel = Instantiate(PanelPrefab, transform);
-            shapeshifterPanel.transform.localPosition = new Vector3(XStart + num * XOffset, YStart + num2 * YOffset, -1f);
-            shapeshifterPanel.SetPlayer(i, player.Data, (Il2CppSystem.Action)(() => { onClick(player); }));
-            shapeshifterPanel.NameText.color = flag ? player.Data.Role.NameColor : Color.white;
-            potentialVictims.Add(shapeshifterPanel);
-            list2.Add(shapeshifterPanel.Button);
-        }
-        ControllerManager.Instance.OpenOverlayMenu(name, BackButton, DefaultButtonSelected, list2);
-    }
-}

MiraAPI/Hud/RegisterButtonAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MiraAPI.Hud;
+
+/// <summary>
+/// Attribute to register a button in the HUD. Necessary for the button to be recognized by Mira.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class RegisterButtonAttribute : Attribute;

MiraAPI/Modifiers/BaseModifier.cs

@@ -75,6 +75,6 @@ public abstract class BaseModifier
     /// <summary>
     /// Determines whether the player can vent.
     /// </summary>
-    /// <returns>True if the player can vent, false otherwise. Null for no effect.</returns>
-    public virtual bool? CanVent() => null;
+    /// <returns>True if the player can vent, false otherwise.</returns>
+    public virtual bool CanVent() => Player?.Data.Role.CanVent == true;
 }

MiraAPI/Modifiers/ModifierComponent.cs

@@ -1,14 +1,14 @@
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using Reactor.Utilities.Attributes;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities;
+using Reactor.Utilities;
+using Reactor.Utilities.Attributes;
 using TMPro;
 using UnityEngine;
 
@@ -39,6 +39,11 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
     internal void ClearModifiers()
     {
+        foreach (var modifier in Modifiers)
+        {
+            modifier.OnDeactivate();
+        }
+
         _toRemove.AddRange(Modifiers);
     }
 
@@ -69,7 +74,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             Modifiers.Add(modifier);
             modifier.OnActivate();
 
-            if (modifier is TimedModifier { AutoStart: true } timer)
+            if (_player?.AmOwner == true && modifier is TimedModifier { AutoStart: true } timer)
             {
                 timer.StartTimer();
             }
@@ -79,7 +84,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         {
             if (_player?.AmOwner == true)
             {
-                HudManager.Instance?.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled);
+                HudManager.Instance?.SetHudActive(true);
             }
             _toAdd.Clear();
             _toRemove.Clear();
@@ -107,7 +112,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         var baseModifiers = filteredModifiers as BaseModifier[] ?? filteredModifiers.ToArray();
 
-        if (baseModifiers.Length != 0 && !MeetingHud.Instance)
+        if (baseModifiers.Length != 0)
         {
             var stringBuild = new StringBuilder();
             foreach (var mod in baseModifiers)
@@ -255,24 +260,4 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         return AddModifier(typeof(T)) as T;
     }
-
-    /// <summary>
-    /// Checks if a player has an active or queued modifier by its ID.
-    /// </summary>
-    /// <param name="id">The Modifier ID.</param>
-    /// <returns>True if the Modifier is present, false otherwise.</returns>
-    public bool HasModifier(uint id)
-    {
-        return ActiveModifiers.Exists(x => x.ModifierId == id) || _toAdd.Exists(x => x.ModifierId == id);
-    }
-
-    /// <summary>
-    /// Checks if a player has an active or queued modifier by its type.
-    /// </summary>
-    /// <typeparam name="T">The Type of the Modifier.</typeparam>
-    /// <returns>True if the Modifier is present, false otherwise.</returns>
-    public bool HasModifier<T>()
-    {
-        return ActiveModifiers.Exists(x => x is T) || _toAdd.Exists(x => x is T);
-    }
 }

MiraAPI/Modifiers/ModifierManager.cs

@@ -19,7 +19,6 @@ public static class ModifierManager
 {
     private static readonly Dictionary<uint, Type> IdToTypeModifierMap = [];
     private static readonly Dictionary<Type, uint> TypeToIdModifierMap = [];
-    private static readonly Dictionary<int, List<uint>> PrioritiesToIdsMap = [];
 
     private static uint _nextId;
 
@@ -49,101 +48,85 @@ public static class ModifierManager
         return TypeToIdModifierMap.GetValueOrDefault(type);
     }
 
-    internal static bool RegisterModifier(Type modifierType)
+    internal static void RegisterModifier(Type modifierType)
     {
         if (!typeof(BaseModifier).IsAssignableFrom(modifierType))
         {
-            return false;
+            return;
         }
 
         IdToTypeModifierMap.Add(GetNextId(), modifierType);
         TypeToIdModifierMap.Add(modifierType, _nextId);
-
-        if (!typeof(GameModifier).IsAssignableFrom(modifierType))
-        {
-            return true;
-        }
-
-        var mod = Activator.CreateInstance(modifierType) as GameModifier;
-        var priority = mod!.Priority();
-
-        if (!PrioritiesToIdsMap.TryGetValue(priority, out var list))
-        {
-            PrioritiesToIdsMap[priority] = list = [];
-        }
-
-        list.Add(_nextId);
-        return true;
     }
 
     internal static void AssignModifiers(List<PlayerControl> plrs)
     {
         var rand = new Random();
 
-        foreach (var priority in PrioritiesToIdsMap.Keys.OrderByDescending(x => x))
+        List<uint> filteredModifiers = [];
+
+        foreach (var modifier in IdToTypeModifierMap.Where(pair => pair.Value.IsAssignableTo(typeof(GameModifier))))
         {
-            var filteredModifiers = new List<uint>();
-
-            foreach (var id in PrioritiesToIdsMap[priority])
+            if (Activator.CreateInstance(modifier.Value) is not GameModifier mod)
             {
-                var mod = Activator.CreateInstance(IdToTypeModifierMap[id]) as GameModifier;
-                var chance = Math.Clamp(mod!.GetAssignmentChance(), 0, 100);
-                var count = mod.GetAmountPerGame();
-
-                if (chance == 0 || count == 0)
-                {
-                    continue;
-                }
-
-                var maxCount = plrs.Count(x => IsGameModifierValid(x, mod, id));
-
-                if (maxCount == 0)
-                {
-                    Logger<MiraApiPlugin>.Warning($"No players are valid for {mod.ModifierName}");
-                    continue;
-                }
-
-                var num = Math.Clamp(count, 0, maxCount);
-
-                for (var i = 0; i < num; i++)
-                {
-                    var randomNum = rand.Next(100);
-
-                    if (randomNum < chance)
-                    {
-                        filteredModifiers.Add(id);
-                    }
-                }
-            }
-
-            if (filteredModifiers.Count == 0)
-            {
-                Logger<MiraApiPlugin>.Warning($"No filtered modifiers for priority {priority}");
+                Logger<MiraApiPlugin>.Error($"Failed to create instance of {modifier.Value.Name}");
                 continue;
             }
 
-            var shuffledList = filteredModifiers.Randomize();
-
-            if (shuffledList.Count > plrs.Count)
+            if (!plrs.Exists(x => IsGameModifierValid(x, mod, modifier.Key)))
             {
-                shuffledList = shuffledList.GetRange(0, plrs.Count);
+                Logger<MiraApiPlugin>.Warning("No players are valid for modifier: " + mod.ModifierName);
+                continue;
             }
 
-            foreach (var id in shuffledList)
-            {
-                var mod = Activator.CreateInstance(IdToTypeModifierMap[id]) as GameModifier;
-                var plr = plrs.Where(x => IsGameModifierValid(x, mod!, id)).Random();
+            var maxCount = plrs.Count(x => IsGameModifierValid(x, mod, modifier.Key));
 
-                if (plr == null)
+            var num = Math.Clamp(mod.GetAmountPerGame(), 0, maxCount);
+            var chance = mod.GetAssignmentChance();
+
+            for (var i = 0; i < num; i++)
+            {
+                var randomNum = rand.Next(100);
+
+                if (randomNum < Math.Clamp(chance, 0, 100))
                 {
-                    Logger<MiraApiPlugin>.Warning($"Somehow valid players for modifier {mod!.ModifierName} disappeared");
-                }
-                else
-                {
-                    plr.RpcAddModifier(id);
+                    filteredModifiers.Add(TypeToIdModifierMap[modifier.Value]);
                 }
             }
         }
+
+        var shuffledModifiers = filteredModifiers.Randomize();
+        if (shuffledModifiers.Count > plrs.Count)
+        {
+            shuffledModifiers = shuffledModifiers.GetRange(0, plrs.Count);
+        }
+
+        while (shuffledModifiers.Count > 0)
+        {
+            var id = shuffledModifiers[0];
+
+            if (Activator.CreateInstance(IdToTypeModifierMap[id]) is not GameModifier mod)
+            {
+                Logger<MiraApiPlugin>.Error($"Failed to create instance of {IdToTypeModifierMap[id].Name}");
+                continue;
+            }
+
+            if (!plrs.Exists(x => IsGameModifierValid(x, mod, id)))
+            {
+                shuffledModifiers.RemoveAt(0);
+                continue;
+            }
+
+            var plr = plrs.Random();
+
+            if (plr == null || !IsGameModifierValid(plr, mod, id))
+            {
+                continue;
+            }
+
+            shuffledModifiers.RemoveAt(0);
+            plr.RpcAddModifier(id);
+        }
     }
 
     private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)

MiraAPI/Modifiers/RegisterModifierAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MiraAPI.Modifiers;
+
+/// <summary>
+/// Marks a class as a modifier that can be registered with the <see cref="ModifierManager"/>.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class RegisterModifierAttribute : Attribute;

MiraAPI/Modifiers/Types/GameModifier.cs

@@ -17,23 +17,10 @@ public abstract class GameModifier : BaseModifier
     /// <returns>An int value greater than or equal to zero.</returns>
     public abstract int GetAmountPerGame();
 
-    /// <summary>
-    /// Gets the priority at which the modifier will spawn. The higher the value, the higher up on the assignment list.
-    /// </summary>
-    /// <returns>An int value greater than or equal to -1.</returns>
-    public virtual int Priority() => -1;
-
     /// <summary>
     /// Determines whether the modifier is valid on a role.
     /// </summary>
     /// <param name="role">The role to be checked.</param>
     /// <returns>True if the modifier is valid on the role, otherwise false.</returns>
     public virtual bool IsModifierValidOn(RoleBehaviour role) => true;
-
-    /// <summary>
-    /// Determines whether the player won the game with this modifier.
-    /// </summary>
-    /// <param name="reason">The reason why the game ended.</param>
-    /// <returns>True if the player won, false if they lost. Return null to use the player's default win condition.</returns>
-    public virtual bool? DidWin(GameOverReason reason) => null;
 }

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -39,9 +39,6 @@ public abstract class TimedModifier : BaseModifier
     /// </summary>
     public float TimeRemaining { get; protected set; }
 
-    /// <inheritdoc />
-    public override bool HideOnUi => !TimerActive;
-
     /// <summary>
     /// Gets the HUD information for Timed Modifier, including the time remaining.
     /// </summary>
@@ -56,18 +53,25 @@ public abstract class TimedModifier : BaseModifier
     /// </summary>
     public override void FixedUpdate()
     {
-        if (!TimerActive)
+        if (Player?.AmOwner == false)
         {
             return;
         }
 
-        if (TimeRemaining > 0)
+        if (TimeRemaining > 0 && TimerActive)
         {
             TimeRemaining -= Time.fixedDeltaTime;
         }
         else
         {
-            StopTimer();
+            TimerActive = false;
+            TimeRemaining = Duration;
+            OnTimerComplete();
+
+            if (RemoveOnComplete)
+            {
+                ModifierComponent?.RemoveModifier(ModifierId);
+            }
         }
     }
 
@@ -82,52 +86,7 @@ public abstract class TimedModifier : BaseModifier
             return;
         }
 
-        TimeRemaining = Duration;
         TimerActive = true;
-    }
-
-    /// <summary>
-    /// Stops the timer and calls OnTimerComplete().
-    /// </summary>
-    public void StopTimer()
-    {
-        if (!TimerActive)
-        {
-            return;
-        }
-
-        TimerActive = false;
         TimeRemaining = Duration;
-        OnTimerComplete();
-
-        if (RemoveOnComplete)
-        {
-            ModifierComponent?.RemoveModifier(ModifierId);
-        }
-    }
-
-    /// <summary>
-    /// Resets the timer. Does not call OnTimerComplete().
-    /// </summary>
-    public void ResetTimer()
-    {
-        TimerActive = false;
-        TimeRemaining = Duration;
-    }
-
-    /// <summary>
-    /// Pauses the timer.
-    /// </summary>
-    public void PauseTimer()
-    {
-        TimerActive = false;
-    }
-
-    /// <summary>
-    /// Pauses the timer.
-    /// </summary>
-    public void ResumeTimer()
-    {
-        TimerActive = true;
     }
 }

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,14 +1,11 @@
-using AmongUs.GameOptions;
+using System.Collections;
+using System.Linq;
+using AmongUs.GameOptions;
 using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
 using Reactor.Networking.Attributes;
-using Reactor.Networking.Rpc;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
-using System.Collections;
-using System.Linq;
 using UnityEngine;
 
 namespace MiraAPI.Networking;
@@ -29,7 +26,7 @@ public static class CustomMurderRpc
     /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
     /// <param name="showKillAnim">Should the kill animation be shown.</param>
     /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before, SendImmediately = true)]
+    [MethodRpc((uint)MiraRpc.CustomMurder)]
     public static void RpcCustomMurder(
         this PlayerControl source,
         PlayerControl target,
@@ -41,15 +38,6 @@ public static class CustomMurderRpc
         bool playKillSound = true)
     {
         var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
-
-        var beforeMurderEvent = new BeforeMurderEvent(source, target);
-        MiraEventManager.InvokeEvent(beforeMurderEvent);
-
-        if (beforeMurderEvent.IsCancelled)
-        {
-            murderResultFlags = MurderResultFlags.FailedError;
-        }
-
         var murderResultFlags2 = MurderResultFlags.DecisionByHost | murderResultFlags;
 
         source.CustomMurder(
@@ -84,6 +72,7 @@ public static class CustomMurderRpc
         bool playKillSound = true)
     {
         source.isKilling = false;
+        Logger<MiraApiPlugin>.Error($"{source.PlayerId} trying to murder {target.PlayerId}");
         var data = target.Data;
         if (resultFlags.HasFlag(MurderResultFlags.FailedError))
         {
@@ -98,7 +87,7 @@ public static class CustomMurderRpc
             if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
             {
                 StatsManager.Instance.IncrementStat(StringNames.StatsGuardianAngelCrewmatesProtected);
-                AchievementManager.Instance.OnProtectACrewmate();
+                DestroyableSingleton<AchievementManager>.Instance.OnProtectACrewmate();
             }
 
             if (source.AmOwner || flag)
@@ -126,7 +115,7 @@ public static class CustomMurderRpc
             return;
         }
 
-        DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
+        DestroyableSingleton<DebugAnalytics>.Instance.Analytics.Kill(target.Data, source.Data);
         if (source.AmOwner)
         {
             StatsManager.Instance.IncrementStat(
@@ -150,7 +139,7 @@ public static class CustomMurderRpc
             }
         }
 
-        UnityTelemetry.Instance.WriteMurder();
+        DestroyableSingleton<UnityTelemetry>.Instance.WriteMurder();
         target.gameObject.layer = LayerMask.NameToLayer("Ghost");
         if (target.AmOwner)
         {
@@ -170,14 +159,14 @@ public static class CustomMurderRpc
 
             if (showKillAnim)
             {
-                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
+                DestroyableSingleton<HudManager>.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
             }
 
             target.cosmetics.SetNameMask(false);
             target.RpcSetScanner(false);
         }
 
-        AchievementManager.Instance.OnMurder(
+        DestroyableSingleton<AchievementManager>.Instance.OnMurder(
             source.AmOwner,
             target.AmOwner,
             source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,
@@ -278,8 +267,5 @@ public static class CustomMurderRpc
 
         PlayerControl.LocalPlayer.isKilling = false;
         source.isKilling = false;
-
-        var afterMurderEvent = new AfterMurderEvent(source, target);
-        MiraEventManager.InvokeEvent(afterMurderEvent);
     }
 }

MiraAPI/Networking/MiraRpc.cs

@@ -34,4 +34,9 @@ public enum MiraRpc : uint
     /// Custom Murder RPC.
     /// </summary>
     CustomMurder,
+
+    /// <summary>
+    /// Trigger Animation using CustomAnimator.
+    /// </summary>
+    TriggerAnimation,
 }

MiraAPI/Patches/AmongUsClientSyncPatch.cs

@@ -1,7 +1,5 @@
 using HarmonyLib;
 using InnerNet;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
@@ -11,16 +9,11 @@ namespace MiraAPI.Patches;
 /// <summary>
 /// Sync all options, role settings, and modifiers to the player when they join the game.
 /// </summary>
-[HarmonyPatch(typeof(AmongUsClient))]
+[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CreatePlayer))]
 public static class AmongUsClientSyncPatch
 {
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CreatePlayer))]
-    public static void CreatePlayerPatch(ClientData clientData)
+    public static void Postfix(ClientData clientData)
     {
-        var joinEvent = new PlayerJoinEvent(clientData);
-        MiraEventManager.InvokeEvent(joinEvent);
-
         if (!AmongUsClient.Instance.AmHost)
         {
             return;
@@ -35,12 +28,4 @@ public static class AmongUsClientSyncPatch
         CustomRoleManager.SyncAllRoleSettings(clientData.Id);
         ModifierManager.SyncAllModifiers(clientData.Id);
     }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnPlayerLeft))]
-    public static void PlayerLeftPatch(ClientData data, DisconnectReasons reason)
-    {
-        var leftEvent = new PlayerLeaveEvent(data, reason);
-        MiraEventManager.InvokeEvent(leftEvent);
-    }
 }

MiraAPI/Patches/Events/CanUsePatches.cs

@@ -1,42 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Usables;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch]
-public static class CanUsePatches
-{
-    public static IEnumerable<MethodBase> TargetMethods()
-    {
-        yield return AccessTools.Method(typeof(Console), nameof(Console.CanUse));
-        yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.CanUse));
-        yield return AccessTools.Method(typeof(SystemConsole), nameof(SystemConsole.CanUse));
-        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.CanUse));
-        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.CanUse));
-        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.CanUse));
-        yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.CanUse));
-        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.CanUse));
-        yield return AccessTools.Method(typeof(ZiplineConsole), nameof(ZiplineConsole.CanUse));
-    }
-
-    [HarmonyPriority(Priority.Last)]
-    [HarmonyPrefix]
-    public static bool CanUsePatch(Il2CppSystem.Object __instance, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] out bool canUse, [HarmonyArgument(2)] out bool couldUse)
-    {
-        canUse = couldUse = false;
-
-        IUsable usable = __instance.Cast<IUsable>();
-        if (usable != null)
-        {
-            var @event = new PlayerCanUseEvent(__instance.Cast<IUsable>());
-            MiraEventManager.InvokeEvent(@event);
-
-            return !@event.IsCancelled;
-        }
-
-        return true;
-    }
-}

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -1,20 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patch for trigging the GameEndEvent.
-/// </summary>
-[HarmonyPatch]
-public static class EndGamePatches
-{
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
-    public static void SetEverythingUpPatch(EndGameManager __instance)
-    {
-        var @event = new GameEndEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-    }
-}

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -1,25 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-
-namespace MiraAPI.Patches;
-
-/// <summary>
-/// General patches for the KillAnimation class.
-/// </summary>
-[HarmonyPatch]
-public static class KillAnimationPatches
-{
-    /// <summary>
-    /// Used to trigger the <see cref="AfterMurderEvent"/>.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The target.</param>
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(KillAnimation), nameof(KillAnimation.CoPerformKill))]
-    public static void KillAnimPostfix(PlayerControl source, PlayerControl target)
-    {
-        var afterMurderEvent = new AfterMurderEvent(source, target);
-        MiraEventManager.InvokeEvent(afterMurderEvent);
-    }
-}

MiraAPI/Patches/Events/MapBehaviourPatches.cs

@@ -1,21 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Map;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patch for map related MiraEvents.
-/// </summary>
-[HarmonyPatch]
-public static class MapBehaviourPatches
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(MapBehaviour), nameof(MapBehaviour.ShowSabotageMap))]
-    public static bool MapShowSabotagePatch(MapBehaviour __instance)
-    {
-        var @event = new PlayerOpenSabotageEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-}

MiraAPI/Patches/Events/SabotageEventPatches.cs

@@ -1,30 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Map;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Used for patching sabotage/system related MiraEvents.
-/// </summary>
-[HarmonyPatch]
-public static class SabotageEventPatches
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(ShipStatus), nameof(ShipStatus.RpcUpdateSystem), typeof(SystemTypes), typeof(byte))]
-    public static bool ShipStatusUpdateSystemPrefix(ShipStatus __instance, SystemTypes systemType, byte amount)
-    {
-        var @event = new UpdateSystemEvent(systemType, PlayerControl.LocalPlayer, amount);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(ShipStatus), nameof(ShipStatus.RpcCloseDoorsOfType))]
-    public static bool ShipStatusCloseDoorsOfTypePrefix(ShipStatus __instance, SystemTypes type)
-    {
-        var @event = new CloseDoorsEvent(type);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-}

MiraAPI/Patches/Events/StartMeetingEventPatch.cs

@@ -1,21 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Meeting;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch]
-public static class StartMeetingEventPatch
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))]
-    public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
-    {
-        var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null;
-
-        var @event = new StartMeetingEvent(__instance, target, body);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-}

MiraAPI/Patches/Events/UsePatches.cs

@@ -1,35 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch]
-public static class UsePatches
-{
-    public static IEnumerable<MethodBase> TargetMethods()
-    {
-        yield return AccessTools.Method(typeof(Console), nameof(Console.Use));
-        yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.Use));
-        yield return AccessTools.Method(typeof(SystemConsole), nameof(SystemConsole.Use));
-        yield return AccessTools.Method(typeof(Vent), nameof(Vent.Use));
-        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.Use));
-        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.Use));
-        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.Use));
-        yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.Use));
-        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.Use));
-        yield return AccessTools.Method(typeof(ZiplineConsole), nameof(ZiplineConsole.Use));
-    }
-
-    [HarmonyPriority(Priority.Last)]
-    [HarmonyPrefix]
-    public static bool UsePatch(Il2CppSystem.Object __instance)
-    {
-        var @event = new PlayerUseEvent(__instance.Cast<IUsable>());
-        MiraEventManager.InvokeEvent(@event);
-
-        return !@event.IsCancelled;
-    }
-}

MiraAPI/Patches/Events/VentEventPatches.cs

@@ -1,57 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Usables;
-using System.Linq;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patches to invoke vent related MiraEvents.
-/// </summary>
-[HarmonyPatch]
-public static class VentEventPatches
-{
-    // necessary because Vent.Use is inlined in il2cpp.
-    private static bool _showButtons;
-
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(VentButton), nameof(VentButton.DoClick))]
-    public static void VentUsePostfix(VentButton __instance)
-    {
-        __instance.currentTarget?.SetButtons(_showButtons);
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcEnterVent))]
-    public static bool PlayerPhysicsRpcEnterVentPrefix(PlayerPhysics __instance, int id)
-    {
-        var pc = __instance.myPlayer;
-        var vent = ShipStatus.Instance.AllVents.FirstOrDefault(v => v.Id == id);
-
-        var @event = new EnterVentEvent(pc, vent);
-        MiraEventManager.InvokeEvent(@event);
-
-        if (pc.AmOwner)
-        {
-            _showButtons = !@event.IsCancelled;
-        }
-        return !@event.IsCancelled;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcExitVent))]
-    public static bool PlayerPhysicsRpcExitVentPrefix(PlayerPhysics __instance, int id)
-    {
-        var pc = __instance.myPlayer;
-        var vent = ShipStatus.Instance.AllVents.First(v => v.Id == id);
-
-        var @event = new ExitVentEvent(pc, vent);
-        MiraEventManager.InvokeEvent(@event);
-
-        if (pc.AmOwner)
-        {
-            _showButtons = @event.IsCancelled;
-        }
-        return !@event.IsCancelled;
-    }
-}

MiraAPI/Patches/HudManagerPatches.cs

@@ -13,9 +13,7 @@ namespace MiraAPI.Patches;
 public static class HudManagerPatches
 {
     // Custom buttons parent.
-    internal static GameObject? _bottomLeft;
-    internal static Transform? _bottomRight;
-    internal static Transform? _buttons;
+    private static GameObject? _bottomLeft;
 
     /*
     /// <summary>
@@ -36,19 +34,12 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        if (_buttons == null)
-        {
-            _buttons = __instance.transform.Find("Buttons");
-        }
-
-        if (_bottomRight == null)
-        {
-            _bottomRight = _buttons.Find("BottomRight");
-        }
+        var buttons = __instance.transform.Find("Buttons");
+        var bottomRight = buttons.Find("BottomRight");
 
         if (_bottomLeft == null)
         {
-            _bottomLeft = Object.Instantiate(_bottomRight.gameObject, _buttons);
+            _bottomLeft = Object.Instantiate(bottomRight.gameObject, buttons);
         }
 
         foreach (var t in _bottomLeft.GetComponentsInChildren<ActionButton>(true))
@@ -68,7 +59,7 @@ public static class HudManagerPatches
             var location = button.Location switch
             {
                 ButtonLocation.BottomLeft => _bottomLeft.transform,
-                ButtonLocation.BottomRight => _bottomRight,
+                ButtonLocation.BottomRight => bottomRight,
                 _ => null,
             };
 
@@ -97,8 +88,7 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.SetHudActive), typeof(PlayerControl), typeof(RoleBehaviour), typeof(bool))]
     public static void SetHudActivePostfix(HudManager __instance, PlayerControl localPlayer, RoleBehaviour role, bool isActive)
     {
-        __instance.AdminButton.ToggleVisible(isActive && role.IsImpostor && GameOptionsManager.Instance.CurrentGameOptions.GameMode == AmongUs.GameOptions.GameModes.HideNSeek);
-        if (localPlayer.Data == null)
+        if (!localPlayer.Data)
         {
             return;
         }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -1,6 +1,4 @@
 using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using UnityEngine;
@@ -22,14 +20,6 @@ public static class IntroCutscenePatches
         }
     }*/
 
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(IntroCutscene.CoBegin))]
-    public static void IntroBeginPatch(IntroCutscene __instance)
-    {
-        var @event = new IntroBeginEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(nameof(IntroCutscene.BeginCrewmate))]
     public static bool BeginCrewmatePatch(IntroCutscene __instance)

MiraAPI/Patches/Modifiers/EndGameDidWinPatch.cs

@@ -1,40 +0,0 @@
-using System.Linq;
-using HarmonyLib;
-using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Patches.Modifiers;
-
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CoEndGame))]
-public static class EndGameDidWinPatch
-{
-    public static void Prefix()
-    {
-        var gameOverReason = EndGameResult.CachedGameOverReason;
-        EndGameResult.CachedWinners.Clear();
-
-        var players = GameData.Instance.AllPlayers.ToArray();
-        for (var i = 0; i < GameData.Instance.PlayerCount; i++)
-        {
-            var networkedPlayerInfo = players[i];
-            if (networkedPlayerInfo == null)
-            {
-                continue;
-            }
-
-            var didWin = networkedPlayerInfo.Role.DidWin(gameOverReason);
-
-            var modifierWin = networkedPlayerInfo.Object?.GetModifierComponent()?.ActiveModifiers.OfType<GameModifier>()
-                .FirstOrDefault(x => x.DidWin(gameOverReason) != null)?.DidWin(gameOverReason);
-            if (modifierWin != null)
-            {
-                didWin = modifierWin.Value;
-            }
-
-            if (didWin)
-            {
-                EndGameResult.CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
-            }
-        }
-    }
-}

MiraAPI/Patches/Modifiers/VentPatches.cs

@@ -0,0 +1,45 @@
+using HarmonyLib;
+using MiraAPI.Utilities;
+using UnityEngine;
+
+namespace MiraAPI.Patches.Modifiers;
+
+[HarmonyPatch(typeof(Vent))]
+public static class VentPatches
+{
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(Vent.CanUse))]
+    public static void CanUseVentPatch(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
+    {
+        var @object = pc.Object;
+        var role = @object.Data.Role;
+
+        var modifiers = @object.GetModifierComponent()?.ActiveModifiers;
+        if (modifiers is null || modifiers.Count <= 0)
+        {
+            return;
+        }
+
+        switch (role.CanVent)
+        {
+            case true when modifiers.Exists(x => !x.CanVent()):
+                couldUse = canUse = false;
+                return;
+            case false when modifiers.Exists(x => x.CanVent()):
+                couldUse = true;
+                break;
+        }
+
+        var num = float.MaxValue;
+
+        canUse = couldUse;
+        if (canUse)
+        {
+            var center = @object.Collider.bounds.center;
+            var position = __instance.transform.position;
+            num = Vector2.Distance(center, position);
+            canUse &= num <= __instance.UsableDistance && !PhysicsHelpers.AnythingBetween(@object.Collider, center, position, Constants.ShipOnlyMask, false);
+        }
+        __result = num;
+    }
+}

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -32,25 +32,16 @@ public static class GameOptionsMenuPatch
         var num = 2.1f;
         var filteredGroups =
             GameSettingMenuPatches.SelectedMod?.OptionGroups.Where(
-                x => x.AdvancedRole is null) ?? [];
+                x => x.GroupVisible.Invoke() && x.AdvancedRole is null) ?? [];
 
         foreach (var group in filteredGroups)
         {
-            if (group.Options.Count == 0 || group.Header is null)
+            var filteredOpts = group.Options.Where(x => x.Visible.Invoke()).ToList();
+            if (filteredOpts.Count == 0 || group.Header is null)
             {
                 continue;
             }
 
-            if (!group.GroupVisible.Invoke())
-            {
-                group.Header.gameObject.SetActive(false);
-                foreach (var option in group.Options)
-                {
-                    option.OptionBehaviour?.gameObject.SetActive(false);
-                }
-                continue;
-            }
-
             group.Header.gameObject.SetActive(true);
             group.Header.transform.localScale = Vector3.one * 0.63f;
             group.Header.transform.localPosition = new Vector3(-0.903f, num, -2f);

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -1,11 +1,11 @@
-using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -128,6 +128,11 @@ public static class LobbyViewPanePatches
 
         foreach (var group in filteredGroups)
         {
+            if (group.Options.Count == 0)
+            {
+                continue;
+            }
+
             var categoryHeaderMasked = Object.Instantiate(
                 instance.categoryHeaderOrigin,
                 instance.settingsContainer,
@@ -171,6 +176,11 @@ public static class LobbyViewPanePatches
 
                 var data = option.Data;
 
+                if (data == null)
+                {
+                    continue;
+                }
+
                 if (data.Type == OptionTypes.Checkbox)
                 {
                     viewSettingsInfoPanel.SetInfoCheckbox(
@@ -215,7 +225,7 @@ public static class LobbyViewPanePatches
         {
             var filteredRoles = SelectedMod.CustomRoles.Values
                 .OfType<ICustomRole>()
-                .Where(x => !x.Configuration.HideSettings && x.Team == team).ToList();
+                .Where(x => !x.HideSettings && x.Team == team).ToList();
 
             if (filteredRoles.Count == 0)
             {
@@ -284,7 +294,7 @@ public static class LobbyViewPanePatches
                     chancePerGame,
                     61,
                     customRole.RoleColor,
-                    customRole.Configuration.Icon.LoadAsset(),
+                    customRole.Icon.LoadAsset(),
                     true);
 
                 viewSettingsInfoPanelRoleVariant.titleText.color =
@@ -369,7 +379,7 @@ public static class LobbyViewPanePatches
             role.StringName,
             maskLayer,
             role.TeamType == RoleTeamTypes.Crewmate,
-            customRole.Configuration.Icon.LoadAsset());
+            customRole.Icon.LoadAsset());
         viewPanel.divider.material.SetInt(PlayerMaterial.MaskLayer, maskLayer);
 
         var num = viewPanel.yPosStart;
@@ -389,6 +399,11 @@ public static class LobbyViewPanePatches
 
             var value = option.GetFloatData();
 
+            if (baseGameSetting == null)
+            {
+                continue;
+            }
+
             if (baseGameSetting.Type == OptionTypes.Checkbox)
             {
                 viewSettingsInfoPanel.SetInfoCheckbox(baseGameSetting.Title, maskLayer, value > 0f);

MiraAPI/Patches/Options/NotificationPopperPatch.cs

@@ -18,7 +18,7 @@ public static class NotificationPopperPatch
         [HarmonyArgument(3)] RoleTeamTypes teamType,
         [HarmonyArgument(4)] bool playSound)
     {
-        if (CustomRoleManager.CustomRoles.Values.FirstOrDefault(x=>x.StringName==key) is not ICustomRole customRole)
+        if (CustomRoleManager.CustomRoles.Values.All(role => role.StringName != key))
         {
             return true;
         }
@@ -27,14 +27,12 @@ public static class NotificationPopperPatch
             ? Palette.CrewmateSettingChangeText.ToTextColor()
             : Palette.ImpostorRed.ToTextColor();
 
-        var item = TranslationController.Instance.GetString(
+        var item = DestroyableSingleton<TranslationController>.Instance.GetString(
             StringNames.LobbyChangeSettingNotificationRole,
-            string.Concat(
-                "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
-                text,
-                TranslationController.Instance.GetString(key, Array.Empty<Object>()),
-                "</color></font>"
-            ),
+            "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
+            text,
+            DestroyableSingleton<TranslationController>.Instance.GetString(key, Array.Empty<Object>()),
+            "</color></font>",
             "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">" + roleCount + "</font>",
             "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">" + roleChance + "%"
         );

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -17,7 +17,7 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
@@ -39,7 +39,7 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
@@ -61,8 +61,8 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
-        __instance.ValueText.text = TranslationController.Instance.GetString(
+            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.ValueText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
             __instance.Values[__instance.Value],
             Array.Empty<Object>());
 

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -56,7 +56,7 @@ public static class RoleSettingMenuPatches
 
         var crewRoles = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values
             .OfType<ICustomRole>()
-            .Where(role => role is { Team: ModdedRoleTeams.Crewmate, Configuration.HideSettings: false })
+            .Where(role => role is { Team: ModdedRoleTeams.Crewmate, HideSettings: false })
             .ToList() ?? [];
 
         if (crewRoles is { Count: > 0 })
@@ -82,7 +82,7 @@ public static class RoleSettingMenuPatches
 
         var impRoles = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values
             .OfType<ICustomRole>()
-            .Where(role => role is { Team: ModdedRoleTeams.Impostor, Configuration.HideSettings: false })
+            .Where(role => role is { Team: ModdedRoleTeams.Impostor, HideSettings: false })
             .ToList() ?? [];
 
         if (impRoles is { Count: > 0 })
@@ -109,7 +109,7 @@ public static class RoleSettingMenuPatches
 
         var neutRoles = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values
             .OfType<ICustomRole>()
-            .Where(role => role is { Team: ModdedRoleTeams.Neutral, Configuration.HideSettings: false })
+            .Where(role => role is { Team: ModdedRoleTeams.Neutral, HideSettings: false })
             .ToList() ?? [];
 
         if (neutRoles is { Count: > 0 })
@@ -159,22 +159,18 @@ public static class RoleSettingMenuPatches
     {
         var roleSetting = obj.Cast<RoleOptionSetting>();
         var role = roleSetting.Role as ICustomRole;
-        if (role is null or { Configuration.HideSettings: true })
+        if (role is null or { HideSettings: true })
         {
             return;
         }
 
         try
         {
-            if (role.Configuration.MaxRoleCount != 0)
-            {
-                role.SetCount(roleSetting.RoleMaxCount);
-            }
+            role.ParentMod.PluginConfig.TryGetEntry<int>(role.NumConfigDefinition, out var numEntry);
+            numEntry.Value = roleSetting.RoleMaxCount;
 
-            if (role.Configuration.CanModifyChance)
-            {
-                role.SetChance(roleSetting.RoleChance);
-            }
+            role.ParentMod.PluginConfig.TryGetEntry<int>(role.ChanceConfigDefinition, out var chanceEntry);
+            chanceEntry.Value = roleSetting.RoleChance;
         }
         catch (Exception e)
         {
@@ -182,7 +178,7 @@ public static class RoleSettingMenuPatches
         }
 
         roleSetting.UpdateValuesAndText(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions);
-        HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(
             roleSetting.Role.StringName,
             roleSetting.RoleMaxCount,
             roleSetting.RoleChance,
@@ -232,7 +228,7 @@ public static class RoleSettingMenuPatches
                 renderer.material.SetInt(PlayerMaterial.MaskLayer, 20);
             }
 
-            foreach (var fontMat in newOpt.GetComponentsInChildren<TextMeshPro>(true).Select(x => x.fontMaterial))
+            foreach (var fontMat in newOpt.GetComponentsInChildren<TextMeshPro>(true).Select(x=>x.fontMaterial))
             {
                 fontMat.SetFloat(ShaderID.StencilComp, 3f);
                 fontMat.SetFloat(ShaderID.Stencil, 20);
@@ -258,11 +254,11 @@ public static class RoleSettingMenuPatches
         }
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
-        __instance.roleTitleText.text = TranslationController.Instance.GetString(
+        __instance.roleTitleText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
             role.StringName,
             new Il2CppReferenceArray<Il2CppSystem.Object>(0));
         __instance.roleScreenshot.sprite = Sprite.Create(
-            customRole.Configuration.OptionsScreenshot.LoadAsset().texture,
+            customRole.OptionsScreenshot.LoadAsset().texture,
             new Rect(0, 0, 370, 230),
             Vector2.one / 2,
             100);
@@ -309,7 +305,6 @@ public static class RoleSettingMenuPatches
             Quaternion.identity,
             __instance.RoleChancesSettings.transform);
         roleOptionSetting.transform.localPosition = new Vector3(-0.15f, yPos, -2f);
-
         roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20);
         roleOptionSetting.labelSprite.color = customRole.RoleColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
@@ -341,18 +336,6 @@ public static class RoleSettingMenuPatches
             passiveButton.OnClick.AddListener((UnityAction)(() => { ChangeTab(role, __instance); }));
         }
 
-        if (customRole.Configuration is { MaxRoleCount: 0 })
-        {
-            roleOptionSetting.CountMinusBtn.gameObject.SetActive(false);
-            roleOptionSetting.CountPlusBtn.gameObject.SetActive(false);
-        }
-
-        if (!customRole.Configuration.CanModifyChance)
-        {
-            roleOptionSetting.ChanceMinusBtn.gameObject.SetActive(false);
-            roleOptionSetting.ChancePlusBtn.gameObject.SetActive(false);
-        }
-
         if (index < GameSettingMenuPatches.SelectedMod?.CustomRoles.Count - 1)
         {
             yPos += -0.43f;

MiraAPI/Patches/Options/SettingPatches.cs

@@ -39,9 +39,9 @@ public static class SettingPatches
                 MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
                 MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
                 MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
-                _ => TranslationController.Instance.GetString(
+                _ => DestroyableSingleton<TranslationController>.Instance.GetString(
                     StringNames.GameSecondsAbbrev,
-                    (Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
+                    (Il2CppSystem.Object[]) [value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
             };
         }
 

MiraAPI/Patches/PlayerControlPatches.cs

@@ -1,12 +1,9 @@
 using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Events.Vanilla.Player;
+using MiraAPI.Animations;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 using Reactor.Utilities.Extensions;
-using System.Linq;
 
 namespace MiraAPI.Patches;
 
@@ -17,10 +14,10 @@ namespace MiraAPI.Patches;
 public static class PlayerControlPatches
 {
     /// <summary>
-    /// Adds the modifier component to the player on start.
+    /// Adds the modifier and animator component to the player on start.
     /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    [HarmonyPostfix]
+    /// <param name="__instance">The player which will be given the components.</param>
+    [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.Start))]
     public static void PlayerControlStartPostfix(PlayerControl __instance)
     {
@@ -29,20 +26,24 @@ public static class PlayerControlPatches
             comp.DestroyImmediate();
         }
 
+        if (__instance.gameObject.TryGetComponent<CustomAnimator>(out var anim))
+        {
+            anim.DestroyImmediate();
+        }
+
+        __instance.gameObject.AddComponent<CustomAnimator>();
         __instance.gameObject.AddComponent<ModifierComponent>();
     }
 
     /// <summary>
     /// Calls the OnDeath method for all active modifiers.
     /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
+    /// <param name="__instance">The player who died.</param>
+    /// <param name="reason">The reason of the death.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Die))]
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
-        var deathEvent = new PlayerDeathEvent(__instance, reason);
-        MiraEventManager.InvokeEvent(deathEvent);
-
         var modifiersComponent = __instance.GetComponent<ModifierComponent>();
 
         if (modifiersComponent)
@@ -51,43 +52,10 @@ public static class PlayerControlPatches
         }
     }
 
-    /// <summary>
-    /// Used to trigger the <see cref="CompleteTaskEvent"/>.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    /// <param name="idx">The task id.</param>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(PlayerControl.CompleteTask))]
-    public static void PlayerCompleteTaskPostfix(PlayerControl __instance, uint idx)
-    {
-        var playerTask = __instance.myTasks.ToArray().First(playerTask => playerTask.Id == idx);
-        if (playerTask != null)
-        {
-            var completeTaskEvent = new CompleteTaskEvent(__instance, playerTask);
-            MiraEventManager.InvokeEvent(completeTaskEvent);
-        }
-    }
-
-    /// <summary>
-    /// Used to trigger the <see cref="BeforeMurderEvent"/>.
-    /// </summary>
-    /// <param name="__instance">The source player.</param>
-    /// <param name="target">The target.</param>
-    /// <param name="didSucceed">Whether the kill succeeded.</param>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
-    public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
-    {
-        var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
-        MiraEventManager.InvokeEvent(beforeMurderEvent);
-
-        didSucceed = beforeMurderEvent.IsCancelled;
-    }
-
     /// <summary>
     /// FixedUpdate handler for custom roles and custom buttons.
     /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
+    /// <param name="__instance">The player who's fixed update is being called.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
@@ -117,15 +85,4 @@ public static class PlayerControlPatches
             button.FixedUpdateHandler(__instance);
         }
     }
-
-    /// <summary>
-    /// Clear from modifier component cache.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.OnDestroy))]
-    public static void PlayerControlOnDestroyPrefix(PlayerControl __instance)
-    {
-        Utilities.Extensions.ModifierComponents.Remove(__instance);
-    }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,6 +1,4 @@
 using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Roles;
 
 namespace MiraAPI.Patches.Roles;
@@ -15,9 +13,6 @@ public static class EjectionPatches
     [HarmonyPatch(nameof(ExileController.Begin))]
     public static void BeginPostfix(ExileController __instance)
     {
-        var @event = new EjectionEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-
         if (!__instance.initData.networkedPlayer || !__instance.initData.networkedPlayer.Role ||
             __instance.initData.networkedPlayer.Role is not ICustomRole role)
         {

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -1,27 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Roles;
-
-/// <summary>
-/// Patches the haunt menu to show the actual role name rather then team.
-/// </summary>
-[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetFilterText))]
-public static class HauntMenuMinigamePatch
-{
-    public static void Postfix(HauntMenuMinigame __instance)
-    {
-        if (__instance.HauntTarget.Data.IsDead)
-        {
-            __instance.FilterText.color = Color.white;
-            return;
-        }
-
-        var role = __instance.HauntTarget.Data.Role;
-        var color = role is ICustomRole custom ? custom.RoleColor : role.TeamColor;
-
-        __instance.FilterText.text = role.NiceName;
-        __instance.FilterText.color = color;
-    }
-}

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -17,10 +17,6 @@ public static class HudManagerPatches
     /// <summary>
     /// Fixes Kill Button not showing for Neutral killing role.
     /// </summary>
-    /// <param name="__instance">HudManager instance.</param>
-    /// <param name="localPlayer">The local PlayerControl.</param>
-    /// <param name="role">The player's RoleBehaviour.</param>
-    /// <param name="isActive">Whether the Hud should be set active or not.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(HudManager.SetHudActive), typeof(PlayerControl), typeof(RoleBehaviour), typeof(bool))]
     public static void SetHudActivePostfix(
@@ -31,11 +27,10 @@ public static class HudManagerPatches
     {
         var flag = localPlayer.Data != null && localPlayer.Data.IsDead;
 
-        if (role is ICustomRole customRole)
+        if (role is ICustomRole)
         {
-            __instance.KillButton.ToggleVisible(isActive && customRole.Configuration.UseVanillaKillButton && !flag);
-            __instance.ImpostorVentButton.ToggleVisible(isActive && customRole.Configuration.CanUseVent && !flag);
-            __instance.SabotageButton.gameObject.SetActive(isActive && customRole.Configuration.CanUseSabotage);
+            __instance.KillButton.ToggleVisible(isActive && role.CanUseKillButton && !flag);
+            __instance.ImpostorVentButton.ToggleVisible(isActive && role.CanVent && !flag);
         }
 
         if (_roleTab)
@@ -60,7 +55,7 @@ public static class HudManagerPatches
 
         var role = local?.Data?.Role;
 
-        if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
+        if (role is ICustomRole { RoleHintType: RoleHintType.RoleTab } customRole)
         {
             customRole.HudUpdate(__instance);
 

MiraAPI/Patches/Roles/KillButtonPatches.cs

@@ -36,7 +36,7 @@ public static class KillButtonPatches
         __instance.currentTarget = target;
         if (__instance.currentTarget)
         {
-            __instance.currentTarget.cosmetics.SetOutline(true, new Nullable<Color>(customRole.Configuration.KillButtonOutlineColor));
+            __instance.currentTarget.cosmetics.SetOutline(true, new Nullable<Color>(customRole.KillButtonOutlineColor));
             __instance.SetEnabled();
             return false;
         }
@@ -52,6 +52,11 @@ public static class KillButtonPatches
     [HarmonyPatch(nameof(KillButton.DoClick))]
     public static bool DoClickPrefix(KillButton __instance)
     {
+        if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole)
+        {
+            return true;
+        }
+
         if (!__instance.isActiveAndEnabled || !__instance.currentTarget || __instance.isCoolingDown ||
             PlayerControl.LocalPlayer.Data.IsDead || !PlayerControl.LocalPlayer.CanMove)
         {

MiraAPI/Patches/Roles/NameTagPatch.cs

@@ -1,11 +1,10 @@
 using HarmonyLib;
-using MiraAPI.Roles;
 using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Set nametag color depending on visibility.
+/// Set nametag color depending on option
 /// </summary>
 [HarmonyPatch(typeof(PlayerNameColor))]
 public static class NameTagPatch
@@ -14,12 +13,6 @@ public static class NameTagPatch
     [HarmonyPatch(nameof(PlayerNameColor.Get), typeof(RoleBehaviour))]
     public static bool GetPatch([HarmonyArgument(0)] RoleBehaviour otherPlayerRole, ref Color __result)
     {
-        if (otherPlayerRole is ICustomRole customRole && customRole.CanLocalPlayerSeeRole(otherPlayerRole.Player))
-        {
-            __result = customRole.RoleColor;
-            return false;
-        }
-
         if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && otherPlayerRole.IsImpostor)
         {
             return true;

MiraAPI/Patches/Roles/RoleBehaviourPatches.cs

@@ -0,0 +1,25 @@
+using HarmonyLib;
+using MiraAPI.Roles;
+using UnityEngine;
+
+namespace MiraAPI.Patches.Roles;
+
+[HarmonyPatch(typeof(RoleBehaviour))]
+public static class RoleBehaviourPatches
+{
+    /// <summary>
+    /// Update TeamColor text for Launchpad roles
+    /// </summary>
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(RoleBehaviour.TeamColor), MethodType.Getter)]
+    public static bool PrefixTeamColorGetter(RoleBehaviour __instance, ref Color __result)
+    {
+        if (__instance is not ICustomRole behaviour)
+        {
+            return true;
+        }
+
+        __result = behaviour.RoleColor;
+        return false;
+    }
+}

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -1,7 +1,5 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 using System.Linq;
@@ -11,14 +9,6 @@ namespace MiraAPI.Patches.Roles;
 [HarmonyPatch(typeof(RoleManager))]
 public static class RoleManagerPatches
 {
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(RoleManager.SetRole))]
-    public static void SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
-    {
-        var @event = new SetRoleEvent(targetPlayer, roleType);
-        MiraEventManager.InvokeEvent(@event);
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(RoleManager.SelectRoles))]
     public static void ModifierSelectionPatches(RoleManager __instance)
@@ -47,12 +37,12 @@ public static class RoleManagerPatches
             return true;
         }
 
-        if (role.Configuration.GhostRole is RoleTypes.CrewmateGhost or RoleTypes.ImpostorGhost)
+        if (role.GhostRole is RoleTypes.CrewmateGhost or RoleTypes.ImpostorGhost)
         {
             return true;
         }
 
-        plr.RpcSetRole(role.Configuration.GhostRole);
+        plr.RpcSetRole(role.GhostRole);
         return false;
     }
 }

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -1,73 +1,55 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
 using MiraAPI.Roles;
-using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Roles;
 
-/// <summary>
-/// Patches to return the correct role counts.
-/// </summary>
 [HarmonyPatch(typeof(RoleOptionsCollectionV08))]
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
     /// Set the role chance for custom Launchpad roles based on config
     /// </summary>
-    /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleOptionsCollectionV08.GetChancePerGame))]
-    public static bool GetChancePrefix(RoleTypes role, ref int __result)
+    public static bool GetChancePrefix([HarmonyArgument(0)] RoleTypes roleType, ref int __result)
     {
-        if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)
+        if (!CustomRoleManager.GetCustomRoleBehaviour(roleType, out var customRole) || customRole == null)
         {
             return true;
         }
 
-        if (customRole.Configuration.HideSettings)
+        if (customRole.HideSettings)
         {
             __result = 0;
             return false;
         }
 
-        var chance = customRole.GetChance();
-        if (chance == null)
-        {
-            Logger<MiraApiPlugin>.Error($"Chance is null, defaulting to zero.");
-            chance = 0;
-        }
-
-        __result = chance.Value;
+        customRole.ParentMod.PluginConfig.TryGetEntry<int>(customRole.ChanceConfigDefinition, out var entry);
+        __result = entry.Value;
         return false;
     }
 
     /// <summary>
     /// Set the amount for custom Launchpad roles based on config
     /// </summary>
-    /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleOptionsCollectionV08.GetNumPerGame))]
-    public static bool GetNumPrefix(RoleTypes role, ref int __result)
+    public static bool GetNumPrefix([HarmonyArgument(0)] RoleTypes roleType, ref int __result)
     {
-        if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)
+        if (!CustomRoleManager.GetCustomRoleBehaviour(roleType, out var customRole) || customRole == null)
         {
             return true;
         }
 
-        if (customRole.Configuration.HideSettings)
+        if (customRole.HideSettings)
         {
             __result = 0;
             return false;
         }
 
-        var count = customRole.GetCount();
-        if (count == null)
-        {
-            Logger<MiraApiPlugin>.Error($"Count is null, defaulting to zero.");
-            count = 0;
-        }
-
-        __result = count.Value;
+        customRole.ParentMod.PluginConfig.TryGetEntry<int>(customRole.NumConfigDefinition, out var entry);
+        __result = entry.Value;
         return false;
     }
 }

MiraAPI/Patches/Roles/SabotageButtonPatch.cs

@@ -1,62 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Roles;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(SabotageButton))]
-public class SabotageButtonPatch
-{
-    /// <summary>
-    /// Patches the Sabotage button to check if the player's custom role can use sabotage.
-    /// </summary>
-    [HarmonyPatch(nameof(SabotageButton.DoClick))]
-    [HarmonyPrefix]
-    public static bool DoClickPrefix(SabotageButton __instance)
-    {
-        var player = PlayerControl.LocalPlayer;
-
-        if (player.Data.Role is not ICustomRole customRole)
-        {
-            return true;
-        }
-
-        if (!customRole.Configuration.CanUseSabotage || PlayerControl.LocalPlayer.inVent || !GameManager.Instance.SabotagesEnabled())
-        {
-            return false;
-        }
-
-        HudManager.Instance.ToggleMapVisible(
-            new MapOptions
-            {
-                Mode = MapOptions.Modes.Sabotage,
-            });
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(SabotageButton.Refresh))]
-    public static bool RefreshPrefix(SabotageButton __instance)
-    {
-        var player = PlayerControl.LocalPlayer;
-        if (GameManager.Instance == null || player == null)
-        {
-            __instance.ToggleVisible(false);
-            __instance.SetDisabled();
-            return false;
-        }
-
-        if (player.Data.Role is not ICustomRole customRole)
-        {
-            return true;
-        }
-
-        if (player.inVent || !GameManager.Instance.SabotagesEnabled() || player.petting)
-        {
-            __instance.ToggleVisible(customRole.Configuration.CanUseSabotage && GameManager.Instance.SabotagesEnabled());
-            __instance.SetDisabled();
-            return false;
-        }
-        __instance.SetEnabled();
-        return false;
-    }
-}

MiraAPI/Patches/Roles/TaskAdderPatch.cs

@@ -1,7 +1,7 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
-using System;
-using System.Collections.Generic;
+using Il2CppSystem;
+using Il2CppSystem.Collections.Generic;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities.Assets;
@@ -12,13 +12,10 @@ using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Roles;
 
-/// <summary>
-/// Patch TaskAdder for organizing Roles and adding scroller.
-/// </summary>
 [HarmonyPatch]
 public static class TaskAdderPatch
 {
-    private static readonly Dictionary<string, string> ModsFolders = [];
+    private static readonly System.Collections.Generic.Dictionary<string, string> ModsFolders = [];
     private static Scroller? _scroller;
 
     [HarmonyPostfix]
@@ -170,14 +167,19 @@ public static class TaskAdderPatch
 
             ControllerManager.Instance.AddSelectableUiElement(taskFolder2.Button);
             if (!string.IsNullOrEmpty(__instance.restorePreviousSelectionByFolderName) &&
-                taskFolder2.FolderName.Equals(__instance.restorePreviousSelectionByFolderName, StringComparison.Ordinal))
+                taskFolder2.FolderName.Equals(__instance.restorePreviousSelectionByFolderName, System.StringComparison.Ordinal))
             {
                 __instance.restorePreviousSelectionFound = taskFolder2.Button;
             }
         }
 
         var flag = false;
-        var list = taskFolder.Children.ToArray().OrderBy(t => t.TaskType).ToList();
+        var list = new List<PlayerTask>();
+
+        foreach (var item in taskFolder.Children)
+        {
+            list.Add(item);
+        }
 
         for (var l = 0; l < list.Count; l++)
         {
@@ -188,24 +190,26 @@ public static class TaskAdderPatch
                 case TaskTypes.DivertPower:
                 {
                     var targetSystem = taskAddButton.MyTask.Cast<DivertPowerTask>().TargetSystem;
-                    taskAddButton.Text.text = TranslationController.Instance.GetString(
+                    taskAddButton.Text.text = DestroyableSingleton<TranslationController>.Instance.GetString(
                         StringNames.DivertPowerTo,
-                        TranslationController.Instance.GetString(targetSystem));
+                        DestroyableSingleton<TranslationController>.Instance.GetString(targetSystem));
                     break;
                 }
                 case TaskTypes.FixWeatherNode:
                 {
-                    var nodeId = taskAddButton.MyTask.Cast<WeatherNodeTask>().NodeId;
+                    var nodeId = ((WeatherNodeTask)taskAddButton.MyTask).NodeId;
                     taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(
-                            StringNames.FixWeatherNode) + " " +
-                        TranslationController.Instance.GetString(
-                            WeatherSwitchGame.ControlNames[nodeId]);
+                        DestroyableSingleton<TranslationController>.Instance.GetString(
+                            StringNames.FixWeatherNode,
+                            Array.Empty<Il2CppSystem.Object>()) + " " +
+                        DestroyableSingleton<TranslationController>.Instance.GetString(
+                            WeatherSwitchGame.ControlNames[nodeId],
+                            Array.Empty<Il2CppSystem.Object>());
                     break;
                 }
                 default:
                     taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(taskAddButton.MyTask.TaskType);
+                        DestroyableSingleton<TranslationController>.Instance.GetString(taskAddButton.MyTask.TaskType);
                     break;
             }
 
@@ -234,9 +238,9 @@ public static class TaskAdderPatch
 
         if (taskFolder.FolderName == "Roles")
         {
-            for (var m = 0; m < RoleManager.Instance.AllRoles.Length; m++)
+            for (var m = 0; m < DestroyableSingleton<RoleManager>.Instance.AllRoles.Length; m++)
             {
-                var roleBehaviour = RoleManager.Instance.AllRoles[m];
+                var roleBehaviour = DestroyableSingleton<RoleManager>.Instance.AllRoles[m];
                 if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
                     CustomRoleManager.CustomRoles.ContainsKey((ushort)roleBehaviour.Role))
                 {
@@ -271,7 +275,7 @@ public static class TaskAdderPatch
 
         if (ModsFolders.TryGetValue(taskFolder.FolderName, out var guid))
         {
-            var plugin = MiraPluginManager.GetPluginByGuid(guid);
+            var plugin = MiraPluginManager.Instance.GetPluginByGuid(guid);
             for (var m = 0; m < plugin.CustomRoles.Count; m++)
             {
                 var roleBehaviour = plugin.CustomRoles.ElementAt(m).Value;

MiraAPI/Patches/Roles/VentOutlinePatch.cs

@@ -6,17 +6,12 @@ using UnityEngine;
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Vent patches for Roles.
+/// Set vent outline color based on the player's role.
 /// </summary>
-[HarmonyPatch(typeof(Vent))]
-public static class VentPatches
+[HarmonyPatch(typeof(Vent), nameof(Vent.SetOutline))]
+public static class VentOutlinePatch
 {
-    /// <summary>
-    /// Set outline to player's custom role color.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(Vent.SetOutline))]
-    public static void SetOutlinePostfix(Vent __instance, bool on, bool mainTarget)
+    public static void Postfix(Vent __instance, bool on, bool mainTarget)
     {
         if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole customRole)
         {

MiraAPI/Patches/Stubs/MinigameStubs.cs

@@ -1,24 +0,0 @@
-using System.Runtime.CompilerServices;
-using HarmonyLib;
-
-namespace MiraAPI.Patches.Stubs;
-
-/// <summary>
-/// Reverse patches for Minigames.
-/// </summary>
-[HarmonyPatch]
-public static class MinigameStubs
-{
-    /// <summary>
-    /// Reverse patch for Minigame.Begin.
-    /// </summary>
-    /// <param name="instance">The Minigame instance.</param>
-    /// <param name="task">Associated PlayerTask.</param>
-    [HarmonyReversePatch]
-    [HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static void Begin(Minigame instance, PlayerTask? task)
-    {
-        // nothing needed
-    }
-}

MiraAPI/Patches/VentPatches.cs

@@ -1,65 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Usables;
-using MiraAPI.Roles;
-using MiraAPI.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Patches;
-
-/// <summary>
-/// Vent patches to make sure the player is able to use the vent.
-/// </summary>
-[HarmonyPatch(typeof(Vent))]
-public static class VentPatches
-{
-    /// <summary>
-    /// CanUse patch.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(Vent.CanUse))]
-    public static void VentCanUsePostfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
-    {
-        var @event = new PlayerCanUseEvent(__instance.Cast<IUsable>());
-        MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled)
-        {
-            canUse = couldUse = false;
-            return;
-        }
-
-        var @object = pc.Object;
-        var role = @object.Data.Role;
-
-        var canVent = role is ICustomRole customRole ? customRole.Configuration.CanUseVent : role.CanVent;
-        couldUse = canVent;
-
-        var modifiers = @object.GetModifierComponent()?.ActiveModifiers;
-        if (modifiers is { Count: > 0 })
-        {
-            switch (canVent)
-            {
-                case true when modifiers.Exists(x => x.CanVent().HasValue && x.CanVent() == false):
-                    couldUse = canUse = false;
-                    return;
-                case false when modifiers.Exists(x => x.CanVent().HasValue && x.CanVent() == true):
-                    couldUse = true;
-                    break;
-            }
-        }
-
-        var num = float.MaxValue;
-
-        canUse = couldUse;
-        if (canUse)
-        {
-            var center = @object.Collider.bounds.center;
-            var position = __instance.transform.position;
-            num = Vector2.Distance(center, position);
-            canUse &= num <= __instance.UsableDistance && !PhysicsHelpers.AnythingBetween(@object.Collider, center, position, Constants.ShipOnlyMask, false);
-        }
-
-        __result = num;
-    }
-}

MiraAPI/PluginLoading/MiraIgnoreAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.PluginLoading;
-
-/// <summary>
-/// Skip an element during plugin loading.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, Inherited = false)]
-public class MiraIgnoreAttribute : Attribute;