Merge branch 'dev' into commission

# Conflicts:
#	MiraAPI/PluginLoading/MiraPluginManager.cs

Directory.Build.props

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

MiraAPI.Example.Extension/Buttons/NeutralKillerButton.cs

@@ -1,19 +1,20 @@
-using MiraAPI.Example.GameOver;
-using MiraAPI.Example.Roles;
+using MiraAPI.Example.Extension.GameOver;
+using MiraAPI.Example.Extension.Roles;
 using MiraAPI.GameEnd;
 using MiraAPI.Hud;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 
-namespace MiraAPI.Example.Buttons;
+namespace MiraAPI.Example.Extension.Buttons;
 
 public class NeutralKillerButton : CustomActionButton
 {
     public override string Name => "Win Game";
+
     public override float Cooldown => 0f;
+
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.K;
+
     protected override void OnClick()
     {
         CustomGameOver.Trigger<NeutralKillerGameOver>([PlayerControl.LocalPlayer.Data]);

MiraAPI.Example.Extension/ExampleExtensionPlugin.cs

@@ -0,0 +1,31 @@
+using System;
+using BepInEx;
+using BepInEx.Unity.IL2CPP;
+using HarmonyLib;
+using MiraAPI.PluginLoading;
+using Reactor;
+using Reactor.Networking;
+using Reactor.Networking.Attributes;
+
+namespace MiraAPI.Example.Extension;
+
+[BepInAutoPlugin("mira.example.extension", "MiraExampleExtensionMod")]
+[BepInProcess("Among Us.exe")]
+[BepInDependency(ReactorPlugin.Id)]
+[BepInDependency(MiraApiPlugin.Id)]
+[BepInDependency(ExamplePlugin.Id)]
+[ReactorModFlags(ModFlags.RequireOnAllClients)]
+public partial class ExampleExtensionPlugin : BasePlugin, IMiraExtension
+{
+    public Harmony Harmony { get; } = new(Id);
+
+    public override void Load()
+    {
+        Harmony.PatchAll();
+    }
+
+    public Type GetBasePluginType()
+    {
+        return typeof(ExamplePlugin);
+    }
+}

MiraAPI.Example.Extension/GameOver/NeutralKillerGameOver.cs

@@ -1,9 +1,9 @@
-using MiraAPI.Example.Roles;
+using MiraAPI.Example.Extension.Roles;
 using MiraAPI.GameEnd;
 using MiraAPI.Utilities;
 using UnityEngine;
 
-namespace MiraAPI.Example.GameOver;
+namespace MiraAPI.Example.Extension.GameOver;
 
 public class NeutralKillerGameOver : CustomGameOver
 {

MiraAPI.Example.Extension/MiraAPI.Example.Extension.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <Version>1.0.0</Version>
+        <Description>Example extension for Mira API</Description>
+        <Authors>Angxl, XtraCube</Authors>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\MiraAPI\MiraAPI.csproj" />
+        <ProjectReference Include="..\MiraAPI.Example\MiraAPI.Example.csproj" />
+    </ItemGroup>
+
+    <Import Project="..\AmongUs.props" />
+</Project>

MiraAPI.Example.Extension/Modifiers/ExtensionModifier.cs

@@ -0,0 +1,16 @@
+using MiraAPI.Example.Extension.Options;
+using MiraAPI.GameOptions;
+using MiraAPI.Modifiers.Types;
+
+namespace MiraAPI.Example.Extension.Modifiers;
+
+public class ExtensionModifier : GameModifier
+{
+    public override string ModifierName => "Extension Modifier";
+
+    public override string GetDescription() => "This is from the extension mod!";
+
+    public override int GetAssignmentChance() => (int)OptionGroupSingleton<ExtensionModifierOptions>.Instance.ModifierChance;
+
+    public override int GetAmountPerGame() => (int)OptionGroupSingleton<ExtensionModifierOptions>.Instance.ModifierLimit;
+}

MiraAPI.Example.Extension/Options/ExtendedFreezerOptions.cs

@@ -0,0 +1,13 @@
+using MiraAPI.Example.Roles;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+
+namespace MiraAPI.Example.Extension.Options;
+
+public class ExtendedFreezerOptions : AbstractOptionGroup<FreezerRole>
+{
+    public override string GroupName => "Extended Freezer Role Options";
+
+    [ModdedNumberOption("Freeze Uses", 1, 5)]
+    public float FreezeUses { get; set; } = 1;
+}

MiraAPI.Example.Extension/Options/ExtensionModifierOptions.cs

@@ -0,0 +1,17 @@
+using MiraAPI.Example.Extension.Modifiers;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+using MiraAPI.Utilities;
+
+namespace MiraAPI.Example.Extension.Options;
+
+public class ExtensionModifierOptions : AbstractOptionGroup<ExtensionModifier>
+{
+    public override string GroupName => "Extension Modifier Options";
+
+    [ModdedNumberOption("Modifier Chance", 0, 100, 10, MiraNumberSuffixes.Percent)]
+    public float ModifierChance { get; set; } = 100f;
+
+    [ModdedNumberOption("Modifier Limit", 0, 10)]
+    public float ModifierLimit { get; set; } = 0;
+}

MiraAPI.Example.Extension/Patches/FreezeButtonPatch.cs

@@ -0,0 +1,15 @@
+using HarmonyLib;
+using MiraAPI.Example.Buttons.Freezer;
+using MiraAPI.Example.Extension.Options;
+using MiraAPI.GameOptions;
+
+namespace MiraAPI.Example.Extension.Patches;
+
+[HarmonyPatch(typeof(FreezeButton), nameof(FreezeButton.MaxUses), MethodType.Getter)]
+public static class FreezeButtonPatch
+{
+    public static void Postfix(ref int __result)
+    {
+        __result = (int)OptionGroupSingleton<ExtendedFreezerOptions>.Instance.FreezeUses;
+    }
+}

MiraAPI.Example.Extension/Roles/NeutralKillerRole.cs

@@ -1,16 +1,20 @@
-using MiraAPI.Example.GameOver;
+using MiraAPI.Example.Extension.GameOver;
 using MiraAPI.GameEnd;
 using MiraAPI.Roles;
 using UnityEngine;
 
-namespace MiraAPI.Example.Roles;
+namespace MiraAPI.Example.Extension.Roles;
 
 public class NeutralKillerRole : ImpostorRole, ICustomRole
 {
     public string RoleName => "Outcast Killer";
+
     public string RoleDescription => "Outcast who can kill.";
-    public string RoleLongDescription => RoleDescription;
+
+    public string RoleLongDescription => this.RoleDescription;
+
     public Color RoleColor => Color.magenta;
+
     public ModdedRoleTeams Team => ModdedRoleTeams.Custom;
 
     public CustomRoleConfiguration Configuration => new(this)

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -6,7 +6,6 @@ using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Freezer;
@@ -17,11 +16,9 @@ public class FreezeButton : CustomActionButton<PlayerControl>
 
     public override float Cooldown => OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeDuration;
 
-    public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
+    public override int MaxUses => 1;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.T;
-    public override ModifierKey Modifier1 => ModifierKey.Control;
 
     protected override void OnClick()
     {

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -2,7 +2,6 @@
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
@@ -16,9 +15,6 @@ public class MeetingButton : CustomActionButton
     public override int MaxUses => 3;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.P;
-    public override ModifierKey Modifier1 => ModifierKey.Control;
-    public override ModifierKey Modifier2 => ModifierKey.Shift;
 
     public override bool Enabled(RoleBehaviour? role)
     {

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -5,7 +5,6 @@ using MiraAPI.GameOptions;
 using MiraAPI.Hud;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
-using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
@@ -22,7 +21,7 @@ public class TeleportButton : CustomActionButton
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
     public override Color TextOutlineColor => new Color32(221, 176, 152, 255);
     public static bool IsZoom { get; private set; }
-    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.M;
+
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is TeleporterRole;

MiraAPI.Example/ExampleEventHandlers.cs

@@ -51,7 +51,7 @@ public static class ExampleEventHandlers
     [RegisterEvent(15)]
     public static void HandleVoteEvent(HandleVoteEvent @event)
     {
-        if (@event.VoteData.Owner.Data.Role is not NeutralKillerRole) return;
+        if (@event.VoteData.Owner.Data.Role is not FreezerRole) return;
 
         @event.VoteData.SetRemainingVotes(0);
 

MiraAPI.Example/Options/Roles/FreezerRoleSettings.cs

@@ -11,7 +11,4 @@ public class FreezerRoleSettings : AbstractOptionGroup<FreezerRole>
 
     [ModdedNumberOption("Freeze Duration", 1, 15, 1, MiraNumberSuffixes.Seconds)]
     public float FreezeDuration { get; set; } = 5;
-
-    [ModdedNumberOption("Freeze Uses", 1, 5)]
-    public float FreezeUses { get; set; } = 1;
 }

MiraAPI.sln

@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiraAPI", "MiraAPI\MiraAPI.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiraAPI.Example", "MiraAPI.Example\MiraAPI.Example.csproj", "{19B76855-16CC-43CC-A0A6-5A7FFB43F077}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiraAPI.Example.Extension", "MiraAPI.Example.Extension\MiraAPI.Example.Extension.csproj", "{526FF017-80E1-4094-804D-741AF35AA226}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{19B76855-16CC-43CC-A0A6-5A7FFB43F077}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19B76855-16CC-43CC-A0A6-5A7FFB43F077}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19B76855-16CC-43CC-A0A6-5A7FFB43F077}.Release|Any CPU.Build.0 = Release|Any CPU
+		{526FF017-80E1-4094-804D-741AF35AA226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{526FF017-80E1-4094-804D-741AF35AA226}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{526FF017-80E1-4094-804D-741AF35AA226}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{526FF017-80E1-4094-804D-741AF35AA226}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MiraAPI/Events/Vanilla/Gameplay/BeforeRoundStartEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Event invoked on IntroCutscene.OnDestroy and ExileController.WrapUp to determine if it should run the round event or not.
-/// </summary>
-public class BeforeRoundStartEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets a value indicating whether the event was triggered by the IntroCutscene or ExileController.
-    /// </summary>
-    public bool TriggeredByIntro { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BeforeRoundStartEvent"/> class.
-    /// </summary>
-    /// <param name="triggeredByIntro">Whether the event was triggered by the intro or not.</param>
-    public BeforeRoundStartEvent(bool triggeredByIntro)
-    {
-        TriggeredByIntro = triggeredByIntro;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/RoundStartEvent.cs

@@ -1,7 +1,7 @@
 namespace MiraAPI.Events.Vanilla.Gameplay;
 
 /// <summary>
-/// Start Round event, invoked on IntroCutscene.OnDestroy and ExileController.WrapUp if the event isn't cancelled.
+/// Start Round event, invoked on IntroCutscene.OnDestroy and ExileController.WrapUp.
 /// </summary>
 public class RoundStartEvent : MiraEvent
 {

MiraAPI/Events/Vanilla/Meeting/Voting/DummyVoteEvent.cs

@@ -1,44 +0,0 @@
-using System;
-using MiraAPI.Utilities;
-using MiraAPI.Voting;
-
-namespace MiraAPI.Events.Vanilla.Meeting.Voting;
-
-/// <summary>
-/// Invoked before the dummy selects their vote. If canceled, the dummy won't vote.
-/// </summary>
-public class DummyVoteEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the dummy that needs to vote.
-    /// </summary>
-    public DummyBehaviour Dummy { get; }
-
-    /// <summary>
-    /// Gets the instance of the dummy's vote data.
-    /// </summary>
-    public PlayerVoteData VoteData { get; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the dummy can vote to skip the meeting.
-    /// </summary>
-    public bool CanSkip { get; set; }
-
-    /// <summary>
-    /// Gets or sets a predicate for validating whether the dummy can vote on a player.
-    /// By default, excludes dead and disconnected players.
-    /// </summary>
-    public Predicate<PlayerControl> PlayerIsValid { get; set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DummyVoteEvent"/> class.
-    /// </summary>
-    /// <param name="dummy">The voting dummy.</param>
-    public DummyVoteEvent(DummyBehaviour dummy)
-    {
-        Dummy = dummy;
-        VoteData = dummy.myPlayer.GetVoteData();
-        CanSkip = true;
-        PlayerIsValid = x => !x.Data.IsDead && !x.Data.Disconnected;
-    }
-}

MiraAPI/Hud/CustomActionButton.cs

@@ -5,7 +5,6 @@ using MiraAPI.Events.Mira;
 using MiraAPI.Patches;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -53,28 +52,6 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual int MaxUses => 0;
 
-    /// <summary>
-    /// Gets or sets the current key binding for this button.
-    /// </summary>
-    public abstract KeyboardKeyCode Defaultkeybind { get; }
-
-    /// <summary>
-    /// The first optional modifier key (e.g., Control, Shift, Alt) that must be held with the main key to activate the button.
-    /// </summary>
-    public virtual ModifierKey Modifier1 => ModifierKey.None;
-
-    /// <summary>
-    /// The second optional modifier key.
-    /// Set to <see cref="ModifierKey.None"/> if unused.
-    /// </summary>
-    public virtual ModifierKey Modifier2 => ModifierKey.None;
-
-    /// <summary>
-    /// The third optional modifier key.
-    /// Set to <see cref="ModifierKey.None"/> if unused.
-    /// </summary>
-    public virtual ModifierKey Modifier3 => ModifierKey.None;
-
     /// <summary>
     /// Gets the button's text outline color.
     /// </summary>

MiraAPI/Keybinds/KeybindManager.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Rewired;
-
-namespace MiraAPI.Keybinds
-{
-    /// <summary>
-    /// Lets you register and manage mod keybinds with conflict checks and rebinding support.
-    /// </summary>
-    public static class KeybindManager
-    {
-        /// <summary>
-        /// Stores all info for a registered keybind.
-        /// </summary>
-        public class KeybindEntry
-        {
-            /// <summary>Unique identifier for this keybind.</summary>
-            public string Id;
-
-            /// <summary>Text shown in the Among Us rebinding menu to describe this keybind.</summary>
-            public string Description;
-
-            /// <summary>
-            /// The method that runs when this keybind is pressed.
-            /// </summary>
-            public Action Handler;
-
-            /// <summary>
-            /// The key currently assigned to this keybind.
-            /// </summary>
-            public KeyboardKeyCode Key;
-
-            /// <summary>
-            /// If true, this keybind will be checked for conflicts with other exclusive keybinds using the same key.
-            /// </summary>
-            public bool Exclusive;
-
-            /// <summary>
-            /// The first optional modifier key (e.g., Control, Shift, Alt) that must be held with the main key.
-            /// </summary>
-            public ModifierKey Modifier1 = ModifierKey.None;
-
-            /// <summary>
-            /// The second optional modifier key, if needed. Set to <c>ModifierKey.None</c> if unused.
-            /// </summary>
-            public ModifierKey Modifier2 = ModifierKey.None;
-
-            /// <summary>
-            /// The third optional modifier key, if needed. Set to <c>ModifierKey.None</c> if unused.
-            /// </summary>
-            public ModifierKey Modifier3 = ModifierKey.None;
-        }
-
-        private static readonly List<KeybindEntry> Registered = new();
-
-        /// <summary>
-        /// Registers a new mod keybind.
-        /// </summary>
-        /// <param name="id">Unique identifier for the keybind.</param>
-        /// <param name="description">Description to display in UI.</param>
-        /// <param name="key">Default key to use if no rebind exists.</param>
-        /// <param name="handler">Method to invoke when the keybind is pressed.</param>
-        /// <param name="exclusive">If true, conflicts with other exclusive keybinds on the same key.</param>
-        /// <param name="modifier1">Optional first modifier key (e.g., <c>Control</c>, <c>Shift</c>, <c>Alt</c>) that must be held with the main key.</param>
-        /// <param name="modifier2">Optional second modifier key. Use <c>ModifierKey.None</c> if unused.</param>
-        /// <param name="modifier3">Optional third modifier key. Use <c>ModifierKey.None</c> if unused.</param>
-        /// <returns> Returns the key that was registered for this keybind. </returns>
-        public static KeyboardKeyCode Register(string id, string description, KeyboardKeyCode key, Action handler, bool exclusive = true, ModifierKey modifier1 = ModifierKey.None, ModifierKey modifier2 = ModifierKey.None, ModifierKey modifier3 = ModifierKey.None)
-        {
-            Registered.Add(new KeybindEntry
-            {
-                Id = id,
-                Description = description,
-                Key = key,
-                Handler = handler,
-                Exclusive = exclusive,
-                Modifier1 = modifier1,
-                Modifier2 = modifier2,
-                Modifier3 = modifier3,
-            });
-
-            return key;
-        }
-
-        /// <summary>
-        /// Returns all conflicts where exclusive keybinds use the same key.
-        /// </summary>
-        /// <returns>A list of pairs of keybinds that conflict.</returns>
-        public static List<(KeybindEntry, KeybindEntry)> GetConflicts()
-        {
-            var conflicts = new List<(KeybindEntry, KeybindEntry)>();
-            for (int i = 0; i < Registered.Count; i++)
-            {
-                for (int j = i + 1; j < Registered.Count; j++)
-                {
-                    var a = Registered[i];
-                    var b = Registered[j];
-                    if (a.Key == b.Key && a.Exclusive && b.Exclusive)
-                    {
-                        conflicts.Add((a, b));
-                    }
-                }
-            }
-            return conflicts;
-        }
-
-        /// <summary>
-        /// Returns all currently registered keybind entries.
-        /// </summary>
-        /// <returns>A list of all registered keybind entries.</returns>
-        public static List<KeybindEntry> GetEntries()
-        {
-            return Registered;
-        }
-    }
-}

MiraAPI/MiraApiConfig.cs

@@ -1,23 +0,0 @@
-using BepInEx;
-using BepInEx.Configuration;
-using BepInEx.Unity.IL2CPP;
-using HarmonyLib;
-using MiraAPI.PluginLoading;
-using Reactor;
-using Reactor.Networking;
-using Reactor.Networking.Attributes;
-using Reactor.Utilities;
-using UnityEngine;
-
-namespace MiraAPI;
-
-/// <summary>
-/// Mira API Config File Handler
-/// </summary>
-public class MiraApiConfig(ConfigFile config)
-{
-    /// <summary>
-    /// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
-    /// </summary>
-    public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Displays", "Show Modifiers HUD on Left Side", false);
-}

MiraAPI/MiraApiPlugin.cs

@@ -30,10 +30,6 @@ public partial class MiraApiPlugin : BasePlugin
     /// </summary>
     public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
 
-    /// <summary>
-    /// Gets the Mira Api Config Handler.
-    /// </summary>
-    public MiraApiConfig? MiraConfig { get; private set; }
     private static MiraPluginManager? PluginManager { get; set; }
     internal Harmony Harmony { get; } = new(Id);
 
@@ -44,7 +40,6 @@ public partial class MiraApiPlugin : BasePlugin
 
         ReactorCredits.Register("Mira API", Version, true, ReactorCredits.AlwaysShow);
 
-        MiraConfig = new MiraApiConfig(Config);
         PluginManager = new MiraPluginManager();
         PluginManager.Initialize();
     }

MiraAPI/Modifiers/BaseModifier.cs

@@ -64,11 +64,6 @@ public abstract class BaseModifier : IOptionable
     /// </summary>
     public virtual bool ShowInFreeplay => false;
 
-    /// <summary>
-    /// Gets a value indicating the color that should be used for the modifier within freeplay.
-    /// </summary>
-    public virtual Color FreeplayFileColor => Color.gray;
-
     /// <summary>
     /// Gets a value indicating whether the modifier is unique. If true, the player can only have one instance of this modifier.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Patches.Roles;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
 using UnityEngine;
@@ -127,18 +126,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
         {
-            var taskPanelOpen = HudManager.Instance.TaskPanel.open;
-            var roleTabOpen = HudManagerPatches.RoleTab != null && HudManagerPatches.RoleTab.open;
-            var leftSideHud = PluginSingleton<MiraApiPlugin>.Instance.MiraConfig!.ModifiersHudLeftSide.Value;
-
-            if (leftSideHud && (taskPanelOpen || roleTabOpen))
-            {
-                ModifierDisplay!.gameObject.SetActive(false);
-            }
-            else
-            {
-                ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
-            }
+            ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
         }
     }
 

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Patches.Roles;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
 using TMPro;
@@ -97,16 +94,6 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 
         IsOpen = false;
         _children.gameObject.SetActive(false);
-
-        if (PluginSingleton<MiraApiPlugin>.Instance.MiraConfig!.ModifiersHudLeftSide.Value)
-        {
-            var aspect = GetComponent<AspectPosition>();
-            _toggleButton.transform.localPosition = new Vector3(-1f, 2.7f, 0f);
-            _children.transform.localPosition = new Vector3(-0.2f, -0.05f, 0f);
-            aspect.Alignment = AspectPosition.EdgeAlignments.LeftTop;
-            aspect.DistanceFromEdge = new Vector3(1.8f, 2.55f, -20f);
-            aspect.AdjustPosition();
-        }
     }
 
     /// <summary>
@@ -122,16 +109,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
     /// </summary>
     public void ToggleTab()
     {
-        SetOpened(!IsOpen);
-    }
-
-    /// <summary>
-    /// Use this to set the visibility of the modifiers tab.
-    /// </summary>
-    /// <param name="val">Whether it should be visible or not.</param>
-    public void SetOpened(bool val)
-    {
-        IsOpen = val;
+        IsOpen = !IsOpen;
         _children.gameObject.SetActive(IsOpen);
         RefreshModifiers();
     }
@@ -140,6 +118,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
     {
         _modifiers.Remove(component.Modifier!);
         component.gameObject.DestroyImmediate();
+
         RefreshModifiers();
     }
 
@@ -215,7 +194,13 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 
         _toggleBtnText.text = $"Modifiers ({filteredModifiers.Count})";
 
-        _toggleButton.gameObject.SetActive(filteredModifiers.Count != 0);
+        if (filteredModifiers.Count == 0)
+        {
+            _toggleButton.gameObject.SetActive(false);
+            return;
+        }
+
+        _toggleButton.gameObject.SetActive(true);
 
         foreach (var mod in modifiersToAdd)
         {

MiraAPI/Modifiers/ModifierManager.cs

@@ -5,7 +5,6 @@ using System.Runtime.Serialization;
 using MiraAPI.Modifiers.Types;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
-using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using Random = System.Random;
@@ -126,7 +125,6 @@ public static class ModifierManager
             .Select(x => Activator.CreateInstance(x.Value) as GameModifier)
             .OfType<GameModifier>()
             .Where(x => x.GetAmountPerGame() > 0 && x.GetAssignmentChance() > 0)
-            .Shuffle()
             .OrderByDescending(x => x.Priority())
             .ToArray();
 

MiraAPI/Patches/ChatControllerPatch.cs

@@ -3,12 +3,10 @@ using UnityEngine;
 
 namespace MiraAPI.Patches;
 
-#pragma warning disable SA1629
 /// <summary>
 /// Allows players to paste text into chat.
 /// Source: https://github.com/CallOfCreator/NewMod/blob/main/NewMod/Patches/ClipboardPatch.cs
 /// </summary>
-#pragma warning restore SA1629
 [HarmonyPatch(typeof(ChatController), nameof(ChatController.Update))]
 public static class ChatControllerPatch
 {

MiraAPI/Patches/Events/CanUsePatches.cs

@@ -12,16 +12,14 @@ public static class CanUsePatches
     public static IEnumerable<MethodBase> TargetMethods()
     {
         yield return AccessTools.Method(typeof(Console), nameof(Console.CanUse));
-        yield return AccessTools.Method(typeof(DeconControl), nameof(DeconControl.CanUse));
-        yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.CanUse));
-        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.CanUse));
         yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.CanUse));
-        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.CanUse));
-        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.CanUse));
-        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.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));
-        // vent is not necessary as it has its own patch
     }
 
     [HarmonyPriority(Priority.Last)]

MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs

@@ -1,17 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch(typeof(TutorialManager._RunTutorial_d__3), nameof(TutorialManager._RunTutorial_d__3.MoveNext))]
-public static class FreeplayRoundStartPatch
-{
-    public static void Postfix(TutorialManager._RunTutorial_d__3 __instance, ref bool __result)
-    {
-        if (!__result)
-        {
-            MiraEventManager.InvokeEvent(new RoundStartEvent(true));
-        }
-    }
-}

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -9,12 +9,7 @@ internal static class SpawnInMinigamePatch
 {
     public static void Postfix()
     {
-        var @event = new BeforeRoundStartEvent(false);
+        var @event = new RoundStartEvent(false);
         MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
-
-        var @event2 = new RoundStartEvent(false);
-        MiraEventManager.InvokeEvent(@event2);
     }
 }

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -25,12 +25,7 @@ internal static class SubmergedSpawnGamePatch
 
     public static void Postfix()
     {
-        var @event = new BeforeRoundStartEvent(false);
+        var @event = new RoundStartEvent(false);
         MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
-
-        var @event2 = new RoundStartEvent(false);
-        MiraEventManager.InvokeEvent(@event2);
     }
 }

MiraAPI/Patches/Freeplay/TaskAddButtonPatches.cs

@@ -22,4 +22,15 @@ internal static class TaskAddButtonPatches
 
         return true;
     }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(TaskAddButton.Role), MethodType.Setter)]
+    public static void RoleGetterPatch(TaskAddButton __instance)
+    {
+        if (__instance.role is ICustomRole { Team: ModdedRoleTeams.Custom } customRole)
+        {
+            __instance.FileImage.color = customRole.IntroConfiguration?.IntroTeamColor ?? Color.gray;
+        }
+        __instance.RolloverHandler.OutColor = __instance.FileImage.color;
+    }
 }

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -10,7 +10,6 @@ using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using TMPro;
 using UnityEngine;
-using UnityEngine.Events;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
@@ -20,6 +19,7 @@ namespace MiraAPI.Patches.Freeplay;
 internal static class TaskAdderPatches
 {
     private static Scroller _scroller = null!;
+
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
     public static void AddRolesFolder(TaskAdderGame __instance)
@@ -32,11 +32,6 @@ internal static class TaskAdderPatches
         _scroller.allowY = true;
         _scroller.Inner = inner.transform;
 
-        var scrollerHelper = __instance.TaskParent.gameObject.AddComponent<ManualScrollHelper>();
-        scrollerHelper.scroller = _scroller;
-        scrollerHelper.verticalAxis = RewiredConstsEnum.Action.TaskRVertical;
-        scrollerHelper.scrollSpeed = 10f;
-
         GameObject hitbox = new("Hitbox")
         {
             layer = 5,
@@ -300,7 +295,7 @@ internal static class TaskAdderPatches
 
         if (_scroller)
         {
-            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 4.5f, 1.65f);
+            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 5, 1.4f);
             _scroller.SetYBoundsMin(0.0f);
             _scroller.ScrollToTop();
         }
@@ -337,8 +332,7 @@ internal static class TaskAdderPatches
             taskAddButton.SafePositionWorld = instance.SafePositionWorld;
             taskAddButton.Text.text = modifier.ModifierName;
             taskAddButton.Text.EnableMasking();
-            taskAddButton.FileImage.color = modifier.FreeplayFileColor;
-            taskAddButton.RolloverHandler.OutColor = modifier.FreeplayFileColor;
+
             taskAddButton.Button.OnClick = new Button.ButtonClickedEvent();
             taskAddButton.Button.OnClick.AddListener((UnityEngine.Events.UnityAction)(() =>
             {
@@ -390,20 +384,6 @@ internal static class TaskAdderPatches
 
             instance.AddFileAsChildCustom(taskAddButton2, ref num, ref num2, ref num3);
             taskAddButton2.Role = roleBehaviour;
-            if (roleBehaviour is ICustomRole custom)
-            {
-                var customColor = custom.IntroConfiguration?.IntroTeamColor ?? Color.gray;
-                if (custom.Team is ModdedRoleTeams.Crewmate)
-                {
-                    customColor = Palette.CrewmateBlue;
-                }
-                else if (custom.Team is ModdedRoleTeams.Impostor)
-                {
-                    customColor = Palette.ImpostorRed;
-                }
-                taskAddButton2.FileImage.color = customColor;
-                taskAddButton2.RolloverHandler.OutColor = customColor;
-            }
             if (taskAddButton2.Button == null)
             {
                 continue;

MiraAPI/Patches/GameStartManagerPatch.cs

@@ -1,36 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Keybinds;
-using UnityEngine;
-
-namespace MiraAPI.Patches;
-
-/// <summary>
-/// Checks keybind conflicts in the lobby and disables secondary ones.
-/// </summary>
-[HarmonyPatch(typeof(GameStartManager))]
-public static class GameStartManagerPatch
-{
-    public static bool conflictShown = false;
-
-    [HarmonyPatch(nameof(GameStartManager.Start))]
-    [HarmonyPostfix]
-    public static void StartPostfix(GameStartManager __instance)
-    {
-        if (conflictShown) return;
-
-        var conflicts = KeybindManager.GetConflicts();
-        if (conflicts.Count == 0) return;
-
-        conflictShown = true;
-
-        var message = "The following keybinds are disabled due to conflicts:\n\n";
-
-        foreach (var (a, b) in conflicts)
-        {
-            message += $"• <color=#FF5555>{b.Description}</color> (conflicts with {a.Description})\n";
-            b.Handler = null;
-        }
-
-        HudManager.Instance.ShowPopUp(message.TrimEnd());
-    }
-}

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections;
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
-using Rewired;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -127,26 +123,4 @@ public static class HudManagerPatches
             }
         }
     }
-
-    [HarmonyPatch(nameof(HudManager.Update))]
-    [HarmonyPostfix]
-    public static void StartPostfix()
-    {
-        if (AmongUsClient.Instance.GameState != InnerNet.InnerNetClient.GameStates.Started) return;
-        if (PlayerControl.LocalPlayer.Data.IsDead) return;
-
-        foreach (var entry in KeybindManager.GetEntries())
-        {
-            var player = ReInput.players.GetPlayer(0);
-            var keyboard = player.controllers.Keyboard;
-
-            if (player.GetButtonDown(entry.Id) &&
-               (entry.Modifier1 == ModifierKey.None || keyboard.GetModifierKey(entry.Modifier1)) &&
-               (entry.Modifier2 == ModifierKey.None || keyboard.GetModifierKey(entry.Modifier2)) &&
-               (entry.Modifier3 == ModifierKey.None || keyboard.GetModifierKey(entry.Modifier3)))
-            {
-                entry.Handler?.Invoke();
-            }
-        }
-    }
 }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -61,11 +61,6 @@ public static class IntroCutscenePatches
     public static void GameBeginPatch(IntroCutscene __instance)
     {
         MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
-
-        var @event = new BeforeRoundStartEvent(true);
-        MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
         MiraEventManager.InvokeEvent(new RoundStartEvent(true));
     }
 }

MiraAPI/Patches/Keybinds/KeybindsPatch.cs

@@ -1,20 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Keybinds;
-using MiraAPI.Utilities;
-using Rewired;
-
-namespace MiraAPI.Patches.Keybinds
-{
-    [HarmonyPatch(typeof(InputManager_Base), nameof(InputManager_Base.Awake))]
-    public static class KeybindMenuPatch
-    {
-        [HarmonyPrefix]
-        private static void StartPrefix(InputManager_Base __instance)
-        {
-            foreach (var entry in KeybindManager.GetEntries())
-            {
-                __instance.userData.RegisterModBind(entry.Id, entry.Description, entry.Key, modifier1: entry.Modifier1, modifier2: entry.Modifier2, modifier3: entry.Modifier3);
-            }
-        }
-    }
-}

MiraAPI/Patches/Menu/HatsTabPatches.cs

@@ -84,7 +84,7 @@ public static class HatsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{sortedHats.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -73,7 +73,7 @@ public static class NameplatesTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{SortedNameplates.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;

MiraAPI/Patches/Menu/SkinsTabPatches.cs

@@ -76,7 +76,7 @@ public static class SkinsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{sortedSkins.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;

MiraAPI/Patches/Menu/VisorsTabPatches.cs

@@ -72,7 +72,7 @@ public static class VisorsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{SortedVisors.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -38,13 +38,8 @@ internal static class EjectionPatches
     {
         public static void Postfix()
         {
-            var @event = new BeforeRoundStartEvent(false);
+            var @event = new RoundStartEvent(false);
             MiraEventManager.InvokeEvent(@event);
-
-            if (@event.IsCancelled) return;
-
-            var @event2 = new RoundStartEvent(false);
-            MiraEventManager.InvokeEvent(@event2);
         }
     }
 }

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -12,7 +12,7 @@ namespace MiraAPI.Patches.Roles;
 public static class HudManagerPatches
 {
     // Custom role tab.
-    public static TaskPanelBehaviour? RoleTab;
+    private static TaskPanelBehaviour? _roleTab;
 
     /// <summary>
     /// Fixes Kill Button not showing for Neutral killing role.
@@ -38,9 +38,9 @@ public static class HudManagerPatches
             __instance.SabotageButton.gameObject.SetActive(isActive && customRole.Configuration.CanUseSabotage);
         }
 
-        if (RoleTab)
+        if (_roleTab)
         {
-            RoleTab?.gameObject.SetActive(isActive);
+            _roleTab?.gameObject.SetActive(isActive);
         }
     }
 
@@ -62,16 +62,16 @@ public static class HudManagerPatches
 
         if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
         {
-            if (RoleTab == null)
+            if (_roleTab == null)
             {
-                RoleTab = CustomRoleManager.CreateRoleTab(customRole);
+                _roleTab = CustomRoleManager.CreateRoleTab(customRole);
             }
 
-            CustomRoleManager.UpdateRoleTab(RoleTab, customRole);
+            CustomRoleManager.UpdateRoleTab(_roleTab, customRole);
         }
-        else if (RoleTab)
+        else if (_roleTab)
         {
-            RoleTab?.gameObject.Destroy();
+            _roleTab?.gameObject.Destroy();
         }
     }
 }

MiraAPI/Patches/ServerDropdownPatch.cs

@@ -1,7 +1,6 @@
 using HarmonyLib;
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.SceneManagement;
 
 namespace MiraAPI.Patches;
 
@@ -15,8 +14,6 @@ public static class ServerDropdownPatch
 
         foreach (var regionInfo in DestroyableSingleton<ServerManager>.Instance.AvailableRegions)
         {
-            var findingGame = SceneManager.GetActiveScene().name is "FindAGame";
-
             if (DestroyableSingleton<ServerManager>.Instance.CurrentRegion.Equals(regionInfo))
             {
                 __instance.defaultButtonSelected = __instance.firstOption;
@@ -30,10 +27,6 @@ public static class ServerDropdownPatch
                 var region = regionInfo;
                 var serverListButton = __instance.ButtonPool.Get<ServerListButton>();
                 var x = num % 2 == 0 ? -2 : 2;
-                if (findingGame)
-                {
-                    x += 2;
-                }
                 var y = -0.55f * (num / 2);
                 serverListButton.transform.localPosition = new Vector3(x, __instance.y_posButton + y, -1f);
                 serverListButton.transform.localScale = Vector3.one;
@@ -46,7 +39,7 @@ public static class ServerDropdownPatch
                 serverListButton.Button.OnClick.AddListener((UnityAction)(() => { __instance.ChooseOption(region); }));
                 __instance.controllerSelectable.Add(serverListButton.Button);
                 __instance.background.transform.localPosition = new Vector3(
-                    findingGame ? 2f : 0f,
+                    0f,
                     __instance.initialYPos + (-0.3f * (num / 2)),
                     0f);
                 __instance.background.size = new Vector2(__instance.background.size.x, 1.2f + (0.6f * (num / 2)));

MiraAPI/Patches/Voting/DummyBehaviourPatch.cs

@@ -1,79 +1,16 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Meeting.Voting;
+using HarmonyLib;
 using MiraAPI.Utilities;
-using MiraAPI.Voting;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
 
 namespace MiraAPI.Patches.Voting;
 
-[HarmonyPatch(typeof(DummyBehaviour))]
-internal static class DummyBehaviourPatches
+[HarmonyPatch(typeof(DummyBehaviour), nameof(DummyBehaviour.Update))]
+internal static class DummyBehaviourPatch
 {
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(DummyBehaviour.Update))]
-    public static bool DummyUpdatePatch(DummyBehaviour __instance)
+    public static void Postfix(DummyBehaviour __instance)
     {
-        NetworkedPlayerInfo data = __instance.myPlayer.Data;
-        if (data == null || data.IsDead) return false;
-
-        if (MeetingHud.Instance)
+        if (MeetingHud.Instance && __instance.myPlayer.GetVoteData())
         {
-            if (!__instance.voted)
-            {
-                __instance.StartCoroutine(CoDoVote(__instance).WrapToIl2Cpp());
-            }
+            __instance.voted = __instance.myPlayer.GetVoteData().VotesRemaining == 0;
         }
-        else
-        {
-            __instance.voted = false;
-        }
-
-        return false;
-    }
-
-    private static IEnumerator CoDoVote(DummyBehaviour dummy)
-    {
-        Logger<MiraApiPlugin>.Warning(dummy.voted);
-        dummy.voted = true;
-        yield return new WaitForSeconds(dummy.voteTime.Next());
-
-        var dummyVoteEvent = new DummyVoteEvent(dummy);
-        MiraEventManager.InvokeEvent(dummyVoteEvent);
-
-        if (dummyVoteEvent.IsCancelled)
-        {
-            dummy.voted = false;
-            yield break;
-        }
-
-        List<byte> potentialSuspects = new();
-        potentialSuspects.AddRange(PlayerControl.AllPlayerControls
-            .ToArray()
-            .Where(p => p != dummy.myPlayer)
-            .Where(p => dummyVoteEvent.PlayerIsValid(p))
-            .Select(p => p.PlayerId));
-
-        if (dummyVoteEvent.CanSkip)
-        {
-            potentialSuspects.Add(253);
-        }
-
-        if (CanVote(dummy))
-        {
-            VotingUtils.RpcCastVote(PlayerControl.LocalPlayer, dummy.myPlayer.PlayerId, potentialSuspects.Random());
-        }
-    }
-
-    private static bool CanVote(this DummyBehaviour dummy)
-    {
-        var dummyVoteData = dummy.myPlayer.GetVoteData();
-        return dummyVoteData.VotesRemaining > 0;
     }
 }

MiraAPI/PluginLoading/IMiraExtension.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace MiraAPI.PluginLoading;
+
+public interface IMiraExtension
+{
+    public Type GetBasePluginType();
+}

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -11,14 +11,12 @@ using MiraAPI.GameEnd;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
 using MiraAPI.Modifiers;
 using MiraAPI.Presets;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Networking;
 using Reactor.Utilities;
-using UnityEngine;
 
 namespace MiraAPI.PluginLoading;
 
@@ -39,108 +37,31 @@ public sealed class MiraPluginManager
         Instance = this;
         IL2CPPChainloader.Instance.PluginLoad += (pluginInfo, assembly, plugin) =>
         {
-            if (plugin is not IMiraPlugin miraPlugin)
+            if (plugin is IMiraPlugin miraPlugin)
             {
-                return;
+                var miraInfo = new MiraPluginInfo(miraPlugin, pluginInfo);
+                RegisterPlugin(miraInfo, assembly);
+                _registeredPlugins.Add(assembly, miraInfo);
             }
-
-            var info = new MiraPluginInfo(miraPlugin, pluginInfo);
-            var roles = new List<Type>();
-
-            var oldConfigSetting = info.PluginConfig.SaveOnConfigSet;
-            info.PluginConfig.SaveOnConfigSet = false;
-
-            foreach (var type in assembly.GetTypes())
+            else if (plugin is IMiraExtension miraExtension)
             {
-                if (type.GetCustomAttribute<MiraIgnoreAttribute>() != null)
+                var basePlugin = miraExtension.GetBasePluginType();
+                var basePluginInfo = _registeredPlugins.Values.FirstOrDefault(x => x.MiraPlugin.GetType() == basePlugin);
+                if (basePluginInfo == null)
                 {
-                    continue;
+                    Logger<MiraApiPlugin>.Error($"Base plugin {basePlugin.Name} not found for extension {pluginInfo.Metadata.GUID}.");
+                    return;
                 }
 
-                foreach (var method in type.GetMethods())
-                {
-                    var eventAttribute = method.GetCustomAttribute<RegisterEventAttribute>();
-                    if (eventAttribute == null)
-                    {
-                        continue;
-                    }
-
-                    if (!method.IsStatic)
-                    {
-                        Logger<MiraApiPlugin>.Error($"Event method {method.Name} in {type.Name} must be static.");
-                        continue;
-                    }
-
-                    var parameters = method.GetParameters();
-                    if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
-                    {
-                        Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
-                        continue;
-                    }
-
-                    var paramType = parameters[0].ParameterType;
-                    MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
-                }
-
-                if (RegisterModifier(type, info))
-                {
-                    continue;
-                }
-
-                if (RegisterOptions(type, info))
-                {
-                    continue;
-                }
-
-                if (RegisterRole(type, info, out var role))
-                {
-                    roles.Add(role);
-                    continue;
-                }
-
-                if (RegisterButton(type, info))
-                {
-                    continue;
-                }
-
-                if (RegisterGameOver(type))
-                {
-                    continue;
-                }
-
-                RegisterColorClasses(type);
+                RegisterPlugin(basePluginInfo, assembly);
             }
-
-            info.PluginConfig.Save();
-            info.PluginConfig.SaveOnConfigSet = oldConfigSetting;
-
-            info.InternalOptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
-            QueuedRoleRegistrations.Add(info, roles);
-
-            _registeredPlugins.Add(assembly, info);
-
-            info.SavePublicCollections();
-            PresetManager.CreateDefaultPreset(info);
-            PresetManager.LoadPresets(info);
-            Logger<MiraApiPlugin>.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
         };
         IL2CPPChainloader.Instance.Finished += PaletteManager.RegisterAllColors;
         IL2CPPChainloader.Instance.Finished += () =>
         {
-            // Save all buttons into a read-only collection for easy access
             CustomButtonManager.Buttons = new ReadOnlyCollection<CustomActionButton>(CustomButtonManager.CustomButtons);
-
-            // Cache all the registered plugins into an array for easy access
             RegisteredPlugins = [.. _registeredPlugins.Values];
-
             ModifierManager.Modifiers = new ReadOnlyCollection<BaseModifier>(ModifierManager.InternalModifiers);
-
-            foreach (var button in CustomButtonManager.Buttons)
-            {
-                KeybindManager.Register($"{button.Name}_Keybind", $"Keybind for {button.Name}", button.Defaultkeybind, button.ClickHandler, modifier1: button.Modifier1, modifier2: button.Modifier2, modifier3: button.Modifier3);
-
-                Logger<MiraApiPlugin>.Info($"Registered keybind for button '{button.GetType().Name}' with default key {button.Defaultkeybind}.");
-            }
         };
     }
 
@@ -154,6 +75,90 @@ public sealed class MiraPluginManager
         return Instance._registeredPlugins.Values.FirstOrDefault(plugin => plugin.PluginId == pluginId);
     }
 
+    private void RegisterPlugin(MiraPluginInfo info, Assembly assembly)
+    {
+        Logger<MiraApiPlugin>.Info($"Registering plugin {info.PluginId} with Mira API.");
+
+        var roles = new List<Type>();
+
+        var oldConfigSetting = info.PluginConfig.SaveOnConfigSet;
+        info.PluginConfig.SaveOnConfigSet = false;
+
+        foreach (var type in assembly.GetTypes())
+        {
+            if (type.GetCustomAttribute<MiraIgnoreAttribute>() != null)
+            {
+                continue;
+            }
+
+            foreach (var method in type.GetMethods())
+            {
+                var eventAttribute = method.GetCustomAttribute<RegisterEventAttribute>();
+                if (eventAttribute == null)
+                {
+                    continue;
+                }
+
+                if (!method.IsStatic)
+                {
+                    Logger<MiraApiPlugin>.Error($"Event method {method.Name} in {type.Name} must be static.");
+                    continue;
+                }
+
+                var parameters = method.GetParameters();
+                if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
+                {
+                    Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
+                    continue;
+                }
+
+                var paramType = parameters[0].ParameterType;
+                MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
+            }
+
+            if (RegisterModifier(type, info))
+            {
+                continue;
+            }
+
+            if (RegisterOptions(type, info))
+            {
+                continue;
+            }
+
+            if (RegisterRole(type, info, out var role))
+            {
+                roles.Add(role);
+                continue;
+            }
+
+            if (RegisterButton(type, info))
+            {
+                continue;
+            }
+
+            if (RegisterGameOver(type))
+            {
+                continue;
+            }
+
+            RegisterColorClasses(type);
+        }
+
+        info.PluginConfig.Save();
+        info.PluginConfig.SaveOnConfigSet = oldConfigSetting;
+
+        info.InternalOptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
+
+        QueuedRoleRegistrations.TryAdd(info, []);
+        QueuedRoleRegistrations[info].AddRange(roles);
+
+        info.SavePublicCollections();
+        PresetManager.CreateDefaultPreset(info);
+        PresetManager.LoadPresets(info);
+        Logger<MiraApiPlugin>.Info($"{info.PluginId} finished registering.");
+    }
+
     private static bool RegisterGameOver(Type type)
     {
         try

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -49,4 +49,4 @@ public static class SpriteTools
         sprite.name = resourcePath;
         return sprite;
     }
-}
+}

MiraAPI/Utilities/EnumerableExtensions.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MiraAPI.Utilities;
-
-/// <summary>
-/// Extensions for IEnumerable.
-/// </summary>
-public static class EnumerableExtensions
-{
-    /// <summary>
-    /// Shuffle the elements of the source enumerable using a new instance of Random.
-    /// </summary>
-    /// <param name="source">The source enumerable.</param>
-    /// <typeparam name="T">The type of the elements.</typeparam>
-    /// <returns>>The shuffled enumerable.</returns>
-    public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> source)
-    {
-        return source.Shuffle(new Random());
-    }
-
-    /// <summary>
-    /// Shuffle the elements of the source enumerable using the provided Random instance.
-    /// </summary>
-    /// <param name="source">The source enumerable.</param>
-    /// <param name="rng">The Random instance to use for shuffling.</param>
-    /// <typeparam name="T">The type of the elements.</typeparam>
-    /// <returns>>The shuffled enumerable.</returns>
-    public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> source, Random rng)
-    {
-        ArgumentNullException.ThrowIfNull(source);
-        ArgumentNullException.ThrowIfNull(rng);
-
-        return source.ShuffleIterator(rng);
-    }
-
-    private static IEnumerable<T> ShuffleIterator<T>(this IEnumerable<T> source, Random rng)
-    {
-        var buffer = source.ToList();
-        for (var i = 0; i < buffer.Count; i++)
-        {
-            var j = rng.Next(i, buffer.Count);
-            yield return buffer[j];
-
-            buffer[j] = buffer[i];
-        }
-    }
-}

MiraAPI/Utilities/Extensions.cs

@@ -10,8 +10,6 @@ using MiraAPI.Networking;
 using MiraAPI.Roles;
 using MiraAPI.Voting;
 using Reactor.Utilities;
-using Rewired;
-using Rewired.Data;
 using TMPro;
 using UnityEngine;
 
@@ -94,7 +92,7 @@ public static class Extensions
     /// <param name="timer">The current timer value.</param>
     /// <param name="maxTimer">The maximum timer value.</param>
     /// <param name="format">The format string to use for the timer text.</param>
-    public static void SetCooldownFormat(this ActionButton button, float timer, float maxTimer, string format = "0")
+    public static void SetCooldownFormat(this ActionButton button, float timer, float maxTimer, string format="0")
     {
         var num = Mathf.Clamp(timer / maxTimer, 0f, 1f);
         button.isCoolingDown = num > 0f;
@@ -115,7 +113,7 @@ public static class Extensions
     /// <param name="timer">The current timer value.</param>
     /// <param name="maxTimer">The maximum timer value.</param>
     /// <param name="format">The format string to use for the timer text.</param>
-    public static void SetFillUpFormat(this ActionButton button, float timer, float maxTimer, string format = "0")
+    public static void SetFillUpFormat(this ActionButton button, float timer, float maxTimer, string format="0")
     {
         var num = Mathf.Clamp(timer / maxTimer, 0f, 1f);
         button.isCoolingDown = num > 0f;
@@ -515,7 +513,6 @@ public static class Extensions
     /// <param name="includeImpostors">Whether impostors should be included in the search.</param>
     /// <param name="distance">The radius to search within.</param>
     /// <param name="ignoreColliders">Whether colliders should be ignored when searching.</param>
-    /// <param name="includeGhosts">Determines if Ghosts are included.</param>
     /// <param name="predicate">Optional predicate to test if the object is valid.</param>
     /// <returns>The closest player if there is one, false otherwise.</returns>
     public static PlayerControl? GetClosestPlayer(
@@ -523,16 +520,16 @@ public static class Extensions
         bool includeImpostors,
         float distance,
         bool ignoreColliders = false,
-        bool includeGhosts = false,
         Predicate<PlayerControl>? predicate = null)
     {
         var filteredPlayers = Helpers.GetClosestPlayers(playerControl, distance, ignoreColliders)
             .Where(
                 playerInfo => !playerInfo.Data.Disconnected &&
                               playerInfo.PlayerId != playerControl.PlayerId &&
-                              (includeGhosts || !playerInfo.Data.IsDead) &&
+                              !playerInfo.Data.IsDead &&
                               (includeImpostors || !playerInfo.Data.Role.IsImpostor))
             .ToList();
+
         return predicate != null ? filteredPlayers.Find(predicate) : filteredPlayers.FirstOrDefault();
     }
 
@@ -547,49 +544,4 @@ public static class Extensions
         renderer.material.SetColor(ShaderID.OutlineColor, color ?? Color.clear);
         renderer.material.SetColor(ShaderID.AddColor, color ?? Color.clear);
     }
-
-    // Inspired by: https://github.com/eDonnes124/Town-Of-Us-R/blob/master/source/Patches/Keybinds.cs#L29
-
-    /// <summary>
-    /// Registers a new mod keybind as a user-assignable button action in Rewired.
-    /// </summary>
-    /// <param name="userData">The Rewired user data to add the action to.</param>
-    /// <param name="actionName">The internal name of the action.</param>
-    /// <param name="description">Text shown in the rebinding UI.</param>
-    /// <param name="key">The default key to assign to this action.</param>
-    /// <param name="category">Category ID to group actions in Rewired (default is 0).</param>
-    /// <param name="elementIdentifierId">The element identifier ID (default is -1, meaning none specified).</param>
-    /// <param name="type">The <see cref="InputActionType"/> for this action (default is Button).</param>
-    /// <param name="modifier1">The first optional modifier key (e.g., <c>Control</c>, <c>Shift</c>, <c>Alt</c>) that must be held together with the main key.</param>
-    /// <param name="modifier2">The second optional modifier key. Set to <see cref="ModifierKey.None"/> if not used.</param>
-    /// <param name="modifier3">The third optional modifier key. Set to <see cref="ModifierKey.None"/> if not used.</param>
-    /// <returns>The action ID of the newly registered action.</returns>
-    public static int RegisterModBind(this UserData userData, string actionName, string description, KeyboardKeyCode key, int category = 0, int elementIdentifierId = -1, InputActionType type = InputActionType.Button, ModifierKey modifier1 = ModifierKey.None, ModifierKey modifier2 = ModifierKey.None, ModifierKey modifier3 = ModifierKey.None)
-    {
-        userData.AddAction(category);
-
-        var action = userData.GetAction(userData.actions.Count - 1)!;
-
-        action.name = actionName;
-        action.descriptiveName = description;
-        action.categoryId = category;
-        action.type = type;
-        action.userAssignable = true;
-
-        var map = new ActionElementMap
-        {
-            _elementIdentifierId = elementIdentifierId,
-            _actionId = action.id,
-            _elementType = ControllerElementType.Button,
-            _axisContribution = Pole.Positive,
-            _keyboardKeyCode = key,
-            _modifierKey1 = modifier1,
-            _modifierKey2 = modifier2,
-            _modifierKey3 = modifier3,
-        };
-        userData.keyboardMaps[0].actionElementMaps.Add(map);
-        userData.joystickMaps[0].actionElementMaps.Add(map);
-
-        return action.id;
-    }
 }

MiraAPI/Utilities/Helpers.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Il2CppSystem.IO;
-using MiraAPI.Keybinds;
-using Rewired;
 using TMPro;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -23,7 +19,7 @@ public static class Helpers
     /// <returns>A list of alive players.</returns>
     public static List<PlayerControl> GetAlivePlayers()
     {
-        return [.. GameData.Instance.AllPlayers.ToArray().Where(x => !x.IsDead && !x.Disconnected && x.Object).Select(x => x.Object)];
+        return [.. GameData.Instance.AllPlayers.ToArray().Where(x => !x.IsDead && !x.Disconnected && x.Object).Select(x=>x.Object)];
     }
 
     /// <summary>
@@ -40,10 +36,10 @@ public static class Helpers
             case 100:
                 return true;
             default:
-                {
-                    var num = UnityEngine.Random.RandomRangeInt(1, 101);
-                    return num <= probability;
-                }
+            {
+                var num = Random.RandomRangeInt(1, 101);
+                return num <= probability;
+            }
         }
     }
 
@@ -402,25 +398,6 @@ public static class Helpers
     public static string RandomString(int length, string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
     {
         return new string(Enumerable.Repeat(chars, length)
-            .Select(s => s[UnityEngine.Random.RandomRangeInt(0, s.Length)]).ToArray());
-    }
-
-    /// <summary>
-    /// Finds and returns an unused KeyCode that is not equal to the excluded key.
-    /// </summary>
-    /// <param name="exclude">The KeyCode to skip during the search.</param>
-    /// <returns>
-    /// The first available KeyCode not currently used by any registered keybind,
-    /// or KeyCode.None if none are available.
-    /// </returns>
-    public static KeyboardKeyCode FindAvailableKey(KeyboardKeyCode exclude)
-    {
-        foreach (KeyboardKeyCode key in Enum.GetValues(typeof(KeyboardKeyCode)))
-        {
-            if (key == exclude) continue;
-            bool used = KeybindManager.GetEntries().Exists(e => e.Key == key);
-            if (!used) return key;
-        }
-        return KeyboardKeyCode.None;
+            .Select(s => s[Random.RandomRangeInt(0, s.Length)]).ToArray());
     }
 }