Update MiraAPI

Author: CallOfCreator

NewMod/Buttons/Aegis/AegisButton.cs

@@ -4,8 +4,8 @@
 using NewMod.Options.Roles.AegisOptions;
 using UnityEngine;
 using AG = NewMod.Roles.CrewmateRoles.Aegis;
-using Rewired;
 using NewMod.Utilities;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Aegis
 {
@@ -37,7 +37,7 @@ public class AegisButton : CustomActionButton
         /// <summary>
         /// Default keybind for Aegis.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.G;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
         /// <summary>
         /// No “hold” effect, instant cast.

NewMod/Buttons/Edgeveil/ArcButton.cs

@@ -8,6 +8,7 @@
 using NewMod.Components.ScreenEffects;
 using NewMod.Utilities;
 using Reactor.Utilities;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Edgeveil
 {
@@ -39,7 +40,7 @@ public class ArcButton : CustomActionButton
         /// <summary>
         /// Default keybind for Edgeveil's Arc ability.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.Q;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
         /// <summary>
         /// Defines where on the screen this button should appear.

NewMod/Buttons/EnergyThief/DrainButton.cs

@@ -6,7 +6,7 @@
 using ET = NewMod.Roles.NeutralRoles.EnergyThief;
 using UnityEngine;
 using NewMod.Utilities;
-using Rewired;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.EnergyThief
 {
@@ -34,11 +34,11 @@ public class DrainButton : CustomActionButton<PlayerControl>
         /// The on-screen position of this button.
         /// </summary>
         public override ButtonLocation Location => ButtonLocation.BottomRight;
-        
+
         /// <summary>
         /// Default keybind for EnergyThief's Drain ability.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.F;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
         /// <summary>
         /// The duration of the effect applied by this button; in this case, zero.

NewMod/Buttons/Injector/InjectButton.cs

@@ -7,7 +7,7 @@
 using MiraAPI.Utilities;
 using System;
 using static NewMod.Utilities.Utils;
-using Rewired;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Injector
 {
@@ -45,7 +45,7 @@ public class InjectButton : CustomActionButton<PlayerControl>
         /// <summary>
         /// Default keybind for Injector's Inject ability.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.C;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
         /// <summary>
         /// Sprite/icon displayed on the button.

NewMod/Buttons/Necromancer/ReviveButton.cs

@@ -5,7 +5,7 @@
 using NewMod.Roles.ImpostorRoles;
 using UnityEngine;
 using NewMod.Utilities;
-using Rewired;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Necromancer
 {
@@ -37,7 +37,7 @@ public class ReviveButton : CustomActionButton
         /// <summary>
         /// Default keybind for Necromancer's Revive ability.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.V;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
         /// <summary>
         /// Defines where on the screen this button should appear.

NewMod/Buttons/Overload/FinalButton.cs

@@ -1,5 +1,6 @@
 using MiraAPI.GameOptions;
 using MiraAPI.Hud;
+using MiraAPI.Keybinds;
 using MiraAPI.Utilities.Assets;
 using NewMod.Options.Roles.OverloadOptions;
 using NewMod.Roles.NeutralRoles;
@@ -32,7 +33,7 @@ public class FinalAbilityButton : CustomActionButton
         /// <summary>
         /// Default keybind for the Final Ability button.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.B;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
 
         /// <summary>
         /// No duration effect.

NewMod/Buttons/Overload/OverloadButton.cs

@@ -1,7 +1,7 @@
 using MiraAPI.Hud;
+using MiraAPI.Keybinds;
 using MiraAPI.Utilities.Assets;
 using NewMod.Roles.NeutralRoles;
-using Rewired;
 using UnityEngine;
 
 namespace NewMod.Buttons.Overload
@@ -47,7 +47,7 @@ public class OverloadButton : CustomActionButton
         /// Stores the default key assigned to the absorbed button's action.
         /// Mirrors the keybind of the original absorbed button.
         /// </summary>
-        public KeyboardKeyCode absorbedKeybind;
+        public MiraKeybind absorbedKeybind;
 
         /// <summary>
         /// The name displayed on the button.
@@ -67,7 +67,7 @@ public class OverloadButton : CustomActionButton
         /// <summary>
         /// Default keybind for Overload's Overload ability.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => absorbedKeybind;
+        public override MiraKeybind Keybind => absorbedKeybind;
 
         /// <summary>
         /// Determines how long the effect from clicking the button lasts. In this case, no duration is set.
@@ -96,7 +96,7 @@ public void Absorb(CustomActionButton target)
             absorbedCooldown = target.Cooldown;
             absorbedMaxUses = target.MaxUses;
             absorbedSprite = target.Sprite;
-            absorbedKeybind = target.Defaultkeybind;
+            absorbedKeybind = target.Keybind;
             absorbedOnClick = () => target.GetType().GetMethod("OnClick", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
                               ?.Invoke(target, null);
 

NewMod/Buttons/Prankster/FakeBodyButton.cs

@@ -7,6 +7,7 @@
 using UnityEngine;
 using NewMod.Utilities;
 using Rewired;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Prankster
 {
@@ -38,7 +39,7 @@ public class FakeBodyButton : CustomActionButton
         /// <summary>
         /// Default keybind for Prankster's Fake Body ability.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.Z;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
 
         /// <summary>
         /// The duration of any effect caused by this button press; in this case, no effect duration is used.

NewMod/Buttons/PulseBlade/StrikeButton.cs

@@ -12,6 +12,7 @@
 using NewMod.Utilities;
 using Reactor.Networking.Attributes;
 using Rewired;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Pulseblade
 {
@@ -48,10 +49,8 @@ public class StrikeButton : CustomActionButton
 
         /// <summary>
         /// Default keybind for Pulseblade's Strike ability.  
-        /// Requires Shift as a modifier to prevent accidental use.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.G;
-        public override ModifierKey Modifier1 => ModifierKey.Shift;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
         /// <summary>
         /// Sprite used for the button — set to empty;
         /// </summary>

NewMod/Buttons/Revenant/DoomAwakening.cs

@@ -9,8 +9,7 @@
 using NewMod.Utilities;
 using Reactor.Utilities;
 using UnityEngine;
-using TMPro;
-using Rewired;
+using MiraAPI.Keybinds;
 
 namespace NewMod.Buttons.Revenant
 {
@@ -41,10 +40,9 @@ public class DoomAwakening : CustomActionButton
 
         /// <summary>
         /// Default keybind for Doom's Awakening ability.  
-        /// Requires Alt as a modifier to prevent accidental use.
         /// </summary>
-        public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.B;
-        public override ModifierKey Modifier1 => ModifierKey.Alt;
+        public override MiraKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
+
         /// <summary>
         /// Determines how long the effect lasts. Configured in <see cref="RevenantOptions"/>.
         /// </summary>