Merge branch 'dev' into android

# Conflicts:
#	AmongUs.props

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -3,10 +3,10 @@ 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;
-using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Freezer;
@@ -16,12 +16,10 @@ public class FreezeButton : CustomActionButton<PlayerControl>
     public override string Name => "Freeze";
 
     public override float Cooldown => OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeDuration;
-
-    public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
+    public override bool PauseTimerInVent => true;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.T;
-    public override ModifierKey Modifier1 => ModifierKey.Control;
+    public override MiraKeybind? Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
     protected override void OnClick()
     {

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -1,8 +1,8 @@
 using MiraAPI.Example.Modifiers;
 using MiraAPI.Hud;
+using MiraAPI.Keybinds;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities.Assets;
-using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
@@ -16,9 +16,7 @@ public class MeetingButton : CustomActionButton
     public override int MaxUses => 3;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.P;
-    public override ModifierKey Modifier1 => ModifierKey.Control;
-    public override ModifierKey Modifier2 => ModifierKey.Shift;
+    public override MiraKeybind? Keybind => MiraGlobalKeybinds.ModifierPrimaryAbility;
 
     public override bool Enabled(RoleBehaviour? role)
     {

MiraAPI.Example/Buttons/NeutralKillerButton.cs

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

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -3,9 +3,9 @@ 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 Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
@@ -22,7 +22,8 @@ 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 KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.M;
+    public override MiraKeybind? Keybind => MiraGlobalKeybinds.PrimaryAbility;
+
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is TeleporterRole;

MiraAPI.Example/Buttons/ThinkButton.cs

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

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

@@ -0,0 +1,53 @@
+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,4 +1,5 @@
-using BepInEx;
+using System.Linq;
+using BepInEx;
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;