fixed presets

Addressables Loading

.gitignore

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

AmongUs.props

@@ -2,10 +2,10 @@
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.10.29" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.3.25" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
-        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" />
+        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
     </ItemGroup>
 
     <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.1.9</VersionPrefix>
+        <VersionPrefix>0.2.0</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>
@@ -34,7 +34,7 @@
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
         <AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" Visible="false" />
 
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -1,10 +1,10 @@
-using MiraAPI.Example.Options.Roles;
+using System.Collections;
+using MiraAPI.Example.Options.Roles;
 using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.Hud;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
-using System.Collections;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
@@ -19,7 +19,7 @@ public class TeleportButton : CustomActionButton
     public override int MaxUses => 2;
 
     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 bool Enabled(RoleBehaviour? role)

MiraAPI.Example/ExampleAssets.cs

@@ -5,6 +5,7 @@ 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/ExampleEventHandlers.cs

@@ -1,10 +1,18 @@
-using MiraAPI.Events;
+using System.Linq;
+using MiraAPI.Events;
 using MiraAPI.Events.Mira;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Map;
+using MiraAPI.Events.Vanilla.Meeting;
+using MiraAPI.Events.Vanilla.Meeting.Voting;
 using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Example.Buttons.Freezer;
+using MiraAPI.Example.Roles;
+using MiraAPI.Utilities;
+using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
+using TMPro;
+using UnityEngine;
 
 namespace MiraAPI.Example;
 
@@ -12,11 +20,7 @@ public static class ExampleEventHandlers
 {
     public static void Initialize()
     {
-        // Register event handlers here
-        MiraEventManager.RegisterEventHandler<MiraButtonClickEvent<FreezeButton>>(FreezeButtonClickHandler, 1);
-        MiraEventManager.RegisterEventHandler<MiraButtonCancelledEvent<FreezeButton>>(FreezeButtonCancelledHandler);
-        MiraEventManager.RegisterEventHandler<UpdateSystemEvent>(UpdateSystemEventHandler);
-
+        // You can register event handlers with the MiraEventManager class.
         MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
         {
             Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
@@ -33,24 +37,59 @@ public static class ExampleEventHandlers
         });
     }
 
+    // If you want to add extra votes to a player, do something like this.
+    [RegisterEvent]
+    public static void StartMeetingEvent(StartMeetingEvent _)
+    {
+        foreach (var plr in PlayerControl.AllPlayerControls.ToArray().Where(player => player.Data.Role is MayorRole))
+        {
+            plr.GetVoteData().IncreaseRemainingVotes(1);
+        }
+    }
+
+    // Example of using the Voting API to make a role similar to the Prosecutor from Town of Us.
+    [RegisterEvent(15)]
+    public static void HandleVoteEvent(HandleVoteEvent @event)
+    {
+        if (@event.VoteData.Owner.Data.Role is not NeutralKillerRole) return;
+
+        @event.VoteData.SetRemainingVotes(0);
+
+        for (var i = 0; i < 5; i++)
+        {
+            @event.VoteData.VoteForPlayer(@event.TargetId);
+        }
+
+        foreach (var plr in PlayerControl.AllPlayerControls.ToArray().Where(player => player != @event.VoteData.Owner))
+        {
+            plr.GetVoteData().Votes.Clear();
+            plr.GetVoteData().VotesRemaining = 0;
+        }
+
+        @event.Cancel();
+    }
+
+    // Events can be registered using an attribute as well.
+    [RegisterEvent]
     public static void UpdateSystemEventHandler(UpdateSystemEvent @event)
     {
         Logger<ExamplePlugin>.Error(@event.SystemType.ToString());
     }
 
     // Example event handler
+    [RegisterEvent(1)]
     public static void FreezeButtonClickHandler(MiraButtonClickEvent<FreezeButton> @event)
     {
         Logger<ExamplePlugin>.Warning("Freeze button clicked!");
 
-        if (PlayerControl.LocalPlayer.Data.PlayerName == "stupid")
-        {
-            @event.Cancel();
-            @event.Button.SetTimer(15f);
-        }
+        if (PlayerControl.LocalPlayer.Data.PlayerName != "stupid") return;
+
+        @event.Cancel();
+        @event.Button.SetTimer(15f);
     }
 
     // Example event handler
+    [RegisterEvent]
     public static void FreezeButtonCancelledHandler(MiraButtonCancelledEvent<FreezeButton> @event)
     {
         Logger<ExamplePlugin>.Warning("Freeze button cancelled!");

MiraAPI.Example/GameOver/NeutralKillerGameOver.cs

@@ -1,4 +1,5 @@
-using MiraAPI.GameEnd;
+using MiraAPI.Example.Roles;
+using MiraAPI.GameEnd;
 using MiraAPI.Utilities;
 using UnityEngine;
 
@@ -6,6 +7,11 @@ namespace MiraAPI.Example.GameOver;
 
 public class NeutralKillerGameOver : CustomGameOver
 {
+    public override bool VerifyCondition(PlayerControl playerControl, NetworkedPlayerInfo[] winners)
+    {
+        return winners is [{ Role: NeutralKillerRole }];
+    }
+
     public override void AfterEndGameSetup(EndGameManager endGameManager)
     {
         endGameManager.WinText.text = "Outcast Killer Wins!";

MiraAPI.Example/MiraAPI.Example.csproj

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

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,18 +1,37 @@
-using MiraAPI.Modifiers.Types;
+using Il2CppSystem.Collections.Generic;
+using MiraAPI.Example.Options.Modifiers;
+using MiraAPI.GameOptions;
+using MiraAPI.Modifiers;
+using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities.Assets;
+using Reactor.Utilities.Extensions;
+using UnityEngine;
+using Random = System.Random;
 
 namespace MiraAPI.Example.Modifiers;
 
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";
+    public override LoadableAsset<Sprite>? ModifierIcon => ExampleAssets.CallMeetingButton;
 
-    public override int GetAmountPerGame()
+    public override void OnDeath(DeathReason reason)
     {
-        return 1;
+        Player.RemoveModifier(this);
+    }
+
+    public override string GetDescription()
+    {
+        return $"You can call a meeting from anywhere on the map.";
     }
 
     public override int GetAssignmentChance()
     {
-        return 100;
+        return (int)OptionGroupSingleton<CaptainModifierSettings>.Instance.Chance;
+    }
+
+    public override int GetAmountPerGame()
+    {
+        return (int)OptionGroupSingleton<CaptainModifierSettings>.Instance.Amount;
     }
 }

MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs

@@ -15,7 +15,7 @@ public class FreezeModifier : TimedModifier
 
     public override void OnActivate()
     {
-        if (Player?.AmOwner == true)
+        if (Player.AmOwner)
         {
             Player.moveable = false;
         }
@@ -25,15 +25,15 @@ public class FreezeModifier : TimedModifier
     {
         base.FixedUpdate();
 
-        if (Player?.AmOwner == true || PlayerControl.LocalPlayer.Data.Role is FreezerRole)
+        if (Player.AmOwner || PlayerControl.LocalPlayer.Data.Role is FreezerRole)
         {
-            Player?.cosmetics.SetOutline(true, new Nullable<Color>(Palette.LightBlue));
+            Player.cosmetics.SetOutline(true, new Nullable<Color>(Palette.LightBlue));
         }
     }
 
     public override void OnTimerComplete()
     {
-        if (Player?.AmOwner == true)
+        if (Player.AmOwner)
         {
             Player.moveable = true;
         }

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,10 +1,18 @@
 using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers;
 
 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/Modifiers/CaptainModifierSettings.cs

@@ -0,0 +1,19 @@
+using MiraAPI.Example.Modifiers;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+
+namespace MiraAPI.Example.Options.Modifiers;
+
+public class CaptainModifierSettings : AbstractOptionGroup<CaptainModifier>
+{
+    public override string GroupName => "Captain Settings";
+
+    [ModdedNumberOption("Amount", 0, 5)]
+    public float Amount { get; set; } = 1;
+
+    [ModdedNumberOption("Chance", 0, 100, 10)]
+    public float Chance { get; set; } = 50;
+
+    [ModdedNumberOption("Uses", 1, 5)]
+    public float NumUses { get; set; } = 3;
+}

MiraAPI.Example/Options/Modifiers/FreezeModifierSettings.cs

@@ -0,0 +1,13 @@
+using MiraAPI.Example.Modifiers.Freezer;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+
+namespace MiraAPI.Example.Options.Modifiers;
+
+public class FreezeModifierSettings : AbstractOptionGroup<FreezeModifier>
+{
+    public override string GroupName => "Freeze";
+
+    [ModdedToggleOption("Use Color")]
+    public bool UseColor { get; set; } = true;
+}

MiraAPI.Example/Options/Modifiers/GeneralModifierOptions.cs

@@ -0,0 +1,19 @@
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+
+namespace MiraAPI.Example.Options.Modifiers;
+
+public class GeneralModifierOptions : AbstractOptionGroup
+{
+    public override string GroupName => "General";
+
+    public override uint GroupPriority => 0;
+
+    public override bool ShowInModifiersMenu => true;
+
+    [ModdedToggleOption("Some Boolean Option")]
+    public bool SomeBooleanOption { get; set; } = true;
+
+    [ModdedNumberOption("Number Option", 0, 10, 1)]
+    public float NumberOption { get; set; } = 5;
+}

MiraAPI.Example/Options/Roles/FreezerRoleSettings.cs

@@ -1,17 +1,14 @@
 using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
-using System;
 using MiraAPI.Utilities;
 
 namespace MiraAPI.Example.Options.Roles;
 
-public class FreezerRoleSettings : AbstractOptionGroup
+public class FreezerRoleSettings : AbstractOptionGroup<FreezerRole>
 {
     public override string GroupName => "Custom Role";
 
-    public override Type AdvancedRole => typeof(FreezerRole);
-
     [ModdedNumberOption("Freeze Duration", 1, 15, 1, MiraNumberSuffixes.Seconds)]
     public float FreezeDuration { get; set; } = 5;
 

MiraAPI.Example/Options/Roles/TeleporterOptions.cs

@@ -1,5 +1,4 @@
-using System;
-using MiraAPI.Example.Roles;
+using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.GameOptions.OptionTypes;
@@ -7,12 +6,10 @@ using MiraAPI.Utilities;
 
 namespace MiraAPI.Example.Options.Roles;
 
-public class TeleporterOptions : AbstractOptionGroup
+public class TeleporterOptions : AbstractOptionGroup<TeleporterRole>
 {
     public override string GroupName => "Teleporter";
 
-    public override Type AdvancedRole => typeof(TeleporterRole);
-
     public ModdedNumberOption TeleportCooldown { get; set; } = new("Teleport Cooldown", 10, 5, 60, 2.5f, MiraNumberSuffixes.Seconds);
 
     [ModdedNumberOption("Teleport Duration", 5, 25, 1, MiraNumberSuffixes.Seconds)]

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,4 +1,6 @@
-using MiraAPI.Roles;
+using AmongUs.GameOptions;
+using MiraAPI.Roles;
+using Reactor.Utilities;
 using TMPro;
 using UnityEngine;
 
@@ -12,11 +14,18 @@ public class ChameloenRole : CrewmateRole, ICustomRole
     public Color RoleColor => Palette.AcceptedGreen;
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
 
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
+    public CustomRoleConfiguration Configuration => new(this)
     {
         OptionsScreenshot = ExampleAssets.Banner,
+        IntroSound = CustomRoleUtils.GetIntroSound(RoleTypes.Shapeshifter),
     };
 
+    public override void Initialize(PlayerControl player)
+    {
+        Player = player;
+        Logger<ExamplePlugin>.Error("Initializing ChamelonRole for player: " + player.PlayerId);
+    }
+
     public void PlayerControlFixedUpdate(PlayerControl playerControl)
     {
         if (playerControl.MyPhysics.Velocity.magnitude > 0)

MiraAPI.Example/Roles/MayorRole.cs

@@ -0,0 +1,14 @@
+using MiraAPI.Roles;
+using UnityEngine;
+
+namespace MiraAPI.Example.Roles;
+
+public class MayorRole : CrewmateRole, ICustomRole
+{
+    public string RoleName => "Mayor";
+    public string RoleLongDescription => "You get extra votes!";
+    public string RoleDescription => RoleLongDescription;
+    public Color RoleColor => new Color32(221, 176, 152, 255);
+    public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
+    public CustomRoleConfiguration Configuration => new(this);
+}

MiraAPI/Events/MiraEventManager.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using Reactor.Utilities;
 
 namespace MiraAPI.Events;
 
@@ -19,7 +21,7 @@ public static class MiraEventManager
     public static bool InvokeEvent<T>(T eventInstance) where T : MiraEvent
     {
         EventWrappers.TryGetValue(typeof(T), out var handlers);
-        if (handlers == null)
+        if (handlers == null || handlers.Count == 0)
         {
             return false;
         }
@@ -41,7 +43,7 @@ public static class MiraEventManager
     public static bool InvokeEvent(MiraEvent eventInstance, Type type)
     {
         EventWrappers.TryGetValue(type, out var handlers);
-        if (handlers == null)
+        if (handlers == null || handlers.Count == 0)
         {
             return false;
         }
@@ -54,28 +56,56 @@ public static class MiraEventManager
         return true;
     }
 
+    /// <summary>
+    /// Register an event.
+    /// </summary>
+    /// <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>
+    public static void RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
+    {
+        if (!type.IsSubclassOf(typeof(MiraEvent)))
+        {
+            Logger<MiraApiPlugin>.Error($"Type must be a subclass of MiraEvent: {type.FullName}");
+            return;
+        }
+
+        EventWrappers.TryAdd(type, []);
+        var handlers = EventWrappers[type];
+
+        var @delegate = Delegate.CreateDelegate(typeof(Action<>).MakeGenericType(type), methodInfo);
+        var eventWrapper = new MiraEventWrapper(@delegate, priority);
+
+        var index = handlers.BinarySearch(eventWrapper, Comparer<MiraEventWrapper>.Create((a, b) => a.Priority.CompareTo(b.Priority)));
+
+        if (index < 0)
+        {
+            index = ~index;
+        }
+
+        handlers.Insert(index, eventWrapper);
+    }
+
     /// <summary>
     /// Register an event.
     /// </summary>
     /// <param name="handler">The callback method/handler for the event.</param>
-    /// <param name="priority">The priority of the event handler. Higher values are called first.</param>
+    /// <param name="priority">The priority of the event handler. Lower values are called first.</param>
     /// <typeparam name="T">Type of event.</typeparam>
     public static void RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
     {
-        if (!EventWrappers.ContainsKey(typeof(T)))
-        {
-            EventWrappers.Add(typeof(T), []);
-        }
+        EventWrappers.TryAdd(typeof(T), []);
 
         var handlers = EventWrappers[typeof(T)];
-        handlers.Add(new MiraEventWrapper(handler, priority));
-    }
+        var eventWrapper = new MiraEventWrapper(handler, priority);
 
-    internal static void SortAllHandlers()
-    {
-        foreach (var handlers in EventWrappers.Values)
+        var index = handlers.BinarySearch(eventWrapper, Comparer<MiraEventWrapper>.Create((a, b) => a.Priority.CompareTo(b.Priority)));
+
+        if (index < 0)
         {
-            handlers.Sort((a, b) => a.Priority.CompareTo(b.Priority));
+            index = ~index;
         }
+
+        handlers.Insert(index, eventWrapper);
     }
 }

MiraAPI/Events/MiraEventWrapper.cs

@@ -13,7 +13,7 @@ public class MiraEventWrapper
     public Delegate EventHandler { get; }
 
     /// <summary>
-    /// Gets the priority of the handler. Higher values are called first.
+    /// Gets the priority of the handler. Lower values are called first.
     /// </summary>
     public int Priority { get; }
 

MiraAPI/Events/RegisterEventAttribute.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace MiraAPI.Events;
+
+/// <summary>
+/// Register an event.
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public class RegisterEventAttribute : Attribute
+{
+    /// <summary>
+    /// Gets the priority of the event. Lower values are called first.
+    /// </summary>
+    public int Priority { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RegisterEventAttribute"/> class.
+    /// </summary>
+    /// <param name="priority">The priority of the event. Lower values are called first.</param>
+    public RegisterEventAttribute(int priority = 0)
+    {
+        Priority = priority;
+    }
+}

MiraAPI/Events/Vanilla/Gameplay/IntroEndEvent.cs

@@ -0,0 +1,12 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// The event that is invoked when the intro cutscene has finished playing.
+/// </summary>
+public class IntroEndEvent(IntroCutscene introCutscene) : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the IntroCutscene.
+    /// </summary>
+    public IntroCutscene IntroCutscene { get; } = introCutscene;
+}

MiraAPI/Events/Vanilla/Gameplay/RoundStartEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// Start Round event, invoked on IntroCutscene.OnDestroy and ExileController.WrapUp.
+/// </summary>
+public class RoundStartEvent : MiraEvent
+{
+    /// <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="RoundStartEvent"/> class.
+    /// </summary>
+    /// <param name="triggeredByIntro">Whether the event was triggered by the intro or not.</param>
+    public RoundStartEvent(bool triggeredByIntro)
+    {
+        TriggeredByIntro = triggeredByIntro;
+    }
+}

MiraAPI/Events/Vanilla/Meeting/EndMeetingEvent.cs

@@ -0,0 +1,12 @@
+namespace MiraAPI.Events.Vanilla.Meeting;
+
+/// <summary>
+/// The event that is invoked when the meeting has ended.
+/// </summary>
+public class EndMeetingEvent(MeetingHud meetingHud) : MiraEvent
+{
+    /// <summary>
+    /// Gets the MeetingHud instance.
+    /// </summary>
+    public MeetingHud MeetingHud { get; } = meetingHud;
+}

MiraAPI/Events/Vanilla/Meeting/ReportBodyEvent.cs

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

MiraAPI/Events/Vanilla/Meeting/StartMeetingEvent.cs

@@ -1,35 +1,22 @@
 namespace MiraAPI.Events.Vanilla.Meeting;
 
 /// <summary>
-/// The event that is invoked when a meeting is called.
+/// The event that is invoked when a meeting is called. This event is not cancelable.
+/// This event is called after Mira resets votes, so if you plan on adding votes to a specific player, do it with this event.
 /// </summary>
-public class StartMeetingEvent : MiraCancelableEvent
+public class StartMeetingEvent : MiraEvent
 {
     /// <summary>
-    /// Gets the player that is calling the meeting.
+    /// Gets the MeetingHud instance.
     /// </summary>
-    public PlayerControl Reporter { get; }
-
-    /// <summary>
-    /// Gets the player that is being reported. Will be null for emergency meeting.
-    /// </summary>
-    public NetworkedPlayerInfo? Target { get; }
-
-    /// <summary>
-    /// Gets the body that is being reported. Will be null for emergency meeting.
-    /// </summary>
-    public DeadBody? Body { get; }
+    public MeetingHud MeetingHud { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="StartMeetingEvent"/> class.
     /// </summary>
-    /// <param name="reporter">The player who reported the body.</param>
-    /// <param name="target">The player being reported.</param>
-    /// <param name="body">The body being reported.</param>
-    public StartMeetingEvent(PlayerControl reporter, NetworkedPlayerInfo? target, DeadBody? body)
+    /// <param name="meetingHud">The MeetingHud instance.</param>
+    public StartMeetingEvent(MeetingHud meetingHud)
     {
-        Reporter = reporter;
-        Target = target;
-        Body = body;
+        MeetingHud = meetingHud;
     }
 }

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

@@ -0,0 +1,26 @@
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// Checks if voting is complete. If canceled, the default end voting logic will be skipped.
+/// </summary>
+public class CheckForEndVotingEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets a value indicating whether default voting logic determines that voting is complete.
+    /// </summary>
+    public bool IsVotingComplete { get; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the voting should be forced to end, regardless of the default logic.
+    /// </summary>
+    public bool ForceEndVoting { get; set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CheckForEndVotingEvent"/> class.
+    /// </summary>
+    /// <param name="isVotingComplete">>True if voting is complete, false otherwise.</param>
+    public CheckForEndVotingEvent(bool isVotingComplete)
+    {
+        IsVotingComplete = isVotingComplete;
+    }
+}

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

@@ -0,0 +1,50 @@
+using MiraAPI.Voting;
+
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// The event that is invoked when Mira handles a vote. This is invoked before Mira's behaviour, so be cautious.
+/// If you intend on adding custom vote behaviour, cancel the event and do so.
+/// If you are NOT canceling the event, keep in mind that Mira automatically removes a vote and adds the suspect to the VotedPlayers list after this event is invoked.
+/// </summary>
+public class HandleVoteEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets the instance of the voter's vote data.
+    /// </summary>
+    public PlayerVoteData VoteData { get; }
+
+    /// <summary>
+    /// Gets the player who voted.
+    /// </summary>
+    public PlayerControl Player { get; }
+
+    /// <summary>
+    /// Gets the player id of the target.
+    /// </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>
+    public NetworkedPlayerInfo TargetPlayerInfo { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="HandleVoteEvent"/> class.
+    /// </summary>
+    /// <param name="playerVoteData">The voter's data.</param>
+    /// <param name="targetId">The target's playerId.</param>
+    public HandleVoteEvent(PlayerVoteData playerVoteData, byte targetId)
+    {
+        VoteData = playerVoteData;
+        Player = playerVoteData.Owner;
+        TargetId = targetId;
+        PreventVote = false;
+        TargetPlayerInfo = GameData.Instance.GetPlayerById(targetId);
+    }
+}

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

@@ -0,0 +1,43 @@
+using MiraAPI.Voting;
+
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// The event that is invoked when the player tries to select another player to vote.
+/// </summary>
+public class MeetingSelectEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the voter's vote data.
+    /// </summary>
+    public PlayerVoteData VoteData { get; }
+
+    /// <summary>
+    /// Gets the player id of the target.
+    /// </summary>
+    public int TargetId { get; }
+
+    /// <summary>
+    /// Gets the player info of the target.
+    /// </summary>
+    public NetworkedPlayerInfo TargetPlayerInfo { get; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the player is allowed to select the target.
+    /// </summary>
+    public bool AllowSelect { get; set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MeetingSelectEvent"/> class.
+    /// </summary>
+    /// <param name="playerVoteData">The voter's data.</param>
+    /// <param name="targetId">The target's playerId.</param>
+    /// <param name="allowSelect">>Whether the player is allowed to select the target.</param>
+    public MeetingSelectEvent(PlayerVoteData playerVoteData, int targetId, bool allowSelect)
+    {
+        VoteData = playerVoteData;
+        TargetId = targetId;
+        TargetPlayerInfo = GameData.Instance.GetPlayerById((byte)targetId);
+        AllowSelect = allowSelect;
+    }
+}

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

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using MiraAPI.Voting;
+
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// Called in VotingUtils.HandlePopulateResults.
+/// Cancelling is NOT advised but if you do plan on cancelling, please ensure you account for displaying ALL player's votes.
+/// </summary>
+public class PopulateResultsEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets a list of networked votes.
+    /// </summary>
+    public List<CustomVote> Votes { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PopulateResultsEvent"/> class.
+    /// </summary>
+    /// <param name="votes">The list of votes.</param>
+    public PopulateResultsEvent(List<CustomVote> votes)
+    {
+        Votes = votes;
+    }
+}

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

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using MiraAPI.Voting;
+
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// Ran after calculating votes and before displaying the results. Only ran on the host.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="ProcessVotesEvent"/> class.
+/// </remarks>
+/// <param name="votes">>The list of votes that are being processed.</param>
+/// <param name="exiledPlayer">The player to be exiled. Will be null if no player is to be exiled.</param>
+public class ProcessVotesEvent(List<CustomVote> votes, NetworkedPlayerInfo? exiledPlayer = null) : MiraEvent
+{
+    private readonly List<CustomVote> _originalVotes = [.. votes];
+
+    private NetworkedPlayerInfo? _exiledPlayer = exiledPlayer;
+
+    /// <summary>
+    /// Gets a value indicating whether the exiled player has been modified by the event.
+    /// </summary>
+    public bool ExiledPlayerModified { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the votes have been modified by the event.
+    /// </summary>
+    public bool VotesModified => !Votes.SequenceEqual(_originalVotes);
+
+    /// <summary>
+    /// Gets the list of votes that are being processed.
+    /// </summary>
+    public List<CustomVote> Votes { get; } = votes;
+
+    /// <summary>
+    /// Gets or sets the player to be exiled. Will be null if no player is to be exiled.
+    /// </summary>
+    public NetworkedPlayerInfo? ExiledPlayer
+    {
+        get => _exiledPlayer;
+        set
+        {
+            _exiledPlayer = value;
+            ExiledPlayerModified = true;
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// The event that is invoked when the voting phase of a meeting is complete.
+/// </summary>
+/// <param name="meetingHud">The MeetingHud instance.</param>
+public class VotingCompleteEvent(MeetingHud meetingHud) : MiraEvent
+{
+    /// <summary>
+    /// Gets the MeetingHud instance.
+    /// </summary>
+    public MeetingHud MeetingHud { get; } = meetingHud;
+}

MiraAPI/GameEnd/CustomGameOver.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using MiraAPI.Networking;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 
 namespace MiraAPI.GameEnd;
 
@@ -15,6 +14,17 @@ public abstract class CustomGameOver
     /// </summary>
     public static CustomGameOver? Instance { get; internal set; }
 
+    /// <summary>
+    /// Verifies if the condition for this CustomGameOver is met.
+    /// </summary>
+    /// <param name="playerControl">The PlayerControl that requested the Game Over.</param>
+    /// <param name="winners">The collection of winners.</param>
+    /// <returns>True if the condition is met, otherwise false.</returns>
+    public virtual bool VerifyCondition(PlayerControl playerControl, NetworkedPlayerInfo[] winners)
+    {
+        return true;
+    }
+
     /// <summary>
     /// Runs before the base game calls EndGameManager.SetEverythingUp.
     /// </summary>
@@ -50,12 +60,6 @@ public abstract class CustomGameOver
     /// <typeparam name="T">Type of the custom game over.</typeparam>
     public static void Trigger<T>(IEnumerable<NetworkedPlayerInfo> winners) where T : CustomGameOver
     {
-        if (!AmongUsClient.Instance.AmHost)
-        {
-            Logger<MiraApiPlugin>.Error("Only the host can send a custom game over.");
-            return;
-        }
-
         var reason = GameOverManager.GetGameOverId<T>();
         var data = new GameOverData(reason, [.. winners]);
 

MiraAPI/GameEnd/GameOverManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Reactor.Utilities;
 
 namespace MiraAPI.GameEnd;
@@ -51,7 +52,7 @@ public static class GameOverManager
     /// <param name="id">ID of the custom game over.</param>
     /// <param name="customGameOver">The created instance of the custom game over.</param>
     /// <returns>An instance of the custom game over.</returns>
-    public static bool TryGetGameOver(int id, out CustomGameOver? customGameOver)
+    public static bool TryGetGameOver(int id, [NotNullWhen(true)] out CustomGameOver? customGameOver)
     {
         if (GameOverTypes.TryGetValue(id, out var gameOverType))
         {

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -1,7 +1,7 @@
-using Reactor.Utilities;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Reactor.Utilities;
 
 namespace MiraAPI.GameModes;
 

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions;
@@ -11,11 +12,27 @@ 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>
     public abstract string GroupName { get; }
 
+    /// <summary>
+    /// Gets the Optionable type of the group.
+    /// </summary>
+    public virtual Type? OptionableType => null;
+
+    /// <summary>
+    /// Gets a value indicating whether the group should be shown in the modifiers menu.
+    /// </summary>
+    // TODO: make this not a boolean
+    public virtual bool ShowInModifiersMenu => false;
+
     /// <summary>
     /// Gets the function that determines whether the group should be visible or not.
     /// </summary>
@@ -24,7 +41,7 @@ public abstract class AbstractOptionGroup
     /// <summary>
     /// Gets the group color. This is used to color the group in the options menu.
     /// </summary>
-    public virtual Color GroupColor => Color.clear;
+    public virtual Color GroupColor => MiraApiPlugin.DefaultHeaderColor;
 
     /// <summary>
     /// Gets the group priority. This is used to determine the order in which groups are displayed in the options menu.
@@ -32,12 +49,17 @@ public abstract class AbstractOptionGroup
     /// </summary>
     public virtual uint GroupPriority => uint.MaxValue;
 
-    /// <summary>
-    /// Gets the role the group is associated with. This is used for the advanced role options menu.
-    /// </summary>
-    public virtual Type? AdvancedRole => null;
-
     internal bool AllOptionsHidden { get; set; }
 
     internal CategoryHeaderMasked? Header { get; set; }
 }
+
+/// <summary>
+/// Base class for option groups. An option group is a collection of options that are displayed together in the options menu.
+/// </summary>
+/// <typeparam name="T">The type of the optionable that this group contains.</typeparam>
+public abstract class AbstractOptionGroup<T> : AbstractOptionGroup where T : IOptionable
+{
+    /// <inheritdoc />
+    public override Type OptionableType => typeof(T);
+}

MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs

@@ -1,6 +1,6 @@
-using MiraAPI.GameOptions.OptionTypes;
-using System;
+using System;
 using System.Reflection;
+using MiraAPI.GameOptions.OptionTypes;
 
 namespace MiraAPI.GameOptions.Attributes;
 
@@ -8,12 +8,12 @@ namespace MiraAPI.GameOptions.Attributes;
 /// Attribute for creating an enum option.
 /// </summary>
 [AttributeUsage(AttributeTargets.Property)]
-public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? values = null, Type? roleType = null)
-    : ModdedOptionAttribute(title, roleType)
+public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? values = null)
+    : ModdedOptionAttribute(title)
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        var opt = new ModdedEnumOption(Title, (int)(value ?? 0), enumType, values, RoleType);
+        var opt = new ModdedEnumOption(Title, (int)(value ?? 0), enumType, values);
         return opt;
     }
 

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -1,7 +1,7 @@
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-using System;
+using System;
 using System.Reflection;
+using MiraAPI.GameOptions.OptionTypes;
+using MiraAPI.Utilities;
 
 namespace MiraAPI.GameOptions.Attributes;
 
@@ -16,13 +16,12 @@ public class ModdedNumberOptionAttribute(
     float increment = 1,
     MiraNumberSuffixes suffixType = MiraNumberSuffixes.None,
     string? formatString = null,
-    bool zeroInfinity = false,
-    Type? roleType = null)
-    : ModdedOptionAttribute(title, roleType)
+    bool zeroInfinity = false)
+    : ModdedOptionAttribute(title)
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, formatString, zeroInfinity, RoleType);
+        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, formatString, zeroInfinity);
     }
 
     /// <inheritdoc />

MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs

@@ -1,6 +1,6 @@
-using MiraAPI.GameOptions.OptionTypes;
-using System;
+using System;
 using System.Reflection;
+using MiraAPI.GameOptions.OptionTypes;
 
 namespace MiraAPI.GameOptions.Attributes;
 
@@ -8,13 +8,12 @@ namespace MiraAPI.GameOptions.Attributes;
 /// Attribute for a toggle option.
 /// </summary>
 /// <param name="title">The option title.</param>
-/// <param name="roleType">An optional role type.</param>
 [AttributeUsage(AttributeTargets.Property)]
-public class ModdedToggleOptionAttribute(string title, Type? roleType = null) : ModdedOptionAttribute(title, roleType)
+public class ModdedToggleOptionAttribute(string title) : ModdedOptionAttribute(title)
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        var toggleOpt = new ModdedToggleOption(Title, (bool)(value ?? false), RoleType);
+        var toggleOpt = new ModdedToggleOption(Title, (bool)(value ?? false));
         return toggleOpt;
     }
 

MiraAPI/GameOptions/IModdedOption.cs

@@ -6,19 +6,100 @@ 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; }
-    Type? AdvancedRole { get; set; }
+
+    /// <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="container">>The Transform container for the option.</param>
+    /// <returns>>The created OptionBehaviour object.</returns>
     OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
+
+    /// <summary>
+    /// Gets the value as a float.
+    /// </summary>
+    /// <returns>>The value of the option as a float.</returns>
     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/IOptionable.cs

@@ -0,0 +1,6 @@
+namespace MiraAPI.GameOptions;
+
+/// <summary>
+/// Interface for classes that can be used for option groups.
+/// </summary>
+public interface IOptionable;

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -42,7 +42,7 @@ public static class ModdedOptionsManager
 
         Groups.Add(group);
         TypeToGroup.Add(type, group);
-        pluginInfo.OptionGroups.Add(group);
+        pluginInfo.InternalOptionGroups.Add(group);
 
         typeof(OptionGroupSingleton<>).MakeGenericType(type)
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
@@ -108,7 +108,7 @@ public static class ModdedOptionsManager
         RegisterOption(option, group, property.Name, pluginInfo);
     }
 
-    private static void RegisterOption(
+    internal static void RegisterOption(
         IModdedOption option,
         AbstractOptionGroup group,
         string propertyName,
@@ -119,10 +119,7 @@ public static class ModdedOptionsManager
         option.ConfigDefinition = new ConfigDefinition(groupName, propertyName);
 
         option.ParentMod = pluginInfo.MiraPlugin;
-        option.AdvancedRole = group.AdvancedRole;
-
-        pluginInfo.Options.Add(option);
-
+        pluginInfo.InternalOptions.Add(option);
         ModdedOptions.Add(option.Id, option);
         group.Options.Add(option);
     }
@@ -143,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;
@@ -159,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];
@@ -176,6 +173,7 @@ public static class ModdedOptionsManager
     /// </summary>
     /// <param name="__originalMethod">The original setter method.</param>
     /// <param name="value">The new object value.</param>
+    // ReSharper disable once InconsistentNaming
     public static void PropertySetterPatch(MethodBase __originalMethod, object value)
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod() == __originalMethod).Value;
@@ -188,6 +186,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>
+    // ReSharper disable InconsistentNaming
     public static bool PropertyGetterPatch(MethodBase __originalMethod, ref object __result)
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod() == __originalMethod).Value;

MiraAPI/GameOptions/ModifierOptionGroup.cs

@@ -0,0 +1,15 @@
+using System.Linq;
+
+namespace MiraAPI.GameOptions;
+
+internal class ModifierOptionGroup : AbstractOptionGroup
+{
+    public override string GroupName { get; }
+
+    public ModifierOptionGroup(string name, IModdedOption[] options, params AbstractOptionGroup[] groups)
+    {
+        GroupName = name;
+        Options.AddRange(options);
+        Options.AddRange(groups.SelectMany(x=>x.Options));
+    }
+}

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,8 @@ 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="roleType">An optional role type to specify for a specific role.</param>
-    public ModdedEnumOption(string title, int defaultValue, Type enumType, string[]? values = null, Type? roleType = null) : base(title, defaultValue, roleType)
+    /// <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)
     {
         Values = values ?? Enum.GetNames(enumType);
         Data = ScriptableObject.CreateInstance<StringGameSetting>();
@@ -38,7 +38,7 @@ 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).ToArray();
+            : [.. values.Select(CustomStringName.CreateAndRegister)];
 
         data.Index = Value;
     }
@@ -88,7 +88,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;
@@ -101,7 +101,6 @@ public class ModdedEnumOption : ModdedOption<int>
     }
 }
 
-
 /// <summary>
 /// An option for selecting an enum value.
 /// </summary>
@@ -111,17 +110,16 @@ 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.
     /// </summary>
     /// <param name="title">The title of the option.</param>
     /// <param name="defaultValue">The default value as an int.</param>
-    /// <param name="enumType">The Enum type.</param>
     /// <param name="values">An option list of string values to use in place of the enum name.</param>
-    /// <param name="roleType">An optional role type to specify for a specific role.</param>
-    public ModdedEnumOption(string title, T defaultValue, string[]? values = null, Type? roleType = null) : base(title, defaultValue, roleType)
+    /// <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)
     {
         Values = values ?? Enum.GetNames(typeof(T));
         Data = ScriptableObject.CreateInstance<StringGameSetting>();
@@ -131,9 +129,9 @@ 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).ToArray();
+            : [.. values.Select(CustomStringName.CreateAndRegister)];
 
-        data.Index = Convert.ToInt32(Value);
+        data.Index = Convert.ToInt32(Value, NumberFormatInfo.InvariantInfo);
     }
 
     /// <inheritdoc />

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -1,7 +1,7 @@
-using AmongUs.GameOptions;
+using System;
+using AmongUs.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Utilities;
-using System;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -48,7 +48,7 @@ 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="roleType">An optional role type.</param>
+    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -58,7 +58,7 @@ public class ModdedNumberOption : ModdedOption<float>
         MiraNumberSuffixes suffixType,
         string? formatString = null,
         bool zeroInfinity = false,
-        Type? roleType = null) : base(title, defaultValue, roleType)
+        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
     {
         Min = min;
         Max = max;
@@ -77,11 +77,11 @@ public class ModdedNumberOption : ModdedOption<float>
         data.Increment = Increment;
         data.ValidRange = new FloatRange(Min, Max);
         data.FormatString = formatString ??
-                            (!Mathf.Approximately(defaultValue, 0) ||
-                             !Mathf.Approximately(Increment % 1, 0) ||
-                             !Mathf.Approximately(Value % 1, 0) ||
-                             !Mathf.Approximately(Min % 1, 0) ||
-                             !Mathf.Approximately(Max % 1, 0) ? "0.0" : "0");
+                            (defaultValue.IsInteger() &&
+                             Increment.IsInteger() &&
+                             Value.IsInteger() &&
+                             Min.IsInteger() &&
+                             Max.IsInteger() ? "0" : "0.0");
 
         data.ZeroIsInfinity = ZeroInfinity;
         data.SuffixType = (NumberSuffixes)SuffixType;
@@ -144,7 +144,7 @@ public class ModdedNumberOption : ModdedOption<float>
         Value = Mathf.Clamp(newValue, Min, Max);
         HudManager.Instance.Notifier.AddSettingsChangeMessage(
             StringName,
-            Data?.GetValueString(Value),
+            Data.GetValueString(Value),
             false);
 
         if (OptionBehaviour is NumberOption opt)

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -1,10 +1,10 @@
-using BepInEx.Configuration;
+using System;
+using BepInEx.Configuration;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
-using MiraAPI.Roles;
 using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
-using System;
+using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions.OptionTypes;
@@ -17,29 +17,19 @@ public abstract class ModdedOption<T> : IModdedOption
 {
     private IMiraPlugin? _parentMod;
 
-    /// <summary>
-    /// Gets the unique identifier of the option.
-    /// </summary>
+    /// <inheritdoc />
     public uint Id { get; }
 
-    /// <summary>
-    /// Gets the title of the option.
-    /// </summary>
+    /// <inheritdoc />
     public string Title { get; }
 
-    /// <summary>
-    /// Gets the StringName object of the option.
-    /// </summary>
+    /// <inheritdoc />
     public StringNames StringName { get; }
 
-    /// <summary>
-    /// Gets the BaseGameSetting data of the option.
-    /// </summary>
-    public BaseGameSetting Data { get; protected init; }
+    /// <inheritdoc />
+    public BaseGameSetting Data { get; protected set; } = null!;
 
-    /// <summary>
-    /// Gets or sets the parent mod of the option.
-    /// </summary>
+    /// <inheritdoc />
     public IMiraPlugin? ParentMod
     {
         get => _parentMod;
@@ -67,43 +57,25 @@ public abstract class ModdedOption<T> : IModdedOption
     /// </summary>
     public Action<T>? ChangedEvent { get; set; }
 
-    /// <summary>
-    /// Gets or sets the visibility of the option.
-    /// </summary>
+    /// <inheritdoc />
     public Func<bool> Visible { get; set; }
 
-    /// <summary>
-    /// Gets or sets the advanced role of the option.
-    /// </summary>
-    public Type? AdvancedRole { get; set; }
+    /// <inheritdoc />
+    public bool IncludeInPreset { get; set; }
 
-    /// <summary>
-    /// Gets or sets the option behaviour of the option.
-    /// </summary>
+    /// <inheritdoc />
     public OptionBehaviour? OptionBehaviour { get; protected set; }
 
-    /// <summary>
-    /// Gets or sets the config definition of the option.
-    /// </summary>
-    public ConfigDefinition? ConfigDefinition
-    {
-        get => _configDefinition;
-        set
-        {
-            if (_configDefinition is not null) return;
-            _configDefinition = value;
-        }
-    }
-
-    private ConfigDefinition? _configDefinition;
+    /// <inheritdoc />
+    public ConfigDefinition? ConfigDefinition { get; set; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ModdedOption{T}"/> class.
     /// </summary>
     /// <param name="title">The option title.</param>
     /// <param name="defaultValue">The default value.</param>
-    /// <param name="roleType">The Role Type or null if it doesn't belong to a role.</param>
-    protected ModdedOption(string title, T defaultValue, Type? roleType)
+    /// <param name="includeInPreset">Whether to include the option in the preset.</param>
+    protected ModdedOption(string title, T defaultValue, bool includeInPreset = true)
     {
         Id = ModdedOptionsManager.NextId;
         Title = title;
@@ -111,11 +83,7 @@ public abstract class ModdedOption<T> : IModdedOption
         Value = defaultValue;
         StringName = CustomStringName.CreateAndRegister(Title);
         Visible = () => true;
-
-        if (roleType is not null && roleType.IsAssignableTo(typeof(ICustomRole)))
-        {
-            AdvancedRole = roleType;
-        }
+        IncludeInPreset = includeInPreset;
     }
 
     internal void ValueChanged(OptionBehaviour optionBehaviour)
@@ -127,7 +95,8 @@ public abstract class ModdedOption<T> : IModdedOption
     /// Sets the value of the option.
     /// </summary>
     /// <param name="newValue">The new value.</param>
-    public void SetValue(T newValue)
+    /// <param name="sendRpc">Whether to send the value to other players.</param>
+    public void SetValue(T newValue, bool sendRpc = true)
     {
         var oldVal = Value;
         Value = newValue;
@@ -137,7 +106,7 @@ public abstract class ModdedOption<T> : IModdedOption
             ChangedEvent?.Invoke(Value);
         }
 
-        if (AmongUsClient.Instance.AmHost)
+        if (sendRpc && AmongUsClient.Instance.AmHost)
         {
             if (ParentMod?.GetConfigFile().TryGetEntry<T>(ConfigDefinition, out var entry) == true)
             {
@@ -150,22 +119,44 @@ public abstract class ModdedOption<T> : IModdedOption
         OnValueChanged(newValue);
     }
 
-    /// <summary>
-    /// Gets the float data of the option.
-    /// </summary>
-    /// <returns>A float object representing the option's value.</returns>
+    /// <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 />
     public abstract float GetFloatData();
 
-    /// <summary>
-    /// Gets the net data of the option.
-    /// </summary>
-    /// <returns>A NetData object representing this option's data.</returns>
+    /// <inheritdoc />
     public abstract NetData GetNetData();
 
-    /// <summary>
-    /// Handles incoming net data.
-    /// </summary>
-    /// <param name="data">The NetData's byte array.</param>
+    /// <inheritdoc />
     public abstract void HandleNetData(byte[] data);
 
     /// <summary>
@@ -181,14 +172,7 @@ public abstract class ModdedOption<T> : IModdedOption
     /// <returns>The value.</returns>
     public abstract T GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour);
 
-    /// <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>
+    /// <inheritdoc />
     public abstract OptionBehaviour CreateOption(
         ToggleOption toggleOpt,
         NumberOption numberOpt,

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -1,5 +1,5 @@
-using MiraAPI.Networking;
-using System;
+using System;
+using MiraAPI.Networking;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -15,8 +15,8 @@ public class ModdedToggleOption : ModdedOption<bool>
     /// </summary>
     /// <param name="title">The option title.</param>
     /// <param name="defaultValue">The default value.</param>
-    /// <param name="roleType">An optional role type.</param>
-    public ModdedToggleOption(string title, bool defaultValue, Type? roleType = null) : base(title, defaultValue, roleType)
+    /// <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)
     {
         Data = ScriptableObject.CreateInstance<CheckboxGameSetting>();
 

MiraAPI/Hud/CustomActionButton.cs

@@ -1,9 +1,9 @@
-using MiraAPI.Events;
+using System;
+using System.Globalization;
+using MiraAPI.Events;
 using MiraAPI.Events.Mira;
 using MiraAPI.Patches;
 using MiraAPI.Utilities.Assets;
-using System;
-using System.Globalization;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -47,9 +47,14 @@ public abstract class CustomActionButton
     public virtual int MaxUses => 0;
 
     /// <summary>
-    /// Gets the location of the button on the screen.
+    /// Gets the button's text outline color.
     /// </summary>
-    public virtual ButtonLocation Location { get; private set; } = ButtonLocation.BottomLeft;
+    public virtual Color TextOutlineColor => Color.clear;
+
+    /// <summary>
+    /// Gets or sets the location of the button on the screen.
+    /// </summary>
+    public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
 
     /// <summary>
     /// Gets a value indicating whether the button has an effect ability.
@@ -64,27 +69,27 @@ public abstract class CustomActionButton
     /// <summary>
     /// Gets or sets a value indicating whether the effect is currently active, if there is one.
     /// </summary>
-    public bool EffectActive { get; protected set; }
+    public bool EffectActive { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether the timer is currently active.
     /// </summary>
-    public bool TimerPaused { get; protected set; }
+    public bool TimerPaused { get; set; }
 
     /// <summary>
     /// Gets or sets the amount of uses left.
     /// </summary>
-    public int UsesLeft { get; protected set; }
+    public int UsesLeft { get; set; }
 
     /// <summary>
     /// Gets or sets the timer variable to measure cooldowns and effects.
     /// </summary>
-    public float Timer { get; protected set; }
+    public float Timer { get; set; }
 
     /// <summary>
-    /// Gets the button object in game. This is created by Mira API automatically.
+    /// Gets or sets the button object in game. This is created by Mira API automatically.
     /// </summary>
-    protected ActionButton? Button { get; private set; }
+    public ActionButton? Button { get; set; }
 
     /// <summary>
     /// The method used to create the button.
@@ -114,6 +119,11 @@ public abstract class CustomActionButton
             Button.SetInfiniteUses();
         }
 
+        if (TextOutlineColor != Color.clear)
+        {
+            SetTextOutline(TextOutlineColor);
+        }
+
         var pb = Button.GetComponent<PassiveButton>();
         pb.OnClick = new Button.ButtonClickedEvent();
         pb.OnClick.AddListener((UnityAction)(() =>
@@ -158,7 +168,7 @@ public abstract class CustomActionButton
     /// Allows you to change the button's location.
     /// </summary>
     /// <param name="location">The new location.</param>
-    /// <param name="moveButton">Whether the button's position should change ingame.</param>
+    /// <param name="moveButton">Whether the button's position should change in-game.</param>
     public virtual void SetButtonLocation(ButtonLocation location, bool moveButton = true)
     {
         if (!HudManager.InstanceExists || Button == null)
@@ -207,6 +217,15 @@ public abstract class CustomActionButton
         EffectActive = false;
     }
 
+    /// <summary>
+    /// A utility function to change the outline color of the button's text.
+    /// </summary>
+    /// <param name="color">The new color.</param>
+    public virtual void SetTextOutline(Color color)
+    {
+        Button?.buttonLabelText.SetOutlineColor(color);
+    }
+
     /// <summary>
     /// A utility function to override the sprite of the button.
     /// </summary>
@@ -344,7 +363,7 @@ public abstract class CustomActionButton
     /// <returns>A value that represents whether the button should light up or not.</returns>
     public virtual bool CanUse()
     {
-        return !LimitedUses || UsesLeft > 0;
+        return PlayerControl.LocalPlayer.moveable && (!LimitedUses || UsesLeft > 0);
     }
 
     /// <summary>
@@ -398,9 +417,12 @@ public abstract class CustomActionButton
     /// <param name="playerControl">The local PlayerControl.</param>
     public virtual void FixedUpdateHandler(PlayerControl playerControl)
     {
-        if (Timer >= 0 && !TimerPaused)
+        if (Timer >= 0)
         {
-            Timer -= Time.deltaTime;
+            if (!TimerPaused)
+            {
+                Timer -= Time.deltaTime;
+            }
         }
         else if (HasEffect && EffectActive)
         {
@@ -409,25 +431,28 @@ public abstract class CustomActionButton
             OnEffectEnd();
         }
 
-        if (CanUse())
+        if (Button)
         {
-            Button?.SetEnabled();
-        }
-        else
-        {
-            Button?.SetDisabled();
-        }
+            if (CanUse())
+            {
+                Button.SetEnabled();
+            }
+            else
+            {
+                Button.SetDisabled();
+            }
 
-        if (EffectActive)
-        {
-            Button?.SetFillUp(Timer, EffectDuration);
+            if (EffectActive)
+            {
+                Button.SetFillUp(Timer, EffectDuration);
 
-            Button!.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
-            Button!.cooldownTimerText.gameObject.SetActive(true);
-        }
-        else
-        {
-            Button?.SetCoolDown(Timer, Cooldown);
+                Button.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
+                Button.cooldownTimerText.gameObject.SetActive(true);
+            }
+            else
+            {
+                Button.SetCoolDown(Timer, Cooldown);
+            }
         }
 
         FixedUpdate(playerControl);
@@ -443,7 +468,7 @@ public abstract class CustomActionButton<T> : CustomActionButton where T : MonoB
     /// <summary>
     /// Gets or sets the target object of the button.
     /// </summary>
-    public T? Target { get; protected set; }
+    public T? Target { get; set; }
 
     /// <summary>
     /// Gets the distance the player must be from the target object to use the button.

MiraAPI/Hud/CustomButtonManager.cs

@@ -1,9 +1,9 @@
-using MiraAPI.Events.Mira;
-using MiraAPI.PluginLoading;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reflection;
+using MiraAPI.Events.Mira;
+using MiraAPI.PluginLoading;
 
 namespace MiraAPI.Hud;
 
@@ -29,7 +29,7 @@ public static class CustomButtonManager
         }
 
         CustomButtons.Add(button);
-        pluginInfo.Buttons.Add(button);
+        pluginInfo.InternalButtons.Add(button);
         typeof(CustomButtonSingleton<>).MakeGenericType(buttonType)
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
             .SetValue(null, button);

MiraAPI/Hud/CustomPlayerMenu.cs

@@ -1,13 +1,16 @@
-using AmongUs.GameOptions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using AmongUs.GameOptions;
 using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.Patches.Stubs;
 using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using UnityEngine.Events;
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
 
 namespace MiraAPI.Hud;
 
@@ -16,22 +19,18 @@ namespace MiraAPI.Hud;
 /// </summary>
 /// <param name="il2CppPtr">Used by Il2Cpp. Do not use constructor, this is a MonoBehaviour.</param>
 [RegisterInIl2Cpp]
+[SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "Unity Convention")]
+[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Unity Convention")]
+[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "Unity Convention")]
 public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
 {
-    public ShapeshifterPanel PanelPrefab;
-
-    public float XStart = -0.8f;
-
-    public float YStart = 2.15f;
-
-    public float XOffset = 1.95f;
-
-    public float YOffset = -0.65f;
-
-    public UiElement BackButton;
-
-    public UiElement DefaultButtonSelected;
-
+    public ShapeshifterPanel panelPrefab;
+    public float xStart = -0.8f;
+    public float yStart = 2.15f;
+    public float xOffset = 1.95f;
+    public float yOffset = -0.65f;
+    public UiElement backButton;
+    public UiElement defaultButtonSelected;
     public List<ShapeshifterPanel> potentialVictims;
 
     /// <summary>
@@ -42,17 +41,17 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
     {
         var shapeShifterRole = RoleManager.Instance.GetRole(RoleTypes.Shapeshifter);
 
-        var ogMenu = shapeShifterRole.TryCast<ShapeshifterRole>().ShapeshifterMenu;
+        var ogMenu = shapeShifterRole.TryCast<ShapeshifterRole>()!.ShapeshifterMenu;
         var newMenu = Instantiate(ogMenu);
         var customMenu = newMenu.gameObject.AddComponent<CustomPlayerMenu>();
 
-        customMenu.PanelPrefab = newMenu.PanelPrefab;
-        customMenu.XStart = newMenu.XStart;
-        customMenu.YStart = newMenu.YStart;
-        customMenu.XOffset = newMenu.XOffset;
-        customMenu.YOffset = newMenu.YOffset;
-        customMenu.BackButton = newMenu.BackButton;
-        var back = customMenu.BackButton.GetComponent<PassiveButton>();
+        customMenu.panelPrefab = newMenu.PanelPrefab;
+        customMenu.xStart = newMenu.XStart;
+        customMenu.yStart = newMenu.YStart;
+        customMenu.xOffset = newMenu.XOffset;
+        customMenu.yOffset = newMenu.YOffset;
+        customMenu.backButton = newMenu.BackButton;
+        var back = customMenu.backButton.GetComponent<PassiveButton>();
         back.OnClick.RemoveAllListeners();
         back.OnClick.AddListener((UnityAction)(() =>
         {
@@ -65,7 +64,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
 
         newMenu.DestroyImmediate();
 
-        customMenu.transform.SetParent(Camera.main.transform, false);
+        customMenu.transform.SetParent(Camera.main!.transform, false);
         customMenu.transform.localPosition = new Vector3(0f, 0f, -50f);
         return customMenu;
     }
@@ -75,6 +74,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
         ControllerManager.Instance.CloseOverlayMenu(name);
     }
 
+    /// <inheritdoc />
     public override void Begin(PlayerTask task)
     {
         throw new NotImplementedException("Use the other Begin method.");
@@ -90,7 +90,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
     {
         MinigameStubs.Begin(this, null);
 
-        var back = BackButton.GetComponent<PassiveButton>();
+        var back = backButton.GetComponent<PassiveButton>();
         back.OnClick.AddListener((UnityAction)(() =>
         {
             onClick(null);
@@ -107,13 +107,13 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
             var num = i % 3;
             var num2 = i / 3;
             var flag = PlayerControl.LocalPlayer.Data.Role.NameColor == player.Data.Role.NameColor;
-            var shapeshifterPanel = Instantiate(PanelPrefab, transform);
-            shapeshifterPanel.transform.localPosition = new Vector3(XStart + num * XOffset, YStart + num2 * YOffset, -1f);
+            var shapeshifterPanel = Instantiate(panelPrefab, transform);
+            shapeshifterPanel.transform.localPosition = new Vector3(xStart + num * xOffset, yStart + num2 * yOffset, -1f);
             shapeshifterPanel.SetPlayer(i, player.Data, (Il2CppSystem.Action)(() => { onClick(player); }));
             shapeshifterPanel.NameText.color = flag ? player.Data.Role.NameColor : Color.white;
             potentialVictims.Add(shapeshifterPanel);
             list2.Add(shapeshifterPanel.Button);
         }
-        ControllerManager.Instance.OpenOverlayMenu(name, BackButton, DefaultButtonSelected, list2);
+        ControllerManager.Instance.OpenOverlayMenu(name, backButton, defaultButtonSelected, list2);
     }
 }

MiraAPI/Hud/InputBox.cs

@@ -0,0 +1,114 @@
+using System;
+using MiraAPI.Utilities.Assets;
+using Reactor.Utilities.Attributes;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.UI;
+
+namespace MiraAPI.Hud;
+
+/// <summary>
+/// Simple input box for user input.
+/// </summary>
+[RegisterInIl2Cpp]
+public class InputBox : MonoBehaviour
+{
+    public InputField inputField = null!;
+
+    public void CreateDialog(string title, string placeholder, string submitText, Action<string> onSubmit)
+    {
+        var canvasObj = new GameObject("DialogCanvas");
+        canvasObj.transform.SetParent(transform);
+        canvasObj.layer = LayerMask.NameToLayer("UI");
+
+        var canvas = canvasObj.AddComponent<Canvas>();
+        canvas.renderMode = RenderMode.ScreenSpaceOverlay;
+        canvas.overrideSorting = true;
+        canvas.sortingOrder = 1000; // Ensure the canvas is on top of other UI elements
+
+        canvasObj.AddComponent<CanvasScaler>().uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
+        canvasObj.AddComponent<GraphicRaycaster>();
+
+        var panelObj = new GameObject("DialogPanel");
+        panelObj.transform.SetParent(canvasObj.transform);
+        var panelRect = panelObj.AddComponent<RectTransform>();
+        var img = panelObj.AddComponent<Image>();
+
+        img.color = new Color(1, 1, 1, 0.9f);
+        img.raycastTarget = true;
+        img.sprite = MiraAssets.RoundedBox.LoadAsset();
+        img.type = Image.Type.Sliced;
+
+        panelRect.sizeDelta = new Vector2(300, 200);
+        panelRect.anchoredPosition = Vector2.zero;
+
+        var titleText = CreateText(panelObj, title);
+        titleText.alignment = TextAnchor.MiddleCenter;
+        titleText.fontSize = 26;
+        titleText.fontStyle = FontStyle.Bold;
+        titleText.color = Color.white;
+
+        var titleRect = titleText.GetComponent<RectTransform>();
+        titleRect.sizeDelta = new Vector2(280, 50);
+        titleRect.anchoredPosition = new Vector2(0, 70);
+
+        var inputObj = new GameObject("InputField");
+        inputObj.transform.SetParent(panelObj.transform);
+        var inputRect = inputObj.AddComponent<RectTransform>();
+        inputRect.sizeDelta = new Vector2(220, 40);
+        inputRect.anchoredPosition = new Vector2(0, 20);
+
+        var inputBg = inputObj.AddComponent<Image>();
+        inputBg.color = new Color(1, 1, 1, 0.8f);
+
+        inputField = inputObj.AddComponent<InputField>();
+        inputField.textComponent = CreateText(inputObj, string.Empty, 18, Color.black);
+        inputField.placeholder = CreateText(inputObj, placeholder, 18, new Color(0.5f, 0.5f, 0.5f));
+
+        var buttonObj = new GameObject("SubmitButton");
+        buttonObj.transform.SetParent(panelObj.transform);
+        var button = buttonObj.AddComponent<Button>();
+        var buttonRect = buttonObj.AddComponent<RectTransform>();
+        buttonRect.sizeDelta = new Vector2(150, 50);
+        buttonRect.anchoredPosition = new Vector2(0, -50);
+
+        var buttonImg = buttonObj.AddComponent<Image>();
+        buttonImg.color = new Color(1f, 1f, 1f, 1f);
+        buttonImg.sprite = MiraAssets.RoundedBox.LoadAsset();
+        buttonImg.type = Image.Type.Sliced;
+
+        var buttonText = CreateText(buttonObj, submitText, 20, Color.white);
+        buttonText.alignment = TextAnchor.MiddleCenter;
+
+        var colors = button.colors;
+        colors.highlightedColor = Color.green;
+        colors.pressedColor = MiraAssets.AcceptedTeal;
+        button.colors = colors;
+
+        button.onClick.AddListener((UnityAction)(() =>
+        {
+            onSubmit(inputField.text);
+            DestroyImmediate(canvasObj);
+        }));
+
+        inputField.ActivateInputField();
+    }
+
+    private static Text CreateText(GameObject parent, string textContent = "", int fontSize = 20, Color? textColor = null, Font? font = null)
+    {
+        var textObj = new GameObject("Text");
+        textObj.transform.SetParent(parent.transform);
+
+        var text = textObj.AddComponent<Text>();
+        text.font = font ?? Resources.GetBuiltinResource<Font>("Arial.ttf");
+        text.text = textContent;
+        text.color = textColor ?? Color.white;
+        text.fontSize = fontSize;
+        text.alignment = TextAnchor.MiddleCenter;
+
+        var rect = textObj.GetComponent<RectTransform>();
+        rect.sizeDelta = new Vector2(200, 40);
+        rect.anchoredPosition = Vector2.zero;
+        return text;
+    }
+}

MiraAPI/MiraApiPlugin.cs

@@ -16,10 +16,20 @@ namespace MiraAPI;
 [BepInAutoPlugin("mira.api", "MiraAPI")]
 [BepInProcess("Among Us.exe")]
 [BepInDependency(ReactorPlugin.Id)]
+[BepInDependency(ModCompatibility.SubmergedId, BepInDependency.DependencyFlags.SoftDependency)]
 [ReactorModFlags(ModFlags.RequireOnAllClients)]
 public partial class MiraApiPlugin : BasePlugin
 {
+    /// <summary>
+    /// Gets the branding Mira API color.
+    /// </summary>
     public static Color MiraColor { get; } = new Color32(238, 154, 112, 255);
+
+    /// <summary>
+    /// Gets the default color for headers in the options menu.
+    /// </summary>
+    public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
+
     private static MiraPluginManager? PluginManager { get; set; }
     internal Harmony Harmony { get; } = new(Id);
 

MiraAPI/ModCompatibility.cs

@@ -0,0 +1,28 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using BepInEx.Unity.IL2CPP;
+
+namespace MiraAPI;
+
+/// <summary>
+/// Mod compatibility tools.
+/// </summary>
+public static class ModCompatibility
+{
+    /// <summary>
+    /// The ID for the Submerged mod.
+    /// </summary>
+    public const string SubmergedId = "Submerged";
+
+    /// <summary>
+    /// Checks if the Submerged mod is loaded.
+    /// </summary>
+    /// <param name="submergedAssembly">Submerged mod assembly if loaded, null otherwise.</param>
+    /// <returns>True if the Submerged mod is loaded, false otherwise.</returns>
+    public static bool SubmergedLoaded([NotNullWhen(true)] out Assembly? submergedAssembly)
+    {
+        var result = IL2CPPChainloader.Instance.Plugins.TryGetValue(SubmergedId, out var plugin);
+        submergedAssembly = result ? plugin?.Instance.GetType().Assembly : null;
+        return result;
+    }
+}

MiraAPI/Modifiers/AssignmentConfiguration.cs

@@ -0,0 +1,10 @@
+namespace MiraAPI.Modifiers;
+
+/// <summary>
+/// Represents the assignment configuration for a game modifier.
+/// </summary>
+/// <param name="DefaultAmount">The default amount of players that can have this modifier in a game.</param>
+/// <param name="DefaultChance">The default chance of the modifier being assigned to a player.</param>
+/// <param name="CreateAmountOption">Whether Mira should create an amount option for the modifier.</param>
+/// <param name="CreateChanceOption">Whether Mira should create a chance option for the modifier.</param>
+public record struct AssignmentConfiguration(int DefaultAmount, int DefaultChance, bool CreateAmountOption, bool CreateChanceOption);

MiraAPI/Modifiers/BaseModifier.cs

@@ -1,16 +1,20 @@
 using System;
+using MiraAPI.GameOptions;
+using MiraAPI.PluginLoading;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
 
 namespace MiraAPI.Modifiers;
 
 /// <summary>
 /// Base class for all modifiers.
 /// </summary>
-public abstract class BaseModifier
+public abstract class BaseModifier : IOptionable
 {
     /// <summary>
     /// Gets the player that the modifier is attached to.
     /// </summary>
-    public PlayerControl? Player { get; internal set; }
+    public PlayerControl Player { get; internal set; } = null!;
 
     /// <summary>
     /// Gets the modifier component that the modifier is attached to.
@@ -32,15 +36,28 @@ public abstract class BaseModifier
     /// </summary>
     public uint TypeId => ModifierManager.GetModifierTypeId(GetType()) ?? throw new InvalidOperationException("Modifier is not registered.");
 
+    /// <summary>
+    /// Gets the parent mod of the modifier.
+    /// </summary>
+    public MiraPluginInfo ParentMod => Array.Find(
+        MiraPluginManager.Instance.RegisteredPlugins,
+        x => x.InternalModifiers.Exists(y => y.TypeId == TypeId)
+        ) ?? throw new InvalidOperationException("Modifier is not registered.");
+
     /// <summary>
     /// Gets the modifier name.
     /// </summary>
     public abstract string ModifierName { get; }
 
     /// <summary>
-    /// Gets a value indicating whether the modifier is hidden on the UI.
+    /// Gets the modifier icon. Useless if HideOnUi is true.
     /// </summary>
-    public virtual bool HideOnUi => false;
+    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;
 
     /// <summary>
     /// Gets a value indicating whether the modifier is shown in the freeplay menu.
@@ -53,10 +70,10 @@ public abstract class BaseModifier
     public virtual bool Unique => true;
 
     /// <summary>
-    /// Gets the HUD information for this modifier. Defaults to the modifier name. Does nothing if <see cref="HideOnUi"/> is true.
+    /// Gets the HUD description for this modifier. Does nothing if <see cref="HideOnUi"/> is true. Required to be visible on UI.
     /// </summary>
-    /// <returns>The information string for the HUD.</returns>
-    public virtual string GetHudString() => ModifierName;
+    /// <returns>The description string for the HUD.</returns>
+    public virtual string GetDescription() => string.Empty;
 
     /// <summary>
     /// Called when the modifier is activated.
@@ -94,6 +111,13 @@ public abstract class BaseModifier
     {
     }
 
+    /// <summary>
+    /// Called when a meeting starts.
+    /// </summary>
+    public virtual void OnMeetingStart()
+    {
+    }
+
     /// <summary>
     /// Determines whether the player can vent.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -1,14 +1,15 @@
-using Il2CppInterop.Runtime.Attributes;
+using System;
+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.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Globalization;
-using System.Linq;
-using System.Text;
 using TMPro;
 using UnityEngine;
 
@@ -24,14 +25,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// Gets the active modifiers on the player.
     /// </summary>
     [HideFromIl2Cpp]
-    public ImmutableList<BaseModifier> ActiveModifiers => Modifiers.ToImmutableList();
+    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;
-
-    private TextMeshPro? _modifierText;
+    private PlayerControl _player = null!;
 
     private readonly List<BaseModifier> _toRemove = [];
 
@@ -42,9 +43,18 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _toRemove.AddRange(Modifiers);
     }
 
-    private void Start()
+    private void Awake()
     {
         _player = GetComponent<PlayerControl>();
+        if (_player == null)
+        {
+            Logger<MiraApiPlugin>.Error("ModifierComponent could not find PlayerControl on the same GameObject.");
+            Destroy(this);
+            return;
+        }
+
+        ModifierExtensions.ModifierComponents.Add(_player, this);
+
         Modifiers = [];
 
         if (!_player.AmOwner)
@@ -52,20 +62,24 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             return;
         }
 
-        _modifierText = Helpers.CreateTextLabel("ModifierText", HudManager.Instance.transform, AspectPosition.EdgeAlignments.RightTop, new Vector3(10.1f, 3.5f, 0), textAlignment: TextAlignmentOptions.Right);
-        _modifierText.verticalAlignment = VerticalAlignmentOptions.Top;
+        ModifierDisplay = ModifierDisplayComponent.CreateDisplay();
+        ModifierDisplay?.UpdateModifiersList(Modifiers);
     }
 
     private void FixedUpdate()
     {
-        foreach (var modifier in _toRemove)
+        var removed = _toRemove.Count > 0;
+        foreach (var modifier in _toRemove.ToArray())
         {
+            _toRemove.Remove(modifier);
             modifier.OnDeactivate();
             Modifiers.Remove(modifier);
         }
 
-        foreach (var modifier in _toAdd)
+        var added = _toAdd.Count > 0;
+        foreach (var modifier in _toAdd.ToArray())
         {
+            _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
             modifier.Initialized = true;
             modifier.OnActivate();
@@ -76,49 +90,39 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
         }
 
-        if (_toAdd.Count > 0 || _toRemove.Count > 0)
+        if (removed || added)
         {
-            if (_player?.AmOwner == true)
+            if (_player.AmOwner && HudManager.InstanceExists)
             {
-                HudManager.Instance?.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled);
+                ModifierDisplay?.UpdateModifiersList(Modifiers);
             }
-            _toAdd.Clear();
-            _toRemove.Clear();
+
+            ActiveModifiers = Modifiers.ToImmutableList();
         }
 
-        foreach (var modifier in Modifiers)
+        foreach (var modifier in ActiveModifiers)
         {
             modifier.FixedUpdate();
         }
+
+        if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
+        {
+            ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
+        }
     }
 
     private void Update()
     {
-        foreach (var modifier in Modifiers)
+        foreach (var modifier in ActiveModifiers)
         {
             modifier.Update();
         }
+    }
 
-        if (!_modifierText || _player?.AmOwner == false)
-        {
-            return;
-        }
-
-        var filteredModifiers = Modifiers.Where(mod => !mod.HideOnUi).ToArray();
-
-        if (filteredModifiers.Length != 0 && !MeetingHud.Instance)
-        {
-            var stringBuild = new StringBuilder();
-            foreach (var mod in filteredModifiers)
-            {
-                stringBuild.Append(CultureInfo.InvariantCulture, $"\n{mod.GetHudString()}");
-            }
-            _modifierText!.text = $"<b><size=130%>Modifiers:</b></size>{stringBuild}";
-        }
-        else if (_modifierText!.text != string.Empty)
-        {
-            _modifierText.text = string.Empty;
-        }
+    private void OnDestroy()
+    {
+        // Remove this component from the global list when destroyed
+        ModifierExtensions.ModifierComponents.Remove(_player);
     }
 
     /// <summary>
@@ -130,7 +134,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public IEnumerable<T> GetModifiers<T>(Func<T, bool>? predicate=null) where T : BaseModifier
     {
-        return Modifiers.OfType<T>().Where(x => predicate == null || predicate(x));
+        return ActiveModifiers.OfType<T>().Where(x => predicate == null || predicate(x));
     }
 
     /// <summary>
@@ -142,7 +146,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public IEnumerable<BaseModifier> GetModifiers(Type type, Func<BaseModifier, bool>? predicate=null)
     {
-        return Modifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x)));
+        return ActiveModifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x)));
     }
 
     /// <summary>
@@ -168,7 +172,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// <typeparam name="T">The Type of the Modifier.</typeparam>
     /// <returns>True if the modifier was found, false otherwise.</returns>
     [HideFromIl2Cpp]
-    public bool TryGetModifier<T>(out T? modifier, Func<T, bool>? predicate = null) where T : BaseModifier
+    public bool TryGetModifier<T>([NotNullWhen(true)] out T? modifier, Func<T, bool>? predicate = null) where T : BaseModifier
     {
         modifier = GetModifier(predicate);
         return modifier != null;
@@ -182,7 +186,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// <param name="predicate">The predicate to check the modifier by.</param>
     /// <returns>True if the modifier was found, false otherwise.</returns>
     [HideFromIl2Cpp]
-    public bool TryGetModifier(Type type, out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
+    public bool TryGetModifier(Type type, [NotNullWhen(true)] out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
     {
         modifier = GetModifier(type, predicate);
         return modifier != null;
@@ -196,7 +200,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// <param name="predicate">The predicate to check the modifier by.</param>
     /// <returns>True if the modifier was found, false otherwise.</returns>
     [HideFromIl2Cpp]
-    public bool TryGetModifier(uint id, out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
+    public bool TryGetModifier(uint id, [NotNullWhen(true)] out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
     {
         modifier = GetModifier(id, predicate);
         return modifier != null;
@@ -209,7 +213,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// <param name="modifier">The modifier or null.</param>
     /// <returns>True if the modifier was found, false otherwise.</returns>
     [HideFromIl2Cpp]
-    public bool TryGetModifier(Guid modifierGuid, out BaseModifier? modifier)
+    public bool TryGetModifier(Guid modifierGuid, [NotNullWhen(true)] out BaseModifier? modifier)
     {
         modifier = GetModifier(modifierGuid);
         return modifier != null;
@@ -262,7 +266,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public BaseModifier? GetModifier(Guid modifierGuid)
     {
-        return Modifiers.Find(x => x.UniqueId == modifierGuid);
+        return ActiveModifiers.Find(x => x.UniqueId == modifierGuid);
     }
 
     /// <summary>
@@ -284,7 +288,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public void RemoveModifier(Type type, Func<BaseModifier, bool>? predicate = null)
     {
-        var modifiers = Modifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x))).ToList();
+        var modifiers = ActiveModifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x))).ToList();
         if (modifiers.Count > 1)
         {
             throw new InvalidOperationException($"Cannot remove modifier {type.Name} because there are multiple instances of that modifier.");
@@ -307,7 +311,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public void RemoveModifier(BaseModifier modifier)
     {
-        if (!Modifiers.Contains(modifier))
+        if (!ActiveModifiers.Contains(modifier))
         {
             Logger<MiraApiPlugin>.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
             return;
@@ -373,13 +377,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         }
 
         var id = modifier.TypeId;
-        if (modifier.Unique && Modifiers.Find(x => x.TypeId == id) != null)
+        if (modifier.Unique && ActiveModifiers.Find(x => x.TypeId == id) != null)
         {
             Logger<MiraApiPlugin>.Error($"Player already has modifier with id {id}!");
             return null;
         }
 
-        if (Modifiers.Contains(modifier))
+        if (ActiveModifiers.Contains(modifier))
         {
             Logger<MiraApiPlugin>.Error($"Player already has this modifier!");
             return null;
@@ -445,7 +449,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public bool HasModifier<T>(Func<T, bool>? predicate=null) where T : BaseModifier
     {
-        return Modifiers.Exists(x => x is T modifier && (predicate == null || predicate(modifier)));
+        return ActiveModifiers.Exists(x => x is T modifier && (predicate == null || predicate(modifier)));
     }
 
     /// <summary>
@@ -457,7 +461,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public bool HasModifier(Type type, Func<BaseModifier, bool>? predicate=null)
     {
-        return Modifiers.Exists(x => x.GetType() == type && (predicate == null || predicate(x)));
+        return ActiveModifiers.Exists(x => x.GetType() == type && (predicate == null || predicate(x)));
     }
 
     /// <summary>
@@ -483,6 +487,63 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public bool HasModifier(Guid id)
     {
-        return Modifiers.Exists(x => x.UniqueId == id);
+        return ActiveModifiers.Exists(x => x.UniqueId == id);
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its type.
+    /// </summary>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>True if the Modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier<T>(bool checkInactive, Func<T, bool>? predicate=null) where T : BaseModifier
+    {
+        return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
+        bool MatchExpr(BaseModifier bm) => bm is T modifier && (predicate == null || predicate(modifier));
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its type.
+    /// </summary>
+    /// <param name="type">The modifier type.</param>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <returns>True if the Modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier(Type type, bool checkInactive, Func<BaseModifier, bool>? predicate=null)
+    {
+        return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
+        bool MatchExpr(BaseModifier bm) => bm.GetType() == type && (predicate == null || predicate(bm));
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its type ID.
+    /// </summary>
+    /// <param name="id">The modifier's type ID.</param>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <returns>True if the modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier(uint id, bool checkInactive, Func<BaseModifier, bool>? predicate=null)
+    {
+        var type = ModifierManager.GetModifierType(id) ?? throw new InvalidOperationException(
+            $"Cannot get modifier with id {id} because it is not registered.");
+
+        return HasModifier(type, checkInactive, predicate);
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its unique ID.
+    /// </summary>
+    /// <param name="id">The modifier's guid.</param>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <returns>True if the modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier(Guid id, bool checkInactive)
+    {
+        return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
+        bool MatchExpr(BaseModifier bm) => bm.UniqueId == id;
     }
 }

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -0,0 +1,212 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using HarmonyLib;
+using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.Utilities.Assets;
+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 ptr) : MonoBehaviour(ptr)
+{
+    /// <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 = 0;
+    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);
+    }
+
+    /// <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()
+    {
+        IsOpen = !IsOpen;
+        _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})";
+
+        if (filteredModifiers.Count == 0)
+        {
+            _toggleButton.gameObject.SetActive(false);
+            return;
+        }
+
+        _toggleButton.gameObject.SetActive(true);
+
+        foreach (var mod in modifiersToAdd)
+        {
+            _modifiers.Add(mod, CreateForModifier(mod));
+        }
+
+        UpdatePage();
+    }
+}

MiraAPI/Modifiers/ModifierDisplay/ModifierUiComponent.cs

@@ -0,0 +1,71 @@
+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 ptr) : MonoBehaviour(ptr)
+{
+    /// <summary>
+    /// Gets the modifier which this component is for.
+    /// </summary>
+    [HideFromIl2Cpp]
+    public BaseModifier? Modifier { get; internal set; }
+
+    private SpriteRenderer modBg = null!;
+    private TextMeshPro desc = null!;
+    private SpriteRenderer icon = null!;
+    private TextMeshPro nameText = null!;
+    private RectTransform descRect = null!;
+
+    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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using MiraAPI.Networking;
 using MiraAPI.Networking.Modifiers;
 using Reactor.Networking.Attributes;
@@ -190,6 +191,81 @@ public static class ModifierExtensions
         return player.GetModifierComponent().HasModifier(uniqueId);
     }
 
+    /// <summary>
+    /// Clears all modifiers from a player.
+    /// </summary>
+    /// <param name="plr">The player you want to clear modifiers for.</param>
+    public static void ClearModifiers(this PlayerControl plr)
+    {
+        foreach (var mod in plr.GetModifierComponent().ActiveModifiers)
+        {
+            plr.RemoveModifier(mod);
+        }
+    }
+
+    /// <summary>
+    /// Clears all modifiers from a player.
+    /// </summary>
+    /// <param name="plr">The player you want to clear modifiers for.</param>
+    public static void RpcClearModifiers(this PlayerControl plr)
+    {
+        foreach (var mod in plr.GetModifierComponent().ActiveModifiers)
+        {
+            plr.RpcRemoveModifier(mod.UniqueId);
+        }
+    }
+
+    /// <summary>
+    /// Tries to get a modifier by its type.
+    /// </summary>
+    /// <param name="player">The PlayerControl instance.</param>
+    /// <param name="modifier">The modifier or null.</param>
+    /// <param name="predicate">The predicate to check the modifier by.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>True if the modifier was found, false otherwise.</returns>
+    public static bool TryGetModifier<T>(this PlayerControl player, [NotNullWhen(true)] out T? modifier, Func<T, bool>? predicate = null) where T : BaseModifier
+    {
+        return player.GetModifierComponent().TryGetModifier(out modifier, predicate);
+    }
+
+    /// <summary>
+    /// Tries to get a modifier by its type.
+    /// </summary>
+    /// <param name="player">The PlayerControl instance.</param>
+    /// <param name="type">The modifier type.</param>
+    /// <param name="modifier">The modifier or null.</param>
+    /// <param name="predicate">The predicate to check the modifier by.</param>
+    /// <returns>True if the modifier was found, false otherwise.</returns>
+    public static bool TryGetModifier(this PlayerControl player, Type type, [NotNullWhen(true)] out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
+    {
+        return player.GetModifierComponent().TryGetModifier(type, out modifier, predicate);
+    }
+
+    /// <summary>
+    /// Tries to get a modifier by its type ID.
+    /// </summary>
+    /// <param name="player">The PlayerControl instance.</param>
+    /// <param name="id">The modifier type ID.</param>
+    /// <param name="modifier">The modifier or null.</param>
+    /// <param name="predicate">The predicate to check the modifier by.</param>
+    /// <returns>True if the modifier was found, false otherwise.</returns>
+    public static bool TryGetModifier(this PlayerControl player, uint id, [NotNullWhen(true)] out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
+    {
+        return player.GetModifierComponent().TryGetModifier(id, out modifier, predicate);
+    }
+
+    /// <summary>
+    /// Tries to get a modifier by its unique ID.
+    /// </summary>
+    /// <param name="player">The PlayerControl instance.</param>
+    /// <param name="modifierGuid">The modifier unique ID.</param>
+    /// <param name="modifier">The modifier or null.</param>
+    /// <returns>True if the modifier was found, false otherwise.</returns>
+    public static bool TryGetModifier(this PlayerControl player, Guid modifierGuid, [NotNullWhen(true)] out BaseModifier? modifier)
+    {
+        return player.GetModifierComponent().TryGetModifier(modifierGuid, out modifier);
+    }
+
     /// <summary>
     /// Gets a specific modifier from the player.
     /// </summary>

MiraAPI/Modifiers/ModifierManager.cs

@@ -63,16 +63,32 @@ public static class ModifierManager
 
         IdToTypeModifierMap.Add(GetNextTypeId(), modifierType);
         TypeToIdModifierMap.Add(modifierType, _nextTypeId);
-        var bm = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType); // this probably isn't a great idea
-        info.Modifiers.Add(bm);
 
-        if (!typeof(GameModifier).IsAssignableFrom(modifierType))
+        BaseModifier modifier;
+        if (modifierType.GetConstructor(Type.EmptyTypes) != null)
+        {
+            modifier = (BaseModifier)Activator.CreateInstance(modifierType)!;
+        }
+        else
+        {
+            // this is probably terrible but its good enough for now.
+            modifier = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType);
+        }
+
+        info.InternalModifiers.Add(modifier);
+
+        if (modifier is not GameModifier gameModifier)
         {
             return true;
         }
 
-        var mod = Activator.CreateInstance(modifierType) as GameModifier;
-        var priority = mod!.Priority();
+        if (modifierType.GetConstructor(Type.EmptyTypes) == null)
+        {
+            Logger<MiraApiPlugin>.Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
+            return false;
+        }
+
+        var priority = gameModifier.Priority();
 
         if (!PrioritiesToIdsMap.TryGetValue(priority, out var list))
         {
@@ -87,68 +103,57 @@ public static class ModifierManager
     {
         var rand = new Random();
 
-        foreach (var priority in PrioritiesToIdsMap.Keys.OrderByDescending(x => x))
+        // Filter and sort modifiers by descending priority.
+        var modifiers = IdToTypeModifierMap
+            .Where(x=>x.Value.IsAssignableTo(typeof(GameModifier)))
+            .Select(x => Activator.CreateInstance(x.Value) as GameModifier)
+            .OfType<GameModifier>()
+            .Where(x => x.GetAmountPerGame() > 0 && x.GetAssignmentChance() > 0)
+            .OrderByDescending(x => x.Priority())
+            .ToArray();
+
+        foreach (var modifier in modifiers)
         {
-            var filteredModifiers = new List<uint>();
+            var assignments = modifier.GetAmountPerGame();
 
-            foreach (var id in PrioritiesToIdsMap[priority])
+            var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
+            if (validPlayers.Count == 0)
             {
-                var mod = Activator.CreateInstance(IdToTypeModifierMap[id]) as GameModifier;
-                var chance = Math.Clamp(mod!.GetAssignmentChance(), 0, 100);
-                var count = mod.GetAmountPerGame();
-
-                if (chance == 0 || count == 0)
-                {
-                    continue;
-                }
-
-                var maxCount = plrs.Count(x => IsGameModifierValid(x, mod, id));
-
-                if (maxCount == 0)
-                {
-                    Logger<MiraApiPlugin>.Warning($"No players are valid for {mod.ModifierName}");
-                    continue;
-                }
-
-                var num = Math.Clamp(count, 0, maxCount);
-
-                for (var i = 0; i < num; i++)
-                {
-                    var randomNum = rand.Next(100);
-
-                    if (randomNum < chance)
-                    {
-                        filteredModifiers.Add(id);
-                    }
-                }
-            }
-
-            if (filteredModifiers.Count == 0)
-            {
-                Logger<MiraApiPlugin>.Warning($"No filtered modifiers for priority {priority}");
+                Logger<MiraApiPlugin>.Warning($"No valid players for modifier {modifier.ModifierName}");
                 continue;
             }
 
-            var shuffledList = filteredModifiers.Randomize();
+            assignments = Math.Min(assignments, validPlayers.Count);
+            var availablePlayers = new List<PlayerControl>(validPlayers);
 
-            if (shuffledList.Count > plrs.Count)
+            for (var i = 0; i < assignments; i++)
             {
-                shuffledList = shuffledList.GetRange(0, plrs.Count);
-            }
-
-            foreach (var id in shuffledList)
-            {
-                var mod = Activator.CreateInstance(IdToTypeModifierMap[id]) as GameModifier;
-                var plr = plrs.Where(x => IsGameModifierValid(x, mod!, id)).Random();
-
-                if (!plr || plr == null)
+                var chance = Math.Clamp(modifier.GetAssignmentChance(), 0, 100);
+                if (rand.Next(100) >= chance)
                 {
-                    Logger<MiraApiPlugin>.Warning($"Somehow valid players for modifier {mod!.ModifierName} disappeared");
+                    continue;
                 }
-                else
+
+                var candidates = availablePlayers
+                    .Where(x => IsGameModifierValid(x, modifier, modifier.TypeId))
+                    .ToList();
+
+                if (candidates.Count == 0)
                 {
-                    plr.RpcAddModifier(id);
+                    Logger<MiraApiPlugin>.Warning(
+                        $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
+                    break;
                 }
+
+                var plr = candidates.Random();
+                if (plr == null)
+                {
+                    Logger<MiraApiPlugin>.Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    continue;
+                }
+
+                plr.RpcAddModifier(modifier.TypeId);
+                availablePlayers.Remove(plr);
             }
         }
     }

MiraAPI/Modifiers/ModifierUtils.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MiraAPI.Modifiers;
+
+/// <summary>
+/// Utilities to make handling modifiers in-game easier.
+/// </summary>
+public static class ModifierUtils
+{
+    /// <summary>
+    /// Gets a list of all active in-game modifiers.
+    /// </summary>
+    /// <param name="predicate">Select if modifier is valid to be added to list.</param>
+    /// <typeparam name="T">The modifier type.</typeparam>
+    /// <returns>A list of modifiers.</returns>
+    public static IEnumerable<T> GetActiveModifiers<T>(Func<T, bool>? predicate = null) where T : BaseModifier
+    {
+        return PlayerControl.AllPlayerControls.ToArray().SelectMany(x => x.GetModifiers<T>(predicate)).OfType<T>();
+    }
+
+    /// <summary>
+    /// Gets all players with a certain modifier.
+    /// </summary>
+    /// <param name="predicate">Select if modifier is valid.</param>
+    /// <typeparam name="T">The modifier type.</typeparam>
+    /// <returns>A list of players with that modifier.</returns>
+    public static IEnumerable<PlayerControl> GetPlayersWithModifier<T>(Func<T, bool>? predicate = null) where T : BaseModifier
+    {
+        return PlayerControl.AllPlayerControls.ToArray().Where(x => x.HasModifier<T>(predicate));
+    }
+}

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.
+    /// Determines whether the player won the game with this modifier. The modifier with the highest priority will override other modifiers.
     /// </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 information for Timed Modifier, including the time remaining.
+    /// Gets the HUD description for Timed Modifier, including the time remaining.
     /// </summary>
-    /// <returns>A string with the hud information + timer.</returns>
-    public override string GetHudString()
+    /// <returns>A string with the time remaining.</returns>
+    public override string GetDescription()
     {
-        return base.GetHudString() + $" <size=70%>({Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s)</size>";
+        return $"Remaining Time: {Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s";
     }
 
     /// <summary>

MiraAPI/Networking/CustomGameOverRpc.cs

@@ -48,11 +48,17 @@ public class CustomGameOverRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<
     {
         if (GameOverManager.TryGetGameOver(data.Reason, out var gameOver))
         {
+            if (!gameOver.VerifyCondition(innerNetObject, [.. data.Winners]))
+            {
+                Logger<MiraApiPlugin>.Info($"Game over condition not met for {gameOver.GetType().Name}");
+                return;
+            }
+
             CustomGameOver.Instance = gameOver;
 
             if (AmongUsClient.Instance.AmHost)
             {
-                GameManager.Instance.RpcEndGame(gameOver!, false);
+                GameManager.Instance.RpcEndGame(gameOver, false);
             }
         }
         else

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,4 +1,7 @@
-using AmongUs.GameOptions;
+using System.Collections;
+using System.Linq;
+using AmongUs.Data;
+using AmongUs.GameOptions;
 using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
 using MiraAPI.Events;
@@ -6,8 +9,6 @@ using MiraAPI.Events.Vanilla.Gameplay;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
 using Reactor.Utilities.Extensions;
-using System.Collections;
-using System.Linq;
 using UnityEngine;
 
 namespace MiraAPI.Networking;
@@ -96,7 +97,7 @@ public static class CustomMurderRpc
             var flag = PlayerControl.LocalPlayer.Data.Role.Role == RoleTypes.GuardianAngel;
             if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
             {
-                StatsManager.Instance.IncrementStat(StringNames.StatsGuardianAngelCrewmatesProtected);
+                DataManager.Player.Stats.IncrementStat(StatID.Role_GuardianAngel_CrewmatesProtected);
                 AchievementManager.Instance.OnProtectACrewmate();
             }
 
@@ -127,14 +128,14 @@ public static class CustomMurderRpc
         DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
         if (source.AmOwner)
         {
-            StatsManager.Instance.IncrementStat(
+            DataManager.Player.Stats.IncrementStat(
                 GameManager.Instance.IsHideAndSeek()
-                    ? StringNames.StatsImpostorKills_HideAndSeek
-                    : StringNames.StatsImpostorKills);
+                    ? StatID.HideAndSeek_ImpostorKills
+                    : StatID.ImpostorKills);
 
             if (source.CurrentOutfitType == PlayerOutfitType.Shapeshifted)
             {
-                StatsManager.Instance.IncrementStat(StringNames.StatsShapeshifterShiftedKills);
+                DataManager.Player.Stats.IncrementStat(StatID.Role_Shapeshifter_ShiftedKills);
             }
 
             if (Constants.ShouldPlaySfx() && playKillSound)
@@ -152,7 +153,7 @@ public static class CustomMurderRpc
         target.gameObject.layer = LayerMask.NameToLayer("Ghost");
         if (target.AmOwner)
         {
-            StatsManager.Instance.IncrementStat(StringNames.StatsTimesMurdered);
+            DataManager.Player.Stats.IncrementStat(StatID.TimesMurdered);
             if (Minigame.Instance)
             {
                 try

MiraAPI/Networking/MiraRpc.cs

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

MiraAPI/Networking/Modifiers/ModifierConverter.cs

@@ -35,6 +35,6 @@ public class ModifierConverter : MessageConverter<BaseModifier>
     {
         var player = reader.ReadNetObject<PlayerControl>();
         var guid = new Guid(reader.ReadBytesAndSize());
-        return player.GetModifier(guid) ?? throw new InvalidOperationException($"Modifier with GUID {guid} not found for player {player.NetId}.");
+        return player.GetModifier(guid) ?? throw new InvalidOperationException($"Modifier with GUID {guid} not found for player with ID: {player.PlayerId}");
     }
 }

MiraAPI/Patches/Events/CanUsePatches.cs

@@ -1,8 +1,8 @@
-using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Usables;
-using System.Collections.Generic;
-using System.Reflection;
 
 namespace MiraAPI.Patches.Events;
 

MiraAPI/Patches/Events/ReportBodyEventPatch.cs

@@ -6,7 +6,7 @@ using MiraAPI.Utilities;
 namespace MiraAPI.Patches.Events;
 
 [HarmonyPatch]
-public static class StartMeetingEventPatch
+public static class ReportBodyEventPatch
 {
     [HarmonyPrefix]
     [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))]
@@ -14,7 +14,7 @@ public static class StartMeetingEventPatch
     {
         var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null;
 
-        var @event = new StartMeetingEvent(__instance, target, body);
+        var @event = new ReportBodyEvent(__instance, target, body);
         MiraEventManager.InvokeEvent(@event);
         return !@event.IsCancelled;
     }

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -0,0 +1,15 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch(typeof(SpawnInMinigame), nameof(SpawnInMinigame.Close))]
+internal static class SpawnInMinigamePatch
+{
+    public static void Postfix()
+    {
+        var @event = new RoundStartEvent(false);
+        MiraEventManager.InvokeEvent(@event);
+    }
+}

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch]
+internal static class SubmergedSpawnGamePatch
+{
+    public static bool Prepare()
+    {
+        return ModCompatibility.SubmergedLoaded(out _);
+    }
+
+    public static IEnumerable<MethodBase> TargetMethods()
+    {
+        if (ModCompatibility.SubmergedLoaded(out var subAss) &&
+            subAss.GetType("Submerged.SpawnIn.SubmarineSelectSpawn") is { } selectSpawn)
+        {
+            yield return AccessTools.Method(selectSpawn, "OnDestroy");
+        }
+    }
+
+    public static void Postfix()
+    {
+        var @event = new RoundStartEvent(false);
+        MiraEventManager.InvokeEvent(@event);
+    }
+}

MiraAPI/Patches/Events/UsePatches.cs

@@ -1,7 +1,7 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
+using HarmonyLib;
+using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Usables;
 
 namespace MiraAPI.Patches.Events;

MiraAPI/Patches/Events/VentEventPatches.cs

@@ -1,7 +1,7 @@
-using HarmonyLib;
+using System.Linq;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Usables;
-using System.Linq;
 
 namespace MiraAPI.Patches.Events;
 

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -18,7 +18,7 @@ namespace MiraAPI.Patches.Freeplay;
 [HarmonyPatch(typeof(TaskAdderGame))]
 internal static class TaskAdderPatches
 {
-    private static Scroller? _scroller;
+    private static Scroller _scroller = null!;
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
@@ -67,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.CustomRoles.Any(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true }))
+            if (plugin.InternalRoles.Any(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true }))
             {
                 var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
                 newFolder.name = plugin.PluginId+":Roles";
@@ -78,7 +78,7 @@ internal static class TaskAdderPatches
                 rolesFolder.SubFolders.Add(newFolder);
             }
 
-            if (plugin.Modifiers.Exists(x => x.ShowInFreeplay))
+            if (plugin.InternalModifiers.Exists(x => x.ShowInFreeplay))
             {
                 var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
                 newFolder.name = plugin.PluginId+":Modifiers";
@@ -293,9 +293,9 @@ internal static class TaskAdderPatches
             chip.GetComponent<SpriteRenderer>().maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
         }
 
-        if (_scroller && _scroller != null)
+        if (_scroller)
         {
-            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 3, 1f);
+            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 5, 1.4f);
             _scroller.SetYBoundsMin(0.0f);
             _scroller.ScrollToTop();
         }
@@ -317,9 +317,9 @@ internal static class TaskAdderPatches
         ref float num2,
         ref float num3)
     {
-        for (var m = 0; m < plugin.Modifiers.Count; m++)
+        for (var m = 0; m < plugin.InternalModifiers.Count; m++)
         {
-            var modifier = plugin.Modifiers[m];
+            var modifier = plugin.InternalModifiers[m];
             if (!modifier.ShowInFreeplay)
             {
                 continue;
@@ -368,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.CustomRoles.Count; m++)
+        for (var m = 0; m < plugin.InternalRoles.Count; m++)
         {
-            var roleBehaviour = plugin.CustomRoles.ElementAt(m).Value;
+            var roleBehaviour = plugin.InternalRoles.ElementAt(m).Value;
             if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
                 roleBehaviour is ICustomRole { Configuration.ShowInFreeplay: false })
             {

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -3,7 +3,6 @@ using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
-using UnityEngine;
 
 namespace MiraAPI.Patches;
 
@@ -57,11 +56,11 @@ public static class IntroCutscenePatches
         }
     }
 
-    /*
     [HarmonyPostfix]
     [HarmonyPatch(nameof(IntroCutscene.OnDestroy))]
-    public static void GameBeginPatch()
+    public static void GameBeginPatch(IntroCutscene __instance)
     {
-        CustomGameModeManager.ActiveMode?.Initialize();
-    }*/
+        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
+        MiraEventManager.InvokeEvent(new RoundStartEvent(true));
+    }
 }

MiraAPI/Patches/Menu/HatsTabPatches.cs

@@ -0,0 +1,141 @@
+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}\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.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+            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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,118 @@
+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}\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.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+        __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

@@ -0,0 +1,118 @@
+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}\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.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+        __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

@@ -0,0 +1,114 @@
+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}\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.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+        __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

@@ -0,0 +1,19 @@
+using HarmonyLib;
+
+namespace MiraAPI.Patches;
+
+/// <summary>
+/// Used to fix the Minigame crash errors (credits Submerged/PH Gaming for the fix)
+/// </summary>
+[HarmonyPatch]
+public 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;
+    }
+}

MiraAPI/Patches/Modifiers/EndGameDidWinPatch.cs

@@ -1,40 +1,63 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
 
 namespace MiraAPI.Patches.Modifiers;
 
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CoEndGame))]
-public static class EndGameDidWinPatch
+[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
+internal static class EndGameDidWinPatch
 {
-    public static void Prefix()
+    private static List<CachedPlayerData> CachedWinners { get; set; } = [];
+
+    public static void Prefix(EndGameResult endGameResult)
     {
-        var gameOverReason = EndGameResult.CachedGameOverReason;
-        EndGameResult.CachedWinners.Clear();
+        CachedWinners.Clear();
+        var gameOverReason = endGameResult.GameOverReason;
 
         var players = GameData.Instance.AllPlayers.ToArray();
         for (var i = 0; i < GameData.Instance.PlayerCount; i++)
         {
             var networkedPlayerInfo = players[i];
-            if (networkedPlayerInfo == null)
+            if (!networkedPlayerInfo)
             {
                 continue;
             }
 
             var didWin = networkedPlayerInfo.Role.DidWin(gameOverReason);
 
-            var modifierWin = networkedPlayerInfo.Object?.GetModifierComponent().GetModifiers<GameModifier>()
-                .FirstOrDefault(x => x.DidWin(gameOverReason) != null)?.DidWin(gameOverReason);
-            if (modifierWin != null)
+            if (!networkedPlayerInfo.Object)
             {
-                didWin = modifierWin.Value;
+                if (didWin)
+                {
+                    CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
+                }
+                continue;
+            }
+
+            foreach (var modifier in networkedPlayerInfo.Object.GetModifiers<GameModifier>().OrderByDescending(x => x.Priority()))
+            {
+                var result = modifier.DidWin(gameOverReason);
+                if (!result.HasValue) continue;
+
+                didWin = result.Value;
+                break;
             }
 
             if (didWin)
             {
-                EndGameResult.CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
+                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

@@ -1,27 +1,25 @@
-using HarmonyLib;
+using System;
+using System.Linq;
+using HarmonyLib;
+using MiraAPI.GameOptions;
+using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using Reactor.Localization.Utilities;
 using Reactor.Utilities.Extensions;
-using System.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
+using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Options;
 
-/// <summary>
-/// Patches the GameOptionsMenu to add custom options.
-/// </summary>
 [HarmonyPatch(typeof(GameOptionsMenu))]
-public static class GameOptionsMenuPatch
+internal 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)
@@ -30,66 +28,101 @@ public static class GameOptionsMenuPatch
         }
 
         var num = 2.1f;
-        var filteredGroups =
-            GameSettingMenuPatches.SelectedMod?.OptionGroups.Where(
-                x => x.AdvancedRole is null) ?? [];
-
-        foreach (var group in filteredGroups)
+        if (__instance.name == "MODIFIERS TAB")
         {
-            if (group.Options.Count == 0 || group.Header is null)
+            ModifiersUpdate(ref num);
+        }
+        else
+        {
+            var filteredGroups =
+                GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+                    .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
+
+            foreach (var group in filteredGroups)
             {
-                continue;
-            }
-
-            if (!group.GroupVisible.Invoke())
-            {
-                group.Header.gameObject.SetActive(false);
-                foreach (var option in group.Options)
-                {
-                    option.OptionBehaviour?.gameObject.SetActive(false);
-                }
-                continue;
-            }
-
-            group.Header.gameObject.SetActive(true);
-            group.Header.transform.localScale = Vector3.one * 0.63f;
-            group.Header.transform.localPosition = new Vector3(-0.903f, num, -2f);
-
-            num -= 0.58f;
-
-            foreach (var opt in group.Options)
-            {
-                var newOpt = opt.OptionBehaviour;
-
-                if (newOpt is null)
-                {
-                    continue;
-                }
-
-                if (!opt.Visible.Invoke())
-                {
-                    newOpt.gameObject.SetActive(false);
-                    continue;
-                }
-
-                if (!group.AllOptionsHidden)
-                {
-                    newOpt.gameObject.SetActive(true);
-                    newOpt.transform.localPosition = new Vector3(0.952f, num, -2f);
-                    num -= 0.45f;
-                }
-                else
-                {
-                    newOpt.gameObject.SetActive(false);
-                }
+                UpdateGroup(group, ref num);
             }
         }
 
         __instance.scrollBar.SetYBoundsMax(-num - 1.65f);
     }
 
+    private static void UpdateGroup(AbstractOptionGroup group, ref float num)
+    {
+        if (group.Options.Count == 0 || group.Header is null)
+        {
+            return;
+        }
+
+        if (!group.GroupVisible.Invoke())
+        {
+            group.Header.gameObject.SetActive(false);
+            foreach (var option in group.Options)
+            {
+                option.OptionBehaviour?.gameObject.SetActive(false);
+            }
+
+            return;
+        }
+
+        group.Header.gameObject.SetActive(true);
+        group.Header.transform.localScale = Vector3.one * 0.63f;
+        group.Header.transform.localPosition = new Vector3(-0.903f, num, -2f);
+
+        num -= 0.58f;
+
+        foreach (var opt in group.Options)
+        {
+            var newOpt = opt.OptionBehaviour;
+
+            if (newOpt is null)
+            {
+                continue;
+            }
+
+            if (!opt.Visible.Invoke())
+            {
+                newOpt.gameObject.SetActive(false);
+                continue;
+            }
+
+            if (!group.AllOptionsHidden)
+            {
+                newOpt.gameObject.SetActive(true);
+                newOpt.transform.localPosition = new Vector3(0.952f, num, -2f);
+                num -= 0.45f;
+            }
+            else
+            {
+                newOpt.gameObject.SetActive(false);
+            }
+        }
+    }
+
+    private static void ModifiersUpdate(ref float num)
+    {
+        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+            .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
+
+        foreach (var modGroup in groups)
+        {
+            UpdateGroup(modGroup, ref num);
+        }
+    }
+
+    private static void ModifiersCreate(GameOptionsMenu menu)
+    {
+        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+            .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
+        foreach (var group in groups)
+        {
+            CreateGroup(menu, group);
+        }
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameOptionsMenu.CreateSettings))]
+    // ReSharper disable once InconsistentNaming
     public static bool SettingsPatch(GameOptionsMenu __instance)
     {
         if (GameSettingMenuPatches.SelectedModIdx == 0)
@@ -99,106 +132,18 @@ public static class GameOptionsMenuPatch
 
         __instance.MapPicker.gameObject.SetActive(false);
 
-        var filteredGroups = GameSettingMenuPatches.SelectedMod?.OptionGroups.Where(x => x.AdvancedRole is null) ?? [];
+        if (__instance.name == "MODIFIERS TAB")
+        {
+            ModifiersCreate(__instance);
+            return false;
+        }
+
+        var filteredGroups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+            .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
         foreach (var group in filteredGroups)
         {
-            var categoryHeaderMasked = Object.Instantiate(
-                __instance.categoryHeaderOrigin,
-                Vector3.zero,
-                Quaternion.identity,
-                __instance.settingsContainer);
-            categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20);
-            if (group.GroupColor != Color.clear)
-            {
-                categoryHeaderMasked.Background.color = group.GroupColor;
-                categoryHeaderMasked.Divider.color = group.GroupColor;
-                categoryHeaderMasked.Title.color = group.GroupColor.GetAlternateColor();
-            }
-
-            categoryHeaderMasked.Background.size = new Vector2(
-                categoryHeaderMasked.Background.size.x + 1.5f,
-                categoryHeaderMasked.Background.size.y);
-            categoryHeaderMasked.gameObject.SetActive(false);
-            group.Header = categoryHeaderMasked;
-
-            var newText = Object.Instantiate(categoryHeaderMasked.Title, categoryHeaderMasked.transform);
-            newText.text = "<size=70%>(Click to close)</size>";
-            newText.transform.localPosition = new Vector3(2.6249f, -0.165f, 0f);
-            newText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
-
-            var options = group.Options.Select(
-                opt => opt.CreateOption(
-                    __instance.checkboxOrigin,
-                    __instance.numberOptionOrigin,
-                    __instance.stringOptionOrigin,
-                    __instance.settingsContainer));
-
-            foreach (var newOpt in options)
-            {
-                newOpt.SetClickMask(__instance.ButtonClickMask);
-
-                SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
-                foreach (var renderer in componentsInChildren)
-                {
-                    if (group.GroupColor != Color.clear)
-                    {
-                        renderer.color = group.GroupColor.GetAlternateColor();
-                        if (renderer.transform.parent.TryGetComponent<GameOptionButton>(out var btn))
-                        {
-                            btn.interactableColor = group.GroupColor.GetAlternateColor();
-                            btn.interactableHoveredColor = Color.white;
-                        }
-                    }
-
-                    renderer.material.SetInt(PlayerMaterial.MaskLayer, 20);
-                }
-
-                foreach (var textMeshPro in newOpt.GetComponentsInChildren<TextMeshPro>(true))
-                {
-                    if (group.GroupColor != Color.clear)
-                    {
-                        textMeshPro.color = group.GroupColor;
-                    }
-
-                    textMeshPro.fontMaterial.SetFloat(ShaderID.StencilComp, 3f);
-                    textMeshPro.fontMaterial.SetFloat(ShaderID.Stencil, 20);
-                }
-
-                if (newOpt is ToggleOption toggle)
-                {
-                    toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset();
-                    toggle.CheckMark.color =
-                        group.GroupColor != Color.clear ? group.GroupColor : MiraAssets.AcceptedTeal;
-                    var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite")
-                        .GetComponent<SpriteRenderer>();
-                    rend.sprite = MiraAssets.CheckmarkBox.LoadAsset();
-                    rend.color = group.GroupColor != Color.clear ? group.GroupColor : MiraAssets.AcceptedTeal;
-                }
-
-                __instance.Children.Add(newOpt);
-
-                newOpt.Initialize();
-                newOpt.gameObject.SetActive(false);
-            }
-
-            var boxCol = categoryHeaderMasked.gameObject.AddComponent<BoxCollider2D>();
-            boxCol.size = new Vector2(7, 0.7f);
-            boxCol.offset = new Vector2(1.5f, -0.3f);
-
-            var headerBtn = categoryHeaderMasked.gameObject.AddComponent<PassiveButton>();
-            headerBtn.ClickSound = __instance.BackButton.GetComponent<PassiveButton>().ClickSound;
-            headerBtn.OnMouseOver = new UnityEvent();
-            headerBtn.OnMouseOut = new UnityEvent();
-            headerBtn.OnClick.AddListener(
-                (UnityAction)(() =>
-                {
-                    group.AllOptionsHidden = !group.AllOptionsHidden;
-                    newText.text = group.AllOptionsHidden
-                        ? "<size=70%>(Click to open)</size>"
-                        : "<size=70%>(Click to close)</size>";
-                }));
-            headerBtn.SetButtonEnableState(true);
+            CreateGroup(__instance, group);
         }
 
         return false;
@@ -206,6 +151,7 @@ public 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)
@@ -233,9 +179,112 @@ public static class GameOptionsMenuPatch
                 continue;
             }
 
-            optionBehaviour.OnValueChanged = new System.Action<OptionBehaviour>(__instance.ValueChanged);
+            optionBehaviour.OnValueChanged = new Action<OptionBehaviour>(__instance.ValueChanged);
         }
 
         return false;
     }
+
+    private static void CreateGroup(GameOptionsMenu menu, AbstractOptionGroup group)
+    {
+        var categoryHeaderMasked = Object.Instantiate(
+            menu.categoryHeaderOrigin,
+            Vector3.zero,
+            Quaternion.identity,
+            menu.settingsContainer);
+
+        categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20);
+        categoryHeaderMasked.Background.color = group.GroupColor;
+        categoryHeaderMasked.Divider.color = group.GroupColor;
+        categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.GroupColor.FindAlternateColor();
+
+        categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
+        categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
+        categoryHeaderMasked.Background.sprite.texture.wrapMode = TextureWrapMode.Clamp;
+
+        categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.5f, -0.1833f, 0);
+        categoryHeaderMasked.Background.size = new Vector2(
+            categoryHeaderMasked.Background.size.x + 1.5f,
+            categoryHeaderMasked.Background.size.y);
+
+        categoryHeaderMasked.gameObject.SetActive(false);
+        group.Header = categoryHeaderMasked;
+
+        var newText = Object.Instantiate(categoryHeaderMasked.Title, categoryHeaderMasked.transform);
+        newText.text = "<size=70%>(Click to close)</size>";
+        newText.transform.localPosition = new Vector3(2.6249f, -0.165f, 0f);
+        newText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
+
+        var options = group.Options.Select(
+            opt => opt.CreateOption(
+                menu.checkboxOrigin,
+                menu.numberOptionOrigin,
+                menu.stringOptionOrigin,
+                menu.settingsContainer));
+
+        foreach (var newOpt in options)
+        {
+            newOpt.SetClickMask(menu.ButtonClickMask);
+
+            SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
+            foreach (var renderer in componentsInChildren)
+            {
+                if (group.GroupColor != MiraApiPlugin.DefaultHeaderColor)
+                {
+                    renderer.color = group.GroupColor.FindAlternateColor();
+                    if (renderer.transform.parent.TryGetComponent<GameOptionButton>(out var btn))
+                    {
+                        btn.interactableColor = group.GroupColor.FindAlternateColor();
+                        btn.interactableHoveredColor = Color.white;
+                    }
+                }
+
+                renderer.material.SetInt(PlayerMaterial.MaskLayer, 20);
+            }
+
+            foreach (var textMeshPro in newOpt.GetComponentsInChildren<TextMeshPro>(true))
+            {
+                if (group.GroupColor != MiraApiPlugin.DefaultHeaderColor)
+                {
+                    textMeshPro.color = group.GroupColor;
+                }
+
+                textMeshPro.fontMaterial.SetFloat(ShaderID.StencilComp, 3f);
+                textMeshPro.fontMaterial.SetFloat(ShaderID.Stencil, 20);
+            }
+
+            if (newOpt is ToggleOption toggle)
+            {
+                toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset();
+                toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal;
+                var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite")
+                    .GetComponent<SpriteRenderer>();
+                rend.sprite = MiraAssets.CheckmarkBox.LoadAsset();
+                rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal;
+            }
+
+            menu.Children.Add(newOpt);
+
+            newOpt.Initialize();
+            newOpt.gameObject.SetActive(false);
+        }
+
+        var boxCol = categoryHeaderMasked.gameObject.AddComponent<BoxCollider2D>();
+        boxCol.size = new Vector2(7, 0.7f);
+        boxCol.offset = new Vector2(1.5f, -0.3f);
+
+        var headerBtn = categoryHeaderMasked.gameObject.AddComponent<PassiveButton>();
+        headerBtn.ClickSound = menu.BackButton.GetComponent<PassiveButton>().ClickSound;
+        headerBtn.OnMouseOver = new UnityEvent();
+        headerBtn.OnMouseOut = new UnityEvent();
+        headerBtn.OnClick.AddListener(
+            (UnityAction)(() =>
+            {
+                group.AllOptionsHidden = !group.AllOptionsHidden;
+                newText.text = group.AllOptionsHidden
+                    ? "<size=70%>(Click to open)</size>"
+                    : "<size=70%>(Click to close)</size>";
+            }));
+        headerBtn.SetButtonEnableState(true);
+    }
 }

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

@@ -0,0 +1,348 @@
+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.Presets))
+            {
+                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.Presets.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.Presets.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,9 +1,12 @@
-using HarmonyLib;
+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 System;
-using System.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
@@ -12,25 +15,74 @@ using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Options;
 
-/// <summary>
-/// Patches for the <see cref="GameSettingMenu"/> to add support for custom options.
-/// </summary>
 [HarmonyPatch(typeof(GameSettingMenu))]
-public static class GameSettingMenuPatches
+internal static class GameSettingMenuPatches
 {
-    /// <summary>
-    /// Gets the currently selected mod index.
-    /// </summary>
     public static int SelectedModIdx { get; private set; }
 
-    /// <summary>
-    /// Gets the currently selected mod.
-    /// </summary>
     public static MiraPluginInfo? SelectedMod { get; private set; }
 
     private static TextMeshPro? _text;
 
     private static Vector3 _roleBtnOgPos;
+    private static Vector3 _smallRoleBtnOgPos;
+    private static Vector3 _modifierBtnOgPos;
+
+    private static GameOptionsMenu? _modifiersTab;
+    private static PassiveButton? _modifiersButton;
+    private static PassiveButton? _smallRolesButton;
+
+    private static Dictionary<int, Vector3> OptionScrolls = [];
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
+    // ReSharper disable once InconsistentNaming
+    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);
+            }
+
+            _modifiersButton?.SelectButton(tabNum == 3);
+            _smallRolesButton?.SelectButton(tabNum == 2);
+            if (tabNum == 3)
+            {
+                if (__instance.RoleSettingsButton.gameObject.active)
+                {
+                    __instance.RoleSettingsButton.SelectButton(true);
+                }
+                else
+                {
+                    _modifiersButton?.SelectButton(true);
+                }
+            }
+        }
+
+        if (previewOnly)
+        {
+            return;
+        }
+
+        _modifiersButton?.SelectButton(tabNum == 3);
+        _smallRolesButton?.SelectButton(tabNum == 2);
+
+        if (tabNum != 3)
+        {
+            return;
+        }
+
+        if (__instance.RoleSettingsButton.gameObject.active)
+        {
+            __instance.RoleSettingsButton.SelectButton(true);
+        }
+        else
+        {
+            _modifiersButton?.SelectButton(true);
+        }
+    }
 
     /// <summary>
     /// Prefix for the <see cref="GameSettingMenu.Start"/> method. Sets up the custom options.
@@ -38,6 +90,7 @@ public static class GameSettingMenuPatches
     /// <param name="__instance">The GameSettingMenu instance.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameSettingMenu.Start))]
+    // ReSharper disable once InconsistentNaming
     public static void StartPrefix(GameSettingMenu __instance)
     {
         _roleBtnOgPos = __instance.RoleSettingsButton.transform.localPosition;
@@ -54,43 +107,171 @@ public static class GameSettingMenuPatches
         _text.fontSizeMax = 3.2f;
         _text.overflowMode = TextOverflowModes.Overflow;
 
-        UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
-
         _text.alignment = TextAlignmentOptions.Center;
 
         var nextButton = Object.Instantiate(__instance.BackButton, __instance.BackButton.transform.parent).gameObject;
         nextButton.transform.localPosition = new Vector3(-2.2663f, 1.5272f, -25f);
         nextButton.name = "RightArrowButton";
-        nextButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().sprite = MiraAssets.NextButton.LoadAsset();
-        nextButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite = MiraAssets.NextButtonActive.LoadAsset();
+        nextButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().sprite =
+            MiraAssets.NextButton.LoadAsset();
+        nextButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
+            MiraAssets.NextButtonActive.LoadAsset();
         nextButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
 
         var passiveButton = nextButton.gameObject.GetComponent<PassiveButton>();
         passiveButton.OnClick = new ButtonClickedEvent();
-        passiveButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            SelectedModIdx += 1;
-            if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
+        passiveButton.OnClick.AddListener(
+            (UnityAction)(() =>
             {
-                SelectedModIdx = 0;
-            }
-            UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
-        }));
+                RoleSettingMenuPatches.Scrolls[SelectedModIdx] =
+                    __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
+                OptionScrolls[SelectedModIdx] =
+                    __instance.GameSettingsTab.scrollBar.Inner.localPosition;
+
+                SelectedModIdx += 1;
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                {
+                    SelectedModIdx = 0;
+                }
+
+                UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
+            }));
 
         var backButton = Object.Instantiate(nextButton, __instance.BackButton.transform.parent).gameObject;
         backButton.transform.localPosition = new Vector3(-4.4209f, 1.5272f, -25f);
         backButton.name = "LeftArrowButton";
         backButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().Destroy();
-        backButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().flipX = backButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().flipX = true;
-        backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener((UnityAction)(() =>
-        {
-            SelectedModIdx -= 1;
-            if (SelectedModIdx < 0)
+        backButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().flipX =
+            backButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().flipX = true;
+        backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
+            (UnityAction)(() =>
             {
-                SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
+                RoleSettingMenuPatches.Scrolls[SelectedModIdx] =
+                    __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
+                OptionScrolls[SelectedModIdx] =
+                    __instance.GameSettingsTab.scrollBar.Inner.localPosition;
+
+                SelectedModIdx -= 1;
+                if (SelectedModIdx < 0)
+                {
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                }
+
+                UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
+            }));
+
+        // clone game settings tab for modifiers
+        _modifiersTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
+        _modifiersTab.name = "MODIFIERS TAB";
+
+        // create button for modifiers
+        __instance.RoleSettingsButton.buttonText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
+        __instance.RoleSettingsButton.gameObject.SetActive(false);
+        _smallRolesButton = Object.Instantiate(
+            __instance.RoleSettingsButton,
+            __instance.RoleSettingsButton.transform.parent);
+        var pos = new Vector3(
+            -3.65f,
+            _smallRolesButton.transform.localPosition.y,
+            _smallRolesButton.transform.localPosition.z);
+        _smallRolesButton.transform.localPosition = pos;
+        _smallRolesButton.OnClick.AddListener(
+            (UnityAction)(() =>
+            {
+                __instance.ChangeTab(2, false);
+            }));
+        _smallRolesButton.OnMouseOver.AddListener(
+            (UnityAction)(() =>
+            {
+                __instance.ChangeTab(2, true);
+            }));
+
+        _smallRoleBtnOgPos = _smallRolesButton.transform.localPosition;
+
+        var roleText = _smallRolesButton.buttonText;
+        roleText.text = "Roles";
+        roleText.GetComponent<TextTranslatorTMP>().Destroy();
+        roleText.alignment = TextAlignmentOptions.Center;
+        roleText.transform.parent.localPosition = new Vector3(
+            -.525f,
+            roleText.transform.parent.localPosition.y,
+            roleText.transform.parent.localPosition.z);
+
+        foreach (var collider in _smallRolesButton.Colliders)
+        {
+            if (collider.TryCast<BoxCollider2D>() is { } col)
+            {
+                col.size = new Vector2(col.size.x / 2, col.size.y);
             }
-            UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
-        }));
+        }
+
+        foreach (var rend in _smallRolesButton.GetComponentsInChildren<SpriteRenderer>(true))
+        {
+            rend.size = new Vector2(rend.size.x / 2, rend.size.y);
+        }
+
+        _modifiersButton = Object.Instantiate(_smallRolesButton, _smallRolesButton.transform.parent);
+        _modifiersButton.OnClick = new ButtonClickedEvent();
+        _modifiersButton.OnClick.AddListener(
+            (UnityAction)(() =>
+            {
+                __instance.ChangeTab(3, false);
+            }));
+        _modifiersButton.OnMouseOver = new UnityEvent();
+        _modifiersButton.OnMouseOver.AddListener(
+            (UnityAction)(() =>
+            {
+                __instance.ChangeTab(3, true);
+            }));
+
+        _modifiersButton.buttonText.text = "Modifiers";
+        pos.x = -2.27f;
+        _modifiersButton.transform.localPosition = pos;
+        _modifiersButton.name = "ModifiersButton";
+
+        _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)
+    {
+        menu.RoleSettingsButton.OnClick = new ButtonClickedEvent();
+        menu.RoleSettingsButton.OnMouseOver = new UnityEvent();
+
+        if (replace)
+        {
+            menu.RoleSettingsButton.buttonText.text = "Modifiers Settings";
+            menu.RoleSettingsButton.OnClick.AddListener(
+                (UnityAction)(() =>
+                {
+                    menu.ChangeTab(3, false);
+                }));
+            menu.RoleSettingsButton.OnMouseOver.AddListener(
+                (UnityAction)(() =>
+                {
+                    menu.ChangeTab(3, true);
+                }));
+        }
+        else
+        {
+            menu.RoleSettingsButton.buttonText.text = "Roles Settings";
+            menu.RoleSettingsButton.OnClick.AddListener(
+                (UnityAction)(() =>
+                {
+                    menu.ChangeTab(2, false);
+                }));
+            menu.RoleSettingsButton.OnMouseOver.AddListener(
+                (UnityAction)(() =>
+                {
+                    menu.ChangeTab(2, true);
+                }));
+        }
     }
 
     private static void UpdateText(GameSettingMenu menu, GameOptionsMenu settings, RolesSettingsMenu roles)
@@ -99,94 +280,223 @@ public static class GameSettingMenuPatches
         {
             _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 = name[..Math.Min(name.Length, 25)];
         }
 
+        bool replaceWithModifiers = true;
+        _smallRolesButton!.transform.localPosition = _smallRoleBtnOgPos;
+        _modifiersButton!.transform.localPosition = _modifierBtnOgPos;
         menu.RoleSettingsButton.transform.localPosition = _roleBtnOgPos;
-        menu.GameSettingsButton.gameObject.SetActive(true);
-        menu.RoleSettingsButton.gameObject.SetActive(true);
 
         if (SelectedModIdx != 0)
         {
-            if (SelectedMod?.Options.Where(x=>x.AdvancedRole==null).ToList().Count == 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);
+
+            _modifiersButton.gameObject.SetActive(true);
+            _smallRolesButton.gameObject.SetActive(true);
+            menu.GameSettingsButton.gameObject.SetActive(true);
+            menu.RoleSettingsButton.gameObject.SetActive(false);
+
+            // If there are no registered custom roles in the selected mod, hide the button.
+            if (!modHasRoles)
+            {
+                _smallRolesButton.gameObject.SetActive(false);
+
+                if (roles.gameObject.active)
+                {
+                    menu.ChangeTab(0, false);
+                }
+
+                // If the mod has modifiers, we can disable the smaller modifier button and enable the bigger one.
+                if (modHasModifiers)
+                {
+                    _modifiersButton.gameObject.SetActive(false);
+                    menu.RoleSettingsButton.gameObject.SetActive(true);
+
+                    if (_modifiersTab!.gameObject.active)
+                    {
+                        menu.RoleSettingsButton.SelectButton(true);
+                    }
+                }
+            }
+
+            // If there are no modifiers in the selected mod, hide the modifiers button.
+            if (!modHasModifiers)
+            {
+                replaceWithModifiers = false;
+                _modifiersButton.gameObject.SetActive(false);
+
+                if (_modifiersTab!.gameObject.active)
+                {
+                    menu.ChangeTab(0, false);
+                }
+
+                // If the mod has roles, we can enable the bigger role button and disable the small one.
+                if (modHasRoles)
+                {
+                    menu.RoleSettingsButton.gameObject.SetActive(true);
+                    _smallRolesButton.gameObject.SetActive(false);
+                }
+            }
+
+            // If there are no custom game options registered (that aren't modifier options), hide game settings button.
+            if (!modHasOptions)
             {
                 menu.GameSettingsButton.gameObject.SetActive(false);
-            }
 
-            if (SelectedMod?.CustomRoles.Count == 0)
-            {
-                menu.RoleSettingsButton.gameObject.SetActive(false);
-            }
+                if (settings.gameObject.active)
+                {
+                    menu.ChangeTab(0, false);
+                }
 
-            if (!menu.GameSettingsButton.gameObject.active && menu.RoleSettingsButton.gameObject.active)
+                // If the mod has roles and modifiers, we can move their buttons to the game settings button position, since nothing is there.
+                if (menu.RoleSettingsButton.gameObject.active)
+                {
+                    menu.RoleSettingsButton.transform.localPosition = menu.GameSettingsButton.transform.localPosition;
+                }
+                else if (_modifiersButton.gameObject.active && _smallRolesButton.gameObject.active)
+                {
+                    _modifiersButton.transform.localPosition = new Vector3(
+                        _modifiersButton.transform.localPosition.x,
+                        menu.GameSettingsButton.transform.localPosition.y,
+                        _modifiersButton.transform.localPosition.z);
+
+                    _smallRolesButton.transform.localPosition = new Vector3(
+                        _smallRolesButton.transform.localPosition.x,
+                        menu.GameSettingsButton.transform.localPosition.y,
+                        _smallRolesButton.transform.localPosition.z);
+                }
+            }
+        }
+        else
+        {
+            _modifiersButton.gameObject.SetActive(false);
+            _smallRolesButton.gameObject.SetActive(false);
+            menu.RoleSettingsButton.gameObject.SetActive(true);
+            menu.GameSettingsButton.gameObject.SetActive(true);
+            replaceWithModifiers = false;
+
+            if (_modifiersTab!.gameObject.active)
             {
-                menu.RoleSettingsButton.transform.localPosition = menu.GameSettingsButton.transform.localPosition;
+                menu.ChangeTab(0, false);
             }
         }
 
-        if (roles.roleChances != null && SelectedMod != null && SelectedMod.CustomRoles.Count != 0)
+        if (menu.RoleSettingsButton.gameObject.active)
         {
-            if (roles.advancedSettingChildren is not null)
-            {
-                foreach (var child in roles.advancedSettingChildren)
-                {
-                    child.gameObject.DestroyImmediate();
-                }
-                roles.advancedSettingChildren.Clear();
-                roles.advancedSettingChildren = null;
-            }
-
-            foreach (var header in roles.RoleChancesSettings.transform.GetComponentsInChildren<CategoryHeaderEditRole>())
-            {
-                header.gameObject.DestroyImmediate();
-            }
-
-            foreach (var roleChance in roles.roleChances)
-            {
-                roleChance.gameObject.DestroyImmediate();
-            }
-
-            roles.roleChances.Clear();
-            roles.AdvancedRolesSettings.gameObject.SetActive(false);
-            roles.RoleChancesSettings.gameObject.SetActive(true);
-            roles.SetQuotaTab();
-            roles.scrollBar.ScrollToTop();
+            ChangeRoleSettingButton(replaceWithModifiers, menu);
         }
 
-        if (settings.Children != null && SelectedMod?.OptionGroups.Count != 0)
+        if (menu.PresetsTab.gameObject.active)
         {
-            foreach (var child in settings.Children)
+            menu.ChangeTab(0, false);
+        }
+
+        CleanupTab(settings, roles);
+    }
+
+    private static void ClearOptions(Il2CppSystem.Collections.Generic.List<OptionBehaviour> options)
+    {
+        foreach (var child in options)
+        {
+            if (child.TryCast<GameOptionsMapPicker>() || !child.gameObject)
             {
-                if (child.TryCast<GameOptionsMapPicker>())
-                {
-                    continue;
-                }
-
-                if (!child.gameObject)
-                {
-                    continue;
-                }
-
-                child.gameObject.DestroyImmediate();
+                continue;
             }
 
-            foreach (var header in settings.settingsContainer.GetComponentsInChildren<CategoryHeaderMasked>())
+            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);
+        }
+
+        void CleanupSettings(GameOptionsMenu gameOptMenu)
+        {
+            ClearOptions(gameOptMenu.Children);
+            gameOptMenu.Children = null;
+
+            gameOptMenu.settingsContainer
+                .GetComponentsInChildren<CategoryHeaderMasked>()
+                .ToList()
+                .ForEach(header => header.gameObject.DestroyImmediate());
+
+            gameOptMenu.Initialize();
+            if (OptionScrolls.TryGetValue(SelectedModIdx, out var pos))
             {
-                header.gameObject.DestroyImmediate();
+                gameOptMenu.scrollBar.Inner.localPosition = pos;
+                gameOptMenu.scrollBar.UpdateScrollBars();
+            }
+            else
+            {
+                gameOptMenu.scrollBar.ScrollToTop();
+            }
+        }
+
+        void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
+        {
+            if (rolesMenu.advancedSettingChildren != null)
+            {
+                ClearOptions(rolesMenu.advancedSettingChildren);
+                rolesMenu.advancedSettingChildren = null;
             }
 
-            settings.Children.Clear();
-            settings.Children = null;
+            rolesMenu.RoleChancesSettings
+                .transform
+                .GetComponentsInChildren<CategoryHeaderEditRole>()
+                .ToList()
+                .ForEach(header => header.gameObject.DestroyImmediate());
 
-            settings.Initialize();
-            settings.scrollBar.ScrollToTop();
+            foreach (var role in rolesMenu.roleChances)
+            {
+                role.gameObject.DestroyImmediate();
+            }
+
+            rolesMenu.roleChances?.Clear();
+
+            rolesMenu.AdvancedRolesSettings.gameObject.SetActive(false);
+            rolesMenu.RoleChancesSettings.gameObject.SetActive(true);
+            rolesMenu.SetQuotaTab();
+            if (SelectedModIdx == 0)
+            {
+                if (RoleSettingMenuPatches.Scrolls.TryGetValue(0, out var pos))
+                {
+                    rolesMenu.scrollBar.Inner.localPosition = pos;
+                    rolesMenu.scrollBar.UpdateScrollBars();
+                }
+                else
+                {
+                    rolesMenu.scrollBar.ScrollToTop();
+                }
+            }
         }
     }
 }

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -1,12 +1,15 @@
-using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
+using MiraAPI.GameOptions;
+using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Reactor.Localization.Utilities;
+using Reactor.Utilities.Extensions;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -17,17 +20,38 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(LobbyViewSettingsPane))]
 public static class LobbyViewPanePatches
 {
-    private static int CurrentSelectedMod { get; set; }
+    private static int SelectedModIdx { get; set; }
 
-    private static MiraPluginInfo? SelectedMod => CurrentSelectedMod == 0
+    private static MiraPluginInfo? SelectedMod => SelectedModIdx == 0
         ? null
-        : MiraPluginManager.Instance.RegisteredPlugins()[CurrentSelectedMod - 1];
+        : MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+
+    private static PassiveButton? ModifiersTabButton { get; set; }
+
+    private static StringNames ModifiersTabName { get; } = CustomStringName.CreateAndRegister("ModifiersTab");
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(LobbyViewSettingsPane.Awake))]
     public static void AwakePatch(LobbyViewSettingsPane __instance)
     {
         __instance.gameModeText.transform.localPosition = new Vector3(-2.3f, 2.4f, -2);
+        __instance.gameModeText.GetComponent<TextTranslatorTMP>().Destroy();
+
+        // create modifiers button
+        ModifiersTabButton = Object.Instantiate(__instance.rolesTabButton, __instance.rolesTabButton.transform.parent);
+        ModifiersTabButton.buttonText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
+        ModifiersTabButton.name = "ModifiersTabButton";
+        var pos = ModifiersTabButton.transform.localPosition;
+        pos.x = 2.1f;
+        ModifiersTabButton.transform.localPosition = pos;
+        ModifiersTabButton.buttonText.text = "Modifiers";
+        ModifiersTabButton.OnClick = new Button.ButtonClickedEvent();
+        ModifiersTabButton.OnClick.AddListener(
+            (UnityAction)(() =>
+            {
+                __instance.ChangeTab(ModifiersTabName);
+            }));
+        ModifiersTabButton.gameObject.SetActive(SelectedModIdx!=0);
 
         // Create the next button
         var nextButton = Object.Instantiate(__instance.BackButton, __instance.BackButton.transform.parent).gameObject;
@@ -49,14 +73,13 @@ public static class LobbyViewPanePatches
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
             {
-                CurrentSelectedMod += 1;
-                if (CurrentSelectedMod > MiraPluginManager.Instance.RegisteredPlugins().Length)
+                SelectedModIdx += 1;
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
                 {
-                    CurrentSelectedMod = 0;
+                    SelectedModIdx = 0;
                 }
 
-                __instance.RefreshTab();
-                __instance.scrollBar.ScrollToTop();
+                Refresh(__instance);
             }));
 
         // Create the back button
@@ -72,34 +95,56 @@ public static class LobbyViewPanePatches
         passiveButton2.OnClick.AddListener(
             (UnityAction)(() =>
             {
-                CurrentSelectedMod -= 1;
-                if (CurrentSelectedMod < 0)
+                SelectedModIdx -= 1;
+                if (SelectedModIdx < 0)
                 {
-                    CurrentSelectedMod = MiraPluginManager.Instance.RegisteredPlugins().Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
                 }
 
-                __instance.RefreshTab();
-                __instance.scrollBar.ScrollToTop();
+                Refresh(__instance);
             }));
     }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(LobbyViewSettingsPane.Update))]
-    public static void UpdatePatch(LobbyViewSettingsPane __instance)
+    private static void Refresh(LobbyViewSettingsPane menu)
     {
-        __instance.gameModeText.text = SelectedMod?.PluginInfo.Metadata.Name ?? "Default";
+        ModifiersTabButton?.gameObject.SetActive(SelectedModIdx != 0);
+        menu.gameModeText.text = SelectedMod?.PluginInfo.Metadata.Name ?? "Default";
+        menu.RefreshTab();
+        menu.scrollBar.ScrollToTop();
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(LobbyViewSettingsPane.SetTab))]
+    public static bool SetTabPatch(LobbyViewSettingsPane __instance)
+    {
+        if (__instance.currentTab != ModifiersTabName || SelectedMod == null)
+        {
+            ModifiersTabButton?.SelectButton(false);
+            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?.IsAssignableTo(typeof(BaseModifier))==true));
+        DrawOptions(__instance, filteredGroups);
+        return false;
     }
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(LobbyViewSettingsPane.DrawNormalTab))]
     public static bool DrawNormalTabPatch(LobbyViewSettingsPane __instance)
     {
-        if (CurrentSelectedMod == 0)
+        if (SelectedModIdx == 0 || SelectedMod == null)
         {
             return true;
         }
 
-        DrawOptionsTab(__instance);
+        var filteredGroups = SelectedMod.InternalOptionGroups
+            .Where(x => x.OptionableType == null && x.GroupVisible.Invoke());
+        DrawOptions(__instance, filteredGroups);
         return false;
     }
 
@@ -107,7 +152,7 @@ public static class LobbyViewPanePatches
     [HarmonyPatch(nameof(LobbyViewSettingsPane.DrawRolesTab))]
     public static bool DrawRolesTabPatch(LobbyViewSettingsPane __instance)
     {
-        if (CurrentSelectedMod == 0)
+        if (SelectedModIdx == 0)
         {
             return true;
         }
@@ -116,29 +161,22 @@ public static class LobbyViewPanePatches
         return false;
     }
 
-    private static void DrawOptionsTab(LobbyViewSettingsPane instance)
+    private static void DrawOptions(LobbyViewSettingsPane menu, IEnumerable<AbstractOptionGroup> groups)
     {
-        if (SelectedMod == null)
-        {
-            return;
-        }
-
         var num = 1.44f;
 
-        var filteredGroups = SelectedMod.OptionGroups.Where(x => x.GroupVisible.Invoke() && x.AdvancedRole is null);
-
-        foreach (var group in filteredGroups)
+        foreach (var group in groups)
         {
             var categoryHeaderMasked = Object.Instantiate(
-                instance.categoryHeaderOrigin,
-                instance.settingsContainer,
+                menu.categoryHeaderOrigin,
+                menu.settingsContainer,
                 true);
             categoryHeaderMasked.SetHeader(StringNames.Name, 61);
             categoryHeaderMasked.Title.text = group.GroupName;
             categoryHeaderMasked.transform.localScale = Vector3.one;
             categoryHeaderMasked.transform.localPosition = new Vector3(-9.77f, num, -2f);
-            instance.settingsInfo.Add(categoryHeaderMasked.gameObject);
-            num -= 0.85f;
+            menu.settingsInfo.Add(categoryHeaderMasked.gameObject);
+            num -= 1.05f;
 
             var i = 0;
 
@@ -150,8 +188,8 @@ public static class LobbyViewPanePatches
                 }
 
                 var viewSettingsInfoPanel = Object.Instantiate(
-                    instance.infoPanelOrigin,
-                    instance.settingsContainer,
+                    menu.infoPanelOrigin,
+                    menu.settingsContainer,
                     true);
                 viewSettingsInfoPanel.transform.localScale = Vector3.one;
                 float num2;
@@ -160,7 +198,7 @@ public static class LobbyViewPanePatches
                     num2 = -8.95f;
                     if (i > 0)
                     {
-                        num -= 0.59f;
+                        num -= 0.85f;
                     }
                 }
                 else
@@ -184,14 +222,14 @@ public static class LobbyViewPanePatches
                     viewSettingsInfoPanel.SetInfo(data.Title, data.GetValueString(option.GetFloatData()), 61);
                 }
 
-                instance.settingsInfo.Add(viewSettingsInfoPanel.gameObject);
+                menu.settingsInfo.Add(viewSettingsInfoPanel.gameObject);
                 i++;
             }
 
-            num -= 0.59f;
+            num -= 0.85f;
         }
 
-        instance.scrollBar.CalculateAndSetYBounds(instance.settingsInfo.Count + 10, 2f, 6f, 0.59f);
+        menu.scrollBar.CalculateAndSetYBounds(menu.settingsInfo.Count + 10, 2f, 6f, 0.85f);
     }
 
     private static void DrawRolesTab(LobbyViewSettingsPane instance)
@@ -212,14 +250,9 @@ public static class LobbyViewPanePatches
 
         var list = new List<Type>();
 
-        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
+        var roleGroups = SelectedMod.InternalRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
-        if (roleGroups is null)
-        {
-            return;
-        }
-
         // sort the groups by priority
         var sortedRoleGroups = roleGroups
             .OrderBy(x => x.Key.Priority)
@@ -227,7 +260,7 @@ public static class LobbyViewPanePatches
 
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any())
+            if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings))
             {
                 continue;
             }
@@ -258,6 +291,11 @@ public static class LobbyViewPanePatches
 
             foreach (var customRole in grouping)
             {
+                if (customRole.Configuration.HideSettings)
+                {
+                    continue;
+                }
+
                 var roleBehaviour = customRole as RoleBehaviour;
                 if (roleBehaviour == null)
                 {
@@ -277,8 +315,9 @@ public static class LobbyViewPanePatches
                 viewSettingsInfoPanelRoleVariant.transform.localScale = Vector3.one;
                 viewSettingsInfoPanelRoleVariant.transform.localPosition = new Vector3(num2, num, -2f);
 
-                var advancedRoleOptions = SelectedMod.Options
-                    .Where(x => x.AdvancedRole == customRole.GetType())
+                var advancedRoleOptions = SelectedMod.InternalOptionGroups
+                    .Where(x => x.OptionableType == customRole.GetType())
+                    .SelectMany(x => x.Options)
                     .ToList();
 
                 if (numPerGame > 0 && advancedRoleOptions.Count > 0)
@@ -292,7 +331,7 @@ public static class LobbyViewPanePatches
                     chancePerGame,
                     61,
                     customRole.RoleColor,
-                    customRole.Configuration.Icon.LoadAsset(),
+                    customRole.Configuration.Icon?.LoadAsset() ?? MiraAssets.Empty.LoadAsset(),
                     true);
                 viewSettingsInfoPanelRoleVariant.iconSprite.transform.localScale = new Vector3(0.365f, 0.365f, 1f);
                 viewSettingsInfoPanelRoleVariant.iconSprite.transform.localPosition = new Vector3(0.7144f, -0.028f, -2);
@@ -301,7 +340,7 @@ public static class LobbyViewPanePatches
                     viewSettingsInfoPanelRoleVariant.chanceTitle.color =
                         viewSettingsInfoPanelRoleVariant.chanceBackground.color =
                             viewSettingsInfoPanelRoleVariant.background.color =
-                                customRole.RoleColor.GetAlternateColor();
+                                customRole.RoleColor.FindAlternateColor();
                 instance.settingsInfo.Add(viewSettingsInfoPanelRoleVariant.gameObject);
                 num -= 0.664f;
             }
@@ -363,7 +402,7 @@ public static class LobbyViewPanePatches
             return 0;
         }
 
-        var role = SelectedMod.CustomRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
+        var role = SelectedMod.InternalRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
 
         if (role == null)
         {
@@ -379,15 +418,16 @@ public static class LobbyViewPanePatches
             role.StringName,
             maskLayer,
             role.TeamType == RoleTeamTypes.Crewmate,
-            customRole.Configuration.Icon.LoadAsset());
+            customRole.Configuration.Icon != null ? customRole.Configuration.Icon.LoadAsset() : MiraAssets.Empty.LoadAsset());
         viewPanel.header.icon.transform.localScale = new Vector3(0.465f, 0.465f, 1f);
         viewPanel.divider.material.SetInt(PlayerMaterial.MaskLayer, maskLayer);
 
         var num = viewPanel.yPosStart;
         var num2 = 1.08f;
 
-        var filteredOptions = SelectedMod.Options
-            .Where(x => x.AdvancedRole == roleType)
+        var filteredOptions = SelectedMod.InternalOptionGroups
+            .Where(x => x.OptionableType == roleType)
+            .SelectMany(x=>x.Options)
             .ToList();
 
         for (var i = 0; i < filteredOptions.Count; i++)

MiraAPI/Patches/Options/NotificationPopperPatch.cs

@@ -1,7 +1,7 @@
-using HarmonyLib;
+using System.Linq;
+using HarmonyLib;
 using Il2CppSystem;
 using MiraAPI.Roles;
-using System.Linq;
 
 namespace MiraAPI.Patches.Options;
 

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -1,4 +1,7 @@
-using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
@@ -8,9 +11,6 @@ using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
@@ -22,15 +22,16 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(RolesSettingsMenu))]
 public static class RoleSettingMenuPatches
 {
-    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();
+    public static Dictionary<int, Vector3> Scrolls { get; } = [];
+    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; } = [];
+    private static List<GameObject> Headers { get; } = [];
+    private static List<RoleOptionSetting> RoleOptionSettings { get; } = [];
 
     private static float ScrollerNum { get; set; } = 0.522f;
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
-    public static bool PatchStart(RolesSettingsMenu __instance)
+    public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
     {
         Headers.ForEach(Object.Destroy);
         RoleOptionSettings.ForEach(Object.Destroy);
@@ -67,7 +68,7 @@ public static class RoleSettingMenuPatches
 
         var num3 = 0;
 
-        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
+        var roleGroups = GameSettingMenuPatches.SelectedMod?.InternalRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         if (roleGroups is null)
@@ -83,10 +84,9 @@ public static class RoleSettingMenuPatches
         var quotaThing = __instance.categoryHeaderEditRoleOrigin.transform.FindChild("QuotaHeader");
         var template = __instance.transform.parent.parent.GetComponent<GameSettingMenu>().GameSettingsTab.categoryHeaderOrigin;
 
-
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any())
+            if (!grouping.Any() || grouping.All(x=>x.Configuration.HideSettings))
             {
                 continue;
             }
@@ -127,32 +127,37 @@ public static class RoleSettingMenuPatches
             chanceLabel.Destroy();
             countLabel.Destroy();
 
-            if (name is StringNames.CrewmateRolesHeader)
-            {
-                categoryHeaderMasked.Title.color = Palette.CrewmateRoleHeaderTextBlue;
-                categoryHeaderMasked.Background.color = Palette.CrewmateRoleHeaderBlue;
-            }
-            else if (name is StringNames.ImpostorRolesHeader)
-            {
-                categoryHeaderMasked.Title.color = Palette.ImpostorRoleHeaderTextRed;
-                categoryHeaderMasked.Background.color = Palette.ImpostorRoleHeaderRed;
-            }
-            else
-            {
-                categoryHeaderMasked.Title.color = group.Color;
-                categoryHeaderMasked.Divider.color = group.Color;
-                categoryHeaderMasked.Background.color = group.Color;
-            }
+            categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
+            categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
+            categoryHeaderMasked.Background.sprite.texture.wrapMode = TextureWrapMode.Clamp;
 
-            categoryHeaderMasked.Title.color = categoryHeaderMasked.Title.color.IsColorDark() ?
-                categoryHeaderMasked.Title.color.LightenColor(0.3f) : categoryHeaderMasked.Title.color.LightenColor(0.1f);
+            categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.5f, -0.1833f, 0);
+
+            switch (name)
+            {
+                case StringNames.CrewmateRolesHeader:
+                    categoryHeaderMasked.Title.color = Palette.CrewmateRoleHeaderTextBlue;
+                    categoryHeaderMasked.Background.color = Palette.CrewmateRoleHeaderBlue;
+                    break;
+                case StringNames.ImpostorRolesHeader:
+                    categoryHeaderMasked.Title.color = Palette.ImpostorRoleHeaderTextRed;
+                    categoryHeaderMasked.Background.color = Palette.ImpostorRoleHeaderRed;
+                    break;
+                default:
+                    categoryHeaderMasked.Title.color = group.Color.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.Color.FindAlternateColor();
+                    categoryHeaderMasked.Divider.color = group.Color;
+                    categoryHeaderMasked.Background.color = group.Color;
+                    break;
+            }
 
             categoryHeaderMasked.Title.fontStyle = __instance.categoryHeaderEditRoleOrigin.Title.fontStyle;
             categoryHeaderMasked.Title.font = __instance.categoryHeaderEditRoleOrigin.Title.font;
             categoryHeaderMasked.Title.fontMaterial = __instance.categoryHeaderEditRoleOrigin.Title.fontMaterial;
 
             categoryHeaderMasked.Divider.color = categoryHeaderMasked.Background.color;
+            categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.55f, -0.1833f, 0);
             categoryHeaderMasked.Background.size = new Vector2(categoryHeaderMasked.Background.size.x + 1.5f, categoryHeaderMasked.Background.size.y);
+
             categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f;
             categoryHeaderMasked.transform.localPosition = new Vector3(-0.44f, ScrollerNum, -2f);
             categoryHeaderMasked.gameObject.SetActive(true);
@@ -228,6 +233,15 @@ public static class RoleSettingMenuPatches
     private static void SetScrollBounds(this Scroller scroller)
     {
         scroller.CalculateAndSetYBounds(1 + 1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
+        if (Scrolls.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
+        {
+            scroller.Inner.localPosition = scroll;
+            scroller.UpdateScrollBars();
+        }
+        else
+        {
+            scroller.ScrollToTop();
+        }
     }
 
     [HarmonyPrefix]
@@ -247,7 +261,6 @@ public static class RoleSettingMenuPatches
         }
 
         __instance.scrollBar.SetScrollBounds();
-        __instance.scrollBar.ScrollToTop();
     }
 
     private static void ValueChanged(OptionBehaviour obj)
@@ -304,15 +317,14 @@ public static class RoleSettingMenuPatches
         var hasImage = role.RoleScreenshot != null;
         var num = hasImage ? -0.872f : -1;
 
-        var filteredOptions = GameSettingMenuPatches.SelectedMod?.Options.Where(x => x.AdvancedRole == role.GetType()) ?? [];
+        // TODO: create sub groups under the role settings.
+        var filteredOptions = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+            .Where(x=> x.OptionableType == role.GetType())
+            .SelectMany(x=>x.Options)
+            .ToList() ?? [];
 
         foreach (var option in filteredOptions)
         {
-            if (option.AdvancedRole is not null && option.AdvancedRole != role.GetType())
-            {
-                continue;
-            }
-
             var newOpt = option.CreateOption(
                 __instance.checkboxOrigin,
                 __instance.numberOptionOrigin,
@@ -341,6 +353,7 @@ public static class RoleSettingMenuPatches
             newOpt.Initialize();
         }
 
+        Scrolls[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
         __instance.scrollBar.CalculateAndSetYBounds(__instance.advancedSettingChildren.Count + 3, 1f, 6f, 0.45f);
         __instance.scrollBar.ScrollToTop();
     }
@@ -353,6 +366,8 @@ public static class RoleSettingMenuPatches
             return;
         }
 
+        Scrolls[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
+
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
         __instance.roleTitleText.text = TranslationController.Instance.GetString(
             role.StringName,
@@ -384,8 +399,8 @@ public static class RoleSettingMenuPatches
             __instance.roleScreenshot.drawMode = SpriteDrawMode.Sliced;
         }
 
-        __instance.roleHeaderSprite.color = customRole.RoleColor;
-        __instance.roleHeaderText.color = customRole.RoleColor.GetAlternateColor();
+        __instance.roleHeaderSprite.color = customRole.OptionsMenuColor;
+        __instance.roleHeaderText.color = customRole.OptionsMenuColor.FindAlternateColor();
 
         var categoryHeaderMasked = __instance.AdvancedRolesSettings.transform.Find("CategoryHeaderMasked").GetComponent<CategoryHeaderMasked>();
 
@@ -460,18 +475,18 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.transform.localPosition = new Vector3(-0.1f, ScrollerNum, -2f);
 
         roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20);
-        roleOptionSetting.labelSprite.color = customRole.RoleColor;
+        roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);
         __instance.roleChances.Add(roleOptionSetting);
 
         roleOptionSetting.titleText.transform.localPosition = new Vector3(-0.5376f, -0.2923f, 0f);
-        roleOptionSetting.titleText.color = customRole.RoleColor.GetAlternateColor();
+        roleOptionSetting.titleText.color = customRole.OptionsMenuColor.FindAlternateColor();
         roleOptionSetting.titleText.horizontalAlignment = HorizontalAlignmentOptions.Left;
 
         if (GameSettingMenuPatches.SelectedMod is null ||
-            GameSettingMenuPatches.SelectedMod.Options.Exists(
-                x => x.AdvancedRole != null && x.AdvancedRole.IsInstanceOfType(role)))
+            GameSettingMenuPatches.SelectedMod.InternalOptionGroups
+                .Exists(x => x.OptionableType == role.GetType()))
         {
             var newButton = Object.Instantiate(roleOptionSetting.buttons[0], roleOptionSetting.transform);
             newButton.name = "ConfigButton";
@@ -484,7 +499,7 @@ public static class RoleSettingMenuPatches
 
             var passiveButton = newButton.GetComponent<GameOptionButton>();
             passiveButton.OnClick = new ButtonClickedEvent();
-            passiveButton.interactableColor = btnRend.color = customRole.RoleColor.GetAlternateColor();
+            passiveButton.interactableColor = btnRend.color = customRole.OptionsMenuColor.FindAlternateColor();
             passiveButton.interactableHoveredColor = Color.white;
 
             passiveButton.OnClick.AddListener((UnityAction)(() => { ChangeTab(role, __instance); }));
@@ -502,9 +517,9 @@ public static class RoleSettingMenuPatches
             roleOptionSetting.ChancePlusBtn.gameObject.SetActive(false);
         }
 
-        if (index < GameSettingMenuPatches.SelectedMod?.CustomRoles.Count - 1)
+        if (index < GameSettingMenuPatches.SelectedMod?.InternalRoles.Count - 1)
         {
-            ScrollerNum += -0.43f;
+            ScrollerNum -= 0.43f;
         }
 
         return roleOptionSetting;

MiraAPI/Patches/PlayerControlPatches.cs

@@ -1,12 +1,13 @@
-using HarmonyLib;
+using System.Linq;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
+using MiraAPI.Voting;
 using Reactor.Utilities.Extensions;
-using System.Linq;
 
 namespace MiraAPI.Patches;
 
@@ -14,30 +15,30 @@ namespace MiraAPI.Patches;
 /// General patches for the PlayerControl class.
 /// </summary>
 [HarmonyPatch(typeof(PlayerControl))]
-public static class PlayerControlPatches
+internal static class PlayerControlPatches
 {
-    /// <summary>
-    /// Adds the modifier component to the player on start.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Start))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlStartPostfix(PlayerControl __instance)
     {
-        if (__instance.gameObject.TryGetComponent<ModifierComponent>(out var comp))
+        if (__instance.gameObject.TryGetComponent<ModifierComponent>(out var modifierComp))
         {
-            comp.DestroyImmediate();
+            modifierComp.DestroyImmediate();
+        }
+
+        if (__instance.gameObject.TryGetComponent<PlayerVoteData>(out var voteComp))
+        {
+            voteComp.DestroyImmediate();
         }
 
         __instance.gameObject.AddComponent<ModifierComponent>();
+        __instance.gameObject.AddComponent<PlayerVoteData>();
     }
 
-    /// <summary>
-    /// Calls the OnDeath method for all active modifiers.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Die))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
         var deathEvent = new PlayerDeathEvent(__instance, reason);
@@ -51,13 +52,9 @@ public static class PlayerControlPatches
         }
     }
 
-    /// <summary>
-    /// Used to trigger the <see cref="CompleteTaskEvent"/>.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    /// <param name="idx">The task id.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.CompleteTask))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerCompleteTaskPostfix(PlayerControl __instance, uint idx)
     {
         var playerTask = __instance.myTasks.ToArray().First(playerTask => playerTask.Id == idx);
@@ -68,14 +65,9 @@ public static class PlayerControlPatches
         }
     }
 
-    /// <summary>
-    /// Used to trigger the <see cref="BeforeMurderEvent"/>.
-    /// </summary>
-    /// <param name="__instance">The source player.</param>
-    /// <param name="target">The target.</param>
-    /// <param name="didSucceed">Whether the kill succeeded.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
     {
         var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
@@ -84,12 +76,9 @@ public static class PlayerControlPatches
         didSucceed = beforeMurderEvent.IsCancelled;
     }
 
-    /// <summary>
-    /// FixedUpdate handler for custom roles and custom buttons.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
     {
         if (__instance.Data?.Role is ICustomRole customRole)
@@ -117,15 +106,4 @@ public static class PlayerControlPatches
             button.FixedUpdateHandler(__instance);
         }
     }
-
-    /// <summary>
-    /// Clear from modifier component cache.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.OnDestroy))]
-    public static void PlayerControlOnDestroyPrefix(PlayerControl __instance)
-    {
-        ModifierExtensions.ModifierComponents.Remove(__instance);
-    }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,5 +1,8 @@
-using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
 using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Roles;
 
@@ -9,7 +12,7 @@ namespace MiraAPI.Patches.Roles;
 /// Patches for custom ejection messages.
 /// </summary>
 [HarmonyPatch(typeof(ExileController))]
-public static class EjectionPatches
+internal static class EjectionPatches
 {
     [HarmonyPostfix]
     [HarmonyPatch(nameof(ExileController.Begin))]
@@ -24,11 +27,21 @@ public static class EjectionPatches
             return;
         }
 
-        if (role.GetCustomEjectionMessage(__instance.initData.networkedPlayer) == null)
+        if (!GameManager.Instance.LogicOptions.GetConfirmImpostor() || role.GetCustomEjectionMessage(__instance.initData.networkedPlayer) == null)
         {
             return;
         }
 
         __instance.completeString = role.GetCustomEjectionMessage(__instance.initData.networkedPlayer);
     }
+
+    [HarmonyPatch(typeof(ExileController), nameof(ExileController.WrapUp))]
+    public static class WrapUpPatch
+    {
+        public static void Postfix()
+        {
+            var @event = new RoundStartEvent(false);
+            MiraEventManager.InvokeEvent(@event);
+        }
+    }
 }

MiraAPI/Patches/Roles/GameStartupPatch.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 
 namespace MiraAPI.Patches.Roles;
@@ -21,6 +22,14 @@ public static class GameStartupPatch
         }
 
         _runOnce = true;
+
+        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0) return;
+        foreach (var queue in MiraPluginManager.Instance.QueuedRoleRegistrations)
+        {
+            CustomRoleManager.RegisterRoleTypes(queue.Value, queue.Key);
+        }
+
+        MiraPluginManager.Instance.QueuedRoleRegistrations.Clear();
         CustomRoleManager.RegisterInRoleManager();
     }
 }

MiraAPI/Patches/Roles/RoleBehaviourPatch.cs

@@ -22,4 +22,4 @@ public static class RoleBehaviourPatch
         __result = behaviour.RoleColor;
         return false;
     }
-}
+}

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -1,22 +1,62 @@
-using AmongUs.GameOptions;
+using System.Linq;
+using AmongUs.GameOptions;
 using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
-using System.Linq;
+using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 [HarmonyPatch(typeof(RoleManager))]
 public static class RoleManagerPatches
 {
-    [HarmonyPostfix]
+    [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleManager.SetRole))]
-    public static void SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
+    public static bool SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
     {
+        if (!targetPlayer)
+        {
+            return false;
+        }
+        var data = targetPlayer.Data;
+        if (data == null)
+        {
+            Debug.LogError("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection.");
+            return false;
+        }
+        if (data.Role)
+        {
+            data.Role.Deinitialize(targetPlayer);
+            Object.Destroy(data.Role.gameObject);
+        }
+        var roleBehaviour = Object.Instantiate<RoleBehaviour>(__instance.AllRoles.First(r => r.Role == roleType), data.gameObject.transform);
+        roleBehaviour.Initialize(targetPlayer);
+        targetPlayer.Data.Role = roleBehaviour;
+        targetPlayer.Data.RoleType = roleType;
+
+        // basically everything is the same except this one if statement
+        // innersloth decided to check the roleType manually instead of the role behaviour.
+        if (!roleBehaviour.IsDead)
+        {
+            targetPlayer.Data.RoleWhenAlive = new Il2CppSystem.Nullable<RoleTypes>(roleType);
+        }
+        roleBehaviour.AdjustTasks(targetPlayer);
+        switch (roleBehaviour.IsDead)
+        {
+            case true when !targetPlayer.Data.IsDead:
+                targetPlayer.Die(DeathReason.Kill, false);
+                return false;
+            case false when targetPlayer.Data.IsDead:
+                targetPlayer.Revive();
+                break;
+        }
+
         var @event = new SetRoleEvent(targetPlayer, roleType);
         MiraEventManager.InvokeEvent(@event);
+
+        return false;
     }
 
     [HarmonyPostfix]

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -8,7 +8,7 @@ namespace MiraAPI.Patches.Roles;
 /// <summary>
 /// Patches to return the correct role counts.
 /// </summary>
-[HarmonyPatch(typeof(RoleOptionsCollectionV08))]
+[HarmonyPatch(typeof(RoleOptionsCollectionV09))]
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
@@ -16,7 +16,7 @@ public static class RoleOptionsCollectionPatch
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV08.GetChancePerGame))]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV09.GetChancePerGame))]
     public static bool GetChancePrefix(RoleTypes role, ref int __result)
     {
         if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)
@@ -46,7 +46,7 @@ public static class RoleOptionsCollectionPatch
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV08.GetNumPerGame))]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV09.GetNumPerGame))]
     public static bool GetNumPrefix(RoleTypes role, ref int __result)
     {
         if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)

MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs

@@ -4,6 +4,9 @@ using Il2CppSystem.Text;
 
 namespace MiraAPI.Patches.Stubs;
 
+/// <summary>
+/// Stub methods for the RoleBehaviour class. Needed because of Il2Cpp limitations on injected classes.
+/// </summary>
 [HarmonyPatch]
 public static class RoleBehaviourStubs
 {
@@ -57,7 +60,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool CanUse(RoleBehaviour instance, IUsable console)
     {
-        return default;
+        return false;
     }
 
     /// <summary>
@@ -84,7 +87,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool DidWin(RoleBehaviour instance, GameOverReason gameOverReason)
     {
-        return default;
+        return false;
     }
 
     /// <summary>
@@ -97,7 +100,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static PlayerControl FindClosestTarget(RoleBehaviour instance)
     {
-        return null;
+        return null!;
     }
 
     /// <summary>
@@ -110,7 +113,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static float GetAbilityDistance(RoleBehaviour instance)
     {
-        return default;
+        return 0;
     }
 
     /// <summary>
@@ -124,7 +127,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool IsValidTarget(RoleBehaviour instance, NetworkedPlayerInfo target)
     {
-        return default;
+        return false;
     }
 
     /// <summary>

MiraAPI/Patches/VentCanUsePatch.cs

@@ -8,17 +8,13 @@ using UnityEngine;
 namespace MiraAPI.Patches;
 
 /// <summary>
-/// Vent patches to make sure the player is able to use the vent.
+/// Used to change vent behaviour for the event system, custom roles, and modifiers.
 /// </summary>
-[HarmonyPatch(typeof(Vent))]
-public static class VentPatches
+[HarmonyPatch(typeof(Vent), nameof(Vent.CanUse))]
+internal static class VentCanUsePatch
 {
-    /// <summary>
-    /// CanUse patch.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(Vent.CanUse))]
-    public static void VentCanUsePostfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
+    // ReSharper disable InconsistentNaming
+    public static void Postfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
     {
         var @event = new PlayerCanUseEvent(__instance.Cast<IUsable>());
         MiraEventManager.InvokeEvent(@event);

MiraAPI/Patches/Voting/DummyBehaviourPatch.cs

@@ -0,0 +1,16 @@
+using HarmonyLib;
+using MiraAPI.Utilities;
+
+namespace MiraAPI.Patches.Voting;
+
+[HarmonyPatch(typeof(DummyBehaviour), nameof(DummyBehaviour.Update))]
+internal static class DummyBehaviourPatch
+{
+    public static void Postfix(DummyBehaviour __instance)
+    {
+        if (MeetingHud.Instance && __instance.myPlayer.GetVoteData())
+        {
+            __instance.voted = __instance.myPlayer.GetVoteData().VotesRemaining == 0;
+        }
+    }
+}

MiraAPI/Patches/Voting/MeetingHudPatches.cs

@@ -0,0 +1,222 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using HarmonyLib;
+using Il2CppInterop.Runtime.InteropTypes.Arrays;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Meeting;
+using MiraAPI.Events.Vanilla.Meeting.Voting;
+using MiraAPI.Modifiers;
+using MiraAPI.Utilities;
+using MiraAPI.Voting;
+using Reactor.Utilities;
+
+namespace MiraAPI.Patches.Voting;
+
+[HarmonyPatch(typeof(MeetingHud))]
+[SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony Convention")]
+internal static class MeetingHudPatches
+{
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.Start))]
+    public static void MeetingHudStartPatch(MeetingHud __instance)
+    {
+        foreach (var plr in PlayerControl.AllPlayerControls)
+        {
+            var voteData = plr.GetVoteData();
+            voteData.Votes.Clear();
+            voteData.SetRemainingVotes(1);
+
+            if (plr.Data.IsDead || plr.Data.Disconnected)
+            {
+                voteData.SetRemainingVotes(0);
+            }
+
+            foreach (var modifier in plr.GetModifierComponent().ActiveModifiers)
+            {
+                modifier.OnMeetingStart();
+            }
+        }
+
+        var @event = new StartMeetingEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
+    }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.OnDestroy))]
+    public static void OnDestroyPatch(MeetingHud __instance)
+    {
+        MiraEventManager.InvokeEvent(new EndMeetingEvent(__instance));
+    }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.VotingComplete))]
+    public static void VotingCompletePatch(MeetingHud __instance)
+    {
+        MiraEventManager.InvokeEvent(new VotingCompleteEvent(__instance));
+    }
+
+    // this is necessary because the actual ForceSkipAll method is inlined.
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.Update))]
+    public static void ForceSkipPatch(MeetingHud __instance)
+    {
+        if (__instance.state is not (MeetingHud.VoteStates.NotVoted or MeetingHud.VoteStates.Voted))
+        {
+            return;
+        }
+
+        var logicOptionsNormal = GameManager.Instance.LogicOptions.Cast<LogicOptionsNormal>();
+        var votingTime = logicOptionsNormal.GetVotingTime();
+        if (votingTime <= 0)
+        {
+            return;
+        }
+
+        var num2 = __instance.discussionTimer - logicOptionsNormal.GetDiscussionTime();
+
+        if (!AmongUsClient.Instance.AmHost || num2 < votingTime)
+        {
+            return;
+        }
+
+        foreach (var plr in PlayerControl.AllPlayerControls)
+        {
+            var voteData = plr.GetVoteData();
+            voteData.SetRemainingVotes(0);
+        }
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.Select))]
+    public static bool SelectPatch(MeetingHud __instance, int suspectStateIdx)
+    {
+        var voteData = PlayerControl.LocalPlayer.GetVoteData();
+
+        var hasVotes = voteData.VotesRemaining > 0;
+        var hasVotedFor = voteData.VotedFor((byte)suspectStateIdx);
+
+        var @event = new MeetingSelectEvent(voteData, suspectStateIdx, hasVotes && !hasVotedFor);
+        MiraEventManager.InvokeEvent(@event);
+
+        return @event.AllowSelect;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.HandleDisconnect), typeof(PlayerControl), typeof(DisconnectReasons))]
+    public static bool HandleDisconnect(MeetingHud __instance, PlayerControl pc)
+    {
+        if (!AmongUsClient.Instance.AmHost || __instance.playerStates is null || !pc || !GameData.Instance)
+        {
+            return false;
+        }
+
+        var playerVoteArea = __instance.playerStates.First(pv => pv.TargetPlayerId == pc.PlayerId);
+        playerVoteArea.AmDead = true;
+        playerVoteArea.Overlay.gameObject.SetActive(true);
+
+        foreach (var player in Helpers.GetAlivePlayers())
+        {
+            var pva = __instance.playerStates.First(pv => pv.TargetPlayerId == player.PlayerId);
+            var voteData = player.GetVoteData();
+
+            if (pva.AmDead || !voteData.VotedFor(pc.PlayerId))
+            {
+                continue;
+            }
+
+            voteData.Votes.RemoveAll(x=>x.Suspect==pc.PlayerId);
+            voteData.VotesRemaining += 1;
+
+            VotingUtils.RpcRemoveVote(PlayerControl.LocalPlayer, player.PlayerId, pc.PlayerId);
+        }
+
+        __instance.SetDirtyBit(1U);
+        __instance.CheckForEndVoting();
+
+        if (__instance.state == MeetingHud.VoteStates.Results)
+        {
+            __instance.SetupProceedButton();
+        }
+
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.CheckForEndVoting))]
+    public static bool EndCheck(MeetingHud __instance)
+    {
+        var shouldEnd = !Helpers.GetAlivePlayers().Exists(plr => plr.GetVoteData().VotesRemaining > 0);
+
+        var checkEndEvent = new CheckForEndVotingEvent(shouldEnd);
+        MiraEventManager.InvokeEvent(checkEndEvent);
+        shouldEnd = checkEndEvent.ForceEndVoting || checkEndEvent is { IsCancelled: false, IsVotingComplete: true };
+
+        if (!shouldEnd)
+        {
+            return false;
+        }
+
+        var votes = VotingUtils.CalculateVotes();
+        var exiled = VotingUtils.GetExiled(votes, out var isTie);
+
+        var @event = new ProcessVotesEvent(votes, exiled);
+        MiraEventManager.InvokeEvent(@event);
+
+        if (@event.VotesModified)
+        {
+            votes = @event.Votes;
+            exiled = VotingUtils.GetExiled(votes, out isTie);
+        }
+
+        if (@event.ExiledPlayerModified)
+        {
+            exiled = @event.ExiledPlayer;
+        }
+
+        var voterStates = new Il2CppStructArray<MeetingHud.VoterState>([
+            .. votes.Select(
+            v=> new MeetingHud.VoterState
+            {
+                VoterId = v.Voter,
+                VotedForId = v.Suspect,
+            })
+        ]);
+
+        __instance.RpcVotingComplete(voterStates, exiled, isTie);
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.PopulateResults))]
+    public static bool PopulateResultsPatch(MeetingHud __instance, ref Il2CppStructArray<MeetingHud.VoterState> states)
+    {
+        var votes = states.Select(x=> new CustomVote(x.VoterId, x.VotedForId)).ToList();
+        var @event = new PopulateResultsEvent(votes);
+        MiraEventManager.InvokeEvent(@event);
+
+        if (@event.IsCancelled)
+        {
+            return false;
+        }
+
+        VotingUtils.HandlePopulateResults(votes);
+        return false;
+    }
+
+    // TODO: figure out a way to do host-authorization since right now any player can send RpcCastVote
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.CmdCastVote))]
+    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;
+    }
+}

MiraAPI/PluginLoading/MiraPluginInfo.cs

@@ -1,12 +1,14 @@
-using BepInEx;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using BepInEx;
 using BepInEx.Configuration;
 using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
+using MiraAPI.Presets;
 
+// ReSharper disable UnusedAutoPropertyAccessor.Global
 namespace MiraAPI.PluginLoading;
 
 /// <summary>
@@ -23,61 +25,58 @@ public class MiraPluginInfo
     }
 
     /// <summary>
-    /// Get a read only collection of this plugin's modifiers. This is probably not safe because they are uninitialized.
+    /// Gets a read only collection of this plugin's modifiers. This is not safe for modifiers with constructors.
     /// </summary>
-    /// <returns>Readonly collection of modifiers.</returns>
-    public IReadOnlyCollection<BaseModifier> GetModifiers()
-    {
-        return Modifiers.AsReadOnly();
-    }
+    public IReadOnlyCollection<BaseModifier> Modifiers { get; private set; } = null!;
 
     /// <summary>
-    /// Get a read only collection of this plugin's Option Groups.
+    /// Gets a read only collection of this plugin's Option Groups.
     /// </summary>
-    /// <returns>Readonly collection of option groups.</returns>
-    public IReadOnlyCollection<AbstractOptionGroup> GetOptionGroups()
-    {
-        return OptionGroups.AsReadOnly();
-    }
+    public IReadOnlyCollection<AbstractOptionGroup> OptionGroups { get; private set; } = null!;
 
     /// <summary>
     /// Gets a read only collection of this plugin's options.
     /// </summary>
-    /// <returns>Read only collection of options.</returns>
-    public IReadOnlyCollection<IModdedOption> GetOptions()
-    {
-        return Options.AsReadOnly();
-    }
+    public IReadOnlyCollection<IModdedOption> Options { get; private set; } = null!;
 
     /// <summary>
     /// Gets a read only dictionary of Role IDs and the RoleBehaviour object they are associated with.
     /// </summary>
-    /// <returns>Read only dictionary of IDs and Roles.</returns>
-    public ReadOnlyDictionary<ushort, RoleBehaviour> GetRoles()
-    {
-        return new ReadOnlyDictionary<ushort, RoleBehaviour>(CustomRoles);
-    }
+    public ReadOnlyDictionary<ushort, RoleBehaviour> Roles { get; private set; } = null!;
 
     /// <summary>
     /// Gets a read only collection of this plugin's custom buttons.
     /// </summary>
-    /// <returns>Read only collection of buttons.</returns>
-    public IReadOnlyCollection<CustomActionButton> GetButtons()
+    public IReadOnlyCollection<CustomActionButton> Buttons { get; private set; } = null!;
+
+    /// <summary>
+    /// Gets a read only dictionary of this plugin's custom game modes.
+    /// </summary>
+    public IReadOnlyCollection<OptionPreset> Presets { get; internal set; } = null!;
+
+    internal void SavePublicCollections()
     {
-        return Buttons.AsReadOnly();
+        Presets = [..InternalPresets];
+        Modifiers = [..InternalModifiers];
+        OptionGroups = [..InternalOptionGroups];
+        Options = [..InternalOptions];
+        Roles = new ReadOnlyDictionary<ushort, RoleBehaviour>(InternalRoles);
+        Buttons = [..InternalButtons];
     }
 
-    internal List<AbstractOptionGroup> OptionGroups { get; } = [];
+    internal List<OptionPreset> InternalPresets { get; } = [];
 
-    internal List<IModdedOption> Options { get; } = [];
+    internal List<AbstractOptionGroup> InternalOptionGroups { get; } = [];
 
-    internal List<BaseModifier> Modifiers { get; } = [];
+    internal List<IModdedOption> InternalOptions { get; } = [];
 
-    internal Dictionary<ushort, RoleBehaviour> CustomRoles { get; } = [];
+    internal List<BaseModifier> InternalModifiers { get; } = [];
 
-    internal Dictionary<int, CustomGameMode> GameModes { get; } = [];
+    internal Dictionary<ushort, RoleBehaviour> InternalRoles { get; } = [];
 
-    internal List<CustomActionButton> Buttons { get; } = [];
+    internal Dictionary<int, CustomGameMode> InternalGameModes { get; } = [];
+
+    internal List<CustomActionButton> InternalButtons { get; } = [];
 
     /// <summary>
     /// Gets the plugin's ID, as defined in the plugin's BepInEx metadata.