offset buttons for android

2025.3.25 (16.0.0) support

.editorconfig

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

AmongUs.props

@@ -1,8 +1,8 @@
 <Project>
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.3.25" PrivateAssets="all" />
+        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
+        <PackageReference Include="AmongUs.GameLibs.Android" Version="2025.4.20" 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" />

MiraAPI.Example/ExampleEventHandlers.cs

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

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,12 +1,9 @@
-using Il2CppSystem.Collections.Generic;
-using MiraAPI.Example.Options.Modifiers;
+using MiraAPI.Example.Options.Modifiers;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities.Extensions;
 using UnityEngine;
-using Random = System.Random;
 
 namespace MiraAPI.Example.Modifiers;
 

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,6 +1,4 @@
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers;
 

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,4 +1,5 @@
 using AmongUs.GameOptions;
+using MiraAPI.Patches.Stubs;
 using MiraAPI.Roles;
 using Reactor.Utilities;
 using TMPro;
@@ -14,6 +15,8 @@ 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,
@@ -22,35 +25,54 @@ public class ChameloenRole : CrewmateRole, ICustomRole
 
     public override void Initialize(PlayerControl player)
     {
-        Player = player;
-        Logger<ExamplePlugin>.Error("Initializing ChamelonRole for player: " + player.PlayerId);
+        Logger<ExamplePlugin>.Info("Initializing ChamelonRole for player: " + player.PlayerId);
+        RoleBehaviourStubs.Initialize(this, player);
+        _shouldHide = true;
     }
 
-    public void PlayerControlFixedUpdate(PlayerControl playerControl)
+    public void FixedUpdate()
     {
-        if (playerControl.MyPhysics.Velocity.magnitude > 0)
+        if (!Player || !_shouldHide)
         {
-            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            TextMeshPro tmp = playerControl.cosmetics.nameText;
+            return;
+        }
+
+        if (Player.MyPhysics.Velocity.magnitude > 0)
+        {
+            var rend = Player.cosmetics.currentBodySprite.BodySprite;
+            var tmp = Player.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 playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
+            foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
             {
                 cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
             }
         }
         else
         {
-            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);
+            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);
 
-            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
+            foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
             {
-                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, Player.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/Events/MiraEventHandle.cs

@@ -0,0 +1,22 @@
+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,7 +28,14 @@ public static class MiraEventManager
 
         foreach (var handler in handlers)
         {
-            ((Action<T>)handler.EventHandler).Invoke(eventInstance);
+            try
+            {
+                ((Action<T>)handler.EventHandler).Invoke(eventInstance);
+            }
+            catch (Exception ex)
+            {
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
+            }
         }
 
         return true;
@@ -50,7 +57,14 @@ public static class MiraEventManager
 
         foreach (var handler in handlers)
         {
-            handler.EventHandler.DynamicInvoke(eventInstance);
+            try
+            {
+                handler.EventHandler.DynamicInvoke(eventInstance);
+            }
+            catch (Exception ex)
+            {
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
+            }
         }
 
         return true;
@@ -62,12 +76,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>
-    public static void RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
+    /// <returns>An event handle to use when unregistering the event.</returns>
+    public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
     {
         if (!type.IsSubclassOf(typeof(MiraEvent)))
         {
-            Logger<MiraApiPlugin>.Error($"Type must be a subclass of MiraEvent: {type.FullName}");
-            return;
+            throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}");
         }
 
         EventWrappers.TryAdd(type, []);
@@ -84,6 +98,7 @@ public static class MiraEventManager
         }
 
         handlers.Insert(index, eventWrapper);
+        return new MiraEventHandle(type, eventWrapper);
     }
 
     /// <summary>
@@ -92,7 +107,8 @@ 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>
-    public static void RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
+    /// <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
     {
         EventWrappers.TryAdd(typeof(T), []);
 
@@ -107,5 +123,30 @@ 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,14 +15,21 @@ 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>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target)
+    /// <param name="deadBody">The player's vody, if it exists.</param>
+    public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody)
     {
         Source = source;
         Target = target;
+        DeadBody = deadBody;
     }
 }

MiraAPI/Events/Vanilla/Map/UpdateSystemEvent.cs

@@ -24,6 +24,7 @@ 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/Player/PlayerDeathEvent.cs

@@ -15,14 +15,21 @@ 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>
-    public PlayerDeathEvent(PlayerControl player, DeathReason reason)
+    /// <param name="deadBody">The player's body, if it exists.</param>
+    public PlayerDeathEvent(PlayerControl player, DeathReason reason, DeadBody? deadBody)
     {
         Player = player;
         DeathReason = reason;
+        DeadBody = deadBody;
     }
 }

MiraAPI/GameEnd/CustomGameOver.cs

@@ -63,7 +63,7 @@ public abstract class CustomGameOver
         var reason = GameOverManager.GetGameOverId<T>();
         var data = new GameOverData(reason, [.. winners]);
 
-        Rpc<CustomGameOverRpc>.Instance.Send(PlayerControl.LocalPlayer, data, true);
+        Rpc<CustomGameOverRpc>.Instance.Send(PlayerControl.LocalPlayer, data);
     }
 
     /// <summary>

MiraAPI/GameModes/.editorconfig

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

MiraAPI/GameModes/CustomGameModeManager.cs

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

MiraAPI/GameOptions/IModdedOption.cs

@@ -46,11 +46,6 @@ public interface IModdedOption
     /// </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>
@@ -83,23 +78,4 @@ public interface IModdedOption
     /// </summary>
     /// <param name="data">>The byte array representing the network data.</param>
     void HandleNetData(byte[] data);
-
-    /// <summary>
-    /// Saves the option to a preset configuration file.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile representing the preset configuration.</param>
-    /// <param name="saveDefault">Indicates whether to save the default value instead of the current value.</param>
-    void SaveToPreset(ConfigFile presetConfig, bool saveDefault = false);
-
-    /// <summary>
-    /// Binds the option to a configuration file.
-    /// </summary>
-    /// <param name="config">The ConfigFile to bind the option to.</param>
-    void Bind(ConfigFile config);
-
-    /// <summary>
-    /// Loads the option from a preset configuration file, applying the values to the option's configuration.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile representing the preset configuration.</param>
-    void LoadFromPreset(ConfigFile presetConfig);
 }

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -42,10 +42,12 @@ public static class ModdedOptionsManager
 
         Groups.Add(group);
         TypeToGroup.Add(type, group);
-        pluginInfo.InternalOptionGroups.Add(group);
+        pluginInfo.OptionGroups.Add(group);
 
         typeof(OptionGroupSingleton<>).MakeGenericType(type)
+#pragma warning disable S3011
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
+#pragma warning restore S3011
             .SetValue(null, group);
 
         return true;
@@ -119,7 +121,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);
     }
@@ -140,7 +142,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;
@@ -156,7 +158,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];
@@ -173,7 +175,6 @@ public static class ModdedOptionsManager
     /// </summary>
     /// <param name="__originalMethod">The original setter method.</param>
     /// <param name="value">The new object value.</param>
-    // ReSharper disable once InconsistentNaming
     public static void PropertySetterPatch(MethodBase __originalMethod, object value)
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod() == __originalMethod).Value;
@@ -186,7 +187,6 @@ public static class ModdedOptionsManager
     /// <param name="__originalMethod">The original getter method.</param>
     /// <param name="__result">The result of the property getter.</param>
     /// <returns>False so the original getter gets skipped.</returns>
-    // ReSharper disable InconsistentNaming
     public static bool PropertyGetterPatch(MethodBase __originalMethod, ref object __result)
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod() == __originalMethod).Value;

MiraAPI/GameOptions/ModifierOptionGroup.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -48,7 +48,6 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="suffixType">The suffix type.</param>
     /// <param name="formatString">Optional format string for the option screen.</param>
     /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -57,8 +56,7 @@ public class ModdedNumberOption : ModdedOption<float>
         float increment,
         MiraNumberSuffixes suffixType,
         string? formatString = null,
-        bool zeroInfinity = false,
-        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
+        bool zeroInfinity = false) : base(title, defaultValue)
     {
         Min = min;
         Max = max;

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -4,7 +4,6 @@ using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions.OptionTypes;
@@ -17,19 +16,29 @@ public abstract class ModdedOption<T> : IModdedOption
 {
     private IMiraPlugin? _parentMod;
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the unique identifier of the option.
+    /// </summary>
     public uint Id { get; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the title of the option.
+    /// </summary>
     public string Title { get; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the StringName object of the option.
+    /// </summary>
     public StringNames StringName { get; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets or sets the BaseGameSetting data of the option.
+    /// </summary>
     public BaseGameSetting Data { get; protected set; } = null!;
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets or sets the parent mod of the option.
+    /// </summary>
     public IMiraPlugin? ParentMod
     {
         get => _parentMod;
@@ -57,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>
@@ -74,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;
@@ -83,7 +94,6 @@ public abstract class ModdedOption<T> : IModdedOption
         Value = defaultValue;
         StringName = CustomStringName.CreateAndRegister(Title);
         Visible = () => true;
-        IncludeInPreset = includeInPreset;
     }
 
     internal void ValueChanged(OptionBehaviour optionBehaviour)
@@ -95,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;
@@ -106,57 +115,35 @@ 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)
             {
                 entry.Value = Value;
             }
 
-            Rpc<SyncOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [GetNetData()], true);
+            Rpc<SyncOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [GetNetData()]);
         }
 
         OnValueChanged(newValue);
     }
 
-    /// <inheritdoc />
-    public void SaveToPreset(ConfigFile presetConfig, bool saveDefault=false)
-    {
-        if (ConfigDefinition is null)
-        {
-            Logger<MiraApiPlugin>.Error($"Attempted to save {Title} to preset, but ConfigDefinition is null.");
-            return;
-        }
-        Bind(presetConfig);
-        presetConfig[ConfigDefinition].BoxedValue = saveDefault ? DefaultValue : Value;
-    }
-
-    /// <inheritdoc />
-    public void Bind(ConfigFile config)
-    {
-        config.Bind(ConfigDefinition, DefaultValue);
-    }
-
-    /// <inheritdoc />
-    public void LoadFromPreset(ConfigFile presetConfig)
-    {
-        if (presetConfig.TryGetEntry(ConfigDefinition, out ConfigEntry<T> entry))
-        {
-            SetValue(entry.Value, false);
-        }
-        else
-        {
-            Logger<MiraApiPlugin>.Error($"Attempted to load {Title} from preset, but ConfigDefinition is not found in preset.");
-        }
-    }
-
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the float data of the option.
+    /// </summary>
+    /// <returns>A float object representing the option's value.</returns>
     public abstract float GetFloatData();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets the net data of the option.
+    /// </summary>
+    /// <returns>A NetData object representing this option's data.</returns>
     public abstract NetData GetNetData();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Handles incoming net data.
+    /// </summary>
+    /// <param name="data">The NetData's byte array.</param>
     public abstract void HandleNetData(byte[] data);
 
     /// <summary>
@@ -172,7 +159,14 @@ 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,

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>();
 

MiraAPI/Hud/CustomActionButton.cs

@@ -180,7 +180,7 @@ public abstract class CustomActionButton
 
         if (!moveButton) return;
 
-        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
+        if (HudManagerPatches.BottomLeft == null || HudManagerPatches.BottomRight == null)
         {
             return;
         }
@@ -188,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;
         }
     }
@@ -435,11 +435,11 @@ public abstract class CustomActionButton
         {
             if (CanUse())
             {
-                Button.SetEnabled();
+                Button!.SetEnabled();
             }
             else
             {
-                Button.SetDisabled();
+                Button!.SetDisabled();
             }
 
             if (EffectActive)

MiraAPI/Hud/CustomButtonManager.cs

@@ -29,9 +29,11 @@ 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,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace MiraAPI.Hud;
 
@@ -13,7 +14,6 @@ public static class CustomButtonSingleton<T> where T : CustomActionButton
     /// <summary>
     /// Gets the instance of the button.
     /// </summary>
-#pragma warning disable CA1000
+    [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.")]
     public static T Instance => _instance ??= CustomButtonManager.CustomButtons.OfType<T>().Single();
-#pragma warning restore CA1000
 }

MiraAPI/Hud/InputBox.cs

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

MiraAPI/Modifiers/BaseModifier.cs

@@ -40,8 +40,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>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -3,14 +3,11 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Text;
 using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
-using TMPro;
 using UnityEngine;
 
 namespace MiraAPI.Modifiers;
@@ -72,7 +69,15 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         foreach (var modifier in _toRemove.ToArray())
         {
             _toRemove.Remove(modifier);
-            modifier.OnDeactivate();
+            try
+            {
+                modifier.OnDeactivate();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
+
             Modifiers.Remove(modifier);
         }
 
@@ -82,7 +87,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
             modifier.Initialized = true;
-            modifier.OnActivate();
+            try
+            {
+                modifier.OnActivate();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
 
             if (modifier is TimedModifier { AutoStart: true } timer)
             {
@@ -102,7 +114,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         foreach (var modifier in ActiveModifiers)
         {
-            modifier.FixedUpdate();
+            try
+            {
+                modifier.FixedUpdate();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
         }
 
         if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
@@ -115,7 +134,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         foreach (var modifier in ActiveModifiers)
         {
-            modifier.Update();
+            try
+            {
+                modifier.Update();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
         }
     }
 

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -17,7 +17,7 @@ namespace MiraAPI.Modifiers.ModifierDisplay;
 /// The code used to display Mira modifiers.
 /// </summary>
 [RegisterInIl2Cpp]
-public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
+public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 {
     /// <summary>
     /// Gets the instance of the Modifier Display.
@@ -34,8 +34,8 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
     private PassiveButton _nextButton = null!;
     private PassiveButton _backButton = null!;
 
-    private int _currentPage = 0;
-    private const int _itemsPerPage = 3;
+    private int _currentPage;
+    private const int ItemsPerPage = 3;
 
     private readonly Dictionary<BaseModifier, ModifierUiComponent> _modifiers = [];
 
@@ -142,10 +142,10 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
 
     private void UpdatePage()
     {
-        var totalPages = Mathf.CeilToInt((float)_modifiers.Count / _itemsPerPage);
+        var totalPages = Mathf.CeilToInt((float)_modifiers.Count / ItemsPerPage);
         _currentPage = Mathf.Clamp(_currentPage, 0, Mathf.Max(0, totalPages - 1));
 
-        if (_modifiers.Count <= _itemsPerPage)
+        if (_modifiers.Count <= ItemsPerPage)
         {
             _modifiers.Do(x => x.Value.gameObject.SetActive(true));
             _pagination.gameObject.SetActive(false);
@@ -162,8 +162,8 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
         _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 start = _currentPage * ItemsPerPage;
+        var end = Mathf.Min(start + ItemsPerPage, _modifiers.Count);
         var modifiers = _modifiers.ToArray();
 
         for (var i = start; i < end; i++)

MiraAPI/Modifiers/ModifierDisplay/ModifierUiComponent.cs

@@ -9,7 +9,7 @@ namespace MiraAPI.Modifiers.ModifierDisplay;
 /// The code placed on every Modifier HUD object. Used to handle updating.
 /// </summary>
 [RegisterInIl2Cpp]
-public class ModifierUiComponent(nint ptr) : MonoBehaviour(ptr)
+public class ModifierUiComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 {
     /// <summary>
     /// Gets the modifier which this component is for.
@@ -17,12 +17,13 @@ public class ModifierUiComponent(nint ptr) : MonoBehaviour(ptr)
     [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;

MiraAPI/Modifiers/ModifierFactory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using MiraAPI.Utilities;
@@ -11,7 +12,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)
     {
@@ -45,13 +46,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() ?? typeof(object)).ToArray();
+        var argTypes = args.Select(arg => arg.GetType()).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);
@@ -95,6 +96,7 @@ 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

@@ -5,7 +5,6 @@ using System.Runtime.Serialization;
 using MiraAPI.Modifiers.Types;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
-using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using Random = System.Random;
@@ -75,7 +74,7 @@ public static class ModifierManager
             modifier = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType);
         }
 
-        info.InternalModifiers.Add(modifier);
+        info.Modifiers.Add(modifier);
 
         if (modifier is not GameModifier gameModifier)
         {

MiraAPI/Networking/CustomMurderRpc.cs

@@ -29,7 +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)]
+    [MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before)]
     public static void RpcCustomMurder(
         this PlayerControl source,
         PlayerControl target,
@@ -264,7 +264,7 @@ public static class CustomMurderRpc
             deadBody.enabled = true;
         }
 
-        var afterMurderEvent = new AfterMurderEvent(source, target);
+        var afterMurderEvent = new AfterMurderEvent(source, target, deadBody);
         MiraEventManager.InvokeEvent(afterMurderEvent);
 
         if (!isParticipant)

MiraAPI/Networking/MiraRpc.cs

@@ -46,7 +46,7 @@ public enum MiraRpc : uint
     RemoveVote,
 
     /// <summary>
-    /// Custom RPC to replace Among Us CastVote
+    /// Custom RPC to replace Among Us CastVote.
     /// </summary>
     CastVote,
 }

MiraAPI/Patches/.editorconfig

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

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -1,6 +1,7 @@
 using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
@@ -19,7 +20,7 @@ public static class KillAnimationPatches
     [HarmonyPatch(typeof(KillAnimation), nameof(KillAnimation.CoPerformKill))]
     public static void KillAnimPostfix(PlayerControl source, PlayerControl target)
     {
-        var afterMurderEvent = new AfterMurderEvent(source, target);
+        var afterMurderEvent = new AfterMurderEvent(source, target, Helpers.GetBodyById(target.PlayerId));
         MiraEventManager.InvokeEvent(afterMurderEvent);
     }
 }

MiraAPI/Patches/Events/VentEventPatches.cs

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

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

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

MiraAPI/Patches/GameModes/.editorconfig

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

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -4,7 +4,7 @@ using MiraAPI.Hud;
 namespace MiraAPI.Patches.Hud;
 
 /// <summary>
-/// Reset button patches
+/// Reset button patches.
 /// </summary>
 [HarmonyPatch]
 public static class ButtonResetPatches

MiraAPI/Patches/HudManagerPatches.cs

@@ -13,9 +13,9 @@ namespace MiraAPI.Patches;
 public static class HudManagerPatches
 {
     // Custom buttons parent.
-    internal static GameObject? _bottomLeft;
-    internal static Transform? _bottomRight;
-    internal static Transform? _buttons;
+    public static GameObject? BottomLeft { get; private set; }
+    public static Transform? BottomRight { get; private set; }
+    public static Transform? Buttons { get; private set; }
 
     /*
     /// <summary>
@@ -36,39 +36,51 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        if (_buttons == null)
+        if (Buttons == null)
         {
-            _buttons = __instance.transform.Find("Buttons");
+            Buttons = __instance.transform.Find("Buttons");
         }
 
-        if (_bottomRight == null)
+        if (BottomRight == null)
         {
-            _bottomRight = _buttons.Find("BottomRight");
+            BottomRight = Buttons.Find("BottomRight");
         }
 
-        if (_bottomLeft == null)
+        if (BottomLeft == null)
         {
-            _bottomLeft = Object.Instantiate(_bottomRight.gameObject, _buttons);
+            BottomLeft = Object.Instantiate(BottomRight.gameObject, Buttons);
         }
 
-        foreach (var t in _bottomLeft.GetComponentsInChildren<ActionButton>(true))
+        foreach (var t in BottomLeft.GetComponentsInChildren<ActionButton>(true))
         {
             t.gameObject.Destroy();
         }
 
-        var gridArrange = _bottomLeft.GetComponent<GridArrange>();
-        var aspectPosition = _bottomLeft.GetComponent<AspectPosition>();
+        var gridArrange = BottomLeft.GetComponent<GridArrange>();
+        var aspectPosition = BottomLeft.GetComponent<AspectPosition>();
 
-        _bottomLeft.name = "BottomLeft";
+        BottomLeft.name = "BottomLeft";
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
+        var fakeButton = Object.Instantiate(__instance.AbilityButton, BottomLeft.transform);
+        foreach (var renderer in fakeButton.GetComponentsInChildren<Renderer>())
+        {
+            renderer.enabled = false;
+        }
+        fakeButton.buttonLabelText.Destroy();
+        fakeButton.cooldownTimerText.Destroy();
+        fakeButton.usesRemainingText.Destroy();
+        fakeButton.GetComponent<PassiveButton>().Destroy();
+        fakeButton.ToggleVisible(true);
+        fakeButton.Destroy();
+
         foreach (var button in CustomButtonManager.CustomButtons)
         {
             var location = button.Location switch
             {
-                ButtonLocation.BottomLeft => _bottomLeft.transform,
-                ButtonLocation.BottomRight => _bottomRight,
+                ButtonLocation.BottomLeft => BottomLeft.transform,
+                ButtonLocation.BottomRight => BottomRight,
                 _ => null,
             };
 

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -57,10 +57,15 @@ public static class IntroCutscenePatches
     }
 
     [HarmonyPostfix]
-    [HarmonyPatch(nameof(IntroCutscene.OnDestroy))]
-    public static void GameBeginPatch(IntroCutscene __instance)
+    [HarmonyPatch(typeof(IntroCutscene._CoBegin_d__34), nameof(IntroCutscene._CoBegin_d__34.MoveNext))]
+    public static void GameBeginPatch(IntroCutscene._CoBegin_d__34 __instance)
     {
-        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
+        if (__instance.__1__state != -1)
+        {
+            return;
+        }
+
+        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance.__4__this));
         MiraEventManager.InvokeEvent(new RoundStartEvent(true));
     }
 }

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -108,7 +108,7 @@ public static class NameplatesTabPatches
         var x = (NamePlateViewData viewdata) =>
         {
             colorChip.transform.GetChild(1).GetComponent<SpriteRenderer>().sprite = viewdata?.Image;
-            //(colorChip as NameplateChip).image.sprite = viewdata?.Image;
+            // (colorChip as NameplateChip).image.sprite = viewdata?.Image;
         };
         __instance.StartCoroutine(AddressableAssetExtensions.CoLoadAssetAsync<NamePlateViewData>(__instance, namePlate.GetAssetReference(), x));
         colorChip.transform.localPosition = new Vector3(position.x, position.y, -1f);

MiraAPI/Patches/MinigameBeginErrorPatch.cs

@@ -3,7 +3,7 @@
 namespace MiraAPI.Patches;
 
 /// <summary>
-/// Used to fix the Minigame crash errors (credits Submerged/PH Gaming for the fix)
+/// Used to fix the Minigame crash errors (credits Submerged/PH Gaming for the fix).
 /// </summary>
 [HarmonyPatch]
 public static class MinigameBeginErrorPatch

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

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

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

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

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
-using MiraAPI.Presets;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities.Extensions;
 using TMPro;
@@ -32,20 +31,15 @@ internal static class GameSettingMenuPatches
     private static PassiveButton? _modifiersButton;
     private static PassiveButton? _smallRolesButton;
 
-    private static Dictionary<int, Vector3> OptionScrolls = [];
+    private static Dictionary<int, Vector3> OptionsPositions { get; } = [];
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
-    // ReSharper disable once InconsistentNaming
     public static void ChangeTabPostfix(GameSettingMenu __instance, int tabNum, bool previewOnly)
     {
         if ((previewOnly && Controller.currentTouchType == Controller.TouchType.Joystick) || !previewOnly)
         {
-            if (_modifiersTab)
-            {
-                _modifiersTab!.gameObject.SetActive(tabNum == 3);
-            }
-
+            if (_modifiersTab) _modifiersTab!.gameObject.SetActive(tabNum == 3);
             _modifiersButton?.SelectButton(tabNum == 3);
             _smallRolesButton?.SelectButton(tabNum == 2);
             if (tabNum == 3)
@@ -69,10 +63,7 @@ internal static class GameSettingMenuPatches
         _modifiersButton?.SelectButton(tabNum == 3);
         _smallRolesButton?.SelectButton(tabNum == 2);
 
-        if (tabNum != 3)
-        {
-            return;
-        }
+        if (tabNum != 3) return;
 
         if (__instance.RoleSettingsButton.gameObject.active)
         {
@@ -90,7 +81,6 @@ internal static class GameSettingMenuPatches
     /// <param name="__instance">The GameSettingMenu instance.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameSettingMenu.Start))]
-    // ReSharper disable once InconsistentNaming
     public static void StartPrefix(GameSettingMenu __instance)
     {
         _roleBtnOgPos = __instance.RoleSettingsButton.transform.localPosition;
@@ -123,13 +113,13 @@ internal static class GameSettingMenuPatches
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
             {
-                RoleSettingMenuPatches.Scrolls[SelectedModIdx] =
-                    __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
-                OptionScrolls[SelectedModIdx] =
-                    __instance.GameSettingsTab.scrollBar.Inner.localPosition;
-
+                if (!__instance.RoleSettingsTab.AdvancedRolesSettings.active)
+                {
+                    RoleSettingMenuPatches.RolePositions[SelectedModIdx] = __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
+                }
+                OptionsPositions[SelectedModIdx] = __instance.GameSettingsTab.scrollBar.Inner.localPosition;
                 SelectedModIdx += 1;
-                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -146,15 +136,15 @@ internal static class GameSettingMenuPatches
         backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
             (UnityAction)(() =>
             {
-                RoleSettingMenuPatches.Scrolls[SelectedModIdx] =
-                    __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
-                OptionScrolls[SelectedModIdx] =
-                    __instance.GameSettingsTab.scrollBar.Inner.localPosition;
-
+                if (!__instance.RoleSettingsTab.AdvancedRolesSettings.active)
+                {
+                    RoleSettingMenuPatches.RolePositions[SelectedModIdx] = __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
+                }
+                OptionsPositions[SelectedModIdx] = __instance.GameSettingsTab.scrollBar.Inner.localPosition;
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
                 }
 
                 UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
@@ -231,61 +221,54 @@ internal static class GameSettingMenuPatches
 
         _modifierBtnOgPos = _modifiersButton.transform.localPosition;
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
-        {
-            PresetManager.LoadPresets(plugin);
-        }
-
         UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
     }
 
-    private static void ChangeRoleSettingButton(bool replace, GameSettingMenu menu)
+    private static void ChangeRoleSettingButton(bool replace, GameSettingMenu __instance)
     {
-        menu.RoleSettingsButton.OnClick = new ButtonClickedEvent();
-        menu.RoleSettingsButton.OnMouseOver = new UnityEvent();
+        __instance.RoleSettingsButton.OnClick = new ButtonClickedEvent();
+        __instance.RoleSettingsButton.OnMouseOver = new UnityEvent();
 
         if (replace)
         {
-            menu.RoleSettingsButton.buttonText.text = "Modifiers Settings";
-            menu.RoleSettingsButton.OnClick.AddListener(
+            __instance.RoleSettingsButton.buttonText.text = "Modifiers Settings";
+            __instance.RoleSettingsButton.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(3, false);
+                    __instance.ChangeTab(3, false);
                 }));
-            menu.RoleSettingsButton.OnMouseOver.AddListener(
+            __instance.RoleSettingsButton.OnMouseOver.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(3, true);
+                    __instance.ChangeTab(3, true);
                 }));
         }
         else
         {
-            menu.RoleSettingsButton.buttonText.text = "Roles Settings";
-            menu.RoleSettingsButton.OnClick.AddListener(
+            __instance.RoleSettingsButton.buttonText.text = "Roles Settings";
+            __instance.RoleSettingsButton.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(2, false);
+                    __instance.ChangeTab(2, false);
                 }));
-            menu.RoleSettingsButton.OnMouseOver.AddListener(
+            __instance.RoleSettingsButton.OnMouseOver.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(2, true);
+                    __instance.ChangeTab(2, true);
                 }));
         }
     }
-
     private static void UpdateText(GameSettingMenu menu, GameOptionsMenu settings, RolesSettingsMenu roles)
     {
         if (_text is not null && SelectedModIdx == 0)
         {
             _text.text = "Default";
             _text.fontSizeMax = 3.2f;
-            SelectedMod = null;
         }
         else if (_text is not null)
         {
             _text.fontSizeMax = 2.3f;
-            SelectedMod = MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+            SelectedMod = MiraPluginManager.Instance.RegisteredPlugins()[SelectedModIdx - 1];
 
             var name = SelectedMod.MiraPlugin.OptionsTitleText;
             _text.text = name[..Math.Min(name.Length, 25)];
@@ -298,11 +281,9 @@ internal static class GameSettingMenuPatches
 
         if (SelectedModIdx != 0)
         {
-            var modHasRoles = SelectedMod!.InternalRoles.Count != 0;
-            var modHasModifiers = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
-            var modHasOptions =
-                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
+            var modHasRoles = SelectedMod!.CustomRoles.Count != 0;
+            var modHasModifiers = SelectedMod.OptionGroups.Exists(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
+            var modHasOptions = SelectedMod.OptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
 
             _modifiersButton.gameObject.SetActive(true);
             _smallRolesButton.gameObject.SetActive(true);
@@ -342,7 +323,6 @@ internal static class GameSettingMenuPatches
                 {
                     menu.ChangeTab(0, false);
                 }
-
                 // If the mod has roles, we can enable the bigger role button and disable the small one.
                 if (modHasRoles)
                 {
@@ -399,11 +379,6 @@ internal static class GameSettingMenuPatches
             ChangeRoleSettingButton(replaceWithModifiers, menu);
         }
 
-        if (menu.PresetsTab.gameObject.active)
-        {
-            menu.ChangeTab(0, false);
-        }
-
         CleanupTab(settings, roles);
     }
 
@@ -415,10 +390,8 @@ internal static class GameSettingMenuPatches
             {
                 continue;
             }
-
             child.gameObject.DestroyImmediate();
         }
-
         options.Clear();
     }
 
@@ -439,28 +412,6 @@ internal static class GameSettingMenuPatches
             CleanupSettings(_modifiersTab);
         }
 
-        void CleanupSettings(GameOptionsMenu gameOptMenu)
-        {
-            ClearOptions(gameOptMenu.Children);
-            gameOptMenu.Children = null;
-
-            gameOptMenu.settingsContainer
-                .GetComponentsInChildren<CategoryHeaderMasked>()
-                .ToList()
-                .ForEach(header => header.gameObject.DestroyImmediate());
-
-            gameOptMenu.Initialize();
-            if (OptionScrolls.TryGetValue(SelectedModIdx, out var pos))
-            {
-                gameOptMenu.scrollBar.Inner.localPosition = pos;
-                gameOptMenu.scrollBar.UpdateScrollBars();
-            }
-            else
-            {
-                gameOptMenu.scrollBar.ScrollToTop();
-            }
-        }
-
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
         {
             if (rolesMenu.advancedSettingChildren != null)
@@ -479,23 +430,41 @@ internal static class GameSettingMenuPatches
             {
                 role.gameObject.DestroyImmediate();
             }
-
             rolesMenu.roleChances?.Clear();
 
             rolesMenu.AdvancedRolesSettings.gameObject.SetActive(false);
             rolesMenu.RoleChancesSettings.gameObject.SetActive(true);
             rolesMenu.SetQuotaTab();
-            if (SelectedModIdx == 0)
+            if (RoleSettingMenuPatches.RolePositions.TryGetValue(SelectedModIdx, out var pos))
             {
-                if (RoleSettingMenuPatches.Scrolls.TryGetValue(0, out var pos))
-                {
-                    rolesMenu.scrollBar.Inner.localPosition = pos;
-                    rolesMenu.scrollBar.UpdateScrollBars();
-                }
-                else
-                {
-                    rolesMenu.scrollBar.ScrollToTop();
-                }
+                rolesMenu.scrollBar.Inner.localPosition = pos;
+                rolesMenu.scrollBar.UpdateScrollBars();
+            }
+            else
+            {
+                rolesMenu.scrollBar.ScrollToTop();
+            }
+        }
+
+        void CleanupSettings(GameOptionsMenu gameOptMenu)
+        {
+            ClearOptions(gameOptMenu.Children);
+            gameOptMenu.Children = null;
+
+            gameOptMenu.settingsContainer
+                .GetComponentsInChildren<CategoryHeaderMasked>()
+                .ToList()
+                .ForEach(header => header.gameObject.DestroyImmediate());
+
+            gameOptMenu.Initialize();
+            if (OptionsPositions.TryGetValue(SelectedModIdx, out var pos))
+            {
+                gameOptMenu.scrollBar.Inner.localPosition = pos;
+                gameOptMenu.scrollBar.UpdateScrollBars();
+            }
+            else
+            {
+                gameOptMenu.scrollBar.ScrollToTop();
             }
         }
     }

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -24,7 +24,7 @@ public static class LobbyViewPanePatches
 
     private static MiraPluginInfo? SelectedMod => SelectedModIdx == 0
         ? null
-        : MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+        : MiraPluginManager.Instance.RegisteredPlugins()[SelectedModIdx - 1];
 
     private static PassiveButton? ModifiersTabButton { get; set; }
 
@@ -74,7 +74,7 @@ public static class LobbyViewPanePatches
             (UnityAction)(() =>
             {
                 SelectedModIdx += 1;
-                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -98,7 +98,7 @@ public static class LobbyViewPanePatches
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
                 }
 
                 Refresh(__instance);
@@ -127,8 +127,8 @@ public static class LobbyViewPanePatches
         __instance.rolesTabButton.SelectButton(false);
 
         ModifiersTabButton?.SelectButton(true);
-        var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true));
+        var filteredGroups = SelectedMod.OptionGroups
+            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true));
         DrawOptions(__instance, filteredGroups);
         return false;
     }
@@ -142,8 +142,8 @@ public static class LobbyViewPanePatches
             return true;
         }
 
-        var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x.OptionableType == null && x.GroupVisible.Invoke());
+        var filteredGroups = SelectedMod.OptionGroups
+            .Where(x => x is { ShowInModifiersMenu: false, OptionableType: null } && x.GroupVisible.Invoke());
         DrawOptions(__instance, filteredGroups);
         return false;
     }
@@ -250,7 +250,7 @@ public static class LobbyViewPanePatches
 
         var list = new List<Type>();
 
-        var roleGroups = SelectedMod.InternalRoles.Values.OfType<ICustomRole>()
+        var roleGroups = SelectedMod.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         // sort the groups by priority
@@ -315,7 +315,7 @@ public static class LobbyViewPanePatches
                 viewSettingsInfoPanelRoleVariant.transform.localScale = Vector3.one;
                 viewSettingsInfoPanelRoleVariant.transform.localPosition = new Vector3(num2, num, -2f);
 
-                var advancedRoleOptions = SelectedMod.InternalOptionGroups
+                var advancedRoleOptions = SelectedMod.OptionGroups
                     .Where(x => x.OptionableType == customRole.GetType())
                     .SelectMany(x => x.Options)
                     .ToList();
@@ -402,7 +402,7 @@ public static class LobbyViewPanePatches
             return 0;
         }
 
-        var role = SelectedMod.InternalRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
+        var role = SelectedMod.CustomRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
 
         if (role == null)
         {
@@ -425,7 +425,7 @@ public static class LobbyViewPanePatches
         var num = viewPanel.yPosStart;
         var num2 = 1.08f;
 
-        var filteredOptions = SelectedMod.InternalOptionGroups
+        var filteredOptions = SelectedMod.OptionGroups
             .Where(x => x.OptionableType == roleType)
             .SelectMany(x=>x.Options)
             .ToList();

MiraAPI/Patches/Options/NotificationPopperPatch.cs

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

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -22,16 +22,17 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(RolesSettingsMenu))]
 public static class RoleSettingMenuPatches
 {
-    public static Dictionary<int, Vector3> Scrolls { get; } = [];
-    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; } = [];
-    private static List<GameObject> Headers { get; } = [];
-    private static List<RoleOptionSetting> RoleOptionSettings { get; } = [];
+    public static Dictionary<int, Vector3> RolePositions { get; set; } = [];
+
+    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; set; } = [];
+    private static List<GameObject> Headers { get; set; } = [];
+    private static List<RoleOptionSetting> RoleOptionSettings { get; set; } = [];
 
     private static float ScrollerNum { get; set; } = 0.522f;
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
-    public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
+    public static bool PatchStart(RolesSettingsMenu __instance)
     {
         Headers.ForEach(Object.Destroy);
         RoleOptionSettings.ForEach(Object.Destroy);
@@ -68,7 +69,7 @@ public static class RoleSettingMenuPatches
 
         var num3 = 0;
 
-        var roleGroups = GameSettingMenuPatches.SelectedMod?.InternalRoles.Values.OfType<ICustomRole>()
+        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         if (roleGroups is null)
@@ -233,7 +234,7 @@ public static class RoleSettingMenuPatches
     private static void SetScrollBounds(this Scroller scroller)
     {
         scroller.CalculateAndSetYBounds(1 + 1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
-        if (Scrolls.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
+        if (RolePositions.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
         {
             scroller.Inner.localPosition = scroll;
             scroller.UpdateScrollBars();
@@ -255,7 +256,7 @@ public static class RoleSettingMenuPatches
     [HarmonyPatch(nameof(RolesSettingsMenu.OpenChancesTab))]
     public static void OpenChancesTabPostfix(RolesSettingsMenu __instance)
     {
-        if (GameSettingMenuPatches.SelectedModIdx == 0)
+        if (GameSettingMenuPatches.SelectedModIdx == 0 || !__instance.scrollBar)
         {
             return;
         }
@@ -299,7 +300,7 @@ public static class RoleSettingMenuPatches
 
         if (AmongUsClient.Instance.AmHost)
         {
-            Rpc<SyncRoleOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [role.GetNetData()], true);
+            Rpc<SyncRoleOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [role.GetNetData()]);
         }
 
         GameOptionsManager.Instance.GameHostOptions = GameOptionsManager.Instance.CurrentGameOptions;
@@ -318,7 +319,7 @@ public static class RoleSettingMenuPatches
         var num = hasImage ? -0.872f : -1;
 
         // TODO: create sub groups under the role settings.
-        var filteredOptions = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
+        var filteredOptions = GameSettingMenuPatches.SelectedMod?.OptionGroups
             .Where(x=> x.OptionableType == role.GetType())
             .SelectMany(x=>x.Options)
             .ToList() ?? [];
@@ -353,7 +354,6 @@ public static class RoleSettingMenuPatches
             newOpt.Initialize();
         }
 
-        Scrolls[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
         __instance.scrollBar.CalculateAndSetYBounds(__instance.advancedSettingChildren.Count + 3, 1f, 6f, 0.45f);
         __instance.scrollBar.ScrollToTop();
     }
@@ -366,7 +366,7 @@ public static class RoleSettingMenuPatches
             return;
         }
 
-        Scrolls[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
+        RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
         __instance.roleTitleText.text = TranslationController.Instance.GetString(
@@ -485,7 +485,7 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.titleText.horizontalAlignment = HorizontalAlignmentOptions.Left;
 
         if (GameSettingMenuPatches.SelectedMod is null ||
-            GameSettingMenuPatches.SelectedMod.InternalOptionGroups
+            GameSettingMenuPatches.SelectedMod.OptionGroups
                 .Exists(x => x.OptionableType == role.GetType()))
         {
             var newButton = Object.Instantiate(roleOptionSetting.buttons[0], roleOptionSetting.transform);
@@ -517,7 +517,7 @@ public static class RoleSettingMenuPatches
             roleOptionSetting.ChancePlusBtn.gameObject.SetActive(false);
         }
 
-        if (index < GameSettingMenuPatches.SelectedMod?.InternalRoles.Count - 1)
+        if (index < GameSettingMenuPatches.SelectedMod?.CustomRoles.Count - 1)
         {
             ScrollerNum -= 0.43f;
         }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -5,7 +5,7 @@ using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
-using MiraAPI.Roles;
+using MiraAPI.Utilities;
 using MiraAPI.Voting;
 using Reactor.Utilities.Extensions;
 
@@ -41,7 +41,7 @@ internal static class PlayerControlPatches
     // ReSharper disable once InconsistentNaming
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
-        var deathEvent = new PlayerDeathEvent(__instance, reason);
+        var deathEvent = new PlayerDeathEvent(__instance, reason, Helpers.GetBodyById(__instance.PlayerId));
         MiraEventManager.InvokeEvent(deathEvent);
 
         var modifiersComponent = __instance.GetComponent<ModifierComponent>();
@@ -81,11 +81,6 @@ internal static class PlayerControlPatches
     // ReSharper disable once InconsistentNaming
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
     {
-        if (__instance.Data?.Role is ICustomRole customRole)
-        {
-            customRole.PlayerControlFixedUpdate(__instance);
-        }
-
         if (!__instance.AmOwner)
         {
             return;

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Reflection;
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Meeting;

MiraAPI/Patches/Roles/GameStartupPatch.cs

@@ -10,7 +10,7 @@ public static class GameStartupPatch
     private static bool _runOnce;
 
     /// <summary>
-    /// This is used for registering roles when the game opens, might be a janky solution, but it works
+    /// This is used for registering roles when the game opens, might be a janky solution, but it works.
     /// </summary>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(MainMenuManager.Start))]

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -24,4 +24,4 @@ public static class HauntMenuMinigamePatch
         __instance.FilterText.text = role.NiceName;
         __instance.FilterText.color = color;
     }
-}
+}

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -62,8 +62,6 @@ public static class HudManagerPatches
 
         if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
         {
-            customRole.HudUpdate(__instance);
-
             if (_roleTab == null)
             {
                 _roleTab = CustomRoleManager.CreateRoleTab(customRole);

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -12,7 +12,7 @@ namespace MiraAPI.Patches.Roles;
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
-    /// Set the role chance for custom Launchpad roles based on config
+    /// Set the role chance for custom Launchpad roles based on config.
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
@@ -42,7 +42,7 @@ public static class RoleOptionsCollectionPatch
     }
 
     /// <summary>
-    /// Set the amount for custom Launchpad roles based on config
+    /// Set the amount for custom Launchpad roles based on config.
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]

MiraAPI/Patches/Roles/SabotageButtonPatch.cs

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

MiraAPI/Patches/Voting/MeetingHudPatches.cs

@@ -8,7 +8,6 @@ using MiraAPI.Events.Vanilla.Meeting.Voting;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Voting;
-using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Voting;
 

MiraAPI/PluginLoading/IMiraPlugin.cs

@@ -2,8 +2,19 @@
 
 namespace MiraAPI.PluginLoading;
 
+/// <summary>
+/// The interface that all Mira plugins must implement.
+/// </summary>
 public interface IMiraPlugin
 {
+    /// <summary>
+    /// Gets the name to display on the options menu.
+    /// </summary>
     string OptionsTitleText { get; }
+
+    /// <summary>
+    /// Gets the BepInEx configuration file for the plugin.
+    /// </summary>
+    /// <returns>The BepInEx configuration file for the plugin.</returns>
     public ConfigFile GetConfigFile();
 }

MiraAPI/PluginLoading/MiraPluginInfo.cs

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

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -12,7 +12,6 @@ using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
-using MiraAPI.Presets;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Networking;
@@ -27,9 +26,8 @@ public sealed class MiraPluginManager
 {
     private readonly Dictionary<Assembly, MiraPluginInfo> _registeredPlugins = [];
 
-    internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = null!;
-
-    internal Dictionary<MiraPluginInfo, List<Type>> QueuedRoleRegistrations { get; } = [];
+    internal MiraPluginInfo[] RegisteredPlugins() => [.. _registeredPlugins.Values];
+    internal Dictionary<MiraPluginInfo, List<Type>> QueuedRoleRegistrations { get; } = new();
     internal static MiraPluginManager Instance { get; private set; } = new();
 
     internal void Initialize()
@@ -55,21 +53,29 @@ public sealed class MiraPluginManager
                     continue;
                 }
 
-                foreach (var method in type.GetMethods(BindingFlags.Static | BindingFlags.Public))
+                foreach (var method in type.GetMethods())
                 {
                     var eventAttribute = method.GetCustomAttribute<RegisterEventAttribute>();
-                    if (eventAttribute != null)
+                    if (eventAttribute == null)
                     {
-                        var parameters = method.GetParameters();
-                        if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
-                        {
-                            Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
-                            continue;
-                        }
-
-                        var paramType = parameters[0].ParameterType;
-                        MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
+                        continue;
                     }
+
+                    if (!method.IsStatic)
+                    {
+                        Logger<MiraApiPlugin>.Error($"Event method {method.Name} in {type.Name} must be static.");
+                        continue;
+                    }
+
+                    var parameters = method.GetParameters();
+                    if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
+                    {
+                        Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
+                        continue;
+                    }
+
+                    var paramType = parameters[0].ParameterType;
+                    MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
                 }
 
                 if (RegisterModifier(type, info))
@@ -82,13 +88,13 @@ public sealed class MiraPluginManager
                     continue;
                 }
 
-                if (RegisterRoleAttribute(type, info, out var role))
+                if (RegisterRole(type, info, out var role))
                 {
                     roles.Add(role);
                     continue;
                 }
 
-                if (RegisterButtonAttribute(type, info))
+                if (RegisterButton(type, info))
                 {
                     continue;
                 }
@@ -104,24 +110,16 @@ public sealed class MiraPluginManager
             info.PluginConfig.Save();
             info.PluginConfig.SaveOnConfigSet = oldConfigSetting;
 
-            info.InternalOptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
+            info.OptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
             QueuedRoleRegistrations.Add(info, roles);
 
             _registeredPlugins.Add(assembly, info);
-
-            info.SavePublicCollections();
-            PresetManager.CreateDefaultPreset(info);
-            PresetManager.LoadPresets(info);
             Logger<MiraApiPlugin>.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
         };
         IL2CPPChainloader.Instance.Finished += PaletteManager.RegisterAllColors;
         IL2CPPChainloader.Instance.Finished += () =>
         {
-            // Save all buttons into a read-only collection for easy access
             CustomButtonManager.Buttons = new ReadOnlyCollection<CustomActionButton>(CustomButtonManager.CustomButtons);
-
-            // Cache all the registered plugins into an array for easy access
-            RegisteredPlugins = [.._registeredPlugins.Values];
         };
     }
 
@@ -164,6 +162,12 @@ public sealed class MiraPluginManager
 
             foreach (var property in type.GetProperties())
             {
+                if (property.GetMethod?.IsStatic == true)
+                {
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} must not be static.");
+                    continue;
+                }
+
                 if (property.PropertyType.IsAssignableTo(typeof(IModdedOption)))
                 {
                     ModdedOptionsManager.RegisterPropertyOption(type, property, pluginInfo);
@@ -179,16 +183,21 @@ public sealed class MiraPluginManager
                 ModdedOptionsManager.RegisterAttributeOption(type, attribute, property, pluginInfo);
             }
 
+            foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(IModdedOption))))
+            {
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for options.");
+            }
+
             return true;
         }
         catch (Exception e)
         {
-            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e.ToString()}");
         }
         return false;
     }
 
-    private static bool RegisterRoleAttribute(Type type, MiraPluginInfo pluginInfo, [NotNullWhen(true)] out Type? role)
+    private static bool RegisterRole(Type type, MiraPluginInfo pluginInfo, [NotNullWhen(true)] out Type? role)
     {
         role = null;
         try
@@ -244,6 +253,11 @@ public sealed class MiraPluginManager
 
                 PaletteManager.CustomColors.Add(color);
             }
+
+            foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(CustomColor))))
+            {
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for colors.");
+            }
         }
         catch (Exception e)
         {
@@ -264,7 +278,7 @@ public sealed class MiraPluginManager
         }
     }
 
-    private static bool RegisterButtonAttribute(Type type, MiraPluginInfo pluginInfo)
+    private static bool RegisterButton(Type type, MiraPluginInfo pluginInfo)
     {
         try
         {

MiraAPI/Presets/OptionPreset.cs

@@ -1,74 +0,0 @@
-using System.Linq;
-using BepInEx.Configuration;
-using MiraAPI.GameOptions;
-using MiraAPI.PluginLoading;
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Presets;
-
-/// <summary>
-/// Represents a preset of game options that can be applied to the game.
-/// </summary>
-public class OptionPreset
-{
-    /// <summary>
-    /// Gets the name of the preset.
-    /// </summary>
-    public string Name { get; }
-
-    /// <summary>
-    /// Gets the plugin associated with the preset.
-    /// </summary>
-    public MiraPluginInfo Plugin { get; }
-
-    /// <summary>
-    /// Gets the configuration file of the plugin associated with the preset.
-    /// </summary>
-    public ConfigFile PluginConfig { get; }
-
-    /// <summary>
-    /// Gets the configuration file for the preset.
-    /// </summary>
-    public ConfigFile PresetConfig { get; }
-
-    /// <summary>
-    /// Gets or sets the button associated with the preset in the UI.
-    /// </summary>
-    public GameObject? PresetButton { get; set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="OptionPreset"/> class with the specified name and configuration file.
-    /// </summary>
-    /// <param name="name">>The name of the preset.</param>
-    /// <param name="plugin">The plugin associated with the preset.</param>
-    /// <param name="presetConfig">>The configuration file for the preset.</param>
-    public OptionPreset(string name, MiraPluginInfo plugin, ConfigFile presetConfig)
-    {
-        Name = name;
-        Plugin = plugin;
-        PluginConfig = plugin.PluginConfig;
-        PresetConfig = presetConfig;
-    }
-
-    /// <summary>
-    /// Loads the preset by applying the values from the preset configuration to the plugin configuration.
-    /// </summary>
-    public void LoadPreset()
-    {
-        PresetConfig.Reload();
-        foreach (var option in Plugin.InternalOptions)
-        {
-            option.LoadFromPreset(PresetConfig);
-        }
-
-        ModdedOptionsManager.SyncAllOptions();
-
-        foreach (var role in Plugin.InternalRoles.Values.OfType<ICustomRole>())
-        {
-            role.LoadFromPreset(PresetConfig);
-        }
-
-        CustomRoleManager.SyncAllRoleSettings();
-    }
-}

MiraAPI/Presets/PresetManager.cs

@@ -1,95 +0,0 @@
-using System.IO;
-using System.Linq;
-using BepInEx.Configuration;
-using MiraAPI.PluginLoading;
-using MiraAPI.Roles;
-using Reactor.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Presets;
-
-/// <summary>
-/// Provides functionality to manage and load game option presets for plugins.
-/// </summary>
-public static class PresetManager
-{
-    /// <summary>
-    /// Gets the directory where the presets are stored.
-    /// </summary>
-    public static string PresetDirectory { get; } = Path.GetFullPath("mira_presets", Application.persistentDataPath);
-
-    internal static void CreateDefaultPreset(MiraPluginInfo plugin)
-    {
-        var presetPath = Path.Combine(PresetDirectory, plugin.PluginId);
-        if (!Directory.Exists(presetPath))
-        {
-            Directory.CreateDirectory(presetPath);
-        }
-
-        var presetConfig = new ConfigFile(Path.Combine(presetPath, "Default.cfg"), false);
-
-        foreach (var option in plugin.InternalOptions.Where(x => x.IncludeInPreset))
-        {
-            option.SaveToPreset(presetConfig, true);
-        }
-
-        foreach (var role in plugin.InternalRoles.Values.OfType<ICustomRole>())
-        {
-            role.SaveToPreset(presetConfig);
-        }
-
-        presetConfig.Save();
-    }
-
-    /// <summary>
-    /// Loads the presets for the specified plugin by reading the configuration files from the preset directory.
-    /// </summary>
-    /// <param name="plugin">>The plugin for which the presets should be loaded.</param>
-    public static void LoadPresets(MiraPluginInfo plugin)
-    {
-        foreach (var btn in plugin.InternalPresets.Select(x=>x.PresetButton))
-        {
-            if (btn != null)
-            {
-                Object.DestroyImmediate(btn);
-            }
-        }
-
-        plugin.InternalPresets.Clear();
-        if (!Directory.Exists(PresetDirectory))
-        {
-            Directory.CreateDirectory(PresetDirectory);
-        }
-
-        var pluginPresetPath = Path.Combine(PresetDirectory, plugin.PluginId);
-        if (!Directory.Exists(pluginPresetPath))
-        {
-            Directory.CreateDirectory(pluginPresetPath);
-        }
-
-        foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
-        {
-            Logger<MiraApiPlugin>.Info($"Loading preset file {file}");
-            var presetName = Path.GetFileNameWithoutExtension(file);
-            var presetConfig = new ConfigFile(file, false)
-            {
-                SaveOnConfigSet = false,
-            };
-
-            foreach (var option in plugin.InternalOptions.Where(x=>x.IncludeInPreset))
-            {
-                option.Bind(presetConfig);
-            }
-
-            foreach (var role in plugin.InternalRoles.Values.OfType<ICustomRole>().Where(x=>!x.Configuration.HideSettings))
-            {
-                role.BindConfig(presetConfig);
-            }
-
-            presetConfig.Save();
-
-            plugin.InternalPresets.Add(new OptionPreset(presetName, plugin, presetConfig));
-        }
-        plugin.Presets = [.. plugin.InternalPresets];
-    }
-}

MiraAPI/Presets/SavePresetPopup.cs

@@ -1,91 +0,0 @@
-using System;
-using Il2CppInterop.Runtime.InteropTypes.Fields;
-using MiraAPI.Modifiers.ModifierDisplay;
-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;
-
-[RegisterInIl2Cpp]
-public class SavePresetPopup(nint ptr) : Minigame(ptr)
-{
-    private PassiveButton saveButton;
-    private PassiveButton closeButton;
-    private TextMeshPro textBoxText;
-    private TextBoxTMP textBox;
-
-    private Action<string> onSave;
-
-    // Cleanup holder object
-    public void OnDestroy()
-    {
-        transform.parent.gameObject.Destroy();
-    }
-
-    public override void Close()
-    {
-    }
-
-    private void Awake()
-    {
-        var textboxHolder = transform.GetChild(1).GetChild(1);
-        saveButton = transform.FindChild("SaveButton").GetComponent<PassiveButton>();
-        closeButton = transform.FindChild("CloseButton").GetComponent<PassiveButton>();
-        textBox = textboxHolder.GetChild(0).GetComponent<TextBoxTMP>();
-        textBoxText = textBox.transform.GetChild(0).GetComponent<TextMeshPro>();
-
-        saveButton.OnClick = new Button.ButtonClickedEvent();
-        saveButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            onSave.Invoke(textBoxText.text);
-            this.BaseClose();
-        }));
-
-        closeButton.OnClick = new Button.ButtonClickedEvent();
-        closeButton.OnClick.AddListener((UnityAction)(() =>
-        {
-            this.BaseClose();
-        }));
-
-        textBox.OnChange = new Button.ButtonClickedEvent();
-        textBox.OnChange.AddListener((UnityAction)(() =>
-        {
-            textBoxText.text = textBoxText.text.Replace(" ", string.Empty);
-        }));
-
-        textBox.GetComponent<PassiveButton>().OnClick.AddListener((UnityAction)(() =>
-        {
-            textBox.GiveFocus();
-        }));
-
-        foreach (var tmp in gameObject.GetComponentsInChildren<TextMeshPro>())
-        {
-            if (tmp.gameObject.transform.parent.name == "Textbox") continue;
-            var text = tmp.text;
-            tmp.text = $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF RadialMenu Material\">{text}</font>";
-        }
-    }
-
-    public static void CreatePopup(Action<string> saveAction)
-    {
-        // Because innerscuff doesnt account for Z value in Close animation
-        var holder = new GameObject("PopupHolder")
-        {
-            transform =
-            {
-                parent = Camera.main!.transform,
-            },
-        };
-        holder.transform.localPosition = new Vector3(0, -1f, -500);
-
-        var gameObject = Instantiate(MiraAssets.PresetSavePopup.LoadAsset(), holder.transform);
-        var popup = gameObject.GetComponent<SavePresetPopup>();
-        popup.onSave = saveAction;
-        popup.Begin(null);
-    }
-}
-

MiraAPI/Roles/CustomRoleManager.cs

@@ -72,7 +72,7 @@ public static class CustomRoleManager
                 continue;
             }
 
-            pluginInfo.InternalRoles.Add((ushort)role.Role, role);
+            pluginInfo.CustomRoles.Add((ushort)role.Role, role);
         }
 
         pluginInfo.PluginConfig.Save();
@@ -161,7 +161,7 @@ public static class CustomRoleManager
     /// <returns>A MiraPluginInfo object representing the parent mod of the role.</returns>
     public static MiraPluginInfo FindParentMod(ICustomRole role)
     {
-        return MiraPluginManager.Instance.RegisteredPlugins.First(plugin => plugin.InternalRoles.ContainsValue(role as RoleBehaviour ?? throw new InvalidOperationException()));
+        return MiraPluginManager.Instance.RegisteredPlugins().First(plugin => plugin.CustomRoles.ContainsValue(role as RoleBehaviour ?? throw new InvalidOperationException()));
     }
 
     /// <summary>
@@ -236,7 +236,7 @@ public static class CustomRoleManager
         // 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;
@@ -271,7 +271,7 @@ public static class CustomRoleManager
             }
         }
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
             plugin.PluginConfig.Save();
             plugin.PluginConfig.SaveOnConfigSet = oldConfigSetting[plugin];

MiraAPI/Roles/CustomRoleSingleton.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace MiraAPI.Roles;
 
@@ -8,12 +9,11 @@ namespace MiraAPI.Roles;
 /// <typeparam name="T">The role you are trying to access.</typeparam>
 public static class CustomRoleSingleton<T> where T : ICustomRole
 {
-    private static ICustomRole? _instance;
+    private static T? _instance;
 
     /// <summary>
     /// Gets the instance of the role.
     /// </summary>
-#pragma warning disable CA1000
-    public static ICustomRole Instance => _instance ??= CustomRoleManager.CustomRoles.Values.OfType<T>().Single();
-#pragma warning restore CA1000
+    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "This is a utility class to get the instance of a custom role.")]
+    public static T Instance => _instance ??= CustomRoleManager.CustomRoles.Values.OfType<T>().Single();
 }

MiraAPI/Roles/ICustomRole.cs

@@ -73,56 +73,9 @@ public interface ICustomRole : IOptionable
     /// </summary>
     MiraPluginInfo ParentMod => CustomRoleManager.FindParentMod(this);
 
-    /// <summary>
-    /// This method runs on the PlayerControl.FixedUpdate method for ALL players with this role.
-    /// </summary>
-    /// <param name="playerControl">The PlayerControl that has this role.</param>
-    void PlayerControlFixedUpdate(PlayerControl playerControl)
-    {
-    }
-
     internal ConfigDefinition NumConfigDefinition => new("Roles", $"Num {GetType().FullName}");
     internal ConfigDefinition ChanceConfigDefinition => new("Roles", $"Chance {GetType().FullName}");
 
-    /// <summary>
-    /// Binds the configuration options for this role to the provided ConfigFile.
-    /// </summary>
-    /// <param name="config">The ConfigFile to bind the options to.</param>
-    public virtual void BindConfig(ConfigFile config)
-    {
-        config.Bind(NumConfigDefinition, Configuration.DefaultRoleCount);
-        config.Bind(ChanceConfigDefinition, Configuration.DefaultChance);
-    }
-
-    /// <summary>
-    /// Saves the role's configuration to a preset ConfigFile.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile to save the preset configuration to.</param>
-    /// <param name="useDefault">Whether to use the default values for the configuration.</param>
-    public virtual void SaveToPreset(ConfigFile presetConfig, bool useDefault=false)
-    {
-        BindConfig(presetConfig);
-        presetConfig[NumConfigDefinition].BoxedValue = useDefault ? Configuration.DefaultRoleCount : GetCount();
-        presetConfig[ChanceConfigDefinition].BoxedValue = useDefault ? Configuration.DefaultChance : GetChance();
-    }
-
-    /// <summary>
-    /// Loads the role's configuration from a preset ConfigFile.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile containing the preset configuration.</param>
-    public virtual void LoadFromPreset(ConfigFile presetConfig)
-    {
-        if (presetConfig.TryGetEntry(NumConfigDefinition, out ConfigEntry<int> numEntry))
-        {
-            SetCount(numEntry.Value);
-        }
-
-        if (presetConfig.TryGetEntry(ChanceConfigDefinition, out ConfigEntry<int> chanceEntry))
-        {
-            SetChance(chanceEntry.Value);
-        }
-    }
-
     /// <summary>
     /// Gets the role chance option.
     /// </summary>
@@ -222,14 +175,6 @@ public interface ICustomRole : IOptionable
         return true;
     }
 
-    /// <summary>
-    /// This method runs on the HudManager.Update method ONLY when the LOCAL player has this role.
-    /// </summary>
-    /// <param name="hudManager">Reference to HudManager instance.</param>
-    void HudUpdate(HudManager hudManager)
-    {
-    }
-
     /// <summary>
     /// Gets a custom ejection message for the role. Return null to use the default message.
     /// </summary>

MiraAPI/Roles/ModdedRoleTeams.cs

@@ -1,8 +1,22 @@
 namespace MiraAPI.Roles;
 
+/// <summary>
+/// Enum for modded role teams.
+/// </summary>
 public enum ModdedRoleTeams
 {
+    /// <summary>
+    /// The crewmate team.
+    /// </summary>
     Crewmate,
+
+    /// <summary>
+    /// The impostor team.
+    /// </summary>
     Impostor,
+
+    /// <summary>
+    /// Custom team, catchall for any other teams.
+    /// </summary>
     Custom,
 }

MiraAPI/Roles/RoleId.cs

@@ -2,9 +2,18 @@
 
 namespace MiraAPI.Roles;
 
+/// <summary>
+/// Utility class to get the ID of a role.
+/// </summary>
 public static class RoleId
 {
-    public static ushort Get<T>() where T : RoleBehaviour
+    /// <summary>
+    /// Gets the ID of a role.
+    /// </summary>
+    /// <typeparam name="T">The type of the role.</typeparam>
+    /// <returns>The role ID as a ushort.</returns>
+    /// <exception cref="InvalidOperationException">Thrown when the role is not registered.</exception>
+    public static ushort Get<T>() where T : ICustomRole
     {
         if (!CustomRoleManager.RoleIds.TryGetValue(typeof(T), out var roleId))
         {
@@ -14,6 +23,12 @@ public static class RoleId
         return roleId;
     }
 
+    /// <summary>
+    /// Gets the ID of a role.
+    /// </summary>
+    /// <param name="type">The type of the role.</param>
+    /// <returns>The ID as a ushort.</returns>
+    /// <exception cref="InvalidOperationException">Thrown when the role is not registered.</exception>
     public static ushort Get(Type type)
     {
         if (!CustomRoleManager.RoleIds.TryGetValue(type, out var roleId))

MiraAPI/Utilities/Assets/LoadableAssetWrapper.cs

@@ -1,25 +0,0 @@
-using Reactor.Utilities.Extensions;
-
-namespace MiraAPI.Utilities.Assets;
-
-/// <summary>
-/// Wrapper class to turn any UnityEngine.Object into a <see cref="LoadableAsset{T}"/>.
-/// </summary>
-/// <typeparam name="T">The type of the asset to be loaded. Must be a subclass of <see cref="UnityEngine.Object"/>.</typeparam>
-public class LoadableAssetWrapper<T> : LoadableAsset<T> where T : UnityEngine.Object
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LoadableAssetWrapper{T}"/> class.
-    /// </summary>
-    /// <param name="asset">The asset to wrap. This should be a reference to a UnityEngine.Object.</param>
-    public LoadableAssetWrapper(T asset)
-    {
-        LoadedAsset = asset.DontDestroy();
-    }
-
-    /// <inheritdoc />
-    public override T LoadAsset()
-    {
-        return LoadedAsset ?? throw new System.InvalidOperationException("The asset could not be loaded!");
-    }
-}

MiraAPI/Utilities/Assets/LoadableResourceAsset.cs

@@ -7,6 +7,7 @@ namespace MiraAPI.Utilities.Assets;
 /// A utility class for loading assets from embedded resources.
 /// </summary>
 /// <param name="path">The path to the embedded resource.</param>
+/// <param name="pixelsPerUnit">The pixels per unit for the loaded sprite.</param>
 public class LoadableResourceAsset(string path, float pixelsPerUnit=100f) : LoadableAsset<Sprite>
 {
     private readonly Assembly _assembly = Assembly.GetCallingAssembly();
@@ -14,9 +15,9 @@ public class LoadableResourceAsset(string path, float pixelsPerUnit=100f) : Load
     /// <inheritdoc />
     public override Sprite LoadAsset()
     {
-        if (LoadedAsset != null)
+        if (LoadedAsset)
         {
-            return LoadedAsset;
+            return LoadedAsset!;
         }
 
         return LoadedAsset = SpriteTools.LoadSpriteFromPath(path, _assembly, pixelsPerUnit);

MiraAPI/Utilities/Assets/MiraAssets.cs

@@ -4,75 +4,57 @@ using UnityEngine;
 namespace MiraAPI.Utilities.Assets;
 
 /// <summary>
-/// Various assets used throughout Mira API.
+/// A static class that contains various assets used in the Mira API.
 /// </summary>
 public static class MiraAssets
 {
-    static MiraAssets()
-    {
-        var boxTex = SpriteTools.LoadTextureFromResourcePath(
-            "MiraAPI.Resources.RoundedBox.png",
-            System.Reflection.Assembly.GetCallingAssembly());
-        var boxSprite = Sprite.Create(
-            boxTex,
-            new Rect(0, 0, boxTex.width, boxTex.height),
-            new Vector2(0.5f, 0.5f),
-            100f,
-            0U,
-            SpriteMeshType.Tight,
-            new Vector4(20, 20, 20, 20));
-
-        RoundedBox = new LoadableAssetWrapper<Sprite>(boxSprite);
-    }
-
-    internal static readonly AssetBundle MiraAssetBundle = AssetBundleManager.Load("mirabundle");
-    internal static readonly LoadableAsset<GameObject> ModifierDisplay = new LoadableBundleAsset<GameObject>("Modifiers", MiraAssetBundle);
-    internal static readonly LoadableAsset<GameObject> PresetSavePopup = new LoadableBundleAsset<GameObject>("PresetSavePopup", MiraAssetBundle);
-    internal static readonly LoadableAsset<Sprite> RefreshIcon = new LoadableBundleAsset<Sprite>("refresh", MiraAssetBundle);
-    internal static readonly LoadableAsset<Sprite> FolderIcon = new LoadableBundleAsset<Sprite>("freePlay_folderTaskRoom", MiraAssetBundle);
-
     /// <summary>
-    /// Gets the accepted teal color used for various selections in the UI.
+    /// Gets the color used for teal highlighting in UI.
     /// </summary>
     public static Color32 AcceptedTeal { get; } = new(43, 233, 198, 255);
 
     /// <summary>
-    /// Gets the empty sprite.
+    /// Gets the Mira API asset bundle.
     /// </summary>
-    public static LoadableAsset<Sprite> Empty { get; } = new LoadableResourceAsset("MiraAPI.Resources.Empty.png");
+    public static AssetBundle MiraAssetBundle { get; } = AssetBundleManager.Load("mirabundle");
 
     /// <summary>
-    /// Gets the RoundedBox sprite, which is a rounded rectangle used for UI elements.
+    /// Gets the ModifierDisplay prefab.
     /// </summary>
-    public static LoadableAsset<Sprite> RoundedBox { get; }
+    public static LoadableAsset<GameObject> ModifierDisplay { get; } = new LoadableBundleAsset<GameObject>("Modifiers", MiraAssetBundle);
 
     /// <summary>
-    /// Gets the NextButton sprite.
+    /// Gets the empty sprite asset.
     /// </summary>
-    public static LoadableAsset<Sprite> NextButton { get; } = new LoadableResourceAsset("MiraAPI.Resources.NextButton.png");
+    public static LoadableResourceAsset Empty { get; } = new("MiraAPI.Resources.Empty.png");
 
     /// <summary>
-    /// Gets the active variant of the NextButton sprite.
+    /// Gets the Next Button sprite.
     /// </summary>
-    public static LoadableAsset<Sprite> NextButtonActive { get; } = new LoadableResourceAsset("MiraAPI.Resources.NextButtonActive.png");
+    public static LoadableResourceAsset NextButton { get; } = new("MiraAPI.Resources.NextButton.png");
 
     /// <summary>
-    /// Gets the Cog icon sprite.
+    /// Gets the highlighted Next Button sprite.
     /// </summary>
-    public static LoadableAsset<Sprite> Cog { get; } = new LoadableResourceAsset("MiraAPI.Resources.Cog.png");
+    public static LoadableResourceAsset NextButtonActive { get; } = new("MiraAPI.Resources.NextButtonActive.png");
 
     /// <summary>
-    /// Gets the Checkmark icon sprite.
+    /// Gets the Cog icon used in Role Settings Menu.
     /// </summary>
-    public static LoadableAsset<Sprite> Checkmark { get; } = new LoadableResourceAsset("MiraAPI.Resources.Checkmark.png");
+    public static LoadableResourceAsset Cog { get; } = new("MiraAPI.Resources.Cog.png");
 
     /// <summary>
-    /// Gets the Checkmark Box sprite.
+    /// Gets the Checkmark Box used in the Settings Menu.
     /// </summary>
-    public static LoadableAsset<Sprite> CheckmarkBox { get; } = new LoadableResourceAsset("MiraAPI.Resources.CheckMarkBox.png");
+    public static LoadableResourceAsset CheckmarkBox { get; } = new("MiraAPI.Resources.CheckMarkBox.png");
 
     /// <summary>
-    /// Gets the custom category header sprite used in the options menu.
+    /// Gets the Checkmark used in the Settings Menu.
     /// </summary>
-    public static LoadableAsset<Sprite> CategoryHeader { get; } = new LoadableResourceAsset("MiraAPI.Resources.CategoryHeader.png");
+    public static LoadableResourceAsset Checkmark { get; } = new("MiraAPI.Resources.Checkmark.png");
+
+    /// <summary>
+    /// Gets the white CategoryHeader used in the Settings Menu.
+    /// </summary>
+    public static LoadableResourceAsset CategoryHeader { get; } = new("MiraAPI.Resources.CategoryHeader.png");
 }

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -11,13 +11,14 @@ namespace MiraAPI.Utilities.Assets;
 public static class SpriteTools
 {
     /// <summary>
-    /// Loads and returns a texture from a resource path using the specified assembly.
+    /// Load a sprite from a resource path.
     /// </summary>
-    /// <param name="resourcePath">The path to the resource within the assembly.</param>
-    /// <param name="assembly">The assembly from which to load the resource.</param>
-    /// <returns>A <see cref="Texture2D"/> object loaded from the specified resource path.</returns>
-    /// <exception cref="ArgumentException">Thrown when the resource cannot be found in the specified assembly.</exception>
-    public static Texture2D LoadTextureFromResourcePath(string resourcePath, Assembly assembly)
+    /// <param name="resourcePath">The path to the resource.</param>
+    /// <param name="assembly">The assembly containing the resource.</param>
+    /// <param name="pixelsPerUnit">The pixels per unit for the loaded sprite.</param>
+    /// <returns>A sprite made from the resource.</returns>
+    /// <exception cref="Exception">The resource cannot be found.</exception>
+    public static Sprite LoadSpriteFromPath(string resourcePath, Assembly assembly, float pixelsPerUnit)
     {
         var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false);
         var myStream = assembly.GetManifestResourceStream(resourcePath);
@@ -32,19 +33,6 @@ public static class SpriteTools
         }
 
         tex.name = resourcePath;
-        return tex;
-    }
-
-    /// <summary>
-    /// Loads and returns a <see cref="Sprite"/> from a resource path using the specified assembly.
-    /// </summary>
-    /// <param name="resourcePath">The path to the resource within the assembly.</param>
-    /// <param name="assembly">The assembly from which to load the resource.</param>
-    /// <param name="pixelsPerUnit">The number of pixels per unit for the sprite.</param>
-    /// <returns>A <see cref="Sprite"/> object created from the texture loaded from the specified resource path.</returns>
-    public static Sprite LoadSpriteFromPath(string resourcePath, Assembly assembly, float pixelsPerUnit)
-    {
-        var tex = LoadTextureFromResourcePath(resourcePath, assembly);
         var sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f), pixelsPerUnit);
         sprite.name = resourcePath;
         return sprite;

MiraAPI/Utilities/Extensions.cs

@@ -41,49 +41,6 @@ public static class Extensions
             BitConverter.GetBytes(count.Value).AddRangeToArray(BitConverter.GetBytes(chance.Value)));
     }
 
-    /// <summary>
-    /// Used if you override Minigame.Close.
-    /// </summary>
-    /// <param name="self">The minigame.</param>
-    public static void BaseClose(this Minigame self)
-    {
-        bool isComplete;
-        if (self.amClosing == Minigame.CloseState.Closing)
-        {
-            UnityEngine.Object.Destroy(self.gameObject);
-            return;
-        }
-        if (self.CloseSound && Constants.ShouldPlaySfx())
-        {
-            SoundManager.Instance.PlaySound(self.CloseSound, false, 1f, null);
-        }
-        if (PlayerControl.LocalPlayer.Data.Role.TeamType == RoleTeamTypes.Crewmate)
-        {
-            GameManager.Instance.LogicMinigame.OnMinigameClose();
-        }
-        if (PlayerControl.LocalPlayer)
-        {
-            PlayerControl.HideCursorTemporarily();
-        }
-        self.amClosing = Minigame.CloseState.Closing;
-        self.logger.Info(string.Concat("Closing minigame ", self.GetType().Name));
-        IAnalyticsReporter analytics = DestroyableSingleton<DebugAnalytics>.Instance.Analytics;
-        NetworkedPlayerInfo data = PlayerControl.LocalPlayer.Data;
-        TaskTypes taskType = self.TaskType;
-        float realtimeSinceStartup = Time.realtimeSinceStartup - self.timeOpened;
-        PlayerTask myTask = self.MyTask;
-        if (myTask != null)
-        {
-            isComplete = myTask.IsComplete;
-        }
-        else
-        {
-            isComplete = false;
-        }
-        analytics.MinigameClosed(data, taskType, realtimeSinceStartup, isComplete);
-        self.StartCoroutine(self.CoDestroySelf());
-    }
-    
     /// <summary>
     /// Gets a PlayerControl from their PlayerVoteArea in a meeting.
     /// </summary>

MiraAPI/Utilities/MiraNumberSuffixes.cs

@@ -1,8 +1,27 @@
 namespace MiraAPI.Utilities;
+
+/// <summary>
+/// Suffixes used for options numbers.
+/// </summary>
 public enum MiraNumberSuffixes
 {
+    /// <summary>
+    /// No suffix.
+    /// </summary>
     None,
+
+    /// <summary>
+    /// Multiplier suffix (x).
+    /// </summary>
     Multiplier,
+
+    /// <summary>
+    /// Seconds suffix (s).
+    /// </summary>
     Seconds,
+
+    /// <summary>
+    /// Percentage suffix (%).
+    /// </summary>
     Percent,
 }

nuget.config

@@ -6,5 +6,6 @@
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
         <add key="Reactor" value="https://nuget.reactor.gg/v3/index.json" />
         <add key="Samboy063" value="https://nuget.samboy.dev/v3/index.json" />
+        <add key="Local" value="packages/" />
     </packageSources>
 </configuration>