offset buttons for android

AmongUs.props

@@ -2,12 +2,12 @@
     <ItemGroup>
         <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="2025.9.9" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Android" Version="2025.4.20" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
     </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.3.0</VersionPrefix>
+        <VersionPrefix>0.2.0</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

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

MiraAPI.Example/Buttons/MeetingButton.cs

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

MiraAPI.Example/Buttons/NeutralKillerButton.cs

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

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

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

MiraAPI.Example/Buttons/ThinkButton.cs

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

MiraAPI.Example/ExampleColors.cs

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

MiraAPI.Example/ExampleKeybinds.cs

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

MiraAPI.Example/ExampleLocalSetings.cs

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

MiraAPI.Example/ExamplePlugin.cs

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

MiraAPI.Example/Options/ExampleOptions2.cs

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

MiraAPI/Colors/CustomColor.cs

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

MiraAPI/Events/Vanilla/Gameplay/BeforeGameEndEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/BeforeRoundStartEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/IntroRoleRevealEvent.cs

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

MiraAPI/Events/Vanilla/Gameplay/RoundStartEvent.cs

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

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

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

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

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

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

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

MiraAPI/GameEnd/CustomGameOver.cs

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

MiraAPI/GameOptions/IModdedOption.cs

@@ -46,11 +46,6 @@ public interface IModdedOption
     /// </summary>
     Func<bool> Visible { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the option should be included with presets.
-    /// </summary>
-    bool IncludeInPreset { get; set; }
-
     /// <summary>
     /// Gets or sets the ConfigDefinition for the option, used for BepInEx configuration.
     /// </summary>
@@ -62,10 +57,9 @@ public interface IModdedOption
     /// <param name="toggleOpt">The ToggleOption template.</param>
     /// <param name="numberOpt">The NumberOption template.</param>
     /// <param name="stringOpt">The StringOption template.</param>
-    /// <param name="playerOpt">The PlayerOption template.</param>
     /// <param name="container">>The Transform container for the option.</param>
     /// <returns>>The created OptionBehaviour object.</returns>
-    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container);
+    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
 
     /// <summary>
     /// Gets the value as a float.
@@ -84,23 +78,4 @@ public interface IModdedOption
     /// </summary>
     /// <param name="data">>The byte array representing the network data.</param>
     void HandleNetData(byte[] data);
-
-    /// <summary>
-    /// Saves the option to a preset configuration file.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile representing the preset configuration.</param>
-    /// <param name="saveDefault">Indicates whether to save the default value instead of the current value.</param>
-    void SaveToPreset(ConfigFile presetConfig, bool saveDefault = false);
-
-    /// <summary>
-    /// Binds the option to a configuration file.
-    /// </summary>
-    /// <param name="config">The ConfigFile to bind the option to.</param>
-    void Bind(ConfigFile config);
-
-    /// <summary>
-    /// Loads the option from a preset configuration file, applying the values to the option's configuration.
-    /// </summary>
-    /// <param name="presetConfig">The ConfigFile representing the preset configuration.</param>
-    void LoadFromPreset(ConfigFile presetConfig);
 }

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using BepInEx.Configuration;
 using HarmonyLib;
 using MiraAPI.GameOptions.Attributes;
-using MiraAPI.GameOptions.OptionTypes;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
@@ -23,7 +21,6 @@ public static class ModdedOptionsManager
     private static readonly Dictionary<PropertyInfo, ModdedOptionAttribute> OptionAttributes = [];
     private static readonly Dictionary<Type, AbstractOptionGroup> TypeToGroup = [];
 
-    internal static readonly Dictionary<OptionBehaviour, ModdedPlayerOption> CreatedPlayerOptions = [];
     internal static readonly Dictionary<uint, IModdedOption> ModdedOptions = [];
     internal static readonly List<AbstractOptionGroup> Groups = [];
 
@@ -45,7 +42,7 @@ public static class ModdedOptionsManager
 
         Groups.Add(group);
         TypeToGroup.Add(type, group);
-        pluginInfo.InternalOptionGroups.Add(group);
+        pluginInfo.OptionGroups.Add(group);
 
         typeof(OptionGroupSingleton<>).MakeGenericType(type)
 #pragma warning disable S3011
@@ -124,7 +121,7 @@ public static class ModdedOptionsManager
         option.ConfigDefinition = new ConfigDefinition(groupName, propertyName);
 
         option.ParentMod = pluginInfo.MiraPlugin;
-        pluginInfo.InternalOptions.Add(option);
+        pluginInfo.Options.Add(option);
         ModdedOptions.Add(option.Id, option);
         group.Options.Add(option);
     }
@@ -145,7 +142,7 @@ public static class ModdedOptionsManager
         // we dont know how other plugins handle their configs
         // this way, all the options are saved at once, instead of one by one
         var oldConfigSetting = new Dictionary<MiraPluginInfo, bool>();
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
             oldConfigSetting.Add(plugin, plugin.PluginConfig.SaveOnConfigSet);
             plugin.PluginConfig.SaveOnConfigSet = false;
@@ -161,7 +158,7 @@ public static class ModdedOptionsManager
             option.HandleNetData(netData.Data);
         }
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
             plugin.PluginConfig.Save();
             plugin.PluginConfig.SaveOnConfigSet = oldConfigSetting[plugin];
@@ -178,10 +175,7 @@ public static class ModdedOptionsManager
     /// </summary>
     /// <param name="__originalMethod">The original setter method.</param>
     /// <param name="value">The new object value.</param>
-#pragma warning disable CA1707
-    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony naming convention")]
     public static void PropertySetterPatch(MethodBase __originalMethod, object value)
-#pragma warning restore CA1707
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod() == __originalMethod).Value;
         attribute.SetValue(value);
@@ -193,10 +187,7 @@ public static class ModdedOptionsManager
     /// <param name="__originalMethod">The original getter method.</param>
     /// <param name="__result">The result of the property getter.</param>
     /// <returns>False so the original getter gets skipped.</returns>
-#pragma warning disable CA1707
-    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony naming convention")]
     public static bool PropertyGetterPatch(MethodBase __originalMethod, ref object __result)
-#pragma warning restore CA1707
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod() == __originalMethod).Value;
         __result = attribute.GetValue();

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -48,7 +48,6 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="suffixType">The suffix type.</param>
     /// <param name="formatString">Optional format string for the option screen.</param>
     /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -57,8 +56,7 @@ public class ModdedNumberOption : ModdedOption<float>
         float increment,
         MiraNumberSuffixes suffixType,
         string? formatString = null,
-        bool zeroInfinity = false,
-        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
+        bool zeroInfinity = false) : base(title, defaultValue)
     {
         Min = min;
         Max = max;
@@ -93,7 +91,6 @@ public class ModdedNumberOption : ModdedOption<float>
         ToggleOption toggleOpt,
         NumberOption numberOpt,
         StringOption stringOpt,
-        PlayerOption playerOpt,
         Transform container)
     {
         var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

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

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

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

MiraAPI/Hud/ButtonUsesMode.cs

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

MiraAPI/Hud/CustomActionButton.cs

@@ -2,14 +2,8 @@
 using System.Globalization;
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
-using MiraAPI.Keybinds;
-using MiraAPI.LocalSettings;
 using MiraAPI.Patches;
-using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
-using Rewired;
-using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -37,29 +31,13 @@ public abstract class CustomActionButton
     /// </summary>
     public abstract float Cooldown { get; }
 
-    /// <summary>
-    /// Gets a value indicating whether the timer should stop decreasing when the player is venting.
-    /// Note that both cooldown decrease and effect timer decrease is disabled.
-    /// </summary>
-    public virtual bool PauseTimerInVent => false;
-
     /// <summary>
     /// Gets the sprite of the button. Use <see cref="LoadableResourceAsset"/> to load a sprite from a resource path. Use <see cref="LoadableBundleAsset{T}"/> to load a sprite from an asset bundle.
     /// </summary>
     public abstract LoadableAsset<Sprite> Sprite { get; }
 
     /// <summary>
-    /// Gets the format string for the cooldown timer.
-    /// </summary>
-    public virtual string CooldownTimerFormatString => "0";
-
-    /// <summary>
-    /// Gets a value indicating whether the button has an effect ability. By default true if <see cref="EffectDuration"/> is greater than 0.
-    /// </summary>
-    public virtual bool HasEffect => EffectDuration > 0;
-
-    /// <summary>
-    /// Gets the button's effect duration in seconds. If 0, the effect needs to be ended manually.
+    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
     /// </summary>
     public virtual float EffectDuration => 0;
 
@@ -68,16 +46,6 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual int MaxUses => 0;
 
-    /// <summary>
-    /// Gets the value indicating uses mode.
-    /// </summary>
-    public virtual ButtonUsesMode UsesMode => ButtonUsesMode.PerGame;
-
-    /// <summary>
-    /// Gets the keybind for this button. If null, no keybind will be added.
-    /// </summary>
-    public virtual BaseKeybind? Keybind => null;
-
     /// <summary>
     /// Gets the button's text outline color.
     /// </summary>
@@ -88,6 +56,11 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
 
+    /// <summary>
+    /// Gets a value indicating whether the button has an effect ability.
+    /// </summary>
+    public bool HasEffect => EffectDuration > 0;
+
     /// <summary>
     /// Gets a value indicating whether the button has limited uses.
     /// </summary>
@@ -118,16 +91,6 @@ public abstract class CustomActionButton
     /// </summary>
     public ActionButton? Button { get; set; }
 
-    /// <summary>
-    /// Gets the gameObject used for the keybind icon.
-    /// </summary>
-    public GameObject? KeybindIcon { get; private set; }
-
-    /// <summary>
-    /// Gets or sets the keybind icon text.
-    /// </summary>
-    private TextMeshPro? KeybindText { get; set; }
-
     /// <summary>
     /// The method used to create the button.
     /// </summary>
@@ -199,26 +162,6 @@ public abstract class CustomActionButton
                 }
             }
         }));
-
-        if (Keybind != null)
-        {
-            Keybind.OnActivate(() =>
-            {
-                if (Enabled(PlayerControl.LocalPlayer.Data.Role))
-                {
-                    ClickHandler();
-                }
-            });
-
-            KeybindIcon =
-                Helpers.CreateKeybindIcon(
-                    Button.gameObject,
-                    Keybind.CurrentKey,
-                    new Vector3(MaxUses <= 0 ? -0.4f : 0.4f, 0.45f, -9f)
-                );
-            KeybindText = KeybindIcon.transform.GetChild(0).GetComponent<TextMeshPro>();
-            Button.usesRemainingSprite.transform.localPosition = new(-0.341f, 0.45f, -0.1f);
-        }
     }
 
     /// <summary>
@@ -235,10 +178,7 @@ public abstract class CustomActionButton
 
         this.Location = location;
 
-        if (!moveButton)
-        {
-            return;
-        }
+        if (!moveButton) return;
 
         if (HudManagerPatches.BottomLeft == null || HudManagerPatches.BottomRight == null)
         {
@@ -405,13 +345,6 @@ public abstract class CustomActionButton
     {
     }
 
-    /// <summary>
-    /// Returns a value indicating whether the effect can be ended early by the player.
-    /// Always false by default.
-    /// </summary>
-    /// <returns>Can the effect be canceled.</returns>
-    public virtual bool IsEffectCancellable() => false;
-
     /// <summary>
     /// When the button is usable, this method is called to determine if the button can be clicked.
     /// By default, it takes into account the timer, effect, and uses.
@@ -420,7 +353,7 @@ public abstract class CustomActionButton
     /// <returns>A value that represents whether the button can be clicked or not.</returns>
     public virtual bool CanClick()
     {
-        return (EffectActive ? IsEffectCancellable() : Timer <= 0) && CanUse();
+        return Timer <= 0 && !EffectActive && CanUse();
     }
 
     /// <summary>
@@ -430,8 +363,7 @@ public abstract class CustomActionButton
     /// <returns>A value that represents whether the button should light up or not.</returns>
     public virtual bool CanUse()
     {
-        return PlayerControl.LocalPlayer.moveable &&
-               ((EffectActive && IsEffectCancellable()) || (!EffectActive && (!LimitedUses || UsesLeft > 0)));
+        return PlayerControl.LocalPlayer.moveable && (!LimitedUses || UsesLeft > 0);
     }
 
     /// <summary>
@@ -453,12 +385,6 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual void ClickHandler()
     {
-        if (EffectActive && IsEffectCancellable())
-        {
-            ResetCooldownAndOrEffect();
-            return;
-        }
-
         if (!CanClick())
         {
             return;
@@ -491,22 +417,14 @@ public abstract class CustomActionButton
     /// <param name="playerControl">The local PlayerControl.</param>
     public virtual void FixedUpdateHandler(PlayerControl playerControl)
     {
-        if (Keybind != null && KeybindText != null)
-        {
-            KeybindText.text = Keybind.CurrentKey.ToString();
-            KeybindIcon?.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
-                                   LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value &&
-                                   Keybind.CurrentKey != KeyboardKeyCode.None);
-        }
-
         if (Timer >= 0)
         {
-            if (!TimerPaused && (!PauseTimerInVent || !playerControl.inVent))
+            if (!TimerPaused)
             {
                 Timer -= Time.deltaTime;
             }
         }
-        else if (HasEffect && EffectActive && EffectDuration > 0)
+        else if (HasEffect && EffectActive)
         {
             EffectActive = false;
             Timer = Cooldown;
@@ -524,16 +442,16 @@ public abstract class CustomActionButton
                 Button!.SetDisabled();
             }
 
-            if (EffectActive && EffectDuration > 0)
+            if (EffectActive)
             {
                 Button.SetFillUp(Timer, EffectDuration);
 
-                Button.cooldownTimerText.text = Timer.ToString(CooldownTimerFormatString, NumberFormatInfo.InvariantInfo);
+                Button.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
                 Button.cooldownTimerText.gameObject.SetActive(true);
             }
             else
             {
-                Button.SetCooldownFormat(Timer, Cooldown, CooldownTimerFormatString);
+                Button.SetCoolDown(Timer, Cooldown);
             }
         }
 

MiraAPI/Hud/CustomButtonManager.cs

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

MiraAPI/Hud/MultiTargetButton.cs

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

MiraAPI/Keybinds/BaseKeybind.cs

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

MiraAPI/Keybinds/KeybindManager.cs

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

MiraAPI/Keybinds/KeybindUtils.cs

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

MiraAPI/Keybinds/MiraGlobalKeybinds.cs

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

MiraAPI/Keybinds/MiraKeybind.cs

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

MiraAPI/Keybinds/RegisterCustomKeybindsAttribute.cs

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

MiraAPI/Keybinds/VanillaKeybind.cs

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

MiraAPI/Keybinds/VanillaKeybindSingleton.cs

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

MiraAPI/LocalSettings/Attributes/LocalEnumSettingAttribute.cs

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

MiraAPI/LocalSettings/Attributes/LocalNumberSettingAttribute.cs

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

MiraAPI/LocalSettings/Attributes/LocalSettingAttribute.cs

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

MiraAPI/LocalSettings/Attributes/LocalSettingsButtonAttribute.cs

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

MiraAPI/LocalSettings/Attributes/LocalSliderSettingAttribute.cs

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

MiraAPI/LocalSettings/Attributes/LocalToggleSettingAttribute.cs

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

MiraAPI/LocalSettings/ILocalSetting.cs

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

MiraAPI/LocalSettings/LocalSettingsButton.cs

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

MiraAPI/LocalSettings/LocalSettingsManager.cs

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

MiraAPI/LocalSettings/LocalSettingsTab.cs

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

MiraAPI/LocalSettings/LocalSettingsTabAppearance.cs

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

MiraAPI/LocalSettings/LocalSettingsTabSingleton.cs

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

MiraAPI/LocalSettings/SettingTypes/LocalEnumSetting.cs

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

MiraAPI/LocalSettings/SettingTypes/LocalNumberSetting.cs

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

MiraAPI/LocalSettings/SettingTypes/LocalSettingBase.cs

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

MiraAPI/LocalSettings/SettingTypes/LocalSliderSetting.cs

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

MiraAPI/LocalSettings/SettingTypes/LocalToggleSetting.cs

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

MiraAPI/MiraApiSettings.cs

@@ -1,40 +0,0 @@
-using BepInEx.Configuration;
-using MiraAPI.LocalSettings;
-using MiraAPI.LocalSettings.Attributes;
-using MiraAPI.Utilities.Assets;
-
-namespace MiraAPI;
-
-/// <summary>
-/// Mira API Config File Handler
-/// </summary>
-public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
-{
-    /// <inheritdoc />
-    public override string TabName => "Mira API";
-
-    /// <inheritdoc />
-    public override LocalSettingTabAppearance TabAppearance => new()
-    {
-        TabButtonHoverColor = MiraApiPlugin.MiraColor,
-        TabIcon = MiraAssets.SettingsIcon,
-        HideIconOnHover = false,
-    };
-
-    /// <summary>
-    /// Gets 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("Displays", "Show Modifiers HUD on Left Side", false);
-
-    /// <summary>
-    /// Gets whether to show keybinds in the control mapper.
-    /// </summary>
-    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);
-}

MiraAPI/Modifiers/BaseModifier.cs

@@ -40,8 +40,8 @@ public abstract class BaseModifier : IOptionable
     /// Gets the parent mod of the modifier.
     /// </summary>
     public MiraPluginInfo ParentMod => Array.Find(
-        MiraPluginManager.Instance.RegisteredPlugins,
-        x => x.InternalModifiers.Exists(y => y.TypeId == TypeId)
+        MiraPluginManager.Instance.RegisteredPlugins(),
+        x => x.Modifiers.Exists(y => y.TypeId == TypeId)
         ) ?? throw new InvalidOperationException("Modifier is not registered.");
 
     /// <summary>
@@ -64,11 +64,6 @@ public abstract class BaseModifier : IOptionable
     /// </summary>
     public virtual bool ShowInFreeplay => false;
 
-    /// <summary>
-    /// Gets a value indicating the color that should be used for the modifier within freeplay.
-    /// </summary>
-    public virtual Color FreeplayFileColor => Color.gray;
-
     /// <summary>
     /// Gets a value indicating whether the modifier is unique. If true, the player can only have one instance of this modifier.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -4,10 +4,8 @@ using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.LocalSettings;
 using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Patches.Roles;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
 using UnityEngine;
@@ -128,18 +126,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
         {
-            var taskPanelOpen = HudManager.Instance.TaskPanel.open;
-            var roleTabOpen = HudManagerPatches.RoleTab != null && HudManagerPatches.RoleTab.open;
-            var leftSideHud = LocalSettingsTabSingleton<MiraApiSettings>.Instance.ModifiersHudLeftSide.Value;
-
-            if (leftSideHud && (taskPanelOpen || roleTabOpen))
-            {
-                ModifierDisplay!.gameObject.SetActive(false);
-            }
-            else
-            {
-                ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
-            }
+            ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
         }
     }
 

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -3,7 +3,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.LocalSettings;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
@@ -95,16 +94,6 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 
         IsOpen = false;
         _children.gameObject.SetActive(false);
-
-        if (LocalSettingsTabSingleton<MiraApiSettings>.Instance.ModifiersHudLeftSide.Value)
-        {
-            var aspect = GetComponent<AspectPosition>();
-            _toggleButton.transform.localPosition = new Vector3(-1f, 2.7f, 0f);
-            _children.transform.localPosition = new Vector3(-0.2f, -0.05f, 0f);
-            aspect.Alignment = AspectPosition.EdgeAlignments.LeftTop;
-            aspect.DistanceFromEdge = new Vector3(1.8f, 2.55f, -20f);
-            aspect.AdjustPosition();
-        }
     }
 
     /// <summary>
@@ -120,16 +109,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
     /// </summary>
     public void ToggleTab()
     {
-        SetOpened(!IsOpen);
-    }
-
-    /// <summary>
-    /// Use this to set the visibility of the modifiers tab.
-    /// </summary>
-    /// <param name="val">Whether it should be visible or not.</param>
-    public void SetOpened(bool val)
-    {
-        IsOpen = val;
+        IsOpen = !IsOpen;
         _children.gameObject.SetActive(IsOpen);
         RefreshModifiers();
     }
@@ -138,6 +118,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
     {
         _modifiers.Remove(component.Modifier!);
         component.gameObject.DestroyImmediate();
+
         RefreshModifiers();
     }
 
@@ -213,7 +194,13 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 
         _toggleBtnText.text = $"Modifiers ({filteredModifiers.Count})";
 
-        _toggleButton.gameObject.SetActive(filteredModifiers.Count != 0);
+        if (filteredModifiers.Count == 0)
+        {
+            _toggleButton.gameObject.SetActive(false);
+            return;
+        }
+
+        _toggleButton.gameObject.SetActive(true);
 
         foreach (var mod in modifiersToAdd)
         {

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -30,7 +30,7 @@ public static class ModifierExtensions
         _ = ModifierManager.GetModifierType(typeId) ?? throw new InvalidOperationException(
             $"Modifier with ID {typeId} is not registered.");
 
-        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args), true);
+        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args));
     }
 
     /// <summary>

MiraAPI/Modifiers/ModifierManager.cs

@@ -5,7 +5,6 @@ using System.Runtime.Serialization;
 using MiraAPI.Modifiers.Types;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
-using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using Random = System.Random;
@@ -17,18 +16,6 @@ namespace MiraAPI.Modifiers;
 /// </summary>
 public static class ModifierManager
 {
-    /// <summary>
-    /// Gets or sets a value indicating whether modifiers should be assigned to players.
-    /// </summary>
-    public static bool MiraAssignsModifiers { get; set; } = true;
-
-    /// <summary>
-    /// Gets the list of all registered modifiers.
-    /// </summary>
-    public static IReadOnlyList<BaseModifier> Modifiers { get; internal set; } = [];
-
-    internal static List<BaseModifier> InternalModifiers { get; } = [];
-
     private static readonly Dictionary<uint, Type> IdToTypeModifierMap = [];
     private static readonly Dictionary<Type, uint> TypeToIdModifierMap = [];
     private static readonly Dictionary<int, List<uint>> PrioritiesToIdsMap = [];
@@ -87,8 +74,7 @@ public static class ModifierManager
             modifier = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType);
         }
 
-        info.InternalModifiers.Add(modifier);
-        InternalModifiers.Add(modifier);
+        info.Modifiers.Add(modifier);
 
         if (modifier is not GameModifier gameModifier)
         {
@@ -112,11 +98,7 @@ public static class ModifierManager
         return true;
     }
 
-    /// <summary>
-    /// Assigns modifiers to players. ONLY CALL THIS METHOD IF YOU KNOW WHAT YOU ARE DOING.
-    /// </summary>
-    /// <param name="plrs">The players to assign modifiers to.</param>
-    public static void AssignModifiers(List<PlayerControl> plrs)
+    internal static void AssignModifiers(List<PlayerControl> plrs)
     {
         var rand = new Random();
 
@@ -126,7 +108,6 @@ public static class ModifierManager
             .Select(x => Activator.CreateInstance(x.Value) as GameModifier)
             .OfType<GameModifier>()
             .Where(x => x.GetAmountPerGame() > 0 && x.GetAssignmentChance() > 0)
-            .Shuffle()
             .OrderByDescending(x => x.Priority())
             .ToArray();
 

MiraAPI/Networking/CustomMurderRpc.cs

@@ -222,7 +222,7 @@ public static class CustomMurderRpc
 
         if (createDeadBody)
         {
-            deadBody = Object.Instantiate(GameManager.Instance.deadBodyPrefab[0]);
+            deadBody = Object.Instantiate(GameManager.Instance.DeadBodyPrefab);
             deadBody.enabled = false;
             deadBody.ParentId = target.PlayerId;
             deadBody.bodyRenderers.ToList().ForEach(target.SetPlayerMaterialColors);

MiraAPI/Patches/ChatControllerPatch.cs

@@ -1,35 +0,0 @@
-using HarmonyLib;
-using UnityEngine;
-
-namespace MiraAPI.Patches;
-
-#pragma warning disable SA1629
-/// <summary>
-/// Allows players to paste text into chat.
-/// Source: https://github.com/CallOfCreator/NewMod/blob/main/NewMod/Patches/ClipboardPatch.cs
-/// </summary>
-#pragma warning restore SA1629
-[HarmonyPatch(typeof(ChatController), nameof(ChatController.Update))]
-public static class ChatControllerPatch
-{
-    public static void Prefix(ChatController __instance)
-    {
-        if (!HudManager.Instance.Chat.IsOpenOrOpening) return;
-
-        var ctrlPressed = Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl);
-
-        if (!ctrlPressed || !Input.GetKeyDown(KeyCode.V)) return;
-
-        var clipboard = GUIUtility.systemCopyBuffer;
-
-        if (string.IsNullOrWhiteSpace(clipboard)) return;
-        clipboard = clipboard.Replace("<", string.Empty)
-            .Replace(">", string.Empty)
-            .Replace("\r", string.Empty);
-
-        if (!Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift))
-            clipboard = clipboard.Replace("\n", string.Empty);
-
-        __instance.freeChatField.textArea.SetText(__instance.freeChatField.textArea.text + clipboard);
-    }
-}

MiraAPI/Patches/Events/CanUsePatches.cs

@@ -12,16 +12,14 @@ public static class CanUsePatches
     public static IEnumerable<MethodBase> TargetMethods()
     {
         yield return AccessTools.Method(typeof(Console), nameof(Console.CanUse));
-        yield return AccessTools.Method(typeof(DeconControl), nameof(DeconControl.CanUse));
-        yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.CanUse));
-        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.CanUse));
         yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.CanUse));
-        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.CanUse));
-        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.CanUse));
-        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.CanUse));
         yield return AccessTools.Method(typeof(SystemConsole), nameof(SystemConsole.CanUse));
+        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.CanUse));
+        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.CanUse));
+        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.CanUse));
+        yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.CanUse));
+        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.CanUse));
         yield return AccessTools.Method(typeof(ZiplineConsole), nameof(ZiplineConsole.CanUse));
-        // vent is not necessary as it has its own patch
     }
 
     [HarmonyPriority(Priority.Last)]

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -5,53 +5,29 @@ using MiraAPI.GameEnd;
 
 namespace MiraAPI.Patches.Events;
 
+[HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
 internal static class EndGamePatches
 {
-    [HarmonyPatch(typeof(GameManager), nameof(GameManager.Awake))]
-    public static class GameManagerAwakePatch
+    public static bool Prefix(EndGameManager __instance)
     {
-        public static void Postfix(GameManager __instance)
+        if (CustomGameOver.Instance is not { } gameOver)
         {
-            __instance.enabled = true;
+            return true;
         }
+
+        var result = gameOver.BeforeEndGameSetup(__instance);
+        return result;
     }
 
-    [HarmonyPatch(typeof(GameManager), nameof(GameManager.RpcEndGame))]
-    public static class GameManagerRpcEndGamePatch
+    public static void Postfix(EndGameManager __instance)
     {
-        public static bool Prefix(GameOverReason endReason)
+        if (CustomGameOver.Instance is { } gameOver)
         {
-            var @event = new BeforeGameEndEvent(endReason);
-            MiraEventManager.InvokeEvent(@event);
-
-            return !@event.IsCancelled;
-        }
-    }
-
-    [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
-    public static class EndGameManagerPatches
-    {
-        public static bool Prefix(EndGameManager __instance)
-        {
-            if (CustomGameOver.Instance is not { } gameOver)
-            {
-                return true;
-            }
-
-            var result = gameOver.BeforeEndGameSetup(__instance);
-            return result;
+            gameOver.AfterEndGameSetup(__instance);
+            CustomGameOver.Instance = null;
         }
 
-        public static void Postfix(EndGameManager __instance)
-        {
-            if (CustomGameOver.Instance is { } gameOver)
-            {
-                gameOver.AfterEndGameSetup(__instance);
-                CustomGameOver.Instance = null;
-            }
-
-            var @event = new GameEndEvent(__instance);
-            MiraEventManager.InvokeEvent(@event);
-        }
+        var @event = new GameEndEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
     }
 }

MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs

@@ -1,17 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch(typeof(TutorialManager._RunTutorial_d__3), nameof(TutorialManager._RunTutorial_d__3.MoveNext))]
-public static class FreeplayRoundStartPatch
-{
-    public static void Postfix(TutorialManager._RunTutorial_d__3 __instance, ref bool __result)
-    {
-        if (!__result)
-        {
-            MiraEventManager.InvokeEvent(new RoundStartEvent(true));
-        }
-    }
-}

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -14,17 +14,13 @@ public static class KillAnimationPatches
     /// <summary>
     /// Used to trigger the <see cref="AfterMurderEvent"/>.
     /// </summary>
+    /// <param name="source">The killer.</param>
+    /// <param name="target">The target.</param>
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(KillAnimation._CoPerformKill_d__2), nameof(KillAnimation._CoPerformKill_d__2.MoveNext))]
-    public static void KillAnimPostfix(KillAnimation._CoPerformKill_d__2 __instance)
+    [HarmonyPatch(typeof(KillAnimation), nameof(KillAnimation.CoPerformKill))]
+    public static void KillAnimPostfix(PlayerControl source, PlayerControl target)
     {
-        // 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));
+        var afterMurderEvent = new AfterMurderEvent(source, target, Helpers.GetBodyById(target.PlayerId));
         MiraEventManager.InvokeEvent(afterMurderEvent);
     }
 }

MiraAPI/Patches/Events/ReportBodyEventPatch.cs

@@ -1,52 +1,21 @@
-using AmongUs.InnerNet.GameDataMessages;
-using HarmonyLib;
-using InnerNet;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Utilities;
-using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
 [HarmonyPatch]
 public static class ReportBodyEventPatch
 {
-    private static bool ReportBodyEventHook(PlayerControl source, NetworkedPlayerInfo? target)
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))]
+    public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
     {
         var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null;
 
-        var @event = new ReportBodyEvent(source, target, body);
+        var @event = new ReportBodyEvent(__instance, target, body);
         MiraEventManager.InvokeEvent(@event);
         return !@event.IsCancelled;
     }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.ReportDeadBody))]
-    public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
-    {
-        return ReportBodyEventHook(__instance, target);
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.LateBroadcastReliableMessage))]
-    public static bool LateBroadcastReliableMessagePrefix(IGameDataMessage rpcMessage)
-    {
-        var reportBodyMessage = rpcMessage.TryCast<RpcReportDeadBodyMessage>();
-
-        if (reportBodyMessage == null)
-        {
-            return true;
-        }
-
-        var source = AmongUsClient.Instance.FindObjectByNetId<PlayerControl>(reportBodyMessage.rpcObjectNetId);
-        if (source == null)
-        {
-            Logger<MiraApiPlugin>.Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
-            return true;
-        }
-
-        var target = GameData.Instance.GetPlayerById(reportBodyMessage.targetPlayerId);
-
-        return ReportBodyEventHook(source, target);
-    }
 }

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -9,12 +9,7 @@ internal static class SpawnInMinigamePatch
 {
     public static void Postfix()
     {
-        var @event = new BeforeRoundStartEvent(false);
+        var @event = new RoundStartEvent(false);
         MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
-
-        var @event2 = new RoundStartEvent(false);
-        MiraEventManager.InvokeEvent(@event2);
     }
 }

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -25,12 +25,7 @@ internal static class SubmergedSpawnGamePatch
 
     public static void Postfix()
     {
-        var @event = new BeforeRoundStartEvent(false);
+        var @event = new RoundStartEvent(false);
         MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
-
-        var @event2 = new RoundStartEvent(false);
-        MiraEventManager.InvokeEvent(@event2);
     }
 }

MiraAPI/Patches/Freeplay/TaskAddButtonPatches.cs

@@ -1,5 +1,7 @@
 using HarmonyLib;
 using MiraAPI.Modifiers;
+using MiraAPI.Roles;
+using UnityEngine;
 
 namespace MiraAPI.Patches.Freeplay;
 
@@ -20,4 +22,15 @@ internal static class TaskAddButtonPatches
 
         return true;
     }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(TaskAddButton.Role), MethodType.Setter)]
+    public static void RoleGetterPatch(TaskAddButton __instance)
+    {
+        if (__instance.role is ICustomRole { Team: ModdedRoleTeams.Custom } customRole)
+        {
+            __instance.FileImage.color = customRole.IntroConfiguration?.IntroTeamColor ?? Color.gray;
+        }
+        __instance.RolloverHandler.OutColor = __instance.FileImage.color;
+    }
 }

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -1,20 +1,15 @@
-using System.Collections.Generic;
+using System;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using AmongUs.GameOptions;
 using HarmonyLib;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using MiraAPI.LocalSettings;
 using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities.Extensions;
+using TMPro;
 using UnityEngine;
-using UnityEngine.Events;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
@@ -24,7 +19,6 @@ namespace MiraAPI.Patches.Freeplay;
 internal static class TaskAdderPatches
 {
     private static Scroller _scroller = null!;
-    private static Dictionary<string, TaskFolder> folders = new();
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
@@ -38,11 +32,6 @@ internal static class TaskAdderPatches
         _scroller.allowY = true;
         _scroller.Inner = inner.transform;
 
-        var scrollerHelper = __instance.TaskParent.gameObject.AddComponent<ManualScrollHelper>();
-        scrollerHelper.scroller = _scroller;
-        scrollerHelper.verticalAxis = RewiredConstsEnum.Action.TaskRVertical;
-        scrollerHelper.scrollSpeed = 10f;
-
         GameObject hitbox = new("Hitbox")
         {
             layer = 5,
@@ -65,168 +54,46 @@ internal static class TaskAdderPatches
         __instance.RoleButton.GetComponent<PassiveButton>().ClickMask = collider;
         __instance.RootFolderPrefab.GetComponent<PassiveButton>().ClickMask = collider;
         __instance.RootFolderPrefab.gameObject.SetActive(false);
+
         __instance.TaskParent = inner.transform;
-        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("Modifiers", __instance.Root, 0, Color.blue);
+        var rolesFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+        rolesFolder.gameObject.SetActive(false);
+        rolesFolder.FolderName = "Roles";
+        rolesFolder.name = "RolesFolder";
 
-        folders.Clear();
-        folders.Add(crewmateFolder.FolderName, crewmateFolder);
-        folders.Add(impostorFolder.FolderName, impostorFolder);
-        //folders.Add("Neutrals", neutralFolder);
-        folders.Add("Modifiers", modifiersFolder);
+        var modifiersFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+        modifiersFolder.gameObject.SetActive(false);
+        modifiersFolder.FolderName = "Modifiers";
+        modifiersFolder.name = "ModifiersFolder";
 
-        int folderIdx = 2;
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
+        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
-            var pluginFolders = new Dictionary<string, TaskFolder>();
-
-            foreach (var role in plugin.InternalRoles
-                         .Where(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true })
-                         .Select(x => x.Value))
+            if (plugin.CustomRoles.Any(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true }))
             {
-                var customRole = role as ICustomRole;
-                var folderName = customRole!.Configuration.FreeplayFolder;
-                if (!folders.TryGetValue(folderName, out var teamFolder))
-                {
-                    teamFolder = __instance.CreateFolder(folderName, __instance.Root, folderIdx++, customRole.IntroConfiguration?.IntroTeamColor ?? Color.gray);
-                    folders.Add(folderName, teamFolder);
-                }
-
-                if (!pluginFolders.TryGetValue(folderName, out var pluginFolder))
-                {
-                    pluginFolder = __instance.CreateFolder(plugin.PluginInfo.Metadata.Name, teamFolder);
-                    pluginFolder.name = $"Roles:{folderName}:{plugin.PluginId}";
-                    pluginFolders.Add(folderName, teamFolder);
-                }
+                var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+                newFolder.name = plugin.PluginId+":Roles";
+                newFolder.FolderName = plugin.PluginInfo.Metadata.Name;
+                newFolder.gameObject.SetActive(false);
+                rolesFolder.SubFolders.Add(newFolder);
             }
 
-            if (plugin.InternalModifiers.Exists(x => x.ShowInFreeplay))
+            if (plugin.Modifiers.Exists(x => x.ShowInFreeplay))
             {
-                __instance.CreateFolder(plugin.PluginInfo.Metadata.Name, modifiersFolder)
-                    .gameObject.name = plugin.PluginId;
+                var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+                newFolder.name = plugin.PluginId+":Modifiers";
+                newFolder.FolderName = plugin.PluginInfo.Metadata.Name;
+                newFolder.gameObject.SetActive(false);
+                modifiersFolder.SubFolders.Add(newFolder);
             }
         }
 
-        // Modifier folder at the end
-        __instance.Root.SubFolders.Insert(folderIdx, modifiersFolder);
+        __instance.Root.SubFolders.Add(rolesFolder);
+        __instance.Root.SubFolders.Add(modifiersFolder);
 
         __instance.GoToRoot();
     }
 
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(TaskAdderGame.PopulateRoot))]
-    private static bool PopulateRootPrefix(TaskAdderGame __instance, TaskAdderGame.FolderType folderType, TaskFolder rootFolder, Il2CppSystem.Collections.Generic.Dictionary<string, TaskFolder> folders, Il2CppReferenceArray<NormalPlayerTask> taskList)
-    {
-        if (folderType != TaskAdderGame.FolderType.Tasks)
-        {
-            if (folderType != TaskAdderGame.FolderType.Roles)
-            {
-                return false;
-            }
-
-            TaskFolder crewFolder = folders["Crewmates"] =
-                Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
-            crewFolder.gameObject.SetActive(false);
-            crewFolder.SetFolderColor(TaskFolder.FolderColor.Blue);
-            TaskFolder impFolder = folders["Impostors"] =
-                Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
-            impFolder.gameObject.SetActive(false);
-            impFolder.SetFolderColor(TaskFolder.FolderColor.Red);
-            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();
-            Il2CppSystem.Collections.Generic.List<RoleBehaviour> crewRoles = new();
-            foreach (var role in RoleManager.Instance.AllRoles)
-            {
-                if (role.Role != RoleTypes.ImpostorGhost && role.Role != RoleTypes.CrewmateGhost && !role.IsCustomRole())
-                {
-                    if (role.TeamType == RoleTeamTypes.Crewmate)
-                    {
-                        crewRoles.Add(role);
-                    }
-                    else
-                    {
-                        impRoles.Add(role);
-                    }
-                }
-            }
-
-            crewFolder.RoleChildren = crewRoles;
-            impFolder.RoleChildren = impRoles;
-            return false;
-        }
-
-        if (taskList == null)
-        {
-            return false;
-        }
-
-        foreach (NormalPlayerTask normalPlayerTask in taskList)
-        {
-            SystemTypes systemTypes = normalPlayerTask.StartAt;
-            if (normalPlayerTask is DivertPowerTask task)
-            {
-                systemTypes = task.TargetSystem;
-            }
-
-            if (systemTypes == SystemTypes.LowerEngine)
-            {
-                systemTypes = SystemTypes.UpperEngine;
-            }
-
-            if (!folders.TryGetValue(systemTypes.ToString(), out var taskFolder3))
-            {
-                taskFolder3 = folders[systemTypes.ToString()] = Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
-                taskFolder3.SetFolderColor(TaskFolder.FolderColor.Tan);
-                taskFolder3.gameObject.SetActive(false);
-                if (systemTypes == SystemTypes.UpperEngine)
-                {
-                    taskFolder3.FolderName = TranslationController.Instance.GetString(StringNames.Engines);
-                }
-                else
-                {
-                    taskFolder3.FolderName = TranslationController.Instance.GetString(systemTypes);
-                }
-
-                rootFolder.SubFolders.Add(taskFolder3);
-            }
-
-            taskFolder3.TaskChildren.Add(normalPlayerTask);
-        }
-
-        return false;
-    }
-
-
-    private static TaskFolder CreateFolder(this TaskAdderGame instance, string name, TaskFolder parent, int idx = -1, Color? color = null)
-    {
-        var folder = Object.Instantiate(instance.RootFolderPrefab, instance.transform);
-        folder.gameObject.SetActive(false);
-        folder.FolderName = name;
-        folder.SetCustomColor(color ?? new Color(0.937f, 0.811f, 0.592f));
-        folder.name = name + "Folder";
-        if (idx == -1)
-            parent.SubFolders.Add(folder);
-        else if (idx > 0)
-            parent.SubFolders.Insert(idx, folder);
-        return folder;
-    }
-
-    private static void SetCustomColor(this TaskFolder folder, Color color)
-    {
-        folder.currentFolderColor = color;
-        folder.folderSpriteRenderer.color = color;
-        folder.buttonRolloverHandler.OutColor = color;
-        folder.buttonRolloverHandler.UnselectedColor = color;
-    }
-
     private static void AddFileAsChildCustom(
         this TaskAdderGame instance,
         TaskAddButton item,
@@ -249,46 +116,40 @@ internal static class TaskAdderPatches
         instance.ActiveItems.Add(item.transform);
     }
 
-    private static bool IsChildOf(this TaskFolder child, TaskFolder parent) => parent.SubFolders
-        .ToArray()
-        .Any(x => x.FolderName == child.FolderName);
-
     // yes it might be crazy patching the entire method, but i tried so many other methods and only this works :cry:
-    // true -chip
     [HarmonyPrefix]
     [HarmonyPatch(nameof(TaskAdderGame.ShowFolder))]
     public static bool ShowPatch(TaskAdderGame __instance, TaskFolder taskFolder)
     {
-        StringBuilder stringBuilder = new StringBuilder(64);
+        var stringBuilder = new Il2CppSystem.Text.StringBuilder(64);
         __instance.Hierarchy.Add(taskFolder);
-        foreach (var t in __instance.Hierarchy)
+        for (var i = 0; i < __instance.Hierarchy.Count; i++)
         {
-            stringBuilder.Append(t.FolderName);
-            stringBuilder.Append('\\');
+            stringBuilder.Append(__instance.Hierarchy.ToArray()[i].FolderName);
+            stringBuilder.Append("\\");
         }
+
         __instance.PathText.text = stringBuilder.ToString();
-        var prettyEnabled = LocalSettingsTabSingleton<MiraApiSettings>.Instance.PrettyTaskAdder.Value;
-        if (prettyEnabled)
+        for (var j = 0; j < __instance.ActiveItems.Count; j++)
         {
-            __instance.PathText.fontSizeMin = 3;
-            __instance.PathText.fontSizeMax = 3;
-            __instance.transform.FindChild("TitleText_TMP")?.gameObject.DestroyImmediate();
+            Object.Destroy(__instance.ActiveItems.ToArray()[j].gameObject);
         }
 
-        __instance.ActiveItems.ToArray().Do(x => x.gameObject.Destroy());
         __instance.ActiveItems.Clear();
-
-        float num = 0f;
-        float num2 = 0f;
-        float num3 = 0f;
-        foreach (var t in taskFolder.SubFolders)
+        var num = 0f;
+        var num2 = 0f;
+        var num3 = 0f;
+        for (var k = 0; k < taskFolder.SubFolders.Count; k++)
         {
-            TaskFolder taskFolder2 = Object.Instantiate(t, __instance.TaskParent);
+            var taskFolder2 = Object.Instantiate(taskFolder.SubFolders.ToArray()[k], __instance.TaskParent);
+            var folderTransform = taskFolder2.transform;
+
             taskFolder2.gameObject.SetActive(true);
             taskFolder2.Parent = __instance;
-            taskFolder2.transform.localPosition = new Vector3(num, num2, 0f);
-            taskFolder2.transform.localScale = Vector3.one;
-            num3 = Mathf.Max(num3, taskFolder2.Text.bounds.size.y + 1.1f);
+
+            folderTransform.localPosition = new Vector3(num, num2, 0f);
+            folderTransform.localScale = Vector3.one;
+            num3 = Mathf.Max(num3, taskFolder2.Text.bounds.size.y + 1.3f);
             num += __instance.folderWidth;
             if (num > __instance.lineWidth)
             {
@@ -297,216 +158,249 @@ internal static class TaskAdderPatches
                 num3 = 0f;
             }
 
-            __instance.ActiveItems.Add(taskFolder2.transform);
-            if (taskFolder2 != null && taskFolder2.Button != null)
+            __instance.ActiveItems.Add(folderTransform);
+            if (!taskFolder2 || !taskFolder2.Button)
             {
-                ControllerManager.Instance.AddSelectableUiElement(taskFolder2.Button);
+                continue;
+            }
+
+            ControllerManager.Instance.AddSelectableUiElement(taskFolder2.Button);
+            if (!string.IsNullOrEmpty(__instance.restorePreviousSelectionByFolderName) &&
+                taskFolder2.FolderName.Equals(__instance.restorePreviousSelectionByFolderName, StringComparison.Ordinal))
+            {
+                __instance.restorePreviousSelectionFound = taskFolder2.Button;
             }
         }
 
-        var list = taskFolder.TaskChildren
-            .ToArray()
-            .OrderBy(x => x.TaskType)
-            .ToArray();
-        foreach (var task in list)
+        var flag = false;
+        var list = taskFolder.Children.ToArray().OrderBy(t => t.TaskType).ToList();
+
+        for (var l = 0; l < list.Count; l++)
         {
-            TaskAddButton taskAddButton = Object.Instantiate(__instance.TaskPrefab);
-            taskAddButton.MyTask = task;
-            switch (task.TaskType)
+            var taskAddButton = Object.Instantiate(__instance.TaskPrefab);
+            taskAddButton.MyTask = list.ToArray()[l];
+            switch (taskAddButton.MyTask.TaskType)
             {
                 case TaskTypes.DivertPower:
-                {
-                    var targetSystem = task.Cast<DivertPowerTask>().TargetSystem;
-                    taskAddButton.Text.text = TranslationController.Instance.GetString(
-                        StringNames.DivertPowerTo,
-                        TranslationController.Instance.GetString(targetSystem));
-                    break;
-                }
+                    {
+                        var targetSystem = taskAddButton.MyTask.Cast<DivertPowerTask>().TargetSystem;
+                        taskAddButton.Text.text = TranslationController.Instance.GetString(
+                            StringNames.DivertPowerTo,
+                            TranslationController.Instance.GetString(targetSystem));
+                        break;
+                    }
                 case TaskTypes.FixWeatherNode:
-                {
-                    var nodeId = task.Cast<WeatherNodeTask>().NodeId;
-                    taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(
-                            StringNames.FixWeatherNode) + " " +
-                        TranslationController.Instance.GetString(
-                            WeatherSwitchGame.ControlNames[nodeId]);
-                    break;
-                }
+                    {
+                        var nodeId = taskAddButton.MyTask.Cast<WeatherNodeTask>().NodeId;
+                        taskAddButton.Text.text =
+                            TranslationController.Instance.GetString(
+                                StringNames.FixWeatherNode) + " " +
+                            TranslationController.Instance.GetString(
+                                WeatherSwitchGame.ControlNames[nodeId]);
+                        break;
+                    }
                 default:
                     taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(task.TaskType);
+                        TranslationController.Instance.GetString(taskAddButton.MyTask.TaskType);
                     break;
             }
 
             __instance.AddFileAsChildCustom(taskAddButton, ref num, ref num2, ref num3);
-            if (taskAddButton != null && taskAddButton.Button != null)
+            if (taskAddButton.Button == null)
             {
-                ControllerManager.Instance.AddSelectableUiElement(taskAddButton.Button, false);
-            }
-        }
-
-        var roleChildren = taskFolder.RoleChildren
-            .ToArray()
-            .Where(x => x is not ICustomRole)
-            .ToArray();
-        foreach (var role in roleChildren)
-        {
-            TaskAddButton roleAddButton = Object.Instantiate(__instance.RoleButton);
-            roleAddButton.SafePositionWorld = __instance.SafePositionWorld;
-            roleAddButton.Text.text = prettyEnabled ? role.GetRoleName() : "Be_" + role.GetRoleName() + ".exe";
-            roleAddButton.Role = role;
-            if (prettyEnabled)
-            {
-                roleAddButton.Text.fontSizeMin = 1;
-                roleAddButton.FileImage.sprite = role.IsImpostor
-                    ? MiraAssets.ImpostorFile.LoadAsset()
-                    : MiraAssets.CrewmateFile.LoadAsset();
+                continue;
             }
 
-            __instance.AddFileAsChildCustom(roleAddButton, ref num, ref num2, ref num3);
-            if (roleAddButton != null && roleAddButton.Button != null)
+            ControllerManager.Instance.AddSelectableUiElement(taskAddButton.Button);
+            if (__instance.Hierarchy.Count == 1 || flag)
             {
-                ControllerManager.Instance.AddSelectableUiElement(roleAddButton.Button);
+                continue;
             }
+
+            var component =
+                ControllerManager.Instance.CurrentUiState.CurrentSelection.GetComponent<TaskFolder>();
+            if (component != null)
+            {
+                __instance.restorePreviousSelectionByFolderName = component.FolderName;
+            }
+
+            ControllerManager.Instance.SetDefaultSelection(taskAddButton.Button);
+            flag = true;
         }
 
-        string[] split = [];
-        try
+        if (taskFolder.FolderName == "Roles")
         {
-            split = taskFolder.name.Replace("(Clone)", string.Empty).Split(':');
-        }
-        catch
-        {
-            // I hate you
-        }
-        if (split is ["Roles", _, _] && folders.Any(x => taskFolder.IsChildOf(x.Value)))
-        {
-            var plugin = MiraPluginManager.GetPluginByGuid(split[2]);
-            if (plugin != null)
+            for (var m = 0; m < RoleManager.Instance.AllRoles.Length; m++)
             {
-                foreach (var role in plugin.InternalRoles)
+                var roleBehaviour = RoleManager.Instance.AllRoles[m];
+                if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
+                    CustomRoleManager.CustomRoles.ContainsKey((ushort)roleBehaviour.Role))
                 {
-                    var roleBehaviour = role.Value;
-                    if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
-                        roleBehaviour is ICustomRole { Configuration.ShowInFreeplay: false })
-                    {
-                        continue;
-                    }
-                    var crewLocale = TranslationController.Instance.GetString(StringNames.Crewmate);
-                    var impLocale = TranslationController.Instance.GetString(StringNames.Impostor);
+                    continue;
+                }
 
-                    var teamFolder = roleBehaviour.IsImpostor ? impLocale : crewLocale;
-                    if (roleBehaviour is ICustomRole cs)
-                    {
-                        teamFolder = cs.Configuration.FreeplayFolder;
-                    }
-                    if (split[1] != teamFolder)
-                    {
-                        continue;
-                    }
+                var taskAddButton2 = Object.Instantiate(__instance.RoleButton);
+                taskAddButton2.SafePositionWorld = __instance.SafePositionWorld;
+                taskAddButton2.Text.text = "Be_" + roleBehaviour.NiceName + ".exe";
+                __instance.AddFileAsChildCustom(taskAddButton2, ref num, ref num2, ref num3);
+                taskAddButton2.Role = roleBehaviour;
 
-                    var roleAddButton = Object.Instantiate(__instance.RoleButton);
-                    roleAddButton.MyTask = null;
-                    roleAddButton.SafePositionWorld = __instance.SafePositionWorld;
-                    roleAddButton.Text.text = prettyEnabled ? roleBehaviour.GetRoleName() : "Be_" + roleBehaviour.GetRoleName() + ".exe";
-                    roleAddButton.Text.EnableMasking();
-                    roleAddButton.role = roleBehaviour;
-                    if (prettyEnabled)
-                    {
-                        roleAddButton.Text.fontSizeMin = 1;
-                        roleAddButton.FileImage.sprite = roleBehaviour.IsImpostor
-                            ? MiraAssets.ImpostorFile.LoadAsset()
-                            : MiraAssets.CrewmateFile.LoadAsset();
-                    }
-                    if (roleBehaviour is ICustomRole custom)
-                    {
-                        if (prettyEnabled && custom.Team == ModdedRoleTeams.Custom) roleAddButton.FileImage.sprite = MiraAssets.CustomTeamFile.LoadAsset();
-                        var customColor = custom.IntroConfiguration?.IntroTeamColor ?? Color.gray;
-                        if (custom.Team is ModdedRoleTeams.Crewmate)
-                        {
-                            customColor = Palette.CrewmateBlue;
-                        }
-                        else if (custom.Team is ModdedRoleTeams.Impostor)
-                        {
-                            customColor = Palette.ImpostorRed;
-                        }
-                        roleAddButton.FileImage.color = customColor;
-                        roleAddButton.RolloverHandler.OutColor = customColor;
-                    }
+                if (taskAddButton2.Button == null)
+                {
+                    continue;
+                }
 
-                    __instance.AddFileAsChildCustom(roleAddButton, ref num, ref num2, ref num3);
-                    ControllerManager.Instance.AddSelectableUiElement(roleAddButton.Button);
+                ControllerManager.Instance.AddSelectableUiElement(taskAddButton2.Button);
+                switch (m)
+                {
+                    case 0 when __instance.restorePreviousSelectionFound != null:
+                        ControllerManager.Instance.SetDefaultSelection(__instance.restorePreviousSelectionFound);
+                        __instance.restorePreviousSelectionByFolderName = string.Empty;
+                        __instance.restorePreviousSelectionFound = null;
+                        break;
+                    case 0:
+                        ControllerManager.Instance.SetDefaultSelection(taskAddButton2.Button);
+                        break;
                 }
             }
         }
 
-        if (folders.TryGetValue("Modifiers", out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
+        if (taskFolder)
         {
-            var plugin = MiraPluginManager.GetPluginByGuid(taskFolder.name.Replace("(Clone)", string.Empty));
-            if (plugin != null)
+            var split = taskFolder.name.Split(':');
+            if (split.Length == 2)
             {
-                foreach (var modifier in plugin.InternalModifiers)
+                var pluginId = split[0];
+                var folderName = split[1];
+
+                if (MiraPluginManager.GetPluginByGuid(pluginId) is { } plugin)
                 {
-                    if (!modifier.ShowInFreeplay)
+                    if (folderName == "Roles(Clone)")
                     {
-                        continue;
+                        PluginRoles(__instance, plugin, ref num, ref num2, ref num3);
                     }
-
-                    var taskAddButton = Object.Instantiate(__instance.RoleButton);
-                    taskAddButton.name = modifier.TypeId.ToString(NumberFormatInfo.InvariantInfo);
-                    taskAddButton.role = null;
-                    taskAddButton.MyTask = null;
-                    taskAddButton.SafePositionWorld = __instance.SafePositionWorld;
-                    taskAddButton.Text.text = modifier.ModifierName;
-                    taskAddButton.Text.fontSizeMin = 1;
-                    taskAddButton.Text.EnableMasking();
-                    taskAddButton.FileImage.color = modifier.FreeplayFileColor;
-                    taskAddButton.RolloverHandler.OutColor = modifier.FreeplayFileColor;
-                    if (modifier is TimedModifier timed)
+                    else if (folderName == "Modifiers(Clone)")
                     {
-                        taskAddButton.FileImage.sprite = MiraAssets.TimedModifierFile.LoadAsset();
-                        taskAddButton.Text.text += $" ({timed.Duration}s)";
+                        PluginModifiers(__instance, plugin, ref num, ref num2, ref num3);
                     }
-                    else
-                    {
-                        taskAddButton.FileImage.sprite = MiraAssets.ModifierFile.LoadAsset();
-                    }
-
-                    taskAddButton.Button.OnClick = new Button.ButtonClickedEvent();
-                    var m = modifier;
-                    taskAddButton.Button.OnClick.AddListener((UnityAction)(() =>
-                    {
-                        var id = m.TypeId;
-                        if (PlayerControl.LocalPlayer.HasModifier(id))
-                        {
-                            PlayerControl.LocalPlayer.RemoveModifier(id);
-                            taskAddButton.Overlay.enabled = false;
-                        }
-                        else
-                        {
-                            PlayerControl.LocalPlayer.AddModifier(id);
-                            taskAddButton.Overlay.enabled = true;
-                        }
-                    }));
-
-                    __instance.AddFileAsChildCustom(taskAddButton, ref num, ref num2, ref num3);
-                    ControllerManager.Instance.AddSelectableUiElement(taskAddButton.Button);
                 }
             }
         }
 
+        foreach (var chip in __instance.ActiveItems)
+        {
+            chip.GetComponentInChildren<TextMeshPro>().EnableStencilMasking();
+            chip.GetComponent<SpriteRenderer>().maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
+        }
+
         if (_scroller)
         {
-            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 4.5f, 1.65f);
+            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 5, 1.4f);
             _scroller.SetYBoundsMin(0.0f);
             _scroller.ScrollToTop();
         }
 
-        ControllerManager.Instance.SetBackButton(__instance.Hierarchy.Count == 1
-            ? __instance.BackButton
-            : __instance.FolderBackButton);
+        if (__instance.Hierarchy.Count == 1)
+        {
+            ControllerManager.Instance.SetBackButton(__instance.BackButton);
+            return false;
+        }
 
-        __instance.SetPreviousControllerSelection(taskFolder.FolderName);
+        ControllerManager.Instance.SetBackButton(__instance.FolderBackButton);
         return false;
     }
+
+    private static void PluginModifiers(
+        TaskAdderGame instance,
+        MiraPluginInfo plugin,
+        ref float num,
+        ref float num2,
+        ref float num3)
+    {
+        for (var m = 0; m < plugin.Modifiers.Count; m++)
+        {
+            var modifier = plugin.Modifiers[m];
+            if (!modifier.ShowInFreeplay)
+            {
+                continue;
+            }
+
+            var taskAddButton = Object.Instantiate(instance.RoleButton);
+            taskAddButton.name = modifier.TypeId.ToString(NumberFormatInfo.InvariantInfo);
+            taskAddButton.role = null;
+            taskAddButton.MyTask = null;
+            taskAddButton.SafePositionWorld = instance.SafePositionWorld;
+            taskAddButton.Text.text = modifier.ModifierName;
+            taskAddButton.Text.EnableMasking();
+
+            taskAddButton.Button.OnClick = new Button.ButtonClickedEvent();
+            taskAddButton.Button.OnClick.AddListener((UnityEngine.Events.UnityAction)(() =>
+            {
+                var id = modifier.TypeId;
+                if (PlayerControl.LocalPlayer.HasModifier(id))
+                {
+                    PlayerControl.LocalPlayer.RemoveModifier(id);
+                    taskAddButton.Overlay.enabled = false;
+                }
+                else
+                {
+                    PlayerControl.LocalPlayer.AddModifier(id);
+                    taskAddButton.Overlay.enabled = true;
+                }
+            }));
+
+            instance.AddFileAsChildCustom(taskAddButton, ref num, ref num2, ref num3);
+
+            ControllerManager.Instance.AddSelectableUiElement(taskAddButton.Button);
+            switch (m)
+            {
+                case 0 when instance.restorePreviousSelectionFound != null:
+                    ControllerManager.Instance.SetDefaultSelection(instance.restorePreviousSelectionFound);
+                    instance.restorePreviousSelectionByFolderName = string.Empty;
+                    instance.restorePreviousSelectionFound = null;
+                    break;
+                case 0:
+                    ControllerManager.Instance.SetDefaultSelection(taskAddButton.Button);
+                    break;
+            }
+        }
+    }
+
+    private static void PluginRoles(TaskAdderGame instance, MiraPluginInfo plugin, ref float num, ref float num2, ref float num3)
+    {
+        for (var m = 0; m < plugin.CustomRoles.Count; m++)
+        {
+            var roleBehaviour = plugin.CustomRoles.ElementAt(m).Value;
+            if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
+                roleBehaviour is ICustomRole { Configuration.ShowInFreeplay: false })
+            {
+                continue;
+            }
+
+            var taskAddButton2 = Object.Instantiate(instance.RoleButton);
+            taskAddButton2.SafePositionWorld = instance.SafePositionWorld;
+            taskAddButton2.Text.text = "Be_" + roleBehaviour.NiceName + ".exe";
+            taskAddButton2.Text.EnableMasking();
+
+            instance.AddFileAsChildCustom(taskAddButton2, ref num, ref num2, ref num3);
+            taskAddButton2.Role = roleBehaviour;
+            if (taskAddButton2.Button == null)
+            {
+                continue;
+            }
+
+            ControllerManager.Instance.AddSelectableUiElement(taskAddButton2.Button);
+            switch (m)
+            {
+                case 0 when instance.restorePreviousSelectionFound != null:
+                    ControllerManager.Instance.SetDefaultSelection(instance.restorePreviousSelectionFound);
+                    instance.restorePreviousSelectionByFolderName = string.Empty;
+                    instance.restorePreviousSelectionFound = null;
+                    break;
+                case 0:
+                    ControllerManager.Instance.SetDefaultSelection(taskAddButton2.Button);
+                    break;
+            }
+        }
+    }
 }

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -1,30 +1,37 @@
 using HarmonyLib;
 using MiraAPI.Hud;
-using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Hud;
 
-[HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
-[HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
+/// <summary>
+/// Reset button patches.
+/// </summary>
+[HarmonyPatch]
 public static class ButtonResetPatches
 {
-    public static void Postfix()
+    /// <summary>
+    /// Resets the cooldown and effect of all custom buttons when the meeting starts.
+    /// </summary>
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
+    public static void MeetingHudStartPostfix()
     {
         foreach (var customActionButton in CustomButtonManager.CustomButtons)
         {
-            try
-            {
-                customActionButton.ResetCooldownAndOrEffect();
-            }
-            catch (System.Exception ex)
-            {
-                Logger<MiraApiPlugin>.Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
-            }
+            customActionButton.ResetCooldownAndOrEffect();
+        }
+    }
 
-            if (customActionButton.UsesMode == ButtonUsesMode.PerRound)
-            {
-                customActionButton.SetUses(customActionButton.MaxUses);
-            }
+    /// <summary>
+    /// Resets the cooldown and effect of all custom buttons after the exile screen is closed.
+    /// </summary>
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
+    public static void ExileControllerReEnableGameplayPostfix()
+    {
+        foreach (var customActionButton in CustomButtonManager.CustomButtons)
+        {
+            customActionButton.ResetCooldownAndOrEffect();
         }
     }
 }

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,14 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Hud;
-using MiraAPI.Keybinds;
-using MiraAPI.LocalSettings;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
-using Rewired;
-using TMPro;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -25,8 +17,6 @@ public static class HudManagerPatches
     public static Transform? BottomRight { get; private set; }
     public static Transform? Buttons { get; private set; }
 
-    private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = new();
-
     /*
     /// <summary>
     /// Trigger hudstart on current custom gamemode
@@ -73,6 +63,18 @@ public static class HudManagerPatches
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
+        var fakeButton = Object.Instantiate(__instance.AbilityButton, BottomLeft.transform);
+        foreach (var renderer in fakeButton.GetComponentsInChildren<Renderer>())
+        {
+            renderer.enabled = false;
+        }
+        fakeButton.buttonLabelText.Destroy();
+        fakeButton.cooldownTimerText.Destroy();
+        fakeButton.usesRemainingText.Destroy();
+        fakeButton.GetComponent<PassiveButton>().Destroy();
+        fakeButton.ToggleVisible(true);
+        fakeButton.Destroy();
+
         foreach (var button in CustomButtonManager.CustomButtons)
         {
             var location = button.Location switch
@@ -87,47 +89,13 @@ public static class HudManagerPatches
                 continue;
             }
 
-            try
-            {
-                button.CreateButton(location);
-            }
-            catch (System.Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to create custom button {button.GetType().Name}: {e}");
-            }
+            button.CreateButton(location);
         }
 
         gridArrange.Start();
         gridArrange.ArrangeChilds();
+
         aspectPosition.AdjustPosition();
-
-        vanillaKeybindIcons = [];
-        var keybindIconPos = new Vector3(-0.4f, 0.4f, -9.5f);
-        var vanillaButtons = new Dictionary<GameObject, int>
-        {
-            { __instance.KillButton.gameObject, 8 },
-            { __instance.UseButton.gameObject, 6 },
-            { __instance.ReportButton.gameObject, 7 },
-            { __instance.ImpostorVentButton.gameObject, 50 },
-            { __instance.SabotageButton.gameObject, 4 },
-            { __instance.AbilityButton.gameObject, 49 },
-        };
-
-        foreach (var kvp in vanillaButtons)
-        {
-            var buttonObj = kvp.Key;
-            var actionId = kvp.Value;
-
-            var key = KeybindUtils.GetKeycodeByActionId(actionId);
-            if (key == KeyboardKeyCode.None)
-            {
-                continue;
-            }
-            var icon = Helpers.CreateKeybindIcon(buttonObj, key, keybindIconPos);
-            vanillaKeybindIcons.Add(icon.transform.GetChild(0).GetComponent<TextMeshPro>(), actionId);
-            var comp = buttonObj.GetComponent<ActionButton>();
-            KeybindManager.VanillaKeybinds[comp.GetType()].Button = comp;
-        }
     }
 
     /// <summary>
@@ -149,43 +117,7 @@ public static class HudManagerPatches
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
-            try
-            {
-                button.SetActive(isActive, role);
-            }
-            catch (System.Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to set custom button {button.GetType().Name} active: {e}");
-            }
-        }
-    }
-
-    [HarmonyPatch(nameof(HudManager.Update))]
-    [HarmonyPostfix]
-    public static void UpdatePostfix()
-    {
-        foreach (var btnIcon in vanillaKeybindIcons)
-        {
-            btnIcon.Key.text = KeybindUtils.GetKeycodeByActionId(btnIcon.Value).ToString();
-            btnIcon.Key.transform.parent.gameObject.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
-                                                              LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value);
-        }
-
-        var player = ReInput.players.GetPlayer(0);
-        foreach (var entry in KeybindManager.Keybinds)
-        {
-            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();
-            }
-        }
-
-        foreach (var entry in KeybindManager.VanillaKeybinds.Values.Where(x => player.GetButtonDown(x.Id)))
-        {
-            entry.Invoke();
+            button.SetActive(isActive, role);
         }
     }
 }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -29,16 +29,6 @@ public static class IntroCutscenePatches
         MiraEventManager.InvokeEvent(@event);
     }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(IntroCutscene._ShowRole_d__41), nameof(IntroCutscene._ShowRole_d__41.MoveNext))]
-    [HarmonyPriority(Priority.Last)]
-    public static void ShowRolePatch(IntroCutscene._ShowRole_d__41 __instance)
-    {
-        var realInstance = __instance.__4__this;
-        var @event = new IntroRoleRevealEvent(realInstance);
-        MiraEventManager.InvokeEvent(@event);
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(nameof(IntroCutscene.BeginImpostor))]
     [HarmonyPatch(nameof(IntroCutscene.BeginCrewmate))]
@@ -67,15 +57,15 @@ public static class IntroCutscenePatches
     }
 
     [HarmonyPostfix]
-    [HarmonyPatch(nameof(IntroCutscene.OnDestroy))]
-    public static void GameBeginPatch(IntroCutscene __instance)
+    [HarmonyPatch(typeof(IntroCutscene._CoBegin_d__34), nameof(IntroCutscene._CoBegin_d__34.MoveNext))]
+    public static void GameBeginPatch(IntroCutscene._CoBegin_d__34 __instance)
     {
-        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
+        if (__instance.__1__state != -1)
+        {
+            return;
+        }
 
-        var @event = new BeforeRoundStartEvent(true);
-        MiraEventManager.InvokeEvent(@event);
-
-        if (@event.IsCancelled) return;
+        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance.__4__this));
         MiraEventManager.InvokeEvent(new RoundStartEvent(true));
     }
 }

MiraAPI/Patches/Keybinds/ControlMapperPatches.cs

@@ -1,67 +0,0 @@
-using System.Linq;
-using HarmonyLib;
-using MiraAPI.Keybinds;
-using MiraAPI.LocalSettings;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using Rewired.UI.ControlMapper;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
-
-namespace MiraAPI.Patches.Keybinds;
-
-[HarmonyPatch(typeof(ControlMapper))]
-public static class ControlMapperPatches
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(ControlMapper.Start))]
-    private static void StartPrefix(ControlMapper __instance)
-    {
-        var doneButton = GameObject.Find("DoneButton")?.GetComponent<CustomButton>();
-        if (doneButton == null)
-        {
-            return;
-        }
-
-        var toggle = Object.Instantiate(doneButton, doneButton.transform.parent);
-        var text = toggle.GetComponentInChildren<TextMeshProUGUI>();
-        var entry = LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds;
-        toggle.gameObject.name = "KeybindsVisibleToggle";
-        text.text = $"Show Keybinds: {(entry.Value ? "On" : "Off")}";
-        toggle.onClick.RemoveAllListeners();
-        toggle.GetComponent<ButtonInfo>().identifier = "KeybindsVisibleToggle";
-        toggle.onClick.AddListener((UnityAction)(() =>
-        {
-            entry.Value = !entry.Value;
-            text.text = $"Show Keybinds: {(entry.Value ? "On" : "Off")}";
-        }));
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(ControlMapper.Update))]
-    private static void UpdatePrefix(ControlMapper __instance)
-    {
-        foreach (var element in __instance.themedElements)
-        {
-            var info = element.GetComponent<InputFieldInfo>();
-            if (info == null)
-            {
-                continue;
-            }
-
-            var key = info.glyphOrText?.actionElementMap?.keyboardKeyCode;
-            if (key == null)
-            {
-                continue;
-            }
-
-            var conflicts = KeybindManager.GetConflicts();
-            if (conflicts.Any(x => x.Key.ToString() == key.ToString()))
-            {
-                element.GetComponent<Image>().color = Color.red;
-            }
-        }
-    }
-}

MiraAPI/Patches/Keybinds/KeybindsPatch.cs

@@ -1,36 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Keybinds;
-using MonoMod.Utils;
-using Rewired;
-
-namespace MiraAPI.Patches.Keybinds;
-
-[HarmonyPatch(typeof(InputManager_Base), nameof(InputManager_Base.Awake))]
-public static class KeybindMenuPatch
-{
-    private static bool _registered;
-
-    [HarmonyPrefix]
-    private static void AwakePrefix(InputManager_Base __instance)
-    {
-        if (_registered)
-        {
-            return;
-        }
-
-        KeybindUtils.RewiredInputManager = __instance;
-        KeybindManager.RewiredInit();
-        _registered = true;
-
-        // Set these here right after input manager initializes
-        KeybindManager.VanillaKeybinds = new()
-        {
-            { typeof(KillButton), new VanillaKeybind(8) },
-            { typeof(UseButton), new VanillaKeybind(6) },
-            { typeof(ReportButton), new VanillaKeybind(7) },
-            { typeof(VentButton), new VanillaKeybind(50) },
-            { typeof(SabotageButton), new VanillaKeybind(4) },
-            { typeof(AbilityButton), new VanillaKeybind(49) },
-        };
-    }
-}

MiraAPI/Patches/Keybinds/OptionsMenuBehaviourPatch.cs

@@ -1,40 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Keybinds;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Keybinds;
-
-[HarmonyPatch(typeof(OptionsMenuBehaviour))]
-public static class OptionsMenuBehaviourPatch
-{
-    private static ButtonRolloverHandler? _remap_rollover;
-    private static SpriteRenderer? _remap_background;
-    private static bool _conflicts => KeybindManager.GetConflicts().Count > 0;
-
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(OptionsMenuBehaviour.Open))]
-    private static void OpenPostfix(OptionsMenuBehaviour __instance)
-    {
-        _remap_rollover = GameObject.Find("Remap Controls")?.GetComponent<ButtonRolloverHandler>()!;
-        _remap_background = _remap_rollover.transform.FindChild("Background").GetComponent<SpriteRenderer>();
-        _remap_background.color = _conflicts ? Color.red : Color.white;
-    }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(OptionsMenuBehaviour.Update))]
-    private static void UpdatePostfix(OptionsMenuBehaviour __instance)
-    {
-        if (_remap_rollover == null)
-        {
-            return;
-        }
-        if (_remap_background == null)
-        {
-            return;
-        }
-
-        _remap_rollover.OutColor = _conflicts ? Color.red : Color.white;
-        _remap_rollover.UnselectedColor = _conflicts ? Color.red : Color.white;
-        _remap_rollover.OverColor = _conflicts ? new Color32(255, 55, 55, 255) : Palette.AcceptedGreen;
-    }
-}

MiraAPI/Patches/LocalSettings/OptionsMenuPatches.cs

@@ -1,232 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
-using MiraAPI.LocalSettings;
-using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
-
-namespace MiraAPI.Patches.LocalSettings;
-
-[HarmonyPatch(typeof(OptionsMenuBehaviour))]
-public static class OptionsMenuPatches
-{
-    internal static OptionsMenuBehaviour? Instance { get; private set; }
-    internal static BoxCollider2D MaskCollider;
-    private static SpriteRenderer? background;
-
-    private static int currentPage = 1;
-    private static Dictionary<int, List<GameObject>> tabButtons = new();
-
-    /// <summary>
-    /// Creates the tabs and their content.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(OptionsMenuBehaviour.Start))]
-    public static void StartPostfix(OptionsMenuBehaviour __instance)
-    {
-        Instance = __instance;
-        // Fix for tabs not being clickable in the main menu
-        if (!AmongUsClient.Instance.IsInGame)
-        {
-            __instance.Background.GetComponent<BoxCollider2D>().enabled = false;
-            __instance.transform.FindChild("Tint").SetLocalZ(5.6f);
-        }
-
-        background = __instance.Background;
-
-        var maskObj = new GameObject
-        {
-            layer = 5,
-            name = "SpriteMask",
-        };
-        maskObj.transform.SetParent(__instance.transform);
-        maskObj.transform.localPosition = new Vector3(0, -0.3f, 0);
-        maskObj.transform.localScale = new Vector3(500, 120, 1);
-
-        var blank = Sprite.Create(
-            Texture2D.whiteTexture,
-            new Rect(0, 0, Texture2D.whiteTexture.width, Texture2D.whiteTexture.height),
-            new Vector2(0.5f, 0.5f));
-
-        var mask = maskObj.AddComponent<SpriteMask>();
-        mask.sprite = blank;
-        mask.isCustomRangeActive = true;
-        mask.sortingLayerName = "Default";
-        mask.backSortingOrder = 100;
-        mask.frontSortingOrder = 500;
-
-        MaskCollider = maskObj.AddComponent<BoxCollider2D>();
-        MaskCollider.size = new Vector2(0.01f, 0.1f);
-        MaskCollider.isTrigger = true;
-        MaskCollider.enabled = true;
-
-        currentPage = 1;
-        tabButtons.Clear();
-        float yOffset = 0;
-        int i = 0;
-        int tabIdx = 0;
-        int page = 1;
-        foreach (var settings in LocalSettingsManager.Tabs)
-        {
-            var tab = settings.CreateTab(__instance);
-            if (settings.ShouldCreateButton)
-            {
-                var button = settings.CreateTabButton(__instance, ref tabIdx, ref yOffset);
-                button.GetComponent<TabGroup>().Content = tab;
-                button.SetActive(page == currentPage);
-
-                if (!tabButtons.TryGetValue(page, out var list))
-                {
-                    tabButtons.Add(page, new());
-                    list = tabButtons[page];
-                }
-                list.Add(button);
-                yOffset += 0.6f;
-                tabIdx++;
-                i++;
-            }
-            if (i > 7)
-            {
-                i = 0;
-                yOffset = 0;
-                page++;
-            }
-        }
-
-        void ChangePage(int increase)
-        {
-            currentPage += increase;
-            if (currentPage > tabButtons.Count)
-            {
-                currentPage = 1;
-            }
-            if (currentPage < 1)
-            {
-                currentPage = tabButtons.Count;
-            }
-        }
-
-        // Create page buttons
-        // TODO: In-game menu has no close button. I tried making one from scratch but failed. Add one later plz
-        if (tabButtons.Count <= 1)
-        {
-            return;
-        }
-
-        var nextButton = Object.Instantiate(__instance.BackButton, __instance.transform).GetComponent<PassiveButton>();
-        nextButton.transform.localPosition = new Vector3(3.2f, 2.6f, -10);
-        nextButton.transform.localScale = new Vector2(0.25f, 0.25f);
-        var nextRend = nextButton.GetComponent<SpriteRenderer>();
-        nextRend.sprite = MiraAssets.NextButton.LoadAsset();
-        nextButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
-
-        var nextRollover = nextButton.gameObject.AddComponent<ButtonRolloverHandler>();
-        nextRollover.Target = nextRend;
-        nextRollover.OverColor = Palette.AcceptedGreen;
-
-        nextButton.OnClick = new Button.ButtonClickedEvent();
-        nextButton.OnClick.AddListener(
-            (UnityAction)(() =>
-            {
-                ChangePage(1);
-                UpdatePages();
-            }));
-
-        var backButton = Object.Instantiate(__instance.BackButton, __instance.transform).GetComponent<PassiveButton>();
-        backButton.transform.localPosition = new Vector3(2.9f, 2.6f, -10);
-        backButton.transform.localScale = new Vector2(0.25f, 0.25f);
-        var backRend = backButton.GetComponent<SpriteRenderer>();
-        backRend.sprite = MiraAssets.NextButton.LoadAsset();
-        backRend.flipX = true;
-        backButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
-
-        var backRollover = backButton.gameObject.AddComponent<ButtonRolloverHandler>();
-        backRollover.Target = backRend;
-        backRollover.OverColor = Palette.AcceptedGreen;
-
-        backButton.OnClick = new Button.ButtonClickedEvent();
-        backButton.OnClick.AddListener(
-            (UnityAction)(() =>
-            {
-                ChangePage(-1);
-                UpdatePages();
-            }));
-    }
-
-    /// <summary>
-    /// Modifies how opening tabs is handled for the custom ones to work.
-    /// </summary>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(OptionsMenuBehaviour.OpenTabGroup))]
-    public static bool OpenTabGroupPrefix(OptionsMenuBehaviour __instance, ref int index)
-    {
-        __instance.Tabs.ToList().ForEach(x => x.Close()); // Close all vanilla tabs
-        LocalSettingsManager.Tabs.ForEach(CustomClose); // Close all mod tabs
-
-        // Tabs with index 10 and above are the mod settings tabs
-        if (index >= 10)
-        {
-            CustomOpen(LocalSettingsManager.Tabs[index - 10]);
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// Makes the custom tabs close when opening the options menu and resets pages.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(OptionsMenuBehaviour.Open))]
-    public static void OpenPostfix(OptionsMenuBehaviour __instance)
-    {
-        LocalSettingsManager.Tabs.ForEach(CustomClose);
-        currentPage = 1;
-        UpdatePages();
-    }
-
-    private static void UpdatePages()
-    {
-        foreach (var pages in tabButtons)
-        {
-            pages.Value?
-                .Where(x => x != null)
-                .Do(
-                   x => x?.SetActive(
-                       pages.Key == currentPage));
-        }
-    }
-
-    private static void CustomOpen(LocalSettingsTab tab)
-    {
-        if (tab.TabButton?.Button)
-            tab.TabButton!.Button.color = tab.TabAppearance.TabButtonHoverColor;
-
-        if (tab.TabButton?.Rollover)
-            tab.TabButton!.Rollover.OutColor = tab.TabAppearance.TabButtonHoverColor;
-
-        if (tab.TabButton?.Content)
-            tab.TabButton!.Content.SetActive(true);
-
-        if (background != null)
-            background.color = tab.TabAppearance.TabColor;
-    }
-    private static void CustomClose(LocalSettingsTab tab)
-    {
-        if (tab.TabButton?.Button)
-            tab.TabButton!.Button.color = tab.TabAppearance.TabButtonColor;
-
-        if (tab.TabButton?.Rollover)
-            tab.TabButton!.Rollover.OutColor = tab.TabAppearance.TabButtonColor;
-
-        if (tab.TabButton?.Content)
-            tab.TabButton!.Content.SetActive(false);
-
-        if (background != null)
-            background.color = Color.white;
-    }
-}

MiraAPI/Patches/LocalSettings/ToggleBehaviourPatch.cs

@@ -1,37 +0,0 @@
-using HarmonyLib;
-using UnityEngine;
-
-namespace MiraAPI.Patches.LocalSettings;
-
-[HarmonyPatch(typeof(ToggleButtonBehaviour))]
-public static class ToggleBehaviourPatch
-{
-    /// <summary>
-    /// ResetText was inlined ofc.
-    /// Skill issue.
-    /// </summary>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(ToggleButtonBehaviour.UpdateText))]
-    public static bool UpdateTextPrefix(ToggleButtonBehaviour __instance, bool on)
-    {
-        var color = on ? new Color(0f, 1f, 0.16470589f, 1f) : Color.white;
-        __instance.onState = on;
-        __instance.Background.color = color;
-
-        // Used to mask the text
-        __instance.Text.richText = true;
-        __instance.Text.text = $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF - Chat Message Masked\">" +
-                               $"{DestroyableSingleton<TranslationController>.Instance.GetString(__instance.BaseText)}: <b>" +
-                               $"{DestroyableSingleton<TranslationController>.Instance.GetString(__instance.onState ? StringNames.SettingsOn : StringNames.SettingsOff)}</b></font>";
-        __instance.Text.sortingOrder = 151;
-        __instance.Text.renderer.sortingLayerName = "Default";
-        __instance.Text.renderer.sortingOrder = 151;
-
-        if (__instance.Rollover)
-        {
-            __instance.Rollover.ChangeOutColor(color);
-        }
-
-        return false;
-    }
-}

MiraAPI/Patches/Menu/HatsTabPatches.cs

@@ -84,7 +84,7 @@ public static class HatsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{sortedHats.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -114,7 +114,7 @@ public static class HatsTabPatches
                 yield return null;
             }
 
-            __instance.SetScrollerBounds();
+            __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
             yield return new WaitForSeconds(0.01f);
         }
         __instance.currentHatIsEquipped = true;

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -73,7 +73,7 @@ public static class NameplatesTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{SortedNameplates.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -91,7 +91,7 @@ public static class NameplatesTabPatches
             hatIndex += 1;
         }
 
-        __instance.SetScrollerBounds();
+        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
         __instance.currentNameplateIsEquipped = true;
     }
 

MiraAPI/Patches/Menu/SkinsTabPatches.cs

@@ -76,7 +76,7 @@ public static class SkinsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{sortedSkins.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -94,7 +94,7 @@ public static class SkinsTabPatches
             hatIndex += 1;
         }
 
-        __instance.SetScrollerBounds();
+        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
         __instance.currentSkinIsEquipped = true;
     }
 

MiraAPI/Patches/Menu/VisorsTabPatches.cs

@@ -72,7 +72,7 @@ public static class VisorsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{SortedVisors.Count})\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -90,7 +90,7 @@ public static class VisorsTabPatches
             hatIndex += 1;
         }
 
-        __instance.SetScrollerBounds();
+        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
         __instance.currentVisorIsEquipped = true;
     }
 

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

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

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

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

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
-using MiraAPI.Presets;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities.Extensions;
 using TMPro;
@@ -33,26 +32,6 @@ internal static class GameSettingMenuPatches
     private static PassiveButton? _smallRolesButton;
 
     private static Dictionary<int, Vector3> OptionsPositions { get; } = [];
-    private static Dictionary<int, Vector3> ModifiersPositions { get; } = [];
-
-    private static void SaveScrollPositions(GameSettingMenu gameSettingMenu)
-    {
-        if (_modifiersTab)
-        {
-            ModifiersPositions[SelectedModIdx] = _modifiersTab!.scrollBar.Inner.localPosition;
-        }
-
-        RoleSettingMenuPatches.RolePositions[SelectedModIdx] = gameSettingMenu.RoleSettingsTab.scrollBar.Inner.localPosition;
-        OptionsPositions[SelectedModIdx] = gameSettingMenu.GameSettingsTab.scrollBar.Inner.localPosition;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
-
-    public static void ChangeTabPrefix(GameSettingMenu __instance)
-    {
-        SaveScrollPositions(__instance);
-    }
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
@@ -60,11 +39,7 @@ internal static class GameSettingMenuPatches
     {
         if ((previewOnly && Controller.currentTouchType == Controller.TouchType.Joystick) || !previewOnly)
         {
-            if (_modifiersTab)
-            {
-                _modifiersTab!.gameObject.SetActive(tabNum == 3);
-            }
-
+            if (_modifiersTab) _modifiersTab!.gameObject.SetActive(tabNum == 3);
             _modifiersButton?.SelectButton(tabNum == 3);
             _smallRolesButton?.SelectButton(tabNum == 2);
             if (tabNum == 3)
@@ -88,10 +63,7 @@ internal static class GameSettingMenuPatches
         _modifiersButton?.SelectButton(tabNum == 3);
         _smallRolesButton?.SelectButton(tabNum == 2);
 
-        if (tabNum != 3)
-        {
-            return;
-        }
+        if (tabNum != 3) return;
 
         if (__instance.RoleSettingsButton.gameObject.active)
         {
@@ -141,9 +113,13 @@ internal static class GameSettingMenuPatches
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
             {
-                SaveScrollPositions(__instance);
+                if (!__instance.RoleSettingsTab.AdvancedRolesSettings.active)
+                {
+                    RoleSettingMenuPatches.RolePositions[SelectedModIdx] = __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
+                }
+                OptionsPositions[SelectedModIdx] = __instance.GameSettingsTab.scrollBar.Inner.localPosition;
                 SelectedModIdx += 1;
-                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -160,11 +136,15 @@ internal static class GameSettingMenuPatches
         backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
             (UnityAction)(() =>
             {
-                SaveScrollPositions(__instance);
+                if (!__instance.RoleSettingsTab.AdvancedRolesSettings.active)
+                {
+                    RoleSettingMenuPatches.RolePositions[SelectedModIdx] = __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
+                }
+                OptionsPositions[SelectedModIdx] = __instance.GameSettingsTab.scrollBar.Inner.localPosition;
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
                 }
 
                 UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
@@ -241,64 +221,57 @@ internal static class GameSettingMenuPatches
 
         _modifierBtnOgPos = _modifiersButton.transform.localPosition;
 
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
-        {
-            PresetManager.LoadPresets(plugin);
-        }
-
         UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
     }
 
-    private static void ChangeRoleSettingButton(bool replace, GameSettingMenu menu)
+    private static void ChangeRoleSettingButton(bool replace, GameSettingMenu __instance)
     {
-        menu.RoleSettingsButton.OnClick = new ButtonClickedEvent();
-        menu.RoleSettingsButton.OnMouseOver = new UnityEvent();
+        __instance.RoleSettingsButton.OnClick = new ButtonClickedEvent();
+        __instance.RoleSettingsButton.OnMouseOver = new UnityEvent();
 
         if (replace)
         {
-            menu.RoleSettingsButton.buttonText.text = "Modifiers Settings";
-            menu.RoleSettingsButton.OnClick.AddListener(
+            __instance.RoleSettingsButton.buttonText.text = "Modifiers Settings";
+            __instance.RoleSettingsButton.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(3, false);
+                    __instance.ChangeTab(3, false);
                 }));
-            menu.RoleSettingsButton.OnMouseOver.AddListener(
+            __instance.RoleSettingsButton.OnMouseOver.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(3, true);
+                    __instance.ChangeTab(3, true);
                 }));
         }
         else
         {
-            menu.RoleSettingsButton.buttonText.text = "Roles Settings";
-            menu.RoleSettingsButton.OnClick.AddListener(
+            __instance.RoleSettingsButton.buttonText.text = "Roles Settings";
+            __instance.RoleSettingsButton.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(2, false);
+                    __instance.ChangeTab(2, false);
                 }));
-            menu.RoleSettingsButton.OnMouseOver.AddListener(
+            __instance.RoleSettingsButton.OnMouseOver.AddListener(
                 (UnityAction)(() =>
                 {
-                    menu.ChangeTab(2, true);
+                    __instance.ChangeTab(2, true);
                 }));
         }
     }
-
     private static void UpdateText(GameSettingMenu menu, GameOptionsMenu settings, RolesSettingsMenu roles)
     {
         if (_text is not null && SelectedModIdx == 0)
         {
-            _text.text = $"<size=40%>(Page 0/{MiraPluginManager.Instance.RegisteredPlugins.Length})</size>\nDefault";
+            _text.text = "Default";
             _text.fontSizeMax = 3.2f;
-            SelectedMod = null;
         }
         else if (_text is not null)
         {
             _text.fontSizeMax = 2.3f;
-            SelectedMod = MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+            SelectedMod = MiraPluginManager.Instance.RegisteredPlugins()[SelectedModIdx - 1];
 
             var name = SelectedMod.MiraPlugin.OptionsTitleText;
-            _text.text = $"<size=50%>(Page {SelectedModIdx}/{MiraPluginManager.Instance.RegisteredPlugins.Length})</size>\n" + name[..Math.Min(name.Length, 25)];
+            _text.text = name[..Math.Min(name.Length, 25)];
         }
 
         bool replaceWithModifiers = true;
@@ -308,11 +281,9 @@ internal static class GameSettingMenuPatches
 
         if (SelectedModIdx != 0)
         {
-            var modHasRoles = SelectedMod!.InternalRoles.Count != 0;
-            var modHasModifiers = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
-            var modHasOptions =
-                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
+            var modHasRoles = SelectedMod!.CustomRoles.Count != 0;
+            var modHasModifiers = SelectedMod.OptionGroups.Exists(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
+            var modHasOptions = SelectedMod.OptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
 
             _modifiersButton.gameObject.SetActive(true);
             _smallRolesButton.gameObject.SetActive(true);
@@ -352,7 +323,6 @@ internal static class GameSettingMenuPatches
                 {
                     menu.ChangeTab(0, false);
                 }
-
                 // If the mod has roles, we can enable the bigger role button and disable the small one.
                 if (modHasRoles)
                 {
@@ -409,11 +379,6 @@ internal static class GameSettingMenuPatches
             ChangeRoleSettingButton(replaceWithModifiers, menu);
         }
 
-        if (menu.PresetsTab.gameObject.active)
-        {
-            menu.ChangeTab(0, false);
-        }
-
         CleanupTab(settings, roles);
     }
 
@@ -425,10 +390,8 @@ internal static class GameSettingMenuPatches
             {
                 continue;
             }
-
             child.gameObject.DestroyImmediate();
         }
-
         options.Clear();
     }
 
@@ -446,7 +409,7 @@ internal static class GameSettingMenuPatches
 
         if (_modifiersTab?.Children?.Count > 0)
         {
-            CleanupSettings(_modifiersTab, true);
+            CleanupSettings(_modifiersTab);
         }
 
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
@@ -467,7 +430,6 @@ internal static class GameSettingMenuPatches
             {
                 role.gameObject.DestroyImmediate();
             }
-
             rolesMenu.roleChances?.Clear();
 
             rolesMenu.AdvancedRolesSettings.gameObject.SetActive(false);
@@ -484,7 +446,7 @@ internal static class GameSettingMenuPatches
             }
         }
 
-        void CleanupSettings(GameOptionsMenu gameOptMenu, bool modifiers = false)
+        void CleanupSettings(GameOptionsMenu gameOptMenu)
         {
             ClearOptions(gameOptMenu.Children);
             gameOptMenu.Children = null;
@@ -495,8 +457,7 @@ internal static class GameSettingMenuPatches
                 .ForEach(header => header.gameObject.DestroyImmediate());
 
             gameOptMenu.Initialize();
-            var positions = modifiers ? ModifiersPositions : OptionsPositions;
-            if (positions.TryGetValue(SelectedModIdx, out var pos))
+            if (OptionsPositions.TryGetValue(SelectedModIdx, out var pos))
             {
                 gameOptMenu.scrollBar.Inner.localPosition = pos;
                 gameOptMenu.scrollBar.UpdateScrollBars();

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -24,7 +24,7 @@ public static class LobbyViewPanePatches
 
     private static MiraPluginInfo? SelectedMod => SelectedModIdx == 0
         ? null
-        : MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
+        : MiraPluginManager.Instance.RegisteredPlugins()[SelectedModIdx - 1];
 
     private static PassiveButton? ModifiersTabButton { get; set; }
 
@@ -74,7 +74,7 @@ public static class LobbyViewPanePatches
             (UnityAction)(() =>
             {
                 SelectedModIdx += 1;
-                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins().Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -98,7 +98,7 @@ public static class LobbyViewPanePatches
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPlugins().Length;
                 }
 
                 Refresh(__instance);
@@ -113,27 +113,24 @@ public static class LobbyViewPanePatches
         menu.scrollBar.ScrollToTop();
     }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(LobbyViewSettingsPane.ChangeTab))]
-    [HarmonyPatch(nameof(LobbyViewSettingsPane.RefreshTab))]
-    // CHANGED BECAUSE OF INLINING
-    public static void SetTabPatch(LobbyViewSettingsPane __instance)
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(LobbyViewSettingsPane.SetTab))]
+    public static bool SetTabPatch(LobbyViewSettingsPane __instance)
     {
         if (__instance.currentTab != ModifiersTabName || SelectedMod == null)
         {
             ModifiersTabButton?.SelectButton(false);
-            return;
+            return true;
         }
 
         __instance.taskTabButton.SelectButton(false);
         __instance.rolesTabButton.SelectButton(false);
 
         ModifiersTabButton?.SelectButton(true);
-
-        var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || (x.OptionableType != null && x.OptionableType.IsAssignableTo(typeof(BaseModifier)))));
-
+        var filteredGroups = SelectedMod.OptionGroups
+            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true));
         DrawOptions(__instance, filteredGroups);
+        return false;
     }
 
     [HarmonyPrefix]
@@ -145,14 +142,8 @@ public static class LobbyViewPanePatches
             return true;
         }
 
-        if (__instance.currentTab == ModifiersTabName)
-        {
-            return false;
-        }
-
-        var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x is { ShowInModifiersMenu: false, OptionableType: null } && x.GroupVisible());
-
+        var filteredGroups = SelectedMod.OptionGroups
+            .Where(x => x is { ShowInModifiersMenu: false, OptionableType: null } && x.GroupVisible.Invoke());
         DrawOptions(__instance, filteredGroups);
         return false;
     }
@@ -166,11 +157,6 @@ public static class LobbyViewPanePatches
             return true;
         }
 
-        if (__instance.currentTab == ModifiersTabName)
-        {
-            return false;
-        }
-
         DrawRolesTab(__instance);
         return false;
     }
@@ -179,15 +165,12 @@ public static class LobbyViewPanePatches
     {
         var num = 1.44f;
 
-        var groupArray = groups.Where(x => x.GroupVisible() && x.Options.Any(y => y.Visible())).ToArray();
-
-        foreach (var group in groupArray)
+        foreach (var group in groups)
         {
             var categoryHeaderMasked = Object.Instantiate(
                 menu.categoryHeaderOrigin,
                 menu.settingsContainer,
                 true);
-
             categoryHeaderMasked.SetHeader(StringNames.Name, 61);
             categoryHeaderMasked.Title.text = group.GroupName;
             categoryHeaderMasked.transform.localScale = Vector3.one;
@@ -199,7 +182,7 @@ public static class LobbyViewPanePatches
 
             foreach (var option in group.Options)
             {
-                if (!option.Visible())
+                if (!option.Visible.Invoke())
                 {
                     continue;
                 }
@@ -208,7 +191,6 @@ public static class LobbyViewPanePatches
                     menu.infoPanelOrigin,
                     menu.settingsContainer,
                     true);
-
                 viewSettingsInfoPanel.transform.localScale = Vector3.one;
                 float num2;
                 if (i % 2 == 0)
@@ -247,7 +229,7 @@ public static class LobbyViewPanePatches
             num -= 0.85f;
         }
 
-        menu.scrollBar.SetYBoundsMax(-num - 2);
+        menu.scrollBar.CalculateAndSetYBounds(menu.settingsInfo.Count + 10, 2f, 6f, 0.85f);
     }
 
     private static void DrawRolesTab(LobbyViewSettingsPane instance)
@@ -268,7 +250,7 @@ public static class LobbyViewPanePatches
 
         var list = new List<Type>();
 
-        var roleGroups = SelectedMod.InternalRoles.Values.OfType<ICustomRole>()
+        var roleGroups = SelectedMod.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         // sort the groups by priority
@@ -333,7 +315,7 @@ public static class LobbyViewPanePatches
                 viewSettingsInfoPanelRoleVariant.transform.localScale = Vector3.one;
                 viewSettingsInfoPanelRoleVariant.transform.localPosition = new Vector3(num2, num, -2f);
 
-                var advancedRoleOptions = SelectedMod.InternalOptionGroups
+                var advancedRoleOptions = SelectedMod.OptionGroups
                     .Where(x => x.OptionableType == customRole.GetType())
                     .SelectMany(x => x.Options)
                     .ToList();
@@ -420,7 +402,7 @@ public static class LobbyViewPanePatches
             return 0;
         }
 
-        var role = SelectedMod.InternalRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
+        var role = SelectedMod.CustomRoles.Values.FirstOrDefault(x => x.GetType() == roleType);
 
         if (role == null)
         {
@@ -443,7 +425,7 @@ public static class LobbyViewPanePatches
         var num = viewPanel.yPosStart;
         var num2 = 1.08f;
 
-        var filteredOptions = SelectedMod.InternalOptionGroups
+        var filteredOptions = SelectedMod.OptionGroups
             .Where(x => x.OptionableType == roleType)
             .SelectMany(x=>x.Options)
             .ToList();

MiraAPI/Patches/Options/NotificationPopperPatch.cs

@@ -2,6 +2,7 @@
 using HarmonyLib;
 using Il2CppSystem;
 using MiraAPI.Roles;
+using UnityEngine;
 using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Patches.Options;

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -1,161 +1,12 @@
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
+using HarmonyLib;
 using Il2CppSystem;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Roles;
 using MiraAPI.Utilities;
-using UnityEngine;
-using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Patches.Options;
 
 [HarmonyPatch]
 public static class OptionsPatches
 {
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseChance))]
-    public static bool RoleIncreaseChancePrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleChance == 0)
-        {
-            __instance.roleMaxCount = 1;
-        }
-
-        var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
-        __instance.roleChance += increment;
-
-        if (__instance.roleChance > 100)
-        {
-            __instance.roleChance = 0;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseChance))]
-    public static bool RoleDecreaseChancePrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleChance == 0)
-        {
-            __instance.roleMaxCount = 1;
-        }
-
-        var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
-        __instance.roleChance -= increment;
-
-        if (__instance.roleChance < 0)
-        {
-            __instance.roleChance = 100;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseCount))]
-    public static bool RoleIncreaseCountPrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleMaxCount == 0)
-        {
-            __instance.roleChance = 50;
-        }
-
-        __instance.roleMaxCount += 1;
-        if (__instance.roleMaxCount > __instance.role.MaxCount)
-        {
-            __instance.roleMaxCount = 0;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseCount))]
-    public static bool RoleDecreaseCountPrefix(RoleOptionSetting __instance)
-    {
-        if (!__instance.Role.IsCustomRole())
-        {
-            return true;
-        }
-
-        if (__instance.roleMaxCount == 0)
-        {
-            __instance.roleChance = 50;
-        }
-
-        __instance.roleMaxCount -= 1;
-        if (__instance.roleMaxCount < 0)
-        {
-            __instance.roleMaxCount = __instance.role.MaxCount;
-        }
-
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.AdjustButtonsActiveState))]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.AdjustButtonsActiveState))]
-    [HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.AdjustButtonsActiveState))]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustChanceButtonsActiveState))]
-    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustCountButtonsActiveState))]
-    public static bool AdjustButtonsPrefix(OptionBehaviour __instance)
-    {
-        if (__instance.IsCustom())
-        {
-            if (__instance.TryCast<NumberOption>() is { } numberOption)
-            {
-                numberOption.MinusBtn.SetInteractable(true);
-                numberOption.PlusBtn.SetInteractable(true);
-            }
-            if (__instance.TryCast<StringOption>() is { } stringOption)
-            {
-                stringOption.MinusBtn.SetInteractable(true);
-                stringOption.PlusBtn.SetInteractable(true);
-            }
-            if (__instance.TryCast<PlayerOption>() is { } playerOption)
-            {
-                playerOption.MinusBtn.SetInteractable(true);
-                playerOption.PlusBtn.SetInteractable(true);
-            }
-
-            return false;
-        }
-
-        if (__instance.TryCast<RoleOptionSetting>() is { } roleOptionSetting && roleOptionSetting.Role.IsCustomRole())
-        {
-            roleOptionSetting.CountMinusBtn.SetInteractable(true);
-            roleOptionSetting.CountPlusBtn.SetInteractable(true);
-            roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
-            roleOptionSetting.ChancePlusBtn.SetInteractable(true);
-
-            return false;
-        }
-
-        return true;
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Initialize))]
     public static bool ToggleInit(ToggleOption __instance)
@@ -165,31 +16,15 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.TitleText.text =
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Toggle))]
-    // UpdateValue was inlined.
+    [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.UpdateValue))]
     public static bool ToggleUpdate(ToggleOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.CheckMark.enabled = !__instance.CheckMark.enabled;
-        __instance.OnValueChanged.Invoke(__instance);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
-    [HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.UpdateValue))]
-    public static bool UpdateValuePrefix(OptionBehaviour __instance)
     {
         return !__instance.IsCustom();
     }
@@ -203,84 +38,17 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.TitleText.text =
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Increase))]
-    public static bool NumberIncrease(NumberOption __instance)
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
+    public static bool NumberUpdate(NumberOption __instance)
     {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value += __instance.Increment;
-        if (__instance.Value > __instance.ValidRange.max)
-        {
-            __instance.Value = __instance.ValidRange.min;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Decrease))]
-    public static bool NumberDecrease(NumberOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value -= __instance.Increment;
-        if (__instance.Value < __instance.ValidRange.min)
-        {
-            __instance.Value = __instance.ValidRange.max;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.Increase))]
-    public static bool StringOptionIncrease(StringOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value += 1;
-        if (__instance.Value >= __instance.Values.Length)
-        {
-            __instance.Value = 0;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.Decrease))]
-    public static bool StringOptionDecrease(StringOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __instance.Value -= 1;
-        if (__instance.Value < 0)
-        {
-            __instance.Value = __instance.Values.Length - 1;
-        }
-        __instance.OnValueChanged.Invoke(__instance);
-        __instance.AdjustButtonsActiveState();
-        return false;
+        return !__instance.IsCustom();
     }
 
     [HarmonyPrefix]
@@ -292,9 +60,19 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
-        __instance.ValueText.text = TranslationController.Instance.GetString(__instance.Values[__instance.Value], Array.Empty<Object>());
+        __instance.TitleText.text =
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.ValueText.text = TranslationController.Instance.GetString(
+            __instance.Values[__instance.Value],
+            Array.Empty<Object>());
 
         return false;
     }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
+    public static bool StringUpdate(StringOption __instance)
+    {
+        return !__instance.IsCustom();
+    }
 }

MiraAPI/Patches/Options/PlayerOptionPatches.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Linq;
-using HarmonyLib;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using UnityEngine;
-using Object = Il2CppSystem.Object;
-
-namespace MiraAPI.Patches.Options;
-
-[HarmonyPatch(typeof(PlayerOption))]
-public static class PlayerOptionPatches
-{
-    // Updates the list of players according to the filter.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.FixedUpdate))]
-    public static bool PlayerOptionUpdatePatch(PlayerOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        if (!ModdedOptionsManager.CreatedPlayerOptions.TryGetValue(__instance, out var moddedPlrOpt)) return false;
-
-        var filteredPlayers = moddedPlrOpt.GetFilteredPlayers();
-        if (filteredPlayers.Count != __instance.Values.Count)
-        {
-            filteredPlayers.Sort((a, b) => a.PlayerId.CompareTo(b.PlayerId));
-
-            __instance.Values = filteredPlayers.ToIl2CppList();
-            moddedPlrOpt.Values = __instance.Values;
-            __instance.playerIndex = filteredPlayers.FindIndex(p => p.PlayerId == __instance.Value);
-            __instance.SetValueText();
-        }
-
-        __instance.CheckValueChanged();
-
-        return false;
-    }
-
-    // Disable going under 0 if you aren't allowed to choose None.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.UpdatePlayerIndex))]
-    public static bool UpdatePlayerIndexPatch(PlayerOption __instance, int index)
-    {
-        if (!__instance.IsCustom() || ModdedOptionsManager.CreatedPlayerOptions[__instance].AllowNone)
-        {
-            return true;
-        }
-
-        var newIndex = Mathf.Clamp(index, 0, __instance.Values.Count - 1);
-        __instance.playerIndex = newIndex;
-        __instance.Value = __instance.Values[newIndex].PlayerId;
-        return false;
-    }
-
-    // Replace "Round Robin" with "None" in the Host Options Menu.
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(PlayerOption.SetValueText))]
-    public static void SetValueTextPatch(PlayerOption __instance)
-    {
-        if (__instance.playerIndex < 0)
-        {
-            __instance.ValueText.text = TranslationController.Instance.GetString(StringNames.FilterNone);
-        }
-    }
-
-    // Innersloth hardcode literally replaces the value with the HNS impostor option OnEnable, so I have to patch that out. Smh.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.OnEnable))]
-    public static bool OnEnablePatch(PlayerOption __instance)
-    {
-        return !__instance.IsCustom();
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.GetInt))]
-    public static bool GetIntPatch(PlayerOption __instance, ref int __result)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        __result = __instance.Value;
-        return false;
-    }
-
-    // Used to replace "Round Robin" with "None" for option notification & view pane.
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerSelectionGameSetting), nameof(PlayerSelectionGameSetting.GetValueString))]
-    public static bool GetStringPatch(PlayerSelectionGameSetting __instance, float value, ref string __result)
-    {
-        var option = ModdedOptionsManager.ModdedOptions.FirstOrDefault(x => x.Value.Data == __instance).Value;
-        if (option == null) return true;
-
-        var networkedPlayerInfo = GameData.Instance.AllPlayers.ToArray().FirstOrDefault(p => p.PlayerId == (int)value);
-        if (networkedPlayerInfo != null)
-        {
-            __result = networkedPlayerInfo.PlayerName;
-            return false;
-        }
-
-        __result = TranslationController.Instance.GetString(StringNames.FilterNone);
-        return false;
-    }
-
-    // "UpdateValue" was inlined and I needed to replace it, so I just rewrote the method where it's called from.
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerOption.CheckValueChanged))]
-    public static bool UpdateValuePatch(PlayerOption __instance)
-    {
-        if (!__instance.IsCustom())
-        {
-            return true;
-        }
-
-        if (__instance.oldValue == __instance.Value) return false;
-
-        __instance.oldValue = __instance.Value;
-        __instance.SetValueText();
-
-        return false;
-    }
-}

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -1,10 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using AmongUs.GameOptions;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using MiraAPI.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
@@ -32,33 +30,20 @@ public static class RoleSettingMenuPatches
 
     private static float ScrollerNum { get; set; } = 0.522f;
 
-    private static RoleBehaviour? CurrentRole { get; set; }
-    private static List<IModdedOption>? CurrentRoleOptions { get; set; }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
-    public static void SetQuotaTabPostfix(RolesSettingsMenu __instance)
-    {
-        __instance.scrollBar.SetScrollBounds(__instance);
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
-    public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
+    public static bool PatchStart(RolesSettingsMenu __instance)
     {
         Headers.ForEach(Object.Destroy);
         RoleOptionSettings.ForEach(Object.Destroy);
         Headers.Clear();
         RoleOptionSettings.Clear();
-        CurrentRole = null;
-        CurrentRoleOptions = null;
 
         __instance.roleChances = new Il2CppSystem.Collections.Generic.List<RoleOptionSetting>();
         __instance.advancedSettingChildren = new Il2CppSystem.Collections.Generic.List<OptionBehaviour>();
 
         var maskBg = __instance.scrollBar.transform.FindChild("MaskBg");
         var hitbox = __instance.scrollBar.transform.FindChild("Hitbox");
-        var dividerImage = __instance.transform.FindChild("HeaderButtons/DividerImage");
 
         if (GameSettingMenuPatches.SelectedModIdx == 0)
         {
@@ -69,64 +54,7 @@ public static class RoleSettingMenuPatches
             maskBg.localScale = new Vector3(6.6811f, 3.3563f, 0.5598f);
             hitbox.localPosition = new Vector3(0.3297f, -.2333f, 4f);
             hitbox.localScale = new Vector3(1, 1, 1);
-            dividerImage.gameObject.SetActive(true);
-
-            var num = 0.662f;
-
-            var list = CustomRoleManager.AllRoles.Where(
-                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.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
-                     r.Role != RoleTypes.ImpostorGhost).ToList();
-
-            if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
-            {
-                var num2 = -1.928f;
-                __instance.roleTabs = new();
-                __instance.roleTabs.Add(__instance.AllButton);
-                foreach (var t in list)
-                {
-                    __instance.AddRoleTab(t, ref num2);
-                }
-
-                foreach (var t in list2)
-                {
-                    __instance.AddRoleTab(t, ref num2);
-                }
-            }
-
-            var categoryHeaderEditRole = Object.Instantiate(
-                __instance.categoryHeaderEditRoleOrigin,
-                Vector3.zero,
-                Quaternion.identity,
-                __instance.RoleChancesSettings.transform);
-            categoryHeaderEditRole.SetHeader(StringNames.CrewmateRolesHeader, 20);
-            categoryHeaderEditRole.transform.localPosition = new Vector3(4.986f, num, -2f);
-            num -= 0.522f;
-            var num3 = 0;
-            foreach (var t in list)
-            {
-                __instance.CreateQuotaOption(t, ref num, num3);
-                num3++;
-            }
-
-            num -= 0.22f;
-            var categoryHeaderEditRole2 = Object.Instantiate(
-                __instance.categoryHeaderEditRoleOrigin,
-                Vector3.zero,
-                Quaternion.identity,
-                __instance.RoleChancesSettings.transform);
-            categoryHeaderEditRole2.SetHeader(StringNames.ImpostorRolesHeader, 20);
-            categoryHeaderEditRole2.transform.localPosition = new Vector3(4.986f, num, -2f);
-            num -= 0.522f;
-            foreach (var t in list2)
-            {
-                __instance.CreateQuotaOption(t, ref num, num3);
-                num3++;
-            }
-
-            return false;
+            return true;
         }
 
         ScrollerNum = 0.522f;
@@ -138,16 +66,15 @@ public static class RoleSettingMenuPatches
         maskBg.localScale = new Vector3(6.6811f, 4.1563f, 0.5598f);
         hitbox.localPosition = new Vector3(0.3297f, -.6333f, 4f);
         hitbox.localScale = new Vector3(1, 1.2f, 1);
-        dividerImage.gameObject.SetActive(false);
 
-        var num4 = 0;
+        var num3 = 0;
 
-        var roleGroups = GameSettingMenuPatches.SelectedMod?.InternalRoles.Values.OfType<ICustomRole>()
+        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
         if (roleGroups is null)
         {
-            return false;
+            return true;
         }
 
         // sort the groups by priority
@@ -257,11 +184,11 @@ public static class RoleSettingMenuPatches
                         continue;
                     }
 
-                    var option = CreateQuotaOption(__instance, roleBehaviour, num4);
+                    var option = CreateQuotaOption(__instance, roleBehaviour, num3);
                     if (option is not null)
                     {
                         RoleOptionSettings.Add(option);
-                        num4++;
+                        num3++;
                     }
                 }
             }
@@ -277,10 +204,9 @@ public static class RoleSettingMenuPatches
             headerBtn.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
-                    if (RoleGroupHidden.TryGetValue(group, out var groupHidden))
+                    if (RoleGroupHidden.TryGetValue(group, out var value))
                     {
-                        RoleGroupHidden[group] = !groupHidden;
+                        RoleGroupHidden[group] = !value;
                     }
                     foreach (var header in Headers)
                     {
@@ -301,20 +227,13 @@ public static class RoleSettingMenuPatches
                 ScrollerNum -= 0.4f;
             }
         }
-
-        __instance.scrollBar.SetScrollBounds(__instance);
+        __instance.scrollBar.SetScrollBounds();
         return false;
     }
 
-    private static void SetScrollBounds(this Scroller scroller, RolesSettingsMenu roleMenu)
+    private static void SetScrollBounds(this Scroller scroller)
     {
-        if (GameSettingMenuPatches.SelectedModIdx == 0)
-        {
-            scroller.CalculateAndSetYBounds(roleMenu.roleChances.Count + 3, 1f, 6f, 0.43f);
-            return;
-        }
-
-        scroller.SetYBoundsMax(-ScrollerNum - 2);
+        scroller.CalculateAndSetYBounds(1 + 1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
         if (RolePositions.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
         {
             scroller.Inner.localPosition = scroll;
@@ -328,45 +247,21 @@ public static class RoleSettingMenuPatches
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.Update))]
-    public static bool UpdatePatch(RolesSettingsMenu __instance)
+    public static bool UpdatePatch()
     {
-        if (GameSettingMenuPatches.SelectedModIdx == 0) return true;
-        if (CurrentRole == null || CurrentRoleOptions == null) return false;
-
-        var hasImage = CurrentRole.RoleScreenshot != null;
-        var num = hasImage ? -0.872f : -1;
-
-        foreach (var opt in CurrentRoleOptions)
-        {
-            if (opt.OptionBehaviour == null) continue;
-
-            if (!opt.Visible.Invoke())
-            {
-                opt.OptionBehaviour.gameObject.SetActive(false);
-                continue;
-            }
-
-            opt.OptionBehaviour.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
-            opt.OptionBehaviour.gameObject.SetActive(true);
-            num += -0.45f;
-        }
-
-        __instance.scrollBar.SetYBoundsMax(-num - 3);
-        return false;
+        return GameSettingMenuPatches.SelectedModIdx == 0;
     }
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(RolesSettingsMenu.OpenChancesTab))]
     public static void OpenChancesTabPostfix(RolesSettingsMenu __instance)
     {
-        if (!__instance.scrollBar)
+        if (GameSettingMenuPatches.SelectedModIdx == 0 || !__instance.scrollBar)
         {
             return;
         }
 
-        CurrentRole = null;
-        CurrentRoleOptions = null;
-        __instance.scrollBar.SetScrollBounds(__instance);
+        __instance.scrollBar.SetScrollBounds();
     }
 
     private static void ValueChanged(OptionBehaviour obj)
@@ -405,7 +300,7 @@ public static class RoleSettingMenuPatches
 
         if (AmongUsClient.Instance.AmHost)
         {
-            Rpc<SyncRoleOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [role.GetNetData()], true);
+            Rpc<SyncRoleOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [role.GetNetData()]);
         }
 
         GameOptionsManager.Instance.GameHostOptions = GameOptionsManager.Instance.CurrentGameOptions;
@@ -418,16 +313,16 @@ public static class RoleSettingMenuPatches
             optBehaviour.gameObject.DestroyImmediate();
         }
 
-        CurrentRole = role;
         __instance.advancedSettingChildren.Clear();
 
-        // TODO: create sub groups under the role settings.
-        var filteredOptions = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.GroupVisible() && x.OptionableType == role.GetType())
-            .SelectMany(x => x.Options)
-            .ToList() ?? [];
+        var hasImage = role.RoleScreenshot != null;
+        var num = hasImage ? -0.872f : -1;
 
-        CurrentRoleOptions = filteredOptions;
+        // TODO: create sub groups under the role settings.
+        var filteredOptions = GameSettingMenuPatches.SelectedMod?.OptionGroups
+            .Where(x=> x.OptionableType == role.GetType())
+            .SelectMany(x=>x.Options)
+            .ToList() ?? [];
 
         foreach (var option in filteredOptions)
         {
@@ -435,9 +330,9 @@ public static class RoleSettingMenuPatches
                 __instance.checkboxOrigin,
                 __instance.numberOptionOrigin,
                 __instance.stringOptionOrigin,
-                GameSettingMenu.Instance.GameSettingsTab.playerOptionOrigin,
                 __instance.AdvancedRolesSettings.transform);
 
+            newOpt.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
             newOpt.SetClickMask(__instance.ButtonClickMask);
 
             SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
@@ -455,10 +350,11 @@ public static class RoleSettingMenuPatches
             newOpt.LabelBackground.enabled = false;
             __instance.advancedSettingChildren.Add(newOpt);
 
-            newOpt.gameObject.SetActive(false);
+            num += -0.45f;
             newOpt.Initialize();
         }
 
+        __instance.scrollBar.CalculateAndSetYBounds(__instance.advancedSettingChildren.Count + 3, 1f, 6f, 0.45f);
         __instance.scrollBar.ScrollToTop();
     }
 
@@ -582,32 +478,15 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);
-        roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
-        roleOptionSetting.ChancePlusBtn.SetInteractable(true);
-        roleOptionSetting.CountMinusBtn.SetInteractable(true);
-        roleOptionSetting.CountPlusBtn.SetInteractable(true);
         __instance.roleChances.Add(roleOptionSetting);
 
-        roleOptionSetting.titleText.transform.localPosition = new Vector3(-0.25f, -0.2923f, 0f);
+        roleOptionSetting.titleText.transform.localPosition = new Vector3(-0.5376f, -0.2923f, 0f);
         roleOptionSetting.titleText.color = customRole.OptionsMenuColor.FindAlternateColor();
         roleOptionSetting.titleText.horizontalAlignment = HorizontalAlignmentOptions.Left;
 
-        if (customRole.Configuration.Icon != null)
-        {
-            var roleIcon = new GameObject("RoleIcon");
-            roleIcon.transform.parent = roleOptionSetting.transform;
-            roleIcon.transform.localScale = new(.25f, .25f, 1);
-            roleIcon.layer = LayerMask.NameToLayer("UI");
-            roleIcon.transform.localPosition = new Vector3(-1.3f, -0.3f, -2f);
-            var rend = roleIcon.AddComponent<SpriteRenderer>();
-            rend.sprite = customRole.Configuration.Icon.LoadAsset();
-
-            rend.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-        }
-
         if (GameSettingMenuPatches.SelectedMod is null ||
-            GameSettingMenuPatches.SelectedMod.InternalOptionGroups
-                .Exists(x => x.GroupVisible() && x.OptionableType == role.GetType() && x.Options.Any(y => y.Visible())))
+            GameSettingMenuPatches.SelectedMod.OptionGroups
+                .Exists(x => x.OptionableType == role.GetType()))
         {
             var newButton = Object.Instantiate(roleOptionSetting.buttons[0], roleOptionSetting.transform);
             newButton.name = "ConfigButton";
@@ -638,7 +517,7 @@ public static class RoleSettingMenuPatches
             roleOptionSetting.ChancePlusBtn.gameObject.SetActive(false);
         }
 
-        if (index < GameSettingMenuPatches.SelectedMod?.InternalRoles.Count - 1)
+        if (index < GameSettingMenuPatches.SelectedMod?.CustomRoles.Count - 1)
         {
             ScrollerNum -= 0.43f;
         }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Linq;
+using System.Linq;
 using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
@@ -8,7 +7,6 @@ using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Voting;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 
 namespace MiraAPI.Patches;
@@ -68,53 +66,14 @@ internal static class PlayerControlPatches
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.CheckMurder))]
-    public static void PlayerControlCheckMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool __runOriginal)
+    [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
+    // ReSharper disable once InconsistentNaming
+    public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
     {
-        __runOriginal = false;
-
-        __instance.logger.Debug($"Checking if {__instance.PlayerId} murdered {(target == null ? "null player" : target.PlayerId.ToString(NumberFormatInfo.InvariantInfo))}");
-
-        __instance.isKilling = false;
-        if (AmongUsClient.Instance.IsGameOver || !AmongUsClient.Instance.AmHost)
-        {
-            return;
-        }
-
-        if (!target || __instance.Data.IsDead || !__instance.Data.Role.IsImpostor || __instance.Data.Disconnected)
-        {
-            int num = target ? target!.PlayerId : -1;
-            __instance.logger.Warning($"Bad kill from {__instance.PlayerId} to {num}");
-            __instance.RpcMurderPlayer(target, false);
-            return;
-        }
-
-        NetworkedPlayerInfo data = target!.Data;
-        if (data == null || data.IsDead || target.inVent || target.MyPhysics.Animations.IsPlayingEnterVentAnimation() ||
-            target.MyPhysics.Animations.IsPlayingAnyLadderAnimation() || target.inMovingPlat)
-        {
-            __instance.logger.Warning("Invalid target data for kill");
-            __instance.RpcMurderPlayer(target, false);
-            return;
-        }
-
-        if (MeetingHud.Instance)
-        {
-            __instance.logger.Warning("Tried to kill while a meeting was starting");
-            __instance.RpcMurderPlayer(target, false);
-            return;
-        }
-
         var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
         MiraEventManager.InvokeEvent(beforeMurderEvent);
 
-        if (beforeMurderEvent.IsCancelled)
-        {
-            return;
-        }
-
-        __instance.isKilling = true;
-        __instance.RpcMurderPlayer(target, true);
+        didSucceed = beforeMurderEvent.IsCancelled;
     }
 
     [HarmonyPostfix]
@@ -134,19 +93,12 @@ internal static class PlayerControlPatches
                 continue;
             }
 
-            try
+            if (!button.Enabled(__instance.Data?.Role))
             {
-                if (!button.Enabled(__instance.Data?.Role))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                button.FixedUpdateHandler(__instance);
-            }
-            catch (System.Exception e)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to update custom button {button.GetType().Name}: {e}");
-            }
+            button.FixedUpdateHandler(__instance);
         }
     }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -33,18 +33,13 @@ internal static class EjectionPatches
         __instance.completeString = role.GetCustomEjectionMessage(__instance.initData.networkedPlayer);
     }
 
-    [HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
-    public static class ReEnableGameplayPatch
+    [HarmonyPatch(typeof(ExileController), nameof(ExileController.WrapUp))]
+    public static class WrapUpPatch
     {
         public static void Postfix()
         {
-            var @event = new BeforeRoundStartEvent(false);
+            var @event = new RoundStartEvent(false);
             MiraEventManager.InvokeEvent(@event);
-
-            if (@event.IsCancelled) return;
-
-            var @event2 = new RoundStartEvent(false);
-            MiraEventManager.InvokeEvent(@event2);
         }
     }
 }

MiraAPI/Patches/Roles/GameStartupPatch.cs

@@ -23,11 +23,7 @@ public static class GameStartupPatch
 
         _runOnce = true;
 
-        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0)
-        {
-            return;
-        }
-
+        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0) return;
         foreach (var queue in MiraPluginManager.Instance.QueuedRoleRegistrations)
         {
             CustomRoleManager.RegisterRoleTypes(queue.Value, queue.Key);

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -7,8 +7,7 @@ namespace MiraAPI.Patches.Roles;
 /// <summary>
 /// Patches the haunt menu to show the actual role name rather then team.
 /// </summary>
-[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetHauntTarget))]
-// SetFilterText was INLINED
+[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetFilterText))]
 public static class HauntMenuMinigamePatch
 {
     public static void Postfix(HauntMenuMinigame __instance)

MiraAPI/Patches/Roles/HowToPlayPatch.cs

@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.GameOptions;
-using HarmonyLib;
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(HowToPlayScene), nameof(HowToPlayScene.OpenRolesSelectionMenu))]
-internal static class HowToPlayPatch
-{
-    // yes i patched the entire method
-    private static void Prefix(HowToPlayScene __instance)
-    {
-        __instance.sceneIndex = 0;
-        __instance.category = HowToPlayScene.HowToPlayCategory.RolesSelection;
-        __instance.startPage.SetActive(false);
-        if (__instance.roleButtonsParent.childCount == 0)
-        {
-            using (IEnumerator<RoleBehaviour> enumerator = RoleManager.Instance.AllRoles.ToArray().Where(x => !x.IsCustomRole()).GetEnumerator())
-            {
-                while (enumerator.MoveNext())
-                {
-                    RoleBehaviour role = enumerator.Current;
-                    if (!role.IsSimpleRole && role.Role != RoleTypes.CrewmateGhost && role.Role != RoleTypes.ImpostorGhost)
-                    {
-                        HowToPlayRoleButton component = Object.Instantiate(__instance.roleButtonPrefab, __instance.roleButtonsParent).GetComponent<HowToPlayRoleButton>();
-                        Sprite roleIcon = __instance.rolesScenes.ToArray().First(r => r.role == role.Role).roleIcon;
-                        component.SetRoleInfo(role, roleIcon);
-                        component.SetButtonAction((Il2CppSystem.Action)(() =>
-                        {
-                            __instance.OpenRolePage(role.Role);
-                        }));
-                        __instance.controllerSelectables.Add(component.GetComponent<PassiveButton>());
-                    }
-                }
-            }
-            foreach (UiElement uiElement in __instance.controllerSelectables)
-            {
-                uiElement.ReceiveMouseOut();
-            }
-            ControllerManager.Instance.NewScene(__instance.name, __instance.closeButton, __instance.defaultButtonSelected, __instance.controllerSelectables, false);
-        }
-        __instance.DisableAllScenes();
-        __instance.roleSelectionScene.SetActive(true);
-        ControllerManager.Instance.SetDefaultSelection(__instance.defaultButtonSelected, null);
-    }
-}

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -12,7 +12,7 @@ namespace MiraAPI.Patches.Roles;
 public static class HudManagerPatches
 {
     // Custom role tab.
-    public static TaskPanelBehaviour? RoleTab;
+    private static TaskPanelBehaviour? _roleTab;
 
     /// <summary>
     /// Fixes Kill Button not showing for Neutral killing role.
@@ -38,9 +38,9 @@ public static class HudManagerPatches
             __instance.SabotageButton.gameObject.SetActive(isActive && customRole.Configuration.CanUseSabotage);
         }
 
-        if (RoleTab)
+        if (_roleTab)
         {
-            RoleTab?.gameObject.SetActive(isActive);
+            _roleTab?.gameObject.SetActive(isActive);
         }
     }
 
@@ -62,16 +62,16 @@ public static class HudManagerPatches
 
         if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
         {
-            if (RoleTab == null)
+            if (_roleTab == null)
             {
-                RoleTab = CustomRoleManager.CreateRoleTab(customRole);
+                _roleTab = CustomRoleManager.CreateRoleTab(customRole);
             }
 
-            CustomRoleManager.UpdateRoleTab(RoleTab, customRole);
+            CustomRoleManager.UpdateRoleTab(_roleTab, customRole);
         }
-        else if (RoleTab)
+        else if (_roleTab)
         {
-            RoleTab?.gameObject.Destroy();
+            _roleTab?.gameObject.Destroy();
         }
     }
 }