fix erorr

# Conflicts:
#	MiraAPI/Roles/ICustomRole.cs

.github/workflows/main.yaml

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

AmongUs.props

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

Directory.Build.props

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

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

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

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -1,17 +1,20 @@
 using MiraAPI.Example.Modifiers;
 using MiraAPI.Hud;
-using MiraAPI.Modifiers;
+using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
 
+[RegisterButton]
 public class MeetingButton : CustomActionButton
 {
     public override string Name => "Call Meeting";
 
     public override float Cooldown => 15;
 
+    public override float EffectDuration => 0;
+
     public override int MaxUses => 3;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;

MiraAPI.Example/Buttons/NeutralKillerButton.cs

@@ -1,24 +0,0 @@
-using MiraAPI.Example.GameOver;
-using MiraAPI.Example.Roles;
-using MiraAPI.GameEnd;
-using MiraAPI.Hud;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Example.Buttons;
-
-public class NeutralKillerButton : CustomActionButton
-{
-    public override string Name => "Win Game";
-    public override float Cooldown => 0f;
-    public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    protected override void OnClick()
-    {
-        CustomGameOver.Trigger<NeutralKillerGameOver>([PlayerControl.LocalPlayer.Data]);
-    }
-
-    public override bool Enabled(RoleBehaviour? role)
-    {
-        return role is NeutralKillerRole;
-    }
-}

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -8,7 +8,7 @@ using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
-
+[RegisterButton]
 public class TeleportButton : CustomActionButton
 {
     public override string Name => "Teleport";
@@ -16,17 +16,16 @@ public class TeleportButton : CustomActionButton
     public override float Cooldown => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportCooldown.Value;
 
     public override float EffectDuration => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportDuration;
-    public override int MaxUses => 2;
+
+    public override int MaxUses => 0;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
-    public override Color TextOutlineColor => new Color32(221, 176, 152, 255);
     public static bool IsZoom { get; private set; }
 
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is TeleporterRole;
     }
-
     protected override void OnClick()
     {
         Coroutines.Start(ZoomOutCoroutine());
@@ -41,7 +40,10 @@ public class TeleportButton : CustomActionButton
     {
         base.FixedUpdate(playerControl);
 
-        if (!EffectActive) return;
+        if (!EffectActive)
+        {
+            return;
+        }
 
         if (Input.GetKey(KeyCode.Mouse0))
         {

MiraAPI.Example/Cosmetics/ExampleCosmeticGroup.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using MiraAPI.Cosmetics;
+
+namespace MiraAPI.Example.Cosmetics;
+public class ExampleCosmeticGroup : AbstractCosmeticsGroup
+{
+    public override string GroupName => "Example";
+
+    [RegisterCustomCosmetic()]
+    public List<HatData> hats { get; set;  } = new();
+    [RegisterCustomCosmetic()]
+    public List<NamePlateData> namePlates { get; set;} = new();
+    [RegisterCustomCosmetic()]
+    public List<SkinData> skins { get; set; } = new();
+    [RegisterCustomCosmetic()]
+    public List<VisorData> visors { get; set; } = new();
+}

MiraAPI.Example/ExampleAssets.cs

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

MiraAPI.Example/ExampleEventHandlers.cs

@@ -1,98 +0,0 @@
-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;
-
-public static class ExampleEventHandlers
-{
-    public static void Initialize()
-    {
-        // 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}");
-        });
-
-        MiraEventManager.RegisterEventHandler<AfterMurderEvent>(@event =>
-        {
-            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} has killed {@event.Target.Data.PlayerName}");
-        });
-
-        MiraEventManager.RegisterEventHandler<CompleteTaskEvent>(@event =>
-        {
-            Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
-        });
-    }
-
-    // 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") return;
-
-        @event.Cancel();
-        @event.Button.SetTimer(15f);
-    }
-
-    // Example event handler
-    [RegisterEvent]
-    public static void FreezeButtonCancelledHandler(MiraButtonCancelledEvent<FreezeButton> @event)
-    {
-        Logger<ExamplePlugin>.Warning("Freeze button cancelled!");
-        @event.Button.OverrideName("Freeze Canceled");
-    }
-}

MiraAPI.Example/ExamplePlugin.cs

@@ -2,7 +2,11 @@
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
+using MiraAPI.Cosmetics;
+using MiraAPI.Example.Cosmetics;
 using MiraAPI.PluginLoading;
+using MiraAPI.Utilities.Assets;
+using MiraAPI.Utilities.Assets.Addressable;
 using Reactor;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
@@ -21,7 +25,13 @@ public partial class ExamplePlugin : BasePlugin, IMiraPlugin
     public ConfigFile GetConfigFile() => Config;
     public override void Load()
     {
-        ExampleEventHandlers.Initialize();
         Harmony.PatchAll();
+        AddComponent<MiraDebugWindow>();
+
+        new Catalog("Output".ToLocalPath()).LoadCatalog();
+        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.hats = new LoadableAddressableGroupAsset<HatData>(CatalogTools.GetResourceLocation("hatdata")).LoadAsset();
+        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.namePlates = new LoadableAddressableGroupAsset<NamePlateData>(CatalogTools.GetResourceLocation("nameplatedata")).LoadAsset();
+        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.skins = new LoadableAddressableGroupAsset<SkinData>(CatalogTools.GetResourceLocation("skindata")).LoadAsset();
+        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.visors = new LoadableAddressableGroupAsset<VisorData>(CatalogTools.GetResourceLocation("visordata")).LoadAsset();
     }
 }

MiraAPI.Example/GameOver/NeutralKillerGameOver.cs

@@ -1,21 +0,0 @@
-using MiraAPI.Example.Roles;
-using MiraAPI.GameEnd;
-using MiraAPI.Utilities;
-using UnityEngine;
-
-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!";
-        endGameManager.WinText.color = Color.magenta;
-        endGameManager.BackgroundBar.material.SetColor(ShaderID.Color, Color.magenta);
-    }
-}

MiraAPI.Example/MiraAPI.Example.csproj

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

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,37 +1,20 @@
-using Il2CppSystem.Collections.Generic;
-using MiraAPI.Example.Options.Modifiers;
-using MiraAPI.GameOptions;
-using MiraAPI.Modifiers;
+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;
 
+[RegisterModifier]
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";
-    public override LoadableAsset<Sprite>? ModifierIcon => ExampleAssets.CallMeetingButton;
 
-    public override void OnDeath(DeathReason reason)
+    public override int GetAmountPerGame()
     {
-        Player.RemoveModifier(this);
-    }
-
-    public override string GetDescription()
-    {
-        return $"You can call a meeting from anywhere on the map.";
+        return 1;
     }
 
     public override int GetAssignmentChance()
     {
-        return (int)OptionGroupSingleton<CaptainModifierSettings>.Instance.Chance;
-    }
-
-    public override int GetAmountPerGame()
-    {
-        return (int)OptionGroupSingleton<CaptainModifierSettings>.Instance.Amount;
+        return 100;
     }
 }

MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs

@@ -1,10 +1,12 @@
 using Il2CppSystem;
 using MiraAPI.Example.Roles;
+using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
 using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers.Freezer;
 
+[RegisterModifier]
 public class FreezeModifier : TimedModifier
 {
     public override string ModifierName => "Freezed";
@@ -15,7 +17,7 @@ public class FreezeModifier : TimedModifier
 
     public override void OnActivate()
     {
-        if (Player.AmOwner)
+        if (Player?.AmOwner == true)
         {
             Player.moveable = false;
         }
@@ -25,15 +27,15 @@ public class FreezeModifier : TimedModifier
     {
         base.FixedUpdate();
 
-        if (Player.AmOwner || PlayerControl.LocalPlayer.Data.Role is FreezerRole)
+        if (Player?.AmOwner == true || 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)
+        if (Player?.AmOwner == true)
         {
             Player.moveable = true;
         }

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,30 +0,0 @@
-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;
-    }
-
-    public override int GetAmountPerGame()
-    {
-        return 1;
-    }
-
-    public override int Priority()
-    {
-        return 100;
-    }
-}

MiraAPI.Example/Options/ExampleOptions.cs

@@ -16,7 +16,7 @@ public class ExampleOptions : AbstractOptionGroup
     [ModdedToggleOption("Toggle Opt 2")]
     public bool ToggleOpt2 { get; set; } = true;
 
-    [ModdedNumberOption("Number Opt", min: 0, max: 10, increment: .25f, formatString: "0.00", suffixType: MiraNumberSuffixes.Percent)]
+    [ModdedNumberOption("Number Opt", min: 0, max: 10, suffixType: MiraNumberSuffixes.Percent)]
     public float NumberOpt { get; set; } = 4f;
 
     [ModdedEnumOption("Best API", typeof(BestApi), ["Mira API", "Mitochondria", "Reactor"])]

MiraAPI.Example/Options/ExampleOptions2.cs

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

MiraAPI.Example/Options/Modifiers/CaptainModifierSettings.cs

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

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

@@ -1,19 +0,0 @@
-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,14 +1,17 @@
-using MiraAPI.Example.Roles;
+using System;
+using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.Utilities;
 
 namespace MiraAPI.Example.Options.Roles;
 
-public class FreezerRoleSettings : AbstractOptionGroup<FreezerRole>
+public class FreezerRoleSettings : AbstractOptionGroup
 {
     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,4 +1,5 @@
-using MiraAPI.Example.Roles;
+using System;
+using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.GameOptions.OptionTypes;
@@ -6,10 +7,12 @@ using MiraAPI.Utilities;
 
 namespace MiraAPI.Example.Options.Roles;
 
-public class TeleporterOptions : AbstractOptionGroup<TeleporterRole>
+public class TeleporterOptions : AbstractOptionGroup
 {
     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,11 +1,9 @@
-using AmongUs.GameOptions;
-using MiraAPI.Roles;
-using Reactor.Utilities;
-using TMPro;
+using MiraAPI.Roles;
 using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class ChameloenRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Chamelon";
@@ -14,24 +12,17 @@ public class ChameloenRole : CrewmateRole, ICustomRole
     public Color RoleColor => Palette.AcceptedGreen;
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
 
-    public CustomRoleConfiguration Configuration => new(this)
+    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(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)
         {
-            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            TextMeshPro tmp = playerControl.cosmetics.nameText;
+            var rend = playerControl.cosmetics.currentBodySprite.BodySprite;
+            var tmp = playerControl.cosmetics.nameText;
             tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, 1), Time.deltaTime * 4f);
             rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
 
@@ -42,8 +33,8 @@ public class ChameloenRole : CrewmateRole, ICustomRole
         }
         else
         {
-            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            TextMeshPro tmp = playerControl.cosmetics.nameText;
+            var rend = playerControl.cosmetics.currentBodySprite.BodySprite;
+            var tmp = playerControl.cosmetics.nameText;
             tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
             rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
 

MiraAPI.Example/Roles/FreezerRole.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class FreezerRole : ImpostorRole, ICustomRole
 {
     public string RoleName => "Freezer";

MiraAPI.Example/Roles/MayorRole.cs

@@ -1,14 +0,0 @@
-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.Example/Roles/NeutralKillerRole.cs

@@ -1,32 +1,24 @@
-using MiraAPI.Example.GameOver;
-using MiraAPI.GameEnd;
-using MiraAPI.Roles;
+using MiraAPI.Roles;
 using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class NeutralKillerRole : ImpostorRole, ICustomRole
 {
-    public string RoleName => "Outcast Killer";
-    public string RoleDescription => "Outcast who can kill.";
+    public string RoleName => "Neutral Killer";
+    public string RoleDescription => "Neutral who can kill.";
     public string RoleLongDescription => RoleDescription;
     public Color RoleColor => Color.magenta;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Custom;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Neutral;
 
-    public CustomRoleConfiguration Configuration => new(this)
+    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
     {
         UseVanillaKillButton = true,
         CanGetKilled = true,
         CanUseVent = true,
     };
 
-    public RoleOptionsGroup RoleOptionsGroup { get; } = new("Outcast", Color.gray);
-
-    public TeamIntroConfiguration? IntroConfiguration { get; } = new(
-        Color.gray,
-        "OUTCAST",
-        "You are an Outcast. You do not have a team.");
-
     public override void SpawnTaskHeader(PlayerControl playerControl)
     {
         // remove existing task header.
@@ -34,6 +26,6 @@ public class NeutralKillerRole : ImpostorRole, ICustomRole
 
     public override bool DidWin(GameOverReason gameOverReason)
     {
-        return gameOverReason == CustomGameOver.GameOverReason<NeutralKillerGameOver>();
+        return GameManager.Instance.DidHumansWin(gameOverReason);
     }
 }

MiraAPI.Example/Roles/TeleporterRole.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
+[RegisterCustomRole]
 public class TeleporterRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Teleporter";
@@ -18,9 +19,4 @@ public class TeleporterRole : CrewmateRole, ICustomRole
         DefaultChance = 73,
         DefaultRoleCount = 4,
     };
-
-    public bool CanLocalPlayerSeeRole(PlayerControl player)
-    {
-        return true;
-    }
 }

MiraAPI/Cosmetics/AbstractCosmeticsGroup.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+
+namespace MiraAPI.Cosmetics;
+public abstract class AbstractCosmeticsGroup
+{
+    public List<HatData> Hats { get; } = [];
+    public List<SkinData> Skins { get; } = [];
+    public List<VisorData> Visors { get; } = [];
+    public List<NamePlateData> Nameplates { get; } = [];
+
+    /// <summary>
+    /// Gets the name of the group. Visible in options menu.
+    /// </summary>
+    public abstract string GroupName { get; }
+
+    /// <summary>
+    /// Gets a function that determines whether the group should be visible or not.
+    /// </summary>
+    public virtual Func<bool> GroupVisible => () => true;
+
+    /// <summary>
+    /// Gets the sorting mode of individual hats within this group.
+    /// </summary>
+    public virtual SortingMode SortingMode => SortingMode.AlphabeticName;
+
+    /// <summary>
+    /// Gets the priority of a group for sorting groups.
+    /// </summary>
+    public virtual int SortingPriority { get; }
+}
+
+public enum SortingMode
+{
+    Priority,
+    AlphabeticProductId,
+    AlphabeticStoreName,
+    AlphabeticName,
+}

MiraAPI/Cosmetics/AbstractCosmeticsGroupComparer.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MiraAPI.Cosmetics;
+internal sealed class AbstractCosmeticsGroupComparer : Comparer<AbstractCosmeticsGroup>
+{
+    public override int Compare(AbstractCosmeticsGroup? x, AbstractCosmeticsGroup? y)
+    {
+        switch (x)
+        {
+            case not null when y is null:
+                return 1;
+            case null when y is null:
+                return 0;
+            case null:
+                return -1;
+        }
+
+        var p = x.SortingPriority - y.SortingPriority;
+        return p == 0 ? StringComparer.InvariantCultureIgnoreCase.Compare(x.GroupName, y.GroupName) : p;
+    }
+}

MiraAPI/Cosmetics/CosmeticComparer.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MiraAPI.Cosmetics;
+internal sealed class CosmeticComparer(AbstractCosmeticsGroup group) : Comparer<CosmeticData>
+{
+    internal static readonly string[] NoCosmetics = ["hat_NoHat", "skin_None", "nameplate_NoPlate", "visor_EmptyVisor"];
+    public override int Compare(CosmeticData? x, CosmeticData? y)
+    {
+        if (NoCosmetics.Contains(x?.ProdId))
+        {
+            return -1;
+        }
+
+        if (NoCosmetics.Contains(y?.ProdId))
+        {
+            return 1;
+        }
+
+        return group.SortingMode switch
+        {
+            SortingMode.AlphabeticProductId => StringComparer.InvariantCultureIgnoreCase.Compare(x?.ProductId, y?.ProductId),
+            SortingMode.Priority => CustomCosmeticManager.CosmeticToPriority[x!] - CustomCosmeticManager.CosmeticToPriority[y!],
+            SortingMode.AlphabeticStoreName => x switch
+            {
+                HatData h1 when y is HatData h2 => StringComparer.InvariantCultureIgnoreCase.Compare(
+                    h1.StoreName,
+                    h2.StoreName),
+                SkinData s1 when y is SkinData s2 => StringComparer.InvariantCultureIgnoreCase.Compare(
+                    s1.StoreName,
+                    s2.StoreName),
+                _ => StringComparer.InvariantCultureIgnoreCase.Compare(x?.GetItemName(), y?.GetItemName()),
+            },
+            _ => StringComparer.InvariantCultureIgnoreCase.Compare(x?.GetItemName(), y?.GetItemName()),
+        };
+    }
+}

MiraAPI/Cosmetics/CosmeticGroupSingleton.cs

@@ -0,0 +1,19 @@
+using System.Linq;
+
+namespace MiraAPI.Cosmetics;
+
+/// <summary>
+/// Used to get access to a CosmeticGroup.
+/// </summary>
+/// <typeparam name="T">The type.</typeparam>
+public static class CosmeticGroupSingleton<T> where T : AbstractCosmeticsGroup
+{
+    private static T? _instance;
+
+    /// <summary>
+    /// Gets instance of the cosmetic group.
+    /// </summary>
+#pragma warning disable CA1000
+    public static T Instance => _instance ??= CustomCosmeticManager.Groups.OfType<T>().Single();
+#pragma warning restore CA1000
+}

MiraAPI/Cosmetics/CustomCosmeticManager.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using HarmonyLib;
+using MiraAPI.PluginLoading;
+using MonoMod.Utils;
+using Reactor.Utilities;
+
+namespace MiraAPI.Cosmetics;
+public static class CustomCosmeticManager
+{
+    private static readonly Dictionary<PropertyInfo, RegisterCustomCosmeticAttribute> OptionAttributes = [];
+    private static readonly Dictionary<Type, AbstractCosmeticsGroup> TypeToGroup = [];
+    internal static readonly Dictionary<CosmeticData, int> CosmeticToPriority = [];
+    internal static readonly Dictionary<CosmeticData, AbstractCosmeticsGroup> CosmeticToGroup = [];
+
+    internal static readonly List<AbstractCosmeticsGroup> Groups = [];
+
+    internal static void RegisterVanilla()
+    {
+        if (Activator.CreateInstance(typeof(VanillaCosmeticsGroup)) is not AbstractCosmeticsGroup group)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to create group from Vanilla");
+            return;
+        }
+        if (TypeToGroup.ContainsKey(typeof(VanillaCosmeticsGroup)))
+        {
+            Logger<MiraApiPlugin>.Error($"Vanilla group already exists.");
+            return;
+        }
+
+        Groups.Add(group);
+        TypeToGroup.Add(typeof(VanillaCosmeticsGroup), group);
+    }
+
+    internal static bool RegisterGroup(Type type, MiraPluginInfo pluginInfo)
+    {
+        if (Activator.CreateInstance(type) is not AbstractCosmeticsGroup group)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to create group from {type.Name}");
+            return false;
+        }
+
+        if (TypeToGroup.ContainsKey(type))
+        {
+            Logger<MiraApiPlugin>.Error($"Group {type.Name} already exists.");
+            return false;
+        }
+
+        Groups.Add(group);
+        TypeToGroup.Add(type, group);
+        pluginInfo.CosmeticGroups.Add(group);
+
+        return true;
+    }
+
+    internal static void RegisterAttributeOption(Type type, RegisterCustomCosmeticAttribute attribute, PropertyInfo property, MiraPluginInfo pluginInfo)
+    {
+        if (OptionAttributes.ContainsKey(property))
+        {
+            Logger<MiraApiPlugin>.Error($"Property {property.Name} already has an attribute registered.");
+            return;
+        }
+
+        if (!TypeToGroup.TryGetValue(type, out var group))
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to get group for {type.Name}");
+            return;
+        }
+
+        OptionAttributes.Add(property, attribute);
+    }
+
+    internal static void LoadCosmetic(PropertyInfo property, RegisterCustomCosmeticAttribute attribute)
+    {
+        if (!TypeToGroup.TryGetValue(property.DeclaringType, out var group))
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to get group for {property.DeclaringType.Name}");
+            return;
+        }
+
+        if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<HatData>)))
+        {
+            group.Hats.AddRange((IEnumerable<HatData>)property.GetValue(group));
+        }
+        else if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<SkinData>)))
+        {
+            group.Skins.AddRange((IEnumerable<SkinData>)property.GetValue(group));
+        }
+        else if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<VisorData>)))
+        {
+            group.Visors.AddRange((IEnumerable<VisorData>)property.GetValue(group));
+        }
+        else if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<NamePlateData>)))
+        {
+            group.Nameplates.AddRange((IEnumerable<NamePlateData>)property.GetValue(group));
+        }
+        else
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to get enumerable for {property.Name}");
+            return;
+        }
+
+        CosmeticToPriority.AddRange(((IEnumerable<CosmeticData>)property.GetValue(group)).ToDictionary(y => y, x => attribute.Priority));
+        CosmeticToGroup.AddRange(((IEnumerable<CosmeticData>)property.GetValue(group)).ToDictionary(y => y, x => group));
+    }
+
+    internal static bool Registered { get; set; }
+    internal static void LoadAll()
+    {
+        CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.runtimeRegister();
+        if (Registered || !CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.registered)
+        {
+            return;
+        }
+
+        Registered = true;
+        CosmeticToPriority.AddRange(CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.Cosmetics.ToDictionary(y => y, x => 0));
+        CosmeticToGroup.AddRange(CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.Cosmetics.ToDictionary(y => y, x => CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance));
+        OptionAttributes.Do(x => LoadCosmetic(x.Key, x.Value));
+        DestroyableSingleton<HatManager>.Instance.allHats = CosmeticToGroup.Keys.OfType<HatData>().ToArray();
+        DestroyableSingleton<HatManager>.Instance.allVisors = CosmeticToGroup.Keys.OfType<VisorData>().ToArray();
+        DestroyableSingleton<HatManager>.Instance.allSkins = CosmeticToGroup.Keys.OfType<SkinData>().ToArray();
+        DestroyableSingleton<HatManager>.Instance.allNamePlates = CosmeticToGroup.Keys.OfType<NamePlateData>().ToArray();
+    }
+}

MiraAPI/Cosmetics/RegisterCustomCosmeticAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MiraAPI.Cosmetics;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class RegisterCustomCosmeticAttribute(int priority = 0) : Attribute
+{
+    public int Priority { get; } = priority;
+}

MiraAPI/Cosmetics/VanillaCosmeticsGroup.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace MiraAPI.Cosmetics;
+public class VanillaCosmeticsGroup : AbstractCosmeticsGroup
+{
+    public override string GroupName => "Vanilla";
+    internal static HatData[] VanillaHats => DestroyableSingleton<HatManager>.Instance.allHats;
+    internal static VisorData[] VanillaVisors => DestroyableSingleton<HatManager>.Instance.allVisors;
+    internal static SkinData[] VanillaSkins => DestroyableSingleton<HatManager>.Instance.allSkins;
+    internal static NamePlateData[] VanillaNameplates => DestroyableSingleton<HatManager>.Instance.allNamePlates;
+
+    internal List<CosmeticData> Cosmetics { get; } = [];
+
+    internal bool registered { get; set; }
+    internal bool runtimeRegister()
+    {
+        if (registered)
+        {
+            return true;
+        }
+
+        if (!DestroyableSingleton<HatManager>.InstanceExists || VanillaHats.Length == 0
+                                                             || VanillaVisors.Length == 0 || VanillaSkins.Length == 0
+                                                             || VanillaNameplates.Length == 0)
+        {
+            return false;
+        }
+
+        registered = true;
+        Hats.AddRange(VanillaHats);
+        Visors.AddRange(VanillaVisors);
+        Skins.AddRange(VanillaSkins);
+        Nameplates.AddRange(VanillaNameplates);
+        Cosmetics.AddRange(Hats);
+        Cosmetics.AddRange(Visors);
+        Cosmetics.AddRange(Skins);
+        Cosmetics.AddRange(Nameplates);
+        return true;
+    }
+}

MiraAPI/Events/Mira/MiraButtonCancelledEvent.cs

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

MiraAPI/Events/Mira/MiraButtonClickEvent.cs

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

MiraAPI/Events/MiraCancelableEvent.cs

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

MiraAPI/Events/MiraEvent.cs

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

MiraAPI/Events/MiraEventManager.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using Reactor.Utilities;
-
-namespace MiraAPI.Events;
-
-/// <summary>
-/// Mira Event manager.
-/// </summary>
-public static class MiraEventManager
-{
-    private static readonly Dictionary<Type, List<MiraEventWrapper>> EventWrappers = [];
-
-    /// <summary>
-    /// Invoke an event.
-    /// </summary>
-    /// <param name="eventInstance">The event instance.</param>
-    /// <typeparam name="T">Type of Event.</typeparam>
-    /// <returns>If there was an event handler invoked for this event, return true. Otherwise, return false.</returns>
-    public static bool InvokeEvent<T>(T eventInstance) where T : MiraEvent
-    {
-        EventWrappers.TryGetValue(typeof(T), out var handlers);
-        if (handlers == null || handlers.Count == 0)
-        {
-            return false;
-        }
-
-        foreach (var handler in handlers)
-        {
-            ((Action<T>)handler.EventHandler).Invoke(eventInstance);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// Invoke an event and use a specific type to find the handlers.
-    /// </summary>
-    /// <param name="eventInstance">The event instance.</param>
-    /// <param name="type">The type to use for handler lookup.</param>
-    /// <returns>If there was an event handler invoked for this event, return true. Otherwise, return false.</returns>
-    public static bool InvokeEvent(MiraEvent eventInstance, Type type)
-    {
-        EventWrappers.TryGetValue(type, out var handlers);
-        if (handlers == null || handlers.Count == 0)
-        {
-            return false;
-        }
-
-        foreach (var handler in handlers)
-        {
-            handler.EventHandler.DynamicInvoke(eventInstance);
-        }
-
-        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. 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
-    {
-        EventWrappers.TryAdd(typeof(T), []);
-
-        var handlers = EventWrappers[typeof(T)];
-        var eventWrapper = new MiraEventWrapper(handler, 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);
-    }
-}

MiraAPI/Events/MiraEventWrapper.cs

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

MiraAPI/Events/RegisterEventAttribute.cs

@@ -1,24 +0,0 @@
-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/AfterMurderEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/GameEndEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/IntroBeginEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/IntroEndEvent.cs

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

@@ -1,21 +0,0 @@
-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/Gameplay/SetRoleEvent.cs

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

MiraAPI/Events/Vanilla/Map/CloseDoorsEvent.cs

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

MiraAPI/Events/Vanilla/Map/PlayerOpenSabotageEvent.cs

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

MiraAPI/Events/Vanilla/Map/UpdateSystemEvent.cs

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

MiraAPI/Events/Vanilla/Meeting/EjectionEvent.cs

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

MiraAPI/Events/Vanilla/Meeting/EndMeetingEvent.cs

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

@@ -1,36 +0,0 @@
-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,22 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Meeting;
-
-/// <summary>
-/// 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 : MiraEvent
-{
-    /// <summary>
-    /// Gets the MeetingHud instance.
-    /// </summary>
-    public MeetingHud MeetingHud { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StartMeetingEvent"/> class.
-    /// </summary>
-    /// <param name="meetingHud">The MeetingHud instance.</param>
-    public StartMeetingEvent(MeetingHud meetingHud)
-    {
-        MeetingHud = meetingHud;
-    }
-}

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

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

@@ -1,44 +0,0 @@
-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 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;
-        TargetPlayerInfo = GameData.Instance.GetPlayerById(targetId);
-    }
-}

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

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

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

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

@@ -1,13 +0,0 @@
-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/Events/Vanilla/Player/CompleteTaskEvent.cs

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

MiraAPI/Events/Vanilla/Player/PlayerDeathEvent.cs

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

MiraAPI/Events/Vanilla/Player/PlayerJoinEvent.cs

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

MiraAPI/Events/Vanilla/Player/PlayerLeaveEvent.cs

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

MiraAPI/Events/Vanilla/Usables/EnterVentEvent.cs

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

MiraAPI/Events/Vanilla/Usables/ExitVentEvent.cs

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

MiraAPI/Events/Vanilla/Usables/PlayerCanUseEvent.cs

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

MiraAPI/Events/Vanilla/Usables/PlayerUseEvent.cs

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

MiraAPI/GameEnd/CustomGameOver.cs

@@ -1,78 +0,0 @@
-using System.Collections.Generic;
-using MiraAPI.Networking;
-using Reactor.Networking.Rpc;
-
-namespace MiraAPI.GameEnd;
-
-/// <summary>
-/// Custom Game Over.
-/// </summary>
-public abstract class CustomGameOver
-{
-    /// <summary>
-    /// Gets the current 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>
-    /// <param name="endGameManager">The EndGameManager instance.</param>
-    /// <returns>Return True to use the run the original method, return False to skip it.</returns>
-    public virtual bool BeforeEndGameSetup(EndGameManager endGameManager)
-    {
-        return true;
-    }
-
-    /// <summary>
-    /// Runs after the base game calls EndGameManager.SetEverythingUp.
-    /// </summary>
-    /// <param name="endGameManager">The EndGameManager instance.</param>
-    public virtual void AfterEndGameSetup(EndGameManager endGameManager)
-    {
-    }
-
-    /// <summary>
-    /// Get the GameOverReason associated with this CustomGameOver.
-    /// </summary>
-    /// <typeparam name="T">Type of the custom game over.</typeparam>
-    /// <returns>The GameOverReason associated with the custom game over.</returns>
-    public static GameOverReason GameOverReason<T>() where T : CustomGameOver
-    {
-        return (GameOverReason)GameOverManager.GetGameOverId<T>();
-    }
-
-    /// <summary>
-    /// Send a custom game over.
-    /// </summary>
-    /// <param name="winners">A collection of winners.</param>
-    /// <typeparam name="T">Type of the custom game over.</typeparam>
-    public static void Trigger<T>(IEnumerable<NetworkedPlayerInfo> winners) where T : CustomGameOver
-    {
-        var reason = GameOverManager.GetGameOverId<T>();
-        var data = new GameOverData(reason, [.. winners]);
-
-        Rpc<CustomGameOverRpc>.Instance.Send(PlayerControl.LocalPlayer, data, true);
-    }
-
-    /// <summary>
-    /// Implicitly convert a CustomGameOver to a GameOverReason.
-    /// </summary>
-    /// <param name="gameOver">The CustomGameOver instance.</param>
-    /// <returns>The GameOverReason associated with the CustomGameOver.</returns>
-    public static implicit operator GameOverReason(CustomGameOver gameOver)
-    {
-        return (GameOverReason)GameOverManager.GetGameOverId(gameOver.GetType());
-    }
-}

MiraAPI/GameEnd/GameOverData.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace MiraAPI.GameEnd;
-
-/// <summary>
-/// Data for a game over.
-/// </summary>
-/// <param name="Reason">Reason for the game over.</param>
-/// <param name="Winners">A collection of winners.</param>
-public record struct GameOverData(int Reason, List<NetworkedPlayerInfo> Winners);

MiraAPI/GameEnd/GameOverManager.cs

@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Reactor.Utilities;
-
-namespace MiraAPI.GameEnd;
-
-/// <summary>
-/// Manage custom game overs.
-/// </summary>
-public static class GameOverManager
-{
-    private static readonly Dictionary<Type, int> GameOverIds = [];
-    private static readonly Dictionary<int, Type> GameOverTypes = [];
-
-    private static int _nextId = Enum.GetNames<GameOverReason>().Length;
-
-    /// <summary>
-    /// Register a custom game over.
-    /// </summary>
-    /// <param name="gameOverType">Type of the custom game over.</param>
-    /// <exception cref="ArgumentException">Thrown when the type is not a subclass of CustomGameOver, is abstract, or does not have a parameterless constructor.</exception>
-    /// <returns>>True if the game over was registered successfully, false otherwise.</returns>
-    public static bool RegisterGameOver(Type gameOverType)
-    {
-        if (!typeof(CustomGameOver).IsAssignableFrom(gameOverType))
-        {
-            return false;
-        }
-
-        if (gameOverType.IsAbstract)
-        {
-            Logger<MiraApiPlugin>.Error("The type must not be abstract.");
-            return false;
-        }
-
-        if (gameOverType.GetConstructor(Type.EmptyTypes) == null)
-        {
-            Logger<MiraApiPlugin>.Error("The type must have a parameterless constructor.");
-            return false;
-        }
-
-        GameOverIds.Add(gameOverType, _nextId);
-        GameOverTypes.Add(_nextId, gameOverType);
-        _nextId++;
-        return true;
-    }
-
-    /// <summary>
-    /// Create an instance of a custom game over.
-    /// </summary>
-    /// <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, [NotNullWhen(true)] out CustomGameOver? customGameOver)
-    {
-        if (GameOverTypes.TryGetValue(id, out var gameOverType))
-        {
-            customGameOver = Activator.CreateInstance(gameOverType) as CustomGameOver;
-            return customGameOver != null;
-        }
-
-        customGameOver = null;
-        return false;
-    }
-
-    /// <summary>
-    /// Get the ID of a custom game over.
-    /// </summary>
-    /// <typeparam name="T">Type of the custom game over.</typeparam>
-    /// <returns>The ID of the custom game over.</returns>
-    public static int GetGameOverId<T>() where T : CustomGameOver
-    {
-        return GetGameOverId(typeof(T));
-    }
-
-    /// <summary>
-    /// Get the ID of a custom game over.
-    /// </summary>
-    /// <param name="gameOverType">Type of the custom game over.</param>
-    /// <returns>The ID of the custom game over.</returns>
-    /// <exception cref="ArgumentException">Thrown when the type is not registered.</exception>
-    public static int GetGameOverId(Type gameOverType)
-    {
-        if (GameOverIds.TryGetValue(gameOverType, out var id))
-            return id;
-
-        throw new ArgumentException($"{gameOverType.FullName} is not a registered custom game over!");
-    }
-}

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -21,7 +21,7 @@ public static class CustomGameModeManager
     }
 
     /// <summary>
-    /// Current gamemode.
+    /// Gets current gamemode.
     /// </summary>
     public static CustomGameMode? ActiveMode { get; internal set; } = new DefaultMode();
 
@@ -29,7 +29,7 @@ public static class CustomGameModeManager
     /// Set current gamemode.
     /// </summary>
     /// <param name="id">gamemode ID.</param>
-    public static void SetGameMode(int id)
+    internal static void SetGameMode(int id)
     {
         if (GameModes.TryGetValue(id, out var gameMode))
         {

MiraAPI/GameModes/DefaultMode.cs

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

MiraAPI/GameModes/RegisterGameModeAttribute.cs

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

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -16,17 +16,6 @@ public abstract class AbstractOptionGroup
     /// </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>
@@ -35,7 +24,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 => MiraApiPlugin.DefaultHeaderColor;
+    public virtual Color GroupColor => Color.clear;
 
     /// <summary>
     /// Gets the group priority. This is used to determine the order in which groups are displayed in the options menu.
@@ -43,17 +32,12 @@ 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

@@ -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)
-    : ModdedOptionAttribute(title)
+public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? values = null, Type? roleType = null)
+    : ModdedOptionAttribute(title, roleType)
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        var opt = new ModdedEnumOption(Title, (int)(value ?? 0), enumType, values);
+        var opt = new ModdedEnumOption(Title, (int)(value ?? 0), enumType, values, RoleType);
         return opt;
     }
 
@@ -27,8 +27,10 @@ public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? va
     /// <inheritdoc />
     public override object GetValue()
     {
-        return HolderOption is ModdedEnumOption opt
-            ? Enum.ToObject(enumType, opt.Value)
-            : throw new InvalidOperationException($"HolderOption for option \"{Title}\" with EnumType ${enumType.FullName} is not a ModdedEnumOption");
+        if (HolderOption is ModdedEnumOption opt)
+        {
+            return Enum.ToObject(enumType, opt.Value);
+        }
+        throw new InvalidOperationException($"HolderOption for option \"{Title}\" with EnumType ${enumType.FullName} is not a ModdedEnumOption");
     }
 }

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

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

MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs

@@ -8,12 +8,13 @@ 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) : ModdedOptionAttribute(title)
+public class ModdedToggleOptionAttribute(string title, Type? roleType = null) : ModdedOptionAttribute(title, roleType)
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        var toggleOpt = new ModdedToggleOption(Title, (bool)(value ?? false));
+        var toggleOpt = new ModdedToggleOption(Title, (bool)(value ?? false), RoleType);
         return toggleOpt;
     }
 

MiraAPI/GameOptions/IModdedOption.cs

@@ -13,6 +13,7 @@ public interface IModdedOption
     StringNames StringName { get; }
     IMiraPlugin? ParentMod { get; set; }
     BaseGameSetting Data { get; }
+    Type? AdvancedRole { get; set; }
     OptionBehaviour? OptionBehaviour { get; }
     Func<bool> Visible { get; set; }
     ConfigDefinition? ConfigDefinition { get; set; }
@@ -20,4 +21,5 @@ public interface IModdedOption
     float GetFloatData();
     NetData GetNetData();
     void HandleNetData(byte[] data);
+    void ResetToConfig();
 }

MiraAPI/GameOptions/IOptionable.cs

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

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -31,6 +31,7 @@ public static class ModdedOptionsManager
     {
         if (Activator.CreateInstance(type) is not AbstractOptionGroup group)
         {
+            Logger<MiraApiPlugin>.Error($"Failed to create group from {type.Name}");
             return false;
         }
 
@@ -108,7 +109,7 @@ public static class ModdedOptionsManager
         RegisterOption(option, group, property.Name, pluginInfo);
     }
 
-    internal static void RegisterOption(
+    private static void RegisterOption(
         IModdedOption option,
         AbstractOptionGroup group,
         string propertyName,
@@ -119,7 +120,10 @@ public static class ModdedOptionsManager
         option.ConfigDefinition = new ConfigDefinition(groupName, propertyName);
 
         option.ParentMod = pluginInfo.MiraPlugin;
+        option.AdvancedRole = group.AdvancedRole;
+
         pluginInfo.Options.Add(option);
+
         ModdedOptions.Add(option.Id, option);
         group.Options.Add(option);
     }
@@ -138,7 +142,6 @@ public static class ModdedOptionsManager
     {
         // necessary to disable then re-enable this setting
         // 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())
         {
@@ -158,7 +161,6 @@ public static class ModdedOptionsManager
 
         foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
-            plugin.PluginConfig.Save();
             plugin.PluginConfig.SaveOnConfigSet = oldConfigSetting[plugin];
         }
 

MiraAPI/GameOptions/ModifierOptionGroup.cs

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

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

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -46,8 +46,8 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="max">The maximum value.</param>
     /// <param name="increment">The increment.</param>
     /// <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>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -55,8 +55,8 @@ public class ModdedNumberOption : ModdedOption<float>
         float max,
         float increment,
         MiraNumberSuffixes suffixType,
-        string? formatString = null,
-        bool zeroInfinity = false) : base(title, defaultValue)
+        bool zeroInfinity = false,
+        Type? roleType = null) : base(title, defaultValue, roleType)
     {
         Min = min;
         Max = max;
@@ -74,13 +74,7 @@ public class ModdedNumberOption : ModdedOption<float>
         data.Value = Value;
         data.Increment = Increment;
         data.ValidRange = new FloatRange(Min, Max);
-        data.FormatString = formatString ??
-                            (defaultValue.IsInteger() &&
-                             Increment.IsInteger() &&
-                             Value.IsInteger() &&
-                             Min.IsInteger() &&
-                             Max.IsInteger() ? "0" : "0.0");
-
+        data.FormatString = Increment % 1 == 0 && Value % 1 == 0 && Min % 1 == 0 && Max % 1 == 0 ? "0" : "0.0"; // not sure if the == checks will work since this is floats but we'll find out
         data.ZeroIsInfinity = ZeroInfinity;
         data.SuffixType = (NumberSuffixes)SuffixType;
         data.OptionName = FloatOptionNames.Invalid;
@@ -140,24 +134,17 @@ public class ModdedNumberOption : ModdedOption<float>
     protected override void OnValueChanged(float newValue)
     {
         Value = Mathf.Clamp(newValue, Min, Max);
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(
-            StringName,
-            Data.GetValueString(Value),
-            false);
+        if (HudManager.InstanceExists)
+        {
+            HudManager.Instance.Notifier.AddSettingsChangeMessage(
+                StringName,
+                Data.GetValueString(Value),
+                false);
+        }
 
         if (OptionBehaviour is NumberOption opt)
         {
             opt.Value = Value;
         }
     }
-
-    /// <summary>
-    /// Implicitly converts the option to an int.
-    /// </summary>
-    /// <param name="option">The option.</param>
-    /// <returns>Integer value.</returns>
-    public static implicit operator int(ModdedNumberOption option)
-    {
-        return (int)option.Value;
-    }
 }

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -2,6 +2,7 @@
 using BepInEx.Configuration;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
+using MiraAPI.Roles;
 using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
 using UnityEngine;
@@ -44,7 +45,11 @@ public abstract class ModdedOption<T> : IModdedOption
         get => _parentMod;
         set
         {
-            if (_parentMod != null || value == null) return;
+            if (_parentMod != null || value == null)
+            {
+                return;
+            }
+
             _parentMod = value;
             var entry = _parentMod.GetConfigFile().Bind(ConfigDefinition, DefaultValue);
             Value = entry.Value;
@@ -71,6 +76,11 @@ public abstract class ModdedOption<T> : IModdedOption
     /// </summary>
     public Func<bool> Visible { get; set; }
 
+    /// <summary>
+    /// Gets or sets the advanced role of the option.
+    /// </summary>
+    public Type? AdvancedRole { get; set; }
+
     /// <summary>
     /// Gets or sets the option behaviour of the option.
     /// </summary>
@@ -86,7 +96,8 @@ public abstract class ModdedOption<T> : IModdedOption
     /// </summary>
     /// <param name="title">The option title.</param>
     /// <param name="defaultValue">The default value.</param>
-    protected ModdedOption(string title, T defaultValue)
+    /// <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)
     {
         Id = ModdedOptionsManager.NextId;
         Title = title;
@@ -94,6 +105,11 @@ 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;
+        }
     }
 
     internal void ValueChanged(OptionBehaviour optionBehaviour)
@@ -146,6 +162,14 @@ public abstract class ModdedOption<T> : IModdedOption
     /// <param name="data">The NetData's byte array.</param>
     public abstract void HandleNetData(byte[] data);
 
+    public void ResetToConfig()
+    {
+        if (ParentMod?.GetConfigFile().TryGetEntry<T>(ConfigDefinition, out var entry) == true)
+        {
+            SetValue(entry.Value);
+        }
+    }
+
     /// <summary>
     /// Handles the value changed event.
     /// </summary>
@@ -172,14 +196,4 @@ public abstract class ModdedOption<T> : IModdedOption
         NumberOption numberOpt,
         StringOption stringOpt,
         Transform container);
-
-    /// <summary>
-    /// Implicitly converts the option to type of <typeparamref name="T"/>.
-    /// </summary>
-    /// <param name="option">The option.</param>
-    /// <returns>Value of type <typeparamref name="T"/>.</returns>
-    public static implicit operator T(ModdedOption<T> option)
-    {
-        return option.Value;
-    }
 }

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -15,7 +15,8 @@ public class ModdedToggleOption : ModdedOption<bool>
     /// </summary>
     /// <param name="title">The option title.</param>
     /// <param name="defaultValue">The default value.</param>
-    public ModdedToggleOption(string title, bool defaultValue) : base(title, defaultValue)
+    /// <param name="roleType">An optional role type.</param>
+    public ModdedToggleOption(string title, bool defaultValue, Type? roleType = null) : base(title, defaultValue, roleType)
     {
         Data = ScriptableObject.CreateInstance<CheckboxGameSetting>();
 
@@ -68,7 +69,10 @@ public class ModdedToggleOption : ModdedOption<bool>
     /// <inheritdoc />
     protected override void OnValueChanged(bool newValue)
     {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
+        if (HudManager.InstanceExists)
+        {
+            HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
+        }
         if (!OptionBehaviour)
         {
             return;

MiraAPI/Hud/CustomActionButton.cs

@@ -1,13 +1,7 @@
-using System;
-using System.Globalization;
-using MiraAPI.Events;
-using MiraAPI.Events.Mira;
-using MiraAPI.Patches;
-using MiraAPI.Utilities.Assets;
+using MiraAPI.Utilities.Assets;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
-using Object = UnityEngine.Object;
 
 namespace MiraAPI.Hud;
 
@@ -21,40 +15,30 @@ public abstract class CustomActionButton
     /// </summary>
     public abstract string Name { get; }
 
-    /// <summary>
-    /// Gets the initial cooldown duration in seconds.
-    /// </summary>
-    public virtual float InitialCooldown => Cooldown;
-
     /// <summary>
     /// Gets the button's cooldown duration in seconds.
     /// </summary>
     public abstract float Cooldown { get; }
 
+    /// <summary>
+    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
+    /// </summary>
+    public abstract float EffectDuration { get; }
+
+    /// <summary>
+    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
+    /// </summary>
+    public abstract int MaxUses { get; }
+
     /// <summary>
     /// Gets the sprite of the button. Use <see cref="LoadableResourceAsset"/> to load a sprite from a resource path. Use <see cref="LoadableBundleAsset{T}"/> to load a sprite from an asset bundle.
     /// </summary>
     public abstract LoadableAsset<Sprite> Sprite { get; }
 
     /// <summary>
-    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
+    /// Gets the location of the button on the screen.
     /// </summary>
-    public virtual float EffectDuration => 0;
-
-    /// <summary>
-    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
-    /// </summary>
-    public virtual int MaxUses => 0;
-
-    /// <summary>
-    /// Gets the button's text outline color.
-    /// </summary>
-    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;
+    public virtual ButtonLocation Location => ButtonLocation.BottomLeft;
 
     /// <summary>
     /// Gets a value indicating whether the button has an effect ability.
@@ -69,33 +53,24 @@ 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; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the timer is currently active.
-    /// </summary>
-    public bool TimerPaused { get; set; }
+    public bool EffectActive { get; protected set; }
 
     /// <summary>
     /// Gets or sets the amount of uses left.
     /// </summary>
-    public int UsesLeft { get; set; }
+    public int UsesLeft { get; protected set; }
 
     /// <summary>
     /// Gets or sets the timer variable to measure cooldowns and effects.
     /// </summary>
-    public float Timer { get; set; }
+    public float Timer { get; protected set; }
 
     /// <summary>
-    /// Gets or sets the button object in game. This is created by Mira API automatically.
+    /// Gets the button object in game. This is created by Mira API automatically.
     /// </summary>
-    public ActionButton? Button { get; set; }
+    protected ActionButton? Button { get; private set; }
 
-    /// <summary>
-    /// The method used to create the button.
-    /// </summary>
-    /// <param name="parent">The parent of the button.</param>
-    public virtual void CreateButton(Transform parent)
+    internal void CreateButton(Transform parent)
     {
         if (Button)
         {
@@ -103,9 +78,8 @@ public abstract class CustomActionButton
         }
 
         UsesLeft = MaxUses;
-        Timer = AmongUsClient.Instance?.NetworkMode == NetworkModes.FreePlay ? 0 : InitialCooldown;
+        Timer = Cooldown;
         EffectActive = false;
-        TimerPaused = false;
 
         Button = Object.Instantiate(HudManager.Instance.AbilityButton, parent);
         Button.name = Name + "Button";
@@ -119,94 +93,15 @@ 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)(() =>
-        {
-            // Invoke the generic button click event.
-            var genericEvent = new MiraButtonClickEvent(this);
-            MiraEventManager.InvokeEvent(genericEvent);
-            if (genericEvent.IsCancelled)
-            {
-                MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this));
-            }
-
-            // Invoke the button click event for specific button.
-            var eventType = CustomButtonManager.ButtonEventTypes[GetType()];
-            var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, this, genericEvent)!;
-            var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType);
-            if (@event.IsCancelled)
-            {
-                var cancelEventType = CustomButtonManager.ButtonCancelledEventTypes[GetType()];
-                var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, this)!;
-                MiraEventManager.InvokeEvent(cancelEvent, cancelEventType);
-            }
-
-            if (specificInvoked)
-            {
-                if (!@event.IsCancelled)
-                {
-                    ClickHandler();
-                }
-            }
-            else
-            {
-                if (!genericEvent.IsCancelled)
-                {
-                    ClickHandler();
-                }
-            }
-        }));
-    }
-
-    /// <summary>
-    /// Allows you to change the button's location.
-    /// </summary>
-    /// <param name="location">The new location.</param>
-    /// <param name="moveButton">Whether the button's position should change in-game.</param>
-    public virtual void SetButtonLocation(ButtonLocation location, bool moveButton = true)
-    {
-        if (!HudManager.InstanceExists || Button == null)
-        {
-            return;
-        }
-
-        this.Location = location;
-
-        if (!moveButton) return;
-
-        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
-        {
-            return;
-        }
-
-        switch (location)
-        {
-            case ButtonLocation.BottomLeft:
-                var gridArrange = HudManagerPatches._bottomLeft.GetComponent<GridArrange>();
-                var aspectPosition = HudManagerPatches._bottomLeft.GetComponent<AspectPosition>();
-
-                Button.transform.SetParent(HudManagerPatches._bottomLeft.transform);
-
-                gridArrange.Start();
-                gridArrange.ArrangeChilds();
-                aspectPosition.AdjustPosition();
-                break;
-            case ButtonLocation.BottomRight:
-                Button.transform.SetParent(HudManagerPatches._bottomRight);
-                break;
-        }
+        pb.OnClick.AddListener((UnityAction)ClickHandler);
     }
 
     /// <summary>
     /// A utility function to reset the cooldown and/or effect of the button.
     /// </summary>
-    public virtual void ResetCooldownAndOrEffect()
+    public void ResetCooldownAndOrEffect()
     {
         Timer = Cooldown;
         if (EffectActive)
@@ -217,20 +112,11 @@ 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>
     /// <param name="sprite">The new sprite to override with.</param>
-    public virtual void OverrideSprite(Sprite sprite)
+    public void OverrideSprite(Sprite sprite)
     {
         if (Button != null)
         {
@@ -242,7 +128,7 @@ public abstract class CustomActionButton
     /// A utility function to override the name of the button.
     /// </summary>
     /// <param name="name">The new name to override with.</param>
-    public virtual void OverrideName(string name)
+    public void OverrideName(string name)
     {
         Button?.OverrideText(name);
     }
@@ -251,7 +137,7 @@ public abstract class CustomActionButton
     /// Set the button's timer.
     /// </summary>
     /// <param name="time">The time you want to set to.</param>
-    public virtual void SetTimer(float time)
+    public void SetTimer(float time)
     {
         Timer = Mathf.Clamp(time, -1, float.MaxValue);
     }
@@ -260,7 +146,7 @@ public abstract class CustomActionButton
     /// Increase the button's timer.
     /// </summary>
     /// <param name="amount">The amount you want to increase by.</param>
-    public virtual void IncreaseTimer(float amount)
+    public void IncreaseTimer(float amount)
     {
         SetTimer(Timer + amount);
     }
@@ -269,40 +155,26 @@ public abstract class CustomActionButton
     /// Decrease the button's timer.
     /// </summary>
     /// <param name="amount">The amount you want to decrease by.</param>
-    public virtual void DecreaseTimer(float amount)
+    public void DecreaseTimer(float amount)
     {
         SetTimer(Timer - amount);
     }
 
-    /// <summary>
-    /// Sets whether the timer is paused or not.
-    /// </summary>
-    /// <param name="val">Whether you want to pause/resume the timer.</param>
-    public virtual void SetTimerPaused(bool val)
-    {
-        TimerPaused = val;
-    }
-
     /// <summary>
     /// Set the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to set to.</param>
-    public virtual void SetUses(int amount)
+    public void SetUses(int amount)
     {
         UsesLeft = Mathf.Clamp(amount, 0, int.MaxValue);
-        Button?.SetUsesRemaining(UsesLeft);
-
-        if (Button != null)
-        {
-            Button.usesRemainingSprite.color = UsesLeft == 0 ? Color.red : Color.white;
-        }
+        Button?.SetUsesRemaining(MaxUses);
     }
 
     /// <summary>
     /// Increase the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to increase by. Default: 1.</param>
-    public virtual void IncreaseUses(int amount = 1)
+    public void IncreaseUses(int amount = 1)
     {
         SetUses(UsesLeft + amount);
     }
@@ -311,7 +183,7 @@ public abstract class CustomActionButton
     /// Decrease the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to decrease by. Default: 1.</param>
-    public virtual void DecreaseUses(int amount = 1)
+    public void DecreaseUses(int amount = 1)
     {
         SetUses(UsesLeft - amount);
     }
@@ -346,24 +218,14 @@ public abstract class CustomActionButton
     }
 
     /// <summary>
-    /// When the button is usable, this method is called to determine if the button can be clicked.
+    /// When the button is enabled, this method is called to determine if the button can be used.
     /// By default, it takes into account the timer, effect, and uses.
     /// You can override it to change the behavior.
     /// </summary>
-    /// <returns>A value that represents whether the button can be clicked or not.</returns>
-    public virtual bool CanClick()
-    {
-        return Timer <= 0 && !EffectActive && CanUse();
-    }
-
-    /// <summary>
-    /// Whether the button should light up or not. This is also the base for CanClick.
-    /// You can override it to change the behaviour. Do not include timer in here, that is for CanClick.
-    /// </summary>
-    /// <returns>A value that represents whether the button should light up or not.</returns>
+    /// <returns>A value that represents whether the button can be used or not.</returns>
     public virtual bool CanUse()
     {
-        return PlayerControl.LocalPlayer.moveable && (!LimitedUses || UsesLeft > 0);
+        return Timer <= 0 && !EffectActive && (!LimitedUses || UsesLeft > 0);
     }
 
     /// <summary>
@@ -383,9 +245,9 @@ public abstract class CustomActionButton
     /// This method takes into account cooldowns, effects, and uses, before calling the <see cref="OnClick"/> method.
     /// It can be overridden for custom behavior.
     /// </summary>
-    public virtual void ClickHandler()
+    protected virtual void ClickHandler()
     {
-        if (!CanClick())
+        if (!CanUse())
         {
             return;
         }
@@ -397,7 +259,7 @@ public abstract class CustomActionButton
         }
 
         OnClick();
-
+        Button?.SetDisabled();
         if (HasEffect)
         {
             EffectActive = true;
@@ -419,10 +281,7 @@ public abstract class CustomActionButton
     {
         if (Timer >= 0)
         {
-            if (!TimerPaused)
-            {
-                Timer -= Time.deltaTime;
-            }
+            Timer -= Time.deltaTime;
         }
         else if (HasEffect && EffectActive)
         {
@@ -431,29 +290,16 @@ public abstract class CustomActionButton
             OnEffectEnd();
         }
 
-        if (Button)
+        if (CanUse())
         {
-            if (CanUse())
-            {
-                Button.SetEnabled();
-            }
-            else
-            {
-                Button.SetDisabled();
-            }
-
-            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?.SetEnabled();
         }
+        else
+        {
+            Button?.SetDisabled();
+        }
+
+        Button?.SetCoolDown(Timer, EffectActive ? EffectDuration : Cooldown);
 
         FixedUpdate(playerControl);
     }
@@ -468,7 +314,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; set; }
+    public T? Target { get; protected set; }
 
     /// <summary>
     /// Gets the distance the player must be from the target object to use the button.
@@ -511,19 +357,4 @@ public abstract class CustomActionButton<T> : CustomActionButton where T : MonoB
 
         return base.CanUse() && Target != null;
     }
-
-    /// <inheritdoc />
-    public override bool CanClick()
-    {
-        return base.CanClick() && Target != null;
-    }
-
-    /// <summary>
-    /// Use this to reset the button's target after used.
-    /// </summary>
-    public virtual void ResetTarget()
-    {
-        Target = null;
-        SetOutline(false);
-    }
 }

MiraAPI/Hud/CustomButtonManager.cs

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

MiraAPI/Hud/CustomPlayerMenu.cs

@@ -1,16 +1,12 @@
 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 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;
 
@@ -19,18 +15,22 @@ 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>
@@ -41,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)(() =>
         {
@@ -64,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;
     }
@@ -74,7 +74,6 @@ 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.");
@@ -85,17 +84,10 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
     /// </summary>
     /// <param name="playerMatch">Function to determine if player should show in the custom menu.</param>
     /// <param name="onClick">Onclick action for player.</param>
-    [HideFromIl2Cpp]
-    public void Begin(Func<PlayerControl, bool> playerMatch, Action<PlayerControl?> onClick)
+    public void Begin(Func<PlayerControl, bool> playerMatch, Action<PlayerControl> onClick)
     {
         MinigameStubs.Begin(this, null);
 
-        var back = backButton.GetComponent<PassiveButton>();
-        back.OnClick.AddListener((UnityAction)(() =>
-        {
-            onClick(null);
-        }));
-
         DestroyableSingleton<DebugAnalytics>.Instance.Analytics.MinigameOpened(PlayerControl.LocalPlayer.Data, TaskType);
         var list = PlayerControl.AllPlayerControls.ToArray().Where(playerMatch).ToList();
         potentialVictims = [];
@@ -107,13 +99,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/RegisterButtonAttribute.cs

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

MiraAPI/MiraAPI.csproj

@@ -10,11 +10,10 @@
     <ItemGroup>
         <None Include="..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
-    
+
     <ItemGroup>
         <EmbeddedResource Include="Resources\**\*.*" />
     </ItemGroup>
-
-    <Import Project="../AmongUs.props" />   
     
+    <Import Project="../AmongUs.props" />
 </Project>

MiraAPI/MiraApiPlugin.cs

@@ -10,30 +10,17 @@ using UnityEngine;
 
 namespace MiraAPI;
 
-/// <summary>
-/// The main plugin class for Mira API.
-/// </summary>
 [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>
+    private static MiraPluginManager? PluginManager { get; set; }
+
+    public Harmony Harmony { get; } = new(Id);
     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);
-
-    /// <inheritdoc />
     public override void Load()
     {
         Harmony.PatchAll();

MiraAPI/ModCompatibility.cs

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

@@ -1,10 +0,0 @@
-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,20 +1,14 @@
-using System;
-using MiraAPI.GameOptions;
-using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Modifiers;
+namespace MiraAPI.Modifiers;
 
 /// <summary>
 /// Base class for all modifiers.
 /// </summary>
-public abstract class BaseModifier : IOptionable
+public abstract class BaseModifier
 {
     /// <summary>
     /// Gets the player that the modifier is attached to.
     /// </summary>
-    public PlayerControl Player { get; internal set; } = null!;
+    public PlayerControl? Player { get; internal set; }
 
     /// <summary>
     /// Gets the modifier component that the modifier is attached to.
@@ -22,27 +16,9 @@ public abstract class BaseModifier : IOptionable
     public ModifierComponent? ModifierComponent { get; internal set; }
 
     /// <summary>
-    /// Gets a value indicating whether the modifier has been initialized.
+    /// Gets the modifier id.
     /// </summary>
-    public bool Initialized { get; internal set; }
-
-    /// <summary>
-    /// Gets the unique ID of the modifier.
-    /// </summary>
-    public Guid UniqueId { get; internal set; } = Guid.Empty;
-
-    /// <summary>
-    /// Gets the type ID of the modifier.
-    /// </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.Modifiers.Exists(y => y.TypeId == TypeId)
-        ) ?? throw new InvalidOperationException("Modifier is not registered.");
+    public uint ModifierId { get; internal set; }
 
     /// <summary>
     /// Gets the modifier name.
@@ -50,30 +26,15 @@ public abstract class BaseModifier : IOptionable
     public abstract string ModifierName { get; }
 
     /// <summary>
-    /// Gets the modifier icon. Useless if HideOnUi is true.
+    /// Gets a value indicating whether the modifier is hidden on the UI.
     /// </summary>
-    public virtual LoadableAsset<Sprite>? ModifierIcon => null;
+    public virtual bool HideOnUi => false;
 
     /// <summary>
-    /// Gets a value indicating whether the modifier is hidden on the UI. Will be hidden either way if no description is provided.
+    /// Gets the HUD information for this modifier. Defaults to the modifier name. Does nothing if <see cref="HideOnUi"/> is true.
     /// </summary>
-    public virtual bool HideOnUi => GetDescription() == string.Empty;
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier is shown in the freeplay menu.
-    /// </summary>
-    public virtual bool ShowInFreeplay => false;
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier is unique. If true, the player can only have one instance of this modifier.
-    /// </summary>
-    public virtual bool Unique => true;
-
-    /// <summary>
-    /// Gets the HUD description for this modifier. Does nothing if <see cref="HideOnUi"/> is true. Required to be visible on UI.
-    /// </summary>
-    /// <returns>The description string for the HUD.</returns>
-    public virtual string GetDescription() => string.Empty;
+    /// <returns>The information string for the HUD.</returns>
+    public virtual string GetHudString() => ModifierName;
 
     /// <summary>
     /// Called when the modifier is activated.
@@ -111,13 +72,6 @@ public abstract class BaseModifier : IOptionable
     {
     }
 
-    /// <summary>
-    /// Called when a meeting starts.
-    /// </summary>
-    public virtual void OnMeetingStart()
-    {
-    }
-
     /// <summary>
     /// Determines whether the player can vent.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -1,15 +1,14 @@
-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 Il2CppInterop.Runtime.Attributes;
 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;
 
@@ -25,14 +24,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// Gets the active modifiers on the player.
     /// </summary>
     [HideFromIl2Cpp]
-    public ImmutableList<BaseModifier> ActiveModifiers { get; private set; } = ImmutableList<BaseModifier>.Empty;
-
-    private ModifierDisplayComponent? ModifierDisplay { get; set; }
+    public ImmutableList<BaseModifier> ActiveModifiers => Modifiers.ToImmutableList();
 
     [HideFromIl2Cpp]
     private List<BaseModifier> Modifiers { get; set; } = [];
 
-    private PlayerControl _player = null!;
+    private PlayerControl? _player;
+
+    private TextMeshPro? _modifierText;
 
     private readonly List<BaseModifier> _toRemove = [];
 
@@ -43,18 +42,9 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _toRemove.AddRange(Modifiers);
     }
 
-    private void Awake()
+    private void Start()
     {
         _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)
@@ -62,26 +52,21 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             return;
         }
 
-        ModifierDisplay = ModifierDisplayComponent.CreateDisplay();
-        ModifierDisplay?.UpdateModifiersList(Modifiers);
+        _modifierText = Helpers.CreateTextLabel("ModifierText", HudManager.Instance.transform, AspectPosition.EdgeAlignments.RightTop, new Vector3(10.1f, 3.5f, 0), textAlignment: TextAlignmentOptions.Right);
+        _modifierText.verticalAlignment = VerticalAlignmentOptions.Top;
     }
 
     private void FixedUpdate()
     {
-        var removed = _toRemove.Count > 0;
-        foreach (var modifier in _toRemove.ToArray())
+        foreach (var modifier in _toRemove)
         {
-            _toRemove.Remove(modifier);
             modifier.OnDeactivate();
             Modifiers.Remove(modifier);
         }
 
-        var added = _toAdd.Count > 0;
-        foreach (var modifier in _toAdd.ToArray())
+        foreach (var modifier in _toAdd)
         {
-            _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
-            modifier.Initialized = true;
             modifier.OnActivate();
 
             if (modifier is TimedModifier { AutoStart: true } timer)
@@ -90,214 +75,97 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
         }
 
-        if (removed || added)
+        if (_toAdd.Count > 0 || _toRemove.Count > 0)
         {
-            if (_player.AmOwner && HudManager.InstanceExists)
+            if (_player?.AmOwner == true)
             {
-                ModifierDisplay?.UpdateModifiersList(Modifiers);
+                HudManager.Instance?.SetHudActive(HudManager.Instance.TaskPanel.isActiveAndEnabled);
             }
-
-            ActiveModifiers = Modifiers.ToImmutableList();
+            _toAdd.Clear();
+            _toRemove.Clear();
         }
 
-        foreach (var modifier in ActiveModifiers)
+        foreach (var modifier in Modifiers)
         {
             modifier.FixedUpdate();
         }
-
-        if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
-        {
-            ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
-        }
     }
 
     private void Update()
     {
-        foreach (var modifier in ActiveModifiers)
+        foreach (var modifier in Modifiers)
         {
             modifier.Update();
         }
-    }
 
-    private void OnDestroy()
-    {
-        // Remove this component from the global list when destroyed
-        ModifierExtensions.ModifierComponents.Remove(_player);
+        if (!_modifierText || _player?.AmOwner == false)
+        {
+            return;
+        }
+
+        var filteredModifiers = Modifiers.Where(mod => !mod.HideOnUi);
+
+        var baseModifiers = filteredModifiers as BaseModifier[] ?? filteredModifiers.ToArray();
+
+        var inMeeting = MeetingHud.Instance != null;
+
+        _modifierText!.gameObject.SetActive(!inMeeting);
+
+        if (baseModifiers.Length != 0)
+        {
+            var stringBuild = new StringBuilder();
+            foreach (var mod in baseModifiers)
+            {
+                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;
+        }
     }
 
     /// <summary>
-    /// Gets a collection of modifiers by type.
-    /// </summary>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    /// <typeparam name="T">The Type of the Modifier.</typeparam>
-    /// <returns>A collection of modifiers.</returns>
-    [HideFromIl2Cpp]
-    public IEnumerable<T> GetModifiers<T>(Func<T, bool>? predicate=null) where T : BaseModifier
-    {
-        return ActiveModifiers.OfType<T>().Where(x => predicate == null || predicate(x));
-    }
-
-    /// <summary>
-    /// Gets a collection of modifiers by type.
+    /// Removes a modifier from the player.
     /// </summary>
     /// <param name="type">The modifier type.</param>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    /// <returns>A collection of modifiers.</returns>
     [HideFromIl2Cpp]
-    public IEnumerable<BaseModifier> GetModifiers(Type type, Func<BaseModifier, bool>? predicate=null)
+    public void RemoveModifier(Type type)
     {
-        return ActiveModifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x)));
-    }
+        var modifier = Modifiers.Find(x => x.GetType() == type);
 
-    /// <summary>
-    /// Gets a collection of modifiers by type ID.
-    /// </summary>
-    /// <param name="id">The modifier's type ID.</param>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    /// <returns>A collection of modifiers.</returns>
-    [HideFromIl2Cpp]
-    public IEnumerable<BaseModifier> GetModifiers(uint id, Func<BaseModifier, bool>? predicate=null)
-    {
-        var type = ModifierManager.GetModifierType(id) ?? throw new InvalidOperationException(
-            $"Cannot get modifier with id {id} because it is not registered.");
+        if (modifier is null)
+        {
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {type.Name} because it is not active.");
+            return;
+        }
 
-        return GetModifiers(type, predicate);
-    }
-
-    /// <summary>
-    /// Tries to get a modifier by its type.
-    /// </summary>
-    /// <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>
-    [HideFromIl2Cpp]
-    public bool TryGetModifier<T>([NotNullWhen(true)] out T? modifier, Func<T, bool>? predicate = null) where T : BaseModifier
-    {
-        modifier = GetModifier(predicate);
-        return modifier != null;
-    }
-
-    /// <summary>
-    /// Tries to get a modifier by its type.
-    /// </summary>
-    /// <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>
-    [HideFromIl2Cpp]
-    public bool TryGetModifier(Type type, [NotNullWhen(true)] out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
-    {
-        modifier = GetModifier(type, predicate);
-        return modifier != null;
-    }
-
-    /// <summary>
-    /// Tries to get a modifier by its type ID.
-    /// </summary>
-    /// <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>
-    [HideFromIl2Cpp]
-    public bool TryGetModifier(uint id, [NotNullWhen(true)] out BaseModifier? modifier, Func<BaseModifier, bool>? predicate = null)
-    {
-        modifier = GetModifier(id, predicate);
-        return modifier != null;
-    }
-
-    /// <summary>
-    /// Tries to get a modifier by its unique ID.
-    /// </summary>
-    /// <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>
-    [HideFromIl2Cpp]
-    public bool TryGetModifier(Guid modifierGuid, [NotNullWhen(true)] out BaseModifier? modifier)
-    {
-        modifier = GetModifier(modifierGuid);
-        return modifier != null;
-    }
-
-    /// <summary>
-    /// Gets a modifier by its type.
-    /// </summary>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    /// <typeparam name="T">The Type of the Modifier.</typeparam>
-    /// <returns>The Modifier if it is found, null otherwise.</returns>
-    [HideFromIl2Cpp]
-    public T? GetModifier<T>(Func<T, bool>? predicate = null) where T : BaseModifier
-    {
-        return GetModifiers(predicate).FirstOrDefault();
-    }
-
-    /// <summary>
-    /// Gets a modifier by its type.
-    /// </summary>
-    /// <param name="type">The modifier type.</param>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    /// <returns>The Modifier if it is found, null otherwise.</returns>
-    [HideFromIl2Cpp]
-    public BaseModifier? GetModifier(Type type, Func<BaseModifier, bool>? predicate = null)
-    {
-        return GetModifiers(type).FirstOrDefault(predicate ?? (_ => true));
-    }
-
-    /// <summary>
-    /// Gets a modifier by its type ID.
-    /// </summary>
-    /// <param name="id">The modifier ID.</param>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    /// <returns>The Modifier if it is found, null otherwise.</returns>
-    [HideFromIl2Cpp]
-    public BaseModifier? GetModifier(uint id, 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 GetModifier(type, predicate);
-    }
-
-    /// <summary>
-    /// Gets a modifier by unique ID.
-    /// </summary>
-    /// <param name="modifierGuid">The modifier's unique ID.</param>
-    /// <returns>The modifier if it is found, or null.</returns>
-    [HideFromIl2Cpp]
-    public BaseModifier? GetModifier(Guid modifierGuid)
-    {
-        return ActiveModifiers.Find(x => x.UniqueId == modifierGuid);
+        RemoveModifier(modifier);
     }
 
     /// <summary>
     /// Removes a modifier from the player.
     /// </summary>
     /// <typeparam name="T">The modifier type.</typeparam>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
     [HideFromIl2Cpp]
-    public void RemoveModifier<T>(Func<T, bool>? predicate = null) where T : BaseModifier
+    public void RemoveModifier<T>() where T : BaseModifier
     {
-        RemoveModifier(typeof(T), x => predicate == null || predicate((T)x));
+        RemoveModifier(typeof(T));
     }
 
     /// <summary>
     /// Removes a modifier from the player.
     /// </summary>
-    /// <param name="type">The modifier type.</param>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
+    /// <param name="modifierId">The modifier ID.</param>
     [HideFromIl2Cpp]
-    public void RemoveModifier(Type type, Func<BaseModifier, bool>? predicate = null)
+    public void RemoveModifier(uint modifierId)
     {
-        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.");
-        }
+        var modifier = Modifiers.Find(x => x.ModifierId == modifierId);
 
-        var modifier = modifiers.FirstOrDefault();
         if (modifier is null)
         {
-            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {type.Name} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier with id {modifierId} because it is not active.");
             return;
         }
 
@@ -311,7 +179,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public void RemoveModifier(BaseModifier modifier)
     {
-        if (!ActiveModifiers.Contains(modifier))
+        if (!Modifiers.Contains(modifier))
         {
             Logger<MiraApiPlugin>.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
             return;
@@ -320,48 +188,6 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _toRemove.Add(modifier);
     }
 
-    /// <summary>
-    /// Removes a modifier from the player.
-    /// </summary>
-    /// <param name="typeId">The modifier's type ID.</param>
-    /// <param name="predicate">The predicate to check the modifier by.</param>
-    [HideFromIl2Cpp]
-    public void RemoveModifier(uint typeId, Func<BaseModifier, bool>? predicate = null)
-    {
-        var type = ModifierManager.GetModifierType(typeId) ?? throw new InvalidOperationException(
-            $"Cannot remove modifier with id {typeId} because it is not registered.");
-        RemoveModifier(type, predicate);
-    }
-
-    /// <summary>
-    /// Removes a modifier from the player.
-    /// </summary>
-    /// <param name="uniqueId">The modifier's unique ID.</param>
-    [HideFromIl2Cpp]
-    public void RemoveModifier(Guid uniqueId)
-    {
-        var modifier = GetModifier(uniqueId);
-        if (modifier == null)
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
-            return;
-        }
-
-        RemoveModifier(modifier);
-    }
-
-    /// <summary>
-    /// Adds a modifier to the player.
-    /// </summary>
-    /// <param name="args">The arguments to initialize the modifier constructor with.</param>
-    /// <typeparam name="T">The Type of the modifier.</typeparam>
-    /// <returns>The new modifier.</returns>
-    [HideFromIl2Cpp]
-    public T? AddModifier<T>(params object[] args) where T : BaseModifier
-    {
-        return AddModifier(typeof(T), args) as T;
-    }
-
     /// <summary>
     /// Adds a modifier to the player.
     /// </summary>
@@ -370,32 +196,24 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public BaseModifier? AddModifier(BaseModifier modifier)
     {
-        // TODO: Make a proper synchronization system.
-        if (LobbyBehaviour.Instance)
+        if (Modifiers.Contains(modifier))
         {
-            Logger<MiraApiPlugin>.Warning($"Modifiers added in the lobby won't sync to new players!");
-        }
-
-        var id = modifier.TypeId;
-        if (modifier.Unique && ActiveModifiers.Find(x => x.TypeId == id) != null)
-        {
-            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {id}!");
+            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {modifier.ModifierId}!");
             return null;
         }
 
-        if (ActiveModifiers.Contains(modifier))
+        var modifierId = ModifierManager.GetModifierId(modifier.GetType());
+
+        if (modifierId == null)
         {
-            Logger<MiraApiPlugin>.Error($"Player already has this modifier!");
+            Logger<MiraApiPlugin>.Error($"Cannot add modifier {modifier.GetType().Name} because it has no ID!");
             return null;
         }
 
         _toAdd.Add(modifier);
         modifier.Player = _player;
         modifier.ModifierComponent = this;
-        if (modifier.UniqueId == Guid.Empty)
-        {
-            modifier.UniqueId = Guid.NewGuid();
-        }
+        modifier.ModifierId = modifierId.Value;
         return modifier;
     }
 
@@ -403,147 +221,42 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// Adds a modifier to the player.
     /// </summary>
     /// <param name="type">The modifier type.</param>
-    /// <param name="args">The arguments to initialize the modifier constructor with.</param>
     /// <returns>The modifier that was added.</returns>
     [HideFromIl2Cpp]
-    public BaseModifier? AddModifier(Type type, params object[] args)
+    public BaseModifier? AddModifier(Type type)
     {
-        BaseModifier? modifier;
-        if (args.Length > 0)
+        var modifierId = ModifierManager.GetModifierId(type);
+        if (modifierId == null)
         {
-            modifier = ModifierFactory.CreateInstance(type, args);
-        }
-        else
-        {
-            modifier = Activator.CreateInstance(type) as BaseModifier;
-            if (modifier == null)
-            {
-                throw new InvalidOperationException($"Cannot add modifier {type.Name} because it is not a valid modifier.");
-            }
+            Logger<MiraApiPlugin>.Error($"Cannot add modifier {type.Name} because it is not registered.");
+            return null;
         }
 
-        return AddModifier(modifier);
+        if (Modifiers.Find(x => x.ModifierId == modifierId) != null)
+        {
+            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {modifierId}!");
+            return null;
+        }
+
+        if (Activator.CreateInstance(type) is not BaseModifier modifier)
+        {
+            Logger<MiraApiPlugin>.Error($"Cannot add modifier {type.Name} because it is null.");
+            return null;
+        }
+
+        AddModifier(modifier);
+
+        return modifier;
     }
 
     /// <summary>
     /// Adds a modifier to the player.
     /// </summary>
-    /// <param name="id">The ID of the modifier.</param>
-    /// <param name="args">The arguments to initialize the modifier constructor with.</param>
-    /// <returns>The modifier if it was created, or null if it failed.</returns>
+    /// <typeparam name="T">The Type of the modifier.</typeparam>
+    /// <returns>The new modifier.</returns>
     [HideFromIl2Cpp]
-    public BaseModifier? AddModifier(uint id, params object[] args)
+    public T? AddModifier<T>() where T : BaseModifier
     {
-        var type = ModifierManager.GetModifierType(id) ?? throw new InvalidOperationException(
-            $"Cannot add modifier with id {id} because it is not registered.");
-
-        return AddModifier(type, args);
-    }
-
-    /// <summary>
-    /// Checks if a player has an active modifier by its type.
-    /// </summary>
-    /// <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>(Func<T, bool>? predicate=null) where T : BaseModifier
-    {
-        return ActiveModifiers.Exists(x => x 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="predicate">The predicate to check the modifier.</param>
-    /// <returns>True if the Modifier is present, false otherwise.</returns>
-    [HideFromIl2Cpp]
-    public bool HasModifier(Type type, Func<BaseModifier, bool>? predicate=null)
-    {
-        return ActiveModifiers.Exists(x => x.GetType() == type && (predicate == null || predicate(x)));
-    }
-
-    /// <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="predicate">The predicate to check the modifier.</param>
-    /// <returns>True if the modifier is present, false otherwise.</returns>
-    [HideFromIl2Cpp]
-    public bool HasModifier(uint id, 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, predicate);
-    }
-
-    /// <summary>
-    /// Checks if a player has an active modifier by its unique ID.
-    /// </summary>
-    /// <param name="id">The modifier's guid.</param>
-    /// <returns>True if the modifier is present, false otherwise.</returns>
-    [HideFromIl2Cpp]
-    public bool HasModifier(Guid 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;
+        return AddModifier(typeof(T)) as T;
     }
 }

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -1,121 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-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 GameObject _children = null!;
-    private GameObject _modTemplate = null!;
-    private PassiveButton _toggleButton = null!;
-    private TextMeshPro _toggleBtnText = null!;
-
-    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).gameObject;
-        _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>();
-        _toggleBtnText.font = HudManager.Instance.TaskPanel.taskText.font;
-        _toggleBtnText.fontMaterial = HudManager.Instance.TaskPanel.taskText.fontMaterial;
-
-        IsOpen = false;
-        _children.gameObject.SetActive(false);
-    }
-
-    [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;
-        newMod.gameObject.SetActive(true);
-        return comp;
-    }
-
-    [HideFromIl2Cpp]
-    internal void UpdateModifiersList(List<BaseModifier> modifiers)
-    {
-        var filteredModifiers = modifiers.Where(x => !x.HideOnUi && x.GetDescription() != string.Empty).ToList();
-
-        foreach (var mod in _modifiers.ToArray())
-        {
-            if (filteredModifiers.Contains(mod.Key))
-            {
-                filteredModifiers.Remove(mod.Key);
-                continue;
-            }
-
-            mod.Value.gameObject.Destroy();
-            _modifiers.Remove(mod.Key);
-        }
-
-        _toggleBtnText.text = $"Modifiers ({modifiers.Count})";
-
-        if (modifiers.Count == 0)
-        {
-            _toggleButton.gameObject.SetActive(false);
-            return;
-        }
-
-        _toggleButton.gameObject.SetActive(true);
-
-        foreach (var mod in filteredModifiers)
-        {
-            _modifiers.Add(mod, CreateForModifier(mod));
-        }
-    }
-}