Merge branch 'dev' into android

# Conflicts:
#	MiraAPI/Patches/IntroCutscenePatches.cs

AmongUs.props

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

Directory.Build.props

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

MiraAPI.Example/ExampleEventHandlers.cs

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

MiraAPI/Events/MiraEventManager.cs

@@ -34,7 +34,7 @@ public static class MiraEventManager
             }
             catch (Exception ex)
             {
-                Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
             }
         }
 
@@ -63,7 +63,7 @@ public static class MiraEventManager
             }
             catch (Exception ex)
             {
-                Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
             }
         }
 

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/VanillaButtonCancelledEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/VanillaButtonClickEvent.cs

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

MiraAPI/Events/Vanilla/Player/CompleteHnsTaskEvent.cs

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

MiraAPI/GameEnd/GameOverManager.cs

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

MiraAPI/GameModes/CustomGameModeManager.cs

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

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using MiraAPI.Modifiers;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions;
@@ -29,16 +28,11 @@ public abstract class AbstractOptionGroup
     public virtual Type? OptionableType => null;
 
     /// <summary>
-    /// Gets a value indicating whether the group should be shown in the modifiers menu. This is deprecated, please use ParentMenu!
+    /// Gets a value indicating whether the group should be shown in the modifiers menu.
     /// </summary>
     // TODO: make this not a boolean
     public virtual bool ShowInModifiersMenu => false;
 
-    /// <summary>
-    /// Gets a value indicating which menu the group is in.
-    /// </summary>
-    public virtual MenuCategory ParentMenu => MenuCategory.Roles;
-
     /// <summary>
     /// Gets the function that determines whether the group should be visible or not.
     /// </summary>
@@ -68,33 +62,4 @@ public abstract class AbstractOptionGroup<T> : AbstractOptionGroup where T : IOp
 {
     /// <inheritdoc />
     public override Type OptionableType => typeof(T);
-
-    /// <summary>
-    /// Gets a value indicating which menu the group is in.
-    /// </summary>
-    public override MenuCategory ParentMenu
-    {
-        get
-        {
-            var type = typeof(T);
-            if (type == typeof(BaseModifier))
-            {
-                return MenuCategory.Modifiers;
-            }
-            else if (type == typeof(RoleBehaviour))
-            {
-                return MenuCategory.Roles;
-            }
-            return MenuCategory.Game;
-        }
-    }
-}
-
-public enum MenuCategory
-{
-    Game,
-    Roles,
-    Modifiers,
-    CustomOne,
-    CustomTwo
 }

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -21,15 +21,7 @@ public class ModdedNumberOptionAttribute(
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        return new ModdedNumberOption(
-            Title,
-            (float)(value ?? min + increment),
-            min,
-            max,
-            increment,
-            suffixType,
-            formatString,
-            zeroInfinity);
+        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, formatString, zeroInfinity);
     }
 
     /// <inheritdoc />

MiraAPI/GameOptions/IModdedOption.cs

@@ -17,9 +17,9 @@ public interface IModdedOption
     uint Id { get; }
 
     /// <summary>
-    /// Gets or sets the title of the option.
+    /// Gets the title of the option.
     /// </summary>
-    string Title { get; set; }
+    string Title { get; }
 
     /// <summary>
     /// Gets the StringName for the option, used for localization.

MiraAPI/GameOptions/MiraNumberOptionComponent.cs

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

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -39,7 +39,7 @@ public static class ModdedOptionsManager
 
         if (TypeToGroup.ContainsKey(type))
         {
-            Error($"Group {type.Name} already exists.");
+            Logger<MiraApiPlugin>.Error($"Group {type.Name} already exists.");
             return false;
         }
 
@@ -60,13 +60,13 @@ public static class ModdedOptionsManager
     {
         if (!TypeToGroup.TryGetValue(type, out var group))
         {
-            Error($"Failed to get group for {type.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get group for {type.Name}");
             return;
         }
 
         if (property.GetValue(group) is not IModdedOption option)
         {
-            Error($"Failed to get option for {property.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get option for {property.Name}");
             return;
         }
 
@@ -81,13 +81,13 @@ public static class ModdedOptionsManager
     {
         if (OptionAttributes.ContainsKey(property))
         {
-            Error($"Property {property.Name} already has an attribute registered.");
+            Logger<MiraApiPlugin>.Error($"Property {property.Name} already has an attribute registered.");
             return;
         }
 
         if (!TypeToGroup.TryGetValue(type, out var group))
         {
-            Error($"Failed to get group for {type.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get group for {type.Name}");
             return;
         }
 
@@ -95,7 +95,7 @@ public static class ModdedOptionsManager
 
         if (option == null)
         {
-            Error($"Failed to get option for {property.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get option for {property.Name}");
             return;
         }
 

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -47,8 +47,6 @@ public class ModdedEnumOption : ModdedOption<int>
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
-        stringOption.name =
-            $"{ParentMod!.OptionsTitleText}.EnumOption.{TranslationController.Instance.GetString(StringName)}";
 
         stringOption.SetUpFromData(Data, 20);
         stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
@@ -140,8 +138,6 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
-        stringOption.name =
-            $"{ParentMod!.OptionsTitleText}.EnumOption.{TranslationController.Instance.GetString(StringName)}";
 
         stringOption.SetUpFromData(Data, 20);
         stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -21,7 +21,7 @@ public abstract class ModdedOption<T> : IModdedOption
     public uint Id { get; }
 
     /// <inheritdoc />
-    public string Title { get; set; }
+    public string Title { get; }
 
     /// <inheritdoc />
     public StringNames StringName { get; }
@@ -125,7 +125,7 @@ public abstract class ModdedOption<T> : IModdedOption
     {
         if (ConfigDefinition is null)
         {
-            Error($"Attempted to save {Title} to preset, but ConfigDefinition is null.");
+            Logger<MiraApiPlugin>.Error($"Attempted to save {Title} to preset, but ConfigDefinition is null.");
             return;
         }
         Bind(presetConfig);
@@ -147,7 +147,7 @@ public abstract class ModdedOption<T> : IModdedOption
         }
         else
         {
-            Error($"Attempted to load {Title} from preset, but ConfigDefinition is not found in preset.");
+            Logger<MiraApiPlugin>.Error($"Attempted to load {Title} from preset, but ConfigDefinition is not found in preset.");
         }
     }
 

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

@@ -55,8 +55,6 @@ public class ModdedPlayerOption : ModdedOption<int>
         Transform container)
     {
         var playerOption = Object.Instantiate(playerOpt, container);
-        playerOption.name =
-            $"{ParentMod!.OptionsTitleText}.PlayerOption.{TranslationController.Instance.GetString(StringName)}";
 
         var filteredList = GetFilteredPlayers();
         Values = filteredList.ToIl2CppList();

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -29,8 +29,6 @@ public class ModdedToggleOption : ModdedOption<bool>
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container);
-        toggleOption.name =
-            $"{ParentMod!.OptionsTitleText}.ToggleOption.{TranslationController.Instance.GetString(StringName)}";
 
         toggleOption.SetUpFromData(Data, 20);
 

MiraAPI/Hud/CustomActionButton.cs

@@ -64,14 +64,9 @@ public abstract class CustomActionButton
     public virtual float EffectDuration => 0;
 
     /// <summary>
-    /// Gets a value indicating whether the button has limited uses.
+    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
     /// </summary>
-    public bool LimitedUses => ZeroIsInfinite ? MaxUses > 0 : MaxUses >= 0;
-
-    /// <summary>
-    /// Gets the maximum number of uses the button has. If the button has infinite uses, set to 0 or -1 based on what value that ZeroIsInfinite is set to.
-    /// </summary>
-    public virtual int MaxUses => ZeroIsInfinite ? 0 : -1;
+    public virtual int MaxUses => 0;
 
     /// <summary>
     /// Gets the value indicating uses mode.
@@ -94,9 +89,9 @@ public abstract class CustomActionButton
     public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
 
     /// <summary>
-    /// Gets or sets a value indicating whether limited uses are determined via zero or a negative number of uses.
+    /// Gets a value indicating whether the button has limited uses.
     /// </summary>
-    public virtual bool ZeroIsInfinite { get; set; } = true;
+    public bool LimitedUses => MaxUses > 0;
 
     /// <summary>
     /// Gets or sets a value indicating whether the effect is currently active, if there is one.
@@ -211,39 +206,7 @@ public abstract class CustomActionButton
             {
                 if (Enabled(PlayerControl.LocalPlayer.Data.Role))
                 {
-                    // Invoke the generic button click event.
-                    var genericEvent = new MiraButtonClickEvent(this);
-                    MiraEventManager.InvokeEvent(genericEvent);
-                    if (genericEvent.IsCancelled)
-                    {
-                        MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this));
-                    }
-
-                    // Invoke the button click event for specific button.
-                    var eventType = CustomButtonManager.ButtonEventTypes[GetType()];
-                    var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, this, genericEvent)!;
-                    var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType);
-                    if (@event.IsCancelled)
-                    {
-                        var cancelEventType = CustomButtonManager.ButtonCancelledEventTypes[GetType()];
-                        var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, this)!;
-                        MiraEventManager.InvokeEvent(cancelEvent, cancelEventType);
-                    }
-
-                    if (specificInvoked)
-                    {
-                        if (!@event.IsCancelled)
-                        {
-                            ClickHandler();
-                        }
-                    }
-                    else
-                    {
-                        if (!genericEvent.IsCancelled)
-                        {
-                            ClickHandler();
-                        }
-                    }
+                    ClickHandler();
                 }
             });
 
@@ -251,10 +214,9 @@ public abstract class CustomActionButton
                 Helpers.CreateKeybindIcon(
                     Button.gameObject,
                     Keybind.CurrentKey,
-                    new Vector3(0.4f, 0.45f, -9f)
+                    new Vector3(MaxUses <= 0 ? -0.4f : 0.4f, 0.45f, -9f)
                 );
             KeybindText = KeybindIcon.transform.GetChild(0).GetComponent<TextMeshPro>();
-            HudManagerPatches.ModdedKeybindIcons.Add(KeybindText);
             Button.usesRemainingSprite.transform.localPosition = new(-0.341f, 0.45f, -0.1f);
         }
     }
@@ -271,7 +233,7 @@ public abstract class CustomActionButton
             return;
         }
 
-        Location = location;
+        this.Location = location;
 
         if (!moveButton)
         {
@@ -532,7 +494,7 @@ public abstract class CustomActionButton
         if (Keybind != null && KeybindText != null)
         {
             KeybindText.text = Keybind.CurrentKey.ToString();
-            KeybindIcon?.SetActive(ActiveInputManager.currentControlType is ActiveInputManager.InputType.Keyboard &&
+            KeybindIcon?.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
                                    LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value &&
                                    Keybind.CurrentKey != KeyboardKeyCode.None);
         }

MiraAPI/Keybinds/BaseKeybind.cs

@@ -69,4 +69,4 @@ public class BaseKeybind
     {
         Handler -= action;
     }
-}
+}

MiraAPI/Keybinds/KeybindManager.cs

@@ -26,11 +26,11 @@ public static class KeybindManager
         try
         {
             var instance = KeybindUtils.RewiredInputManager!;
-            foreach (var keybind in Keybinds)
+            foreach (var keybind in KeybindManager.Keybinds)
             {
                 if (instance.userData.actions.ToArray().Any(x => x.name == keybind.Id))
                 {
-                    Warning($"Keybind of id {keybind.Id} already exists. Skipping it");
+                    Logger<MiraApiPlugin>.Warning($"Keybind of id {keybind.Id} already exists. Skipping it");
                     continue;
                 }
 
@@ -44,7 +44,7 @@ public static class KeybindManager
         }
         catch (Exception e)
         {
-            Error($"Error while registering keybinds in Rewired: {e}");
+            Logger<MiraApiPlugin>.Error($"Error while registering keybinds in Rewired: {e}");
         }
     }
 

MiraAPI/Keybinds/MiraKeybind.cs

@@ -9,7 +9,7 @@ namespace MiraAPI.Keybinds;
 public class MiraKeybind : BaseKeybind
 {
     /// <summary>
-    /// Gets name of the keybind.
+    /// Gets name of the keybind
     /// </summary>
     public string Name { get; }
 

MiraAPI/Keybinds/VanillaKeybind.cs

@@ -19,6 +19,6 @@ public class VanillaKeybind : BaseKeybind
     public VanillaKeybind(int id)
     {
         RewiredInputAction = KeybindUtils.GetInputActionById(id);
-        Id = RewiredInputAction != null ? RewiredInputAction.name : id.ToString();
+        Id = RewiredInputAction?.name;
     }
 }

MiraAPI/LocalSettings/LocalSettingsManager.cs

@@ -24,7 +24,7 @@ public static class LocalSettingsManager
 
         if (TypeToTab.ContainsKey(type))
         {
-            Error($"Local settings tab {type.Name} already exists.");
+            Logger<MiraApiPlugin>.Error($"Local settings tab {type.Name} already exists.");
             return false;
         }
 

MiraAPI/MiraApiPlugin.cs

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

MiraAPI/MiraApiSettings.cs

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

MiraAPI/Modifiers/ModifierComponent.cs

@@ -47,7 +47,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _player = GetComponent<PlayerControl>();
         if (_player == null)
         {
-            Error("ModifierComponent could not find PlayerControl on the same GameObject.");
+            Logger<MiraApiPlugin>.Error("ModifierComponent could not find PlayerControl on the same GameObject.");
             Destroy(this);
             return;
         }
@@ -77,7 +77,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
             }
 
             Modifiers.Remove(modifier);
@@ -95,7 +95,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
             }
 
             if (modifier is TimedModifier { AutoStart: true } timer)
@@ -122,7 +122,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
             }
         }
 
@@ -153,7 +153,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
             }
         }
     }
@@ -336,7 +336,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         var modifier = modifiers.FirstOrDefault();
         if (modifier is null)
         {
-            Error($"Cannot remove modifier {type.Name} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {type.Name} because it is not active.");
             return;
         }
 
@@ -352,7 +352,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         if (!ActiveModifiers.Contains(modifier))
         {
-            Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
             return;
         }
 
@@ -382,7 +382,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         var modifier = GetModifier(uniqueId);
         if (modifier == null)
         {
-            Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
             return;
         }
 
@@ -412,19 +412,19 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         // TODO: Make a proper synchronization system.
         if (LobbyBehaviour.Instance)
         {
-            Warning($"Modifiers added in the lobby won't sync to new players!");
+            Logger<MiraApiPlugin>.Warning($"Modifiers added in the lobby won't sync to new players!");
         }
 
         var id = modifier.TypeId;
         if (modifier.Unique && ActiveModifiers.Find(x => x.TypeId == id) != null)
         {
-            Error($"Player already has modifier with id {id}!");
+            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {id}!");
             return null;
         }
 
         if (ActiveModifiers.Contains(modifier))
         {
-            Error($"Player already has this modifier!");
+            Logger<MiraApiPlugin>.Error($"Player already has this modifier!");
             return null;
         }
 

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -83,7 +83,7 @@ public static class ModifierExtensions
         var modifier = target.GetModifier(typeId, predicate);
         if (modifier is null)
         {
-            Error($"Player {target.PlayerId} does not have modifier with type ID {typeId}.");
+            Logger<MiraApiPlugin>.Error($"Player {target.PlayerId} does not have modifier with type ID {typeId}.");
             return;
         }
 

MiraAPI/Modifiers/ModifierManager.cs

@@ -97,7 +97,7 @@ public static class ModifierManager
 
         if (modifierType.GetConstructor(Type.EmptyTypes) == null)
         {
-            Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
+            Logger<MiraApiPlugin>.Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
             return false;
         }
 
@@ -137,7 +137,7 @@ public static class ModifierManager
             var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
             if (validPlayers.Count == 0)
             {
-                Warning($"No valid players for modifier {modifier.ModifierName}");
+                Logger<MiraApiPlugin>.Warning($"No valid players for modifier {modifier.ModifierName}");
                 continue;
             }
 
@@ -158,7 +158,7 @@ public static class ModifierManager
 
                 if (candidates.Count == 0)
                 {
-                    Warning(
+                    Logger<MiraApiPlugin>.Warning(
                         $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
                     break;
                 }
@@ -166,7 +166,7 @@ public static class ModifierManager
                 var plr = candidates.Random();
                 if (plr == null)
                 {
-                    Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    Logger<MiraApiPlugin>.Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
                     continue;
                 }
 
@@ -179,7 +179,6 @@ public static class ModifierManager
     private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
     {
         return (player.Data.Role is not ICustomRole role || role.IsModifierApplicable(modifier)) &&
-               modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId) &&
-               modifier.CanSpawnOnCurrentMode();
+               modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId);
     }
 }

MiraAPI/Modifiers/Types/GameModifier.cs

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

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -80,7 +80,7 @@ public abstract class TimedModifier : BaseModifier
     {
         if (TimerActive)
         {
-            Error("Can't start a timer that has already been started.");
+            Logger<MiraApiPlugin>.Error("Can't start a timer that has already been started.");
             return;
         }
 

MiraAPI/Networking/CustomGameOverRpc.cs

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

MiraAPI/Networking/CustomMurderRpc.cs

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

MiraAPI/Networking/MiraRpc.cs

@@ -35,11 +35,6 @@ public enum MiraRpc : uint
     /// </summary>
     CustomMurder,
 
-    /// <summary>
-    /// Custom Murder RPC Confirmation.
-    /// </summary>
-    ConfirmCustomMurder,
-
     /// <summary>
     /// Custom Game Over RPC.
     /// </summary>

MiraAPI/Patches/Accessibility/HudManagerFlashPatches.cs

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

MiraAPI/Patches/DetectiveNotesMinigamePatch.cs

@@ -7,12 +7,12 @@ using UnityEngine;
 
 namespace MiraAPI.Patches;
 
-[HarmonyPatch(typeof(DetectiveNotesMinigame), nameof(DetectiveNotesMinigame.SetImpostorPopup))]
+[HarmonyPatch(typeof(DetectiveNotesMinigame), nameof(DetectiveNotesMinigame.OpenBodyPopup))]
 public static class DetectiveNotesMinigamePatch
 {
     public static void Prefix(DetectiveNotesMinigame __instance, bool active)
     {
-        __instance.impostorTypePopup.gameObject.SetActive(active);
+        __instance.impostorTypePopup.SetActive(active);
         if (!active)
         {
             ControllerManager.Instance.CloseOverlayMenu(__instance.ImpostorOverlay);
@@ -22,21 +22,23 @@ public static class DetectiveNotesMinigamePatch
         }
         if (__instance.impostorButton != null)
         {
-            ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, __instance.impostorTypePopup, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
+            ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, null, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
             return;
         }
         __instance.impostorButton = new List<GameObject>();
+        int num = 0;
         var allRoles = DestroyableSingleton<RoleManager>.Instance.AllRoles;
         var customRoles = CustomRoleManager.CustomRoleBehaviours;
         foreach (var role in allRoles)
         {
             if (role.TeamType != RoleTeamTypes.Impostor || role.Role == RoleTypes.ImpostorGhost || customRoles.Contains(role) )
                 continue;
-            var gameObject = Object.Instantiate(__instance.impostorTypePrefab, __instance.impostorTypeParent);
+            GameObject gameObject = Object.Instantiate<GameObject>(__instance.impostorTypePrefab, __instance.impostorTypeParent);
             __instance.impostorButton.Add(gameObject);
             gameObject.GetComponent<DetectiveImpostorType>().Initialize(__instance, role);
+            num++;
             __instance.ImpostorIconControllerSelectables.Add(gameObject.GetComponent<PassiveButton>());
         }
-        ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, __instance.impostorTypePopup, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
+        ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, null, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
     }
-}
+}

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -7,6 +7,15 @@ namespace MiraAPI.Patches.Events;
 
 internal static class EndGamePatches
 {
+    [HarmonyPatch(typeof(GameManager), nameof(GameManager.Awake))]
+    public static class GameManagerAwakePatch
+    {
+        public static void Postfix(GameManager __instance)
+        {
+            __instance.enabled = true;
+        }
+    }
+
     [HarmonyPatch(typeof(GameManager), nameof(GameManager.RpcEndGame))]
     public static class GameManagerRpcEndGamePatch
     {

MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs

@@ -1,20 +1,13 @@
-using System.Reflection;
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
-[HarmonyPatch]
+[HarmonyPatch(typeof(TutorialManager._RunTutorial_d__3), nameof(TutorialManager._RunTutorial_d__3.MoveNext))]
 public static class FreeplayRoundStartPatch
 {
-    public static MethodBase TargetMethod()
-    {
-        return Helpers.GetStateMachineMoveNext<TutorialManager>(nameof(TutorialManager.RunTutorial))!;
-    }
-
-    public static void Postfix(ref bool __result)
+    public static void Postfix(TutorialManager._RunTutorial_d__3 __instance, ref bool __result)
     {
         if (!__result)
         {

MiraAPI/Patches/Events/HnsFinishTaskPatch.cs

@@ -1,17 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Player;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch(typeof(HideAndSeekManager))]
-public static class HnsFinishTaskPatch
-{
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(HideAndSeekManager.FinishTask))]
-    public static void FinishTaskPostfix(HideAndSeekManager __instance, PlayerTask task)
-    {
-        var completeTaskEvent = new CompleteHnsTaskEvent(__instance, task.Owner, task);
-        MiraEventManager.InvokeEvent(completeTaskEvent);
-    }
-}

MiraAPI/Patches/Events/KillAnimationMurderEventPatch.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using HarmonyLib;
-using Il2CppInterop.Runtime.InteropTypes;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patch to invoke AfterMurderEvent after a kill animation is performed.
-/// </summary>
-[HarmonyPatch]
-public static class KillAnimationMurderEventPatch
-{
-    public static MethodBase TargetMethod()
-    {
-        return Helpers.GetStateMachineMoveNext<KillAnimation>(nameof(KillAnimation.CoPerformKill))!;
-    }
-
-    public static void Postfix(Il2CppObjectBase __instance)
-    {
-        var wrapper = new StateMachineWrapper<KillAnimation>(__instance);
-        if (wrapper.GetState() != 1)
-        {
-            return;
-        }
-
-        var source = wrapper.GetParameter<PlayerControl>("source");
-        var target = wrapper.GetParameter<PlayerControl>("target");
-
-        var afterMurderEvent = new AfterMurderEvent(source, target, Helpers.GetBodyById(target.PlayerId));
-        MiraEventManager.InvokeEvent(afterMurderEvent);
-    }
-}

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -0,0 +1,30 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Utilities;
+
+namespace MiraAPI.Patches.Events;
+
+/// <summary>
+/// General patches for the KillAnimation class.
+/// </summary>
+[HarmonyPatch]
+public static class KillAnimationPatches
+{
+    /// <summary>
+    /// Used to trigger the <see cref="AfterMurderEvent"/>.
+    /// </summary>
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(KillAnimation._CoPerformKill_d__2), nameof(KillAnimation._CoPerformKill_d__2.MoveNext))]
+    public static void KillAnimPostfix(KillAnimation._CoPerformKill_d__2 __instance)
+    {
+        // Checking if state is -1 to wait for the end of coroutine.
+        if (__instance.__1__state != -1)
+        {
+            return;
+        }
+
+        var afterMurderEvent = new AfterMurderEvent(__instance.source, __instance.target, Helpers.GetBodyById(__instance.target.PlayerId));
+        MiraEventManager.InvokeEvent(afterMurderEvent);
+    }
+}

MiraAPI/Patches/Events/ReportBodyEventPatch.cs

@@ -41,7 +41,7 @@ public static class ReportBodyEventPatch
         var source = AmongUsClient.Instance.FindObjectByNetId<PlayerControl>(reportBodyMessage.rpcObjectNetId);
         if (source == null)
         {
-            Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
+            Logger<MiraApiPlugin>.Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
             return true;
         }
 

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -1,5 +1,4 @@
-/*
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 
@@ -19,4 +18,3 @@ internal static class SpawnInMinigamePatch
         MiraEventManager.InvokeEvent(@event2);
     }
 }
-*/

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -1,5 +1,4 @@
-/*
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
 using HarmonyLib;
 using MiraAPI.Events;
@@ -35,4 +34,3 @@ internal static class SubmergedSpawnGamePatch
         MiraEventManager.InvokeEvent(@event2);
     }
 }
-*/

MiraAPI/Patches/Events/VanillaButtonPatches.cs

@@ -1,75 +0,0 @@
-using System.Linq;
-using AmongUs.GameOptions;
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Events.Vanilla.Usables;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patches to invoke vent related MiraEvents.
-/// </summary>
-[HarmonyPatch]
-public static class VanillaButtonPatches
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(AbilityButton), nameof(AbilityButton.DoClick))]
-    public static bool DoClickPrefix(AbilityButton __instance)
-    {
-        // Invoke the generic button click event.
-        PlayerControl? playerTarget = null;
-        Vent? ventTarget = null;
-        var role = PlayerControl.LocalPlayer.Data.Role;
-        if (role.Role is RoleTypes.Tracker)
-        {
-            playerTarget = role.Cast<TrackerRole>().currentTarget;
-        }
-        else if (role.Role is RoleTypes.GuardianAngel)
-        {
-            playerTarget = role.Cast<GuardianAngelRole>().currentTarget;
-        }
-        else if (role.Role is RoleTypes.Engineer)
-        {
-            ventTarget = role.Cast<EngineerRole>().currentTarget;
-        }
-        var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget, ventTarget);
-        MiraEventManager.InvokeEvent(genericEvent);
-        if (genericEvent.IsCancelled)
-        {
-            MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance));
-        }
-
-        if (!genericEvent.IsCancelled)
-        {
-            return true;
-        }
-
-        return false;
-    }
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(SecondaryAbilityButton), nameof(SecondaryAbilityButton.DoClick))]
-    public static bool SecondaryDoClickPrefix(AbilityButton __instance)
-    {
-        // Invoke the generic button click event.
-        PlayerControl? playerTarget = null;
-        var role = PlayerControl.LocalPlayer.Data.Role;
-        if (role.Role is RoleTypes.Detective)
-        {
-            playerTarget = role.Cast<DetectiveRole>().currentTarget;
-        }
-        var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget);
-        MiraEventManager.InvokeEvent(genericEvent);
-        if (genericEvent.IsCancelled)
-        {
-            MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance));
-        }
-
-        if (!genericEvent.IsCancelled)
-        {
-            return true;
-        }
-
-        return false;
-    }
-}

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -21,14 +21,10 @@ using Object = UnityEngine.Object;
 namespace MiraAPI.Patches.Freeplay;
 
 [HarmonyPatch(typeof(TaskAdderGame))]
-public static class TaskAdderPatches
+internal static class TaskAdderPatches
 {
     private static Scroller _scroller = null!;
     private static Dictionary<string, TaskFolder> folders = new();
-    public static string CrewmateName => TranslationController.Instance.GetString(StringNames.Crewmate);
-    public static string ImpostorName => TranslationController.Instance.GetString(StringNames.Impostor);
-    public static string NeutralName => "Neutral";
-    public static string ModifiersName => "Modifiers";
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
@@ -70,16 +66,19 @@ public static class TaskAdderPatches
         __instance.RootFolderPrefab.GetComponent<PassiveButton>().ClickMask = collider;
         __instance.RootFolderPrefab.gameObject.SetActive(false);
         __instance.TaskParent = inner.transform;
-        var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == CrewmateName)!;
-        var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == ImpostorName)!;
+        var crewLocale = TranslationController.Instance.GetString(StringNames.Crewmate);
+        var impLocale = TranslationController.Instance.GetString(StringNames.Impostor);
+
+        var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == crewLocale)!;
+        var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == impLocale)!;
         //var neutralFolder = __instance.CreateFolder("Neutral", __instance.Root, 2, Color.gray);
-        var modifiersFolder = __instance.CreateFolder(ModifiersName, __instance.Root, 0, Color.blue);
+        var modifiersFolder = __instance.CreateFolder("Modifiers", __instance.Root, 0, Color.blue);
 
         folders.Clear();
         folders.Add(crewmateFolder.FolderName, crewmateFolder);
         folders.Add(impostorFolder.FolderName, impostorFolder);
         //folders.Add("Neutrals", neutralFolder);
-        folders.Add(ModifiersName, modifiersFolder);
+        folders.Add("Modifiers", modifiersFolder);
 
         int folderIdx = 2;
         foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
@@ -138,8 +137,8 @@ public static class TaskAdderPatches
                 Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
             impFolder.gameObject.SetActive(false);
             impFolder.SetFolderColor(TaskFolder.FolderColor.Red);
-            crewFolder.FolderName = CrewmateName;
-            impFolder.FolderName = ImpostorName;
+            crewFolder.FolderName = TranslationController.Instance.GetString(StringNames.Crewmate);
+            impFolder.FolderName = TranslationController.Instance.GetString(StringNames.Impostor);
             rootFolder.SubFolders.Insert(0, crewFolder);
             rootFolder.SubFolders.Insert(0, impFolder);
             Il2CppSystem.Collections.Generic.List<RoleBehaviour> impRoles = new();
@@ -441,7 +440,7 @@ public static class TaskAdderPatches
             }
         }
 
-        if (folders.TryGetValue(ModifiersName, out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
+        if (folders.TryGetValue("Modifiers", out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
         {
             var plugin = MiraPluginManager.GetPluginByGuid(taskFolder.name.Replace("(Clone)", string.Empty));
             if (plugin != null)

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -9,11 +9,6 @@ namespace MiraAPI.Patches.Hud;
 public static class ButtonResetPatches
 {
     public static void Postfix()
-    {
-        ResetCooldowns();
-    }
-
-    public static void ResetCooldowns()
     {
         foreach (var customActionButton in CustomButtonManager.CustomButtons)
         {
@@ -23,7 +18,7 @@ public static class ButtonResetPatches
             }
             catch (System.Exception ex)
             {
-                Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
+                Logger<MiraApiPlugin>.Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
             }
 
             if (customActionButton.UsesMode == ButtonUsesMode.PerRound)

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,5 +1,5 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 using HarmonyLib;
 using MiraAPI.Hud;
 using MiraAPI.Keybinds;
@@ -25,87 +25,7 @@ public static class HudManagerPatches
     public static Transform? BottomRight { get; private set; }
     public static Transform? Buttons { get; private set; }
 
-    private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = [];
-
-    internal static List<TextMeshPro> ModdedKeybindIcons = [];
-
-    public static IEnumerator CoResizeUI()
-    {
-        while (!HudManager.Instance)
-        {
-            yield return null;
-        }
-
-        yield return new WaitForSeconds(0.01f);
-        ResizeUI(LocalSettingsTabSingleton<MiraApiSettings>.Instance.ButtonUIFactorSlider.Value);
-    }
-
-    public static void ResizeUI(float scaleFactor)
-    {
-        var baseButtons = HudManager.Instance.transform.FindChild("Buttons");
-        if (baseButtons != null)
-        {
-            foreach (var aspect in baseButtons.GetComponentsInChildren<AspectPosition>(true))
-            {
-                if (aspect.gameObject == null)
-                {
-                    continue;
-                }
-
-                if (aspect.gameObject.transform.parent.name == "TopRight")
-                {
-                    continue;
-                }
-
-                if (aspect.gameObject.transform.parent.transform.parent.name == "TopRight")
-                {
-                    continue;
-                }
-
-                aspect.gameObject.SetActive(!aspect.isActiveAndEnabled);
-                aspect.DistanceFromEdge *= new Vector2(scaleFactor, scaleFactor);
-                aspect.gameObject.SetActive(!aspect.isActiveAndEnabled);
-            }
-        }
-
-        foreach (var button in HudManager.Instance.GetComponentsInChildren<ActionButton>(true))
-        {
-            if (button.gameObject == null)
-            {
-                continue;
-            }
-
-            button.gameObject.SetActive(!button.isActiveAndEnabled);
-            button.gameObject.transform.localScale *= scaleFactor;
-            button.gameObject.SetActive(!button.isActiveAndEnabled);
-        }
-
-        if (baseButtons != null)
-        {
-            foreach (var arrange in baseButtons.GetComponentsInChildren<GridArrange>(true))
-            {
-                if (!arrange.gameObject || !arrange.transform)
-                {
-                    continue;
-                }
-
-                arrange.gameObject.SetActive(!arrange.isActiveAndEnabled);
-                arrange.CellSize = new Vector2(scaleFactor, scaleFactor);
-                arrange.gameObject.SetActive(!arrange.isActiveAndEnabled);
-                if (arrange.isActiveAndEnabled && arrange.gameObject.transform.childCount != 0)
-                {
-                    try
-                    {
-                        arrange.ArrangeChilds();
-                    }
-                    catch
-                    {
-                        // Error($"Error arranging child objects in GridArrange: {e}");
-                    }
-                }
-            }
-        }
-    }
+    private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = new();
 
     /*
     /// <summary>
@@ -153,22 +73,17 @@ public static class HudManagerPatches
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
-        if (Constants.GetPlatformType() is Platforms.Android or Platforms.IPhone)
+        var fakeButton = Object.Instantiate(__instance.AbilityButton, BottomLeft.transform);
+        foreach (var renderer in fakeButton.GetComponentsInChildren<Renderer>())
         {
-            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();
+            renderer.enabled = false;
         }
-        ModdedKeybindIcons = [];
+        fakeButton.buttonLabelText.Destroy();
+        fakeButton.cooldownTimerText.Destroy();
+        fakeButton.usesRemainingText.Destroy();
+        fakeButton.GetComponent<PassiveButton>().Destroy();
+        fakeButton.ToggleVisible(true);
+        fakeButton.Destroy();
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
@@ -190,18 +105,16 @@ public static class HudManagerPatches
             }
             catch (System.Exception e)
             {
-                Error($"Failed to create custom button {button.GetType().Name}: {e}");
+                Logger<MiraApiPlugin>.Error($"Failed to create custom button {button.GetType().Name}: {e}");
             }
         }
-        __instance.ImpostorVentButton.transform.SetParent(null);
-        __instance.ImpostorVentButton.transform.SetParent(BottomRight.transform);
 
         gridArrange.Start();
         gridArrange.ArrangeChilds();
         aspectPosition.AdjustPosition();
 
         vanillaKeybindIcons = [];
-        var keybindIconPos = new Vector3(0.4f, 0.4f, -9.5f);
+        var keybindIconPos = new Vector3(-0.4f, 0.4f, -9.5f);
         var vanillaButtons = new Dictionary<GameObject, int>
         {
             { __instance.KillButton.gameObject, 8 },
@@ -224,15 +137,9 @@ public static class HudManagerPatches
             }
             var icon = Helpers.CreateKeybindIcon(buttonObj, key, keybindIconPos);
             vanillaKeybindIcons.Add(icon.transform.GetChild(0).GetComponent<TextMeshPro>(), actionId);
-            if (!MiraApiPlugin.IsMobile)
-            {
-                var comp = buttonObj.GetComponent<ActionButton>();
-                KeybindManager.VanillaKeybinds[comp.GetType()].Button = comp;
-            }
+            var comp = buttonObj.GetComponent<ActionButton>();
+            KeybindManager.VanillaKeybinds[comp.GetType()].Button = comp;
         }
-        MiraApiSettings.OldButtonScaleFactor =
-            LocalSettingsTabSingleton<MiraApiSettings>.Instance.ButtonUIFactorSlider.Value;
-        Coroutines.Start(CoResizeUI());
     }
 
     /// <summary>
@@ -260,7 +167,7 @@ public static class HudManagerPatches
             }
             catch (System.Exception e)
             {
-                Error($"Failed to set custom button {button.GetType().Name} active: {e}");
+                Logger<MiraApiPlugin>.Error($"Failed to set custom button {button.GetType().Name} active: {e}");
             }
         }
     }
@@ -269,56 +176,28 @@ public static class HudManagerPatches
     [HarmonyPostfix]
     public static void UpdatePostfix()
     {
-        var canSeeBinds = ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
-                          LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value;
-
         foreach (var btnIcon in vanillaKeybindIcons)
         {
             btnIcon.Key.text = KeybindUtils.GetKeycodeByActionId(btnIcon.Value).ToString();
-            btnIcon.Key.transform.parent.gameObject.SetActive(canSeeBinds);
-        }
-
-        foreach (var btnIcon in ModdedKeybindIcons)
-        {
-            btnIcon.transform.parent.gameObject.SetActive(canSeeBinds);
+            btnIcon.Key.transform.parent.gameObject.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
+                                                              LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value);
         }
 
         var player = ReInput.players.GetPlayer(0);
-        var keyboard = player.controllers.Keyboard;
         foreach (var entry in KeybindManager.Keybinds)
         {
-            var modKeys = entry.ModifierKeys;
-            bool modifierKeysPressed;
-            if (modKeys.Length == 0)
-            {
-                modifierKeysPressed = true;
-            }
-            else
-            {
-                modifierKeysPressed = true;
-                foreach (var key in modKeys)
-                {
-                    if (keyboard.GetModifierKey(key)) continue;
-                    modifierKeysPressed = false;
-                    break;
-                }
-            }
-
+            var keyboard = player.controllers.Keyboard;
+            bool modifierKeysPressed = entry.ModifierKeys.All(k => keyboard.GetModifierKey(k)) ||
+                                       entry.ModifierKeys.Length <= 0;
             if (player.GetButtonDown(entry.Id) && modifierKeysPressed)
             {
                 entry.Invoke();
             }
         }
 
-        // suppressed warning because we want minimum allocations here
-#pragma warning disable S3267
-        foreach (var entry in KeybindManager.VanillaKeybinds.Values)
-#pragma warning restore S3267
+        foreach (var entry in KeybindManager.VanillaKeybinds.Values.Where(x => player.GetButtonDown(x.Id)))
         {
-            if (player.GetButtonDown(entry.Id))
-            {
-                entry.Invoke();
-            }
+            entry.Invoke();
         }
     }
 }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -38,7 +38,7 @@ public static class IntroCutscenePatches
     {
         public static MethodBase TargetMethod()
         {
-            return Helpers.GetStateMachineMoveNext<IntroCutscene>(nameof(IntroCutscene.ShowRole))!;
+            return Helpers.GetStateMachineMoveNext<IntroCutscene>("ShowRole")!;
         }
 
         public static void Postfix(Il2CppObjectBase __instance)
@@ -52,7 +52,7 @@ public static class IntroCutscenePatches
 
             var introCutscene = wrapper.Instance;
 
-            Info("IntroCutscene ShowRole reached");
+            Logger<MiraApiPlugin>.Info("IntroCutscene ShowRole reached");
             var @event = new IntroRoleRevealEvent(introCutscene);
             MiraEventManager.InvokeEvent(@event);
         }
@@ -96,12 +96,12 @@ public static class IntroCutscenePatches
             if (onDestroy != null)
             {
                 _usedFallback = false;
-                Info("Using OnDestroy for IntroCutsceneDestroyPatch");
+                Logger<MiraApiPlugin>.Info("Using OnDestroy for IntroCutsceneDestroyPatch");
                 return onDestroy;
             }
 
             _usedFallback = true;
-            return Helpers.GetStateMachineMoveNext<IntroCutscene>(nameof(IntroCutscene.CoBegin))!;
+            return Helpers.GetStateMachineMoveNext<IntroCutscene>("CoBegin")!;
         }
 
         public static void Postfix(Il2CppObjectBase __instance)
@@ -124,7 +124,7 @@ public static class IntroCutscenePatches
             }
 
 
-            Info("IntroCutscene ended");
+            Logger<MiraApiPlugin>.Info("IntroCutscene ended");
 
             MiraEventManager.InvokeEvent(new IntroEndEvent(introCutscene));
 

MiraAPI/Patches/Keybinds/ControlMapperPatches.cs

@@ -15,8 +15,7 @@ namespace MiraAPI.Patches.Keybinds;
 [HarmonyPatch(typeof(ControlMapper))]
 public static class ControlMapperPatches
 {
-    // Patching this crashes for Epic Games users
-    /*[HarmonyPrefix]
+    [HarmonyPrefix]
     [HarmonyPatch(nameof(ControlMapper.Start))]
     private static void StartPrefix(ControlMapper __instance)
     {
@@ -38,7 +37,7 @@ public static class ControlMapperPatches
             entry.Value = !entry.Value;
             text.text = $"Show Keybinds: {(entry.Value ? "On" : "Off")}";
         }));
-    }*/
+    }
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(ControlMapper.Update))]

MiraAPI/Patches/Keybinds/OptionsMenuBehaviourPatch.cs

@@ -16,15 +16,8 @@ public static class OptionsMenuBehaviourPatch
     private static void OpenPostfix(OptionsMenuBehaviour __instance)
     {
         _remap_rollover = GameObject.Find("Remap Controls")?.GetComponent<ButtonRolloverHandler>()!;
-        try
-        {
-            _remap_background = _remap_rollover.transform.FindChild("Background").GetComponent<SpriteRenderer>();
-            _remap_background.color = _conflicts ? Color.red : Color.white;
-        }
-        catch
-        {
-            // ignored, this normally breaks when on mobile since there's no remap button screen.
-        }
+        _remap_background = _remap_rollover.transform.FindChild("Background").GetComponent<SpriteRenderer>();
+        _remap_background.color = _conflicts ? Color.red : Color.white;
     }
 
     [HarmonyPostfix]

MiraAPI/Patches/Menu/MainMenuManagerPatches.cs

@@ -1,9 +1,5 @@
-using System.Collections;
-using HarmonyLib;
-using MiraAPI.LocalSettings;
+using HarmonyLib;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
-using UnityEngine;
 
 namespace MiraAPI.Patches.Menu;
 
@@ -21,14 +17,5 @@ public static class MainMenuManagerPatches
     public static void AwakePostfix()
     {
         AddressablesLoader.LoadAll();
-        Coroutines.Start(SetFps());
-    }
-
-    private static IEnumerator SetFps()
-    {
-        Application.targetFrameRate = (int)LocalSettingsTabSingleton<MiraApiSettings>.Instance.SetFpsSlider.Value;
-        yield return new WaitForSeconds(1f);
-
-        Application.targetFrameRate = (int)LocalSettingsTabSingleton<MiraApiSettings>.Instance.SetFpsSlider.Value;
     }
 }

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Linq;
-using AmongUs.GameOptions;
 using HarmonyLib;
-using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
-using MiraAPI.Presets;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using Reactor.Localization.Utilities;
@@ -13,7 +10,6 @@ using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Options;
@@ -21,20 +17,6 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(GameOptionsMenu))]
 internal static class GameOptionsMenuPatch
 {
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(GameOptionsMenu.OnEnable))]
-    public static void OpenPatch(GameOptionsMenu __instance)
-    {
-        HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = false;
-    }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(GameOptionsMenu.OnDisable))]
-    public static void ClosePatch(GameOptionsMenu __instance)
-    {
-        HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = true;
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameOptionsMenu.Update))]
     // ReSharper disable once InconsistentNaming
@@ -50,20 +32,11 @@ internal static class GameOptionsMenuPatch
         {
             ModifiersUpdate(ref num);
         }
-        else if (__instance.name == "CUSTOM TAB 1")
-        {
-            CustomMenuOneUpdate(ref num);
-        }
-        else if (__instance.name == "CUSTOM TAB 2")
-        {
-            CustomMenuTwoUpdate(ref num);
-        }
         else
         {
             var filteredGroups =
                 GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-                    .Where(x => x.OptionableType == null &&
-                                !x.ShowInModifiersMenu && x.ParentMenu == MenuCategory.Roles) ?? [];
+                    .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
             foreach (var group in filteredGroups)
             {
@@ -126,52 +99,10 @@ internal static class GameOptionsMenuPatch
         }
     }
 
-    private static void CustomMenuOneUpdate(ref float num)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomOne) ?? [];
-
-        foreach (var modGroup in groups)
-        {
-            UpdateGroup(modGroup, ref num);
-        }
-    }
-
-    private static void CustomMenuOneCreate(GameOptionsMenu menu)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomOne) ?? [];
-        foreach (var group in groups)
-        {
-            CreateGroup(menu, group);
-        }
-    }
-
-    private static void CustomMenuTwoUpdate(ref float num)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomTwo) ?? [];
-
-        foreach (var modGroup in groups)
-        {
-            UpdateGroup(modGroup, ref num);
-        }
-    }
-
-    private static void CustomMenuTwoCreate(GameOptionsMenu menu)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomTwo) ?? [];
-        foreach (var group in groups)
-        {
-            CreateGroup(menu, group);
-        }
-    }
-
     private static void ModifiersUpdate(ref float num)
     {
         var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
+            .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
 
         foreach (var modGroup in groups)
         {
@@ -182,7 +113,7 @@ internal static class GameOptionsMenuPatch
     private static void ModifiersCreate(GameOptionsMenu menu)
     {
         var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
+            .Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
         foreach (var group in groups)
         {
             CreateGroup(menu, group);
@@ -206,19 +137,9 @@ internal static class GameOptionsMenuPatch
             ModifiersCreate(__instance);
             return false;
         }
-        else if (__instance.name == "CUSTOM TAB 1")
-        {
-            CustomMenuOneCreate(__instance);
-            return false;
-        }
-        else if (__instance.name == "CUSTOM TAB 2")
-        {
-            CustomMenuTwoCreate(__instance);
-            return false;
-        }
 
         var filteredGroups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu && x.ParentMenu == MenuCategory.Roles) ?? [];
+            .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
         foreach (var group in filteredGroups)
         {
@@ -275,9 +196,7 @@ internal static class GameOptionsMenuPatch
         categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20);
         categoryHeaderMasked.Background.color = group.GroupColor;
         categoryHeaderMasked.Divider.color = group.GroupColor;
-        categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
-            ? Color.white
-            : group.GroupColor.FindAlternateColor();
+        categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.GroupColor.FindAlternateColor();
 
         categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
         categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
@@ -296,20 +215,13 @@ internal static class GameOptionsMenuPatch
         newText.transform.localPosition = new Vector3(2.6249f, -0.165f, 0f);
         newText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
 
-        var options = group.Options.Select(opt => opt.CreateOption(
-            menu.checkboxOrigin,
-            menu.numberOptionOrigin,
-            menu.stringOptionOrigin,
-            menu.playerOptionOrigin,
-            menu.settingsContainer));
-
-        OptionPreset? defaultPreset = null;
-        if (GameSettingMenuPatches.SelectedMod != null && PresetManager.DefaultPresets.TryGetValue(
-                GameSettingMenuPatches.SelectedMod,
-                out var preset))
-        {
-            defaultPreset = preset;
-        }
+        var options = group.Options.Select(
+            opt => opt.CreateOption(
+                menu.checkboxOrigin,
+                menu.numberOptionOrigin,
+                menu.stringOptionOrigin,
+                menu.playerOptionOrigin,
+                menu.settingsContainer));
 
         foreach (var newOpt in options)
         {
@@ -345,79 +257,14 @@ internal static class GameOptionsMenuPatch
             if (newOpt is ToggleOption toggle)
             {
                 toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset();
-                toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
-                    ? group.GroupColor
-                    : MiraAssets.AcceptedTeal;
+                toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal;
                 var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite")
                     .GetComponent<SpriteRenderer>();
                 rend.sprite = MiraAssets.CheckmarkBox.LoadAsset();
-                rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
-                    ? group.GroupColor
-                    : MiraAssets.AcceptedTeal;
+                rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal;
             }
 
             menu.Children.Add(newOpt);
-            var resetBtn = new GameObject("ResetOption");
-            resetBtn.transform.parent = newOpt.transform;
-            resetBtn.transform.localScale = new(.5f, .5f, 1);
-            resetBtn.layer = LayerMask.NameToLayer("UI");
-            resetBtn.transform.localPosition = new Vector3(-3.1f, 0f, -2f);
-            var resetRend = resetBtn.AddComponent<SpriteRenderer>();
-            resetRend.sprite = MiraAssets.ResetButton.LoadAsset();
-            resetRend.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-            resetRend.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
-                ? Color.white
-                : group.GroupColor.FindAlternateColor();
-            var resetBoxCol = resetBtn.gameObject.AddComponent<BoxCollider2D>();
-            resetBoxCol.size = new Vector2(1f, 1f);
-            resetBoxCol.offset = new Vector2(0, 0);
-            var passiveButton = resetBtn.AddComponent<PassiveButton>();
-            passiveButton.OnClick = new Button.ButtonClickedEvent();
-            passiveButton.ClickSound = menu.BackButton.GetComponent<PassiveButton>().ClickSound;
-            passiveButton.OnMouseOver = new UnityEvent();
-            passiveButton.OnMouseOver.AddListener(
-                (UnityAction)(() =>
-                {
-                    resetRend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
-                        ? group.GroupColor
-                        : MiraAssets.AcceptedTeal;
-                }));
-            passiveButton.OnMouseOut = new UnityEvent();
-            passiveButton.OnMouseOut.AddListener(
-                (UnityAction)(() =>
-                {
-                    resetRend.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
-                        ? Color.white
-                        : group.GroupColor.FindAlternateColor();
-                }));
-            if (newOpt is ToggleOption toggleOpt)
-            {
-                passiveButton.OnClick.AddListener(
-                    (UnityAction)(() =>
-                    {
-                        defaultPreset!.ResetOption(toggleOpt);
-                    }));
-            }
-            else if (newOpt is NumberOption numOpt)
-            {
-                passiveButton.OnClick.AddListener(
-                    (UnityAction)(() =>
-                    {
-                        defaultPreset!.ResetOption(numOpt);
-                    }));
-            }
-            else if (newOpt is StringOption strOpt)
-            {
-                passiveButton.OnClick.AddListener(
-                    (UnityAction)(() =>
-                    {
-                        defaultPreset!.ResetOption(strOpt);
-                    }));
-            }
-            if (!defaultPreset!.IsOptionInPreset(newOpt))
-            {
-                resetBtn.Destroy();
-            }
 
             newOpt.Initialize();
             newOpt.gameObject.SetActive(false);

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

@@ -117,7 +117,7 @@ internal static class GamePresetsTabPatches
         // ReSharper disable once InconsistentNaming
         public static void Postfix()
         {
-            Error("OnDisable called");
+            Logger<MiraApiPlugin>.Error("OnDisable called");
 
             if (_saveButton)
             {
@@ -155,7 +155,7 @@ internal static class GamePresetsTabPatches
         var prefab = GameSettingMenu.Instance.GameSettingsButton;
         if (prefab == null)
         {
-            Error("GameSettingsButton prefab is null");
+            Logger<MiraApiPlugin>.Error("GameSettingsButton prefab is null");
             return;
         }
 
@@ -318,10 +318,10 @@ internal static class GamePresetsTabPatches
 
     private static void Refresh()
     {
-        Error("Refreshing presets");
+        Logger<MiraApiPlugin>.Error("Refreshing presets");
         if (GameSettingMenuPatches.SelectedMod == null)
         {
-            Error("Selected mod is null, cannot refresh presets");
+            Logger<MiraApiPlugin>.Error("Selected mod is null, cannot refresh presets");
             return;
         }
         lock (Lock)

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
-using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Presets;
@@ -28,23 +27,13 @@ internal static class GameSettingMenuPatches
     private static Vector3 _roleBtnOgPos;
     private static Vector3 _smallRoleBtnOgPos;
     private static Vector3 _modifierBtnOgPos;
-    private static Vector3 _customOneBtnOgPos;
-    private static Vector3 _customTwoBtnOgPos;
 
     private static GameOptionsMenu? _modifiersTab;
     private static PassiveButton? _modifiersButton;
     private static PassiveButton? _smallRolesButton;
-    private static GameOptionsMenu? _customOneTab;
-    private static PassiveButton? _customOneButton;
-    private static GameOptionsMenu? _customTwoTab;
-    private static PassiveButton? _customTwoButton;
-    private static GameObject? _nextModButton;
-    private static GameObject? _previousModButton;
 
     private static Dictionary<int, Vector3> OptionsPositions { get; } = [];
     private static Dictionary<int, Vector3> ModifiersPositions { get; } = [];
-    private static Dictionary<int, Vector3> CustomOnePositions { get; } = [];
-    private static Dictionary<int, Vector3> CustomTwoPositions { get; } = [];
 
     private static void SaveScrollPositions(GameSettingMenu gameSettingMenu)
     {
@@ -52,14 +41,6 @@ internal static class GameSettingMenuPatches
         {
             ModifiersPositions[SelectedModIdx] = _modifiersTab!.scrollBar.Inner.localPosition;
         }
-        else if (_customOneTab)
-        {
-            CustomOnePositions[SelectedModIdx] = _customOneTab!.scrollBar.Inner.localPosition;
-        }
-        else if (_customTwoTab)
-        {
-            CustomTwoPositions[SelectedModIdx] = _customTwoTab!.scrollBar.Inner.localPosition;
-        }
 
         RoleSettingMenuPatches.RolePositions[SelectedModIdx] = gameSettingMenu.RoleSettingsTab.scrollBar.Inner.localPosition;
         OptionsPositions[SelectedModIdx] = gameSettingMenu.GameSettingsTab.scrollBar.Inner.localPosition;
@@ -84,21 +65,9 @@ internal static class GameSettingMenuPatches
                 _modifiersTab!.gameObject.SetActive(tabNum == 3);
             }
 
-            if (_customOneTab)
-            {
-                _customOneTab!.gameObject.SetActive(tabNum == 4);
-            }
-
-            if (_customTwoTab)
-            {
-                _customTwoTab!.gameObject.SetActive(tabNum == 5);
-            }
-
             _modifiersButton?.SelectButton(tabNum == 3);
             _smallRolesButton?.SelectButton(tabNum == 2);
-            _customOneButton?.SelectButton(tabNum == 4);
-            _customTwoButton?.SelectButton(tabNum == 5);
-            if (tabNum >= 3 && tabNum <= 5)
+            if (tabNum == 3)
             {
                 if (__instance.RoleSettingsButton.gameObject.active)
                 {
@@ -106,21 +75,7 @@ internal static class GameSettingMenuPatches
                 }
                 else
                 {
-                    switch (tabNum)
-                    {
-                        case 3:
-                            _modifiersButton?.SelectButton(true);
-                            __instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.ModifierMenuDescription : "Configure modifiers and their settings here!";
-                            break;
-                        case 4:
-                            _customOneButton?.SelectButton(true);
-                            __instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuOneDescription : "Apply game settings for this mod!";
-                            break;
-                        case 5:
-                            _customTwoButton?.SelectButton(true);
-                            __instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuTwoDescription : "Apply game settings for this mod!";
-                            break;
-                    }
+                    _modifiersButton?.SelectButton(true);
                 }
             }
         }
@@ -132,30 +87,19 @@ internal static class GameSettingMenuPatches
 
         _modifiersButton?.SelectButton(tabNum == 3);
         _smallRolesButton?.SelectButton(tabNum == 2);
-        _customOneButton?.SelectButton(tabNum == 4);
-        _customTwoButton?.SelectButton(tabNum == 5);
 
-        if (tabNum >= 3 && tabNum <= 5)
+        if (tabNum != 3)
         {
-            if (__instance.RoleSettingsButton.gameObject.active)
-            {
-                __instance.RoleSettingsButton.SelectButton(true);
-            }
-            else
-            {
-                switch (tabNum)
-                {
-                    case 3:
-                        _modifiersButton?.SelectButton(true);
-                        break;
-                    case 4:
-                        _customOneButton?.SelectButton(true);
-                        break;
-                    case 5:
-                        _customTwoButton?.SelectButton(true);
-                        break;
-                }
-            }
+            return;
+        }
+
+        if (__instance.RoleSettingsButton.gameObject.active)
+        {
+            __instance.RoleSettingsButton.SelectButton(true);
+        }
+        else
+        {
+            _modifiersButton?.SelectButton(true);
         }
     }
 
@@ -183,16 +127,16 @@ internal static class GameSettingMenuPatches
 
         _text.alignment = TextAlignmentOptions.Center;
 
-        _nextModButton = Object.Instantiate(__instance.BackButton, __instance.BackButton.transform.parent).gameObject;
-        _nextModButton.transform.localPosition = new Vector3(-2.2663f, 1.5272f, -25f);
-        _nextModButton.name = "RightArrowButton";
-        _nextModButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().sprite =
+        var nextButton = Object.Instantiate(__instance.BackButton, __instance.BackButton.transform.parent).gameObject;
+        nextButton.transform.localPosition = new Vector3(-2.2663f, 1.5272f, -25f);
+        nextButton.name = "RightArrowButton";
+        nextButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().sprite =
             MiraAssets.NextButton.LoadAsset();
-        _nextModButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
+        nextButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
             MiraAssets.NextButtonActive.LoadAsset();
-        _nextModButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
+        nextButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
 
-        var passiveButton = _nextModButton.gameObject.GetComponent<PassiveButton>();
+        var passiveButton = nextButton.gameObject.GetComponent<PassiveButton>();
         passiveButton.OnClick = new ButtonClickedEvent();
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
@@ -207,13 +151,13 @@ internal static class GameSettingMenuPatches
                 UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
             }));
 
-        _previousModButton = Object.Instantiate(_nextModButton, __instance.BackButton.transform.parent).gameObject;
-        _previousModButton.transform.localPosition = new Vector3(-4.4209f, 1.5272f, -25f);
-        _previousModButton.name = "LeftArrowButton";
-        _previousModButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().Destroy();
-        _previousModButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().flipX =
-            _previousModButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().flipX = true;
-        _previousModButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
+        var backButton = Object.Instantiate(nextButton, __instance.BackButton.transform.parent).gameObject;
+        backButton.transform.localPosition = new Vector3(-4.4209f, 1.5272f, -25f);
+        backButton.name = "LeftArrowButton";
+        backButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().Destroy();
+        backButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().flipX =
+            backButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().flipX = true;
+        backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
             (UnityAction)(() =>
             {
                 SaveScrollPositions(__instance);
@@ -230,61 +174,6 @@ internal static class GameSettingMenuPatches
         _modifiersTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
         _modifiersTab.name = "MODIFIERS TAB";
 
-        // clone game settings tab for both custom tabs
-        _customOneTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
-        _customOneTab.name = "CUSTOM TAB 1";
-        _customTwoTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
-        _customTwoTab.name = "CUSTOM TAB 2";
-
-        // create button for the first custom category
-        var customPos = new Vector3(
-            __instance.RoleSettingsButton.transform.localPosition.x,
-            __instance.RoleSettingsButton.transform.localPosition.y,
-            __instance.RoleSettingsButton.transform.localPosition.z);
-        _customOneButton = Object.Instantiate(__instance.RoleSettingsButton, __instance.RoleSettingsButton.transform.parent);
-        _customOneButton.buttonText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
-        _customOneButton.OnClick = new ButtonClickedEvent();
-        _customOneButton.OnClick.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(4, false);
-            }));
-        _customOneButton.OnMouseOver = new UnityEvent();
-        _customOneButton.OnMouseOver.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(4, true);
-            }));
-
-        _customOneButton.buttonText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuNameOne : "Custom Category 1";
-        customPos.y -= 0.637f;
-        _customOneButton.transform.localPosition = customPos;
-        _customOneButton.name = "CustomOneButton";
-
-        _customOneBtnOgPos = _customOneButton.transform.localPosition;
-
-        // create button for the first custom category
-        _customTwoButton = Object.Instantiate(_customOneButton, _customOneButton.transform.parent);
-        _customTwoButton.OnClick = new ButtonClickedEvent();
-        _customTwoButton.OnClick.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(5, false);
-            }));
-        _customTwoButton.OnMouseOver = new UnityEvent();
-        _customTwoButton.OnMouseOver.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(5, true);
-            }));
-
-        _customTwoButton.buttonText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuNameTwo : "Custom Category 2";
-        customPos.y -= 0.637f;
-        _customTwoButton.transform.localPosition = customPos;
-        _customTwoButton.name = "CustomTwoButton";
-
-        _customTwoBtnOgPos = _customTwoButton.transform.localPosition;
-
         // create button for modifiers
         __instance.RoleSettingsButton.buttonText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
         __instance.RoleSettingsButton.gameObject.SetActive(false);
@@ -415,32 +304,20 @@ internal static class GameSettingMenuPatches
         bool replaceWithModifiers = true;
         _smallRolesButton!.transform.localPosition = _smallRoleBtnOgPos;
         _modifiersButton!.transform.localPosition = _modifierBtnOgPos;
-        _customOneButton!.transform.localPosition = _customOneBtnOgPos;
-        _customTwoButton!.transform.localPosition = _customTwoBtnOgPos;
         menu.RoleSettingsButton.transform.localPosition = _roleBtnOgPos;
 
         if (SelectedModIdx != 0)
         {
-            _customOneButton.buttonText.text = SelectedMod!.MiraPlugin.CustomOptionMenuNameOne;
-            _customTwoButton.buttonText.text = SelectedMod!.MiraPlugin.CustomOptionMenuNameTwo;
             var modHasRoles = SelectedMod!.InternalRoles.Count != 0;
-            var modHasCustomOne = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ParentMenu == MenuCategory.CustomOne);
-            var modHasCustomTwo = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ParentMenu == MenuCategory.CustomTwo);
             var modHasModifiers = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ShowInModifiersMenu || x.ParentMenu == MenuCategory.Modifiers || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
+                x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
             var modHasOptions =
-                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && (!x.ShowInModifiersMenu ||
-                    (x.ParentMenu != MenuCategory.Modifiers && x.ParentMenu != MenuCategory.Roles)));
+                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
 
             _modifiersButton.gameObject.SetActive(true);
             _smallRolesButton.gameObject.SetActive(true);
-            _customOneButton.gameObject.SetActive(true);
-            _customTwoButton.gameObject.SetActive(true);
             menu.GameSettingsButton.gameObject.SetActive(true);
             menu.RoleSettingsButton.gameObject.SetActive(false);
-            var defaultButton = menu.RoleSettingsButton;
 
             // If there are no registered custom roles in the selected mod, hide the button.
             if (!modHasRoles)
@@ -457,7 +334,6 @@ internal static class GameSettingMenuPatches
                 {
                     _modifiersButton.gameObject.SetActive(false);
                     menu.RoleSettingsButton.gameObject.SetActive(true);
-                    defaultButton = _modifiersButton;
 
                     if (_modifiersTab!.gameObject.active)
                     {
@@ -480,7 +356,6 @@ internal static class GameSettingMenuPatches
                 // If the mod has roles, we can enable the bigger role button and disable the small one.
                 if (modHasRoles)
                 {
-                    defaultButton = menu.RoleSettingsButton;
                     menu.RoleSettingsButton.gameObject.SetActive(true);
                     _smallRolesButton.gameObject.SetActive(false);
                 }
@@ -495,7 +370,6 @@ internal static class GameSettingMenuPatches
                 {
                     menu.ChangeTab(0, false);
                 }
-                defaultButton = menu.RoleSettingsButton;
 
                 // If the mod has roles and modifiers, we can move their buttons to the game settings button position, since nothing is there.
                 if (menu.RoleSettingsButton.gameObject.active)
@@ -515,37 +389,16 @@ internal static class GameSettingMenuPatches
                         _smallRolesButton.transform.localPosition.z);
                 }
             }
-
-            // If the mod has no primary custom tab, we can go ahead and hide the button.
-            if (!modHasCustomOne)
-            {
-                _customOneButton.gameObject.SetActive(false);
-                if (_customOneTab!.gameObject.active)
-                {
-                    defaultButton.SelectButton(true);
-                }
-            }
-            // If the mod has no secondary custom tab, we can go ahead and hide the button.
-            if (!modHasCustomTwo)
-            {
-                _customTwoButton.gameObject.SetActive(false);
-                if (_customTwoTab!.gameObject.active)
-                {
-                    defaultButton.SelectButton(true);
-                }
-            }
         }
         else
         {
             _modifiersButton.gameObject.SetActive(false);
             _smallRolesButton.gameObject.SetActive(false);
-            _customOneButton.gameObject.SetActive(false);
-            _customTwoButton.gameObject.SetActive(false);
             menu.RoleSettingsButton.gameObject.SetActive(true);
             menu.GameSettingsButton.gameObject.SetActive(true);
             replaceWithModifiers = false;
 
-            if (_modifiersTab!.gameObject.active || _customOneTab!.gameObject.active || _customTwoTab!.gameObject.active)
+            if (_modifiersTab!.gameObject.active)
             {
                 menu.ChangeTab(0, false);
             }
@@ -593,17 +446,7 @@ internal static class GameSettingMenuPatches
 
         if (_modifiersTab?.Children?.Count > 0)
         {
-            CleanupSettings(_modifiersTab, MenuCategory.Modifiers);
-        }
-
-        if (_customOneTab?.Children?.Count > 0)
-        {
-            CleanupSettings(_customOneTab, MenuCategory.CustomOne);
-        }
-
-        if (_customTwoTab?.Children?.Count > 0)
-        {
-            CleanupSettings(_customTwoTab, MenuCategory.CustomTwo);
+            CleanupSettings(_modifiersTab, true);
         }
 
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
@@ -641,7 +484,7 @@ internal static class GameSettingMenuPatches
             }
         }
 
-        void CleanupSettings(GameOptionsMenu gameOptMenu, MenuCategory menuCategory = MenuCategory.Roles)
+        void CleanupSettings(GameOptionsMenu gameOptMenu, bool modifiers = false)
         {
             ClearOptions(gameOptMenu.Children);
             gameOptMenu.Children = null;
@@ -652,19 +495,7 @@ internal static class GameSettingMenuPatches
                 .ForEach(header => header.gameObject.DestroyImmediate());
 
             gameOptMenu.Initialize();
-            var positions = OptionsPositions;
-            switch (menuCategory)
-            {
-                case MenuCategory.Modifiers:
-                    positions = ModifiersPositions;
-                    break;
-                case MenuCategory.CustomOne:
-                    positions = CustomOnePositions;
-                    break;
-                case MenuCategory.CustomTwo:
-                    positions = CustomTwoPositions;
-                    break;
-            }
+            var positions = modifiers ? ModifiersPositions : OptionsPositions;
             if (positions.TryGetValue(SelectedModIdx, out var pos))
             {
                 gameOptMenu.scrollBar.Inner.localPosition = pos;

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AmongUs.GameOptions;
 using HarmonyLib;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
@@ -164,117 +163,7 @@ public static class LobbyViewPanePatches
     {
         if (SelectedModIdx == 0)
         {
-            float num = 0.95f;
-            float num2 = -6.53f;
-            CategoryHeaderMasked categoryHeaderMasked =
-                Object.Instantiate(__instance.categoryHeaderOrigin, __instance.settingsContainer);
-            categoryHeaderMasked.SetHeader(StringNames.RoleQuotaLabel, 61);
-            categoryHeaderMasked.transform.localScale = Vector3.one;
-            categoryHeaderMasked.transform.localPosition = new Vector3(-9.77f, 1.26f, -2f);
-            __instance.settingsInfo.Add(categoryHeaderMasked.gameObject);
-            var list = new List<RoleBehaviour>();
-            for (int i = 0; i < 2; i++)
-            {
-                var categoryHeaderRoleVariant =
-                    Object.Instantiate(__instance.categoryHeaderRoleOrigin, __instance.settingsContainer);
-                categoryHeaderRoleVariant.SetHeader(
-                    (i == 0) ? StringNames.CrewmateRolesHeader : StringNames.ImpostorRolesHeader,
-                    61);
-                categoryHeaderRoleVariant.transform.localScale = Vector3.one;
-                categoryHeaderRoleVariant.transform.localPosition = new Vector3(0.09f, num, -2f);
-                __instance.settingsInfo.Add(categoryHeaderRoleVariant.gameObject);
-                num -= 0.696f;
-                var roles = RoleManager.Instance.AllRoles.ToArray().Where(x =>
-                    x is not ICustomRole && !x.IsRoleBlacklisted() && x.Role != RoleTypes.Crewmate &&
-                    x.Role != RoleTypes.Impostor && ((i == 0 && x.TeamType is RoleTeamTypes.Crewmate) ||
-                                                     (i == 1 && x.TeamType is RoleTeamTypes.Impostor)) &&
-                    x.Role != RoleTypes.CrewmateGhost && x.Role != RoleTypes.ImpostorGhost).ToList();
-                for (int j = 0; j < roles.Count; j++)
-                {
-                    var roleBehaviour = roles[j];
-                    int chancePerGame =
-                        GameOptionsManager.Instance.CurrentGameOptions.RoleOptions.GetChancePerGame(
-                            roleBehaviour.Role);
-                    int numPerGame =
-                        GameOptionsManager.Instance.CurrentGameOptions.RoleOptions
-                            .GetNumPerGame(roleBehaviour.Role);
-                    bool flag = numPerGame == 0;
-                    var viewSettingsInfoPanelRoleVariant =
-                        Object.Instantiate(
-                            __instance.infoPanelRoleOrigin,
-                            __instance.settingsContainer);
-                    viewSettingsInfoPanelRoleVariant.transform.localScale = Vector3.one;
-                    viewSettingsInfoPanelRoleVariant.transform.localPosition = new Vector3(num2, num, -2f);
-                    if (!flag)
-                    {
-                        list.Add(roleBehaviour);
-                    }
-
-                    var color = (i == 0) ? Palette.CrewmateRoleBlue : Palette.ImpostorRoleRed;
-                    if (roleBehaviour is ICustomRole custom && (custom.Team is not ModdedRoleTeams.Crewmate &&
-                                                                custom.Team is not ModdedRoleTeams.Impostor))
-                    {
-                        color = Color.grey;
-                    }
-
-                    viewSettingsInfoPanelRoleVariant.SetInfo(
-                        roleBehaviour.NiceName,
-                        numPerGame,
-                        chancePerGame,
-                        61,
-                        color,
-                        roleBehaviour.RoleIconSolid,
-                        i == 0,
-                        flag);
-                    __instance.settingsInfo.Add(viewSettingsInfoPanelRoleVariant.gameObject);
-                    num -= 0.664f;
-                }
-            }
-
-            if (list.Count > 0)
-            {
-                var categoryHeaderMasked2 =
-                    Object.Instantiate(__instance.categoryHeaderOrigin, __instance.settingsContainer);
-                categoryHeaderMasked2.SetHeader(StringNames.RoleSettingsLabel, 61);
-                categoryHeaderMasked2.transform.localScale = Vector3.one;
-                categoryHeaderMasked2.transform.localPosition = new Vector3(-9.77f, num, -2f);
-                __instance.settingsInfo.Add(categoryHeaderMasked2.gameObject);
-                num -= 2.1f;
-                float num3 = 0f;
-                for (int k = 0; k < list.Count; k++)
-                {
-                    float num4;
-                    if (k % 2 == 0)
-                    {
-                        num4 = -5.8f;
-                        if (k > 0)
-                        {
-                            num -= num3 + 0.85f;
-                            num3 = 0f;
-                        }
-                    }
-                    else
-                    {
-                        num4 = 0.14999962f;
-                    }
-
-                    var advancedRoleViewPanel =
-                        Object.Instantiate(__instance.advancedRolePanelOrigin, __instance.settingsContainer);
-                    advancedRoleViewPanel.transform.localScale = Vector3.one;
-                    advancedRoleViewPanel.transform.localPosition = new Vector3(num4, num, -2f);
-                    float num5 = advancedRoleViewPanel.SetUp(list[k], 0.85f, 61);
-                    if (num5 > num3)
-                    {
-                        num3 = num5;
-                    }
-
-                    __instance.settingsInfo.Add(advancedRoleViewPanel.gameObject);
-                }
-            }
-
-            __instance.scrollBar.SetYBoundsMax(-num);
-
-            return false;
+            return true;
         }
 
         if (__instance.currentTab == ModifiersTabName)
@@ -389,7 +278,7 @@ public static class LobbyViewPanePatches
 
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings || !x.VisibleInSettings()))
+            if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings))
             {
                 continue;
             }
@@ -420,7 +309,7 @@ public static class LobbyViewPanePatches
 
             foreach (var customRole in grouping)
             {
-                if (customRole.Configuration.HideSettings || !customRole.VisibleInSettings())
+                if (customRole.Configuration.HideSettings)
                 {
                     continue;
                 }
@@ -455,7 +344,7 @@ public static class LobbyViewPanePatches
                 }
 
                 viewSettingsInfoPanelRoleVariant.SetInfo(
-                    roleBehaviour.GetRoleName(),
+                    roleBehaviour.NiceName,
                     numPerGame,
                     chancePerGame,
                     61,
@@ -520,34 +409,6 @@ public static class LobbyViewPanePatches
         instance.scrollBar.SetYBoundsMax(-num);
     }
 
-    public static void SetModdedHeader(this CategoryHeaderRoleVariant header, StringNames roleName, int maskLayer, ModdedRoleTeams team, Sprite? roleIcon = null)
-    {
-        header.SetHeader(roleName, maskLayer);
-        if (team is ModdedRoleTeams.Crewmate)
-        {
-            header.Background.color = Palette.CrewmateRoleHeaderBlue;
-            header.Divider.color = Palette.CrewmateRoleHeaderBlue;
-            header.Title.color = Palette.CrewmateRoleHeaderTextBlue;
-        }
-        else if (team is ModdedRoleTeams.Impostor)
-        {
-            header.Background.color = Palette.ImpostorRoleHeaderRed;
-            header.Divider.color = Palette.ImpostorRoleHeaderRed;
-            header.Title.color = Palette.ImpostorRoleHeaderTextRed;
-        }
-        else
-        {
-            header.Background.color = Color.grey;
-            header.Divider.color = Color.grey;
-            header.Title.color = new Color32(50, 50, 50, 255);
-        }
-        if (roleIcon != null && header.icon != null)
-        {
-            header.icon.material.SetInt(PlayerMaterial.MaskLayer, maskLayer);
-            header.icon.sprite = roleIcon;
-        }
-    }
-
     private static float SetUpAdvancedRoleViewPanel(
         AdvancedRoleViewPanel viewPanel,
         Type roleType,
@@ -571,10 +432,10 @@ public static class LobbyViewPanePatches
             return 0;
         }
 
-        viewPanel.header.SetModdedHeader(
+        viewPanel.header.SetHeader(
             role.StringName,
             maskLayer,
-            customRole.Team,
+            role.TeamType == RoleTeamTypes.Crewmate,
             customRole.Configuration.Icon != null ? customRole.Configuration.Icon.LoadAsset() : MiraAssets.Empty.LoadAsset());
         viewPanel.header.icon.transform.localScale = new Vector3(0.465f, 0.465f, 1f);
         viewPanel.divider.material.SetInt(PlayerMaterial.MaskLayer, maskLayer);

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -216,16 +216,7 @@ public static class OptionsPatches
             return true;
         }
 
-        var increment = __instance.Increment;
-
-        if (Input.GetKey(KeyCode.LeftShift) &&
-            __instance.TryGetComponent<MiraNumberOptionComponent>(out var miraNumber) &&
-            miraNumber.ShiftIncrementToggle)
-        {
-            increment /= 2;
-        }
-
-        __instance.Value += increment;
+        __instance.Value += __instance.Increment;
         if (__instance.Value > __instance.ValidRange.max)
         {
             __instance.Value = __instance.ValidRange.min;
@@ -244,16 +235,7 @@ public static class OptionsPatches
             return true;
         }
 
-        var increment = __instance.Increment;
-
-        if (Input.GetKey(KeyCode.LeftShift) &&
-            __instance.TryGetComponent<MiraNumberOptionComponent>(out var miraNumber) &&
-            miraNumber.ShiftIncrementToggle)
-        {
-            increment /= 2;
-        }
-
-        __instance.Value -= increment;
+        __instance.Value -= __instance.Increment;
         if (__instance.Value < __instance.ValidRange.min)
         {
             __instance.Value = __instance.ValidRange.max;

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -35,19 +35,6 @@ public static class RoleSettingMenuPatches
     private static RoleBehaviour? CurrentRole { get; set; }
     private static List<IModdedOption>? CurrentRoleOptions { get; set; }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(RolesSettingsMenu.OnEnable))]
-    public static void OpenPatch(RolesSettingsMenu __instance)
-    {
-        HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = false;
-    }
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(RolesSettingsMenu.OnDisable))]
-    public static void ClosePatch(RolesSettingsMenu __instance)
-    {
-        HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = true;
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
     public static void SetQuotaTabPostfix(RolesSettingsMenu __instance)
@@ -87,10 +74,10 @@ public static class RoleSettingMenuPatches
             var num = 0.662f;
 
             var list = CustomRoleManager.AllRoles.Where(
-                r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
+                r => !r.IsCustomRole() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
                      r.Role != RoleTypes.CrewmateGhost).ToList();
             var list2 = CustomRoleManager.AllRoles.Where(
-                r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
+                r => !r.IsCustomRole() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
                      r.Role != RoleTypes.ImpostorGhost).ToList();
 
             if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
@@ -173,7 +160,7 @@ public static class RoleSettingMenuPatches
 
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any() || grouping.All(x=> x.Configuration.HideSettings || !x.VisibleInSettings()))
+            if (!grouping.Any() || grouping.All(x=>x.Configuration.HideSettings))
             {
                 continue;
             }
@@ -405,7 +392,7 @@ public static class RoleSettingMenuPatches
         }
         catch (Exception e)
         {
-            Warning(e);
+            Logger<MiraApiPlugin>.Warning(e);
         }
 
         roleSetting.UpdateValuesAndText(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions);
@@ -479,14 +466,16 @@ public static class RoleSettingMenuPatches
     {
         if (role is not ICustomRole customRole)
         {
-            Error($"Role {role.NiceName} is not a custom role.");
+            Logger<MiraApiPlugin>.Error($"Role {role.NiceName} is not a custom role.");
             return;
         }
 
         RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
-        __instance.roleTitleText.text = role.GetRoleName();
+        __instance.roleTitleText.text = TranslationController.Instance.GetString(
+            role.StringName,
+            new Il2CppReferenceArray<Il2CppSystem.Object>(0));
 
         var imgBg = __instance.AdvancedRolesSettings.transform.FindChild("Imagebackground");
         var labelBg = __instance.AdvancedRolesSettings.transform.FindChild("InfoLabelBackground");
@@ -573,7 +562,7 @@ public static class RoleSettingMenuPatches
     {
         if (role is not ICustomRole customRole)
         {
-            Error($"Role {role.NiceName} is not a custom role.");
+            Logger<MiraApiPlugin>.Error($"Role {role.NiceName} is not a custom role.");
             return null;
         }
 
@@ -590,7 +579,6 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.transform.localPosition = new Vector3(-0.1f, ScrollerNum, -2f);
 
         roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20);
-        roleOptionSetting.titleText.text = role.GetRoleName();
         roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);

MiraAPI/Patches/Options/SettingPatches.cs

@@ -1,8 +1,5 @@
 using System.Globalization;
-using System.Linq;
 using HarmonyLib;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
 using MiraAPI.Utilities;
 using UnityEngine;
 
@@ -31,33 +28,7 @@ public static class SettingPatches
         string result;
         var suffix = (MiraNumberSuffixes)__instance.SuffixType;
 
-        var custom =
-            ModdedOptionsManager.ModdedOptions.Values.FirstOrDefault(opt =>
-                opt.OptionBehaviour != null && opt.OptionBehaviour.Data == __instance);
-        if (custom is ModdedNumberOption moddedNumberOption)
-        {
-            if (moddedNumberOption.NegativeWordValue != "#" && (int)value == -1)
-            {
-                result = $"<b>{moddedNumberOption.NegativeWordValue}</b>";
-            }
-            else if (moddedNumberOption.ZeroWordValue != "#" && Mathf.Abs(value) < 0.0001f)
-            {
-                result = $"<b>{moddedNumberOption.ZeroWordValue}</b>";
-            }
-            else
-            {
-                result = suffix switch
-                {
-                    MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
-                    MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
-                    MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
-                    _ => TranslationController.Instance.GetString(
-                        StringNames.GameSecondsAbbrev,
-                        (Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
-                };
-            }
-        }
-        else if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
+        if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
         {
             result = "<b>∞</b>";
         }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -117,20 +117,6 @@ internal static class PlayerControlPatches
         __instance.RpcMurderPlayer(target, true);
     }
 
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
-    [HarmonyPatch(nameof(PlayerControl.MurderPlayer))]
-    // ReSharper disable once InconsistentNaming
-    public static bool MurderPlayerPrefix(PlayerControl __instance)
-    {
-        if (LobbyBehaviour.Instance)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
     // ReSharper disable once InconsistentNaming
@@ -141,19 +127,17 @@ internal static class PlayerControlPatches
             return;
         }
 
-        var role = __instance.Data?.Role;
         foreach (var button in CustomButtonManager.CustomButtons)
         {
-            if (role == null)
+            if (__instance.Data?.Role == null)
             {
                 continue;
             }
 
             try
             {
-                if (!button.Enabled(role))
+                if (!button.Enabled(__instance.Data?.Role))
                 {
-                    button.SetActive(false, role);
                     continue;
                 }
 
@@ -161,7 +145,7 @@ internal static class PlayerControlPatches
             }
             catch (System.Exception e)
             {
-                Error($"Failed to update custom button {button.GetType().Name}: {e}");
+                Logger<MiraApiPlugin>.Error($"Failed to update custom button {button.GetType().Name}: {e}");
             }
         }
     }

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -1,12 +1,11 @@
 using HarmonyLib;
 using MiraAPI.Roles;
-using MiraAPI.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Patches the haunt menu to show the actual role name rather than team.
+/// Patches the haunt menu to show the actual role name rather then team.
 /// </summary>
 [HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetHauntTarget))]
 // SetFilterText was INLINED
@@ -23,7 +22,7 @@ public static class HauntMenuMinigamePatch
         var role = __instance.HauntTarget.Data.Role;
         var color = role is ICustomRole custom ? custom.RoleColor : role.TeamColor;
 
-        __instance.FilterText.text = role.GetRoleName();
+        __instance.FilterText.text = role.NiceName;
         __instance.FilterText.color = color;
     }
 }

MiraAPI/Patches/Roles/HowToPlayPatch.cs

@@ -13,10 +13,6 @@ internal static class HowToPlayPatch
     // yes i patched the entire method
     private static void Prefix(HowToPlayScene __instance)
     {
-        if (RoleManager.Instance.AllRoles.ToArray().All(x => !x.IsCustomRole()))
-        {
-            return;
-        }
         __instance.sceneIndex = 0;
         __instance.category = HowToPlayScene.HowToPlayCategory.RolesSelection;
         __instance.startPage.SetActive(false);

MiraAPI/Patches/Roles/KillButtonPatches.cs

@@ -46,7 +46,7 @@ public static class KillButtonPatches
     }
 
     /// <summary>
-    /// Use Custom Murder instead of Murder Player from vanilla.
+    /// Use Custom Murder if player is custom role.
     /// </summary>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(KillButton.DoClick))]
@@ -58,7 +58,12 @@ public static class KillButtonPatches
             return false;
         }
 
-        PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget, MeetingCheck.OutsideMeeting);
+        if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole)
+        {
+            return true;
+        }
+
+        PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget);
         __instance.SetTarget(null);
 
         return false;

MiraAPI/Patches/Roles/LogicRoleSelectionHnsPatch.cs

@@ -1,183 +0,0 @@
-using AmongUs.GameOptions;
-using HarmonyLib;
-using Il2CppSystem.Collections.Generic;
-using System.Linq;
-using MiraAPI.Roles;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(LogicRoleSelectionHnS))]
-public static class LogicRoleSelectionHnsPatch
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(LogicRoleSelectionHnS.AssignRolesForTeam))]
-    public static bool AssignRolesForTeam(
-        LogicRoleSelectionHnS __instance,
-        List<NetworkedPlayerInfo> players,
-        IGameOptions opts,
-        RoleTeamTypes team,
-        int teamMax,
-        Il2CppSystem.Nullable<RoleTypes> defaultRole)
-    {
-        Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Team: {team}, Max: {teamMax}, Players: {players.Count}, DefaultRole: {defaultRole}");
-        int num = 0;
-        IRoleOptionsCollection roleOptions = opts.RoleOptions;
-        var source = RoleManager.Instance.AllRoles.ToArray()
-            .Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
-                           CustomRoleUtils.CanSpawnOnCurrentMode(role));
-        var assignmentData = source.Where(x => !x.IsDead).Select(role =>
-            new RoleManager.RoleAssignmentData(
-                role,
-                roleOptions.GetNumPerGame(role.Role),
-                roleOptions.GetChancePerGame(role.Role))).ToList();
-        var source2 = CustomRoleUtils.GetPossibleRoles(assignmentData, x => x.Chance == 100);
-        var guaranteedRoles = source.Where(x => source2.Contains(((ushort)x.Role, 100)));
-        List<RoleTypes> list = new List<RoleTypes>();
-        if (team == RoleTeamTypes.Crewmate)
-        {
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
-                         new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
-            {
-                while (true)
-                {
-                    RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
-                    int count = roleAssignmentData2.Count;
-                    roleAssignmentData2.Count = count - 1;
-                    if (count <= 0)
-                    {
-                        break;
-                    }
-
-                    list.Add(roleAssignmentData.Role.Role);
-                }
-            }
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Guaranteed Assignment");
-            AssignRolesFromList(players, teamMax, list, ref num);
-
-            var list2 = source.Where(x => !x.IsDead).Select(role =>
-                new RoleManager.RoleAssignmentData(
-                    role,
-                    roleOptions.GetNumPerGame(role.Role),
-                    roleOptions.GetChancePerGame(role.Role))).ToList();
-
-            list.Clear();
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
-            {
-                for (int i = 0; i < roleAssignmentData3.Count; i++)
-                {
-                    if (HashRandom.Next(101) < roleAssignmentData3.Chance)
-                    {
-                        list.Add(roleAssignmentData3.Role.Role);
-                    }
-                }
-            }
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Potential Assignment");
-
-            AssignRolesFromList(players, teamMax, list, ref num);
-            var basicRole = RoleTypes.Engineer;
-            while (list.Count < players.Count && list.Count + num < teamMax)
-            {
-                list.Add(basicRole);
-            }
-
-            AssignRolesFromList(players, teamMax, list, ref num);
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Fallback Assignment");
-        }
-        else if (team == RoleTeamTypes.Impostor)
-        {
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
-            var newImpostors = new List<NetworkedPlayerInfo>();
-            // Specified Seeker
-            if (__instance.hnsManager.LogicOptionsHnS.HasImpostorPlayerID() &&
-                __instance.hnsManager.LogicOptionsHnS.ValidateImpostorPlayerID(players) &&
-                !AmongUsClient.Instance.IsGamePublic)
-            {
-                NetworkedPlayerInfo networkedPlayerInfo = players.ToArray()
-                    .First(p => p.PlayerId == __instance.hnsManager.LogicOptionsHnS.ImpostorPlayerID());
-                players.Remove(networkedPlayerInfo);
-                newImpostors.Add(networkedPlayerInfo);
-                Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Seeker is {networkedPlayerInfo.PlayerName}, ID: {networkedPlayerInfo.PlayerId}");
-            }
-            // Random Seeker
-            else
-            {
-                int num2 = 0;
-                while (num2 < teamMax && players.Count > 0)
-                {
-                    PseudoRandomList<NetworkedPlayerInfo> pseudoRandomList = new PseudoRandomList<NetworkedPlayerInfo>(AmongUsClient.Instance.GameId);
-                    players._items.Do(x => pseudoRandomList.Add(x));
-                    for (int i = 0; i < GameData.RoundsPlayedInSession; i++)
-                    {
-                        pseudoRandomList.PickRandom();
-                    }
-                    NetworkedPlayerInfo networkedPlayerInfo = pseudoRandomList.PickRandom();
-                    players.Remove(networkedPlayerInfo);
-                    newImpostors.Add(networkedPlayerInfo);
-                    num2++;
-                    Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Seeker is {networkedPlayerInfo.PlayerName}, ID: {networkedPlayerInfo.PlayerId}");
-                }
-            }
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Guaranteed Assignment");
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
-                         new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
-            {
-                while (true)
-                {
-                    RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
-                    int count = roleAssignmentData2.Count;
-                    roleAssignmentData2.Count = count - 1;
-                    if (count <= 0)
-                    {
-                        break;
-                    }
-
-                    list.Add(roleAssignmentData.Role.Role);
-                }
-            }
-            AssignRolesFromList(newImpostors, teamMax, list, ref num);
-
-            var list2 = source.Where(x => !x.IsDead).Select(role =>
-                new RoleManager.RoleAssignmentData(
-                    role,
-                    roleOptions.GetNumPerGame(role.Role),
-                    roleOptions.GetChancePerGame(role.Role))).ToList();
-
-            list.Clear();
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
-            {
-                for (int i = 0; i < roleAssignmentData3.Count; i++)
-                {
-                    if (HashRandom.Next(101) < roleAssignmentData3.Chance)
-                    {
-                        list.Add(roleAssignmentData3.Role.Role);
-                    }
-                }
-            }
-
-            AssignRolesFromList(newImpostors, teamMax, list, ref num);
-            var basicRole = RoleTypes.Impostor;
-            while (list.Count < newImpostors.Count && list.Count + num < teamMax)
-            {
-                list.Add(basicRole);
-            }
-
-            AssignRolesFromList(newImpostors, teamMax, list, ref num);
-        }
-        return false;
-    }
-
-    public static void AssignRolesFromList(List<NetworkedPlayerInfo> players, int teamMax, List<RoleTypes> roleList, ref int rolesAssigned)
-    {
-        while (roleList.Count > 0 && players.Count > 0 && rolesAssigned < teamMax)
-        {
-            int index = HashRandom.FastNext(roleList.Count);
-            RoleTypes roleType = roleList[index];
-            roleList.RemoveAt(index);
-            int index2 = HashRandom.FastNext(players.Count);
-            players[index2].Object.RpcSetRole(roleType, false);
-            players.RemoveAt(index2);
-            rolesAssigned++;
-        }
-    }
-}

MiraAPI/Patches/Roles/LogicRoleSelectionNormalPatch.cs

@@ -1,93 +0,0 @@
-using AmongUs.GameOptions;
-using HarmonyLib;
-using Il2CppSystem.Collections.Generic;
-using System.Linq;
-using MiraAPI.Roles;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(LogicRoleSelectionNormal))]
-public static class LogicRoleSelectionNormalPatch
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(LogicRoleSelectionNormal.AssignRolesForTeam))]
-    public static bool AssignRolesForTeam(
-        LogicRoleSelectionNormal __instance,
-        List<NetworkedPlayerInfo> players,
-        IGameOptions opts,
-        RoleTeamTypes team,
-        int teamMax,
-        Il2CppSystem.Nullable<RoleTypes> defaultRole)
-    {
-        int num = 0;
-        var source = RoleManager.Instance.AllRoles.ToArray()
-            .Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
-                           CustomRoleUtils.CanSpawnOnCurrentMode(role));
-        List<RoleTypes> list = new List<RoleTypes>();
-        IRoleOptionsCollection roleOptions = opts.RoleOptions;
-
-        var assignmentData = source.Where(x => !x.IsDead).Select(role =>
-            new RoleManager.RoleAssignmentData(
-                role,
-                roleOptions.GetNumPerGame(role.Role),
-                roleOptions.GetChancePerGame(role.Role))).ToList();
-        var source2 = CustomRoleUtils.GetPossibleRoles(assignmentData, x => x.Chance == 100);
-        var guaranteedRoles = source.Where(x => source2.Contains(((ushort)x.Role, 100)));
-        foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
-                     new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
-        {
-            while (true)
-            {
-                RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
-                int count = roleAssignmentData2.Count;
-                roleAssignmentData2.Count = count - 1;
-                if (count <= 0)
-                {
-                    break;
-                }
-
-                list.Add(roleAssignmentData.Role.Role);
-            }
-        }
-
-        __instance.AssignRolesFromList(players, teamMax, list, ref num);
-
-        var list2 = source.Where(x => !x.IsDead).Select(role =>
-            new RoleManager.RoleAssignmentData(
-                role,
-                roleOptions.GetNumPerGame(role.Role),
-                roleOptions.GetChancePerGame(role.Role))).ToList();
-
-        list.Clear();
-        foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
-        {
-            for (int i = 0; i < roleAssignmentData3.Count; i++)
-            {
-                if (HashRandom.Next(101) < roleAssignmentData3.Chance)
-                {
-                    list.Add(roleAssignmentData3.Role.Role);
-                }
-            }
-        }
-
-        __instance.AssignRolesFromList(players, teamMax, list, ref num);
-        var defaultRole2 = team is RoleTeamTypes.Crewmate ? RoleTypes.Crewmate : RoleTypes.Impostor;
-        try
-        {
-            defaultRole2 = defaultRole.Value;
-        }
-        catch
-        {
-            // Ignored
-        }
-
-        while (list.Count < players.Count && list.Count + num < teamMax)
-        {
-            list.Add(defaultRole2);
-        }
-
-        __instance.AssignRolesFromList(players, teamMax, list, ref num);
-
-        return false;
-    }
-}

MiraAPI/Patches/Roles/NameTagPatch.cs

@@ -20,7 +20,7 @@ public static class NameTagPatch
             return false;
         }
 
-        if (PlayerControl.LocalPlayer.Data?.Role?.IsImpostor == true && otherPlayerRole.IsImpostor)
+        if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && otherPlayerRole.IsImpostor)
         {
             return true;
         }
@@ -30,7 +30,7 @@ public static class NameTagPatch
             return true;
         }
 
-        if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data?.Role || !otherPlayerRole)
+        if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data.Role || !otherPlayerRole)
         {
             __result = Color.white;
         }

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using AmongUs.GameOptions;
 using HarmonyLib;
-using InnerNet;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Modifiers;
@@ -26,7 +25,7 @@ public static class RoleManagerPatches
         var data = targetPlayer.Data;
         if (data == null)
         {
-            Error("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection.");
+            Debug.LogError("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection.");
             return false;
         }
         if (data.Role)

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -51,7 +51,7 @@ public static class RoleOptionsCollectionPatch
         var chance = customRole.GetChance();
         if (chance == null)
         {
-            Error($"Chance is null, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error($"Chance is null, defaulting to zero.");
             chance = 0;
         }
 
@@ -81,7 +81,7 @@ public static class RoleOptionsCollectionPatch
         var count = customRole.GetCount();
         if (count == null)
         {
-            Error($"Count is null, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error($"Count is null, defaulting to zero.");
             count = 0;
         }
 

MiraAPI/PluginLoading/IMiraPlugin.cs

@@ -12,31 +12,6 @@ public interface IMiraPlugin
     /// </summary>
     string OptionsTitleText { get; }
 
-    /// <summary>
-    /// Gets the name for the first custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuNameOne => "Custom Category 1";
-
-    /// <summary>
-    /// Gets the name for the second custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuNameTwo => "Custom Category 2";
-
-    /// <summary>
-    /// Gets the description for the second custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string ModifierMenuDescription => "Configure modifiers and their settings here!";
-
-    /// <summary>
-    /// Gets the description for the first custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuOneDescription => "Apply game settings for this mod!";
-
-    /// <summary>
-    /// Gets the description for the second custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuTwoDescription => "Apply game settings for this mod!";
-
     /// <summary>
     /// Gets the BepInEx configuration file for the plugin.
     /// </summary>

MiraAPI/PluginLoading/MiraPluginInfo.cs

@@ -51,7 +51,7 @@ public class MiraPluginInfo
     public IReadOnlyCollection<CustomActionButton> Buttons { get; private set; } = null!;
 
     /// <summary>
-    /// Gets a read only dictionary of this plugin's custom presets.
+    /// Gets a read only dictionary of this plugin's custom game modes.
     /// </summary>
     public IReadOnlyCollection<OptionPreset> Presets { get; internal set; } = null!;
 

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Reflection;
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
-using HarmonyLib;
 using MiraAPI.Colors;
 using MiraAPI.Events;
 using MiraAPI.GameEnd;
@@ -22,6 +21,7 @@ using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Networking;
 using Reactor.Utilities;
+using Rewired;
 
 namespace MiraAPI.PluginLoading;
 
@@ -60,7 +60,7 @@ public sealed class MiraPluginManager
                     continue;
                 }
 
-                foreach (var method in AccessTools.GetDeclaredMethods(type))
+                foreach (var method in type.GetMethods())
                 {
                     var eventAttribute = method.GetCustomAttribute<RegisterEventAttribute>();
                     if (eventAttribute == null)
@@ -70,14 +70,14 @@ public sealed class MiraPluginManager
 
                     if (!method.IsStatic)
                     {
-                        Error($"Event method {method.Name} in {type.Name} must be static.");
+                        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)))
                     {
-                        Error($"Invalid event registration method {method.Name} in {type.Name}");
+                        Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
                         continue;
                     }
 
@@ -131,7 +131,7 @@ public sealed class MiraPluginManager
             info.SavePublicCollections();
             PresetManager.CreateDefaultPreset(info);
             PresetManager.LoadPresets(info);
-            Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
+            Logger<MiraApiPlugin>.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
         };
         IL2CPPChainloader.Instance.Finished += PaletteManager.RegisterAllColors;
         IL2CPPChainloader.Instance.Finished += () =>
@@ -167,7 +167,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register game over {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register game over {type.Name}: {e}");
             return false;
         }
     }
@@ -190,7 +190,7 @@ public sealed class MiraPluginManager
             {
                 if (property.GetMethod?.IsStatic == true)
                 {
-                    Error($"Option property {property.Name} in {type.Name} must not be static.");
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} must not be static.");
                     continue;
                 }
 
@@ -211,14 +211,14 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(IModdedOption))))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for options.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for options.");
             }
 
             return true;
         }
         catch (Exception e)
         {
-            Error($"Failed to register options for {type.Name}: {e.ToString()}");
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e.ToString()}");
         }
         return false;
     }
@@ -235,7 +235,7 @@ public sealed class MiraPluginManager
 
             if (!ModList.GetById(pluginInfo.PluginId).IsRequiredOnAllClients)
             {
-                Error("Custom roles are only supported on all clients.");
+                Logger<MiraApiPlugin>.Error("Custom roles are only supported on all clients.");
                 return false;
             }
 
@@ -244,7 +244,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register role for {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register role for {type.Name}: {e}");
         }
         return false;
     }
@@ -260,7 +260,7 @@ public sealed class MiraPluginManager
 
             if (!type.IsStatic())
             {
-                Error($"Color class {type.Name} must be static.");
+                Logger<MiraApiPlugin>.Error($"Color class {type.Name} must be static.");
                 return;
             }
 
@@ -273,7 +273,7 @@ public sealed class MiraPluginManager
 
                 if (property.GetValue(null) is not CustomColor color)
                 {
-                    Error($"Color property {property.Name} in {type.Name} is not a CustomColor.");
+                    Logger<MiraApiPlugin>.Error($"Color property {property.Name} in {type.Name} is not a CustomColor.");
                     continue;
                 }
 
@@ -282,12 +282,12 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(CustomColor))))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for colors.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for colors.");
             }
         }
         catch (Exception e)
         {
-            Error($"Failed to register color class {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register color class {type.Name}: {e}");
         }
     }
 
@@ -299,7 +299,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register modifier {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register modifier {type.Name}: {e}");
             return false;
         }
     }
@@ -312,7 +312,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register button {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register button {type.Name}: {e}");
         }
 
         return false;
@@ -355,13 +355,13 @@ public sealed class MiraPluginManager
 
                 if (property.GetMethod?.IsStatic == true)
                 {
-                    Error($"Option property {property.Name} in {type.Name} must not be static.");
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} must not be static.");
                     continue;
                 }
 
                 if (property.GetValue(tabInstance) is not ConfigEntryBase configEntry)
                 {
-                    Error($"Option property {property.Name} in {type.Name} has to be a config entry.");
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} has to be a config entry.");
                     continue;
                 }
 
@@ -376,14 +376,14 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(ConfigEntryBase)) && f.GetCustomAttribute<LocalSettingAttribute>() != null))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for local settings.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for local settings.");
             }
 
             return true;
         }
         catch (Exception e)
         {
-            Error($"Failed to register options for {type.Name}: {e.ToString()}");
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e.ToString()}");
         }
 
         return false;
@@ -400,7 +400,7 @@ public sealed class MiraPluginManager
 
             if (!type.IsStatic())
             {
-                Error($"Keybinds class {type.Name} must be static.");
+                Logger<MiraApiPlugin>.Error($"Keybinds class {type.Name} must be static.");
                 return;
             }
 
@@ -413,7 +413,7 @@ public sealed class MiraPluginManager
 
                 if (property.GetValue(null) is not MiraKeybind keybind)
                 {
-                    Error($"Keybind property {property.Name} in {type.Name} is not a MiraKeybind.");
+                    Logger<MiraApiPlugin>.Error($"Keybind property {property.Name} in {type.Name} is not a MiraKeybind.");
                     continue;
                 }
 
@@ -430,12 +430,12 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(MiraKeybind))))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for keybinds.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for keybinds.");
             }
         }
         catch (Exception e)
         {
-            Error($"Failed to register keybind class {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register keybind class {type.Name}: {e}");
         }
     }
 }

MiraAPI/Presets/OptionPreset.cs

@@ -71,26 +71,4 @@ public class OptionPreset
 
         CustomRoleManager.SyncAllRoleSettings();
     }
-
-    /// <summary>
-    /// Resets the specified option with the preset provided.
-    /// </summary>
-    public void ResetOption(OptionBehaviour baseOption)
-    {
-        var selectedOpt = Plugin.InternalOptions.First(x => x.OptionBehaviour == baseOption);
-        selectedOpt.LoadFromPreset(PresetConfig);
-        /*ModdedOptionsManager.SyncAllOptions();
-
-        CustomRoleManager.SyncAllRoleSettings();*/
-    }
-
-    /// <summary>
-    /// Gets whether the specified option is included in the preset.
-    /// </summary>
-    /// <returns>>The value of whether the option is in the preset.</returns>
-    public bool IsOptionInPreset(OptionBehaviour baseOption)
-    {
-        var selectedOpt = Plugin.InternalOptions.First(x => x.OptionBehaviour == baseOption);
-        return selectedOpt.ConfigDefinition != null && PresetConfig.ContainsKey(selectedOpt.ConfigDefinition);
-    }
 }

MiraAPI/Presets/PresetManager.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
 using BepInEx.Configuration;
 using MiraAPI.PluginLoading;
@@ -19,14 +18,6 @@ public static class PresetManager
     /// </summary>
     public static string PresetDirectory { get; } = Path.GetFullPath("mira_presets", Application.persistentDataPath);
 
-    internal static Dictionary<MiraPluginInfo, OptionPreset> DefaultPresets { get; } = [];
-    internal static List<OptionPreset> InternalMasterPresets { get; } = [];
-
-    /// <summary>
-    /// Gets a read only dictionary of this plugin's custom presets.
-    /// </summary>
-    public static IReadOnlyCollection<OptionPreset> MasterPresets { get; internal set; } = null!;
-
     internal static void CreateDefaultPreset(MiraPluginInfo plugin)
     {
         var presetPath = Path.Combine(PresetDirectory, plugin.PluginId);
@@ -48,7 +39,6 @@ public static class PresetManager
         }
 
         presetConfig.Save();
-        DefaultPresets.Add(plugin, new OptionPreset("Default", plugin, presetConfig));
     }
 
     /// <summary>
@@ -80,7 +70,7 @@ public static class PresetManager
         foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
         {
             var fileName = Path.GetFileName(file);
-            Info($"Loading preset file {fileName}");
+            Logger<MiraApiPlugin>.Info($"Loading preset file {fileName}");
             var presetName = Path.GetFileNameWithoutExtension(file);
             var presetConfig = new ConfigFile(file, false)
             {
@@ -103,58 +93,4 @@ public static class PresetManager
         }
         plugin.Presets = [..plugin.InternalPresets];
     }
-
-    /// <summary>
-    /// Loads the master presets by reading the configuration files from the preset directory.
-    /// </summary>
-    public static void LoadMasterPreset()
-    {
-        /*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, "MasterPresets");
-        if (!Directory.Exists(pluginPresetPath))
-        {
-            Directory.CreateDirectory(pluginPresetPath);
-        }
-
-        foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
-        {
-            var fileName = Path.GetFileName(file);
-            Info($"Loading preset file {fileName}");
-            var presetName = Path.GetFileNameWithoutExtension(file);
-            var presetConfig = new ConfigFile(file, false)
-            {
-                SaveOnConfigSet = false,
-            };
-            foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
-            {
-                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();
-
-            // InternalMasterPresets.Add(new OptionPreset(presetName, plugin, presetConfig));
-        }
-        MasterPresets = [..InternalMasterPresets];
-    }
 }

MiraAPI/Roles/CustomRoleConfiguration.cs

@@ -1,9 +1,7 @@
-using AmongUs.GameOptions;
-using System;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Patches.Freeplay;
+using AmongUs.GameOptions;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
+
 namespace MiraAPI.Roles;
 
 /// <summary>
@@ -11,16 +9,6 @@ namespace MiraAPI.Roles;
 /// </summary>
 public record struct CustomRoleConfiguration
 {
-#pragma warning disable S1133
-    [Obsolete("Default constructor is not supported. Please use the constructor that takes an ICustomRole parameter.")]
-#pragma warning restore S1133
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-    public CustomRoleConfiguration()
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-    {
-        throw new NotImplementedException("Default constructor is not supported. Please use the constructor that takes an ICustomRole parameter.");
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="CustomRoleConfiguration"/> struct.
     /// </summary>
@@ -48,7 +36,7 @@ public record struct CustomRoleConfiguration
         {
             ModdedRoleTeams.Crewmate => TranslationController.Instance.GetString(StringNames.Crewmate),
             ModdedRoleTeams.Impostor => TranslationController.Instance.GetString(StringNames.Impostor),
-            _ => TaskAdderPatches.NeutralName,
+            _ => "Neutral",
         };
         IntroSound = role.Team is ModdedRoleTeams.Crewmate
             ? CustomRoleManager.CrewmateIntroSound
@@ -78,19 +66,16 @@ public record struct CustomRoleConfiguration
     /// <summary>
     /// Gets or sets the Sprite used for the Role Options menu screenshot.
     /// </summary>
-    [HideFromIl2Cpp]
     public LoadableAsset<Sprite>? OptionsScreenshot { get; set; } = null;
 
     /// <summary>
     /// Gets or sets the Sprite used for the Role Icon.
     /// </summary>
-    [HideFromIl2Cpp]
     public LoadableAsset<Sprite>? Icon { get; set; } = null;
 
     /// <summary>
     /// Gets or sets the Intro sound for the Role.
     /// </summary>
-    [HideFromIl2Cpp]
     public LoadableAsset<AudioClip>? IntroSound { get; set; } = null;
 
     /// <summary>

MiraAPI/Roles/CustomRoleManager.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using AmongUs.GameOptions;
 using Il2CppInterop.Runtime;
 using Il2CppInterop.Runtime.Injection;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
@@ -54,9 +53,6 @@ public static class CustomRoleManager
     internal static readonly Dictionary<ushort, RoleBehaviour> CustomRoles = [];
     internal static readonly Dictionary<Type, ushort> RoleIds = [];
 
-    private static Il2CppSystem.Collections.Generic.List<BaseGameSetting>? _emptySettings;
-    private static Il2CppReferenceArray<OverlayKillAnimation>? _emptyKillAnimations;
-
     private static ushort _roleId = 100;
 
     private static ushort GetNextRoleId()
@@ -89,22 +85,15 @@ public static class CustomRoleManager
 
         foreach (var roleType in roles)
         {
-            try
-            {
-                ClassInjector.RegisterTypeInIl2Cpp(roleType);
+            ClassInjector.RegisterTypeInIl2Cpp(roleType);
 
-                var role = RegisterRole(roleType, pluginInfo);
-                if (role is null)
-                {
-                    continue;
-                }
-
-                pluginInfo.InternalRoles.Add((ushort)role.Role, role);
-            }
-            catch (Exception ex)
+            var role = RegisterRole(roleType, pluginInfo);
+            if (role is null)
             {
-                Error($"Failed to register role type {roleType.Name}: {ex}");
+                continue;
             }
+
+            pluginInfo.InternalRoles.Add((ushort)role.Role, role);
         }
 
         pluginInfo.PluginConfig.Save();
@@ -115,7 +104,7 @@ public static class CustomRoleManager
     {
         if (!(typeof(RoleBehaviour).IsAssignableFrom(roleType) && typeof(ICustomRole).IsAssignableFrom(roleType)))
         {
-            Error($"{roleType.Name} does not inherit from RoleBehaviour or ICustomRole.");
+            Logger<MiraApiPlugin>.Error($"{roleType.Name} does not inherit from RoleBehaviour or ICustomRole.");
             return null;
         }
 
@@ -144,12 +133,6 @@ public static class CustomRoleManager
         roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount;
         roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot?.LoadAsset();
 
-        _emptySettings ??= new(0);
-        _emptyKillAnimations ??= new(0);
-
-        roleBehaviour.AllGameSettings = _emptySettings;
-        roleBehaviour.CustomKillAnimations = _emptyKillAnimations;
-
         if (customRole.Configuration.Icon != null)
         {
             var asset = customRole.Configuration.Icon.LoadAsset();
@@ -175,7 +158,7 @@ public static class CustomRoleManager
 
         if (useTaskHint && !overridesTaskText)
         {
-            Error($"Role {customRole.RoleName} is using RoleHintType.TaskHint but does not override SpawnTaskHeader!");
+            Logger<MiraApiPlugin>.Error($"Role {customRole.RoleName} is using RoleHintType.TaskHint but does not override SpawnTaskHeader!");
         }
 
         CustomRoles.Add(roleId, roleBehaviour);
@@ -305,7 +288,7 @@ public static class CustomRoleManager
             }
             catch (Exception e)
             {
-                Error(e);
+                Logger<MiraApiPlugin>.Error(e);
             }
         }
 

MiraAPI/Roles/CustomRoleUtils.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -14,62 +13,6 @@ namespace MiraAPI.Roles;
 /// </summary>
 public static class CustomRoleUtils
 {
-    /// <summary>
-    /// Determines whether the specified role can spawn in general, accounting for gamemodes and everything else.
-    /// </summary>
-    /// <param name="role">The role you would like to check for.</param>
-    /// <returns>True if the role is able to spawn, otherwise false.</returns>
-    public static bool CanSpawnOnCurrentMode(RoleBehaviour role)
-    {
-        if (role is ICustomRole custom)
-        {
-            return custom.CanSpawnOnCurrentMode();
-        }
-
-        if (GameManager.Instance.IsHideAndSeek())
-        {
-            return role.Role is RoleTypes.Engineer || role.Role is RoleTypes.Impostor;
-        }
-        return true;
-    }
-
-    public static List<(ushort RoleType, int Chance)> GetPossibleRoles(
-        List<RoleManager.RoleAssignmentData> assignmentData,
-        Func<RoleManager.RoleAssignmentData, bool>? predicate = null)
-    {
-        var roles = new List<(ushort, int)>();
-
-        assignmentData.Where(x => predicate == null || predicate(x)).ToList().ForEach(x =>
-        {
-            for (var i = 0; i < x.Count; i++)
-            {
-                roles.Add(((ushort)x.Role.Role, x.Chance));
-            }
-        });
-
-        return roles;
-    }
-
-    public static RoleManager.RoleAssignmentData GetAssignData(RoleTypes roleType)
-    {
-        var currentGameOptions = GameOptionsManager.Instance.CurrentGameOptions;
-        var roleOptions = currentGameOptions.RoleOptions;
-
-        var role = GetRegisteredRole(roleType);
-        var assignmentData = new RoleManager.RoleAssignmentData(role, roleOptions.GetNumPerGame(role!.Role),
-            roleOptions.GetChancePerGame(role.Role));
-
-        return assignmentData;
-    }
-
-    public static RoleBehaviour? GetRegisteredRole(RoleTypes roleType)
-    {
-        // we want to prioritize the custom roles because the role has the right RoleColour/TeamColor
-        var role = CustomRoleManager.AllRoles.FirstOrDefault(x => x.Role == roleType);
-
-        return role;
-    }
-
     /// <summary>
     /// Gets all active in-game roles.
     /// </summary>

MiraAPI/Roles/ICustomRole.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 using BepInEx.Configuration;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
@@ -157,7 +156,7 @@ public interface ICustomRole : IOptionable
     {
         if (!Configuration.CanModifyChance)
         {
-            Error($"Cannot modify chance for role: {RoleName}");
+            Logger<MiraApiPlugin>.Error($"Cannot modify chance for role: {RoleName}");
             return;
         }
 
@@ -167,7 +166,7 @@ public interface ICustomRole : IOptionable
             return;
         }
 
-        Error($"Error getting chance configuration for role: {RoleName}");
+        Logger<MiraApiPlugin>.Error($"Error getting chance configuration for role: {RoleName}");
     }
 
     /// <summary>
@@ -182,7 +181,7 @@ public interface ICustomRole : IOptionable
             return;
         }
 
-        Error($"Error getting count configuration for role: {RoleName}");
+        Logger<MiraApiPlugin>.Error($"Error getting count configuration for role: {RoleName}");
     }
 
     /// <summary>
@@ -240,15 +239,4 @@ public interface ICustomRole : IOptionable
     {
         return true;
     }
-
-    /// <summary>
-    /// Determines whether the role can spawn in general, accounting for gamemodes and everything else.
-    /// </summary>
-    /// <returns>True if the role is able to spawn, otherwise false.</returns>
-    public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
-
-    /// <summary>
-    /// Gets the function that determines whether the role should be toggled on or off in the game settings.
-    /// </summary>
-    public virtual Func<bool> VisibleInSettings => () => true;
 }

MiraAPI/Utilities/Assets/AddressablesLoader.cs

@@ -33,7 +33,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more catalogs.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more catalogs.");
             return;
         }
 
@@ -48,7 +48,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for hats.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for hats.");
             return;
         }
 
@@ -63,7 +63,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for skins.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for skins.");
             return;
         }
 
@@ -79,7 +79,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for nameplates.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for nameplates.");
             return;
         }
 
@@ -95,7 +95,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for visors.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for visors.");
             return;
         }
 
@@ -106,7 +106,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized.");
             return;
         }
 
@@ -129,10 +129,10 @@ public static class AddressablesLoader
         // Check for errors
         if (catalogOperation.Status != AsyncOperationStatus.Succeeded)
         {
-            Error($"Failed to load catalog {location}.");
+            Logger<MiraApiPlugin>.Error($"Failed to load catalog {location}.");
         }
 
-        Info($"Loaded addressables {location}.");
+        Logger<MiraApiPlugin>.Info($"Loaded addressables {location}.");
         LoadedLocations.Add(location);
     }
 
@@ -193,7 +193,7 @@ public static class AddressablesLoader
             }
             catch
             {
-                Error($"Failed to find tag {tag}");
+                Logger<MiraApiPlugin>.Error($"Failed to find tag {tag}");
             }
         }
         return behaviours;
@@ -214,7 +214,7 @@ public static class AddressablesLoader
             }
             catch
             {
-                Error($"Failed to find tag {tag}");
+                Logger<MiraApiPlugin>.Error($"Failed to find tag {tag}");
             }
         }
         return behaviours;

MiraAPI/Utilities/Assets/LoadableAddressableAsset.cs

@@ -38,7 +38,7 @@ public class LoadableAddressableAsset<T>(string uid) : LoadableAsset<T> where T
 
         var remoteReference = new AssetReference(uid);
 
-        if (!GC.TryStartNoGCRegion(4096, true)) Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
+        if (!GC.TryStartNoGCRegion(4096, true)) Logger<MiraApiPlugin>.Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
 
         LoadedAsset = remoteReference.LoadAssetAsync<T>().WaitForCompletion();
         if (LoadedAsset == null)

MiraAPI/Utilities/Assets/LoadableAddressableAssets.cs

@@ -45,7 +45,7 @@ public class LoadableAddressableAssets<T>(string key) where T : UnityEngine.Obje
 
         var locations = Addressables.LoadResourceLocationsAsync(key).WaitForCompletion();
 
-        if (!GC.TryStartNoGCRegion(4096, true)) Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
+        if (!GC.TryStartNoGCRegion(4096, true)) Logger<MiraApiPlugin>.Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
 
         var assetsIList = Addressables.LoadAssetsAsync<T>(locations, null, false).WaitForCompletion();
         if (assetsIList == null)

MiraAPI/Utilities/Assets/MiraAssets.cs

@@ -90,11 +90,6 @@ public static class MiraAssets
     /// </summary>
     public static LoadableResourceAsset CheckmarkBox { get; } = new("MiraAPI.Resources.CheckMarkBox.png");
 
-    /// <summary>
-    /// Gets the Reset Box used in the Settings Menu.
-    /// </summary>
-    public static LoadableResourceAsset ResetButton { get; } = new("MiraAPI.Resources.ResetButton.png");
-
     /// <summary>
     /// Gets the Checkmark used in the Settings Menu.
     /// </summary>

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -19,10 +19,7 @@ public static class SpriteTools
     /// <exception cref="ArgumentException">Thrown when the resource cannot be found in the specified assembly.</exception>
     public static Texture2D LoadTextureFromResourcePath(string resourcePath, Assembly assembly)
     {
-        var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false)
-        {
-            wrapMode = TextureWrapMode.Clamp,
-        };
+        var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false);
         var myStream = assembly.GetManifestResourceStream(resourcePath);
         if (myStream != null)
         {

MiraAPI/Utilities/Extensions.cs

@@ -29,13 +29,13 @@ public static class Extensions
 
         if (count == null)
         {
-            Error("Couldn't get role count for NetData, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error("Couldn't get role count for NetData, defaulting to zero.");
             count = 0;
         }
 
         if (chance == null)
         {
-            Error("Couldn't get role chance for NetData, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error("Couldn't get role chance for NetData, defaulting to zero.");
             chance = 0;
         }
 
@@ -132,31 +132,6 @@ public static class Extensions
         button.SetCooldownFill(num);
     }
 
-    /// <summary>
-    /// Returns a random element from the specified sequence.
-    /// </summary>
-    /// <param name="input">
-    /// The sequence to select an element from.
-    /// </param>
-    /// <typeparam name="T">
-    /// The type of elements in the sequence.
-    /// </typeparam>
-    /// <returns>
-    /// A randomly selected element from <paramref name="input"/>.
-    /// </returns>
-    /// <exception cref="InvalidOperationException">
-    /// Thrown when <paramref name="input"/> is empty.
-    /// </exception>
-    public static T RandomSnapshot<T>(this IEnumerable<T> input)
-    {
-        var list = input.ToList();
-
-        if (list.Count == 0)
-            throw new InvalidOperationException("Cannot get random element from an empty collection.");
-
-        return list[UnityEngine.Random.Range(0, list.Count)];
-    }
-
     /// <summary>
     /// Gets a PlayerControl from their PlayerVoteArea in a meeting.
     /// </summary>
@@ -181,16 +156,6 @@ public static class Extensions
         return TutorialManager.InstanceExists || AmongUsClient.Instance.HostId == playerControl.OwnerId;
     }
 
-    /// <summary>
-    /// Checks if a PlayerControl is protected by a Guardian Angel.
-    /// </summary>
-    /// <param name="playerControl">The player you're checking for.</param>
-    /// <returns>If the player is protected, true, else false.</returns>
-    public static bool ProtectedByGa(this PlayerControl playerControl)
-    {
-        return playerControl.protectedByGuardianId > -1;
-    }
-
     /// <summary>
     /// Used to convert a System.Collections.Generic.List to Il2cppSystem.
     /// </summary>
@@ -433,7 +398,7 @@ public static class Extensions
 
             if (length > chunkSize)
             {
-                Info($"NetData length is greater than chunk size: {length} > {chunkSize}");
+                Logger<MiraApiPlugin>.Info($"NetData length is greater than chunk size: {length} > {chunkSize}");
                 continue;
             }
 

MiraAPI/Utilities/Helpers.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using AmongUs.GameOptions;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Roles;
@@ -50,18 +49,18 @@ public static class Helpers
 
         if (showRoleStateMachine == null)
         {
-            Error($"Failed to find {methodName} state machine for {typeName}");
+            Logger<MiraApiPlugin>.Error($"Failed to find {methodName} state machine for {typeName}");
             return null;
         }
 
         var moveNext = AccessTools.Method(showRoleStateMachine, "MoveNext");
         if (moveNext == null)
         {
-            Error($"Failed to find MoveNext method for {typeName}.{methodName}");
+            Logger<MiraApiPlugin>.Error($"Failed to find MoveNext method for {typeName}.{methodName}");
             return null;
         }
 
-        Info($"Found {methodName}.MoveNext");
+        Logger<MiraApiPlugin>.Info($"Found {methodName}.MoveNext");
         return moveNext;
     }
 
@@ -140,7 +139,7 @@ public static class Helpers
                 return true;
             default:
                 {
-                    var num = Random.RandomRangeInt(1, 101);
+                    var num = UnityEngine.Random.RandomRangeInt(1, 101);
                     return num <= probability;
                 }
         }
@@ -501,7 +500,7 @@ public static class Helpers
     public static string RandomString(int length, string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
     {
         return new string(Enumerable.Repeat(chars, length)
-            .Select(s => s[Random.RandomRangeInt(0, s.Length)]).ToArray());
+            .Select(s => s[UnityEngine.Random.RandomRangeInt(0, s.Length)]).ToArray());
     }
 
     /// <summary>
@@ -537,15 +536,4 @@ public static class Helpers
         }
         return role.NiceName;
     }
-
-    /// <summary>
-    /// Returns whether the role is blacklisted from appearing and spawning. (Only applicable to vanilla roles)
-    /// </summary>
-    /// <param name="role">The role to check.</param>
-    /// <returns>The role's blacklist status.</returns>
-    public static bool IsRoleBlacklisted(this RoleBehaviour role)
-    {
-        // This should be patchable by mods when a vanilla role is meant to be replaced by a custom role.
-        return false;
-    }
 }

MiraAPI/Utilities/StateMachineWrapper.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes;
-using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Utilities;
 
@@ -14,12 +11,8 @@ namespace MiraAPI.Utilities;
 public class StateMachineWrapper<T> where T : Il2CppObjectBase
 {
     private readonly Il2CppObjectBase _stateMachine;
-
-    // normally it is fields, but IL2CPP turns them into properties
     private readonly PropertyInfo _thisProperty;
     private readonly PropertyInfo _stateProperty;
-    private readonly PropertyInfo _currentProperty;
-    private readonly Dictionary<string, PropertyInfo> _propertyCache;
 
     private T? _parentInstance;
 
@@ -39,14 +32,6 @@ public class StateMachineWrapper<T> where T : Il2CppObjectBase
         var type = _stateMachine.GetType();
         _thisProperty = AccessTools.Property(type, "__4__this");
         _stateProperty = AccessTools.Property(type, "__1__state");
-        _currentProperty = AccessTools.Property(type, "__2__current");
-
-        if (_thisProperty == null || _stateProperty == null || _currentProperty == null)
-        {
-            throw new MissingMemberException($"Could not find required properties in type '{type}'.");
-        }
-
-        _propertyCache = [];
     }
 
     /// <summary>
@@ -54,37 +39,4 @@ public class StateMachineWrapper<T> where T : Il2CppObjectBase
     /// </summary>
     /// <returns>The current state as an integer.</returns>
     public int GetState() => (int)_stateProperty.GetValue(_stateMachine)!;
-
-    /// <summary>
-    /// Sets the current state of the state machine.
-    /// </summary>
-    /// <param name="newState">The new state to use.</param>
-    public void SetState(int newState) => _stateProperty.SetValue(_stateMachine, newState);
-
-    /// <summary>
-    /// Sets the newest yield return of the state machine.
-    /// </summary>
-    /// <param name="newReturn">The new return to use.</param>
-    public void SetRecentReturn(Object newReturn) => _currentProperty.SetValue(_stateMachine, newReturn);
-
-    /// <summary>
-    /// Gets a parameter from the state machine by its name.
-    /// </summary>
-    /// <param name="parameterName">The name of the parameter to retrieve.</param>
-    /// <typeparam name="TField">The type of the parameter to retrieve.</typeparam>
-    /// <returns>>The value of the specified parameter.</returns>
-    /// <exception cref="MissingFieldException">Thrown if the specified parameter does not exist.</exception>
-    public TField GetParameter<TField>(string parameterName)
-    {
-        if (_propertyCache.TryGetValue(parameterName, out var property))
-        {
-            return (TField)property.GetValue(_stateMachine)!;
-        }
-
-        property = AccessTools.Property(_stateMachine.GetType(), parameterName)
-                   ?? throw new MissingFieldException($"Could not find parameter '{parameterName}' in state machine of type '{_stateMachine.GetType()}'.");
-
-        _propertyCache[parameterName] = property;
-        return (TField)property.GetValue(_stateMachine)!;
-    }
 }

MiraAPI/Voting/VotingUtils.cs

@@ -224,7 +224,7 @@ public static class VotingUtils
                 var playerById = GameData.Instance.GetPlayerById(vote.Voter);
                 if (playerById == null)
                 {
-                    Error($"Couldn't find player info for voter: {vote.Voter}");
+                    Logger<MiraApiPlugin>.Error($"Couldn't find player info for voter: {vote.Voter}");
                 }
                 else if (i == 0 && vote.Suspect == SkipVoteId)
                 {

README.md

@@ -5,7 +5,6 @@
 # Mira API
 
 A thorough, but simple, Among Us modding API and utility library that covers:
-
 - Roles
 - Options
 - Modifiers
@@ -14,9 +13,6 @@ A thorough, but simple, Among Us modding API and utility library that covers:
 - Events
 - Voting
 - Assets
-- Keybinds
-- Local Settings
-- Custom Game Over Conditions
 - Compatibility
 - ~~Game Modes~~ (coming soon)
 
@@ -28,10 +24,9 @@ The result is a less intrusive, better modding API that covers general use cases
 # Usage
 
 To start using Mira API, you need to:
-
 1. Add a reference to Mira API either through a [DLL](https://github.com/All-Of-Us-Mods/MiraAPI/releases), project reference, or [NuGet package](https://www.nuget.org/packages/AllOfUs.MiraAPI).
 2. Add a BepInDependency on your plugin class like this: `[BepInDependency(MiraApiPlugin.Id)]`
-3. Implement the `IMiraPlugin` interface on your plugin class.
+3. Implement the IMiraPlugin interface in your plugin class.
 
 Mira API also depends on [Reactor](https://github.com/NuclearPowered/Reactor) to function properly!
 Remember to include it as a reference and `BepInDependency`!
@@ -39,10 +34,8 @@ Remember to include it as a reference and `BepInDependency`!
 For a full example, see [this file](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/ExamplePlugin.cs).
 
 ## Recommended Project Structure
-
 It is highly recommended to follow this project structure when using Mira API to keep your code clean and organized.
 You can also view the Example Mod in this repository for some guidance.
-
 ```
 MyMiraMod/
 ├── Buttons/
@@ -67,21 +60,220 @@ MyMiraMod/
 └── MyModAssets.cs
 ```
 
-# Documentation
+## Roles
+Roles are straightforward in Mira API. There are two things you need to do to create a custom role:
+1. Create a class that inherits from a base game role (like `CrewmateRole`, `ImpostorRole`, etc.) 
+2. Implement the `ICustomRole` interface from Mira API.
 
-Full documentation for every Mira API feature is available on the **[wiki](https://github.com/All-Of-Us-Mods/MiraAPI/wiki)**:
+**Disclaimer: Make sure your plugin class has the following attribute `[ReactorModFlags(ModFlags.RequireOnAllClients)]` or else your roles will not register correctly.**
 
-- [Get Started / IMiraPlugin](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Home)
-- [Custom Roles](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Custom-Roles)
-- [Options](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Options)
-- [Modifiers](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Modifiers)
-- [Custom Buttons](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Custom-Buttons)
-- [Custom Colors](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Colors)
-- [Events](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Events)
-- [Meetings and Voting](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Meetings-and-Voting)
-- [Assets](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Assets)
-- [Keybinds](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Keybinds)
-- [Local Settings](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Local-Settings)
-- [Game Modes](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Game-Modes)
-- [Custom Game Over](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Game-Over)
-- [Utilities](https://github.com/All-Of-Us-Mods/MiraAPI/wiki/Utilities)
+Note: For step 1, if you are making neutral roles,
+you can choose either `CrewmateRole` or `ImpostorRole`,
+or even `RoleBehaviour` if you are okay with starting from scratch.
+
+Mira API handles everything else, from adding the proper options to the settings menu,
+to managing the role assignment at the start of the game.
+There are no extra steps on the developer's part.
+
+See [this file](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/Roles/CustomRole.cs) for a code example.
+
+## Modifiers
+Mira API uses a different definition of 'modifiers' than other Among Us mods.
+For example, in Town Of Us, a modifier is an extra "ability" that is applied on top of the base role.
+However, in Mira API, modifiers are very flexible.
+A modifier is anything that "modifiers" a player's abilities or interactions.
+
+Mira provides three classes for working with modifiers:
+- `BaseModifier`: The base for every modifier. You MUST add and remove this modifier from a player manually!
+- `TimedModifier`: A modifier that has a time limit. This modifier has to be added manually, but will automatically remove itself after the time limit.
+- `GameModifier`: This works like the typical TOU modifier, where it is automatically applied at the beginning of the game, then removed at the end.
+
+Modifiers provide various overridable functions and properties for custom behavior.
+They can also be used for "tagging" a player.
+You can check if a player has a modifier through the extension method `HasModifier` on a `PlayerControl` object.
+
+To start using a modifier, pick one of the base classes above and create a class that inherits from it. Implement the properties and methods you would like, then add the `[RegisterModifier]` attribute to the class.
+
+An example Game modifier can be found [here](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/Modifiers/GameModifierExample.cs).
+An example Timer modifier can be found [here](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/Modifiers/ModifierTimerExample.cs).
+
+## Options
+Options are also simple in Mira API.
+Mira API handles all the hard work behind the scenes,
+so developers only have to follow a few steps to create their custom options.
+The Options API is split up into Groups and Options.
+Every Option needs to be in a Group.
+
+To create a group, you need to create a class that inherits from the `AbstractOptionGroup` abstract class.
+Groups contain some properties for developers to control,
+including `GroupName`, `GroupColor`, `GroupVisible`, and `OptionableType`.
+The full list of properties can be found in the `AbstractOptionGroup` class.
+Only the `GroupName` is required.
+
+Here is an example of a group class:
+```csharp
+public class MyOptionsGroup : AbstractOptionGroup
+{
+    public override string GroupName => "My Options"; // this is required
+    
+    [ModdedNumberOption("My Number Option", min: 0, max: 10)]
+    public float MyNumberOption { get; set; } = 5f;
+}
+```
+
+You can access any group class using the `OptionGroupSingleton` class like this:
+```csharp
+// MyOptionsGroup is a class that inherits from AbstractOptionGroup
+var myGroup = OptionGroupSingleton<MyOptionsGroup>.Instance; // gets the instance of the group
+Logger<MyPlugin>.Info(myGroup.MyNumberOption); // prints the value of the option to the console
+```
+
+Once you have an options group, there are two ways to make the actual options:
+- Use an Option Attribute with a property.  
+- Create a ModdedOption property.
+
+### Option Attributes
+
+This is an example of using an Option Attribute on a property:
+```csharp
+// The first parameter is always the name of the option. The rest are dependent on the type of option.
+[ModdedNumberOption("Sussy level", min: 0, max: 10)]
+public float SussyLevel { get; set; } = 4f; // You can set a default value here.
+```
+
+Here are the available Option Attributes and their signatures:
+```csharp
+ModdedEnumOption(string name, Type enumType, string[]? values = null, Type? roleType = null)
+    
+ModdedNumberOption(
+    string name,
+    float min,
+    float max,
+    float increment=1
+    NumberSuffixes suffixType = NumberSuffixes.None,
+    bool zeroInfinity = false,
+    Type? roleType = null)
+
+ModdedToggleOption(string name, Type? roleType = null)
+```
+
+### ModdedOption Properties
+
+And this is an example of a ModdedOption property:
+```csharp
+public ModdedToggleOption YeezusAbility { get; } = new ModdedToggleOption("Yeezus Ability", false);
+```
+
+There are currently three types of ModdedOptions you can create:
+- `ModdedEnumOption`
+- `ModdedNumberOption`
+- `ModdedToggleOption`
+
+To see a full example of an option class,
+see [this file](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/Options/ExampleOptions.cs).
+
+### Role Options
+
+You can also specify a role type for an option or option group.
+
+To set the role type for an entire group, set the `OptionableType` property on that group like this: 
+```csharp
+public class MyOptionsGroup : AbstractOptionGroup
+{
+    public override string GroupName => "My Options";
+    public override Type? OptionableType => typeof(MyRole); // this is the role that will have these options
+    
+    [ModdedNumberOption("Ability Uses", min: 0, max: 10)]
+    public float AbilityUses { get; set; } = 5f;
+}
+```
+
+You can also use a modifier type for the `OptionableType` property.
+This will associate that option group with the specified modifier type
+and display it in the modifier options menu.
+
+An example can be found [here](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/Options/Roles/CustomRoleSettings.cs).
+
+## Custom Murders
+Mira API provides its own implementation for murders.
+Our implementation allows for more customization on kills, and helps bypass server checks.
+You can use `PlayerControl.RpcCustomMurder` to perform a networked custom murder, or `PlayerControl.CustomMurder` to normally perform a custom murder.
+For example: 
+```cs
+PlayerControl.LocalPlayer.RpcCustomMurder(Target, createDeadBody: false, teleportMurderer: false, playKillSound: false, resetKillTimer: false, showKillAnim: false);
+```
+This will kill a player without creating a dead body and without teleporting the murderer.
+
+## Buttons
+
+Mira API provides a simple interface for adding ability buttons to the game.
+
+The only thing you need to do is create a class
+that inherits from the `CustomActionButton` class and implement the properties and methods.
+
+Mira API handles all other tasks and logic required to add the button to the game.
+
+In case you need to access your `CustomActionButton` instance from another class,
+you can use the `CustomButtonSingleton` class like this:
+```csharp
+var myButton = CustomButtonSingleton<MyCoolButton>.Instance;
+```
+
+The button API is straightforward, but provides a lot of flexibility.
+There are various methods you can override to customize the behavior of your button.
+See [this file](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI/Hud/CustomActionButton.cs) 
+for a full list of methods you can override.
+
+An example button can be found [here](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/Buttons/ExampleButton.cs).
+
+## Custom Colors
+
+Mira provides a simple Custom Color API that allows you to add custom player colors to the game.
+
+Creating custom colors isn't difficult, but there are some requirements for Mira to register your colors.
+
+1. Create a ***STATIC*** class to house all your `CustomColor` objects.
+2. Inside this class, create a `CustomColor` property for each color you intend to add.
+3. Add the `[RegisterCustomColors]` attribute to the class.
+
+Here is an example of a custom color class:
+```csharp
+[RegisterCustomColors]
+public static class MyCustomColors
+{
+    public static CustomColor Cerulean { get; } = new CustomColor("Cerulean", new Color(0.0f, 0.48f, 0.65f)); 
+
+    public static CustomColor Rose { get; } = new CustomColor("Rose", new Color(0.98f, 0.26f, 0.62f));
+    
+    public static CustomColor Gold { get; } = new CustomColor("Gold", new Color(1.0f, 0.84f, 0.0f));
+}
+```
+
+## Assets
+
+Mira API provides a simple, but expandable asset system.
+The core of the system is the `LoadableAsset<T>` class.
+This is a generic abstract class that provides a pattern for loading assets. 
+
+Mira API comes with a few asset loaders:
+1. `LoadableBundleAsset<T>`: This is used for loading assets from AssetBundles.
+2. `LoadableAddressableAsset<T>`: This is used for loading assets from Addressables.
+3. `LoadableResourceAsset`: This is used for loading **only sprites** from the Embedded Resources within a mod.
+4. `LoadableAudioResourceAsset`: This is used for loading **only audio clips** from the Embedded Resources within a mod.
+
+The code below shows how to use an asset loaders:
+```csharp
+// Load a sprite from an AssetBundle
+AssetBundle bundle = AssetBundleManager.Load("MyBundle"); // AssetBundleManager is a utility provided by Reactor
+LoadableAsset<Sprite> mySpriteAsset = new LoadableBundleAsset<Sprite>("MySprite", bundle);
+Sprite sprite = mySpriteAsset.LoadAsset();
+
+// Load a sprite from an Embedded Resource
+// Make sure to set the Build Action of your image to Embedded Resource!
+LoadableAsset<Sprite> buttonAsset = new LoadableResourceAsset("ExampleMod.Resources.MyButton.png");
+Sprite button = buttonSpriteAsset.LoadAsset();
+```
+
+You can view an example file [here](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/ExampleAssets.cs).
+
+You can create your own asset loaders by inheriting from `LoadableAsset<T>` and implementing the `LoadAsset` method.

nuget.config

@@ -6,6 +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" />
+        <add key="Local" value="packages/" />
     </packageSources>
 </configuration>

packages/packages.txt

@@ -1,3 +0,0 @@
-here to ensure git doesn't delete empty folders
-
-local packages are stored in this directory