fix crashing after meetings

.editorconfig

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

.gitignore

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

AmongUs.props

@@ -1,13 +1,13 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="Reactor" Version="2.5.0-ci.371" />
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.3.31" PrivateAssets="all" />
+        <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.Android" Version="2025.3.28" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
     </ItemGroup>
-    
+
     <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
         <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" UseSymboliclinksIfPossible="true" />
     </Target>

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.4.0</VersionPrefix>
+        <VersionPrefix>0.2.0</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>
@@ -42,4 +42,4 @@
     <PropertyGroup>
         <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\stylecop.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
-</Project>
+</Project>

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -3,7 +3,6 @@ using MiraAPI.Example.Options.Roles;
 using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
@@ -16,10 +15,10 @@ public class FreezeButton : CustomActionButton<PlayerControl>
     public override string Name => "Freeze";
 
     public override float Cooldown => OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeDuration;
-    public override bool PauseTimerInVent => true;
+
+    public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override MiraKeybind? Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
     protected override void OnClick()
     {

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -1,6 +1,5 @@
 using MiraAPI.Example.Modifiers;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
@@ -16,7 +15,6 @@ public class MeetingButton : CustomActionButton
     public override int MaxUses => 3;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override MiraKeybind? Keybind => MiraGlobalKeybinds.ModifierPrimaryAbility;
 
     public override bool Enabled(RoleBehaviour? role)
     {

MiraAPI.Example/Buttons/NeutralKillerButton.cs

@@ -2,7 +2,6 @@
 using MiraAPI.Example.Roles;
 using MiraAPI.GameEnd;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
 
@@ -13,8 +12,6 @@ public class NeutralKillerButton : CustomActionButton
     public override string Name => "Win Game";
     public override float Cooldown => 0f;
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override MiraKeybind Keybind => ExampleKeybinds.NeutralWinKeybind;
-
     protected override void OnClick()
     {
         CustomGameOver.Trigger<NeutralKillerGameOver>([PlayerControl.LocalPlayer.Data]);

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -3,7 +3,6 @@ using MiraAPI.Example.Options.Roles;
 using MiraAPI.Example.Roles;
 using MiraAPI.GameOptions;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
 using UnityEngine;
@@ -22,7 +21,6 @@ public class TeleportButton : CustomActionButton
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
     public override Color TextOutlineColor => new Color32(221, 176, 152, 255);
     public static bool IsZoom { get; private set; }
-    public override MiraKeybind? Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
     public override bool Enabled(RoleBehaviour? role)
     {

MiraAPI.Example/Buttons/ThinkButton.cs

@@ -1,35 +0,0 @@
-using MiraAPI.Hud;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Example.Buttons;
-
-public class ThinkButton : CustomActionButton
-{
-    public override string Name => "Think";
-    public override float Cooldown => 15f;
-    public override float EffectDuration => 10f;
-    public override int MaxUses => 1;
-    public override ButtonUsesMode UsesMode => ButtonUsesMode.PerRound;
-    public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    protected override void OnClick()
-    {
-        // This button does absolutely nothing besides changing its text
-        Button!.OverrideText("Thinking...");
-    }
-
-    public override void OnEffectEnd()
-    {
-        Button!.OverrideText("Think");
-    }
-
-    public override bool IsEffectCancellable()
-    {
-        return true;
-    }
-
-    public override bool Enabled(RoleBehaviour? role)
-    {
-        return role != null && role.IsImpostor;
-    }
-}

MiraAPI.Example/ExampleAssets.cs

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

MiraAPI.Example/ExampleColors.cs

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

MiraAPI.Example/ExampleEventHandlers.cs

@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Linq;
+using System.Linq;
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
 using MiraAPI.Events.Vanilla.Gameplay;
@@ -18,8 +17,8 @@ public static class ExampleEventHandlers
 {
     public static void Initialize()
     {
-        // You can register event handlers with the MiraEventManager class
-        var handle = MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
+        // You can register event handlers with the MiraEventManager class.
+        MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
         {
             Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
         });
@@ -33,24 +32,6 @@ public static class ExampleEventHandlers
         {
             Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
         });
-
-        // You can also unregister event handlers using the handle returned from RegisterEventHandler.
-        MiraEventManager.UnregisterEventHandler(handle);
-    }
-
-    // If you want to check vanilla buttons, use something like this!
-    [RegisterEvent]
-    public static void VanillaButtonClickHandler(VanillaButtonClickEvent @event)
-    {
-        Logger<ExamplePlugin>.Info($"{@event.Button.buttonLabelText.text} is being used!");
-        if (@event.PlayerTarget != null)
-        {
-            Logger<ExamplePlugin>.Info($"{@event.PlayerTarget.Data.PlayerName} is being targeted!");
-        }
-        else if (@event.VentTarget != null)
-        {
-            Logger<ExamplePlugin>.Info($"Vent with id {@event.VentTarget.Id.ToString(CultureInfo.InvariantCulture)} is being targeted!");
-        }
     }
 
     // If you want to add extra votes to a player, do something like this.

MiraAPI.Example/ExampleKeybinds.cs

@@ -1,10 +0,0 @@
-using MiraAPI.Keybinds;
-using Rewired;
-
-namespace MiraAPI.Example;
-
-[RegisterCustomKeybinds]
-public static class ExampleKeybinds
-{
-    public static MiraKeybind NeutralWinKeybind { get; } = new("Neutral Win", KeyboardKeyCode.C, [ModifierKey.Shift]);
-}

MiraAPI.Example/ExampleLocalSetings.cs

@@ -1,53 +0,0 @@
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings;
-using MiraAPI.LocalSettings.Attributes;
-using MiraAPI.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Example;
-
-public class ExampleLocalSettings(ConfigFile config) : LocalSettingsTab(config)
-{
-    public override string TabName => "Mira Example";
-    protected override bool ShouldCreateLabels => false;
-
-    public override LocalSettingTabAppearance TabAppearance => new()
-    {
-        ToggleActiveColor = Color.blue,
-        ToggleInactiveColor = Color.red,
-    };
-
-    [LocalSettingsButton]
-    public LocalSettingsButton ExampleButton { get; private set; } = new("Example Button", OnExampleButtonClick);
-
-    [LocalToggleSetting]
-    public ConfigEntry<bool> ExampleToggle { get; private set; } = config.Bind("General", "Example Bool", true);
-
-    [LocalToggleSetting]
-    public ConfigEntry<bool> ExampleToggle2 { get; private set; } = config.Bind("General", "Example Bool 2", false);
-
-    [LocalSliderSetting(suffixType: MiraNumberSuffixes.Percent, formatString: "0", roundValue: true)]
-    public ConfigEntry<float> ExampleSlider { get; private set; } = config.Bind("General", "Slider", 50f);
-
-    [LocalNumberSetting]
-    public ConfigEntry<float> ExampleNumber { get; private set; } = config.Bind("General", "Example Number", 4f);
-
-    [LocalNumberSetting(min: 0.1f, max: 2.5f, increment: 0.1f, formatString: "0.0", suffixType: MiraNumberSuffixes.Multiplier)]
-    public ConfigEntry<float> ExampleFloatNumber { get; private set; } = config.Bind("General", "Example Multplier", 1f);
-
-    [LocalEnumSetting]
-    public ConfigEntry<ExampleEnumSetting> ExampleEnum { get; private set; } = config.Bind("General", "Example Enum", ExampleEnumSetting.Fries);
-
-    private static void OnExampleButtonClick()
-    {
-        LocalSettingsTabSingleton<MiraApiSettings>.Instance.Open();
-    }
-}
-
-public enum ExampleEnumSetting
-{
-    Cheeseburger,
-    Sandwich,
-    Fries,
-    ChickenNuggets,
-}

MiraAPI.Example/ExamplePlugin.cs

@@ -1,5 +1,4 @@
-using System.Linq;
-using BepInEx;
+using BepInEx;
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;

MiraAPI.Example/MiraAPI.Example.csproj

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

MiraAPI.Example/Modifiers/CaptainModifier.cs

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

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

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

MiraAPI.Example/Options/ExampleOptions2.cs

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

MiraAPI.Example/Roles/ChameleonRole.cs

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

MiraAPI.Example/Roles/NeutralKillerRole.cs

@@ -1,5 +1,4 @@
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Example.GameOver;
+using MiraAPI.Example.GameOver;
 using MiraAPI.GameEnd;
 using MiraAPI.Roles;
 using UnityEngine;
@@ -23,7 +22,6 @@ public class NeutralKillerRole : ImpostorRole, ICustomRole
 
     public RoleOptionsGroup RoleOptionsGroup { get; } = new("Outcast", Color.gray);
 
-    [HideFromIl2Cpp]
     public TeamIntroConfiguration? IntroConfiguration { get; } = new(
         Color.gray,
         "OUTCAST",

MiraAPI/Colors/CustomColor.cs

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

MiraAPI/Events/MiraEventHandle.cs

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

MiraAPI/Events/MiraEventManager.cs

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

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -15,21 +15,14 @@ public class AfterMurderEvent : MiraEvent
     /// </summary>
     public PlayerControl Target { get; }
 
-    /// <summary>
-    /// Gets the player's body, if it exists.
-    /// </summary>
-    public DeadBody? DeadBody { get; }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
     /// </summary>
     /// <param name="source">The killer.</param>
     /// <param name="target">The killed player.</param>
-    /// <param name="deadBody">The player's vody, if it exists.</param>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody)
+    public AfterMurderEvent(PlayerControl source, PlayerControl target)
     {
         Source = source;
         Target = target;
-        DeadBody = deadBody;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/BeforeGameEndEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

@@ -1,6 +1,4 @@
-using MiraAPI.Networking;
-
-namespace MiraAPI.Events.Vanilla.Gameplay;
+namespace MiraAPI.Events.Vanilla.Gameplay;
 
 /// <summary>
 /// Event that is invoked before a player is murdered. This event is cancelable.
@@ -17,24 +15,6 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     /// </summary>
     public PlayerControl Target { get; }
 
-    /// <summary>
-    /// Gets whether the murder was meant to be done in a meeting via an enum.
-    /// </summary>
-    public MeetingCheck InMeeting { 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>
-    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
-    public BeforeMurderEvent(PlayerControl source, PlayerControl target, MeetingCheck inMeeting)
-    {
-        Source = source;
-        Target = target;
-        InMeeting = inMeeting;
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
     /// </summary>
@@ -44,6 +24,5 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     {
         Source = source;
         Target = target;
-        InMeeting = MeetingCheck.Ignore;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/BeforeRoundStartEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/IntroRoleRevealEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/RoundStartEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/VanillaButtonCancelledEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/VanillaButtonClickEvent.cs

@@ -1,65 +0,0 @@
-using MiraAPI.Hud;
-
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Button click event for Vanilla Buttons only. Do not use for custom buttons.
-/// </summary>
-/// <typeparam name="T">The Vanilla Button type.</typeparam>
-public sealed class VanillaButtonClickEvent<T> : MiraCancelableEvent where T : AbilityButton
-{
-    /// <summary>
-    /// Gets Vanilla 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 VanillaButtonClickEvent GenericClickEvent { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaButtonClickEvent{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 VanillaButtonClickEvent(T button, VanillaButtonClickEvent genericClickEvent)
-    {
-        GenericClickEvent = genericClickEvent;
-        Button = button;
-    }
-}
-
-/// <summary>
-/// Button click event for Vanilla Buttons only. Do not use for custom buttons.
-/// </summary>
-public sealed class VanillaButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets Vanilla Button that was clicked.
-    /// </summary>
-    public AbilityButton Button { get; }
-
-    /// <summary>
-    /// Gets the target player, if any, of the Vanilla Button that was clicked.
-    /// </summary>
-    public PlayerControl? PlayerTarget { get; }
-
-    /// <summary>
-    /// Gets the target vent, if any, of the Vanilla Button that was clicked.
-    /// </summary>
-    public Vent? VentTarget { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The Vanilla Button that was clicked.</param>
-    /// <param name="playerTarget">The Player target, if any.</param>
-    /// <param name="ventTarget">The Vent target, if any.</param>
-    public VanillaButtonClickEvent(AbilityButton button, PlayerControl? playerTarget = null, Vent? ventTarget = null)
-    {
-        Button = button;
-        PlayerTarget = playerTarget;
-        VentTarget = ventTarget;
-    }
-}

MiraAPI/Events/Vanilla/Map/UpdateSystemEvent.cs

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

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

@@ -1,30 +0,0 @@
-using MiraAPI.Voting;
-
-namespace MiraAPI.Events.Vanilla.Meeting.Voting;
-
-/// <summary>
-/// Event that is invoked after the local player successfully votes a player or skips. This event is not cancelable.
-/// </summary>
-public class AfterVoteEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the instance of the voter's vote data.
-    /// </summary>
-    public PlayerVoteArea VoteArea { get; }
-
-    /// <summary>
-    /// Gets the player who voted.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AfterVoteEvent"/> class.
-    /// </summary>
-    /// <param name="playerVoteArea">The player vote area that was voted on.</param>
-    /// <param name="voter">The player who voted.</param>
-    public AfterVoteEvent(PlayerVoteArea playerVoteArea, PlayerControl voter)
-    {
-        VoteArea = playerVoteArea;
-        Player = voter;
-    }
-}

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

@@ -1,30 +0,0 @@
-using MiraAPI.Voting;
-
-namespace MiraAPI.Events.Vanilla.Meeting.Voting;
-
-/// <summary>
-/// Event that is invoked before the local player confirms a vote on a player or when skipping. This event is cancelable.
-/// </summary>
-public class BeforeVoteEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the instance of the voter's vote data.
-    /// </summary>
-    public PlayerVoteArea VoteArea { get; }
-
-    /// <summary>
-    /// Gets the player who voted.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BeforeVoteEvent"/> class.
-    /// </summary>
-    /// <param name="playerVoteArea">The player vote area that was voted on.</param>
-    /// <param name="voter">The player who voted.</param>
-    public BeforeVoteEvent(PlayerVoteArea playerVoteArea, PlayerControl voter)
-    {
-        VoteArea = playerVoteArea;
-        Player = voter;
-    }
-}

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

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

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

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

MiraAPI/Events/Vanilla/Player/CompleteHnsTaskEvent.cs

@@ -1,35 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Player;
-
-/// <summary>
-/// The event that is invoked when a player completes a task within Hide and Seek. Non-cancelable.
-/// </summary>
-public class CompleteHnsTaskEvent : 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>
-    /// Gets the instance of the <see cref="HnsManager"/> attached to the game.
-    /// </summary>
-    public HideAndSeekManager HnsManager { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CompleteHnsTaskEvent"/> class.
-    /// </summary>
-    /// <param name="hnsManager">The Hide and Seek Manager currently active.</param>
-    /// <param name="player">The player who completed the task.</param>
-    /// <param name="task">The task that the player completed.</param>
-    public CompleteHnsTaskEvent(HideAndSeekManager hnsManager, PlayerControl player, PlayerTask task)
-    {
-        HnsManager = hnsManager;
-        Player = player;
-        Task = task;
-    }
-}

MiraAPI/Events/Vanilla/Player/PlayerDeathEvent.cs

@@ -15,21 +15,14 @@ public class PlayerDeathEvent : MiraEvent
     /// </summary>
     public DeathReason DeathReason { get; }
 
-    /// <summary>
-    /// Gets the dead body associated with the player, if any.
-    /// </summary>
-    public DeadBody? DeadBody { get; }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="PlayerDeathEvent"/> class.
     /// </summary>
     /// <param name="player">The player who died.</param>
     /// <param name="reason">The reason the player died.</param>
-    /// <param name="deadBody">The player's body, if it exists.</param>
-    public PlayerDeathEvent(PlayerControl player, DeathReason reason, DeadBody? deadBody)
+    public PlayerDeathEvent(PlayerControl player, DeathReason reason)
     {
         Player = player;
         DeathReason = reason;
-        DeadBody = deadBody;
     }
 }

MiraAPI/GameEnd/GameOverManager.cs

@@ -30,13 +30,13 @@ public static class GameOverManager
 
         if (gameOverType.IsAbstract)
         {
-            Error("The type must not be abstract.");
+            Logger<MiraApiPlugin>.Error("The type must not be abstract.");
             return false;
         }
 
         if (gameOverType.GetConstructor(Type.EmptyTypes) == null)
         {
-            Error("The type must have a parameterless constructor.");
+            Logger<MiraApiPlugin>.Error("The type must have a parameterless constructor.");
             return false;
         }
 

MiraAPI/GameModes/.editorconfig

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

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -21,7 +21,7 @@ public static class CustomGameModeManager
     }
 
     /// <summary>
-    /// Gets the current gamemode.
+    /// Current gamemode.
     /// </summary>
     public static CustomGameMode? ActiveMode { get; internal set; } = new DefaultMode();
 
@@ -37,7 +37,7 @@ public static class CustomGameModeManager
             return;
         }
 
-        Error($"No gamemode with id {id} found!");
+        Logger<MiraApiPlugin>.Error($"No gamemode with id {id} found!");
     }
 
     /// <summary>
@@ -48,7 +48,7 @@ public static class CustomGameModeManager
     {
         if (!typeof(CustomGameMode).IsAssignableFrom(gameModeType))
         {
-            Warning($"{gameModeType.Name} does not inherit CustomGameMode!");
+            Logger<MiraApiPlugin>.Warning($"{gameModeType.Name} does not inherit CustomGameMode!");
             return;
         }
 
@@ -56,13 +56,13 @@ public static class CustomGameModeManager
 
         if (modeObj is not CustomGameMode gameMode)
         {
-            Error($"Failed to create instance of {gameModeType.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to create instance of {gameModeType.Name}");
             return;
         }
 
         if (GameModes.Any(x => x.Key == gameMode.Id))
         {
-            Error($"ID for gamemode {gameMode.Name} already exists!");
+            Logger<MiraApiPlugin>.Error($"ID for gamemode {gameMode.Name} already exists!");
             return;
         }
 

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using MiraAPI.Modifiers;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions;
@@ -13,11 +11,6 @@ public abstract class AbstractOptionGroup
 {
     internal List<IModdedOption> Options { get; } = [];
 
-    /// <summary>
-    /// Gets a list of the options which are a part of this group.
-    /// </summary>
-    public ReadOnlyCollection<IModdedOption> Children => new(Options);
-
     /// <summary>
     /// Gets the name of the group. Visible in options menu.
     /// </summary>
@@ -29,16 +22,11 @@ public abstract class AbstractOptionGroup
     public virtual Type? OptionableType => null;
 
     /// <summary>
-    /// Gets a value indicating whether the group should be shown in the modifiers menu. This is deprecated, please use ParentMenu!
+    /// 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 a value indicating which menu the group is in.
-    /// </summary>
-    public virtual MenuCategory ParentMenu => MenuCategory.Roles;
-
     /// <summary>
     /// Gets the function that determines whether the group should be visible or not.
     /// </summary>
@@ -68,33 +56,4 @@ public abstract class AbstractOptionGroup<T> : AbstractOptionGroup where T : IOp
 {
     /// <inheritdoc />
     public override Type OptionableType => typeof(T);
-
-    /// <summary>
-    /// Gets a value indicating which menu the group is in.
-    /// </summary>
-    public override MenuCategory ParentMenu
-    {
-        get
-        {
-            var type = typeof(T);
-            if (type == typeof(BaseModifier))
-            {
-                return MenuCategory.Modifiers;
-            }
-            else if (type == typeof(RoleBehaviour))
-            {
-                return MenuCategory.Roles;
-            }
-            return MenuCategory.Game;
-        }
-    }
-}
-
-public enum MenuCategory
-{
-    Game,
-    Roles,
-    Modifiers,
-    CustomOne,
-    CustomTwo
 }

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -21,15 +21,7 @@ public class ModdedNumberOptionAttribute(
 {
     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, formatString, zeroInfinity);
     }
 
     /// <inheritdoc />

MiraAPI/GameOptions/IModdedOption.cs

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

MiraAPI/GameOptions/MiraNumberOptionComponent.cs

@@ -1,40 +0,0 @@
-using System;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.GameOptions.OptionTypes;
-using Reactor.Utilities.Attributes;
-using UnityEngine;
-
-namespace MiraAPI.GameOptions;
-
-/// <summary>
-/// Component added onto options generated via MiraAPI. This allows developers to hook patches onto options in general, without using a list.
-/// </summary>
-[RegisterInIl2Cpp]
-public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
-{
-    /// <summary>
-    /// Gets or sets the modded option associated with the object.
-    /// </summary>
-    [HideFromIl2Cpp]
-    public ModdedNumberOption NumberOption { get; set; }
-
-    /// <summary>
-    /// Gets or sets the default increment.
-    /// </summary>
-    public float DefaultIncrement { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether holding shift will split the increment in half.
-    /// </summary>
-    public bool ShiftIncrementToggle { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating what Zero displays.
-    /// </summary>
-    public string ZeroValue { get; set; } = "#";
-
-    /// <summary>
-    /// Gets or sets a value indicating what Negative One displays.
-    /// </summary>
-    public string NegativeValue { get; set; } = "#";
-}

MiraAPI/GameOptions/ModdedOptionsManager.cs

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

MiraAPI/GameOptions/ModifierOptionGroup.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -32,82 +32,10 @@ public class ModdedNumberOption : ModdedOption<float>
     /// </summary>
     public MiraNumberSuffixes SuffixType { get; }
 
-    /// <summary>
-    /// Gets a value indicating what zero appears as.
-    /// </summary>
-    public string ZeroWordValue { get; }
-
-    /// <summary>
-    /// Gets a value indicating what a negative one appears as.
-    /// </summary>
-    public string NegativeWordValue { get; }
-
     /// <summary>
     /// Gets a value indicating whether zero is infinity.
     /// </summary>
-    public bool ZeroInfinity => ZeroWordValue == "∞";
-
-    /// <summary>
-    /// Gets a value indicating whether holding shift will divide the increment.
-    /// </summary>
-    public bool ShiftIncrement { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="defaultValue">The default value as a float.</param>
-    /// <param name="min">The minimum value.</param>
-    /// <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="zeroBehavior">Determines what is shown for zero. Options: ∞, #, or a word value (such as Off).</param>
-    /// <param name="negativeBehavior">Determines what is shown for negative 1. Options: ∞, #, or a word value (such as Off).</param>
-    /// <param name="halfIncrements">Whether increments can be split in half.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
-    public ModdedNumberOption(
-        string title,
-        float defaultValue,
-        float min,
-        float max,
-        float increment,
-        string zeroBehavior,
-        string negativeBehavior,
-        MiraNumberSuffixes suffixType,
-        string? formatString = null,
-        bool halfIncrements = false,
-        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
-    {
-        Min = min;
-        Max = max;
-        Increment = increment;
-        SuffixType = suffixType;
-        ZeroWordValue = zeroBehavior;
-        NegativeWordValue = negativeBehavior;
-        ShiftIncrement = halfIncrements;
-
-        Value = Mathf.Clamp(defaultValue, min, max);
-
-        Data = ScriptableObject.CreateInstance<FloatGameSetting>();
-
-        var data = (FloatGameSetting)Data;
-        data.Type = global::OptionTypes.Float;
-        data.Title = StringName;
-        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.ZeroIsInfinity = ZeroInfinity;
-        data.SuffixType = (NumberSuffixes)SuffixType;
-        data.OptionName = FloatOptionNames.Invalid;
-    }
+    public bool ZeroInfinity { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
@@ -120,7 +48,6 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="suffixType">The suffix type.</param>
     /// <param name="formatString">Optional format string for the option screen.</param>
     /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -129,16 +56,13 @@ public class ModdedNumberOption : ModdedOption<float>
         float increment,
         MiraNumberSuffixes suffixType,
         string? formatString = null,
-        bool zeroInfinity = false,
-        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
+        bool zeroInfinity = false) : base(title, defaultValue)
     {
         Min = min;
         Max = max;
         Increment = increment;
         SuffixType = suffixType;
-        ZeroWordValue = zeroInfinity ? "∞" : "#";
-        NegativeWordValue = "#";
-        ShiftIncrement = increment != 1f;
+        ZeroInfinity = zeroInfinity;
 
         Value = Mathf.Clamp(defaultValue, min, max);
 
@@ -167,18 +91,9 @@ public class ModdedNumberOption : ModdedOption<float>
         ToggleOption toggleOpt,
         NumberOption numberOpt,
         StringOption stringOpt,
-        PlayerOption playerOpt,
         Transform container)
     {
         var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);
-        numberOption.name =
-            $"{ParentMod!.OptionsTitleText}.NumberOption.{TranslationController.Instance.GetString(StringName)}";
-        var optionComponent = numberOption.gameObject.AddComponent<MiraNumberOptionComponent>();
-        optionComponent.NumberOption = this;
-        optionComponent.DefaultIncrement = Increment;
-        optionComponent.ShiftIncrementToggle = ShiftIncrement;
-        optionComponent.NegativeValue = NegativeWordValue;
-        optionComponent.ZeroValue = ZeroWordValue;
 
         numberOption.SetUpFromData(Data, 20);
         numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

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

MiraAPI/Hud/ButtonUsesMode.cs

@@ -1,17 +0,0 @@
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// The uses mode for custom buttons.
-/// </summary>
-public enum ButtonUsesMode
-{
-    /// <summary>
-    /// Uses per game.
-    /// </summary>
-    PerGame,
-
-    /// <summary>
-    /// Uses per round.
-    /// </summary>
-    PerRound,
-}

MiraAPI/Hud/CustomActionButton.cs

@@ -2,14 +2,8 @@
 using System.Globalization;
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
-using MiraAPI.Keybinds;
-using MiraAPI.LocalSettings;
 using MiraAPI.Patches;
-using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
-using Rewired;
-using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -37,51 +31,20 @@ public abstract class CustomActionButton
     /// </summary>
     public abstract float Cooldown { get; }
 
-    /// <summary>
-    /// Gets a value indicating whether the timer should stop decreasing when the player is venting.
-    /// Note that both cooldown decrease and effect timer decrease is disabled.
-    /// </summary>
-    public virtual bool PauseTimerInVent => false;
-
     /// <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 format string for the cooldown timer.
-    /// </summary>
-    public virtual string CooldownTimerFormatString => "0";
-
-    /// <summary>
-    /// Gets a value indicating whether the button has an effect ability. By default true if <see cref="EffectDuration"/> is greater than 0.
-    /// </summary>
-    public virtual bool HasEffect => EffectDuration > 0;
-
-    /// <summary>
-    /// Gets the button's effect duration in seconds. If 0, the effect needs to be ended manually.
+    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
     /// </summary>
     public virtual float EffectDuration => 0;
 
     /// <summary>
-    /// Gets a value indicating whether the button has limited uses.
+    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
     /// </summary>
-    public bool LimitedUses => ZeroIsInfinite ? MaxUses > 0 : MaxUses >= 0;
-
-    /// <summary>
-    /// Gets the maximum number of uses the button has. If the button has infinite uses, set to 0 or -1 based on what value that ZeroIsInfinite is set to.
-    /// </summary>
-    public virtual int MaxUses => ZeroIsInfinite ? 0 : -1;
-
-    /// <summary>
-    /// Gets the value indicating uses mode.
-    /// </summary>
-    public virtual ButtonUsesMode UsesMode => ButtonUsesMode.PerGame;
-
-    /// <summary>
-    /// Gets the keybind for this button. If null, no keybind will be added.
-    /// </summary>
-    public virtual BaseKeybind? Keybind => null;
+    public virtual int MaxUses => 0;
 
     /// <summary>
     /// Gets the button's text outline color.
@@ -94,9 +57,14 @@ public abstract class CustomActionButton
     public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
 
     /// <summary>
-    /// Gets or sets a value indicating whether limited uses are determined via zero or a negative number of uses.
+    /// Gets a value indicating whether the button has an effect ability.
     /// </summary>
-    public virtual bool ZeroIsInfinite { get; set; } = true;
+    public bool HasEffect => EffectDuration > 0;
+
+    /// <summary>
+    /// Gets a value indicating whether the button has limited uses.
+    /// </summary>
+    public bool LimitedUses => MaxUses > 0;
 
     /// <summary>
     /// Gets or sets a value indicating whether the effect is currently active, if there is one.
@@ -123,16 +91,6 @@ public abstract class CustomActionButton
     /// </summary>
     public ActionButton? Button { get; set; }
 
-    /// <summary>
-    /// Gets the gameObject used for the keybind icon.
-    /// </summary>
-    public GameObject? KeybindIcon { get; private set; }
-
-    /// <summary>
-    /// Gets or sets the keybind icon text.
-    /// </summary>
-    private TextMeshPro? KeybindText { get; set; }
-
     /// <summary>
     /// The method used to create the button.
     /// </summary>
@@ -204,59 +162,6 @@ public abstract class CustomActionButton
                 }
             }
         }));
-
-        if (Keybind != null)
-        {
-            Keybind.OnActivate(() =>
-            {
-                if (Enabled(PlayerControl.LocalPlayer.Data.Role))
-                {
-                    // 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();
-                        }
-                    }
-                }
-            });
-
-            KeybindIcon =
-                Helpers.CreateKeybindIcon(
-                    Button.gameObject,
-                    Keybind.CurrentKey,
-                    new Vector3(0.4f, 0.45f, -9f)
-                );
-            KeybindText = KeybindIcon.transform.GetChild(0).GetComponent<TextMeshPro>();
-            HudManagerPatches.ModdedKeybindIcons.Add(KeybindText);
-            Button.usesRemainingSprite.transform.localPosition = new(-0.341f, 0.45f, -0.1f);
-        }
     }
 
     /// <summary>
@@ -271,14 +176,11 @@ public abstract class CustomActionButton
             return;
         }
 
-        Location = location;
+        this.Location = location;
 
-        if (!moveButton)
-        {
-            return;
-        }
+        if (!moveButton) return;
 
-        if (HudManagerPatches.BottomLeft == null || HudManagerPatches.BottomRight == null)
+        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
         {
             return;
         }
@@ -286,17 +188,17 @@ public abstract class CustomActionButton
         switch (location)
         {
             case ButtonLocation.BottomLeft:
-                var gridArrange = HudManagerPatches.BottomLeft.GetComponent<GridArrange>();
-                var aspectPosition = HudManagerPatches.BottomLeft.GetComponent<AspectPosition>();
+                var gridArrange = HudManagerPatches._bottomLeft.GetComponent<GridArrange>();
+                var aspectPosition = HudManagerPatches._bottomLeft.GetComponent<AspectPosition>();
 
-                Button.transform.SetParent(HudManagerPatches.BottomLeft.transform);
+                Button.transform.SetParent(HudManagerPatches._bottomLeft.transform);
 
                 gridArrange.Start();
                 gridArrange.ArrangeChilds();
                 aspectPosition.AdjustPosition();
                 break;
             case ButtonLocation.BottomRight:
-                Button.transform.SetParent(HudManagerPatches.BottomRight);
+                Button.transform.SetParent(HudManagerPatches._bottomRight);
                 break;
         }
     }
@@ -443,13 +345,6 @@ public abstract class CustomActionButton
     {
     }
 
-    /// <summary>
-    /// Returns a value indicating whether the effect can be ended early by the player.
-    /// Always false by default.
-    /// </summary>
-    /// <returns>Can the effect be canceled.</returns>
-    public virtual bool IsEffectCancellable() => false;
-
     /// <summary>
     /// When the button is usable, this method is called to determine if the button can be clicked.
     /// By default, it takes into account the timer, effect, and uses.
@@ -458,7 +353,7 @@ public abstract class CustomActionButton
     /// <returns>A value that represents whether the button can be clicked or not.</returns>
     public virtual bool CanClick()
     {
-        return (EffectActive ? IsEffectCancellable() : Timer <= 0) && CanUse();
+        return Timer <= 0 && !EffectActive && CanUse();
     }
 
     /// <summary>
@@ -468,8 +363,7 @@ public abstract class CustomActionButton
     /// <returns>A value that represents whether the button should light up or not.</returns>
     public virtual bool CanUse()
     {
-        return PlayerControl.LocalPlayer.moveable &&
-               ((EffectActive && IsEffectCancellable()) || (!EffectActive && (!LimitedUses || UsesLeft > 0)));
+        return PlayerControl.LocalPlayer.moveable && (!LimitedUses || UsesLeft > 0);
     }
 
     /// <summary>
@@ -491,12 +385,6 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual void ClickHandler()
     {
-        if (EffectActive && IsEffectCancellable())
-        {
-            ResetCooldownAndOrEffect();
-            return;
-        }
-
         if (!CanClick())
         {
             return;
@@ -529,22 +417,14 @@ public abstract class CustomActionButton
     /// <param name="playerControl">The local PlayerControl.</param>
     public virtual void FixedUpdateHandler(PlayerControl playerControl)
     {
-        if (Keybind != null && KeybindText != null)
-        {
-            KeybindText.text = Keybind.CurrentKey.ToString();
-            KeybindIcon?.SetActive(ActiveInputManager.currentControlType is ActiveInputManager.InputType.Keyboard &&
-                                   LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value &&
-                                   Keybind.CurrentKey != KeyboardKeyCode.None);
-        }
-
         if (Timer >= 0)
         {
-            if (!TimerPaused && (!PauseTimerInVent || !playerControl.inVent))
+            if (!TimerPaused)
             {
                 Timer -= Time.deltaTime;
             }
         }
-        else if (HasEffect && EffectActive && EffectDuration > 0)
+        else if (HasEffect && EffectActive)
         {
             EffectActive = false;
             Timer = Cooldown;
@@ -555,23 +435,23 @@ public abstract class CustomActionButton
         {
             if (CanUse())
             {
-                Button!.SetEnabled();
+                Button.SetEnabled();
             }
             else
             {
-                Button!.SetDisabled();
+                Button.SetDisabled();
             }
 
-            if (EffectActive && EffectDuration > 0)
+            if (EffectActive)
             {
                 Button.SetFillUp(Timer, EffectDuration);
 
-                Button.cooldownTimerText.text = Timer.ToString(CooldownTimerFormatString, NumberFormatInfo.InvariantInfo);
+                Button.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
                 Button.cooldownTimerText.gameObject.SetActive(true);
             }
             else
             {
-                Button.SetCooldownFormat(Timer, Cooldown, CooldownTimerFormatString);
+                Button.SetCoolDown(Timer, Cooldown);
             }
         }
 

MiraAPI/Hud/CustomButtonManager.cs

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 using System.Reflection;
 using MiraAPI.Events.Mira;
 using MiraAPI.PluginLoading;
-using UnityEngine;
 
 namespace MiraAPI.Hud;
 
@@ -30,11 +29,9 @@ public static class CustomButtonManager
         }
 
         CustomButtons.Add(button);
-        pluginInfo.InternalButtons.Add(button);
+        pluginInfo.Buttons.Add(button);
         typeof(CustomButtonSingleton<>).MakeGenericType(buttonType)
-#pragma warning disable S3011
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-#pragma warning restore S3011
             .SetValue(null, button);
 
         ButtonEventTypes.Add(buttonType, typeof(MiraButtonClickEvent<>).MakeGenericType(buttonType));

MiraAPI/Hud/CustomButtonSingleton.cs

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

MiraAPI/Hud/MultiTargetButton.cs

@@ -1,78 +0,0 @@
-using System.Linq;
-using HarmonyLib;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
-
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// Custom action button that has multiple target objects.
-/// </summary>
-/// <typeparam name="T">The type of the target objects.</typeparam>
-public abstract class MultiTargetButton<T> : CustomActionButton where T : MonoBehaviour
-{
-    /// <summary>
-    /// Gets or sets the list of targets of the button.
-    /// </summary>
-    public T[] Targets { get; protected set; } = [];
-
-    /// <inheritdoc cref="CustomActionButton{T}.Distance"/>
-    public virtual float Distance => PlayerControl.LocalPlayer.Data.Role.GetAbilityDistance();
-
-    /// <summary>
-    /// Gets the maximum amount of targets the button can have.
-    /// </summary>
-    public virtual int MaxTargets { get; } = int.MaxValue;
-
-    /// <inheritdoc cref="CustomActionButton{T}.IsTargetValid"/>
-    public virtual bool IsTargetValid(T target)
-    {
-        return target != null;
-    }
-
-    /// <summary>
-    /// The method used to get the target objects.
-    /// </summary>
-    /// <returns>The list of target objects.</returns>
-    public abstract T[] GetTargets();
-
-    /// <inheritdoc cref="CustomActionButton{T}.SetOutline"/>
-    /// <param name="target">The target object to set the oultine.</param>
-    public abstract void SetOutline(T target, bool active);
-
-    /// <inheritdoc cref="CustomActionButton{T}.CanUse"/>
-    public override bool CanUse()
-    {
-        var newTargets = GetTargets();
-        foreach (var target in Targets)
-        {
-            if (!newTargets.Contains(target))
-            {
-                SetOutline(target, false);
-            }
-        }
-
-        Targets = newTargets
-            .Where(IsTargetValid)
-            .Take(MaxTargets)
-            .ToArray();
-        Targets.Do(t => SetOutline(t, true));
-
-        return base.CanUse() && Targets.Length > 0;
-    }
-
-    /// <inheritdoc cref="CustomActionButton{T}.CanClick"/>
-    public override bool CanClick()
-    {
-        return base.CanClick() && Targets.Length > 0;
-    }
-
-    /// <summary>
-    /// Use this to reset the button's targets after used.
-    /// </summary>
-    public virtual void ResetTarget()
-    {
-        Targets.Do(t => SetOutline(t, false));
-        Targets = [];
-    }
-}

MiraAPI/Keybinds/BaseKeybind.cs

@@ -1,72 +0,0 @@
-using System;
-using Rewired;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Base keybind class.
-/// </summary>
-public class BaseKeybind
-{
-    /// <summary>
-    /// Gets the Rewired <see cref="InputAction"/> assinged for this keybind.
-    /// </summary>
-    public InputAction? RewiredInputAction { get; internal set; }
-
-    /// <summary>
-    /// Gets the unique identifier for this keybind. Used in Rewired.
-    /// </summary>
-    public string Id { get; protected set; }
-
-    /// <summary>
-    /// Gets the currently assigned keycode.
-    /// </summary>
-    public KeyboardKeyCode CurrentKey => KeybindUtils.GetKeycodeByKeybind(this);
-
-    /// <summary>
-    /// Gets or sets the handler of the keybind. Invoked when the keybind is activated.
-    /// </summary>
-    protected Action Handler { get; set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BaseKeybind"/> class.
-    /// </summary>
-    /// <param name="id">The unique identifier for this keybind.</param>
-    public BaseKeybind(string id)
-    {
-        Id = id;
-        Handler = () => { };
-    }
-
-    public BaseKeybind()
-    {
-        Handler = () => { };
-    }
-
-    /// <summary>
-    /// Triggers the keybind, invoking its handler.
-    /// </summary>
-    public void Invoke()
-    {
-        Handler.Invoke();
-    }
-
-    /// <summary>
-    /// Adds an <see cref="Action"/> that will be invoked when the keybind is used.
-    /// </summary>
-    /// <param name="action">The <see cref="Action"/> to add.</param>
-    public void OnActivate(Action action)
-    {
-        Handler += action;
-    }
-
-    /// <summary>
-    /// Removes an <see cref="Action"/> that would be invoked when the keybind is used.
-    /// Not recommended to use - add checks in the method added in <see cref="OnActivate"/> itself rather than removing it from the keybind.
-    /// </summary>
-    /// <param name="action">The <see cref="Action"/> to remove.</param>
-    public void RemoveOnActivate(Action action)
-    {
-        Handler -= action;
-    }
-}

MiraAPI/Keybinds/KeybindManager.cs

@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using Rewired;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Lets you register and manage mod keybinds with conflict checks and rebinding support.
-/// </summary>
-public static class KeybindManager
-{
-    /// <summary>
-    /// Gets a list of all registered keybinds.
-    /// </summary>
-    public static List<MiraKeybind> Keybinds { get; } = new();
-
-    [HideFromIl2Cpp]
-    internal static Dictionary<Type, VanillaKeybind> VanillaKeybinds { get; set; } = [];
-
-    internal static void RewiredInit()
-    {
-        try
-        {
-            var instance = KeybindUtils.RewiredInputManager!;
-            foreach (var keybind in Keybinds)
-            {
-                if (instance.userData.actions.ToArray().Any(x => x.name == keybind.Id))
-                {
-                    Warning($"Keybind of id {keybind.Id} already exists. Skipping it");
-                    continue;
-                }
-
-                keybind.RewiredInputAction = instance.userData.RegisterModBind(
-                    keybind.Id,
-                    keybind.Name,
-                    keybind.SourcePluginName,
-                    keybind.DefaultKey,
-                    modifiers: keybind.ModifierKeys);
-            }
-        }
-        catch (Exception e)
-        {
-            Error($"Error while registering keybinds in Rewired: {e}");
-        }
-    }
-
-    /// <summary>
-    /// Returns all conflicts where keybinds use the same key.
-    /// </summary>
-    /// <returns>A list of pairs of keybinds that conflict.</returns>
-    public static Dictionary<KeyboardKeyCode, List<MiraKeybind>> GetConflicts()
-    {
-        var conflicts = new Dictionary<KeyboardKeyCode, List<MiraKeybind>>();
-        foreach (var keybind in Keybinds)
-        {
-            var all = GetKeybindsForKey(keybind.CurrentKey, true);
-            if (all.Length > 1)
-            {
-                if (!conflicts.TryGetValue(keybind.CurrentKey, out var group))
-                {
-                    conflicts.Add(keybind.CurrentKey, new List<MiraKeybind>());
-                    group = conflicts[keybind.CurrentKey];
-                }
-
-                if (!group.Contains(keybind))
-                {
-                    group.Add(keybind);
-                }
-            }
-        }
-
-        return conflicts;
-    }
-
-    /// <summary>
-    /// Returns all keybinds for a specified keycode.
-    /// </summary>
-    /// <param name="keyCode">The key to look for.</param>
-    /// /// <param name="exclusiveCheck">Should only exlusive keybinds be present.</param>
-    /// <returns>The list of keybinds.</returns>
-    public static MiraKeybind[] GetKeybindsForKey(KeyboardKeyCode keyCode, bool exclusiveCheck = false)
-    {
-        var all = new List<MiraKeybind>();
-        foreach (var keybind in Keybinds)
-        {
-            if (keybind.CurrentKey == keyCode && (keybind.Exclusive || !exclusiveCheck))
-            {
-                all.Add(keybind);
-            }
-        }
-
-        return all.ToArray();
-    }
-}

MiraAPI/Keybinds/KeybindUtils.cs

@@ -1,80 +0,0 @@
-using System;
-using Rewired;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Collection of keybind-related utility classes.
-/// </summary>
-public static class KeybindUtils
-{
-    /// <summary>
-    /// Gets the Rewired <see cref="InputManager_Base"/> instance.
-    /// </summary>
-    public static InputManager_Base? RewiredInputManager { get; internal set; }
-
-    /// <summary>
-    /// Returns the currently assigned keycode of a keybind.
-    /// </summary>
-    /// <param name="keybind">The keybind to get the keycode from.</param>
-    /// <returns>The currently assigned keycode.</returns>
-    public static KeyboardKeyCode GetKeycodeByKeybind(BaseKeybind keybind)
-    {
-        if (keybind.RewiredInputAction == null)
-        {
-            return KeyboardKeyCode.None;
-        }
-
-        return GetKeycodeByActionId(keybind.RewiredInputAction.id);
-    }
-
-    /// <summary>
-    /// Gets the keycode for an action with ReInput.
-    /// </summary>
-    /// <param name="actionId">The action ID.</param>
-    /// <returns>The keyboard keycode.</returns>
-    public static KeyboardKeyCode GetKeycodeByActionId(int actionId)
-    {
-        return GetActionElementMap(actionId)?.keyboardKeyCode ?? KeyboardKeyCode.None;
-    }
-
-    /// <summary>
-    /// Gets a <see cref="ActionElementMap"/> by id with ReInput.
-    /// </summary>
-    /// <param name="actionId">The action ID.</param>
-    /// <returns>The keyboard keycode.</returns>
-    public static ActionElementMap? GetActionElementMap(int actionId)
-    {
-        var player = ReInput.players.GetPlayer(0);
-        return player.controllers.maps.GetFirstElementMapWithAction(ControllerType.Keyboard, actionId, false);
-    }
-
-    /// <summary>
-    /// Gets an <see cref="InputAction"/> by id.
-    /// </summary>
-    /// <param name="id">The action identifier name.</param>
-    /// <returns>The keyboard keycode.</returns>
-    public static InputAction? GetInputActionById(int id)
-    {
-        return RewiredInputManager?.userData?.GetActionById(id);
-    }
-
-    /// <summary>
-    /// Finds and returns an unused KeyCode that is not equal to the excluded key.
-    /// </summary>
-    /// <param name="exclude">The KeyCode to skip during the search.</param>
-    /// <returns>
-    /// The first available KeyCode not currently used by any registered keybind,
-    /// or KeyCode.None if none are available.
-    /// </returns>
-    public static KeyboardKeyCode FindAvailableKey(KeyboardKeyCode exclude)
-    {
-        foreach (KeyboardKeyCode key in Enum.GetValues<KeyboardKeyCode>())
-        {
-            if (key == exclude) continue;
-            bool used = KeybindManager.Keybinds.Exists(e => e.DefaultKey == key);
-            if (!used) return key;
-        }
-        return KeyboardKeyCode.None;
-    }
-}

MiraAPI/Keybinds/MiraGlobalKeybinds.cs

@@ -1,41 +0,0 @@
-using Rewired;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Class containing all default keybinds.
-/// Recommended for cross-mod compatibility.
-/// </summary>
-[RegisterCustomKeybinds]
-public static class MiraGlobalKeybinds
-{
-    /// <summary>
-    /// Gets the keybind for primary abilities.
-    /// </summary>
-    public static MiraKeybind PrimaryAbility { get; } = new("Primary Ability", KeyboardKeyCode.T);
-
-    /// <summary>
-    /// Gets the keybind for secondary abilities.
-    /// </summary>
-    public static MiraKeybind SecondaryAbility { get; } = new("Secondary Ability", KeyboardKeyCode.Y);
-
-    /// <summary>
-    /// Gets the keybind for Tetiary abilities.
-    /// </summary>
-    public static MiraKeybind TertiaryAbility { get; } = new("Tertiary Ability", KeyboardKeyCode.U);
-
-    /// <summary>
-    /// Gets the keybind for primary modifier abilities.
-    /// </summary>
-    public static MiraKeybind ModifierPrimaryAbility { get; } = new("Modifier Primary Ability", KeyboardKeyCode.I);
-
-    /// <summary>
-    /// Gets the keybind for secondary modifier abilities.
-    /// </summary>
-    public static MiraKeybind ModifierSecondaryAbility { get; } = new("Modifier Secondary Ability", KeyboardKeyCode.O);
-
-    /// <summary>
-    /// Gets the keybind for Tetiary modifier abilities.
-    /// </summary>
-    public static MiraKeybind ModifierTertiaryAbility { get; } = new("Modifier Tertiary Ability", KeyboardKeyCode.P);
-}

MiraAPI/Keybinds/MiraKeybind.cs

@@ -1,58 +0,0 @@
-using System.Globalization;
-using Rewired;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Represents a registered keybind.
-/// </summary>
-public class MiraKeybind : BaseKeybind
-{
-    /// <summary>
-    /// Gets name of the keybind.
-    /// </summary>
-    public string Name { get; }
-
-    /// <summary>
-    /// Gets the default keycode of this keybind.
-    /// </summary>
-    public KeyboardKeyCode DefaultKey { get; }
-
-    /// <summary>
-    /// Gets the modifier keys assigned to this keybind.
-    /// Due to Rewired limitations, there can only be 3 modifier keys.
-    /// </summary>
-    public ModifierKey[] ModifierKeys { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether this keybind should be checked for conflicts with other exclusive keybinds using the same key.
-    /// </summary>
-    public bool Exclusive { get; }
-
-    internal string? SourcePluginName { get; set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MiraKeybind"/> class.
-    /// </summary>
-    /// <param name="name">The name of the keybind.</param>
-    /// <param name="defaultKeycode">The default keycode.</param>
-    /// <param name="modifierKeys">Up to 3 optional modifier keys.</param>
-    /// <param name="exclusive">Is exclusive.</param>
-    public MiraKeybind(
-        string name,
-        KeyboardKeyCode? defaultKeycode,
-        ModifierKey[]? modifierKeys = null,
-        bool exclusive = true) : base(name.ToLower(CultureInfo.InvariantCulture).Replace(' ', '_'))
-    {
-        Name = name;
-        DefaultKey = defaultKeycode ?? KeyboardKeyCode.None;
-        ModifierKeys = modifierKeys ?? [];
-        Exclusive = exclusive;
-    }
-
-    /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{Name} ({Id})";
-    }
-}

MiraAPI/Keybinds/RegisterCustomKeybindsAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Used to mark a class for custom keybinds registration.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterCustomKeybindsAttribute : Attribute;

MiraAPI/Keybinds/VanillaKeybind.cs

@@ -1,24 +0,0 @@
-using Rewired;
-
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Represents a vanilla keybind.
-/// </summary>
-public class VanillaKeybind : BaseKeybind
-{
-    /// <summary>
-    /// Gets the <see cref="ActionButton"/> this keybind is binded to.
-    /// </summary>
-    public ActionButton? Button { get; internal set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaKeybind"/> class.
-    /// </summary>
-    /// <param name="id">The keybind id.</param>
-    public VanillaKeybind(int id)
-    {
-        RewiredInputAction = KeybindUtils.GetInputActionById(id);
-        Id = RewiredInputAction != null ? RewiredInputAction.name : id.ToString();
-    }
-}

MiraAPI/Keybinds/VanillaKeybindSingleton.cs

@@ -1,17 +0,0 @@
-namespace MiraAPI.Keybinds;
-
-/// <summary>
-/// Singleton for getting a vanilla keybind by <see cref="ActionButton"/>.
-/// </summary>
-/// <typeparam name="T">ActionButton type.</typeparam>
-public static class VanillaKeybinding<T> where T : ActionButton
-{
-    private static VanillaKeybind? _instance;
-
-    /// <summary>
-    /// Gets the instance of the option group.
-    /// </summary>
-#pragma warning disable CA1000
-    public static VanillaKeybind Instance => _instance ??= KeybindManager.VanillaKeybinds[typeof(T)];
-#pragma warning restore CA1000
-}

MiraAPI/LocalSettings/Attributes/LocalEnumSettingAttribute.cs

@@ -1,27 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings.SettingTypes;
-
-namespace MiraAPI.LocalSettings.Attributes;
-
-/// <summary>
-/// Creates an enum setting for the <see cref="ConfigEntry{T}"/>.
-/// </summary>
-/// <param name="names">Optional custom enum names.</param>
-/// <inheritdoc/>
-[AttributeUsage(AttributeTargets.Property)]
-public class LocalEnumSettingAttribute(
-    string? name = null,
-    string? description = null,
-    string[]? names = null
-    ) : LocalSettingAttribute(name, description)
-{
-    private readonly string? _name = name;
-    private readonly string? _description = description;
-
-    /// <inheritdoc/>
-    public override LocalEnumSetting CreateSetting(Type tab, ConfigEntryBase configEntryBase)
-    {
-        return new LocalEnumSetting(tab, configEntryBase, configEntryBase.SettingType, _name, _description, names);
-    }
-}

MiraAPI/LocalSettings/Attributes/LocalNumberSettingAttribute.cs

@@ -1,36 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings.SettingTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.LocalSettings.Attributes;
-
-/// <summary>
-/// Creates a number setting for the <see cref="ConfigEntry{T}"/>.
-/// </summary>
-/// <param name="min">Minimum range.</param>
-/// <param name="max">Maximum range.</param>
-/// <param name="increment">Increment per use.</param>
-/// <param name="suffixType">Suffix for the value.</param>
-/// <param name="formatString">Format string used when formating.</param>
-/// <inheritdoc/>
-[AttributeUsage(AttributeTargets.Property)]
-public class LocalNumberSettingAttribute(
-    string? name = null,
-    string? description = null,
-    float min = 1,
-    float max = 5,
-    float increment = 1,
-    MiraNumberSuffixes suffixType = MiraNumberSuffixes.None,
-    string? formatString = null
-    ) : LocalSettingAttribute(name, description)
-{
-    private readonly string? _name = name;
-    private readonly string? _description = description;
-
-    /// <inheritdoc/>
-    public override LocalNumberSetting CreateSetting(Type tab, ConfigEntryBase configEntryBase)
-    {
-        return new LocalNumberSetting(tab, configEntryBase, _name, _description, new FloatRange(min, max), increment, suffixType, formatString);
-    }
-}

MiraAPI/LocalSettings/Attributes/LocalSettingAttribute.cs

@@ -1,24 +0,0 @@
-using System;
-using BepInEx.Configuration;
-
-namespace MiraAPI.LocalSettings.Attributes;
-
-/// <summary>
-/// Base class for all local settings attributes.
-/// </summary>
-/// <param name="name">The name of the setting. Defaults to entry key.</param>
-/// <param name="description">The description of the setting. Defalts to entry description.</param>
-[AttributeUsage(AttributeTargets.Property)]
-public abstract class LocalSettingAttribute(
-    string? name = null,
-    string? description = null
-    ) : Attribute
-{
-    /// <summary>
-    /// Returns the created setting object.
-    /// </summary>
-    /// <param name="tab">Gets the tab where the setting is located.</param>
-    /// <param name="configEntryBase">Gets the config entry the setting is attached to.</param>
-    /// <returns>The created class.</returns>
-    public abstract ILocalSetting CreateSetting(Type tab, ConfigEntryBase configEntryBase);
-}

MiraAPI/LocalSettings/Attributes/LocalSettingsButtonAttribute.cs

@@ -1,12 +0,0 @@
-using System;
-using BepInEx.Configuration;
-
-namespace MiraAPI.LocalSettings.Attributes;
-
-/// <summary>
-/// Attribute for local setting buttons.
-/// </summary>
-[AttributeUsage(AttributeTargets.Property)]
-public class LocalSettingsButtonAttribute : Attribute
-{
-}

MiraAPI/LocalSettings/Attributes/LocalSliderSettingAttribute.cs

@@ -1,36 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings.SettingTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.LocalSettings.Attributes;
-
-/// <summary>
-/// Creates a slider setting for the <see cref="ConfigEntry{T}"/>.
-/// </summary>
-/// <inheritdoc/>
-/// <param name="min">Minimum range.</param>
-/// <param name="max">Maximum range.</param>
-/// <param name="roundValue">Should the value be rounded.</param>
-/// <param name="suffixType">Suffix for the value.</param>
-[AttributeUsage(AttributeTargets.Property)]
-public class LocalSliderSettingAttribute(
-    string? name = null,
-    float min = 0,
-    float max = 100,
-    string? description = null,
-    bool displayValue = false,
-    string? formatString = null,
-    bool roundValue = false,
-    MiraNumberSuffixes suffixType = MiraNumberSuffixes.None
-    ) : LocalSettingAttribute(name, description)
-{
-    private readonly string? _name = name;
-    private readonly string? _description = description;
-
-    /// <inheritdoc/>
-    public override LocalSliderSetting CreateSetting(Type tab, ConfigEntryBase configEntryBase)
-    {
-        return new LocalSliderSetting(tab, configEntryBase, _name, _description, new FloatRange(min, max), displayValue, suffixType, formatString, roundValue);
-    }
-}

MiraAPI/LocalSettings/Attributes/LocalToggleSettingAttribute.cs

@@ -1,25 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings.SettingTypes;
-
-namespace MiraAPI.LocalSettings.Attributes;
-
-/// <summary>
-/// Creates a toggle setting for the <see cref="ConfigEntry{T}"/>.
-/// </summary>
-/// <inheritdoc/>
-[AttributeUsage(AttributeTargets.Property)]
-public class LocalToggleSettingAttribute(
-    string? name = null,
-    string? description = null
-    ) : LocalSettingAttribute(name, description)
-{
-    private readonly string? _name = name;
-    private readonly string? _description = description;
-
-    /// <inheritdoc/>
-    public override LocalToggleSetting CreateSetting(Type tab, ConfigEntryBase configEntryBase)
-    {
-        return new LocalToggleSetting(tab, configEntryBase, _name, _description);
-    }
-}

MiraAPI/LocalSettings/ILocalSetting.cs

@@ -1,42 +0,0 @@
-using BepInEx.Configuration;
-using UnityEngine;
-
-namespace MiraAPI.LocalSettings;
-
-/// <summary>
-/// Interface for all local settings.
-/// </summary>
-public interface ILocalSetting
-{
-    /// <summary>
-    /// Gets the preferred name of a setting.
-    /// </summary>
-    string Name { get; }
-
-    /// <summary>
-    /// Gets the description of a setting.
-    /// </summary>
-    string Description { get; }
-
-    /// <summary>
-    /// Gets the setting's gameobject.
-    /// </summary>
-    GameObject? Setting { get; }
-
-    /// <summary>
-    /// Gets the setting's config entry.
-    /// </summary>
-    ConfigEntryBase ConfigEntry { get; }
-
-    /// <summary>
-    /// Used to create the setting.
-    /// </summary>
-    /// <param name="toggle">Toggle template.</param>
-    /// <param name="slider">Slider template.</param>
-    /// <param name="parent">The parent of the setting.</param>
-    /// <param name="offset">The offset.</param>
-    /// <param name="order">The order.</param>
-    /// <param name="last">Whether it's the last on the row.</param>
-    /// <returns>The created setting.</returns>
-    GameObject? CreateOption(ToggleButtonBehaviour toggle, SlideBar slider, Transform parent, ref float offset, ref int order, bool last);
-}

MiraAPI/LocalSettings/LocalSettingsButton.cs

@@ -1,78 +0,0 @@
-using System;
-using MiraAPI.Utilities;
-using Reactor.Localization.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.LocalSettings;
-
-/// <summary>
-/// Represents a local settings button.
-/// </summary>
-public class LocalSettingsButton(string text, Action onClick)
-{
-    /// <summary>
-    /// Gets or sets the button text.
-    /// </summary>
-    public string Text { get; set; } = text;
-
-    /// <summary>
-    /// Gets or sets the button on-click action.
-    /// </summary>
-    public Action OnClick { get; set; } = onClick;
-
-    /// <summary>
-    /// Gets the tab instance this button belongs to.
-    /// </summary>
-    public LocalSettingsTab? Tab { get; internal set; }
-
-    internal GameObject CreateButton(ToggleButtonBehaviour toggle, Transform parent, ref float offset, ref int order, bool last)
-    {
-        var button = Object.Instantiate(toggle, parent).GetComponent<PassiveButton>();
-        var tmp = button.transform.FindChild("Text_TMP").GetComponent<TextMeshPro>();
-        var rollover = button.GetComponent<ButtonRolloverHandler>();
-        tmp.GetComponent<TextTranslatorTMP>().Destroy();
-        button.gameObject.SetActive(true);
-
-        var toggleComp = button.GetComponent<ToggleButtonBehaviour>();
-        var background = toggleComp.Background;
-        button.transform.FindChild("ButtonHighlight")?.gameObject.DestroyImmediate();
-        toggleComp.Destroy();
-
-        if (last && order == 1)
-        {
-            // Button in the middle
-            button.transform.localPosition = new Vector3(0, 1.85f - offset, -7);
-        }
-        else
-        {
-            button.transform.localPosition = new Vector3(order == 1 ? -1.185f : 1.185f, 1.85f - offset, -7);
-        }
-
-        tmp.text = Text;
-        button.name = Text;
-        button.OnClick = new UnityEngine.UI.Button.ButtonClickedEvent();
-        rollover.OutColor = Tab!.TabAppearance.ButtonColor;
-        rollover.OverColor = Tab!.TabAppearance.ButtonHoverColor;
-        rollover.Target = background;
-        background.color = Tab!.TabAppearance.ButtonColor;
-        button.OnClick.AddListener((UnityAction)OnClick);
-
-        background.transform.localScale = new Vector3(1, 1.25f, 1);
-        Helpers.DivideSize(button.gameObject, 1.1f);
-
-        order++;
-        if (order > 2 && !last)
-        {
-            offset += 0.5f;
-            order = 1;
-        }
-        if (last)
-            offset += 0.6f;
-
-        return button.gameObject;
-    }
-}

MiraAPI/LocalSettings/LocalSettingsManager.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using BepInEx.Unity.IL2CPP;
-using MiraAPI.GameOptions;
-using Reactor.Utilities;
-
-namespace MiraAPI.LocalSettings;
-
-/// <summary>
-/// Manages local settings.
-/// </summary>
-public static class LocalSettingsManager
-{
-    internal static readonly Dictionary<Type, LocalSettingsTab> TypeToTab = [];
-    internal static readonly List<LocalSettingsTab> Tabs = [];
-
-    internal static bool RegisterTab(Type type, BasePlugin pluginInfo)
-    {
-        if (Activator.CreateInstance(type, pluginInfo.Config) is not LocalSettingsTab tab)
-        {
-            return false;
-        }
-
-        if (TypeToTab.ContainsKey(type))
-        {
-            Error($"Local settings tab {type.Name} already exists.");
-            return false;
-        }
-
-        Tabs.Add(tab);
-        TypeToTab.Add(type, tab);
-
-        typeof(LocalSettingsTabSingleton<>).MakeGenericType(type)
-#pragma warning disable S3011
-            .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-#pragma warning restore S3011
-            .SetValue(null, tab);
-
-        return true;
-    }
-}

MiraAPI/LocalSettings/LocalSettingsTab.cs

@@ -1,299 +0,0 @@
-using System;
-using System.Collections.Generic;
-using BepInEx.Configuration;
-using HarmonyLib;
-using MiraAPI.Patches.LocalSettings;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.LocalSettings;
-
-/// <summary>
-/// Represents a local settings tab. Gets a button by default.
-/// </summary>
-public abstract class LocalSettingsTab(ConfigFile config)
-{
-    /// <summary>
-    /// Gets the name of the tab.
-    /// </summary>
-    public abstract string TabName { get; }
-
-    /// <summary>
-    /// Gets the tab appearance.
-    /// </summary>
-    public virtual LocalSettingTabAppearance TabAppearance { get; } = new();
-
-    /// <summary>
-    /// Gets a value indicating whether a button should be created for the tab.
-    /// </summary>
-    public virtual bool ShouldCreateButton => true;
-
-    /// <summary>
-    /// Gets a value indicating whether the tab should have category labels.
-    /// </summary>
-    protected virtual bool ShouldCreateLabels => true;
-
-    /// <summary>
-    /// Gets the mod's config file. Automatically found in the plugin loader.
-    /// </summary>
-    public ConfigFile Config { get; } = config ?? throw new ArgumentNullException(nameof(config));
-
-    /// <summary>
-    /// Gets the tab button instance.
-    /// </summary>
-    public TabGroup? TabButton { get; internal set; }
-
-    /// <summary>
-    /// Gets the list of settings.
-    /// </summary>
-    public List<ILocalSetting> Settings { get; } = [];
-
-    /// <summary>
-    /// Gets the list of buttons.
-    /// </summary>
-    public List<LocalSettingsButton> Buttons { get; } = [];
-
-    /// <summary>
-    /// Gets the index of this tab.
-    /// </summary>
-    protected int TabIndex => LocalSettingsManager.Tabs.IndexOf(this) + 10;
-
-    private Scroller? Scroller { get; set; }
-
-    /// <summary>
-    /// Invoked when an option value is changed.
-    /// </summary>
-    /// <param name="configEntry">The config entry which was changed.</param>
-    public virtual void OnOptionChanged(ConfigEntryBase configEntry)
-    {
-    }
-
-    /// <summary>
-    /// Attempts to open the tab.
-    /// Override for custom behavior.
-    /// </summary>
-    public virtual void Open()
-    {
-        OptionsMenuPatches.Instance?.OpenTabGroup(TabIndex);
-    }
-
-    /// <summary>
-    /// Creates the tab <see cref="GameObject"/> and it's content.
-    /// </summary>
-    /// <param name="instance">The <see cref="OptionsMenuBehaviour"/> instace.</param>
-    /// <returns>The created tab <see cref="GameObject"/>.</returns>
-    public virtual GameObject CreateTab(OptionsMenuBehaviour instance)
-    {
-         var tab = Object.Instantiate(instance.transform.FindChild("GeneralTab").gameObject, instance.transform);
-         tab.name = $"{TabName}Tab";
-         tab.transform.DestroyChildren();
-         tab.gameObject.SetActive(false);
-
-         if (Scroller == null)
-         {
-             Scroller = Helpers.CreateScroller(tab.transform, OptionsMenuPatches.MaskCollider);
-         }
-
-         if (TabButton != null)
-         {
-             TabButton.Content = tab.gameObject;
-         }
-
-         var generalLabel = instance.transform.FindChild("GeneralTab").FindChild("ControlGroup")
-             .FindChild("ControlText_TMP").gameObject;
-         var toggle = instance.transform.FindChild("GeneralTab").FindChild("ChatGroup").FindChild("CensorChatButton").GetComponent<ToggleButtonBehaviour>();
-         var slider = instance.transform.FindChild("GeneralTab").FindChild("SoundGroup").FindChild("SFXSlider").GetComponent<SlideBar>();
-
-         Dictionary<string, List<ILocalSetting>> entriesByGroup = new();
-         foreach (var entry in Settings)
-         {
-             var group = entry.ConfigEntry.Definition.Section;
-             if (!entriesByGroup.ContainsKey(group))
-                 entriesByGroup.Add(group, []);
-
-             entriesByGroup[group].Add(entry);
-         }
-
-         float contentOffset = 0;
-         var contentOrder = 1;
-         var contentIndex = 1;
-
-         foreach (var pair in entriesByGroup)
-         {
-             if (ShouldCreateLabels)
-             {
-                 CreateLabel(generalLabel, Scroller.Inner, pair.Key, ref contentOffset);
-                 contentOrder = 1;
-                 contentIndex = 1;
-             }
-
-             foreach (var setting in pair.Value)
-             {
-                 var obj = setting.CreateOption(
-                     toggle,
-                     slider,
-                     Scroller.Inner,
-                     ref contentOffset,
-                     ref contentOrder,
-                     contentIndex == pair.Value.Count);
-
-                 obj!.GetComponentsInChildren<SpriteRenderer>(true).Do(x =>
-                 {
-                     x.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-                     x.sortingOrder = 150;
-                     x.sortingLayerName = "Default";
-                 });
-
-                 obj.GetComponentsInChildren<MeshRenderer>(true).Do(x =>
-                 {
-                     x.sortingOrder = 151;
-                     x.sortingLayerName = "Default";
-                 });
-
-                 obj.GetComponentsInChildren<PassiveButton>().Do(x => { x.ClickMask = OptionsMenuPatches.MaskCollider; });
-
-                 contentIndex++;
-             }
-
-             contentOrder = 1;
-         }
-
-         contentIndex = 1;
-         contentOrder = 1;
-         foreach (var button in Buttons)
-         {
-             var obj = button.CreateButton(
-                 toggle,
-                 Scroller.Inner,
-                 ref contentOffset,
-                 ref contentOrder,
-                 contentIndex == Buttons.Count);
-
-             obj!.GetComponentsInChildren<SpriteRenderer>(true).Do(x =>
-             {
-                 x.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-                 x.sortingOrder = 150;
-                 x.sortingLayerName = "Default";
-             });
-
-             obj.GetComponentsInChildren<MeshRenderer>(true).Do(x =>
-             {
-                 x.sortingOrder = 151;
-                 x.sortingLayerName = "Default";
-             });
-
-             obj.GetComponentsInChildren<PassiveButton>().Do(x => { x.ClickMask = OptionsMenuPatches.MaskCollider; });
-
-             contentIndex++;
-         }
-
-         Scroller.SetBounds(new FloatRange(0, (Settings.Count + Buttons.Count) * 0.5f - 5f), new FloatRange(0, 0));
-         return tab;
-    }
-
-    /// <summary>
-    /// Creates the tab button.
-    /// </summary>
-    /// <param name="instance">The <see cref="OptionsMenuBehaviour"/> instance.</param>
-    /// <param name="tabIdx">The tab index.</param>
-    /// <param name="offset">The current button offset.</param>
-    /// <returns>The created button <see cref="GameObject"/>.</returns>
-    public virtual GameObject CreateTabButton(OptionsMenuBehaviour instance, ref int tabIdx, ref float offset)
-    {
-        var tabButtonObject = Object.Instantiate(instance.Tabs[0], instance.transform);
-        tabButtonObject.name = $"{TabName} Button";
-        tabButtonObject.transform.localPosition = new Vector3(2.4f, 2.1f - offset, 5.5f);
-        tabButtonObject.transform.localScale = new Vector3(1.25f, 1.25f, 1);
-        tabButtonObject.Button.color = TabAppearance.TabButtonColor;
-        TabButton = tabButtonObject;
-
-        var tabButtonText = tabButtonObject.transform.FindChild("Text_TMP").GetComponent<TextMeshPro>();
-        tabButtonText.GetComponent<TextTranslatorTMP>().Destroy(); // i hate text translators
-        tabButtonText.transform.localPosition = new Vector3(0.078f, 0, 0);
-        tabButtonText.transform.localScale = new Vector3(0.9f, 0.9f);
-        tabButtonText.alignment = TextAlignmentOptions.Right;
-        tabButtonText.text = $"<b>{GetShortName(TabName)}</b>";
-
-        var tabButton = tabButtonObject.GetComponent<PassiveButton>();
-        var rollover = tabButtonObject.Rollover;
-        rollover.OverColor = TabAppearance.TabButtonHoverColor;
-        rollover.OutColor = TabAppearance.TabButtonColor;
-
-        SpriteRenderer? tabButtonRend = null;
-        if (TabAppearance.TabIcon != null)
-        {
-            tabButtonRend = new GameObject("sprite").AddComponent<SpriteRenderer>();
-            tabButtonRend.gameObject.layer = 5; // ui layer
-            tabButtonRend.transform.SetParent(tabButtonObject.transform);
-            tabButtonRend.transform.localPosition = new Vector3(0.5f, 0, -2);
-            tabButtonRend.transform.localScale = new Vector3(0.2f, 0.2f, 1);
-            tabButtonRend.sprite = TabAppearance.TabIcon.LoadAsset();
-            tabButtonText.gameObject.SetActive(false);
-        }
-
-        var tabIndex = tabIdx; // Local copies of the tab variables so we can use them in the lambdas
-        var tabOffset = offset;
-        tabButton.OnClick.AddListener((UnityAction)(() => { instance.OpenTabGroup(tabIndex + 10); }));
-        tabButton.OnMouseOver.AddListener((UnityAction)(() =>
-        {
-            tabButton.transform.localPosition = new Vector3(3.55f, 2.1f - tabOffset, 5.5f);
-            tabButtonText.gameObject.SetActive(true);
-            tabButtonText.transform.localPosition = new Vector3(-0.024f, 0, 0);
-            tabButtonText.maxVisibleCharacters = int.MaxValue;
-            tabButtonText.text = TabName;
-            tabButtonText.alignment = TextAlignmentOptions.Left;
-            tabButtonRend?.gameObject.SetActive(!TabAppearance.HideIconOnHover);
-        }));
-        tabButton.OnMouseOut.AddListener((UnityAction)(() =>
-        {
-            if (!tabButtonObject.Content.gameObject.activeSelf)
-            {
-                //tabButtonObject.Button.color = TabColor;
-                //tabButtonObject.Rollover.OutColor = TabColor;
-            }
-
-            tabButton.transform.localPosition = new Vector3(2.4f, 2.1f - tabOffset, 5.5f);
-            tabButtonText.alignment = TextAlignmentOptions.Right;
-            if (tabButtonRend != null)
-            {
-                tabButtonRend.gameObject.SetActive(true);
-                tabButtonText.gameObject.SetActive(false);
-            }
-
-            tabButtonText.transform.localPosition = new Vector3(0.1f, 0, 0);
-            tabButtonText.maxVisibleCharacters = 4;
-            tabButtonText.text = $"<b>{GetShortName(TabName)}</b>";
-        }));
-
-        return tabButtonObject.gameObject;
-    }
-
-    private static void CreateLabel(GameObject template, Transform parent, string text, ref float offset)
-    {
-        var label = Object.Instantiate(template, parent);
-        label.transform.localPosition = new Vector3(0, 1.85f - offset);
-        label.GetComponent<TextTranslatorTMP>().Destroy();
-        label.name = text;
-
-        var tmp = label.GetComponent<TextMeshPro>();
-        tmp.text = $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF - Chat Message Masked\"><b>{text}</b></font>";
-        tmp.alignment = TextAlignmentOptions.Center;
-
-        var meshRend = label.GetComponent<MeshRenderer>();
-        meshRend.sortingLayerName = "Default";
-        meshRend.sortingOrder = 151;
-
-        offset += 0.5f;
-    }
-
-    private static string GetShortName(string name)
-    {
-        var shortName = string.Empty;
-        name.Split(' ').Do(x => shortName += x[0]);
-        return shortName;
-    }
-}

MiraAPI/LocalSettings/LocalSettingsTabAppearance.cs

@@ -1,96 +0,0 @@
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.LocalSettings;
-
-/// <summary>
-/// Struct for modifying tab appearance.
-/// Defines how the settings look.
-/// </summary>
-public record struct LocalSettingTabAppearance()
-{
-    /// <summary>
-    /// Gets or sets main color of the tab.
-    /// </summary>
-    public Color TabColor { get; set; } = Color.white;
-
-    /// <summary>
-    /// Gets or sets tab button icon. No icon by default.
-    /// </summary>
-    public LoadableAsset<Sprite>? TabIcon { get; set; }
-
-    /// <summary>
-    /// Gets or sets color of the tab button.
-    /// </summary>
-    public Color TabButtonColor { get; set; } = Color.white;
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the icon should be hidden when tab button is hovered.
-    /// </summary>
-    public bool HideIconOnHover { get; set; } = true;
-
-    /// <summary>
-    /// Gets or sets hover color of the tab button.
-    /// </summary>
-    public Color TabButtonHoverColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets active color of the tab button.
-    /// </summary>
-    public Color TabButtonActiveColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets hover color of toggles.
-    /// </summary>
-    public Color ToggleHoverColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets active color of toggles.
-    /// </summary>
-    public Color ToggleActiveColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets inactive color of toggles.
-    /// </summary>
-    public Color ToggleInactiveColor { get; set; } = Color.red;
-
-    /// <summary>
-    /// Gets or sets color of number buttons.
-    /// </summary>
-    public Color NumberColor { get; set; } = Color.white;
-
-    /// <summary>
-    /// Gets or sets hover color of number buttons.
-    /// </summary>
-    public Color NumberHoverColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets color of sliders.
-    /// </summary>
-    public Color SliderColor { get; set; } = Color.white;
-
-    /// <summary>
-    /// Gets or sets hover color of sliders.
-    /// </summary>
-    public Color SliderHoverColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets color of enum buttons.
-    /// </summary>
-    public Color EnumColor { get; set; } = Color.white;
-
-    /// <summary>
-    /// Gets or sets hover color of enum buttons.
-    /// </summary>
-    public Color EnumHoverColor { get; set; } = Palette.AcceptedGreen;
-
-    /// <summary>
-    /// Gets or sets color of buttons.
-    /// </summary>
-    public Color ButtonColor { get; set; } = Color.white;
-
-    /// <summary>
-    /// Gets or sets hover color of buttons.
-    /// </summary>
-    public Color ButtonHoverColor { get; set; } = Palette.AcceptedGreen;
-}

MiraAPI/LocalSettings/LocalSettingsTabSingleton.cs

@@ -1,19 +0,0 @@
-using System.Linq;
-
-namespace MiraAPI.LocalSettings;
-
-/// <summary>
-/// Singleton for local settings tabs.
-/// </summary>
-/// <typeparam name="T">The settings tab type.</typeparam>
-public static class LocalSettingsTabSingleton<T> where T : LocalSettingsTab
-{
-    private static T? _instance;
-
-    /// <summary>
-    /// Gets the instance of the setting tab.
-    /// </summary>
-#pragma warning disable CA1000
-    public static T Instance => _instance ??= LocalSettingsManager.Tabs.OfType<T>().Single();
-#pragma warning restore CA1000
-}

MiraAPI/LocalSettings/SettingTypes/LocalEnumSetting.cs

@@ -1,132 +0,0 @@
-using System;
-using System.Linq;
-using BepInEx.Configuration;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.LocalSettings.SettingTypes;
-
-/// <summary>
-/// Local setting class for enums.
-/// </summary>
-public class LocalEnumSetting : LocalSettingBase<int>
-{
-    /// <summary>
-    /// Gets the enum type of the setting.
-    /// </summary>
-    public Type EnumType { get; }
-
-    /// <summary>
-    /// Gets the enum values.
-    /// </summary>
-    public string[] Values { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LocalEnumSetting"/> class.
-    /// </summary>
-    /// <inheritdoc/>
-    /// <param name="enumType">The enum type.</param>
-    /// <param name="values">The optional values array to replace the enum names.</param>
-    public LocalEnumSetting(
-        Type tab,
-        ConfigEntryBase configEntry,
-        Type enumType,
-        string? name = null,
-        string? description = null,
-        string[]? values = null)
-        : base(tab, configEntry, name, description)
-    {
-        EnumType = enumType;
-        Values = values ?? Enum
-            .GetValues(configEntry.SettingType)
-            .Cast<Enum>()
-            .Select(x => x.ToDisplayString())
-            .ToArray();
-    }
-
-    /// <inheritdoc />
-    public override GameObject CreateOption(ToggleButtonBehaviour toggle, SlideBar slider, Transform parent, ref float offset, ref int order, bool last)
-    {
-        var button = Object.Instantiate(toggle, parent).GetComponent<PassiveButton>();
-        var tmp = button.transform.FindChild("Text_TMP").GetComponent<TextMeshPro>();
-        var rollover = button.GetComponent<ButtonRolloverHandler>();
-        tmp.GetComponent<TextTranslatorTMP>().Destroy();
-        button.gameObject.SetActive(true);
-
-        var toggleComp = button.GetComponent<ToggleButtonBehaviour>();
-        var background = toggleComp.Background;
-        var highlight = button.transform.FindChild("ButtonHighlight")?.GetComponent<SpriteRenderer>();
-        if (highlight != null)
-        {
-            highlight.color = Tab!.TabAppearance.EnumHoverColor;
-            highlight.gameObject.SetActive(false);
-        }
-        toggleComp.Destroy();
-
-        if (last && order == 1)
-        {
-            // Button in the middle
-            button.transform.localPosition = new Vector3(0, 1.85f - offset, -7);
-        }
-        else
-        {
-            button.transform.localPosition = new Vector3(order == 1 ? -1.185f : 1.185f, 1.85f - offset, -7);
-        }
-
-        tmp.text = GetValueText();
-        button.name = Name;
-        button.OnClick = new UnityEngine.UI.Button.ButtonClickedEvent();
-        rollover.OutColor = Tab!.TabAppearance.EnumColor;
-        rollover.OverColor = Tab!.TabAppearance.EnumHoverColor;
-        background.color = Tab!.TabAppearance.EnumColor;
-
-        button.OnClick.AddListener((UnityAction)(() =>
-        {
-            int value = GetValue();
-            value++;
-            if (value >= Values.Length)
-            {
-                value = 0;
-            }
-
-            SetValue(value);
-            tmp.text = GetValueText();
-        }));
-        button.OnMouseOver.AddListener((UnityAction)(() =>
-        {
-            if (!Description.IsNullOrWhiteSpace())
-            {
-                tmp.text = Description;
-            }
-            highlight?.gameObject.SetActive(true);
-        }));
-        button.OnMouseOut.AddListener((UnityAction)(() =>
-        {
-            tmp.text = GetValueText();
-            highlight?.gameObject.SetActive(false);
-        }));
-
-        Helpers.DivideSize(button.gameObject, 1.1f);
-
-        order++;
-        if (order > 2 && !last)
-        {
-            offset += 0.5f;
-            order = 1;
-        }
-        if (last)
-            offset += 0.6f;
-
-        return button.gameObject;
-    }
-
-    /// <inheritdoc/>
-    protected override string GetValueText()
-    {
-        return $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF - Chat Message Masked\">{Name}: <b>{Values[GetValue()]}</font></b>";
-    }
-}

MiraAPI/LocalSettings/SettingTypes/LocalNumberSetting.cs

@@ -1,145 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.LocalSettings.SettingTypes;
-
-/// <summary>
-/// Local setting class for numbers.
-/// </summary>
-public class LocalNumberSetting : LocalSettingBase<float>
-{
-    /// <summary>
-    /// Gets the range of the button.
-    /// </summary>
-    public FloatRange NumberRange { get; }
-
-    /// <summary>
-    /// Gets the increment of the value when button is pressed.
-    /// </summary>
-    public float Increment { get; }
-
-    /// <summary>
-    /// Gets a format for the text to use to format the number.
-    /// </summary>
-    public string FormatString { get; }
-
-    /// <summary>
-    /// Gets the suffix for the number value.
-    /// </summary>
-    public MiraNumberSuffixes SuffixType { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LocalNumberSetting"/> class.
-    /// </summary>
-    /// <inheritdoc/>
-    /// <param name="numberRange">The value range.</param>
-    /// <param name="increment">The increment per click.</param>
-    /// <param name="suffixType">The suffix used for formating.</param>
-    /// <param name="formatString">The format string used for formating.</param>
-    public LocalNumberSetting(
-        Type tab,
-        ConfigEntryBase configEntry,
-        string? name = null,
-        string? description = null,
-        FloatRange? numberRange = null,
-        float? increment = null,
-        MiraNumberSuffixes? suffixType = null,
-        string? formatString = null)
-        : base(tab, configEntry, name, description)
-    {
-        SuffixType = suffixType ?? MiraNumberSuffixes.None;
-        NumberRange = numberRange ?? new FloatRange(1, 5);
-        Increment = increment ?? 1;
-        FormatString = formatString ?? "0";
-    }
-
-    /// <inheritdoc />
-    public override GameObject CreateOption(ToggleButtonBehaviour toggle, SlideBar slider, Transform parent, ref float offset, ref int order, bool last)
-    {
-        var button = Object.Instantiate(toggle, parent).GetComponent<PassiveButton>();
-        var tmp = button.transform.FindChild("Text_TMP").GetComponent<TextMeshPro>();
-        var rollover = button.GetComponent<ButtonRolloverHandler>();
-        tmp.GetComponent<TextTranslatorTMP>().Destroy();
-        button.gameObject.SetActive(true);
-
-        var toggleComp = button.GetComponent<ToggleButtonBehaviour>();
-        var background = toggleComp.Background;
-        var highlight = button.transform.FindChild("ButtonHighlight")?.GetComponent<SpriteRenderer>();
-        if (highlight != null)
-        {
-            highlight.color = Tab!.TabAppearance.NumberHoverColor;
-            highlight.gameObject.SetActive(false);
-        }
-        toggleComp.Destroy();
-
-        if (last && order == 1)
-        {
-            // Button in the middle
-            button.transform.localPosition = new Vector3(0, 1.85f - offset, -7);
-        }
-        else
-        {
-            button.transform.localPosition = new Vector3(order == 1 ? -1.185f : 1.185f, 1.85f - offset, -7);
-        }
-
-        tmp.text = GetValueText();
-        button.name = Name;
-        button.OnClick = new UnityEngine.UI.Button.ButtonClickedEvent();
-        rollover.OutColor = Tab!.TabAppearance.NumberColor;
-        rollover.OverColor = Tab!.TabAppearance.NumberHoverColor;
-        background.color = Tab!.TabAppearance.NumberColor;
-
-        button.OnClick.AddListener((UnityAction)(() =>
-        {
-            float value = GetValue();
-            value += Increment;
-            if (value > NumberRange.max)
-            {
-                value = NumberRange.min;
-            }
-
-            SetValue(value);
-            tmp.text = GetValueText();
-        }));
-        button.OnMouseOver.AddListener((UnityAction)(() =>
-        {
-            if (!Description.IsNullOrWhiteSpace())
-            {
-                tmp.text = Description;
-            }
-            highlight?.gameObject.SetActive(true);
-        }));
-        button.OnMouseOut.AddListener((UnityAction)(() =>
-        {
-            tmp.text = GetValueText();
-            highlight?.gameObject.SetActive(false);
-        }));
-
-        Helpers.DivideSize(button.gameObject, 1.1f);
-
-        order++;
-        if (order > 2 && !last)
-        {
-            offset += 0.5f;
-            order = 1;
-        }
-        if (last)
-            offset += 0.6f;
-
-        return button.gameObject;
-    }
-
-    /// <inheritdoc/>
-    protected override string GetValueText()
-    {
-        var value = GetValue();
-        var formated = Helpers.FormatValue(value, SuffixType, FormatString);
-        return $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF - Chat Message Masked\">{Name}: <b>{formated}</font></b>";
-    }
-}

MiraAPI/LocalSettings/SettingTypes/LocalSettingBase.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Linq;
-using BepInEx.Configuration;
-using UnityEngine;
-
-namespace MiraAPI.LocalSettings.SettingTypes;
-
-/// <inheritdoc />
-public abstract class LocalSettingBase<T> : ILocalSetting
-{
-    /// <inheritdoc />
-    public string Name { get; }
-
-    /// <inheritdoc />
-    public string Description { get; }
-
-    /// <inheritdoc />
-    public GameObject? Setting { get; } = null!;
-
-    /// <inheritdoc />
-    public ConfigEntryBase ConfigEntry { get; }
-
-    /// <summary>
-    /// Gets the tab of the local setting.
-    /// </summary>
-    public LocalSettingsTab? Tab => LocalSettingsManager.Tabs.FirstOrDefault(x => x.Settings.Contains(this));
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LocalSettingBase{T}"/> class.
-    /// </summary>
-    /// <param name="tab">The tab to create the setting in.</param>
-    /// <param name="configEntry">The config entry.</param>
-    /// <param name="name">The name of the setting.</param>
-    /// <param name="description">The description of the setting.</param>
-    protected LocalSettingBase(Type tab, ConfigEntryBase configEntry, string? name = null, string? description = null)
-    {
-        ConfigEntry = configEntry;
-        Name = name ?? ConfigEntry.Definition.Key;
-        Description = description ?? ConfigEntry.Description.Description;
-        LocalSettingsManager.TypeToTab[tab].Settings.Add(this);
-    }
-
-    /// <summary>
-    /// Creates an instance of the setting.
-    /// </summary>
-    /// <returns>The created setting.</returns>
-    public abstract GameObject CreateOption(ToggleButtonBehaviour toggle, SlideBar slider, Transform parent, ref float offset, ref int order, bool last);
-
-    /// <summary>
-    /// Returns the formated string to use in the text of the setting.
-    /// </summary>
-    /// <returns>The value text.</returns>
-    protected virtual string GetValueText()
-    {
-        return string.Empty;
-    }
-
-    /// <summary>
-    /// Gets the value of the config entry, cast to the setting type.
-    /// </summary>
-    /// <returns>The value.</returns>
-    public virtual T GetValue()
-    {
-        return (T)ConfigEntry.BoxedValue;
-    }
-
-    /// <summary>
-    /// Sets the value of the config entry.
-    /// </summary>
-    /// <param name="value">The value to set to.</param>
-    public virtual void SetValue(T value)
-    {
-        ConfigEntry.BoxedValue = value;
-        Tab?.OnOptionChanged(ConfigEntry);
-    }
-}

MiraAPI/LocalSettings/SettingTypes/LocalSliderSetting.cs

@@ -1,120 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.LocalSettings.SettingTypes;
-
-/// <summary>
-/// Local setting class for sliders.
-/// </summary>
-public class LocalSliderSetting : LocalSettingBase<float>
-{
-    /// <summary>
-    /// Gets the range of the slider.
-    /// </summary>
-    public FloatRange SliderRange { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the value should be displayed next to name.
-    /// </summary>
-    public bool DisplayValue { get; }
-
-    /// <summary>
-    /// Gets a format for the text to use to format the number.
-    /// </summary>
-    public string FormatString { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the value should be rounded.
-    /// </summary>
-    public bool RoundValue { get; }
-
-    /// <summary>
-    /// Gets the suffix for the number value.
-    /// </summary>
-    public MiraNumberSuffixes SuffixType { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LocalSliderSetting"/> class.
-    /// </summary>
-    /// <inheritdoc/>
-    /// <param name="sliderRange">The value range.</param>
-    /// <param name="suffixType">The suffix used for formating.</param>
-    /// <param name="formatString">The format string used for formating.</param>
-    /// <param name="roundValue">Should the value be rounded.</param>
-    public LocalSliderSetting(
-        Type tab,
-        ConfigEntryBase configEntry,
-        string? name = null,
-        string? description = null,
-        FloatRange? sliderRange = null,
-        bool displayValue = false,
-        MiraNumberSuffixes? suffixType = null,
-        string? formatString = null,
-        bool roundValue = false)
-        : base(tab, configEntry, name, description)
-    {
-        SliderRange = sliderRange ?? new FloatRange(0, 100);
-        DisplayValue = displayValue;
-        SuffixType = suffixType ?? MiraNumberSuffixes.None;
-        FormatString = formatString ?? "0.0";
-        RoundValue = roundValue;
-    }
-
-    /// <inheritdoc />
-    public override GameObject CreateOption(ToggleButtonBehaviour toggle, SlideBar slider, Transform parent, ref float offset, ref int order, bool last)
-    {
-        var newSlider = Object.Instantiate(slider, parent).GetComponent<SlideBar>();
-        var rollover = newSlider.GetComponent<ButtonRolloverHandler>();
-        newSlider.Title = newSlider.transform.FindChild("Text_TMP").GetComponent<TextMeshPro>(); // Why the hell slider has a title property that is not even assigned???
-        newSlider.Title.GetComponent<TextTranslatorTMP>().Destroy();
-        newSlider.gameObject.SetActive(true);
-        newSlider.Bar.color = Tab!.TabAppearance.SliderColor;
-
-        if (order == 2)
-            offset += 0.5f;
-
-        newSlider.Bar.transform.localPosition = new Vector3(2.85f, 0, 0);
-        newSlider.transform.localPosition = new Vector3(-2.12f, 1.85f - offset, -7);
-        newSlider.name = Name;
-        newSlider.Range = new FloatRange(-1.5f, 1.5f);
-        newSlider.SetValue(Mathf.InverseLerp(SliderRange.min, SliderRange.max, GetValue()));
-        rollover.OutColor = Tab!.TabAppearance.SliderColor;
-        rollover.OverColor = Tab!.TabAppearance.SliderHoverColor;
-        newSlider.Title.transform.localPosition = new Vector3(0.5f, 0, -1f);
-        newSlider.Title.horizontalAlignment = DisplayValue ? HorizontalAlignmentOptions.Left : HorizontalAlignmentOptions.Center;
-        newSlider.Title.text = GetValueText();
-
-        newSlider.OnValueChange.AddListener((UnityAction)(() =>
-        {
-            SetValue(RoundValue
-                ? Mathf.Round(Mathf.Lerp(SliderRange.min, SliderRange.max, newSlider.Value))
-                : Mathf.Lerp(SliderRange.min, SliderRange.max, newSlider.Value));
-
-            newSlider.Title.text = GetValueText();
-        }));
-
-        order = 1;
-        offset += 0.5f;
-        return newSlider.gameObject;
-    }
-
-    /// <inheritdoc/>
-    protected override string GetValueText()
-    {
-        if (DisplayValue)
-        {
-            var value = GetValue();
-            var formated = Helpers.FormatValue(value, SuffixType, FormatString);
-            var maxFormated = Helpers.FormatValue(SliderRange.max, SuffixType, FormatString);
-            return $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF - Chat Message Masked\">{Name}: <b>{formated} / {maxFormated}</font></b>";
-        }
-
-        return $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF - Chat Message Masked\">{Name}</font></b>";
-    }
-}

MiraAPI/LocalSettings/SettingTypes/LocalToggleSetting.cs

@@ -1,88 +0,0 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.Utilities;
-using Reactor.Localization.Utilities;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.LocalSettings.SettingTypes;
-
-/// <summary>
-/// Local setting class for toggles.
-/// </summary>
-public class LocalToggleSetting : LocalSettingBase<bool>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LocalToggleSetting"/> class.
-    /// </summary>
-    /// <inheritdoc/>
-    public LocalToggleSetting(
-        Type tab,
-        ConfigEntryBase configEntry,
-        string? name = null,
-        string? description = null
-        ) : base(tab, configEntry, name, description)
-    {
-    }
-
-    /// <inheritdoc />
-    public override GameObject CreateOption(ToggleButtonBehaviour toggle, SlideBar slider, Transform parent, ref float offset, ref int order, bool last)
-    {
-        var toggleObject = Object.Instantiate(toggle, parent).GetComponent<ToggleButtonBehaviour>();
-        var tmp = toggleObject.transform.FindChild("Text_TMP").GetComponent<TextMeshPro>();
-        var passiveButton = toggleObject.GetComponent<PassiveButton>();
-        var rollover = toggleObject.GetComponent<ButtonRolloverHandler>();
-        toggleObject.gameObject.SetActive(true);
-
-        if (last && order == 1)
-        {
-            // Toggle in the middle
-            toggleObject.transform.localPosition = new Vector3(0, 1.85f - offset, -7);
-        }
-        else
-        {
-            toggleObject.transform.localPosition = new Vector3(order == 1 ? -1.185f : 1.185f, 1.85f - offset, -7);
-        }
-
-        toggleObject.BaseText = CustomStringName.CreateAndRegister(Name);
-        toggleObject.UpdateText(GetValue());
-        toggleObject.name = Name;
-        toggleObject.Background.color = GetValue() ? Tab!.TabAppearance.ToggleActiveColor : Tab!.TabAppearance.ToggleInactiveColor;
-        passiveButton.OnClick = new UnityEngine.UI.Button.ButtonClickedEvent();
-        rollover.OverColor = Tab!.TabAppearance.ToggleHoverColor;
-
-        passiveButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            SetValue(!GetValue());
-            toggleObject.UpdateText(GetValue());
-            toggleObject.Background.color = GetValue() ? Tab!.TabAppearance.ToggleActiveColor : Tab!.TabAppearance.ToggleInactiveColor;
-        }));
-        passiveButton.OnMouseOver.AddListener((UnityAction)(() =>
-        {
-            if (!Description.IsNullOrWhiteSpace())
-            {
-                tmp.text = Description;
-            }
-        }));
-        passiveButton.OnMouseOut.AddListener((UnityAction)(() =>
-        {
-            toggleObject.UpdateText(GetValue());
-            toggleObject.Background.color = GetValue() ? Tab!.TabAppearance.ToggleActiveColor : Tab!.TabAppearance.ToggleInactiveColor;
-        }));
-
-        Helpers.DivideSize(toggleObject.gameObject, 1.1f);
-
-        order++;
-        if (order > 2 && !last)
-        {
-            offset += 0.5f;
-            order = 1;
-        }
-        if (last)
-            offset += 0.6f;
-
-        return toggleObject.gameObject;
-    }
-}

MiraAPI/MiraApiPlugin.cs

@@ -1,6 +1,4 @@
-global using static Reactor.Utilities.Logger<MiraAPI.MiraApiPlugin>;
-using System;
-using BepInEx;
+using BepInEx;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using MiraAPI.PluginLoading;
@@ -22,11 +20,6 @@ namespace MiraAPI;
 [ReactorModFlags(ModFlags.RequireOnAllClients)]
 public partial class MiraApiPlugin : BasePlugin
 {
-    /// <summary>
-    /// Gets a value indicating whether the current device is running Starlight (on mobile).
-    /// </summary>
-    public static bool IsMobile => Constants.GetPlatformType() is Platforms.Android or Platforms.IPhone;
-
     /// <summary>
     /// Gets the branding Mira API color.
     /// </summary>
@@ -37,11 +30,6 @@ public partial class MiraApiPlugin : BasePlugin
     /// </summary>
     public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
 
-    /// <summary>
-    /// Gets a value indicating whether the current build is a development build or not. This mostly avoids confusion for users asking why the mod appears red.
-    /// </summary>
-    public static bool IsDevBuild => Version.Contains("ci", StringComparison.OrdinalIgnoreCase) || Version.Contains("dev", StringComparison.OrdinalIgnoreCase);
-
     private static MiraPluginManager? PluginManager { get; set; }
     internal Harmony Harmony { get; } = new(Id);
 
@@ -50,7 +38,7 @@ public partial class MiraApiPlugin : BasePlugin
     {
         Harmony.PatchAll();
 
-        ReactorCredits.Register("Mira API", Version, IsDevBuild, ReactorCredits.AlwaysShow);
+        ReactorCredits.Register("Mira API", Version, true, ReactorCredits.AlwaysShow);
 
         PluginManager = new MiraPluginManager();
         PluginManager.Initialize();

MiraAPI/MiraApiSettings.cs

@@ -1,101 +0,0 @@
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings;
-using MiraAPI.LocalSettings.Attributes;
-using MiraAPI.Patches;
-using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI;
-
-/// <summary>
-/// Mira API Config File Handler.
-/// </summary>
-public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
-{
-    /// <inheritdoc />
-    public override string TabName => "Mira API";
-
-    /// <inheritdoc />
-    public override LocalSettingTabAppearance TabAppearance => new()
-    {
-        TabButtonHoverColor = MiraApiPlugin.MiraColor,
-        TabIcon = MiraAssets.SettingsIcon,
-        HideIconOnHover = false,
-    };
-
-    /// <summary>
-    /// Gets or sets the value stored for scaling buttons properly.
-    /// </summary>
-    public static float OldButtonScaleFactor { get; set; }
-
-    /// <inheritdoc />
-    public override void Open()
-    {
-        base.Open();
-        OldButtonScaleFactor = ButtonUIFactorSlider.Value;
-    }
-
-    /// <inheritdoc />
-    public override void OnOptionChanged(ConfigEntryBase configEntry)
-    {
-        base.OnOptionChanged(configEntry);
-        if (configEntry == ButtonUIFactorSlider)
-        {
-            if (HudManager.InstanceExists)
-            {
-                HudManagerPatches.ResizeUI(1f / OldButtonScaleFactor);
-                HudManagerPatches.ResizeUI(ButtonUIFactorSlider.Value);
-            }
-            OldButtonScaleFactor = ButtonUIFactorSlider.Value;
-        }
-        else if (configEntry == SetFpsSlider)
-        {
-            Application.targetFrameRate = (int)SetFpsSlider.Value;
-        }
-    }
-
-    /// <summary>
-    /// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Visuals/UI", "Show Modifiers HUD on Left Side", false);
-
-    /// <summary>
-    /// Gets whether to show keybinds on buttons.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> ShowKeybinds { get; private set; } = config.Bind("Visuals/UI", "Show Keybinds on Buttons", true);
-
-    /// <summary>
-    /// Gets the scale of the buttons.
-    /// </summary>
-    [LocalSliderSetting(min: 0.5f, max: 1.5f, suffixType: MiraNumberSuffixes.Multiplier, formatString: "0.00", displayValue: true)]
-    public ConfigEntry<float> ButtonUIFactorSlider { get; private set; } =
-        config.Bind("Visuals/UI", "Button Scale Factor", 0.75f);
-
-    /// <summary>
-    /// Gets the fps specified by the player.
-    /// </summary>
-    [LocalSliderSetting(min: 60f, max: 240f, suffixType: MiraNumberSuffixes.None, formatString: "0", displayValue: true, roundValue: true)]
-    public ConfigEntry<float> SetFpsSlider { get; private set; } =
-        config.Bind("Visuals/UI", "Max FPS", 120f);
-
-    /// <summary>
-    /// Gets whether to apply cosmetic changes to the TaskAdder.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> PrettyTaskAdder { get; private set; } = config.Bind("Freeplay", "Pretty Task Laptop", true);
-
-    /// <summary>
-    /// Gets whether to show the red flash from sabotages.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> EnableSabotageFlashes { get; private set; } = config.Bind("Accessibility", "Enable Sabotage Flashes", true);
-
-    /// <summary>
-    /// Gets whether to enable the sabotage sound effects or not.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> EnableSabotageBlares { get; private set; } = config.Bind("Accessibility", "Enable Sabotage Blare", true);
-}

MiraAPI/Modifiers/BaseModifier.cs

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

MiraAPI/Modifiers/ModifierComponent.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Text;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.LocalSettings;
-using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Patches.Roles;
+using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
+using TMPro;
 using UnityEngine;
 
 namespace MiraAPI.Modifiers;
@@ -26,13 +26,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     public ImmutableList<BaseModifier> ActiveModifiers { get; private set; } = ImmutableList<BaseModifier>.Empty;
 
-    private ModifierDisplayComponent? ModifierDisplay { get; set; }
-
     [HideFromIl2Cpp]
     private List<BaseModifier> Modifiers { get; set; } = [];
 
     private PlayerControl _player = null!;
 
+    private TextMeshPro _modifierText = null!;
+
     private readonly List<BaseModifier> _toRemove = [];
 
     private readonly List<BaseModifier> _toAdd = [];
@@ -47,7 +47,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _player = GetComponent<PlayerControl>();
         if (_player == null)
         {
-            Error("ModifierComponent could not find PlayerControl on the same GameObject.");
+            Logger<MiraApiPlugin>.Error("ModifierComponent could not find PlayerControl on the same GameObject.");
             Destroy(this);
             return;
         }
@@ -61,8 +61,8 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             return;
         }
 
-        ModifierDisplay = ModifierDisplayComponent.CreateDisplay();
-        ModifierDisplay?.UpdateModifiersList(Modifiers);
+        _modifierText = Helpers.CreateTextLabel("ModifierText", HudManager.Instance.transform, AspectPosition.EdgeAlignments.RightTop, new Vector3(10.1f, 3.5f, 0), textAlignment: TextAlignmentOptions.Right);
+        _modifierText.verticalAlignment = VerticalAlignmentOptions.Top;
     }
 
     private void FixedUpdate()
@@ -71,15 +71,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         foreach (var modifier in _toRemove.ToArray())
         {
             _toRemove.Remove(modifier);
-            try
-            {
-                modifier.OnDeactivate();
-            }
-            catch (Exception e)
-            {
-                Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
-
+            modifier.OnDeactivate();
             Modifiers.Remove(modifier);
         }
 
@@ -89,14 +81,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
             modifier.Initialized = true;
-            try
-            {
-                modifier.OnActivate();
-            }
-            catch (Exception e)
-            {
-                Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
+            modifier.OnActivate();
 
             if (modifier is TimedModifier { AutoStart: true } timer)
             {
@@ -108,7 +93,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         {
             if (_player.AmOwner && HudManager.InstanceExists)
             {
-                ModifierDisplay?.UpdateModifiersList(Modifiers);
+                HudManager.Instance.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled);
             }
 
             ActiveModifiers = Modifiers.ToImmutableList();
@@ -116,30 +101,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         foreach (var modifier in ActiveModifiers)
         {
-            try
-            {
-                modifier.FixedUpdate();
-            }
-            catch (Exception e)
-            {
-                Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
-        }
-
-        if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
-        {
-            var taskPanelOpen = HudManager.Instance.TaskPanel.open;
-            var roleTabOpen = HudManagerPatches.RoleTab != null && HudManagerPatches.RoleTab.open;
-            var leftSideHud = LocalSettingsTabSingleton<MiraApiSettings>.Instance.ModifiersHudLeftSide.Value;
-
-            if (leftSideHud && (taskPanelOpen || roleTabOpen))
-            {
-                ModifierDisplay!.gameObject.SetActive(false);
-            }
-            else
-            {
-                ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
-            }
+            modifier.FixedUpdate();
         }
     }
 
@@ -147,15 +109,34 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         foreach (var modifier in ActiveModifiers)
         {
-            try
-            {
-                modifier.Update();
-            }
-            catch (Exception e)
-            {
-                Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
-            }
+            modifier.Update();
         }
+
+        if (!_modifierText || !_player.AmOwner)
+        {
+            return;
+        }
+
+        if (MeetingHud.Instance)
+        {
+            return;
+        }
+
+        var showText = false;
+        var builder = new StringBuilder("<b><size=130%>Modifiers:</b></size>\n");
+
+        foreach (var modifier in ActiveModifiers)
+        {
+            if (modifier.HideOnUi)
+            {
+                continue;
+            }
+
+            showText = true;
+            builder.AppendLine(modifier.GetHudString());
+        }
+
+        _modifierText.text = showText ? builder.ToString() : string.Empty;
     }
 
     private void OnDestroy()
@@ -336,7 +317,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         var modifier = modifiers.FirstOrDefault();
         if (modifier is null)
         {
-            Error($"Cannot remove modifier {type.Name} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {type.Name} because it is not active.");
             return;
         }
 
@@ -352,7 +333,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         if (!ActiveModifiers.Contains(modifier))
         {
-            Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
             return;
         }
 
@@ -382,7 +363,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         var modifier = GetModifier(uniqueId);
         if (modifier == null)
         {
-            Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
             return;
         }
 
@@ -412,19 +393,19 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         // TODO: Make a proper synchronization system.
         if (LobbyBehaviour.Instance)
         {
-            Warning($"Modifiers added in the lobby won't sync to new players!");
+            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)
         {
-            Error($"Player already has modifier with id {id}!");
+            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {id}!");
             return null;
         }
 
         if (ActiveModifiers.Contains(modifier))
         {
-            Error($"Player already has this modifier!");
+            Logger<MiraApiPlugin>.Error($"Player already has this modifier!");
             return null;
         }
 

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -1,226 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using HarmonyLib;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.LocalSettings;
-using MiraAPI.Utilities;
-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 cppPtr) : MonoBehaviour(cppPtr)
-{
-    /// <summary>
-    /// Gets the instance of the Modifier Display.
-    /// </summary>
-    public static ModifierDisplayComponent? Instance { get; private set; }
-
-    private RectTransform _children = null!;
-    private GameObject _modTemplate = null!;
-    private PassiveButton _toggleButton = null!;
-    private TextMeshPro _toggleBtnText = null!;
-
-    private RectTransform _pagination = null!;
-    private TextMeshPro _pageText = null!;
-    private PassiveButton _nextButton = null!;
-    private PassiveButton _backButton = null!;
-
-    private int _currentPage;
-    private const int ItemsPerPage = 3;
-
-    private readonly Dictionary<BaseModifier, ModifierUiComponent> _modifiers = [];
-
-    /// <summary>
-    /// Gets a read only dictionary of the created modifier UI components.
-    /// </summary>
-    [HideFromIl2Cpp]
-    public ReadOnlyDictionary<BaseModifier, ModifierUiComponent> Modifiers => new(_modifiers);
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier display hud is currently open.
-    /// </summary>
-    public bool IsOpen { get; private set; }
-
-    private void Awake()
-    {
-        Instance = this;
-
-        _children = transform.GetChild(0).GetComponent<RectTransform>();
-        _modTemplate = transform.GetChild(2).gameObject;
-
-        _toggleButton = transform.GetChild(1).GetComponent<PassiveButton>();
-        _toggleButton.OnClick = new Button.ButtonClickedEvent();
-        _toggleButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            IsOpen = !IsOpen;
-            _children.gameObject.SetActive(!_children.gameObject.activeSelf);
-        }));
-
-        _toggleButton.ClickSound = HudManager.Instance.GameMenu.StreamerModeButton.GetComponent<PassiveButton>().ClickSound;
-        _toggleButton.HoverSound = HudManager.Instance.GameMenu.StreamerModeButton.GetComponent<PassiveButton>().HoverSound;
-        _toggleButton.inactiveSprites = _toggleButton.transform.GetChild(1).gameObject;
-        _toggleBtnText = _toggleButton.transform.GetChild(0).GetComponent<TextMeshPro>();
-
-        _pagination = _children.transform.GetChild(0).GetComponent<RectTransform>();
-        _pageText = _pagination.transform.GetChild(0).GetComponent<TextMeshPro>();
-        _nextButton = _pagination.transform.GetChild(1).GetComponent<PassiveButton>();
-        _backButton = _pagination.transform.GetChild(2).GetComponent<PassiveButton>();
-
-        _toggleBtnText.font = _pageText.font = _nextButton.buttonText.font = _backButton.buttonText.font = HudManager.Instance.TaskPanel.taskText.font;
-        _toggleBtnText.fontMaterial = _pageText.fontMaterial = _nextButton.buttonText.fontMaterial = _backButton.buttonText.fontMaterial = HudManager.Instance.TaskPanel.taskText.fontMaterial;
-
-        _nextButton.OnClick = new Button.ButtonClickedEvent();
-        _nextButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            _currentPage++;
-            UpdatePage();
-        }));
-
-        _backButton.OnClick = new Button.ButtonClickedEvent();
-        _backButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            _currentPage--;
-            UpdatePage();
-        }));
-
-        IsOpen = false;
-        _children.gameObject.SetActive(false);
-
-        if (LocalSettingsTabSingleton<MiraApiSettings>.Instance.ModifiersHudLeftSide.Value)
-        {
-            var aspect = GetComponent<AspectPosition>();
-            _toggleButton.transform.localPosition = new Vector3(-1f, 2.7f, 0f);
-            _children.transform.localPosition = new Vector3(-0.2f, -0.05f, 0f);
-            aspect.Alignment = AspectPosition.EdgeAlignments.LeftTop;
-            aspect.DistanceFromEdge = new Vector3(1.8f, 2.55f, -20f);
-            aspect.AdjustPosition();
-        }
-    }
-
-    /// <summary>
-    /// Use this to refresh the modifiers UI. Useful if you hide modifiers uis based on options.
-    /// </summary>
-    public void RefreshModifiers()
-    {
-        UpdateModifiersList([.. PlayerControl.LocalPlayer.GetModifierComponent().ActiveModifiers]);
-    }
-
-    /// <summary>
-    /// Use this to toggle the visibility of the modifiers tab.
-    /// </summary>
-    public void ToggleTab()
-    {
-        SetOpened(!IsOpen);
-    }
-
-    /// <summary>
-    /// Use this to set the visibility of the modifiers tab.
-    /// </summary>
-    /// <param name="val">Whether it should be visible or not.</param>
-    public void SetOpened(bool val)
-    {
-        IsOpen = val;
-        _children.gameObject.SetActive(IsOpen);
-        RefreshModifiers();
-    }
-
-    internal void DestroyComponent(ModifierUiComponent component)
-    {
-        _modifiers.Remove(component.Modifier!);
-        component.gameObject.DeepDestroy();
-        RefreshModifiers();
-    }
-
-    [HideFromIl2Cpp]
-    internal static ModifierDisplayComponent CreateDisplay()
-    {
-        var gameObject = Instantiate(MiraAssets.ModifierDisplay.LoadAsset(), HudManager.Instance.transform);
-        var minigame = gameObject.AddComponent<ModifierDisplayComponent>();
-        return minigame;
-    }
-
-    [HideFromIl2Cpp]
-    private ModifierUiComponent CreateForModifier(BaseModifier modifier)
-    {
-        var newMod = Instantiate(_modTemplate, _children.transform);
-        newMod.transform.name = modifier.ModifierName;
-        var comp = newMod.AddComponent<ModifierUiComponent>();
-        comp.Modifier = modifier;
-        return comp;
-    }
-
-    private void UpdatePage()
-    {
-        var totalPages = Mathf.CeilToInt((float)_modifiers.Count / ItemsPerPage);
-        _currentPage = Mathf.Clamp(_currentPage, 0, Mathf.Max(0, totalPages - 1));
-
-        if (_modifiers.Count <= ItemsPerPage)
-        {
-            _modifiers.Do(x => x.Value.gameObject.SetActive(true));
-            _pagination.gameObject.SetActive(false);
-            return;
-        }
-
-        _pagination.gameObject.SetActive(true);
-        if (_pageText != null)
-        {
-            _pageText.text = $"Page {_currentPage + 1}/{Mathf.Max(totalPages, 1)}";
-        }
-
-        _nextButton.gameObject.SetActive(true);
-        _backButton.gameObject.SetActive(true);
-
-        _modifiers.Do(x => x.Value.gameObject.SetActive(false));
-        var start = _currentPage * ItemsPerPage;
-        var end = Mathf.Min(start + ItemsPerPage, _modifiers.Count);
-        var modifiers = _modifiers.ToArray();
-
-        for (var i = start; i < end; i++)
-        {
-            modifiers[i].Value.gameObject.SetActive(true);
-        }
-
-        _pagination.SetAsLastSibling();
-    }
-
-    [HideFromIl2Cpp]
-    internal void UpdateModifiersList(List<BaseModifier> modifiers)
-    {
-        var filteredModifiers = modifiers.Where(x => !x.HideOnUi && x.GetDescription() != string.Empty).ToList();
-        var modifiersToAdd = filteredModifiers.ToList();
-
-        foreach (var mod in _modifiers.ToArray())
-        {
-            if (modifiersToAdd.Contains(mod.Key))
-            {
-                modifiersToAdd.Remove(mod.Key);
-                continue;
-            }
-
-            mod.Value.gameObject.DeepDestroy();
-            _modifiers.Remove(mod.Key);
-        }
-
-        _toggleBtnText.text = $"Modifiers ({filteredModifiers.Count})";
-
-        _toggleButton.gameObject.SetActive(filteredModifiers.Count != 0);
-
-        foreach (var mod in modifiersToAdd)
-        {
-            _modifiers.Add(mod, CreateForModifier(mod));
-        }
-
-        UpdatePage();
-    }
-}

MiraAPI/Modifiers/ModifierDisplay/ModifierUiComponent.cs

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

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -30,7 +30,7 @@ public static class ModifierExtensions
         _ = ModifierManager.GetModifierType(typeId) ?? throw new InvalidOperationException(
             $"Modifier with ID {typeId} is not registered.");
 
-        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args), true);
+        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args));
     }
 
     /// <summary>
@@ -83,7 +83,7 @@ public static class ModifierExtensions
         var modifier = target.GetModifier(typeId, predicate);
         if (modifier is null)
         {
-            Error($"Player {target.PlayerId} does not have modifier with type ID {typeId}.");
+            Logger<MiraApiPlugin>.Error($"Player {target.PlayerId} does not have modifier with type ID {typeId}.");
             return;
         }
 

MiraAPI/Modifiers/ModifierFactory.cs

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

MiraAPI/Modifiers/ModifierManager.cs

@@ -17,18 +17,6 @@ namespace MiraAPI.Modifiers;
 /// </summary>
 public static class ModifierManager
 {
-    /// <summary>
-    /// Gets or sets a value indicating whether modifiers should be assigned to players.
-    /// </summary>
-    public static bool MiraAssignsModifiers { get; set; } = true;
-
-    /// <summary>
-    /// Gets the list of all registered modifiers.
-    /// </summary>
-    public static IReadOnlyList<BaseModifier> Modifiers { get; internal set; } = [];
-
-    internal static List<BaseModifier> InternalModifiers { get; } = [];
-
     private static readonly Dictionary<uint, Type> IdToTypeModifierMap = [];
     private static readonly Dictionary<Type, uint> TypeToIdModifierMap = [];
     private static readonly Dictionary<int, List<uint>> PrioritiesToIdsMap = [];
@@ -87,8 +75,7 @@ public static class ModifierManager
             modifier = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType);
         }
 
-        info.InternalModifiers.Add(modifier);
-        InternalModifiers.Add(modifier);
+        info.Modifiers.Add(modifier);
 
         if (modifier is not GameModifier gameModifier)
         {
@@ -97,7 +84,7 @@ public static class ModifierManager
 
         if (modifierType.GetConstructor(Type.EmptyTypes) == null)
         {
-            Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
+            Logger<MiraApiPlugin>.Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
             return false;
         }
 
@@ -112,11 +99,7 @@ public static class ModifierManager
         return true;
     }
 
-    /// <summary>
-    /// Assigns modifiers to players. ONLY CALL THIS METHOD IF YOU KNOW WHAT YOU ARE DOING.
-    /// </summary>
-    /// <param name="plrs">The players to assign modifiers to.</param>
-    public static void AssignModifiers(List<PlayerControl> plrs)
+    internal static void AssignModifiers(List<PlayerControl> plrs)
     {
         var rand = new Random();
 
@@ -126,7 +109,6 @@ public static class ModifierManager
             .Select(x => Activator.CreateInstance(x.Value) as GameModifier)
             .OfType<GameModifier>()
             .Where(x => x.GetAmountPerGame() > 0 && x.GetAssignmentChance() > 0)
-            .Shuffle()
             .OrderByDescending(x => x.Priority())
             .ToArray();
 
@@ -137,7 +119,7 @@ public static class ModifierManager
             var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
             if (validPlayers.Count == 0)
             {
-                Warning($"No valid players for modifier {modifier.ModifierName}");
+                Logger<MiraApiPlugin>.Warning($"No valid players for modifier {modifier.ModifierName}");
                 continue;
             }
 
@@ -158,7 +140,7 @@ public static class ModifierManager
 
                 if (candidates.Count == 0)
                 {
-                    Warning(
+                    Logger<MiraApiPlugin>.Warning(
                         $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
                     break;
                 }
@@ -166,7 +148,7 @@ public static class ModifierManager
                 var plr = candidates.Random();
                 if (plr == null)
                 {
-                    Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    Logger<MiraApiPlugin>.Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
                     continue;
                 }
 
@@ -179,7 +161,6 @@ public static class ModifierManager
     private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
     {
         return (player.Data.Role is not ICustomRole role || role.IsModifierApplicable(modifier)) &&
-               modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId) &&
-               modifier.CanSpawnOnCurrentMode();
+               modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId);
     }
 }

MiraAPI/Modifiers/Types/GameModifier.cs

@@ -34,15 +34,9 @@ public abstract class GameModifier : BaseModifier
     public virtual bool IsModifierValidOn(RoleBehaviour role) => true;
 
     /// <summary>
-    /// Determines whether the player won the game with this modifier. The modifier with the highest priority will override other modifiers.
+    /// Determines whether the player won the game with this modifier.
     /// </summary>
     /// <param name="reason">The reason why the game ended.</param>
     /// <returns>True if the player won, false if they lost. Return null to use the player's default win condition.</returns>
     public virtual bool? DidWin(GameOverReason reason) => null;
-
-    /// <summary>
-    /// Determines whether the modifier can spawn in general, accounting for gamemodes and everything else.
-    /// </summary>
-    /// <returns>True if the modifier is able to spawn, otherwise false.</returns>
-    public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
 }

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -45,12 +45,12 @@ public abstract class TimedModifier : BaseModifier
     public override bool HideOnUi => !TimerActive;
 
     /// <summary>
-    /// Gets the HUD description for Timed Modifier, including the time remaining.
+    /// Gets the HUD information for Timed Modifier, including the time remaining.
     /// </summary>
-    /// <returns>A string with the time remaining.</returns>
-    public override string GetDescription()
+    /// <returns>A string with the hud information + timer.</returns>
+    public override string GetHudString()
     {
-        return $"Remaining Time: {Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s";
+        return base.GetHudString() + $" <size=70%>({Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s)</size>";
     }
 
     /// <summary>
@@ -80,7 +80,7 @@ public abstract class TimedModifier : BaseModifier
     {
         if (TimerActive)
         {
-            Error("Can't start a timer that has already been started.");
+            Logger<MiraApiPlugin>.Error("Can't start a timer that has already been started.");
             return;
         }
 

MiraAPI/Networking/CustomGameOverRpc.cs

@@ -50,7 +50,7 @@ public class CustomGameOverRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<
         {
             if (!gameOver.VerifyCondition(innerNetObject, [.. data.Winners]))
             {
-                Info($"Game over condition not met for {gameOver.GetType().Name}");
+                Logger<MiraApiPlugin>.Info($"Game over condition not met for {gameOver.GetType().Name}");
                 return;
             }
 
@@ -64,7 +64,7 @@ public class CustomGameOverRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<
         else
         {
             CustomGameOver.Instance = null;
-            Error($"Unknown game over reason: {data.Reason}");
+            Logger<MiraApiPlugin>.Error($"Unknown game over reason: {data.Reason}");
         }
     }
 }

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Linq;
 using AmongUs.Data;
 using AmongUs.GameOptions;
@@ -7,14 +6,10 @@ using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Utilities;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
-using Rewired;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace MiraAPI.Networking;
 
@@ -24,7 +19,7 @@ namespace MiraAPI.Networking;
 public static class CustomMurderRpc
 {
     /// <summary>
-    /// Networked Custom Murder method, ran by clients for the host to confirm kills.
+    /// Networked Custom Murder method.
     /// </summary>
     /// <param name="source">The killer.</param>
     /// <param name="target">The player to murder.</param>
@@ -34,6 +29,7 @@ public static class CustomMurderRpc
     /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
     /// <param name="showKillAnim">Should the kill animation be shown.</param>
     /// <param name="playKillSound">Should the kill sound be played.</param>
+    [MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before, SendImmediately = true)]
     public static void RpcCustomMurder(
         this PlayerControl source,
         PlayerControl target,
@@ -44,117 +40,16 @@ public static class CustomMurderRpc
         bool showKillAnim = true,
         bool playKillSound = true)
     {
-        source.RpcCustomMurder(
-            target,
-            MeetingCheck.Ignore,
-            didSucceed,
-            resetKillTimer,
-            createDeadBody,
-            teleportMurderer,
-            showKillAnim,
-            playKillSound);
-    }
-
-    /// <summary>
-    /// Networked Custom Murder method, which checks for meetings as well, ran by clients for the host to confirm kills.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
-    /// <param name="didSucceed">Whether the murder was successful or not.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before)]
-    public static void RpcCustomMurder(
-        this PlayerControl source,
-        PlayerControl target,
-        MeetingCheck inMeeting,
-        bool didSucceed = true,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        if (LobbyBehaviour.Instance)
-        {
-            return;
-        }
         var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
 
-        var beforeMurderEvent = new BeforeMurderEvent(source, target, inMeeting);
+        var beforeMurderEvent = new BeforeMurderEvent(source, target);
         MiraEventManager.InvokeEvent(beforeMurderEvent);
-        var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null;
-        if ((inMeeting is MeetingCheck.ForMeeting && !isMeetingActive) || (inMeeting is MeetingCheck.OutsideMeeting && isMeetingActive))
-        {
-            beforeMurderEvent.Cancel();
-        }
 
-        if (target.ProtectedByGa())
-        {
-            beforeMurderEvent.Cancel();
-            murderResultFlags = MurderResultFlags.FailedProtected;
-        }
-        else if (beforeMurderEvent.IsCancelled)
+        if (beforeMurderEvent.IsCancelled)
         {
             murderResultFlags = MurderResultFlags.FailedError;
         }
 
-        if (beforeMurderEvent.IsCancelled && source.AmOwner)
-        {
-            source.isKilling = true;
-        }
-
-        if (!PlayerControl.LocalPlayer.IsHost())
-        {
-            return;
-        }
-
-        RpcConfirmCustomMurder(
-            PlayerControl.LocalPlayer,
-            source,
-            target,
-            murderResultFlags,
-            resetKillTimer,
-            createDeadBody,
-            teleportMurderer,
-            showKillAnim,
-            playKillSound);
-    }
-
-    /// <summary>
-    /// Networked Custom Murder method, which checks for meetings as well, ran by clients for the host to confirm kills.
-    /// </summary>
-    /// <param name="host">The game host.</param>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="murderResultFlags">End result for the murder.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.ConfirmCustomMurder, LocalHandling = RpcLocalHandling.After)]
-    public static void RpcConfirmCustomMurder(
-        this PlayerControl host,
-        PlayerControl source,
-        PlayerControl target,
-        MurderResultFlags murderResultFlags,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        if (LobbyBehaviour.Instance || !host.IsHost() || target.Data.IsDead || target.Data.Disconnected)
-        {
-            source.isKilling = false;
-            return;
-        }
-
         var murderResultFlags2 = MurderResultFlags.DecisionByHost | murderResultFlags;
 
         source.CustomMurder(
@@ -189,7 +84,8 @@ public static class CustomMurderRpc
         bool playKillSound = true)
     {
         source.isKilling = false;
-        if (resultFlags.HasFlag(MurderResultFlags.FailedError) || LobbyBehaviour.Instance)
+        var data = target.Data;
+        if (resultFlags.HasFlag(MurderResultFlags.FailedError))
         {
             return;
         }
@@ -273,14 +169,7 @@ public static class CustomMurderRpc
 
             if (showKillAnim)
             {
-                try
-                {
-                    HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, target.Data);
-                }
-                catch (Exception e)
-                {
-                    Error($"Error with kill animation: {e.ToString()}");
-                }
+                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
             }
 
             target.cosmetics.SetNameMask(false);
@@ -293,7 +182,7 @@ public static class CustomMurderRpc
             source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,
             source.shapeshiftTargetPlayerId,
             target.PlayerId);
-        source.MyPhysics.StartCoroutine(source.KillAnimations.RandomSnapshot().CoPerformCustomKill(source, target, createDeadBody, teleportMurderer));
+        source.MyPhysics.StartCoroutine(source.KillAnimations.Random()?.CoPerformCustomKill(source, target, createDeadBody, teleportMurderer));
     }
 
     /// <summary>
@@ -312,12 +201,8 @@ public static class CustomMurderRpc
         bool createDeadBody = true,
         bool teleportMurderer = true)
     {
-        if (LobbyBehaviour.Instance)
-        {
-            yield break;
-        }
         var cam = Camera.main?.GetComponent<FollowerCamera>();
-        var isParticipant = source.AmOwner || target.AmOwner;
+        var isParticipant = PlayerControl.LocalPlayer == source || PlayerControl.LocalPlayer == target;
         var sourcePhys = source.MyPhysics;
 
         if (teleportMurderer)
@@ -337,7 +222,7 @@ public static class CustomMurderRpc
 
         if (createDeadBody)
         {
-            deadBody = Object.Instantiate(GameManager.Instance.GetDeadBody(source.Data.Role));
+            deadBody = Object.Instantiate(GameManager.Instance.DeadBodyPrefab);
             deadBody.enabled = false;
             deadBody.ParentId = target.PlayerId;
             deadBody.bodyRenderers.ToList().ForEach(target.SetPlayerMaterialColors);
@@ -348,13 +233,6 @@ public static class CustomMurderRpc
             deadBody.transform.position = vector;
         }
 
-        source.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
-        target.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
-
-        // no idea if this causes bugs, but innersloth is brain-dead
-        // I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF
-        PlayerControl.LocalPlayer.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
-
         if (isParticipant)
         {
             if (cam != null)
@@ -386,7 +264,7 @@ public static class CustomMurderRpc
             deadBody.enabled = true;
         }
 
-        var afterMurderEvent = new AfterMurderEvent(source, target, deadBody);
+        var afterMurderEvent = new AfterMurderEvent(source, target);
         MiraEventManager.InvokeEvent(afterMurderEvent);
 
         if (!isParticipant)
@@ -403,24 +281,3 @@ public static class CustomMurderRpc
         source.isKilling = false;
     }
 }
-
-/// <summary>
-/// Checks for custom murders.
-/// </summary>
-public enum MeetingCheck
-{
-    /// <summary>
-    /// Checks for meetings.
-    /// </summary>
-    ForMeeting,
-
-    /// <summary>
-    /// Checks for a meeting to not be active.
-    /// </summary>
-    OutsideMeeting,
-
-    /// <summary>
-    /// Doesn't check for a meeting at all.
-    /// </summary>
-    Ignore,
-}

MiraAPI/Networking/MiraRpc.cs

@@ -35,11 +35,6 @@ public enum MiraRpc : uint
     /// </summary>
     CustomMurder,
 
-    /// <summary>
-    /// Custom Murder RPC Confirmation.
-    /// </summary>
-    ConfirmCustomMurder,
-
     /// <summary>
     /// Custom Game Over RPC.
     /// </summary>
@@ -49,9 +44,4 @@ public enum MiraRpc : uint
     /// Custom RPC to undo a player's vote.
     /// </summary>
     RemoveVote,
-
-    /// <summary>
-    /// Custom RPC to replace Among Us CastVote.
-    /// </summary>
-    CastVote,
 }

MiraAPI/Patches/.editorconfig

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

MiraAPI/Patches/Accessibility/HudManagerFlashPatches.cs

@@ -1,67 +0,0 @@
-using System.Collections;
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using HarmonyLib;
-using MiraAPI.LocalSettings;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Accessibility;
-[HarmonyPatch]
-public static class HudManagerFlashPatches
-{
-    [HarmonyPatch(typeof(HudManager), nameof(HudManager.StartReactorFlash))]
-    [HarmonyPrefix]
-    public static bool ReactorFlashPrefix(HudManager __instance)
-    {
-        if (__instance.ReactorFlash == null)
-        {
-            __instance.ReactorFlash = __instance.StartCoroutine(CoReactorFlash().WrapToIl2Cpp());
-        }
-
-        return false;
-    }
-    [HarmonyPatch(typeof(HudManager), nameof(HudManager.StartOxyFlash))]
-    [HarmonyPrefix]
-    public static bool OxygenFlashPrefix(HudManager __instance)
-    {
-        if (__instance.OxyFlash == null)
-        {
-            __instance.OxyFlash = __instance.StartCoroutine(CoReactorFlash().WrapToIl2Cpp());
-        }
-
-        return false;
-    }
-    public static IEnumerator CoReactorFlash()
-    {
-        if (!HudManager.InstanceExists)
-        {
-            yield break;
-        }
-        var hudManager = HudManager.Instance;
-        WaitForSeconds wait = new WaitForSeconds(1f);
-        bool light = false;
-
-        hudManager.FullScreen.color = new Color(1f, 0f, 0f, 0.37254903f);
-        while (true)
-        {
-            var settins = LocalSettingsTabSingleton<MiraApiSettings>.Instance;
-            hudManager.FullScreen.gameObject.SetActive(settins.EnableSabotageFlashes.Value && !hudManager.FullScreen.gameObject.activeSelf);
-            if (settins.EnableSabotageBlares.Value)
-            {
-                SoundManager.Instance.PlaySound(ShipStatus.Instance.SabotageSound, false, 1f, null);
-            }
-            light = !light;
-
-            /*if (!MiraApiPlugin.IsMobile)
-            {
-                if (hudManager.lightFlashHandle == null)
-                {
-                    hudManager.lightFlashHandle = DualshockLightManager.Instance.AllocateLight();
-                    hudManager.lightFlashHandle.color = new Color(1f, 0f, 0f, 1f);
-                    hudManager.lightFlashHandle.intensity = 1f;
-                }
-                hudManager.lightFlashHandle.color.SetAlpha(light ? 1f : 0f);
-            }*/
-            yield return wait;
-        }
-    }
-}