fix crashing after meetings

.editorconfig

@@ -1 +1,2 @@
-[*.{cs,vb}]
+[*.{cs,vb}]
+dotnet_diagnostic.CA1707.severity = none

.gitignore

@@ -3,7 +3,6 @@
 .vs/
 obj/
 bin/
-.qodo/
 
 *.user
 *.lock.json

AmongUs.props

@@ -1,8 +1,8 @@
 <Project>
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.4.15" PrivateAssets="all" />
+        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
+        <PackageReference Include="AmongUs.GameLibs.Android" Version="2025.3.28" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />

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/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;
@@ -20,8 +19,6 @@ public class FreezeButton : CustomActionButton<PlayerControl>
     public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
 
     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/NeutralKillerButton.cs

@@ -3,7 +3,6 @@ using MiraAPI.Example.Roles;
 using MiraAPI.GameEnd;
 using MiraAPI.Hud;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
@@ -13,7 +12,6 @@ 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/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/ExampleAssets.cs

@@ -5,7 +5,6 @@ namespace MiraAPI.Example;
 public static class ExampleAssets
 {
     public static LoadableResourceAsset ExampleButton { get; } = new("MiraAPI.Example.Resources.ExampleButton.png");
-    public static LoadableResourceAsset CallMeetingButton { get; } = new("MiraAPI.Example.Resources.CallMeeting.png");
 
     // Credit to EpicHorrors for the teleport button asset.
     public static LoadableResourceAsset TeleportButton { get; } = new("MiraAPI.Example.Resources.TeleportButton.png");

MiraAPI.Example/ExampleColors.cs

@@ -6,10 +6,7 @@ namespace MiraAPI.Example;
 [RegisterCustomColors]
 public static class ExampleColors
 {
-    public static CustomColor Cerulean { get; } = new("Cerulean", new Color(0.0f, 0.48f, 0.65f))
-    {
-        ColorBrightness = CustomColorBrightness.Lighter,
-    };
+    public static CustomColor Cerulean { get; } = new("Cerulean", new Color(0.0f, 0.48f, 0.65f));
 
     public static CustomColor Rose { get; } = new("Rose", new Color(0.98f, 0.26f, 0.62f));
 

MiraAPI.Example/ExampleEventHandlers.cs

@@ -18,7 +18,7 @@ public static class ExampleEventHandlers
     public static void Initialize()
     {
         // You can register event handlers with the MiraEventManager class.
-        var handle = MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
+        MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
         {
             Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
         });
@@ -32,9 +32,6 @@ public static class ExampleEventHandlers
         {
             Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
         });
-
-        // You can also unregister event handlers using the handle returned from RegisterEventHandler.
-        MiraEventManager.UnregisterEventHandler(handle);
     }
 
     // If you want to add extra votes to a player, do something like this.

MiraAPI.Example/MiraAPI.Example.csproj

@@ -9,9 +9,11 @@
 		<ProjectReference Include="..\MiraAPI\MiraAPI.csproj" />
 	</ItemGroup>
 
-	 <ItemGroup>
-		 <EmbeddedResource Include="Resources\**\*.*" />
-	 </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Resources\ExampleButton.png" />
+		<EmbeddedResource Include="Resources\FortniteBanner.jpeg" />
+		<EmbeddedResource Include="Resources\TeleportButton.png" />
+	</ItemGroup>
 
 	<Import Project="..\AmongUs.props" />
 </Project>

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,26 +1,12 @@
 using MiraAPI.Example.Options.Modifiers;
 using MiraAPI.GameOptions;
-using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers;
 
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";
-    public override LoadableAsset<Sprite>? ModifierIcon => ExampleAssets.CallMeetingButton;
-
-    public override void OnDeath(DeathReason reason)
-    {
-        Player.RemoveModifier(this);
-    }
-
-    public override string GetDescription()
-    {
-        return $"You can call a meeting from anywhere on the map.";
-    }
 
     public override int GetAssignmentChance()
     {

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -6,11 +6,6 @@ public class HighPriorityModifier : GameModifier
 {
     public override string ModifierName => "High Priority";
 
-    public override string GetDescription()
-    {
-        return "You are high priority! Idrk what this means either tbh...";
-    }
-
     public override int GetAssignmentChance()
     {
         return 100;

MiraAPI.Example/Options/ExampleOptions2.cs

@@ -10,8 +10,6 @@ public class ExampleOptions2 : AbstractOptionGroup
 
     public override uint GroupPriority => 0; // This group will be displayed first. The default value is uint.MaxValue.
 
-    public ModdedPlayerOption PlayerOption2 { get; } = new("YOU MUST CHOSE A PLAYER", false);
-    public ModdedPlayerOption PlayerOption { get; } = new("Eh whatever");
     public ModdedToggleOption ToggleOpt1 { get; } = new("Toggle Option 1", false);
 
     public ModdedToggleOption ToggleOpt2 { get; } = new("Toggle Option 2", false)

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,5 +1,4 @@
 using AmongUs.GameOptions;
-using MiraAPI.Patches.Stubs;
 using MiraAPI.Roles;
 using Reactor.Utilities;
 using TMPro;
@@ -15,8 +14,6 @@ public class ChameloenRole : CrewmateRole, ICustomRole
     public Color RoleColor => Palette.AcceptedGreen;
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
 
-    private bool _shouldHide;
-
     public CustomRoleConfiguration Configuration => new(this)
     {
         OptionsScreenshot = ExampleAssets.Banner,
@@ -25,54 +22,35 @@ public class ChameloenRole : CrewmateRole, ICustomRole
 
     public override void Initialize(PlayerControl player)
     {
-        Logger<ExamplePlugin>.Info("Initializing ChamelonRole for player: " + player.PlayerId);
-        RoleBehaviourStubs.Initialize(this, player);
-        _shouldHide = true;
+        Player = player;
+        Logger<ExamplePlugin>.Error("Initializing ChamelonRole for player: " + player.PlayerId);
     }
 
-    public void FixedUpdate()
+    public void PlayerControlFixedUpdate(PlayerControl playerControl)
     {
-        if (!Player || !_shouldHide)
+        if (playerControl.MyPhysics.Velocity.magnitude > 0)
         {
-            return;
-        }
-
-        if (Player.MyPhysics.Velocity.magnitude > 0)
-        {
-            var rend = Player.cosmetics.currentBodySprite.BodySprite;
-            var tmp = Player.cosmetics.nameText;
+            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
+            TextMeshPro tmp = playerControl.cosmetics.nameText;
             tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, 1), Time.deltaTime * 4f);
             rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
 
-            foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
+            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
             {
                 cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
             }
         }
         else
         {
-            SpriteRenderer rend = Player.cosmetics.currentBodySprite.BodySprite;
-            TextMeshPro tmp = Player.cosmetics.nameText;
-            tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, Player.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
-            rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, Player.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
+            TextMeshPro tmp = playerControl.cosmetics.nameText;
+            tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+            rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
 
-            foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
+            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
             {
-                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, Player.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
             }
         }
     }
-
-    public override void Deinitialize(PlayerControl targetPlayer)
-    {
-        Logger<ExamplePlugin>.Info("Deinitializing ChamelonRole for player: " + targetPlayer.PlayerId);
-        RoleBehaviourStubs.Deinitialize(this, targetPlayer);
-        _shouldHide = false;
-        foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>(true))
-        {
-            cosmetic.color = Color.white;
-        }
-        Player.cosmetics.currentBodySprite.BodySprite.color = Color.white;
-        Player.cosmetics.nameText.color = Color.white;
-    }
 }

MiraAPI/Colors/CustomColor.cs

@@ -13,24 +13,19 @@ namespace MiraAPI.Colors;
 public sealed class CustomColor(StringNames name, Color32 mainColor, Color32 shadowColor)
 {
     /// <summary>
-    /// Gets or sets the main color.
+    /// Gets the main color.
     /// </summary>
-    public Color32 MainColor { get; set; } = mainColor;
+    public Color32 MainColor { get; } = mainColor;
 
     /// <summary>
-    /// Gets or sets the shadow color.
+    /// Gets the shadow color.
     /// </summary>
-    public Color32 ShadowColor { get; set; } = shadowColor;
+    public Color32 ShadowColor { get; } = shadowColor;
 
     /// <summary>
-    /// Gets or sets the name of the color.
+    /// Gets the name of the color.
     /// </summary>
-    public StringNames Name { get; set; } = name;
-
-    /// <summary>
-    /// Gets or sets whether the color is lighter or darker. Can be used to help with colorblind stuff.
-    /// </summary>
-    public CustomColorBrightness ColorBrightness { get; set; } = CustomColorBrightness.Darker;
+    public StringNames Name { get; } = name;
 
     /// <inheritdoc />
     public CustomColor(StringNames name, Color32 mainColor) : this(name, mainColor, mainColor.GetShadowColor(60))
@@ -47,19 +42,3 @@ public sealed class CustomColor(StringNames name, Color32 mainColor, Color32 sha
     {
     }
 }
-
-/// <summary>
-/// Can be used to help with colorblind stuff.
-/// </summary>
-public enum CustomColorBrightness
-{
-    /// <summary>
-    /// A lighter color.
-    /// </summary>
-    Lighter,
-
-    /// <summary>
-    /// A darker color.
-    /// </summary>
-    Darker,
-}

MiraAPI/Events/MiraEventHandle.cs

@@ -1,22 +0,0 @@
-using System;
-
-namespace MiraAPI.Events;
-
-/// <summary>
-/// Event handle to use when unregistering an event.
-/// </summary>
-public class MiraEventHandle
-{
-    /// <summary>
-    /// Gets the type of event.
-    /// </summary>
-    public Type EventType { get; }
-
-    internal MiraEventWrapper EventWrapper { get; }
-
-    internal MiraEventHandle(Type type, MiraEventWrapper eventWrapper)
-    {
-        EventType = type;
-        EventWrapper = eventWrapper;
-    }
-}

MiraAPI/Events/MiraEventManager.cs

@@ -28,14 +28,7 @@ public static class MiraEventManager
 
         foreach (var handler in handlers)
         {
-            try
-            {
-                ((Action<T>)handler.EventHandler).Invoke(eventInstance);
-            }
-            catch (Exception ex)
-            {
-                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
-            }
+            ((Action<T>)handler.EventHandler).Invoke(eventInstance);
         }
 
         return true;
@@ -57,14 +50,7 @@ public static class MiraEventManager
 
         foreach (var handler in handlers)
         {
-            try
-            {
-                handler.EventHandler.DynamicInvoke(eventInstance);
-            }
-            catch (Exception ex)
-            {
-                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
-            }
+            handler.EventHandler.DynamicInvoke(eventInstance);
         }
 
         return true;
@@ -76,12 +62,12 @@ public static class MiraEventManager
     /// <param name="type">The type of event.</param>
     /// <param name="methodInfo">The MethodInfo of the event handler.</param>
     /// <param name="priority">The priority of the event handler. Lower values are called first.</param>
-    /// <returns>An event handle to use when unregistering the event.</returns>
-    public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
+    public static void RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
     {
         if (!type.IsSubclassOf(typeof(MiraEvent)))
         {
-            throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}");
+            Logger<MiraApiPlugin>.Error($"Type must be a subclass of MiraEvent: {type.FullName}");
+            return;
         }
 
         EventWrappers.TryAdd(type, []);
@@ -98,7 +84,6 @@ public static class MiraEventManager
         }
 
         handlers.Insert(index, eventWrapper);
-        return new MiraEventHandle(type, eventWrapper);
     }
 
     /// <summary>
@@ -107,8 +92,7 @@ public static class MiraEventManager
     /// <param name="handler">The callback method/handler for the event.</param>
     /// <param name="priority">The priority of the event handler. Lower values are called first.</param>
     /// <typeparam name="T">Type of event.</typeparam>
-    /// <returns>An event handle to use when unregistering the event.</returns>
-    public static MiraEventHandle RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
+    public static void RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
     {
         EventWrappers.TryAdd(typeof(T), []);
 
@@ -123,30 +107,5 @@ public static class MiraEventManager
         }
 
         handlers.Insert(index, eventWrapper);
-        return new MiraEventHandle(typeof(T), eventWrapper);
-    }
-
-    /// <summary>
-    /// Unregister an event using the event handle.
-    /// </summary>
-    /// <param name="eventHandle">A handle to the event.</param>
-    /// <returns>True if the event was unregistered successfully, false otherwise.</returns>
-    public static bool UnregisterEventHandler(MiraEventHandle eventHandle)
-    {
-        if (!EventWrappers.TryGetValue(eventHandle.EventType, out var handlers))
-        {
-            return false;
-        }
-
-        if (!handlers.Remove(eventHandle.EventWrapper))
-        {
-            return false;
-        }
-
-        if (handlers.Count == 0)
-        {
-            EventWrappers.Remove(eventHandle.EventType);
-        }
-        return true;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -15,21 +15,14 @@ public class AfterMurderEvent : MiraEvent
     /// </summary>
     public PlayerControl Target { get; }
 
-    /// <summary>
-    /// Gets the player's body, if it exists.
-    /// </summary>
-    public DeadBody? DeadBody { 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>
-    /// <param name="deadBody">The player's vody, if it exists.</param>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody)
+    public AfterMurderEvent(PlayerControl source, PlayerControl target)
     {
         Source = source;
         Target = target;
-        DeadBody = deadBody;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/BeforeGameEndEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Invoked before RpcEndGame is called, allowing cancellation of the game end entirely.
-/// </summary>
-public class BeforeGameEndEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the reason for the game end.
-    /// </summary>
-    public GameOverReason Reason { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BeforeGameEndEvent"/> class.
-    /// </summary>
-    /// <param name="reason">The reason for the game end.</param>
-    public BeforeGameEndEvent(GameOverReason reason)
-    {
-        Reason = reason;
-    }
-}

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/Map/UpdateSystemEvent.cs

@@ -24,7 +24,6 @@ public class UpdateSystemEvent : MiraCancelableEvent
     ///  Initializes a new instance of the <see cref="UpdateSystemEvent"/> class.
     /// </summary>
     /// <param name="systemType">The SystemType being updated.</param>
-    /// <param name="player">The player that is updating the system.</param>
     /// <param name="amount">Amount to update System to.</param>
     public UpdateSystemEvent(SystemTypes systemType, PlayerControl player, byte amount)
     {

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/Events/Vanilla/Meeting/Voting/HandleVoteEvent.cs

@@ -24,11 +24,6 @@ public class HandleVoteEvent : MiraCancelableEvent
     /// </summary>
     public byte TargetId { get; }
 
-    /// <summary>
-    /// Gets a value indicating whether to prevent the vote from commencing.
-    /// </summary>
-    public bool PreventVote { get; }
-
     /// <summary>
     /// Gets the player info of the target.
     /// </summary>
@@ -44,7 +39,6 @@ public class HandleVoteEvent : MiraCancelableEvent
         VoteData = playerVoteData;
         Player = playerVoteData.Owner;
         TargetId = targetId;
-        PreventVote = false;
         TargetPlayerInfo = GameData.Instance.GetPlayerById(targetId);
     }
 }

MiraAPI/Events/Vanilla/Player/PlayerDeathEvent.cs

@@ -15,21 +15,14 @@ public class PlayerDeathEvent : MiraEvent
     /// </summary>
     public DeathReason DeathReason { get; }
 
-    /// <summary>
-    /// Gets the dead body associated with the player, if any.
-    /// </summary>
-    public DeadBody? DeadBody { 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>
-    /// <param name="deadBody">The player's body, if it exists.</param>
-    public PlayerDeathEvent(PlayerControl player, DeathReason reason, DeadBody? deadBody)
+    public PlayerDeathEvent(PlayerControl player, DeathReason reason)
     {
         Player = player;
         DeathReason = reason;
-        DeadBody = deadBody;
     }
 }

MiraAPI/GameModes/.editorconfig

@@ -1,2 +0,0 @@
-[*.cs]
-dotnet_diagnostic.CS1591.severity = none

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -21,7 +21,7 @@ public static class CustomGameModeManager
     }
 
     /// <summary>
-    /// Gets the current gamemode.
+    /// Current gamemode.
     /// </summary>
     public static CustomGameMode? ActiveMode { get; internal set; } = new DefaultMode();
 

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions;
@@ -12,11 +11,6 @@ public abstract class AbstractOptionGroup
 {
     internal List<IModdedOption> Options { get; } = [];
 
-    /// <summary>
-    /// Gets a list of the options which are a part of this group.
-    /// </summary>
-    public ReadOnlyCollection<IModdedOption> Children => new(Options);
-
     /// <summary>
     /// Gets the name of the group. Visible in options menu.
     /// </summary>

MiraAPI/GameOptions/IModdedOption.cs

@@ -6,101 +6,18 @@ using UnityEngine;
 
 namespace MiraAPI.GameOptions;
 
-/// <summary>
-/// Interface for modded options.
-/// </summary>
 public interface IModdedOption
 {
-    /// <summary>
-    /// Gets the unique identifier for the option.
-    /// </summary>
     uint Id { get; }
-
-    /// <summary>
-    /// Gets the title of the option.
-    /// </summary>
     string Title { get; }
-
-    /// <summary>
-    /// Gets the StringName for the option, used for localization.
-    /// </summary>
     StringNames StringName { get; }
-
-    /// <summary>
-    /// Gets or sets the MiraPlugin that created this option.
-    /// </summary>
     IMiraPlugin? ParentMod { get; set; }
-
-    /// <summary>
-    /// Gets the game setting data for the option.
-    /// </summary>
     BaseGameSetting Data { get; }
-
-    /// <summary>
-    /// Gets the OptionBehaviour object of the option.
-    /// </summary>
     OptionBehaviour? OptionBehaviour { get; }
-
-    /// <summary>
-    /// Gets or sets the visibility function for the option.
-    /// </summary>
     Func<bool> Visible { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the option should be included with presets.
-    /// </summary>
-    bool IncludeInPreset { get; set; }
-
-    /// <summary>
-    /// Gets or sets the ConfigDefinition for the option, used for BepInEx configuration.
-    /// </summary>
     ConfigDefinition? ConfigDefinition { get; set; }
-
-    /// <summary>
-    /// Creates the option behaviour for the modded option.
-    /// </summary>
-    /// <param name="toggleOpt">The ToggleOption template.</param>
-    /// <param name="numberOpt">The NumberOption template.</param>
-    /// <param name="stringOpt">The StringOption template.</param>
-    /// <param name="playerOpt">The PlayerOption template.</param>
-    /// <param name="container">>The Transform container for the option.</param>
-    /// <returns>>The created OptionBehaviour object.</returns>
-    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container);
-
-    /// <summary>
-    /// Gets the value as a float.
-    /// </summary>
-    /// <returns>>The value of the option as a float.</returns>
+    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
     float GetFloatData();
-
-    /// <summary>
-    /// Gets the NetData for the option, used for network synchronization.
-    /// </summary>
-    /// <returns>>Returns the NetData object for the option.</returns>
     NetData GetNetData();
-
-    /// <summary>
-    /// Handles incoming network data for the option.
-    /// </summary>
-    /// <param name="data">>The byte array representing the network data.</param>
     void HandleNetData(byte[] data);
-
-    /// <summary>
-    /// Saves the option to a preset configuration file.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile representing the preset configuration.</param>
-    /// <param name="saveDefault">Indicates whether to save the default value instead of the current value.</param>
-    void SaveToPreset(ConfigFile presetConfig, bool saveDefault = false);
-
-    /// <summary>
-    /// Binds the option to a configuration file.
-    /// </summary>
-    /// <param name="config">The ConfigFile to bind the option to.</param>
-    void Bind(ConfigFile config);
-
-    /// <summary>
-    /// Loads the option from a preset configuration file, applying the values to the option's configuration.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile representing the preset configuration.</param>
-    void LoadFromPreset(ConfigFile presetConfig);
 }

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using BepInEx.Configuration;
 using HarmonyLib;
 using MiraAPI.GameOptions.Attributes;
-using MiraAPI.GameOptions.OptionTypes;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
@@ -23,7 +21,6 @@ public static class ModdedOptionsManager
     private static readonly Dictionary<PropertyInfo, ModdedOptionAttribute> OptionAttributes = [];
     private static readonly Dictionary<Type, AbstractOptionGroup> TypeToGroup = [];
 
-    internal static readonly Dictionary<OptionBehaviour, ModdedPlayerOption> CreatedPlayerOptions = [];
     internal static readonly Dictionary<uint, IModdedOption> ModdedOptions = [];
     internal static readonly List<AbstractOptionGroup> Groups = [];
 
@@ -45,12 +42,10 @@ public static class ModdedOptionsManager
 
         Groups.Add(group);
         TypeToGroup.Add(type, group);
-        pluginInfo.InternalOptionGroups.Add(group);
+        pluginInfo.OptionGroups.Add(group);
 
         typeof(OptionGroupSingleton<>).MakeGenericType(type)
-#pragma warning disable S3011
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-#pragma warning restore S3011
             .SetValue(null, group);
 
         return true;
@@ -124,7 +119,7 @@ public static class ModdedOptionsManager
         option.ConfigDefinition = new ConfigDefinition(groupName, propertyName);
 
         option.ParentMod = pluginInfo.MiraPlugin;
-        pluginInfo.InternalOptions.Add(option);
+        pluginInfo.Options.Add(option);
         ModdedOptions.Add(option.Id, option);
         group.Options.Add(option);
     }
@@ -145,7 +140,7 @@ public static class ModdedOptionsManager
         // we dont know how other plugins handle their configs
         // this way, all the options are saved at once, instead of one by one
         var oldConfigSetting = new Dictionary<MiraPluginInfo, bool>();
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
             oldConfigSetting.Add(plugin, plugin.PluginConfig.SaveOnConfigSet);
             plugin.PluginConfig.SaveOnConfigSet = false;
@@ -161,7 +156,7 @@ public static class ModdedOptionsManager
             option.HandleNetData(netData.Data);
         }
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
             plugin.PluginConfig.Save();
             plugin.PluginConfig.SaveOnConfigSet = oldConfigSetting[plugin];
@@ -178,10 +173,7 @@ public static class ModdedOptionsManager
     /// </summary>
     /// <param name="__originalMethod">The original setter method.</param>
     /// <param name="value">The new object value.</param>
-#pragma warning disable CA1707
-    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony naming convention")]
     public static void PropertySetterPatch(MethodBase __originalMethod, object value)
-#pragma warning restore CA1707
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod() == __originalMethod).Value;
         attribute.SetValue(value);
@@ -193,10 +185,7 @@ public static class ModdedOptionsManager
     /// <param name="__originalMethod">The original getter method.</param>
     /// <param name="__result">The result of the property getter.</param>
     /// <returns>False so the original getter gets skipped.</returns>
-#pragma warning disable CA1707
-    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony naming convention")]
     public static bool PropertyGetterPatch(MethodBase __originalMethod, ref object __result)
-#pragma warning restore CA1707
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod() == __originalMethod).Value;
         __result = attribute.GetValue();

MiraAPI/GameOptions/ModifierOptionGroup.cs

@@ -2,9 +2,7 @@
 
 namespace MiraAPI.GameOptions;
 
-#pragma warning disable CA1852
 internal class ModifierOptionGroup : AbstractOptionGroup
-#pragma warning restore CA1852
 {
     public override string GroupName { get; }
 

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -18,7 +18,7 @@ public class ModdedEnumOption : ModdedOption<int>
     /// <summary>
     /// Gets the string values of the enum.
     /// </summary>
-    public string[] Values { get; }
+    public string[]? Values { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ModdedEnumOption"/> class.
@@ -27,8 +27,7 @@ public class ModdedEnumOption : ModdedOption<int>
     /// <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="includeInPreset">Whether to include this option in the preset or not.</param>
-    public ModdedEnumOption(string title, int defaultValue, Type enumType, string[]? values = null, bool includeInPreset=true) : base(title, defaultValue, includeInPreset)
+    public ModdedEnumOption(string title, int defaultValue, Type enumType, string[]? values = null) : base(title, defaultValue)
     {
         Values = values ?? Enum.GetNames(enumType);
         Data = ScriptableObject.CreateInstance<StringGameSetting>();
@@ -38,13 +37,13 @@ public class ModdedEnumOption : ModdedOption<int>
         data.Type = global::OptionTypes.String;
         data.Values = values is null ?
             Enum.GetNames(enumType).Select(CustomStringName.CreateAndRegister).ToArray()
-            : [.. values.Select(CustomStringName.CreateAndRegister)];
+            : values.Select(CustomStringName.CreateAndRegister).ToArray();
 
         data.Index = Value;
     }
 
     /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
 
@@ -88,7 +87,7 @@ public class ModdedEnumOption : ModdedOption<int>
     /// <inheritdoc />
     protected override void OnValueChanged(int newValue)
     {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
+        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
         if (!OptionBehaviour)
         {
             return;
@@ -110,7 +109,7 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
     /// <summary>
     /// Gets the string values of the enum.
     /// </summary>
-    public string[] Values { get; }
+    public string[]? Values { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ModdedEnumOption{T}"/> class.
@@ -118,8 +117,7 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
     /// <param name="title">The title of the option.</param>
     /// <param name="defaultValue">The default value as an int.</param>
     /// <param name="values">An option list of string values to use in place of the enum name.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
-    public ModdedEnumOption(string title, T defaultValue, string[]? values = null, bool includeInPreset=true) : base(title, defaultValue, includeInPreset)
+    public ModdedEnumOption(string title, T defaultValue, string[]? values = null) : base(title, defaultValue)
     {
         Values = values ?? Enum.GetNames(typeof(T));
         Data = ScriptableObject.CreateInstance<StringGameSetting>();
@@ -129,13 +127,13 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
         data.Type = global::OptionTypes.String;
         data.Values = values is null ?
             Enum.GetNames(typeof(T)).Select(CustomStringName.CreateAndRegister).ToArray()
-            : [.. values.Select(CustomStringName.CreateAndRegister)];
+            : values.Select(CustomStringName.CreateAndRegister).ToArray();
 
-        data.Index = Convert.ToInt32(Value, NumberFormatInfo.InvariantInfo);
+        data.Index = Convert.ToInt32(Value);
     }
 
     /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
 

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -48,7 +48,6 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="suffixType">The suffix type.</param>
     /// <param name="formatString">Optional format string for the option screen.</param>
     /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -57,8 +56,7 @@ public class ModdedNumberOption : ModdedOption<float>
         float increment,
         MiraNumberSuffixes suffixType,
         string? formatString = null,
-        bool zeroInfinity = false,
-        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
+        bool zeroInfinity = false) : base(title, defaultValue)
     {
         Min = min;
         Max = max;
@@ -93,7 +91,6 @@ public class ModdedNumberOption : ModdedOption<float>
         ToggleOption toggleOpt,
         NumberOption numberOpt,
         StringOption stringOpt,
-        PlayerOption playerOpt,
         Transform container)
     {
         var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -4,7 +4,6 @@ using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions.OptionTypes;
@@ -17,19 +16,29 @@ public abstract class ModdedOption<T> : IModdedOption
 {
     private IMiraPlugin? _parentMod;
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the unique identifier of the option.
+    /// </summary>
     public uint Id { get; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the title of the option.
+    /// </summary>
     public string Title { get; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the StringName object of the option.
+    /// </summary>
     public StringNames StringName { get; }
 
-    /// <inheritdoc />
-    public BaseGameSetting Data { get; protected set; } = null!;
+    /// <summary>
+    /// Gets the BaseGameSetting data of the option.
+    /// </summary>
+    public BaseGameSetting Data { get; protected init; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets or sets the parent mod of the option.
+    /// </summary>
     public IMiraPlugin? ParentMod
     {
         get => _parentMod;
@@ -37,7 +46,6 @@ public abstract class ModdedOption<T> : IModdedOption
         {
             if (_parentMod != null || value == null) return;
             _parentMod = value;
-
             var entry = _parentMod.GetConfigFile().Bind(ConfigDefinition, DefaultValue);
             Value = entry.Value;
         }
@@ -58,16 +66,19 @@ public abstract class ModdedOption<T> : IModdedOption
     /// </summary>
     public Action<T>? ChangedEvent { get; set; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets or sets the visibility of the option.
+    /// </summary>
     public Func<bool> Visible { get; set; }
 
-    /// <inheritdoc />
-    public bool IncludeInPreset { get; set; }
-
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets or sets the option behaviour of the option.
+    /// </summary>
     public OptionBehaviour? OptionBehaviour { get; protected set; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets or sets the config definition of the option.
+    /// </summary>
     public ConfigDefinition? ConfigDefinition { get; set; }
 
     /// <summary>
@@ -75,8 +86,7 @@ public abstract class ModdedOption<T> : IModdedOption
     /// </summary>
     /// <param name="title">The option title.</param>
     /// <param name="defaultValue">The default value.</param>
-    /// <param name="includeInPreset">Whether to include the option in the preset.</param>
-    protected ModdedOption(string title, T defaultValue, bool includeInPreset = true)
+    protected ModdedOption(string title, T defaultValue)
     {
         Id = ModdedOptionsManager.NextId;
         Title = title;
@@ -84,7 +94,6 @@ public abstract class ModdedOption<T> : IModdedOption
         Value = defaultValue;
         StringName = CustomStringName.CreateAndRegister(Title);
         Visible = () => true;
-        IncludeInPreset = includeInPreset;
     }
 
     internal void ValueChanged(OptionBehaviour optionBehaviour)
@@ -96,8 +105,7 @@ public abstract class ModdedOption<T> : IModdedOption
     /// Sets the value of the option.
     /// </summary>
     /// <param name="newValue">The new value.</param>
-    /// <param name="sendRpc">Whether to send the value to other players.</param>
-    public void SetValue(T newValue, bool sendRpc = true)
+    public void SetValue(T newValue)
     {
         var oldVal = Value;
         Value = newValue;
@@ -107,7 +115,7 @@ public abstract class ModdedOption<T> : IModdedOption
             ChangedEvent?.Invoke(Value);
         }
 
-        if (sendRpc && AmongUsClient.Instance.AmHost)
+        if (AmongUsClient.Instance.AmHost)
         {
             if (ParentMod?.GetConfigFile().TryGetEntry<T>(ConfigDefinition, out var entry) == true)
             {
@@ -120,44 +128,22 @@ public abstract class ModdedOption<T> : IModdedOption
         OnValueChanged(newValue);
     }
 
-    /// <inheritdoc />
-    public void SaveToPreset(ConfigFile presetConfig, bool saveDefault=false)
-    {
-        if (ConfigDefinition is null)
-        {
-            Logger<MiraApiPlugin>.Error($"Attempted to save {Title} to preset, but ConfigDefinition is null.");
-            return;
-        }
-        Bind(presetConfig);
-        presetConfig[ConfigDefinition].BoxedValue = saveDefault ? DefaultValue : Value;
-    }
-
-    /// <inheritdoc />
-    public void Bind(ConfigFile config)
-    {
-        config.Bind(ConfigDefinition, DefaultValue);
-    }
-
-    /// <inheritdoc />
-    public void LoadFromPreset(ConfigFile presetConfig)
-    {
-        if (presetConfig.TryGetEntry(ConfigDefinition, out ConfigEntry<T> entry))
-        {
-            SetValue(entry.Value, false);
-        }
-        else
-        {
-            Logger<MiraApiPlugin>.Error($"Attempted to load {Title} from preset, but ConfigDefinition is not found in preset.");
-        }
-    }
-
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the float data of the option.
+    /// </summary>
+    /// <returns>A float object representing the option's value.</returns>
     public abstract float GetFloatData();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the net data of the option.
+    /// </summary>
+    /// <returns>A NetData object representing this option's data.</returns>
     public abstract NetData GetNetData();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Handles incoming net data.
+    /// </summary>
+    /// <param name="data">The NetData's byte array.</param>
     public abstract void HandleNetData(byte[] data);
 
     /// <summary>
@@ -173,12 +159,18 @@ public abstract class ModdedOption<T> : IModdedOption
     /// <returns>The value.</returns>
     public abstract T GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour);
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Creates the option behaviour.
+    /// </summary>
+    /// <param name="toggleOpt">The ToggleOption prefab.</param>
+    /// <param name="numberOpt">The NumberOption prefab.</param>
+    /// <param name="stringOpt">The StringOption prefab.</param>
+    /// <param name="container">The options container.</param>
+    /// <returns>A new OptionBehaviour for this modded option.</returns>
     public abstract OptionBehaviour CreateOption(
         ToggleOption toggleOpt,
         NumberOption numberOpt,
         StringOption stringOpt,
-        PlayerOption playerOpt,
         Transform container);
 
     /// <summary>

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Linq;
-using Il2CppSystem.Collections.Generic;
-using MiraAPI.Networking;
-using MiraAPI.Utilities;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.GameOptions.OptionTypes;
-
-/// <summary>
-/// An option for selecting an ingame player. It returns an index of the values list, NOT A PLAYER ID. To get a player out of this, index the Values list.
-/// </summary>
-public class ModdedPlayerOption : ModdedOption<int>
-{
-    /// <summary>
-    /// Gets or sets the included players.
-    /// </summary>
-    public List<NetworkedPlayerInfo> Values { get; set; }
-
-    /// <summary>
-    /// Gets or sets a filter for the players included in the option.
-    /// </summary>
-    public Func<NetworkedPlayerInfo, bool>? PlayerFilter { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the option includes a "None" option. If None is selected, value will return -1.
-    /// </summary>
-    public bool AllowNone { get; set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedPlayerOption"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="allowNone">Whether the option includes a none option. If None is selected, value will return -1.</param>
-    public ModdedPlayerOption(string title, bool allowNone = true) : base(title, allowNone ? -1 : 0, false)
-    {
-        Data = ScriptableObject.CreateInstance<PlayerSelectionGameSetting>();
-        var data = (PlayerSelectionGameSetting)Data;
-
-        data.Title = StringName;
-        data.Type = global::OptionTypes.Player;
-
-        Values = new List<NetworkedPlayerInfo>();
-        AllowNone = allowNone;
-        Value = DefaultValue;
-    }
-
-    /// <inheritdoc />
-    public override OptionBehaviour CreateOption(
-        ToggleOption toggleOpt,
-        NumberOption numberOpt,
-        StringOption stringOpt,
-        PlayerOption playerOpt,
-        Transform container)
-    {
-        var playerOption = Object.Instantiate(playerOpt, container);
-
-        var filteredList = GetFilteredPlayers();
-        Values = filteredList.ToIl2CppList();
-
-        playerOption.SetUpFromData(Data, 20);
-        playerOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
-
-        playerOption.Title = StringName;
-        playerOption.TitleText.text = TranslationController.Instance.GetString(StringName);
-        playerOption.Values = Values;
-        playerOption.Value = Value;
-        playerOption.playerIndex = filteredList.FindIndex(p => p.PlayerId == Value);
-
-        OptionBehaviour = playerOption;
-        ModdedOptionsManager.CreatedPlayerOptions.TryAdd(playerOption, this);
-
-        playerOption.SetValueText();
-        playerOption.AdjustButtonsActiveState();
-
-        return playerOption;
-    }
-
-    /// <summary>
-    /// Returns a player ran through the filter.
-    /// </summary>
-    /// <returns>A list of filtered players.</returns>
-    public System.Collections.Generic.List<NetworkedPlayerInfo> GetFilteredPlayers()
-    {
-        return GameData.Instance.AllPlayers.ToArray()
-            .Where(x => PlayerFilter?.Invoke(x) ?? true)
-            .ToList();
-    }
-
-    /// <summary>
-    /// Returns a player from the value. If AllowNone is enabled and none is enabled this will return null.
-    /// </summary>
-    /// <returns>A player or null if chosen none.</returns>
-    public NetworkedPlayerInfo? GetPlayerValue()
-    {
-        return Value < 0 ? null : Values[Value];
-    }
-
-    /// <inheritdoc />
-    public override float GetFloatData()
-    {
-        return Value;
-    }
-
-    /// <inheritdoc />
-    public override NetData GetNetData()
-    {
-        return new NetData(Id, BitConverter.GetBytes(Value));
-    }
-
-    /// <inheritdoc />
-    public override void HandleNetData(byte[] data)
-    {
-        SetValue(BitConverter.ToInt32(data));
-    }
-
-    /// <inheritdoc />
-    public override int GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
-    {
-        return optionBehaviour.GetInt();
-    }
-
-    /// <inheritdoc />
-    protected override void OnValueChanged(int newValue)
-    {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
-        if (!OptionBehaviour)
-        {
-            return;
-        }
-
-        if (OptionBehaviour is PlayerOption opt)
-        {
-            opt.Value = newValue;
-        }
-    }
-}

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -15,8 +15,7 @@ public class ModdedToggleOption : ModdedOption<bool>
     /// </summary>
     /// <param name="title">The option title.</param>
     /// <param name="defaultValue">The default value.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
-    public ModdedToggleOption(string title, bool defaultValue, bool includeInPreset=true) : base(title, defaultValue, includeInPreset)
+    public ModdedToggleOption(string title, bool defaultValue) : base(title, defaultValue)
     {
         Data = ScriptableObject.CreateInstance<CheckboxGameSetting>();
 
@@ -26,7 +25,7 @@ public class ModdedToggleOption : ModdedOption<bool>
     }
 
     /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
     {
         var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container);
 

MiraAPI/Hud/CustomActionButton.cs

@@ -3,9 +3,7 @@ using System.Globalization;
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
 using MiraAPI.Patches;
-using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -38,11 +36,6 @@ public abstract class CustomActionButton
     /// </summary>
     public abstract LoadableAsset<Sprite> Sprite { get; }
 
-    /// <summary>
-    /// Gets the format string for the cooldown timer.
-    /// </summary>
-    public virtual string CooldownTimerFormatString => "0";
-
     /// <summary>
     /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
     /// </summary>
@@ -53,28 +46,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>
@@ -207,12 +178,9 @@ public abstract class CustomActionButton
 
         this.Location = location;
 
-        if (!moveButton)
-        {
-            return;
-        }
+        if (!moveButton) return;
 
-        if (HudManagerPatches.BottomLeft == null || HudManagerPatches.BottomRight == null)
+        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
         {
             return;
         }
@@ -220,17 +188,17 @@ public abstract class CustomActionButton
         switch (location)
         {
             case ButtonLocation.BottomLeft:
-                var gridArrange = HudManagerPatches.BottomLeft.GetComponent<GridArrange>();
-                var aspectPosition = HudManagerPatches.BottomLeft.GetComponent<AspectPosition>();
+                var gridArrange = HudManagerPatches._bottomLeft.GetComponent<GridArrange>();
+                var aspectPosition = HudManagerPatches._bottomLeft.GetComponent<AspectPosition>();
 
-                Button.transform.SetParent(HudManagerPatches.BottomLeft.transform);
+                Button.transform.SetParent(HudManagerPatches._bottomLeft.transform);
 
                 gridArrange.Start();
                 gridArrange.ArrangeChilds();
                 aspectPosition.AdjustPosition();
                 break;
             case ButtonLocation.BottomRight:
-                Button.transform.SetParent(HudManagerPatches.BottomRight);
+                Button.transform.SetParent(HudManagerPatches._bottomRight);
                 break;
         }
     }
@@ -467,23 +435,23 @@ public abstract class CustomActionButton
         {
             if (CanUse())
             {
-                Button!.SetEnabled();
+                Button.SetEnabled();
             }
             else
             {
-                Button!.SetDisabled();
+                Button.SetDisabled();
             }
 
             if (EffectActive)
             {
                 Button.SetFillUp(Timer, EffectDuration);
 
-                Button.cooldownTimerText.text = Timer.ToString(CooldownTimerFormatString, NumberFormatInfo.InvariantInfo);
+                Button.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
                 Button.cooldownTimerText.gameObject.SetActive(true);
             }
             else
             {
-                Button.SetCooldownFormat(Timer, Cooldown, CooldownTimerFormatString);
+                Button.SetCoolDown(Timer, Cooldown);
             }
         }
 

MiraAPI/Hud/CustomButtonManager.cs

@@ -29,11 +29,9 @@ public static class CustomButtonManager
         }
 
         CustomButtons.Add(button);
-        pluginInfo.InternalButtons.Add(button);
+        pluginInfo.Buttons.Add(button);
         typeof(CustomButtonSingleton<>).MakeGenericType(buttonType)
-#pragma warning disable S3011
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-#pragma warning restore S3011
             .SetValue(null, button);
 
         ButtonEventTypes.Add(buttonType, typeof(MiraButtonClickEvent<>).MakeGenericType(buttonType));

MiraAPI/Hud/CustomButtonSingleton.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+using System.Linq;
 
 namespace MiraAPI.Hud;
 
@@ -14,6 +13,7 @@ public static class CustomButtonSingleton<T> where T : CustomActionButton
     /// <summary>
     /// Gets the instance of the button.
     /// </summary>
-    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "This is a utility class to get the instance of a custom action button.")]
+#pragma warning disable CA1000
     public static T Instance => _instance ??= CustomButtonManager.CustomButtons.OfType<T>().Single();
+#pragma warning restore CA1000
 }

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

@@ -1,8 +1,6 @@
 using System;
 using MiraAPI.GameOptions;
 using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
 
 namespace MiraAPI.Modifiers;
 
@@ -40,8 +38,8 @@ public abstract class BaseModifier : IOptionable
     /// Gets the parent mod of the modifier.
     /// </summary>
     public MiraPluginInfo ParentMod => Array.Find(
-        MiraPluginManager.Instance.RegisteredPlugins,
-        x => x.InternalModifiers.Exists(y => y.TypeId == TypeId)
+        MiraPluginManager.Instance.RegisteredPlugins(),
+        x => x.Modifiers.Exists(y => y.TypeId == TypeId)
         ) ?? throw new InvalidOperationException("Modifier is not registered.");
 
     /// <summary>
@@ -50,35 +48,25 @@ public abstract class BaseModifier : IOptionable
     public abstract string ModifierName { get; }
 
     /// <summary>
-    /// Gets the modifier icon. Useless if HideOnUi is true.
+    /// Gets a value indicating whether the modifier is hidden on the UI.
     /// </summary>
-    public virtual LoadableAsset<Sprite>? ModifierIcon => null;
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier is hidden on the UI. Will be hidden either way if no description is provided.
-    /// </summary>
-    public virtual bool HideOnUi => GetDescription() == string.Empty;
+    public virtual bool HideOnUi => false;
 
     /// <summary>
     /// Gets a value indicating whether the modifier is shown in the freeplay menu.
     /// </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>
     public virtual bool Unique => true;
 
     /// <summary>
-    /// Gets the HUD description for this modifier. Does nothing if <see cref="HideOnUi"/> is true. Required to be visible on UI.
+    /// Gets the HUD information for this modifier. Defaults to the modifier name. Does nothing if <see cref="HideOnUi"/> is true.
     /// </summary>
-    /// <returns>The description string for the HUD.</returns>
-    public virtual string GetDescription() => string.Empty;
+    /// <returns>The information string for the HUD.</returns>
+    public virtual string GetHudString() => ModifierName;
 
     /// <summary>
     /// Called when the modifier is activated.

MiraAPI/Modifiers/ModifierComponent.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Text;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Patches.Roles;
+using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
+using TMPro;
 using UnityEngine;
 
 namespace MiraAPI.Modifiers;
@@ -25,13 +26,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public ImmutableList<BaseModifier> ActiveModifiers { get; private set; } = ImmutableList<BaseModifier>.Empty;
 
-    private ModifierDisplayComponent? ModifierDisplay { get; set; }
-
     [HideFromIl2Cpp]
     private List<BaseModifier> Modifiers { get; set; } = [];
 
     private PlayerControl _player = null!;
 
+    private TextMeshPro _modifierText = null!;
+
     private readonly List<BaseModifier> _toRemove = [];
 
     private readonly List<BaseModifier> _toAdd = [];
@@ -60,8 +61,8 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             return;
         }
 
-        ModifierDisplay = ModifierDisplayComponent.CreateDisplay();
-        ModifierDisplay?.UpdateModifiersList(Modifiers);
+        _modifierText = Helpers.CreateTextLabel("ModifierText", HudManager.Instance.transform, AspectPosition.EdgeAlignments.RightTop, new Vector3(10.1f, 3.5f, 0), textAlignment: TextAlignmentOptions.Right);
+        _modifierText.verticalAlignment = VerticalAlignmentOptions.Top;
     }
 
     private void FixedUpdate()
@@ -70,15 +71,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         foreach (var modifier in _toRemove.ToArray())
         {
             _toRemove.Remove(modifier);
-            try
-            {
-                modifier.OnDeactivate();
-            }
-            catch (Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
-
+            modifier.OnDeactivate();
             Modifiers.Remove(modifier);
         }
 
@@ -88,14 +81,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
             modifier.Initialized = true;
-            try
-            {
-                modifier.OnActivate();
-            }
-            catch (Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
+            modifier.OnActivate();
 
             if (modifier is TimedModifier { AutoStart: true } timer)
             {
@@ -107,7 +93,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         {
             if (_player.AmOwner && HudManager.InstanceExists)
             {
-                ModifierDisplay?.UpdateModifiersList(Modifiers);
+                HudManager.Instance.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled);
             }
 
             ActiveModifiers = Modifiers.ToImmutableList();
@@ -115,30 +101,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         foreach (var modifier in ActiveModifiers)
         {
-            try
-            {
-                modifier.FixedUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
-        }
-
-        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);
-            }
+            modifier.FixedUpdate();
         }
     }
 
@@ -146,15 +109,34 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         foreach (var modifier in ActiveModifiers)
         {
-            try
-            {
-                modifier.Update();
-            }
-            catch (Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
+            modifier.Update();
         }
+
+        if (!_modifierText || !_player.AmOwner)
+        {
+            return;
+        }
+
+        if (MeetingHud.Instance)
+        {
+            return;
+        }
+
+        var showText = false;
+        var builder = new StringBuilder("<b><size=130%>Modifiers:</b></size>\n");
+
+        foreach (var modifier in ActiveModifiers)
+        {
+            if (modifier.HideOnUi)
+            {
+                continue;
+            }
+
+            showText = true;
+            builder.AppendLine(modifier.GetHudString());
+        }
+
+        _modifierText.text = showText ? builder.ToString() : string.Empty;
     }
 
     private void OnDestroy()

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -1,227 +0,0 @@
-using System;
-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;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
-
-namespace MiraAPI.Modifiers.ModifierDisplay;
-
-/// <summary>
-/// The code used to display Mira modifiers.
-/// </summary>
-[RegisterInIl2Cpp]
-public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
-{
-    /// <summary>
-    /// Gets the instance of the Modifier Display.
-    /// </summary>
-    public static ModifierDisplayComponent? Instance { get; private set; }
-
-    private RectTransform _children = null!;
-    private GameObject _modTemplate = null!;
-    private PassiveButton _toggleButton = null!;
-    private TextMeshPro _toggleBtnText = null!;
-
-    private RectTransform _pagination = null!;
-    private TextMeshPro _pageText = null!;
-    private PassiveButton _nextButton = null!;
-    private PassiveButton _backButton = null!;
-
-    private int _currentPage;
-    private const int ItemsPerPage = 3;
-
-    private readonly Dictionary<BaseModifier, ModifierUiComponent> _modifiers = [];
-
-    /// <summary>
-    /// Gets a read only dictionary of the created modifier UI components.
-    /// </summary>
-    [HideFromIl2Cpp]
-    public ReadOnlyDictionary<BaseModifier, ModifierUiComponent> Modifiers => new(_modifiers);
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier display hud is currently open.
-    /// </summary>
-    public bool IsOpen { get; private set; }
-
-    private void Awake()
-    {
-        Instance = this;
-
-        _children = transform.GetChild(0).GetComponent<RectTransform>();
-        _modTemplate = transform.GetChild(2).gameObject;
-
-        _toggleButton = transform.GetChild(1).GetComponent<PassiveButton>();
-        _toggleButton.OnClick = new Button.ButtonClickedEvent();
-        _toggleButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            IsOpen = !IsOpen;
-            _children.gameObject.SetActive(!_children.gameObject.activeSelf);
-        }));
-
-        _toggleButton.ClickSound = HudManager.Instance.GameMenu.StreamerModeButton.GetComponent<PassiveButton>().ClickSound;
-        _toggleButton.HoverSound = HudManager.Instance.GameMenu.StreamerModeButton.GetComponent<PassiveButton>().HoverSound;
-        _toggleButton.inactiveSprites = _toggleButton.transform.GetChild(1).gameObject;
-        _toggleBtnText = _toggleButton.transform.GetChild(0).GetComponent<TextMeshPro>();
-
-        _pagination = _children.transform.GetChild(0).GetComponent<RectTransform>();
-        _pageText = _pagination.transform.GetChild(0).GetComponent<TextMeshPro>();
-        _nextButton = _pagination.transform.GetChild(1).GetComponent<PassiveButton>();
-        _backButton = _pagination.transform.GetChild(2).GetComponent<PassiveButton>();
-
-        _toggleBtnText.font = _pageText.font = _nextButton.buttonText.font = _backButton.buttonText.font = HudManager.Instance.TaskPanel.taskText.font;
-        _toggleBtnText.fontMaterial = _pageText.fontMaterial = _nextButton.buttonText.fontMaterial = _backButton.buttonText.fontMaterial = HudManager.Instance.TaskPanel.taskText.fontMaterial;
-
-        _nextButton.OnClick = new Button.ButtonClickedEvent();
-        _nextButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            _currentPage++;
-            UpdatePage();
-        }));
-
-        _backButton.OnClick = new Button.ButtonClickedEvent();
-        _backButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            _currentPage--;
-            UpdatePage();
-        }));
-
-        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>
-    /// Use this to refresh the modifiers UI. Useful if you hide modifiers uis based on options.
-    /// </summary>
-    public void RefreshModifiers()
-    {
-        UpdateModifiersList([.. PlayerControl.LocalPlayer.GetModifierComponent().ActiveModifiers]);
-    }
-
-    /// <summary>
-    /// Use this to toggle the visibility of the modifiers tab.
-    /// </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;
-        _children.gameObject.SetActive(IsOpen);
-        RefreshModifiers();
-    }
-
-    internal void DestroyComponent(ModifierUiComponent component)
-    {
-        _modifiers.Remove(component.Modifier!);
-        component.gameObject.DestroyImmediate();
-        RefreshModifiers();
-    }
-
-    [HideFromIl2Cpp]
-    internal static ModifierDisplayComponent CreateDisplay()
-    {
-        var gameObject = Instantiate(MiraAssets.ModifierDisplay.LoadAsset(), HudManager.Instance.transform);
-        var minigame = gameObject.AddComponent<ModifierDisplayComponent>();
-        return minigame;
-    }
-
-    [HideFromIl2Cpp]
-    private ModifierUiComponent CreateForModifier(BaseModifier modifier)
-    {
-        var newMod = Instantiate(_modTemplate, _children.transform);
-        newMod.transform.name = modifier.ModifierName;
-        var comp = newMod.AddComponent<ModifierUiComponent>();
-        comp.Modifier = modifier;
-        return comp;
-    }
-
-    private void UpdatePage()
-    {
-        var totalPages = Mathf.CeilToInt((float)_modifiers.Count / ItemsPerPage);
-        _currentPage = Mathf.Clamp(_currentPage, 0, Mathf.Max(0, totalPages - 1));
-
-        if (_modifiers.Count <= ItemsPerPage)
-        {
-            _modifiers.Do(x => x.Value.gameObject.SetActive(true));
-            _pagination.gameObject.SetActive(false);
-            return;
-        }
-
-        _pagination.gameObject.SetActive(true);
-        if (_pageText != null)
-        {
-            _pageText.text = $"Page {_currentPage + 1}/{Mathf.Max(totalPages, 1)}";
-        }
-
-        _nextButton.gameObject.SetActive(true);
-        _backButton.gameObject.SetActive(true);
-
-        _modifiers.Do(x => x.Value.gameObject.SetActive(false));
-        var start = _currentPage * ItemsPerPage;
-        var end = Mathf.Min(start + ItemsPerPage, _modifiers.Count);
-        var modifiers = _modifiers.ToArray();
-
-        for (var i = start; i < end; i++)
-        {
-            modifiers[i].Value.gameObject.SetActive(true);
-        }
-
-        _pagination.SetAsLastSibling();
-    }
-
-    [HideFromIl2Cpp]
-    internal void UpdateModifiersList(List<BaseModifier> modifiers)
-    {
-        var filteredModifiers = modifiers.Where(x => !x.HideOnUi && x.GetDescription() != string.Empty).ToList();
-        var modifiersToAdd = filteredModifiers.ToList();
-
-        foreach (var mod in _modifiers.ToArray())
-        {
-            if (modifiersToAdd.Contains(mod.Key))
-            {
-                modifiersToAdd.Remove(mod.Key);
-                continue;
-            }
-
-            mod.Value.gameObject.Destroy();
-            _modifiers.Remove(mod.Key);
-        }
-
-        _toggleBtnText.text = $"Modifiers ({filteredModifiers.Count})";
-
-        _toggleButton.gameObject.SetActive(filteredModifiers.Count != 0);
-
-        foreach (var mod in modifiersToAdd)
-        {
-            _modifiers.Add(mod, CreateForModifier(mod));
-        }
-
-        UpdatePage();
-    }
-}

MiraAPI/Modifiers/ModifierDisplay/ModifierUiComponent.cs

@@ -1,72 +0,0 @@
-using Il2CppInterop.Runtime.Attributes;
-using Reactor.Utilities.Attributes;
-using TMPro;
-using UnityEngine;
-
-namespace MiraAPI.Modifiers.ModifierDisplay;
-
-/// <summary>
-/// The code placed on every Modifier HUD object. Used to handle updating.
-/// </summary>
-[RegisterInIl2Cpp]
-public class ModifierUiComponent(nint cppPtr) : MonoBehaviour(cppPtr)
-{
-    /// <summary>
-    /// Gets the modifier which this component is for.
-    /// </summary>
-    [HideFromIl2Cpp]
-    public BaseModifier? Modifier { get; internal set; }
-
-    // ReSharper disable InconsistentNaming
-    private SpriteRenderer modBg = null!;
-    private TextMeshPro desc = null!;
-    private SpriteRenderer icon = null!;
-    private TextMeshPro nameText = null!;
-    private RectTransform descRect = null!;
-    // ReSharper restore InconsistentNaming
-    private void Awake()
-    {
-        if (Modifier == null) return;
-
-        modBg = transform.GetChild(0).GetComponent<SpriteRenderer>();
-        desc = modBg.transform.GetChild(0).GetComponent<TextMeshPro>();
-        icon = modBg.transform.GetChild(1).GetComponent<SpriteRenderer>();
-        var nameBg = transform.GetChild(1);
-        nameText = nameBg.GetChild(0).GetComponent<TextMeshPro>();
-        descRect = desc.gameObject.GetComponent<RectTransform>();
-
-        nameText.font = desc.font = HudManager.Instance.TaskPanel.taskText.font;
-        nameText.fontMaterial = desc.fontMaterial = HudManager.Instance.TaskPanel.taskText.fontMaterial;
-    }
-
-    // Might not be the best solution, but used to update name/description/icon if updated in the modifier.
-    private void FixedUpdate()
-    {
-        if (Modifier == null || ModifierDisplayComponent.Instance == null || !ModifierDisplayComponent.Instance.IsOpen) return;
-
-        if (Modifier.HideOnUi || Modifier.GetDescription() == string.Empty)
-        {
-            ModifierDisplayComponent.Instance.DestroyComponent(this);
-            return;
-        }
-
-        nameText.text = Modifier.ModifierName;
-        desc.text = Modifier.GetDescription();
-        modBg.gameObject.SetActive(true);
-
-        icon.gameObject.SetActive(Modifier.ModifierIcon != null);
-        if (icon.gameObject && icon.gameObject.activeSelf && Modifier.ModifierIcon != null)
-        {
-            icon.sprite = Modifier.ModifierIcon?.LoadAsset();
-            icon.size = new Vector2(0.7f, 0.7f);
-            icon.tileMode = SpriteTileMode.Continuous;
-            descRect.localPosition = new Vector3(0.38f, -0.1f, -5);
-            descRect.sizeDelta = new Vector2(2.38f, 0.65f);
-        }
-        else
-        {
-            descRect.localPosition = new Vector3(0, -0.1f, -5);
-            descRect.sizeDelta = new Vector2(3.1f, 0.65f);
-        }
-    }
-}

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -30,7 +30,7 @@ public static class ModifierExtensions
         _ = ModifierManager.GetModifierType(typeId) ?? throw new InvalidOperationException(
             $"Modifier with ID {typeId} is not registered.");
 
-        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args), true);
+        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args));
     }
 
     /// <summary>
@@ -63,7 +63,7 @@ public static class ModifierExtensions
     /// </summary>
     /// <param name="target">The player to remove the modifier from.</param>
     /// <param name="uniqueId">The unique ID of the modifier.</param>
-    [MethodRpc((uint)MiraRpc.RemoveModifier, SendImmediately = true)]
+    [MethodRpc((uint)MiraRpc.RemoveModifier)]
     public static void RpcRemoveModifier(this PlayerControl target, Guid uniqueId)
     {
         target.RemoveModifier(uniqueId);

MiraAPI/Modifiers/ModifierFactory.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using MiraAPI.Utilities;
@@ -12,7 +11,7 @@ namespace MiraAPI.Modifiers;
 /// </summary>
 public static class ModifierFactory
 {
-    private static readonly Dictionary<(Type, Type[]), Func<object[], BaseModifier>> ConstructorCache = [];
+    private static readonly Dictionary<(Type, Type[]), Func<object[], BaseModifier>> _constructorCache = [];
 
     private static Func<object[], BaseModifier> CreateConstructor(Type type, params object[] args)
     {
@@ -46,13 +45,13 @@ public static class ModifierFactory
     /// <returns>An instance of the modifier.</returns>
     public static BaseModifier CreateInstance(Type type, params object[] args)
     {
-        var argTypes = args.Select(arg => arg.GetType()).ToArray();
+        var argTypes = args.Select(arg => arg?.GetType() ?? typeof(object)).ToArray();
         var key = (type, argTypes);
 
-        if (!ConstructorCache.TryGetValue(key, out var constructor))
+        if (!_constructorCache.TryGetValue(key, out var constructor))
         {
             constructor = CreateConstructor(type, args);
-            ConstructorCache[key] = constructor;
+            _constructorCache[key] = constructor;
         }
 
         return constructor(args);
@@ -96,7 +95,6 @@ public static class ModifierFactory<T> where T : BaseModifier
     /// </summary>
     /// <param name="args">Parameters for the constructor.</param>
     /// <returns>An instance of the modifier.</returns>
-    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "This is a factory class.")]
     public static T CreateInstance(params object[] args)
     {
         return Constructor(args);

MiraAPI/Modifiers/ModifierManager.cs

@@ -17,18 +17,6 @@ namespace MiraAPI.Modifiers;
 /// </summary>
 public static class ModifierManager
 {
-    /// <summary>
-    /// Gets or sets a value indicating whether modifiers should be assigned to players.
-    /// </summary>
-    public static bool MiraAssignsModifiers { get; set; } = true;
-
-    /// <summary>
-    /// Gets the list of all registered modifiers.
-    /// </summary>
-    public static IReadOnlyList<BaseModifier> Modifiers { get; internal set; } = [];
-
-    internal static List<BaseModifier> InternalModifiers { get; } = [];
-
     private static readonly Dictionary<uint, Type> IdToTypeModifierMap = [];
     private static readonly Dictionary<Type, uint> TypeToIdModifierMap = [];
     private static readonly Dictionary<int, List<uint>> PrioritiesToIdsMap = [];
@@ -87,8 +75,7 @@ public static class ModifierManager
             modifier = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType);
         }
 
-        info.InternalModifiers.Add(modifier);
-        InternalModifiers.Add(modifier);
+        info.Modifiers.Add(modifier);
 
         if (modifier is not GameModifier gameModifier)
         {
@@ -112,11 +99,7 @@ public static class ModifierManager
         return true;
     }
 
-    /// <summary>
-    /// Assigns modifiers to players. ONLY CALL THIS METHOD IF YOU KNOW WHAT YOU ARE DOING.
-    /// </summary>
-    /// <param name="plrs">The players to assign modifiers to.</param>
-    public static void AssignModifiers(List<PlayerControl> plrs)
+    internal static void AssignModifiers(List<PlayerControl> plrs)
     {
         var rand = new Random();
 
@@ -126,7 +109,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/Modifiers/Types/GameModifier.cs

@@ -34,7 +34,7 @@ public abstract class GameModifier : BaseModifier
     public virtual bool IsModifierValidOn(RoleBehaviour role) => true;
 
     /// <summary>
-    /// Determines whether the player won the game with this modifier. The modifier with the highest priority will override other modifiers.
+    /// 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>

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -45,12 +45,12 @@ public abstract class TimedModifier : BaseModifier
     public override bool HideOnUi => !TimerActive;
 
     /// <summary>
-    /// Gets the HUD description for Timed Modifier, including the time remaining.
+    /// Gets the HUD information for Timed Modifier, including the time remaining.
     /// </summary>
-    /// <returns>A string with the time remaining.</returns>
-    public override string GetDescription()
+    /// <returns>A string with the hud information + timer.</returns>
+    public override string GetHudString()
     {
-        return $"Remaining Time: {Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s";
+        return base.GetHudString() + $" <size=70%>({Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s)</size>";
     }
 
     /// <summary>

MiraAPI/Networking/CustomMurderRpc.cs

@@ -264,7 +264,7 @@ public static class CustomMurderRpc
             deadBody.enabled = true;
         }
 
-        var afterMurderEvent = new AfterMurderEvent(source, target, deadBody);
+        var afterMurderEvent = new AfterMurderEvent(source, target);
         MiraEventManager.InvokeEvent(afterMurderEvent);
 
         if (!isParticipant)

MiraAPI/Networking/MiraRpc.cs

@@ -44,9 +44,4 @@ public enum MiraRpc : uint
     /// Custom RPC to undo a player's vote.
     /// </summary>
     RemoveVote,
-
-    /// <summary>
-    /// Custom RPC to replace Among Us CastVote.
-    /// </summary>
-    CastVote,
 }

MiraAPI/Patches/.editorconfig

@@ -1,5 +0,0 @@
-[*.{cs,vb}]
-dotnet_diagnostic.CA1707.severity = none
-dotnet_diagnostic.CS1591.severity = none
-dotnet_diagnostic.SA1611.severity = none
-dotnet_diagnostic.SA1615.severity = none

MiraAPI/Patches/ChatControllerPatch.cs

@@ -1,35 +0,0 @@
-using HarmonyLib;
-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
-{
-    public static void Prefix(ChatController __instance)
-    {
-        if (!HudManager.Instance.Chat.IsOpenOrOpening) return;
-
-        var ctrlPressed = Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl);
-
-        if (!ctrlPressed || !Input.GetKeyDown(KeyCode.V)) return;
-
-        var clipboard = GUIUtility.systemCopyBuffer;
-
-        if (string.IsNullOrWhiteSpace(clipboard)) return;
-        clipboard = clipboard.Replace("<", string.Empty)
-            .Replace(">", string.Empty)
-            .Replace("\r", string.Empty);
-
-        if (!Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift))
-            clipboard = clipboard.Replace("\n", string.Empty);
-
-        __instance.freeChatField.textArea.SetText(__instance.freeChatField.textArea.text + clipboard);
-    }
-}

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/EndGamePatches.cs

@@ -5,44 +5,29 @@ using MiraAPI.GameEnd;
 
 namespace MiraAPI.Patches.Events;
 
+[HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
 internal static class EndGamePatches
 {
-    [HarmonyPatch(typeof(GameManager), nameof(GameManager.RpcEndGame))]
-    public static class GameManagerPatches
+    public static bool Prefix(EndGameManager __instance)
     {
-        public static bool Prefix(GameOverReason endReason)
+        if (CustomGameOver.Instance is not { } gameOver)
         {
-            var @event = new BeforeGameEndEvent(endReason);
-            MiraEventManager.InvokeEvent(@event);
-
-            return !@event.IsCancelled;
+            return true;
         }
+
+        var result = gameOver.BeforeEndGameSetup(__instance);
+        return result;
     }
 
-    [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
-    public static class EndGameManagerPatches
+    public static void Postfix(EndGameManager __instance)
     {
-        public static bool Prefix(EndGameManager __instance)
+        if (CustomGameOver.Instance is { } gameOver)
         {
-            if (CustomGameOver.Instance is not { } gameOver)
-            {
-                return true;
-            }
-
-            var result = gameOver.BeforeEndGameSetup(__instance);
-            return result;
+            gameOver.AfterEndGameSetup(__instance);
+            CustomGameOver.Instance = null;
         }
 
-        public static void Postfix(EndGameManager __instance)
-        {
-            if (CustomGameOver.Instance is { } gameOver)
-            {
-                gameOver.AfterEndGameSetup(__instance);
-                CustomGameOver.Instance = null;
-            }
-
-            var @event = new GameEndEvent(__instance);
-            MiraEventManager.InvokeEvent(@event);
-        }
+        var @event = new GameEndEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
     }
 }

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/KillAnimationPatches.cs

@@ -1,7 +1,6 @@
 using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
@@ -14,17 +13,13 @@ 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._CoPerformKill_d__2), nameof(KillAnimation._CoPerformKill_d__2.MoveNext))]
-    public static void KillAnimPostfix(KillAnimation._CoPerformKill_d__2 __instance)
+    [HarmonyPatch(typeof(KillAnimation), nameof(KillAnimation.CoPerformKill))]
+    public static void KillAnimPostfix(PlayerControl source, PlayerControl target)
     {
-        // Checking if state is -1 to wait for the end of coroutine.
-        if (__instance.__1__state != -1)
-        {
-            return;
-        }
-
-        var afterMurderEvent = new AfterMurderEvent(__instance.source, __instance.target, Helpers.GetBodyById(__instance.target.PlayerId));
+        var afterMurderEvent = new AfterMurderEvent(source, target);
         MiraEventManager.InvokeEvent(afterMurderEvent);
     }
 }

MiraAPI/Patches/Events/ReportBodyEventPatch.cs

@@ -1,52 +1,21 @@
-using AmongUs.InnerNet.GameDataMessages;
-using HarmonyLib;
-using InnerNet;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Utilities;
-using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
 [HarmonyPatch]
 public static class ReportBodyEventPatch
 {
-    private static bool ReportBodyEventHook(PlayerControl source, NetworkedPlayerInfo? target)
+    [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 ReportBodyEvent(source, target, body);
+        var @event = new ReportBodyEvent(__instance, target, body);
         MiraEventManager.InvokeEvent(@event);
         return !@event.IsCancelled;
     }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.ReportDeadBody))]
-    public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
-    {
-        return ReportBodyEventHook(__instance, target);
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.LateBroadcastReliableMessage))]
-    public static bool LateBroadcastReliableMessagePrefix(IGameDataMessage rpcMessage)
-    {
-        var reportBodyMessage = rpcMessage.TryCast<RpcReportDeadBodyMessage>();
-
-        if (reportBodyMessage == null)
-        {
-            return true;
-        }
-
-        var source = AmongUsClient.Instance.FindObjectByNetId<PlayerControl>(reportBodyMessage.rpcObjectNetId);
-        if (source == null)
-        {
-            Logger<MiraApiPlugin>.Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
-            return true;
-        }
-
-        var target = GameData.Instance.GetPlayerById(reportBodyMessage.targetPlayerId);
-
-        return ReportBodyEventHook(source, target);
-    }
 }

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/Events/VentEventPatches.cs

@@ -23,10 +23,10 @@ public static class VentEventPatches
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcEnterVent))]
-    public static bool PlayerPhysicsRpcEnterVentPrefix(PlayerPhysics __instance, int ventId)
+    public static bool PlayerPhysicsRpcEnterVentPrefix(PlayerPhysics __instance, int id)
     {
         var pc = __instance.myPlayer;
-        var vent = ShipStatus.Instance.AllVents.FirstOrDefault(v => v.Id == ventId);
+        var vent = ShipStatus.Instance.AllVents.FirstOrDefault(v => v.Id == id);
 
         var @event = new EnterVentEvent(pc, vent);
         MiraEventManager.InvokeEvent(@event);
@@ -40,10 +40,10 @@ public static class VentEventPatches
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcExitVent))]
-    public static bool PlayerPhysicsRpcExitVentPrefix(PlayerPhysics __instance, int ventId)
+    public static bool PlayerPhysicsRpcExitVentPrefix(PlayerPhysics __instance, int id)
     {
         var pc = __instance.myPlayer;
-        var vent = ShipStatus.Instance.AllVents.First(v => v.Id == ventId);
+        var vent = ShipStatus.Instance.AllVents.First(v => v.Id == id);
 
         var @event = new ExitVentEvent(pc, vent);
         MiraEventManager.InvokeEvent(@event);

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,
@@ -72,9 +67,9 @@ internal static class TaskAdderPatches
         modifiersFolder.FolderName = "Modifiers";
         modifiersFolder.name = "ModifiersFolder";
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
-            if (plugin.InternalRoles.Any(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true }))
+            if (plugin.CustomRoles.Any(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true }))
             {
                 var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
                 newFolder.name = plugin.PluginId+":Roles";
@@ -83,7 +78,7 @@ internal static class TaskAdderPatches
                 rolesFolder.SubFolders.Add(newFolder);
             }
 
-            if (plugin.InternalModifiers.Exists(x => x.ShowInFreeplay))
+            if (plugin.Modifiers.Exists(x => x.ShowInFreeplay))
             {
                 var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
                 newFolder.name = plugin.PluginId+":Modifiers";
@@ -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();
         }
@@ -322,9 +317,9 @@ internal static class TaskAdderPatches
         ref float num2,
         ref float num3)
     {
-        for (var m = 0; m < plugin.InternalModifiers.Count; m++)
+        for (var m = 0; m < plugin.Modifiers.Count; m++)
         {
-            var modifier = plugin.InternalModifiers[m];
+            var modifier = plugin.Modifiers[m];
             if (!modifier.ShowInFreeplay)
             {
                 continue;
@@ -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)(() =>
             {
@@ -374,9 +368,9 @@ internal static class TaskAdderPatches
 
     private static void PluginRoles(TaskAdderGame instance, MiraPluginInfo plugin, ref float num, ref float num2, ref float num3)
     {
-        for (var m = 0; m < plugin.InternalRoles.Count; m++)
+        for (var m = 0; m < plugin.CustomRoles.Count; m++)
         {
-            var roleBehaviour = plugin.InternalRoles.ElementAt(m).Value;
+            var roleBehaviour = plugin.CustomRoles.ElementAt(m).Value;
             if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
                 roleBehaviour is ICustomRole { Configuration.ShowInFreeplay: false })
             {
@@ -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/GameModes/.editorconfig

@@ -1,2 +0,0 @@
-[*.cs]
-dotnet_diagnostic.S125.severity = none

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/Hud/ButtonResetPatches.cs

@@ -4,22 +4,36 @@ using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Hud;
 
-[HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
-[HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
+/// <summary>
+/// Reset button patches
+/// </summary>
+[HarmonyPatch]
 public static class ButtonResetPatches
 {
-    public static void Postfix()
+    /// <summary>
+    /// Resets the cooldown and effect of all custom buttons when the meeting starts.
+    /// </summary>
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
+    public static void MeetingHudStartPostfix()
     {
         foreach (var customActionButton in CustomButtonManager.CustomButtons)
         {
-            try
-            {
-                customActionButton.ResetCooldownAndOrEffect();
-            }
-            catch (System.Exception ex)
-            {
-                Logger<MiraApiPlugin>.Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
-            }
+            customActionButton.ResetCooldownAndOrEffect();
+        }
+    }
+
+    /// <summary>
+    /// Resets the cooldown and effect of all custom buttons after the exile screen is closed.
+    /// </summary>
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(ExileController), nameof(ExileController.WrapUp))]
+    [HarmonyPatch(typeof(AirshipExileController), nameof(AirshipExileController.WrapUpAndSpawn))]
+    public static void ExileControllerReEnableGameplayPostfix()
+    {
+        foreach (var customActionButton in CustomButtonManager.CustomButtons)
+        {
+            customActionButton.ResetCooldownAndOrEffect();
         }
     }
 }

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,11 +1,6 @@
-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;
 
@@ -18,9 +13,9 @@ namespace MiraAPI.Patches;
 public static class HudManagerPatches
 {
     // Custom buttons parent.
-    public static GameObject? BottomLeft { get; private set; }
-    public static Transform? BottomRight { get; private set; }
-    public static Transform? Buttons { get; private set; }
+    internal static GameObject? _bottomLeft;
+    internal static Transform? _bottomRight;
+    internal static Transform? _buttons;
 
     /*
     /// <summary>
@@ -41,30 +36,30 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        if (Buttons == null)
+        if (_buttons == null)
         {
-            Buttons = __instance.transform.Find("Buttons");
+            _buttons = __instance.transform.Find("Buttons");
         }
 
-        if (BottomRight == null)
+        if (_bottomRight == null)
         {
-            BottomRight = Buttons.Find("BottomRight");
+            _bottomRight = _buttons.Find("BottomRight");
         }
 
-        if (BottomLeft == null)
+        if (_bottomLeft == null)
         {
-            BottomLeft = Object.Instantiate(BottomRight.gameObject, Buttons);
+            _bottomLeft = Object.Instantiate(_bottomRight.gameObject, _buttons);
         }
 
-        foreach (var t in BottomLeft.GetComponentsInChildren<ActionButton>(true))
+        foreach (var t in _bottomLeft.GetComponentsInChildren<ActionButton>(true))
         {
             t.gameObject.Destroy();
         }
 
-        var gridArrange = BottomLeft.GetComponent<GridArrange>();
-        var aspectPosition = BottomLeft.GetComponent<AspectPosition>();
+        var gridArrange = _bottomLeft.GetComponent<GridArrange>();
+        var aspectPosition = _bottomLeft.GetComponent<AspectPosition>();
 
-        BottomLeft.name = "BottomLeft";
+        _bottomLeft.name = "BottomLeft";
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
@@ -72,8 +67,8 @@ public static class HudManagerPatches
         {
             var location = button.Location switch
             {
-                ButtonLocation.BottomLeft => BottomLeft.transform,
-                ButtonLocation.BottomRight => BottomRight,
+                ButtonLocation.BottomLeft => _bottomLeft.transform,
+                ButtonLocation.BottomRight => _bottomRight,
                 _ => null,
             };
 
@@ -82,14 +77,7 @@ public static class HudManagerPatches
                 continue;
             }
 
-            try
-            {
-                button.CreateButton(location);
-            }
-            catch (System.Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to create custom button {button.GetType().Name}: {e}");
-            }
+            button.CreateButton(location);
         }
 
         gridArrange.Start();
@@ -117,36 +105,7 @@ public static class HudManagerPatches
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
-            try
-            {
-                button.SetActive(isActive, role);
-            }
-            catch (System.Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to set custom button {button.GetType().Name} active: {e}");
-            }
-        }
-    }
-
-    [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();
-            }
+            button.SetActive(isActive, role);
         }
     }
 }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -57,15 +57,15 @@ public static class IntroCutscenePatches
     }
 
     [HarmonyPostfix]
-    [HarmonyPatch(nameof(IntroCutscene.OnDestroy))]
-    public static void GameBeginPatch(IntroCutscene __instance)
+    [HarmonyPatch(typeof(IntroCutscene._CoBegin_d__34), nameof(IntroCutscene._CoBegin_d__34.MoveNext))]
+    public static void GameBeginPatch(IntroCutscene._CoBegin_d__34 __instance)
     {
-        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
+        if (__instance.__1__state != -1)
+        {
+            return;
+        }
 
-        var @event = new BeforeRoundStartEvent(true);
-        MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
+        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance.__4__this));
         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

@@ -1,141 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.Menu;
-
-[HarmonyPatch(typeof(HatsTab))]
-public static class HatsTabPatches
-{
-    private static SortedList<string, List<HatData>> sortedHats = [];
-    private static int currentPage;
-
-    [HarmonyPatch(nameof(HatsTab.OnEnable))]
-    [HarmonyPrefix]
-    public static bool OnEnablePrefix(HatsTab __instance)
-    {
-        __instance.currentHat = HatManager.Instance.GetHatById(DataManager.Player.Customization.Hat);
-        var allHats = HatManager.Instance.GetUnlockedHats().ToImmutableList();
-
-        if (sortedHats.Count == 0)
-        {
-            var comparer = new ControllableComparer<string>(["vanilla"], [], StringComparer.InvariantCulture);
-            sortedHats = new SortedList<string, List<HatData>>(comparer);
-            foreach (var hat in allHats)
-            {
-                if (!sortedHats.ContainsKey(hat.StoreName)) sortedHats[hat.StoreName] = [];
-                sortedHats[hat.StoreName].Add(hat);
-            }
-        }
-
-        GenerateHats(__instance, currentPage);
-
-        return false;
-    }
-
-    [HarmonyPatch(typeof(HatsTab), nameof(HatsTab.Update))]
-    [HarmonyPrefix]
-
-    public static void UpdatePrefix(HatsTab __instance)
-    {
-        if (sortedHats.Count == 0) return;
-
-        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
-        {
-            currentPage--;
-            currentPage = currentPage < 0 ? sortedHats.Count - 1 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
-        {
-            currentPage++;
-            currentPage = currentPage > sortedHats.Count - 1 ? 0 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-    }
-
-    private static IEnumerator? loadRoutine;
-    private static int hatIndex;
-
-    private static void GenerateHats(HatsTab __instance, int page)
-    {
-        if (loadRoutine != null) Coroutines.Stop(loadRoutine);
-
-        hatIndex = 0;
-        foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        __instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.Destroy());
-
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-
-        var (groupName, hats) = sortedHats.ToArray()[page];
-        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-        text.enabled = true;
-        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.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 3f;
-        text.fontSizeMax = 3f;
-        text.fontSizeMin = 0f;
-        var xLerp = __instance.XRange.Lerp(0.5f);
-        var yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-
-        hatIndex += 5;
-        loadRoutine = Coroutines.Start(CoGenerateChips(__instance, hats));
-    }
-
-    private static IEnumerator CoGenerateChips(HatsTab __instance, List<HatData> hats)
-    {
-        __instance.scroller.ScrollToTop();
-        var batchSize = 5;
-        for (var i = 0; i < hats.Count; i += batchSize)
-        {
-            var batch = hats.Skip(i).Take(batchSize).ToList();
-
-            foreach (var hat in batch.OrderBy(HatManager.Instance.allHats.IndexOf))
-            {
-                var hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                var hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-                GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), hat);
-                hatIndex += 1;
-                yield return null;
-            }
-
-            __instance.SetScrollerBounds();
-            yield return new WaitForSeconds(0.01f);
-        }
-        __instance.currentHatIsEquipped = true;
-        loadRoutine = null;
-    }
-
-    private static void GenerateColorChip(HatsTab __instance, Vector2 position, HatData hat)
-    {
-        var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-        colorChip.gameObject.name = hat.ProductId;
-        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
-        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectHat(hat)));
-        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectHat(HatManager.Instance.GetHatById(DataManager.Player.Customization.Hat))));
-        colorChip.Inner.SetHat(hat, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color);
-        colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-        colorChip.SelectionHighlight.gameObject.SetActive(false);
-        __instance.UpdateMaterials(colorChip.Inner.FrontLayer, hat);
-        colorChip.Inner.SetMaskType(PlayerMaterial.MaskType.SimpleUI);
-        colorChip.transform.localPosition = new Vector3(position.x, position.y, -1f);
-        colorChip.Inner.transform.localPosition = hat.ChipOffset + new Vector2(0f, -0.3f);
-        colorChip.Tag = hat;
-        __instance.ColorChips.Add(colorChip);
-    }
-}

MiraAPI/Patches/Menu/MainMenuManagerPatches.cs

@@ -1,21 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Utilities.Assets;
-
-namespace MiraAPI.Patches.Menu;
-
-/// <summary>
-/// General MainMenuManage patches.
-/// </summary>
-[HarmonyPatch(typeof(MainMenuManager))]
-public static class MainMenuManagerPatches
-{
-    /// <summary>
-    /// A postifix on Awake to load all the addressables registered.
-    /// </summary>
-    [HarmonyPatch(nameof(MainMenuManager.Awake))]
-    [HarmonyPostfix]
-    public static void AwakePostfix()
-    {
-        AddressablesLoader.LoadAll();
-    }
-}

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -1,118 +0,0 @@
-using AmongUs.Data;
-using HarmonyLib;
-using Innersloth.Assets;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using TMPro;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.Menu;
-
-[HarmonyPatch(typeof(NameplatesTab))]
-public static class NameplatesTabPatches
-{
-    private static readonly SortedList<string, List<NamePlateData>> SortedNameplates = new(new ControllableComparer<string>(["vanilla"], [], StringComparer.InvariantCulture));
-    private static int currentPage;
-    internal static void AddRange(IEnumerable<(string Key, NamePlateData Visor)> data)
-    {
-        foreach (var item in data)
-        {
-            if (!SortedNameplates.ContainsKey(item.Key)) SortedNameplates.Add(item.Key, []);
-            SortedNameplates[item.Key].Add(item.Visor);
-        }
-    }
-
-    [HarmonyPatch(nameof(NameplatesTab.OnEnable))]
-    [HarmonyPrefix]
-    public static bool OnEnablePrefix(NameplatesTab __instance)
-    {
-        __instance.plateId = HatManager.Instance.GetNamePlateById(DataManager.Player.Customization.namePlate).ProdId;
-
-        if (!SortedNameplates.ContainsKey("Vanilla")) AddRange(DestroyableSingleton<HatManager>.Instance.GetUnlockedNamePlates().Select(x => ("Vanilla", x)));
-        GenerateHats(__instance, currentPage);
-
-        return false;
-    }
-
-    [HarmonyPatch(typeof(NameplatesTab), nameof(NameplatesTab.Update))]
-    [HarmonyPrefix]
-
-    public static void UpdatePrefix(NameplatesTab __instance)
-    {
-        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
-        {
-            currentPage--;
-            currentPage = currentPage < 0 ? SortedNameplates.Count - 1 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
-        {
-            currentPage++;
-            currentPage = currentPage > SortedNameplates.Count - 1 ? 0 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-    }
-
-    private static void GenerateHats(NameplatesTab __instance, int page)
-    {
-        foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        __instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.Destroy());
-
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-
-        int hatIndex = 0;
-
-        var (groupName, nameplates) = SortedNameplates.ToArray()[page];
-        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-        text.enabled = true;
-        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.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 3f;
-        text.fontSizeMax = 3f;
-        text.fontSizeMin = 0f;
-        float xLerp = __instance.XRange.Lerp(0.5f);
-        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-
-        hatIndex += 2;
-        foreach (var visor in nameplates.OrderBy(HatManager.Instance.allNamePlates.IndexOf))
-        {
-            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), visor);
-            hatIndex += 1;
-        }
-
-        __instance.SetScrollerBounds();
-        __instance.currentNameplateIsEquipped = true;
-    }
-
-    private static void GenerateColorChip(NameplatesTab __instance, Vector2 position, NamePlateData namePlate)
-    {
-        var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-        colorChip.gameObject.name = namePlate.ProductId;
-        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
-        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectNameplate(namePlate)));
-        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectNameplate(HatManager.Instance.GetNamePlateById(DataManager.Player.Customization.NamePlate))));
-        colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-        colorChip.ProductId = namePlate.ProdId;
-
-        var x = (NamePlateViewData viewdata) =>
-        {
-            colorChip.transform.GetChild(1).GetComponent<SpriteRenderer>().sprite = viewdata?.Image;
-            // (colorChip as NameplateChip).image.sprite = viewdata?.Image;
-        };
-        __instance.StartCoroutine(AddressableAssetExtensions.CoLoadAssetAsync<NamePlateViewData>(__instance, namePlate.GetAssetReference(), x));
-        colorChip.transform.localPosition = new Vector3(position.x, position.y, -1f);
-        colorChip.Tag = namePlate;
-        __instance.ColorChips.Add(colorChip);
-    }
-}

MiraAPI/Patches/Menu/SkinsTabPatches.cs

@@ -1,118 +0,0 @@
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using TMPro;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.Menu;
-
-[HarmonyPatch(typeof(SkinsTab))]
-public static class SkinsTabPatches
-{
-    private static SortedList<string, List<SkinData>> sortedSkins = [];
-    private static int currentPage;
-
-    [HarmonyPatch(nameof(SkinsTab.OnEnable))]
-    [HarmonyPrefix]
-    public static bool OnEnablePrefix(SkinsTab __instance)
-    {
-        __instance.skinId = HatManager.Instance.GetSkinById(DataManager.Player.Customization.Skin).ProdId;
-        var allSkins = HatManager.Instance.GetUnlockedSkins().ToImmutableList();
-
-        if (sortedSkins.Count == 0)
-        {
-            var comparer = new ControllableComparer<string>(["vanilla"], [], StringComparer.InvariantCulture);
-            sortedSkins = new SortedList<string, List<SkinData>>(comparer);
-            foreach (var skin in allSkins)
-            {
-                if (!sortedSkins.ContainsKey(skin.StoreName)) sortedSkins[skin.StoreName] = [];
-                sortedSkins[skin.StoreName].Add(skin);
-            }
-        }
-
-        GenerateHats(__instance, currentPage);
-
-        return false;
-    }
-
-    [HarmonyPatch(typeof(SkinsTab), nameof(SkinsTab.Update))]
-    [HarmonyPrefix]
-
-    public static void UpdatePrefix(SkinsTab __instance)
-    {
-        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
-        {
-            currentPage--;
-            currentPage = currentPage < 0 ? sortedSkins.Count - 1 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
-        {
-            currentPage++;
-            currentPage = currentPage > sortedSkins.Count - 1 ? 0 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-    }
-
-    private static void GenerateHats(SkinsTab __instance, int page)
-    {
-        foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        __instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.Destroy());
-
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-
-        int hatIndex = 0;
-
-        var (groupName, skins) = sortedSkins.ToArray()[page];
-        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-        text.enabled = true;
-        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.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 3f;
-        text.fontSizeMax = 3f;
-        text.fontSizeMin = 0f;
-        float xLerp = __instance.XRange.Lerp(0.5f);
-        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-
-        hatIndex += 5;
-        foreach (var skin in skins.OrderBy(HatManager.Instance.allSkins.IndexOf))
-        {
-            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), skin);
-            hatIndex += 1;
-        }
-
-        __instance.SetScrollerBounds();
-        __instance.currentSkinIsEquipped = true;
-    }
-
-    private static void GenerateColorChip(SkinsTab __instance, Vector2 position, SkinData skin)
-    {
-        var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-        colorChip.gameObject.name = skin.ProductId;
-        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
-        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectSkin(skin)));
-        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectSkin(HatManager.Instance.GetSkinById(DataManager.Player.Customization.Skin))));
-        colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-        colorChip.ProductId = skin.ProductId;
-        colorChip.SelectionHighlight.gameObject.SetActive(false);
-        __instance.UpdateMaterials(colorChip.Inner.FrontLayer, skin);
-        skin.SetPreview(colorChip.Inner.FrontLayer, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color);
-        colorChip.transform.localPosition = new Vector3(position.x, position.y, -1f);
-        colorChip.Inner.transform.localPosition = skin.ChipOffset + new Vector2(0f, -0.3f);
-        colorChip.Tag = skin;
-        __instance.ColorChips.Add(colorChip);
-    }
-}

MiraAPI/Patches/Menu/VisorsTabPatches.cs

@@ -1,114 +0,0 @@
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using TMPro;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.Menu;
-
-[HarmonyPatch(typeof(VisorsTab))]
-public static class VisorsTabPatches
-{
-    private static readonly SortedList<string, List<VisorData>> SortedVisors = new(new ControllableComparer<string>(["vanilla"], [], StringComparer.InvariantCulture));
-    private static int currentPage;
-    internal static void AddRange(IEnumerable<(string Key, VisorData Visor)> data)
-    {
-        foreach (var item in data)
-        {
-            if (!SortedVisors.ContainsKey(item.Key)) SortedVisors.Add(item.Key, []);
-            SortedVisors[item.Key].Add(item.Visor);
-        }
-    }
-
-    [HarmonyPatch(nameof(VisorsTab.OnEnable))]
-    [HarmonyPrefix]
-    public static bool OnEnablePrefix(VisorsTab __instance)
-    {
-        __instance.visorId = HatManager.Instance.GetVisorById(DataManager.Player.Customization.Visor).ProdId;
-
-        if (!SortedVisors.ContainsKey("Vanilla")) AddRange(DestroyableSingleton<HatManager>.Instance.GetUnlockedVisors().Select(x => ("Vanilla", x)));
-        GenerateHats(__instance, currentPage);
-
-        return false;
-    }
-
-    [HarmonyPatch(typeof(VisorsTab), nameof(VisorsTab.Update))]
-    [HarmonyPrefix]
-
-    public static void UpdatePrefix(VisorsTab __instance)
-    {
-        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
-        {
-            currentPage--;
-            currentPage = currentPage < 0 ? SortedVisors.Count - 1 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
-        {
-            currentPage++;
-            currentPage = currentPage > SortedVisors.Count - 1 ? 0 : currentPage;
-            GenerateHats(__instance, currentPage);
-        }
-    }
-
-    private static void GenerateHats(VisorsTab __instance, int page)
-    {
-        foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        __instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.Destroy());
-
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-
-        int hatIndex = 0;
-
-        var (groupName, visors) = SortedVisors.ToArray()[page];
-        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-        text.enabled = true;
-        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.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 3f;
-        text.fontSizeMax = 3f;
-        text.fontSizeMin = 0f;
-        float xLerp = __instance.XRange.Lerp(0.5f);
-        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-
-        hatIndex += 5;
-        foreach (var visor in visors.OrderBy(HatManager.Instance.allVisors.IndexOf))
-        {
-            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), visor);
-            hatIndex += 1;
-        }
-
-        __instance.SetScrollerBounds();
-        __instance.currentVisorIsEquipped = true;
-    }
-
-    private static void GenerateColorChip(VisorsTab __instance, Vector2 position, VisorData visor)
-    {
-        var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-        colorChip.gameObject.name = visor.ProductId;
-        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
-        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectVisor(visor)));
-        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectVisor(HatManager.Instance.GetVisorById(DataManager.Player.Customization.Visor))));
-        colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-        colorChip.ProductId = visor.ProductId;
-        colorChip.SelectionHighlight.gameObject.SetActive(false);
-        __instance.UpdateMaterials(colorChip.Inner.FrontLayer, visor);
-        visor.SetPreview(colorChip.Inner.FrontLayer, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color);
-        colorChip.transform.localPosition = new Vector3(position.x, position.y, -1f);
-        colorChip.Inner.transform.localPosition = visor.ChipOffset + new Vector2(0f, -0.3f);
-        colorChip.Tag = visor;
-        __instance.ColorChips.Add(colorChip);
-    }
-}

MiraAPI/Patches/MinigameBeginErrorPatch.cs

@@ -2,18 +2,11 @@
 
 namespace MiraAPI.Patches;
 
-/// <summary>
-/// Used to fix the Minigame crash errors (credits Submerged/PH Gaming for the fix).
-/// </summary>
-[HarmonyPatch]
-public static class MinigameBeginErrorPatch
+[HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))]
+internal static class MinigameBeginErrorPatch
 {
-    private static readonly Logger _logger = new(Logger.Category.Gameplay, "Minigame");
-
-    [HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))]
-    [HarmonyPrefix]
     public static void Prefix(Minigame __instance)
     {
-        __instance.logger ??= _logger;
+        __instance.logger ??= new Logger(Logger.Category.Gameplay, "Minigame");
     }
 }

MiraAPI/Patches/Modifiers/EndGameDidWinPatch.cs

@@ -1,20 +1,19 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities;
+using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Modifiers;
 
 [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
-internal static class EndGameDidWinPatch
+public static class EndGameDidWinPatch
 {
-    private static List<CachedPlayerData> CachedWinners { get; set; } = [];
-
-    public static void Prefix(EndGameResult endGameResult)
+    public static void Postfix()
     {
-        CachedWinners.Clear();
-        var gameOverReason = endGameResult.GameOverReason;
+        var gameOverReason = EndGameResult.CachedGameOverReason;
+        EndGameResult.CachedWinners.Clear();
 
         var players = GameData.Instance.AllPlayers.ToArray();
         for (var i = 0; i < GameData.Instance.PlayerCount; i++)
@@ -27,37 +26,25 @@ internal static class EndGameDidWinPatch
 
             var didWin = networkedPlayerInfo.Role.DidWin(gameOverReason);
 
-            if (!networkedPlayerInfo.Object)
-            {
-                if (didWin)
-                {
-                    CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
-                }
-                continue;
-            }
-
+            bool? modifierDidWin = null;
             foreach (var modifier in networkedPlayerInfo.Object.GetModifiers<GameModifier>().OrderByDescending(x => x.Priority()))
             {
                 var result = modifier.DidWin(gameOverReason);
                 if (!result.HasValue) continue;
 
-                didWin = result.Value;
+                modifierDidWin = result.Value;
                 break;
             }
 
+            if (modifierDidWin.HasValue)
+            {
+                didWin = modifierDidWin.Value;
+            }
+
             if (didWin)
             {
-                CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
+                EndGameResult.CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
             }
         }
     }
-
-    public static void Postfix(EndGameResult endGameResult)
-    {
-        EndGameResult.CachedWinners.Clear();
-        foreach (var winner in CachedWinners)
-        {
-            EndGameResult.CachedWinners.Add(winner);
-        }
-    }
 }

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -14,12 +14,18 @@ using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Options;
 
+/// <summary>
+/// Patches the GameOptionsMenu to add custom options.
+/// </summary>
 [HarmonyPatch(typeof(GameOptionsMenu))]
-internal static class GameOptionsMenuPatch
+public static class GameOptionsMenuPatch
 {
+    /// <summary>
+    /// Update patch for the GameOptionsMenu.
+    /// </summary>
+    /// <param name="__instance">The GameOptionsMenu instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameOptionsMenu.Update))]
-    // ReSharper disable once InconsistentNaming
     public static void UpdatePatch(GameOptionsMenu __instance)
     {
         if (GameSettingMenuPatches.SelectedModIdx == 0)
@@ -35,7 +41,7 @@ internal static class GameOptionsMenuPatch
         else
         {
             var filteredGroups =
-                GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+                GameSettingMenuPatches.SelectedMod?.OptionGroups
                     .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
             foreach (var group in filteredGroups)
@@ -101,7 +107,7 @@ internal static class GameOptionsMenuPatch
 
     private static void ModifiersUpdate(ref float num)
     {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+        var groups = GameSettingMenuPatches.SelectedMod?.OptionGroups
             .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
 
         foreach (var modGroup in groups)
@@ -112,7 +118,7 @@ internal static class GameOptionsMenuPatch
 
     private static void ModifiersCreate(GameOptionsMenu menu)
     {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+        var groups = GameSettingMenuPatches.SelectedMod?.OptionGroups
             .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
         foreach (var group in groups)
         {
@@ -122,7 +128,6 @@ internal static class GameOptionsMenuPatch
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameOptionsMenu.CreateSettings))]
-    // ReSharper disable once InconsistentNaming
     public static bool SettingsPatch(GameOptionsMenu __instance)
     {
         if (GameSettingMenuPatches.SelectedModIdx == 0)
@@ -138,7 +143,7 @@ internal static class GameOptionsMenuPatch
             return false;
         }
 
-        var filteredGroups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+        var filteredGroups = GameSettingMenuPatches.SelectedMod?.OptionGroups
             .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
         foreach (var group in filteredGroups)
@@ -151,7 +156,6 @@ internal static class GameOptionsMenuPatch
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameOptionsMenu.Initialize))]
-    // ReSharper disable once InconsistentNaming
     public static bool InitPatch(GameOptionsMenu __instance)
     {
         if (__instance.Children != null && __instance.Children.Count != 0)
@@ -220,7 +224,6 @@ internal static class GameOptionsMenuPatch
                 menu.checkboxOrigin,
                 menu.numberOptionOrigin,
                 menu.stringOptionOrigin,
-                menu.playerOptionOrigin,
                 menu.settingsContainer));
 
         foreach (var newOpt in options)

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

@@ -1,348 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using BepInEx.Configuration;
-using HarmonyLib;
-using MiraAPI.PluginLoading;
-using MiraAPI.Presets;
-using MiraAPI.Roles;
-using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.Options;
-
-internal static class GamePresetsTabPatches
-{
-    private static GameObject _saveButton = null!;
-    private static GameObject _refreshButton = null!;
-    private static GameObject _folderButton = null!;
-    private static GameObject _newDivider = null!;
-    private static GameObject _presetHolder = null!;
-    private static GridArrange _arrange = null!;
-
-    private static readonly object Lock = new();
-
-    public static void DivideSize(GameObject obj, float amount)
-    {
-        foreach (var collider in obj.GetComponentsInChildren<Collider2D>(true))
-        {
-            if (collider.TryCast<BoxCollider2D>() is { } col)
-            {
-                col.size = new Vector2(col.size.x / amount, col.size.y);
-            }
-        }
-
-        foreach (var rend in obj.GetComponentsInChildren<SpriteRenderer>(true))
-        {
-            rend.size = new Vector2(rend.size.x / amount, rend.size.y);
-        }
-    }
-
-    [HarmonyPatch(typeof(GamePresetsTab), nameof(GamePresetsTab.OnEnable))]
-    public static class GamePresetsOnEnablePatch
-    {
-        // ReSharper disable once InconsistentNaming
-        public static void Postfix(GamePresetsTab __instance)
-        {
-            if (!GameSettingMenu.Instance)
-            {
-                return;
-            }
-
-            CreatePresetMenu(__instance);
-
-            __instance.StandardPresetButton.gameObject.SetActive(GameSettingMenuPatches.SelectedModIdx == 0);
-            __instance.SecondPresetButton.gameObject.SetActive(GameSettingMenuPatches.SelectedModIdx == 0);
-
-            if (GameSettingMenuPatches.SelectedModIdx != 0)
-            {
-                __instance.PresetDescriptionText.text = "Select or create an options preset for this mod";
-            }
-            else
-            {
-                __instance.SetSelectedText();
-            }
-
-            // Show the save and refresh buttons
-            if (_saveButton)
-            {
-                _saveButton.SetActive(GameSettingMenuPatches.SelectedModIdx != 0);
-            }
-            if (_refreshButton)
-            {
-                _refreshButton.SetActive(GameSettingMenuPatches.SelectedModIdx != 0);
-            }
-            if (_folderButton)
-            {
-                _folderButton.SetActive(GameSettingMenuPatches.SelectedModIdx != 0);
-            }
-            if (_newDivider)
-            {
-                _newDivider.SetActive(GameSettingMenuPatches.SelectedModIdx != 0);
-            }
-
-            var prefab = GameSettingMenu.Instance.GameSettingsButton;
-
-            foreach (var preset in MiraPluginManager.Instance.RegisteredPlugins.SelectMany(x => x.InternalPresets))
-            {
-                var button = Object.Instantiate(prefab, _presetHolder.transform);
-                button.buttonText.text = preset.Name;
-                if (button.buttonText.TryGetComponent<TextTranslatorTMP>(out var tmp))
-                {
-                    tmp.DestroyImmediate();
-                }
-
-                button.buttonText.alignment = TextAlignmentOptions.Center;
-
-                button.OnClick = new Button.ButtonClickedEvent();
-                button.OnClick.AddListener(
-                    (UnityAction)(() =>
-                    {
-                        preset.LoadPreset();
-                    }));
-                button.gameObject.SetActive(false);
-                preset.PresetButton = button.gameObject;
-            }
-
-            foreach (var mod in MiraPluginManager.Instance.RegisteredPlugins)
-            {
-                foreach (var button in mod.InternalPresets.Select(x => x.PresetButton))
-                {
-                    if (button != null)
-                    {
-                        button.SetActive(mod == GameSettingMenuPatches.SelectedMod);
-                    }
-                }
-            }
-
-            _arrange.Start();
-            _arrange.ArrangeChilds();
-        }
-    }
-
-    [HarmonyPatch(typeof(GamePresetsTab), nameof(GamePresetsTab.OnDisable))]
-    public static class GamePresetsOnDisablePatch
-    {
-        // ReSharper disable once InconsistentNaming
-        public static void Postfix()
-        {
-            Logger<MiraApiPlugin>.Error("OnDisable called");
-
-            if (_saveButton)
-            {
-                _saveButton.SetActive(false);
-            }
-            if (_refreshButton)
-            {
-                _refreshButton.SetActive(false);
-            }
-            if (_folderButton)
-            {
-                _folderButton.SetActive(false);
-            }
-
-            if (_newDivider)
-            {
-                _newDivider.SetActive(false);
-            }
-
-            foreach (var mod in MiraPluginManager.Instance.RegisteredPlugins)
-            {
-                foreach (var button in mod.InternalPresets.Select(x => x.PresetButton))
-                {
-                    if (button != null)
-                    {
-                        button.SetActive(false);
-                    }
-                }
-            }
-        }
-    }
-
-    public static void CreatePresetMenu(GamePresetsTab presetTab)
-    {
-        var prefab = GameSettingMenu.Instance.GameSettingsButton;
-        if (prefab == null)
-        {
-            Logger<MiraApiPlugin>.Error("GameSettingsButton prefab is null");
-            return;
-        }
-
-        var tmpTranslator = presetTab.PresetDescriptionText.gameObject.GetComponent<TextTranslatorTMP>();
-        if (tmpTranslator)
-        {
-            tmpTranslator.Destroy();
-        }
-
-        if (!_newDivider)
-        {
-            var oldDiv = presetTab.transform.FindChild("DividerImage");
-            _newDivider = Object.Instantiate(oldDiv.gameObject, oldDiv.transform.parent);
-            _newDivider.transform.localPosition = new Vector3(1.85f, 0.13f, 0f);
-            _newDivider.transform.localScale = new Vector3(1.13f, 1, 1);
-            _newDivider.transform.localRotation = Quaternion.Euler(new Vector3(0, 0, 90));
-        }
-
-        PassiveButton saveButton;
-        if (!_saveButton)
-        {
-            saveButton = Object.Instantiate(prefab, presetTab.transform);
-            _saveButton = saveButton.gameObject;
-            _saveButton.gameObject.name = "SaveButton";
-            _saveButton.transform.localPosition = new Vector3(3.2f, 1.7f, -2);
-
-            // set the button text and alignment
-            var saveText = saveButton.buttonText;
-            saveText.text = "Save";
-            saveText.GetComponent<TextTranslatorTMP>().Destroy();
-            saveText.alignment = TextAlignmentOptions.Center;
-            saveText.transform.parent.localPosition = new Vector3(
-                -.525f,
-                saveText.transform.parent.localPosition.y,
-                saveText.transform.parent.localPosition.z);
-
-            DivideSize(saveButton.gameObject, 2f);
-
-            saveButton.OnClick = new Button.ButtonClickedEvent();
-            saveButton.OnClick.AddListener(
-                (UnityAction)(() =>
-                {
-                    if (GameSettingMenuPatches.SelectedModIdx == 0)
-                    {
-                        return;
-                    }
-
-                    SavePresetPopup.CreatePopup(
-                        name =>
-                        {
-                            if (GameSettingMenuPatches.SelectedMod == null)
-                            {
-                                return;
-                            }
-
-                            if (name == string.Empty)
-                            {
-                                return;
-                            }
-
-                            var presetFile = new ConfigFile(
-                                Path.Combine(
-                                    PresetManager.PresetDirectory,
-                                    GameSettingMenuPatches.SelectedMod.PluginId,
-                                    $"{name}.cfg"),
-                                false)
-                            {
-                                SaveOnConfigSet = false,
-                            };
-
-                            foreach (var option in GameSettingMenuPatches.SelectedMod.InternalOptions.Where(x => x.IncludeInPreset))
-                            {
-                                option.SaveToPreset(presetFile);
-                            }
-
-                            foreach (var role in GameSettingMenuPatches.SelectedMod.InternalRoles.Values.OfType<ICustomRole>().Where(x=>!x.Configuration.HideSettings))
-                            {
-                                role.SaveToPreset(presetFile);
-                            }
-
-                            presetFile.Save();
-                            Refresh();
-                        });
-                }));
-        }
-
-        saveButton = _saveButton.GetComponent<PassiveButton>();
-
-        PassiveButton refreshButton;
-        if (!_refreshButton)
-        {
-            refreshButton = Object.Instantiate(saveButton, presetTab.transform);
-            _refreshButton = refreshButton.gameObject;
-            _refreshButton.name = "RefreshButton";
-            _refreshButton.transform.localPosition = new Vector3(2.85f, 1.1f, -2);
-
-            var icon = new GameObject("Sprite");
-            icon.transform.SetParent(refreshButton.transform);
-            icon.transform.localPosition = new Vector3(-0.47f, -0.08f, -5f);
-            icon.transform.localScale = new Vector3(0.5f, 0.5f, 1);
-            icon.layer = refreshButton.gameObject.layer;
-
-            var iconSpriteRend = icon.AddComponent<SpriteRenderer>();
-            iconSpriteRend.sprite = MiraAssets.RefreshIcon.LoadAsset();
-
-            DivideSize(refreshButton.gameObject, 2f);
-            refreshButton.buttonText.gameObject.Destroy();
-
-            refreshButton.OnClick = new Button.ButtonClickedEvent();
-            refreshButton.OnClick.AddListener((UnityAction)Refresh);
-        }
-        refreshButton = _refreshButton.GetComponent<PassiveButton>();
-
-        if (!_folderButton)
-        {
-            var openFolderButton = Object.Instantiate(refreshButton, presetTab.transform);
-            _folderButton = openFolderButton.gameObject;
-            _folderButton.name = "OpenFolderButton";
-            _folderButton.transform.localPosition = new Vector3(3.55f, 1.1f, -2);
-
-            var folderRend = openFolderButton.transform.FindChild("Sprite").gameObject.GetComponent<SpriteRenderer>();
-            folderRend.sprite = MiraAssets.FolderIcon.LoadAsset();
-            folderRend.transform.localScale = new Vector3(0.4f, 0.4f, 1);
-
-            openFolderButton.OnClick = new Button.ButtonClickedEvent();
-            openFolderButton.OnClick.AddListener(
-                (UnityAction)(() =>
-                {
-                    var directory = Path.Combine(
-                        PresetManager.PresetDirectory,
-                        GameSettingMenuPatches.SelectedMod?.PluginId ?? string.Empty);
-                    Directory.CreateDirectory(directory);
-                    Process.Start(
-                        new ProcessStartInfo
-                        {
-                            FileName = directory,
-                            UseShellExecute = true,
-                            Verb = "open",
-                        });
-                }));
-        }
-
-        _saveButton.SetActive(false);
-        _refreshButton.SetActive(false);
-        _folderButton.SetActive(false);
-        _newDivider.SetActive(false);
-
-        if (!_presetHolder)
-        {
-            _presetHolder = new GameObject("PresetHolder");
-            _presetHolder.transform.SetParent(presetTab.transform, false);
-            _presetHolder.transform.localScale = new Vector3(0.9f, 0.9f, 1);
-            _presetHolder.transform.localPosition = new Vector3(-1.9f, 1.7f, 0);
-            _arrange = _presetHolder.AddComponent<GridArrange>();
-            _arrange.Alignment = GridArrange.StartAlign.Right;
-            _arrange.CellSize = new Vector2(2.15f, -.55f);
-            _arrange.MaxColumns = 2;
-        }
-    }
-
-    private static void Refresh()
-    {
-        Logger<MiraApiPlugin>.Error("Refreshing presets");
-        if (GameSettingMenuPatches.SelectedMod == null)
-        {
-            Logger<MiraApiPlugin>.Error("Selected mod is null, cannot refresh presets");
-            return;
-        }
-        lock (Lock)
-        {
-            PresetManager.LoadPresets(GameSettingMenuPatches.SelectedMod);
-        }
-        GameSettingMenu.Instance.ChangeTab(0, false); // refresh the tab
-    }
-}

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
-using MiraAPI.Presets;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities.Extensions;
 using TMPro;
@@ -32,39 +30,13 @@ internal static class GameSettingMenuPatches
     private static PassiveButton? _modifiersButton;
     private static PassiveButton? _smallRolesButton;
 
-    private static Dictionary<int, Vector3> OptionsPositions { get; } = [];
-    private static Dictionary<int, Vector3> ModifiersPositions { get; } = [];
-
-    private static void SaveScrollPositions(GameSettingMenu gameSettingMenu)
-    {
-        if (_modifiersTab)
-        {
-            ModifiersPositions[SelectedModIdx] = _modifiersTab!.scrollBar.Inner.localPosition;
-        }
-
-        RoleSettingMenuPatches.RolePositions[SelectedModIdx] = gameSettingMenu.RoleSettingsTab.scrollBar.Inner.localPosition;
-        OptionsPositions[SelectedModIdx] = gameSettingMenu.GameSettingsTab.scrollBar.Inner.localPosition;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
-
-    public static void ChangeTabPrefix(GameSettingMenu __instance)
-    {
-        SaveScrollPositions(__instance);
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
     public static void ChangeTabPostfix(GameSettingMenu __instance, int tabNum, bool previewOnly)
     {
         if ((previewOnly && Controller.currentTouchType == Controller.TouchType.Joystick) || !previewOnly)
         {
-            if (_modifiersTab)
-            {
-                _modifiersTab!.gameObject.SetActive(tabNum == 3);
-            }
-
+            if (_modifiersTab) _modifiersTab!.gameObject.SetActive(tabNum == 3);
             _modifiersButton?.SelectButton(tabNum == 3);
             _smallRolesButton?.SelectButton(tabNum == 2);
             if (tabNum == 3)
@@ -88,10 +60,7 @@ internal static class GameSettingMenuPatches
         _modifiersButton?.SelectButton(tabNum == 3);
         _smallRolesButton?.SelectButton(tabNum == 2);
 
-        if (tabNum != 3)
-        {
-            return;
-        }
+        if (tabNum != 3) return;
 
         if (__instance.RoleSettingsButton.gameObject.active)
         {
@@ -141,9 +110,8 @@ internal static class GameSettingMenuPatches
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
             {
-                SaveScrollPositions(__instance);
                 SelectedModIdx += 1;
-                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -160,11 +128,10 @@ internal static class GameSettingMenuPatches
         backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
             (UnityAction)(() =>
             {
-                SaveScrollPositions(__instance);
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
                 }
 
                 UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
@@ -241,64 +208,57 @@ internal static class GameSettingMenuPatches
 
         _modifierBtnOgPos = _modifiersButton.transform.localPosition;
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
-        {
-            PresetManager.LoadPresets(plugin);
-        }
-
         UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
     }
 
-    private static void ChangeRoleSettingButton(bool replace, GameSettingMenu menu)
+    private static void ChangeRoleSettingButton(bool replace, GameSettingMenu __instance)
     {
-        menu.RoleSettingsButton.OnClick = new ButtonClickedEvent();
-        menu.RoleSettingsButton.OnMouseOver = new UnityEvent();
+        __instance.RoleSettingsButton.OnClick = new ButtonClickedEvent();
+        __instance.RoleSettingsButton.OnMouseOver = new UnityEvent();
 
         if (replace)
         {
-            menu.RoleSettingsButton.buttonText.text = "Modifiers Settings";
-            menu.RoleSettingsButton.OnClick.AddListener(
+            __instance.RoleSettingsButton.buttonText.text = "Modifiers Settings";
+            __instance.RoleSettingsButton.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(3, false);
+                    __instance.ChangeTab(3, false);
                 }));
-            menu.RoleSettingsButton.OnMouseOver.AddListener(
+            __instance.RoleSettingsButton.OnMouseOver.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(3, true);
+                    __instance.ChangeTab(3, true);
                 }));
         }
         else
         {
-            menu.RoleSettingsButton.buttonText.text = "Roles Settings";
-            menu.RoleSettingsButton.OnClick.AddListener(
+            __instance.RoleSettingsButton.buttonText.text = "Roles Settings";
+            __instance.RoleSettingsButton.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(2, false);
+                    __instance.ChangeTab(2, false);
                 }));
-            menu.RoleSettingsButton.OnMouseOver.AddListener(
+            __instance.RoleSettingsButton.OnMouseOver.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(2, true);
+                    __instance.ChangeTab(2, true);
                 }));
         }
     }
-
     private static void UpdateText(GameSettingMenu menu, GameOptionsMenu settings, RolesSettingsMenu roles)
     {
         if (_text is not null && SelectedModIdx == 0)
         {
-            _text.text = $"<size=40%>(Page 0/{MiraPluginManager.Instance.RegisteredPlugins.Length})</size>\nDefault";
+            _text.text = "Default";
             _text.fontSizeMax = 3.2f;
-            SelectedMod = null;
         }
         else if (_text is not null)
         {
             _text.fontSizeMax = 2.3f;
-            SelectedMod = MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+            SelectedMod = MiraPluginManager.Instance.RegisteredPlugins()[SelectedModIdx - 1];
 
             var name = SelectedMod.MiraPlugin.OptionsTitleText;
-            _text.text = $"<size=50%>(Page {SelectedModIdx}/{MiraPluginManager.Instance.RegisteredPlugins.Length})</size>\n" + name[..Math.Min(name.Length, 25)];
+            _text.text = name[..Math.Min(name.Length, 25)];
         }
 
         bool replaceWithModifiers = true;
@@ -308,11 +268,9 @@ internal static class GameSettingMenuPatches
 
         if (SelectedModIdx != 0)
         {
-            var modHasRoles = SelectedMod!.InternalRoles.Count != 0;
-            var modHasModifiers = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
-            var modHasOptions =
-                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
+            var modHasRoles = SelectedMod!.CustomRoles.Count != 0;
+            var modHasModifiers = SelectedMod.OptionGroups.Exists(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
+            var modHasOptions = SelectedMod.OptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
 
             _modifiersButton.gameObject.SetActive(true);
             _smallRolesButton.gameObject.SetActive(true);
@@ -352,7 +310,6 @@ internal static class GameSettingMenuPatches
                 {
                     menu.ChangeTab(0, false);
                 }
-
                 // If the mod has roles, we can enable the bigger role button and disable the small one.
                 if (modHasRoles)
                 {
@@ -409,11 +366,6 @@ internal static class GameSettingMenuPatches
             ChangeRoleSettingButton(replaceWithModifiers, menu);
         }
 
-        if (menu.PresetsTab.gameObject.active)
-        {
-            menu.ChangeTab(0, false);
-        }
-
         CleanupTab(settings, roles);
     }
 
@@ -425,30 +377,13 @@ internal static class GameSettingMenuPatches
             {
                 continue;
             }
-
             child.gameObject.DestroyImmediate();
         }
-
         options.Clear();
     }
 
     private static void CleanupTab(GameOptionsMenu settings, RolesSettingsMenu roles)
     {
-        if (roles.roleChances != null)
-        {
-            CleanupRoleSettings(roles);
-        }
-
-        if (settings.Children != null)
-        {
-            CleanupSettings(settings);
-        }
-
-        if (_modifiersTab?.Children?.Count > 0)
-        {
-            CleanupSettings(_modifiersTab, true);
-        }
-
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
         {
             if (rolesMenu.advancedSettingChildren != null)
@@ -467,24 +402,15 @@ internal static class GameSettingMenuPatches
             {
                 role.gameObject.DestroyImmediate();
             }
-
             rolesMenu.roleChances?.Clear();
 
             rolesMenu.AdvancedRolesSettings.gameObject.SetActive(false);
             rolesMenu.RoleChancesSettings.gameObject.SetActive(true);
             rolesMenu.SetQuotaTab();
-            if (RoleSettingMenuPatches.RolePositions.TryGetValue(SelectedModIdx, out var pos))
-            {
-                rolesMenu.scrollBar.Inner.localPosition = pos;
-                rolesMenu.scrollBar.UpdateScrollBars();
-            }
-            else
-            {
-                rolesMenu.scrollBar.ScrollToTop();
-            }
+            rolesMenu.scrollBar.ScrollToTop();
         }
 
-        void CleanupSettings(GameOptionsMenu gameOptMenu, bool modifiers = false)
+        void CleanupSettings(GameOptionsMenu gameOptMenu)
         {
             ClearOptions(gameOptMenu.Children);
             gameOptMenu.Children = null;
@@ -495,16 +421,22 @@ internal static class GameSettingMenuPatches
                 .ForEach(header => header.gameObject.DestroyImmediate());
 
             gameOptMenu.Initialize();
-            var positions = modifiers ? ModifiersPositions : OptionsPositions;
-            if (positions.TryGetValue(SelectedModIdx, out var pos))
-            {
-                gameOptMenu.scrollBar.Inner.localPosition = pos;
-                gameOptMenu.scrollBar.UpdateScrollBars();
-            }
-            else
-            {
-                gameOptMenu.scrollBar.ScrollToTop();
-            }
+            gameOptMenu.scrollBar.ScrollToTop();
+        }
+
+        if (roles.roleChances != null && SelectedMod?.CustomRoles.Count > 0)
+        {
+            CleanupRoleSettings(roles);
+        }
+
+        if (settings.Children != null && SelectedMod?.OptionGroups.Count > 0)
+        {
+            CleanupSettings(settings);
+        }
+
+        if (_modifiersTab?.Children?.Count > 0)
+        {
+            CleanupSettings(_modifiersTab);
         }
     }
 }

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -24,7 +24,7 @@ public static class LobbyViewPanePatches
 
     private static MiraPluginInfo? SelectedMod => SelectedModIdx == 0
         ? null
-        : MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+        : MiraPluginManager.Instance.RegisteredPlugins()[SelectedModIdx - 1];
 
     private static PassiveButton? ModifiersTabButton { get; set; }
 
@@ -74,7 +74,7 @@ public static class LobbyViewPanePatches
             (UnityAction)(() =>
             {
                 SelectedModIdx += 1;
-                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -98,7 +98,7 @@ public static class LobbyViewPanePatches
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
                 }
 
                 Refresh(__instance);
@@ -113,27 +113,24 @@ public static class LobbyViewPanePatches
         menu.scrollBar.ScrollToTop();
     }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(LobbyViewSettingsPane.ChangeTab))]
-    [HarmonyPatch(nameof(LobbyViewSettingsPane.RefreshTab))]
-    // CHANGED BECAUSE OF INLINING
-    public static void SetTabPatch(LobbyViewSettingsPane __instance)
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(LobbyViewSettingsPane.SetTab))]
+    public static bool SetTabPatch(LobbyViewSettingsPane __instance)
     {
         if (__instance.currentTab != ModifiersTabName || SelectedMod == null)
         {
             ModifiersTabButton?.SelectButton(false);
-            return;
+            return true;
         }
 
         __instance.taskTabButton.SelectButton(false);
         __instance.rolesTabButton.SelectButton(false);
 
         ModifiersTabButton?.SelectButton(true);
-
-        var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || (x.OptionableType != null && x.OptionableType.IsAssignableTo(typeof(BaseModifier)))));
-
+        var filteredGroups = SelectedMod.OptionGroups
+            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true));
         DrawOptions(__instance, filteredGroups);
+        return false;
     }
 
     [HarmonyPrefix]
@@ -145,14 +142,8 @@ public static class LobbyViewPanePatches
             return true;
         }
 
-        if (__instance.currentTab == ModifiersTabName)
-        {
-            return false;
-        }
-
-        var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x is { ShowInModifiersMenu: false, OptionableType: null } && x.GroupVisible());
-
+        var filteredGroups = SelectedMod.OptionGroups
+            .Where(x => x.OptionableType == null && x.GroupVisible.Invoke());
         DrawOptions(__instance, filteredGroups);
         return false;
     }
@@ -166,11 +157,6 @@ public static class LobbyViewPanePatches
             return true;
         }
 
-        if (__instance.currentTab == ModifiersTabName)
-        {
-            return false;
-        }
-
         DrawRolesTab(__instance);
         return false;
     }
@@ -179,15 +165,12 @@ public static class LobbyViewPanePatches
     {
         var num = 1.44f;
 
-        var groupArray = groups.Where(x => x.GroupVisible() && x.Options.Any(y => y.Visible())).ToArray();
-
-        foreach (var group in groupArray)
+        foreach (var group in groups)
         {
             var categoryHeaderMasked = Object.Instantiate(
                 menu.categoryHeaderOrigin,
                 menu.settingsContainer,
                 true);
-
             categoryHeaderMasked.SetHeader(StringNames.Name, 61);
             categoryHeaderMasked.Title.text = group.GroupName;
             categoryHeaderMasked.transform.localScale = Vector3.one;
@@ -199,7 +182,7 @@ public static class LobbyViewPanePatches
 
             foreach (var option in group.Options)
             {
-                if (!option.Visible())
+                if (!option.Visible.Invoke())
                 {
                     continue;
                 }
@@ -208,7 +191,6 @@ public static class LobbyViewPanePatches
                     menu.infoPanelOrigin,
                     menu.settingsContainer,
                     true);
-
                 viewSettingsInfoPanel.transform.localScale = Vector3.one;
                 float num2;
                 if (i % 2 == 0)
@@ -247,7 +229,7 @@ public static class LobbyViewPanePatches
             num -= 0.85f;
         }
 
-        menu.scrollBar.SetYBoundsMax(-num - 2);
+        menu.scrollBar.CalculateAndSetYBounds(menu.settingsInfo.Count + 10, 2f, 6f, 0.85f);
     }
 
     private static void DrawRolesTab(LobbyViewSettingsPane instance)
@@ -268,7 +250,7 @@ public static class LobbyViewPanePatches
 
         var list = new List<Type>();
 
-        var roleGroups = SelectedMod.InternalRoles.Values.OfType<ICustomRole>()
+        var roleGroups = SelectedMod.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         // sort the groups by priority
@@ -309,11 +291,6 @@ public static class LobbyViewPanePatches
 
             foreach (var customRole in grouping)
             {
-                if (customRole.Configuration.HideSettings)
-                {
-                    continue;
-                }
-
                 var roleBehaviour = customRole as RoleBehaviour;
                 if (roleBehaviour == null)
                 {
@@ -333,7 +310,7 @@ public static class LobbyViewPanePatches
                 viewSettingsInfoPanelRoleVariant.transform.localScale = Vector3.one;
                 viewSettingsInfoPanelRoleVariant.transform.localPosition = new Vector3(num2, num, -2f);
 
-                var advancedRoleOptions = SelectedMod.InternalOptionGroups
+                var advancedRoleOptions = SelectedMod.OptionGroups
                     .Where(x => x.OptionableType == customRole.GetType())
                     .SelectMany(x => x.Options)
                     .ToList();
@@ -420,7 +397,7 @@ public static class LobbyViewPanePatches
             return 0;
         }
 
-        var role = SelectedMod.InternalRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
+        var role = SelectedMod.CustomRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
 
         if (role == null)
         {
@@ -443,7 +420,7 @@ public static class LobbyViewPanePatches
         var num = viewPanel.yPosStart;
         var num2 = 1.08f;
 
-        var filteredOptions = SelectedMod.InternalOptionGroups
+        var filteredOptions = SelectedMod.OptionGroups
             .Where(x => x.OptionableType == roleType)
             .SelectMany(x=>x.Options)
             .ToList();

MiraAPI/Patches/Options/NotificationPopperPatch.cs

@@ -2,7 +2,6 @@
 using HarmonyLib;
 using Il2CppSystem;
 using MiraAPI.Roles;
-using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Patches.Options;
 
@@ -24,13 +23,15 @@ public static class NotificationPopperPatch
             return true;
         }
 
-        var textColor = customRole.OptionsMenuColor.ToTextColor();
+        var text = teamType == RoleTeamTypes.Crewmate
+            ? Palette.CrewmateSettingChangeText.ToTextColor()
+            : Palette.ImpostorRed.ToTextColor();
 
         var item = TranslationController.Instance.GetString(
             StringNames.LobbyChangeSettingNotificationRole,
             string.Concat(
                 "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
-                textColor,
+                text,
                 TranslationController.Instance.GetString(key, Array.Empty<Object>()),
                 "</color></font>"
             ),

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -1,161 +1,12 @@
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
+using HarmonyLib;
 using Il2CppSystem;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Roles;
 using MiraAPI.Utilities;
-using UnityEngine;
-using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Patches.Options;
 
 [HarmonyPatch]
 public static class OptionsPatches
 {
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseChance))]
-    public static bool RoleIncreaseChancePrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleChance == 0)
-        {
-            __instance.roleMaxCount = 1;
-        }
-
-        var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
-        __instance.roleChance += increment;
-
-        if (__instance.roleChance > 100)
-        {
-            __instance.roleChance = 0;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseChance))]
-    public static bool RoleDecreaseChancePrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleChance == 0)
-        {
-            __instance.roleMaxCount = 1;
-        }
-
-        var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
-        __instance.roleChance -= increment;
-
-        if (__instance.roleChance < 0)
-        {
-            __instance.roleChance = 100;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseCount))]
-    public static bool RoleIncreaseCountPrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleMaxCount == 0)
-        {
-            __instance.roleChance = 50;
-        }
-
-        __instance.roleMaxCount += 1;
-        if (__instance.roleMaxCount > __instance.role.MaxCount)
-        {
-            __instance.roleMaxCount = 0;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseCount))]
-    public static bool RoleDecreaseCountPrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleMaxCount == 0)
-        {
-            __instance.roleChance = 50;
-        }
-
-        __instance.roleMaxCount -= 1;
-        if (__instance.roleMaxCount < 0)
-        {
-            __instance.roleMaxCount = __instance.role.MaxCount;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.AdjustButtonsActiveState))]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.AdjustButtonsActiveState))]
-    [HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.AdjustButtonsActiveState))]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustChanceButtonsActiveState))]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustCountButtonsActiveState))]
-    public static bool AdjustButtonsPrefix(OptionBehaviour __instance)
-    {
-        if (__instance.IsCustom())
-        {
-            if (__instance.TryCast<NumberOption>() is { } numberOption)
-            {
-                numberOption.MinusBtn.SetInteractable(true);
-                numberOption.PlusBtn.SetInteractable(true);
-            }
-            if (__instance.TryCast<StringOption>() is { } stringOption)
-            {
-                stringOption.MinusBtn.SetInteractable(true);
-                stringOption.PlusBtn.SetInteractable(true);
-            }
-            if (__instance.TryCast<PlayerOption>() is { } playerOption)
-            {
-                playerOption.MinusBtn.SetInteractable(true);
-                playerOption.PlusBtn.SetInteractable(true);
-            }
-
-            return false;
-        }
-
-        if (__instance.TryCast<RoleOptionSetting>() is { } roleOptionSetting && roleOptionSetting.Role.IsCustomRole())
-        {
-            roleOptionSetting.CountMinusBtn.SetInteractable(true);
-            roleOptionSetting.CountPlusBtn.SetInteractable(true);
-            roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
-            roleOptionSetting.ChancePlusBtn.SetInteractable(true);
-
-            return false;
-        }
-
-        return true;
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Initialize))]
     public static bool ToggleInit(ToggleOption __instance)
@@ -165,31 +16,15 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.TitleText.text =
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Toggle))]
-    // UpdateValue was inlined.
+    [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.UpdateValue))]
     public static bool ToggleUpdate(ToggleOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.CheckMark.enabled = !__instance.CheckMark.enabled;
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
-    [HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.UpdateValue))]
-    public static bool UpdateValuePrefix(OptionBehaviour __instance)
     {
         return !__instance.IsCustom();
     }
@@ -203,84 +38,17 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.TitleText.text =
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Increase))]
-    public static bool NumberIncrease(NumberOption __instance)
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
+    public static bool NumberUpdate(NumberOption __instance)
     {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value += __instance.Increment;
-        if (__instance.Value > __instance.ValidRange.max)
-        {
-            __instance.Value = __instance.ValidRange.min;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Decrease))]
-    public static bool NumberDecrease(NumberOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value -= __instance.Increment;
-        if (__instance.Value < __instance.ValidRange.min)
-        {
-            __instance.Value = __instance.ValidRange.max;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.Increase))]
-    public static bool StringOptionIncrease(StringOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value += 1;
-        if (__instance.Value >= __instance.Values.Length)
-        {
-            __instance.Value = 0;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.Decrease))]
-    public static bool StringOptionDecrease(StringOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value -= 1;
-        if (__instance.Value < 0)
-        {
-            __instance.Value = __instance.Values.Length - 1;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
+        return !__instance.IsCustom();
     }
 
     [HarmonyPrefix]
@@ -292,9 +60,19 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
-        __instance.ValueText.text = TranslationController.Instance.GetString(__instance.Values[__instance.Value], Array.Empty<Object>());
+        __instance.TitleText.text =
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.ValueText.text = TranslationController.Instance.GetString(
+            __instance.Values[__instance.Value],
+            Array.Empty<Object>());
 
         return false;
     }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
+    public static bool StringUpdate(StringOption __instance)
+    {
+        return !__instance.IsCustom();
+    }
 }

MiraAPI/Patches/Options/PlayerOptionPatches.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Linq;
-using HarmonyLib;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using UnityEngine;
-using Object = Il2CppSystem.Object;
-
-namespace MiraAPI.Patches.Options;
-
-[HarmonyPatch(typeof(PlayerOption))]
-public static class PlayerOptionPatches
-{
-    // Updates the list of players according to the filter.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.FixedUpdate))]
-    public static bool PlayerOptionUpdatePatch(PlayerOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        if (!ModdedOptionsManager.CreatedPlayerOptions.TryGetValue(__instance, out var moddedPlrOpt)) return false;
-
-        var filteredPlayers = moddedPlrOpt.GetFilteredPlayers();
-        if (filteredPlayers.Count != __instance.Values.Count)
-        {
-            filteredPlayers.Sort((a, b) => a.PlayerId.CompareTo(b.PlayerId));
-
-            __instance.Values = filteredPlayers.ToIl2CppList();
-            moddedPlrOpt.Values = __instance.Values;
-            __instance.playerIndex = filteredPlayers.FindIndex(p => p.PlayerId == __instance.Value);
-            __instance.SetValueText();
-        }
-
-        __instance.CheckValueChanged();
-
-        return false;
-    }
-
-    // Disable going under 0 if you aren't allowed to choose None.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.UpdatePlayerIndex))]
-    public static bool UpdatePlayerIndexPatch(PlayerOption __instance, int index)
-    {
-        if (!__instance.IsCustom() || ModdedOptionsManager.CreatedPlayerOptions[__instance].AllowNone)
-        {
-            return true;
-        }
-
-        var newIndex = Mathf.Clamp(index, 0, __instance.Values.Count - 1);
-        __instance.playerIndex = newIndex;
-        __instance.Value = __instance.Values[newIndex].PlayerId;
-        return false;
-    }
-
-    // Replace "Round Robin" with "None" in the Host Options Menu.
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(PlayerOption.SetValueText))]
-    public static void SetValueTextPatch(PlayerOption __instance)
-    {
-        if (__instance.playerIndex < 0)
-        {
-            __instance.ValueText.text = TranslationController.Instance.GetString(StringNames.FilterNone);
-        }
-    }
-
-    // Innersloth hardcode literally replaces the value with the HNS impostor option OnEnable, so I have to patch that out. Smh.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.OnEnable))]
-    public static bool OnEnablePatch(PlayerOption __instance)
-    {
-        return !__instance.IsCustom();
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.GetInt))]
-    public static bool GetIntPatch(PlayerOption __instance, ref int __result)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __result = __instance.Value;
-        return false;
-    }
-
-    // Used to replace "Round Robin" with "None" for option notification & view pane.
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerSelectionGameSetting), nameof(PlayerSelectionGameSetting.GetValueString))]
-    public static bool GetStringPatch(PlayerSelectionGameSetting __instance, float value, ref string __result)
-    {
-        var option = ModdedOptionsManager.ModdedOptions.FirstOrDefault(x => x.Value.Data == __instance).Value;
-        if (option == null) return true;
-
-        var networkedPlayerInfo = GameData.Instance.AllPlayers.ToArray().FirstOrDefault(p => p.PlayerId == (int)value);
-        if (networkedPlayerInfo != null)
-        {
-            __result = networkedPlayerInfo.PlayerName;
-            return false;
-        }
-
-        __result = TranslationController.Instance.GetString(StringNames.FilterNone);
-        return false;
-    }
-
-    // "UpdateValue" was inlined and I needed to replace it, so I just rewrote the method where it's called from.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.CheckValueChanged))]
-    public static bool UpdateValuePatch(PlayerOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        if (__instance.oldValue == __instance.Value) return false;
-
-        __instance.oldValue = __instance.Value;
-        __instance.SetValueText();
-
-        return false;
-    }
-}

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using MiraAPI.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
@@ -23,34 +22,20 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(RolesSettingsMenu))]
 public static class RoleSettingMenuPatches
 {
-    public static Dictionary<int, Vector3> RolePositions { get; set; } = [];
-
-    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; set; } = [];
-    private static List<GameObject> Headers { get; set; } = [];
-    private static List<RoleOptionSetting> RoleOptionSettings { get; set; } = [];
+    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; set; } = new();
+    private static List<GameObject> Headers { get; set; } = new();
+    private static List<RoleOptionSetting> RoleOptionSettings { get; set; } = new();
 
     private static float ScrollerNum { get; set; } = 0.522f;
 
-    private static RoleBehaviour? CurrentRole { get; set; }
-    private static List<IModdedOption>? CurrentRoleOptions { get; set; }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
-    public static void SetQuotaTabPostfix(RolesSettingsMenu __instance)
-    {
-        __instance.scrollBar.SetScrollBounds(__instance);
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
-    public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
+    public static bool PatchStart(RolesSettingsMenu __instance)
     {
         Headers.ForEach(Object.Destroy);
         RoleOptionSettings.ForEach(Object.Destroy);
         Headers.Clear();
         RoleOptionSettings.Clear();
-        CurrentRole = null;
-        CurrentRoleOptions = null;
 
         __instance.roleChances = new Il2CppSystem.Collections.Generic.List<RoleOptionSetting>();
         __instance.advancedSettingChildren = new Il2CppSystem.Collections.Generic.List<OptionBehaviour>();
@@ -82,7 +67,7 @@ public static class RoleSettingMenuPatches
 
         var num3 = 0;
 
-        var roleGroups = GameSettingMenuPatches.SelectedMod?.InternalRoles.Values.OfType<ICustomRole>()
+        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         if (roleGroups is null)
@@ -217,10 +202,9 @@ public static class RoleSettingMenuPatches
             headerBtn.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
-                    if (RoleGroupHidden.TryGetValue(group, out var groupHidden))
+                    if (RoleGroupHidden.TryGetValue(group, out var value))
                     {
-                        RoleGroupHidden[group] = !groupHidden;
+                        RoleGroupHidden[group] = !value;
                     }
                     foreach (var header in Headers)
                     {
@@ -241,72 +225,33 @@ public static class RoleSettingMenuPatches
                 ScrollerNum -= 0.4f;
             }
         }
-
-        __instance.scrollBar.SetScrollBounds(__instance);
+        __instance.scrollBar.SetScrollBounds();
         return false;
     }
 
-    private static void SetScrollBounds(this Scroller scroller, RolesSettingsMenu roleMenu)
+    private static void SetScrollBounds(this Scroller scroller)
     {
-        if (GameSettingMenuPatches.SelectedModIdx == 0)
-        {
-            scroller.CalculateAndSetYBounds(roleMenu.roleChances.Count + 3, 1f, 6f, 0.43f);
-            return;
-        }
-
-        scroller.SetYBoundsMax(-ScrollerNum - 2);
-        if (RolePositions.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
-        {
-            scroller.Inner.localPosition = scroll;
-            scroller.UpdateScrollBars();
-        }
-        else
-        {
-            scroller.ScrollToTop();
-        }
+        scroller.CalculateAndSetYBounds(1 + 1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
     }
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.Update))]
-    public static bool UpdatePatch(RolesSettingsMenu __instance)
+    public static bool UpdatePatch()
     {
-        if (GameSettingMenuPatches.SelectedModIdx == 0) return true;
-        if (CurrentRole == null || CurrentRoleOptions == null) return false;
-
-        var hasImage = CurrentRole.RoleScreenshot != null;
-        var num = hasImage ? -0.872f : -1;
-
-        foreach (var opt in CurrentRoleOptions)
-        {
-            if (opt.OptionBehaviour == null) continue;
-
-            if (!opt.Visible.Invoke())
-            {
-                opt.OptionBehaviour.gameObject.SetActive(false);
-                continue;
-            }
-
-            opt.OptionBehaviour.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
-            opt.OptionBehaviour.gameObject.SetActive(true);
-            num += -0.45f;
-        }
-
-        __instance.scrollBar.SetYBoundsMax(-num - 3);
-        return false;
+        return GameSettingMenuPatches.SelectedModIdx == 0;
     }
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(RolesSettingsMenu.OpenChancesTab))]
     public static void OpenChancesTabPostfix(RolesSettingsMenu __instance)
     {
-        if (!__instance.scrollBar)
+        if (GameSettingMenuPatches.SelectedModIdx == 0 || !__instance.scrollBar)
         {
             return;
         }
 
-        CurrentRole = null;
-        CurrentRoleOptions = null;
-        __instance.scrollBar.SetScrollBounds(__instance);
+        __instance.scrollBar.SetScrollBounds();
+        __instance.scrollBar.ScrollToTop();
     }
 
     private static void ValueChanged(OptionBehaviour obj)
@@ -358,16 +303,16 @@ public static class RoleSettingMenuPatches
             optBehaviour.gameObject.DestroyImmediate();
         }
 
-        CurrentRole = role;
         __instance.advancedSettingChildren.Clear();
 
-        // TODO: create sub groups under the role settings.
-        var filteredOptions = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.GroupVisible() && x.OptionableType == role.GetType())
-            .SelectMany(x => x.Options)
-            .ToList() ?? [];
+        var hasImage = role.RoleScreenshot != null;
+        var num = hasImage ? -0.872f : -1;
 
-        CurrentRoleOptions = filteredOptions;
+        // TODO: create sub groups under the role settings.
+        var filteredOptions = GameSettingMenuPatches.SelectedMod?.OptionGroups
+            .Where(x=> x.OptionableType == role.GetType())
+            .SelectMany(x=>x.Options)
+            .ToList() ?? [];
 
         foreach (var option in filteredOptions)
         {
@@ -375,9 +320,9 @@ public static class RoleSettingMenuPatches
                 __instance.checkboxOrigin,
                 __instance.numberOptionOrigin,
                 __instance.stringOptionOrigin,
-                GameSettingMenu.Instance.GameSettingsTab.playerOptionOrigin,
                 __instance.AdvancedRolesSettings.transform);
 
+            newOpt.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
             newOpt.SetClickMask(__instance.ButtonClickMask);
 
             SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
@@ -395,10 +340,11 @@ public static class RoleSettingMenuPatches
             newOpt.LabelBackground.enabled = false;
             __instance.advancedSettingChildren.Add(newOpt);
 
-            newOpt.gameObject.SetActive(false);
+            num += -0.45f;
             newOpt.Initialize();
         }
 
+        __instance.scrollBar.CalculateAndSetYBounds(__instance.advancedSettingChildren.Count + 3, 1f, 6f, 0.45f);
         __instance.scrollBar.ScrollToTop();
     }
 
@@ -410,8 +356,6 @@ public static class RoleSettingMenuPatches
             return;
         }
 
-        RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
-
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
         __instance.roleTitleText.text = TranslationController.Instance.GetString(
             role.StringName,
@@ -522,10 +466,6 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);
-        roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
-        roleOptionSetting.ChancePlusBtn.SetInteractable(true);
-        roleOptionSetting.CountMinusBtn.SetInteractable(true);
-        roleOptionSetting.CountPlusBtn.SetInteractable(true);
         __instance.roleChances.Add(roleOptionSetting);
 
         roleOptionSetting.titleText.transform.localPosition = new Vector3(-0.5376f, -0.2923f, 0f);
@@ -533,8 +473,8 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.titleText.horizontalAlignment = HorizontalAlignmentOptions.Left;
 
         if (GameSettingMenuPatches.SelectedMod is null ||
-            GameSettingMenuPatches.SelectedMod.InternalOptionGroups
-                .Exists(x => x.GroupVisible() && x.OptionableType == role.GetType() && x.Options.Any(y => y.Visible())))
+            GameSettingMenuPatches.SelectedMod.OptionGroups
+                .Exists(x => x.OptionableType == role.GetType()))
         {
             var newButton = Object.Instantiate(roleOptionSetting.buttons[0], roleOptionSetting.transform);
             newButton.name = "ConfigButton";
@@ -565,7 +505,7 @@ public static class RoleSettingMenuPatches
             roleOptionSetting.ChancePlusBtn.gameObject.SetActive(false);
         }
 
-        if (index < GameSettingMenuPatches.SelectedMod?.InternalRoles.Count - 1)
+        if (index < GameSettingMenuPatches.SelectedMod?.CustomRoles.Count - 1)
         {
             ScrollerNum -= 0.43f;
         }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -5,9 +5,8 @@ using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
-using MiraAPI.Utilities;
+using MiraAPI.Roles;
 using MiraAPI.Voting;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 
 namespace MiraAPI.Patches;
@@ -42,7 +41,7 @@ internal static class PlayerControlPatches
     // ReSharper disable once InconsistentNaming
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
-        var deathEvent = new PlayerDeathEvent(__instance, reason, Helpers.GetBodyById(__instance.PlayerId));
+        var deathEvent = new PlayerDeathEvent(__instance, reason);
         MiraEventManager.InvokeEvent(deathEvent);
 
         var modifiersComponent = __instance.GetComponent<ModifierComponent>();
@@ -69,7 +68,6 @@ internal static class PlayerControlPatches
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
     // ReSharper disable once InconsistentNaming
-    // Note: This method is partially inlined in 2025.5.20 but we already use custom murder RPCs.
     public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
     {
         var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
@@ -83,6 +81,11 @@ internal static class PlayerControlPatches
     // ReSharper disable once InconsistentNaming
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
     {
+        if (__instance.Data?.Role is ICustomRole customRole)
+        {
+            customRole.PlayerControlFixedUpdate(__instance);
+        }
+
         if (!__instance.AmOwner)
         {
             return;
@@ -95,19 +98,12 @@ internal static class PlayerControlPatches
                 continue;
             }
 
-            try
+            if (!button.Enabled(__instance.Data?.Role))
             {
-                if (!button.Enabled(__instance.Data?.Role))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                button.FixedUpdateHandler(__instance);
-            }
-            catch (System.Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to update custom button {button.GetType().Name}: {e}");
-            }
+            button.FixedUpdateHandler(__instance);
         }
     }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,4 +1,6 @@
-using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Meeting;
@@ -25,7 +27,7 @@ internal static class EjectionPatches
             return;
         }
 
-        if (!GameManager.Instance.LogicOptions.GetConfirmImpostor() || role.GetCustomEjectionMessage(__instance.initData.networkedPlayer) == null)
+        if (role.GetCustomEjectionMessage(__instance.initData.networkedPlayer) == null)
         {
             return;
         }
@@ -38,13 +40,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/GameStartupPatch.cs

@@ -10,7 +10,7 @@ public static class GameStartupPatch
     private static bool _runOnce;
 
     /// <summary>
-    /// This is used for registering roles when the game opens, might be a janky solution, but it works.
+    /// This is used for registering roles when the game opens, might be a janky solution, but it works
     /// </summary>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(MainMenuManager.Start))]
@@ -23,11 +23,7 @@ public static class GameStartupPatch
 
         _runOnce = true;
 
-        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0)
-        {
-            return;
-        }
-
+        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0) return;
         foreach (var queue in MiraPluginManager.Instance.QueuedRoleRegistrations)
         {
             CustomRoleManager.RegisterRoleTypes(queue.Value, queue.Key);

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -7,8 +7,7 @@ namespace MiraAPI.Patches.Roles;
 /// <summary>
 /// Patches the haunt menu to show the actual role name rather then team.
 /// </summary>
-[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetHauntTarget))]
-// SetFilterText was INLINED
+[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetFilterText))]
 public static class HauntMenuMinigamePatch
 {
     public static void Postfix(HauntMenuMinigame __instance)
@@ -25,4 +24,4 @@ public static class HauntMenuMinigamePatch
         __instance.FilterText.text = role.NiceName;
         __instance.FilterText.color = color;
     }
-}
+}

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,18 @@ public static class HudManagerPatches
 
         if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
         {
-            if (RoleTab == null)
+            customRole.HudUpdate(__instance);
+
+            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/Roles/RoleManagerPatches.cs

@@ -14,8 +14,6 @@ public static class RoleManagerPatches
 {
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleManager.SetRole))]
-    // NOTE: As of 2025.5.20 update, this is INLINED in ONE place: GameManager::ReviveEveryoneFreeplay(void).
-    // Should not affect normal gameplay, but may cause issues in Freeplay.
     public static bool SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
     {
         if (!targetPlayer)
@@ -65,7 +63,7 @@ public static class RoleManagerPatches
     [HarmonyPatch(nameof(RoleManager.SelectRoles))]
     public static void ModifierSelectionPatches(RoleManager __instance)
     {
-        if (!AmongUsClient.Instance.AmHost || !ModifierManager.MiraAssignsModifiers)
+        if (!AmongUsClient.Instance.AmHost)
         {
             return;
         }

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -1,6 +1,5 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
-using Il2CppSystem.Collections.Generic;
 using MiraAPI.Roles;
 using Reactor.Utilities;
 
@@ -13,24 +12,7 @@ namespace MiraAPI.Patches.Roles;
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
-    /// This patch fixes GetNumPerGame being inlined (2025.5.20) in the original code.
-    /// </summary>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV09.AnyRolesEnabled))]
-    public static bool AnyRolesEnabledPrefix(RoleOptionsCollectionV09 __instance, ref bool __result)
-    {
-        foreach (KeyValuePair<RoleTypes, RoleDataV09> keyValuePair in __instance.roles)
-        {
-            if (__instance.GetNumPerGame(keyValuePair.Key) > 0)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /// <summary>
-    /// Set the role chance for custom Launchpad roles based on config.
+    /// Set the role chance for custom Launchpad roles based on config
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
@@ -60,7 +42,7 @@ public static class RoleOptionsCollectionPatch
     }
 
     /// <summary>
-    /// Set the amount for custom Launchpad roles based on config.
+    /// Set the amount for custom Launchpad roles based on config
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]

MiraAPI/Patches/Roles/SabotageButtonPatch.cs

@@ -4,7 +4,7 @@ using MiraAPI.Roles;
 namespace MiraAPI.Patches.Roles;
 
 [HarmonyPatch(typeof(SabotageButton))]
-public static class SabotageButtonPatch
+public class SabotageButtonPatch
 {
     /// <summary>
     /// Patches the Sabotage button to check if the player's custom role can use sabotage.

MiraAPI/Patches/ServerDropdownPatch.cs

@@ -1,59 +0,0 @@
-using HarmonyLib;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.SceneManagement;
-
-namespace MiraAPI.Patches;
-
-[HarmonyPatch(typeof(ServerDropdown), nameof(ServerDropdown.FillServerOptions))]
-public static class ServerDropdownPatch
-{
-    public static bool Prefix(ServerDropdown __instance)
-    {
-        var num = 0;
-        __instance.background.size = new Vector2(8.4f, 4.8f);
-
-        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;
-                __instance.firstOption.ChangeButtonText(
-                    DestroyableSingleton<TranslationController>.Instance.GetStringWithDefault(
-                        regionInfo.TranslateName,
-                        regionInfo.Name));
-            }
-            else
-            {
-                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;
-                serverListButton.Text.text =
-                    DestroyableSingleton<TranslationController>.Instance.GetStringWithDefault(
-                        regionInfo.TranslateName,
-                        regionInfo.Name);
-                serverListButton.Text.ForceMeshUpdate();
-                serverListButton.Button.OnClick.RemoveAllListeners();
-                serverListButton.Button.OnClick.AddListener((UnityAction)(() => { __instance.ChooseOption(region); }));
-                __instance.controllerSelectable.Add(serverListButton.Button);
-                __instance.background.transform.localPosition = new Vector3(
-                    findingGame ? 2f : 0f,
-                    __instance.initialYPos + (-0.3f * (num / 2)),
-                    0f);
-                __instance.background.size = new Vector2(__instance.background.size.x, 1.2f + (0.6f * (num / 2)));
-                num++;
-            }
-        }
-
-        return false;
-    }
-}

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/Patches/Voting/MeetingHudPatches.cs

@@ -140,6 +140,84 @@ internal static class MeetingHudPatches
         return false;
     }
 
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.CastVote))]
+    public static bool CastVotePatch(MeetingHud __instance, byte srcPlayerId, byte suspectPlayerId)
+    {
+        var plr = GameData.Instance.GetPlayerById(srcPlayerId);
+
+        if (plr == null)
+        {
+            return false;
+        }
+
+        var voteData = plr.Object.GetVoteData();
+        if (voteData == null || voteData.VotesRemaining == 0 ||
+            voteData.VotedFor(suspectPlayerId))
+        {
+            return false;
+        }
+
+        VotingUtils.HandleVote(voteData, suspectPlayerId);
+
+        __instance.SetDirtyBit(1U);
+        __instance.CheckForEndVoting();
+
+        if (voteData.VotesRemaining != 0)
+        {
+            return false;
+        }
+
+        __instance.playerStates.First(x => x.TargetPlayerId == srcPlayerId).SetVote(suspectPlayerId);
+        PlayerControl.LocalPlayer.RpcSendChatNote(srcPlayerId, ChatNoteTypes.DidVote);
+
+        return false;
+    }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.CmdCastVote))]
+    public static void CmdCastVotePatch(MeetingHud __instance, byte playerId, byte suspectIdx)
+    {
+        var plr = GameData.Instance.GetPlayerById(playerId);
+        var voteData = plr.Object.GetVoteData();
+
+        if (!AmongUsClient.Instance.AmHost)
+        {
+            if (voteData == null || voteData.VotesRemaining == 0 ||
+                voteData.VotedFor(suspectIdx))
+            {
+                return;
+            }
+
+            VotingUtils.HandleVote(voteData, suspectIdx);
+
+            if (voteData.VotesRemaining == 0)
+            {
+                __instance.playerStates.First(x => x.TargetPlayerId == playerId).SetVote(suspectIdx);
+            }
+        }
+
+        if (PlayerControl.LocalPlayer.PlayerId != playerId)
+        {
+            return;
+        }
+
+        SoundManager.Instance.PlaySound(__instance.VoteLockinSound, false);
+
+        foreach (var playerVoteArea in __instance.playerStates)
+        {
+            playerVoteArea.ClearButtons();
+        }
+
+        __instance.SkipVoteButton.ClearButtons();
+
+        var localVoteData = PlayerControl.LocalPlayer.GetVoteData();
+        if (localVoteData == null || localVoteData.VotesRemaining != 0) return;
+
+        __instance.SkipVoteButton.voteComplete = true;
+        __instance.SkipVoteButton.gameObject.SetActive(false);
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(MeetingHud.CheckForEndVoting))]
     public static bool EndCheck(MeetingHud __instance)
@@ -202,21 +280,12 @@ internal static class MeetingHudPatches
         return false;
     }
 
-    // TODO: figure out a way to do host-authorization since right now any player can send RpcCastVote
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(MeetingHud.CmdCastVote))]
-    // Although this method is inlined in MeetingHud.Confirm, the next patch fixes that.
-    public static bool CmdCastVoteOverridePatch(MeetingHud __instance, byte playerId, byte suspectIdx)
-    {
-        VotingUtils.RpcCastVote(PlayerControl.LocalPlayer, playerId, suspectIdx);
-        return false;
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(nameof(MeetingHud.Confirm))]
     public static bool ConfirmPatch(MeetingHud __instance, [HarmonyArgument(0)] byte suspect)
     {
         __instance.CmdCastVote(PlayerControl.LocalPlayer.PlayerId, suspect);
+
         return false;
     }
 }