WIP Anim API

AmongUs.props

@@ -2,7 +2,7 @@
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.9.4" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.8.13" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" />

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.1.8</VersionPrefix>
+        <VersionPrefix>0.1.4</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -21,7 +21,7 @@ public class MeetingButton : CustomActionButton
 
     public override bool Enabled(RoleBehaviour? role)
     {
-        return PlayerControl.LocalPlayer != null && PlayerControl.LocalPlayer.HasModifier<CaptainModifier>();
+        return PlayerControl.LocalPlayer.HasModifier<CaptainModifier>();
     }
 
     protected override void OnClick()

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -43,4 +43,4 @@ public class ChameloenRole : CrewmateRole, ICustomRole
             }
         }
     }
-}
+}

MiraAPI/Animations/AnimationPresetManager.cs

@@ -0,0 +1,46 @@
+using MiraAPI.Animations;
+using System;
+using System.Collections.Generic;
+
+namespace MiraAPI.Modifiers;
+
+/// <summary>
+/// The manager for handling modifiers.
+/// </summary>
+public static class AnimationPresetManager
+{
+    private static uint _nextId;
+
+    /// <summary>
+    /// Gets registered Animation Presets.
+    /// </summary>
+    public static List<CustomAnimationPreset> Presets { get; internal set; } = new List<CustomAnimationPreset>();
+
+    private static uint GetNextId()
+    {
+        _nextId++;
+        return _nextId;
+    }
+
+    /// <summary>
+    /// Get Animation Preset by ID.
+    /// </summary>
+    /// <param name="id">The id of the preset you want to find.</param>
+    /// <returns>The animation preset.</returns>
+    public static CustomAnimationPreset? GetPresetById(uint id)
+    {
+        return Presets.Find(p => p.Id == id);
+    }
+
+    internal static void RegisterPreset(Type modifierType)
+    {
+        if (!typeof(CustomAnimationPreset).IsAssignableFrom(modifierType))
+        {
+            return;
+        }
+
+        CustomAnimationPreset preset = (CustomAnimationPreset)Activator.CreateInstance(modifierType);
+        preset.Id = GetNextId();
+        Presets.Add(preset);
+    }
+}

MiraAPI/Animations/CustomAnimationPreset.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+
+namespace MiraAPI.Animations;
+
+/// <summary>
+/// Configure an animation's settings using presets.
+/// </summary>
+/// <param name="clip">The animation clip the preset will use.</param>
+public abstract class CustomAnimationPreset(AnimationClip clip)
+{
+    internal uint Id;
+
+    internal void PlayAnimation(PlayerControl source)
+    {
+
+    }
+
+    /// <summary>
+    /// Check whether the local player should be able to see this animation.
+    /// </summary>
+    /// <param name="source">The player who the animation is being triggered upon.</param>
+    /// <returns>Whether the local player can see the animation or not.</returns>
+    public abstract bool AnimationVisible(PlayerControl source);
+}

MiraAPI/Animations/CustomAnimator.cs

@@ -0,0 +1,38 @@
+using MiraAPI.Animations.Presets;
+using MiraAPI.Modifiers;
+using MiraAPI.Networking;
+using MiraAPI.Utilities;
+using Reactor.Networking.Attributes;
+using Reactor.Utilities.Attributes;
+using System;
+using UnityEngine;
+
+namespace MiraAPI.Animations;
+
+[RegisterInIl2Cpp]
+public class CustomAnimator(IntPtr cppPtr) : MonoBehaviour(cppPtr)
+{
+    private PlayerControl _player;
+
+    private void Start()
+    {
+        _player = gameObject.GetComponent<PlayerControl>();
+
+        _player.GetCustomAnimator()?.TriggerCustomAnimation(new LocalAnimationPreset(new AnimationClip()));
+    }
+
+    public void TriggerCustomAnimation(CustomAnimationPreset preset) => RpcTriggerCustomAnimation(_player, preset.Id);
+
+
+    [MethodRpc((uint)MiraRpc.TriggerAnimation)]
+    internal static void RpcTriggerCustomAnimation(PlayerControl source, uint presetId)
+    {
+        CustomAnimationPreset preset = AnimationPresetManager.GetPresetById(presetId);
+        if (preset is null) return;
+
+        if (preset.AnimationVisible(source))
+        {
+            preset.PlayAnimation(source);
+        }
+    }
+}

MiraAPI/Animations/Presets/LocalAnimationPreset.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+namespace MiraAPI.Animations.Presets;
+public class LocalAnimationPreset(AnimationClip clip) : CustomAnimationPreset(clip)
+{
+    /// <inheritdoc/>
+    public override bool AnimationVisible(PlayerControl source)
+    {
+        return source.AmOwner;
+    }
+}

MiraAPI/Animations/RegisterAnimationPresetAttribute.cs

@@ -0,0 +1,6 @@
+using System;
+
+namespace MiraAPI.Animations;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class RegisterAnimationPresetAttribute : Attribute;

MiraAPI/GameOptions/IModdedOption.cs

@@ -12,7 +12,7 @@ internal interface IModdedOption
     string Title { get; }
     StringNames StringName { get; }
     IMiraPlugin? ParentMod { get; set; }
-    BaseGameSetting Data { get; }
+    BaseGameSetting? Data { get; }
     Type? AdvancedRole { get; set; }
     OptionBehaviour? OptionBehaviour { get; }
     Func<bool> Visible { get; set; }

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -45,10 +45,6 @@ public static class ModdedOptionsManager
         TypeToGroup.Add(type, group);
         pluginInfo.OptionGroups.Add(group);
 
-        typeof(OptionGroupSingleton<>).MakeGenericType(type)
-            .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-            .SetValue(null, group);
-
         return true;
     }
 

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -86,7 +86,7 @@ public class ModdedEnumOption : ModdedOption<int>
     /// <inheritdoc />
     protected override void OnValueChanged(int newValue)
     {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
         if (!OptionBehaviour)
         {
             return;

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -134,7 +134,7 @@ public class ModdedNumberOption : ModdedOption<float>
     protected override void OnValueChanged(float newValue)
     {
         Value = Mathf.Clamp(newValue, Min, Max);
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(
             StringName,
             Data?.GetValueString(Value),
             false);

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -35,7 +35,7 @@ public abstract class ModdedOption<T> : IModdedOption
     /// <summary>
     /// Gets the BaseGameSetting data of the option.
     /// </summary>
-    public BaseGameSetting Data { get; protected init; }
+    public BaseGameSetting? Data { get; protected init; }
 
     /// <summary>
     /// Gets or sets the parent mod of the option.

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -69,7 +69,7 @@ public class ModdedToggleOption : ModdedOption<bool>
     /// <inheritdoc />
     protected override void OnValueChanged(bool newValue)
     {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
         if (!OptionBehaviour)
         {
             return;

MiraAPI/Modifiers/ModifierComponent.cs

@@ -39,6 +39,11 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
     internal void ClearModifiers()
     {
+        foreach (var modifier in Modifiers)
+        {
+            modifier.OnDeactivate();
+        }
+
         _toRemove.AddRange(Modifiers);
     }
 
@@ -69,7 +74,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             Modifiers.Add(modifier);
             modifier.OnActivate();
 
-            if (modifier is TimedModifier { AutoStart: true } timer)
+            if (_player?.AmOwner == true && modifier is TimedModifier { AutoStart: true } timer)
             {
                 timer.StartTimer();
             }

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -39,9 +39,6 @@ public abstract class TimedModifier : BaseModifier
     /// </summary>
     public float TimeRemaining { get; protected set; }
 
-    /// <inheritdoc />
-    public override bool HideOnUi => !TimerActive;
-
     /// <summary>
     /// Gets the HUD information for Timed Modifier, including the time remaining.
     /// </summary>
@@ -56,18 +53,25 @@ public abstract class TimedModifier : BaseModifier
     /// </summary>
     public override void FixedUpdate()
     {
-        if (!TimerActive)
+        if (Player?.AmOwner == false)
         {
             return;
         }
 
-        if (TimeRemaining > 0)
+        if (TimeRemaining > 0 && TimerActive)
         {
             TimeRemaining -= Time.fixedDeltaTime;
         }
         else
         {
-            StopTimer();
+            TimerActive = false;
+            TimeRemaining = Duration;
+            OnTimerComplete();
+
+            if (RemoveOnComplete)
+            {
+                ModifierComponent?.RemoveModifier(ModifierId);
+            }
         }
     }
 
@@ -82,52 +86,7 @@ public abstract class TimedModifier : BaseModifier
             return;
         }
 
-        TimeRemaining = Duration;
         TimerActive = true;
-    }
-
-    /// <summary>
-    /// Stops the timer and calls OnTimerComplete().
-    /// </summary>
-    public void StopTimer()
-    {
-        if (!TimerActive)
-        {
-            return;
-        }
-
-        TimerActive = false;
         TimeRemaining = Duration;
-        OnTimerComplete();
-
-        if (RemoveOnComplete)
-        {
-            ModifierComponent?.RemoveModifier(ModifierId);
-        }
-    }
-
-    /// <summary>
-    /// Resets the timer. Does not call OnTimerComplete().
-    /// </summary>
-    public void ResetTimer()
-    {
-        TimerActive = false;
-        TimeRemaining = Duration;
-    }
-
-    /// <summary>
-    /// Pauses the timer.
-    /// </summary>
-    public void PauseTimer()
-    {
-        TimerActive = false;
-    }
-
-    /// <summary>
-    /// Pauses the timer.
-    /// </summary>
-    public void ResumeTimer()
-    {
-        TimerActive = true;
     }
 }

MiraAPI/Networking/CustomMurderRpc.cs

@@ -87,7 +87,7 @@ public static class CustomMurderRpc
             if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
             {
                 StatsManager.Instance.IncrementStat(StringNames.StatsGuardianAngelCrewmatesProtected);
-                AchievementManager.Instance.OnProtectACrewmate();
+                DestroyableSingleton<AchievementManager>.Instance.OnProtectACrewmate();
             }
 
             if (source.AmOwner || flag)
@@ -115,7 +115,7 @@ public static class CustomMurderRpc
             return;
         }
 
-        DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
+        DestroyableSingleton<DebugAnalytics>.Instance.Analytics.Kill(target.Data, source.Data);
         if (source.AmOwner)
         {
             StatsManager.Instance.IncrementStat(
@@ -139,7 +139,7 @@ public static class CustomMurderRpc
             }
         }
 
-        UnityTelemetry.Instance.WriteMurder();
+        DestroyableSingleton<UnityTelemetry>.Instance.WriteMurder();
         target.gameObject.layer = LayerMask.NameToLayer("Ghost");
         if (target.AmOwner)
         {
@@ -159,14 +159,14 @@ public static class CustomMurderRpc
 
             if (showKillAnim)
             {
-                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
+                DestroyableSingleton<HudManager>.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
             }
 
             target.cosmetics.SetNameMask(false);
             target.RpcSetScanner(false);
         }
 
-        AchievementManager.Instance.OnMurder(
+        DestroyableSingleton<AchievementManager>.Instance.OnMurder(
             source.AmOwner,
             target.AmOwner,
             source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,

MiraAPI/Networking/MiraRpc.cs

@@ -34,4 +34,9 @@ public enum MiraRpc : uint
     /// Custom Murder RPC.
     /// </summary>
     CustomMurder,
+
+    /// <summary>
+    /// Trigger Animation using CustomAnimator.
+    /// </summary>
+    TriggerAnimation,
 }

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,6 +1,5 @@
 using HarmonyLib;
 using MiraAPI.Hud;
-using MiraAPI.Roles;
 using Reactor.Utilities.Extensions;
 using UnityEngine;
 using Object = UnityEngine.Object;

MiraAPI/Patches/Modifiers/VentPatches.cs

@@ -1,35 +1,26 @@
 using HarmonyLib;
-using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using UnityEngine;
 
-namespace MiraAPI.Patches;
+namespace MiraAPI.Patches.Modifiers;
 
-/// <summary>
-/// Vent patches to make sure the player is able to use the vent.
-/// </summary>
 [HarmonyPatch(typeof(Vent))]
 public static class VentPatches
 {
-    /// <summary>
-    /// CanUse patch.
-    /// </summary>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(Vent.CanUse))]
-    public static void VentCanUsePostfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
+    public static void CanUseVentPatch(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
     {
         var @object = pc.Object;
         var role = @object.Data.Role;
 
-        var canVent = role is ICustomRole customRole ? customRole.CanUseVent : role.CanVent;
-
         var modifiers = @object.GetModifierComponent()?.ActiveModifiers;
         if (modifiers is null || modifiers.Count <= 0)
         {
             return;
         }
 
-        switch (canVent)
+        switch (role.CanVent)
         {
             case true when modifiers.Exists(x => !x.CanVent()):
                 couldUse = canUse = false;

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -32,25 +32,16 @@ public static class GameOptionsMenuPatch
         var num = 2.1f;
         var filteredGroups =
             GameSettingMenuPatches.SelectedMod?.OptionGroups.Where(
-                x => x.AdvancedRole is null) ?? [];
+                x => x.GroupVisible.Invoke() && x.AdvancedRole is null) ?? [];
 
         foreach (var group in filteredGroups)
         {
-            if (group.Options.Count == 0 || group.Header is null)
+            var filteredOpts = group.Options.Where(x => x.Visible.Invoke()).ToList();
+            if (filteredOpts.Count == 0 || group.Header is null)
             {
                 continue;
             }
 
-            if (!group.GroupVisible.Invoke())
-            {
-                group.Header.gameObject.SetActive(false);
-                foreach (var option in group.Options)
-                {
-                    option.OptionBehaviour?.gameObject.SetActive(false);
-                }
-                continue;
-            }
-
             group.Header.gameObject.SetActive(true);
             group.Header.transform.localScale = Vector3.one * 0.63f;
             group.Header.transform.localPosition = new Vector3(-0.903f, num, -2f);

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -6,7 +6,6 @@ using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -129,6 +128,11 @@ public static class LobbyViewPanePatches
 
         foreach (var group in filteredGroups)
         {
+            if (group.Options.Count == 0)
+            {
+                continue;
+            }
+
             var categoryHeaderMasked = Object.Instantiate(
                 instance.categoryHeaderOrigin,
                 instance.settingsContainer,
@@ -172,6 +176,11 @@ public static class LobbyViewPanePatches
 
                 var data = option.Data;
 
+                if (data == null)
+                {
+                    continue;
+                }
+
                 if (data.Type == OptionTypes.Checkbox)
                 {
                     viewSettingsInfoPanel.SetInfoCheckbox(
@@ -390,6 +399,11 @@ public static class LobbyViewPanePatches
 
             var value = option.GetFloatData();
 
+            if (baseGameSetting == null)
+            {
+                continue;
+            }
+
             if (baseGameSetting.Type == OptionTypes.Checkbox)
             {
                 viewSettingsInfoPanel.SetInfoCheckbox(baseGameSetting.Title, maskLayer, value > 0f);

MiraAPI/Patches/Options/NotificationPopperPatch.cs

@@ -18,7 +18,7 @@ public static class NotificationPopperPatch
         [HarmonyArgument(3)] RoleTeamTypes teamType,
         [HarmonyArgument(4)] bool playSound)
     {
-        if (CustomRoleManager.CustomRoles.Values.FirstOrDefault(x=>x.StringName==key) is not ICustomRole customRole)
+        if (CustomRoleManager.CustomRoles.Values.All(role => role.StringName != key))
         {
             return true;
         }
@@ -27,14 +27,12 @@ public static class NotificationPopperPatch
             ? Palette.CrewmateSettingChangeText.ToTextColor()
             : Palette.ImpostorRed.ToTextColor();
 
-        var item = TranslationController.Instance.GetString(
+        var item = DestroyableSingleton<TranslationController>.Instance.GetString(
             StringNames.LobbyChangeSettingNotificationRole,
-            string.Concat(
+            "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
-                "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
+            text,
-                text,
+            DestroyableSingleton<TranslationController>.Instance.GetString(key, Array.Empty<Object>()),
-                TranslationController.Instance.GetString(key, Array.Empty<Object>()),
+            "</color></font>",
-                "</color></font>"
-            ),
             "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">" + roleCount + "</font>",
             "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">" + roleChance + "%"
         );

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -17,7 +17,7 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
@@ -39,7 +39,7 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
@@ -61,8 +61,8 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
-        __instance.ValueText.text = TranslationController.Instance.GetString(
+        __instance.ValueText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
             __instance.Values[__instance.Value],
             Array.Empty<Object>());
 

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -178,7 +178,7 @@ public static class RoleSettingMenuPatches
         }
 
         roleSetting.UpdateValuesAndText(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions);
-        HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(
             roleSetting.Role.StringName,
             roleSetting.RoleMaxCount,
             roleSetting.RoleChance,
@@ -254,7 +254,7 @@ public static class RoleSettingMenuPatches
         }
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
-        __instance.roleTitleText.text = TranslationController.Instance.GetString(
+        __instance.roleTitleText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
             role.StringName,
             new Il2CppReferenceArray<Il2CppSystem.Object>(0));
         __instance.roleScreenshot.sprite = Sprite.Create(

MiraAPI/Patches/Options/SettingPatches.cs

@@ -39,9 +39,9 @@ public static class SettingPatches
                 MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
                 MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
                 MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
-                _ => TranslationController.Instance.GetString(
+                _ => DestroyableSingleton<TranslationController>.Instance.GetString(
                     StringNames.GameSecondsAbbrev,
-                    (Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
+                    (Il2CppSystem.Object[]) [value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
             };
         }
 

MiraAPI/Patches/PlayerControlPatches.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using MiraAPI.Animations;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
@@ -13,9 +14,9 @@ namespace MiraAPI.Patches;
 public static class PlayerControlPatches
 {
     /// <summary>
-    /// Adds the modifier component to the player on start.
+    /// Adds the modifier and animator component to the player on start.
     /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
+    /// <param name="__instance">The player which will be given the components.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.Start))]
     public static void PlayerControlStartPostfix(PlayerControl __instance)
@@ -25,13 +26,20 @@ public static class PlayerControlPatches
             comp.DestroyImmediate();
         }
 
+        if (__instance.gameObject.TryGetComponent<CustomAnimator>(out var anim))
+        {
+            anim.DestroyImmediate();
+        }
+
+        __instance.gameObject.AddComponent<CustomAnimator>();
         __instance.gameObject.AddComponent<ModifierComponent>();
     }
 
     /// <summary>
     /// Calls the OnDeath method for all active modifiers.
     /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
+    /// <param name="__instance">The player who died.</param>
+    /// <param name="reason">The reason of the death.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Die))]
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
@@ -40,14 +48,14 @@ public static class PlayerControlPatches
 
         if (modifiersComponent)
         {
-            modifiersComponent.ActiveModifiers.ForEach(x=>x.OnDeath(reason));
+            modifiersComponent.ActiveModifiers.ForEach(x => x.OnDeath(reason));
         }
     }
 
     /// <summary>
     /// FixedUpdate handler for custom roles and custom buttons.
     /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
+    /// <param name="__instance">The player who's fixed update is being called.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
@@ -77,15 +85,4 @@ public static class PlayerControlPatches
             button.FixedUpdateHandler(__instance);
         }
     }
-
-    /// <summary>
-    /// Clear from modifier component cache.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.OnDestroy))]
-    public static void PlayerControlOnDestroyPrefix(PlayerControl __instance)
-    {
-        Utilities.Extensions.ModifierComponents.Remove(__instance);
-    }
 }

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -27,11 +27,10 @@ public static class HudManagerPatches
     {
         var flag = localPlayer.Data != null && localPlayer.Data.IsDead;
 
-        if (role is ICustomRole customRole)
+        if (role is ICustomRole)
         {
-            __instance.KillButton.ToggleVisible(isActive && customRole.UseVanillaKillButton && !flag);
+            __instance.KillButton.ToggleVisible(isActive && role.CanUseKillButton && !flag);
-            __instance.ImpostorVentButton.ToggleVisible(isActive && customRole.CanUseVent && !flag);
+            __instance.ImpostorVentButton.ToggleVisible(isActive && role.CanVent && !flag);
-            __instance.SabotageButton.gameObject.SetActive(isActive && customRole.CanUseSabotage);
         }
 
         if (_roleTab)

MiraAPI/Patches/Roles/SabotageButtonPatch.cs

@@ -1,62 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Roles;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(SabotageButton))]
-public class SabotageButtonPatch
-{
-    /// <summary>
-    /// Patches the Sabotage button to check if the player's custom role can use sabotage.
-    /// </summary>
-    [HarmonyPatch(nameof(SabotageButton.DoClick))]
-    [HarmonyPrefix]
-    public static bool DoClickPrefix(SabotageButton __instance)
-    {
-        var player = PlayerControl.LocalPlayer;
-
-        if (player.Data.Role is not ICustomRole customRole)
-        {
-            return true;
-        }
-
-        if (!customRole.CanUseSabotage || PlayerControl.LocalPlayer.inVent || !GameManager.Instance.SabotagesEnabled())
-        {
-            return false;
-        }
-
-        HudManager.Instance.ToggleMapVisible(
-            new MapOptions
-            {
-                Mode = MapOptions.Modes.Sabotage,
-            });
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(SabotageButton.Refresh))]
-    public static bool RefreshPrefix(SabotageButton __instance)
-    {
-        var player = PlayerControl.LocalPlayer;
-        if (GameManager.Instance == null || player == null)
-        {
-            __instance.ToggleVisible(false);
-            __instance.SetDisabled();
-            return false;
-        }
-
-        if (player.Data.Role is not ICustomRole customRole)
-        {
-            return true;
-        }
-
-        if (player.inVent || !GameManager.Instance.SabotagesEnabled() || player.petting)
-        {
-            __instance.ToggleVisible(customRole.CanUseSabotage && GameManager.Instance.SabotagesEnabled());
-            __instance.SetDisabled();
-            return false;
-        }
-        __instance.SetEnabled();
-        return false;
-    }
-}

MiraAPI/Patches/Roles/TaskAdderPatch.cs

@@ -1,7 +1,7 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
-using System;
+using Il2CppSystem;
-using System.Collections.Generic;
+using Il2CppSystem.Collections.Generic;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities.Assets;
@@ -12,13 +12,10 @@ using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Roles;
 
-/// <summary>
-/// Patch TaskAdder for organizing Roles and adding scroller.
-/// </summary>
 [HarmonyPatch]
 public static class TaskAdderPatch
 {
-    private static readonly Dictionary<string, string> ModsFolders = [];
+    private static readonly System.Collections.Generic.Dictionary<string, string> ModsFolders = [];
     private static Scroller? _scroller;
 
     [HarmonyPostfix]
@@ -170,14 +167,19 @@ public static class TaskAdderPatch
 
             ControllerManager.Instance.AddSelectableUiElement(taskFolder2.Button);
             if (!string.IsNullOrEmpty(__instance.restorePreviousSelectionByFolderName) &&
-                taskFolder2.FolderName.Equals(__instance.restorePreviousSelectionByFolderName, StringComparison.Ordinal))
+                taskFolder2.FolderName.Equals(__instance.restorePreviousSelectionByFolderName, System.StringComparison.Ordinal))
             {
                 __instance.restorePreviousSelectionFound = taskFolder2.Button;
             }
         }
 
         var flag = false;
-        var list = taskFolder.Children.ToArray().OrderBy(t => t.TaskType).ToList();
+        var list = new List<PlayerTask>();
+
+        foreach (var item in taskFolder.Children)
+        {
+            list.Add(item);
+        }
 
         for (var l = 0; l < list.Count; l++)
         {
@@ -188,24 +190,26 @@ public static class TaskAdderPatch
                 case TaskTypes.DivertPower:
                 {
                     var targetSystem = taskAddButton.MyTask.Cast<DivertPowerTask>().TargetSystem;
-                    taskAddButton.Text.text = TranslationController.Instance.GetString(
+                    taskAddButton.Text.text = DestroyableSingleton<TranslationController>.Instance.GetString(
                         StringNames.DivertPowerTo,
-                        TranslationController.Instance.GetString(targetSystem));
+                        DestroyableSingleton<TranslationController>.Instance.GetString(targetSystem));
                     break;
                 }
                 case TaskTypes.FixWeatherNode:
                 {
-                    var nodeId = taskAddButton.MyTask.Cast<WeatherNodeTask>().NodeId;
+                    var nodeId = ((WeatherNodeTask)taskAddButton.MyTask).NodeId;
                     taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(
+                        DestroyableSingleton<TranslationController>.Instance.GetString(
-                            StringNames.FixWeatherNode) + " " +
+                            StringNames.FixWeatherNode,
-                        TranslationController.Instance.GetString(
+                            Array.Empty<Il2CppSystem.Object>()) + " " +
-                            WeatherSwitchGame.ControlNames[nodeId]);
+                        DestroyableSingleton<TranslationController>.Instance.GetString(
+                            WeatherSwitchGame.ControlNames[nodeId],
+                            Array.Empty<Il2CppSystem.Object>());
                     break;
                 }
                 default:
                     taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(taskAddButton.MyTask.TaskType);
+                        DestroyableSingleton<TranslationController>.Instance.GetString(taskAddButton.MyTask.TaskType);
                     break;
             }
 
@@ -234,9 +238,9 @@ public static class TaskAdderPatch
 
         if (taskFolder.FolderName == "Roles")
         {
-            for (var m = 0; m < RoleManager.Instance.AllRoles.Length; m++)
+            for (var m = 0; m < DestroyableSingleton<RoleManager>.Instance.AllRoles.Length; m++)
             {
-                var roleBehaviour = RoleManager.Instance.AllRoles[m];
+                var roleBehaviour = DestroyableSingleton<RoleManager>.Instance.AllRoles[m];
                 if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
                     CustomRoleManager.CustomRoles.ContainsKey((ushort)roleBehaviour.Role))
                 {

MiraAPI/Patches/Roles/VentOutlinePatch.cs

@@ -6,17 +6,12 @@ using UnityEngine;
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Vent patches for Roles.
+/// Set vent outline color based on the player's role.
 /// </summary>
-[HarmonyPatch(typeof(Vent))]
+[HarmonyPatch(typeof(Vent), nameof(Vent.SetOutline))]
-public static class VentPatches
+public static class VentOutlinePatch
 {
-    /// <summary>
+    public static void Postfix(Vent __instance, bool on, bool mainTarget)
-    /// Set outline to player's custom role color.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(Vent.SetOutline))]
-    public static void SetOutlinePostfix(Vent __instance, bool on, bool mainTarget)
     {
         if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole customRole)
         {

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -1,8 +1,5 @@
-using System;
+using BepInEx.Unity.IL2CPP;
-using System.Collections.Generic;
+using MiraAPI.Animations;
-using System.Linq;
-using System.Reflection;
-using BepInEx.Unity.IL2CPP;
 using MiraAPI.Colors;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
@@ -10,17 +7,29 @@ using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
+using MiraAPI.Utilities.Assets;
 using Reactor.Networking;
 using Reactor.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 
 namespace MiraAPI.PluginLoading;
 
 internal sealed class MiraPluginManager
 {
     private readonly Dictionary<Assembly, MiraPluginInfo> _registeredPlugins = [];
-
     internal MiraPluginInfo[] RegisteredPlugins() => [.. _registeredPlugins.Values];
 
+    public List<LoadableBundleAsset<UnityEngine.Object>> BundleAssets = new();
+    internal uint NextAssetId { get; private set; }
+    internal uint GetNextAssetId()
+    {
+        NextAssetId++;
+        return NextAssetId;
+    }
+
     public static MiraPluginManager Instance { get; private set; } = new();
 
     internal void Initialize()
@@ -36,6 +45,7 @@ internal sealed class MiraPluginManager
             var info = new MiraPluginInfo(miraPlugin, pluginInfo);
 
             RegisterModifierAttribute(assembly);
+            RegisterAnimPresetAttribute(assembly);
             RegisterAllOptions(assembly, info);
 
             RegisterRoleAttribute(assembly, info);
@@ -161,6 +171,18 @@ internal sealed class MiraPluginManager
         }
     }
 
+    private static void RegisterAnimPresetAttribute(Assembly assembly)
+    {
+        foreach (var type in assembly.GetTypes())
+        {
+            var attribute = type.GetCustomAttribute<RegisterAnimationPresetAttribute>();
+            if (attribute != null)
+            {
+                AnimationPresetManager.RegisterPreset(type);
+            }
+        }
+    }
+
     private static void RegisterButtonAttribute(Assembly assembly)
     {
         foreach (var type in assembly.GetTypes())

MiraAPI/Roles/CustomRoleManager.cs

@@ -224,7 +224,7 @@ public static class CustomRoleManager
             var num = BitConverter.ToInt32(netData.Data, 0);
             var chance = BitConverter.ToInt32(netData.Data, 4);
 
-            HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
+            DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
 
             try
             {

MiraAPI/Roles/ICustomRole.cs

@@ -77,11 +77,6 @@ public interface ICustomRole
     /// </summary>
     bool CanUseVent => Team == ModdedRoleTeams.Impostor;
 
-    /// <summary>
-    /// Gets a value indicating whether the role can use the sabotage button.
-    /// </summary>
-    bool CanUseSabotage => Team == ModdedRoleTeams.Impostor;
-
     /// <summary>
     /// Gets a value indicating whether the role's tasks count towards task progress.
     /// </summary>

MiraAPI/Utilities/Assets/LoadableBundleAsset.cs

@@ -1,5 +1,6 @@
-using System;
+using MiraAPI.PluginLoading;
 using Reactor.Utilities.Extensions;
+using System;
 using UnityEngine;
 
 namespace MiraAPI.Utilities.Assets;
@@ -10,8 +11,30 @@ namespace MiraAPI.Utilities.Assets;
 /// <param name="name">The name of the asset.</param>
 /// <param name="bundle">The AssetBundle that contains the asset.</param>
 /// <typeparam name="T">The type of the asset to be loaded.</typeparam>
-public class LoadableBundleAsset<T>(string name, AssetBundle bundle) : LoadableAsset<T> where T : UnityEngine.Object
+public class LoadableBundleAsset<T> : LoadableAsset<T> where T : UnityEngine.Object
 {
+
+    /// <summary>
+    /// Gets the ID of this asset. Used for networking.
+    /// </summary>
+    public uint AssetId { get; internal set; }
+    private string _name { get; }
+    private AssetBundle _bundle { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LoadableBundleAsset{T}"/> class.
+    /// </summary>
+    /// <param name="name">Name of the bundle.</param>
+    /// <param name="bundle">Asset bundle.</param>
+    public LoadableBundleAsset(string name, AssetBundle bundle)
+    {
+        AssetId = MiraPluginManager.Instance.GetNextAssetId();
+        //MiraPluginManager.Instance.BundleAssets.Add((LoadableBundleAsset<Object>)this);
+
+        _name = name;
+        _bundle = bundle;
+    }
+
     /// <summary>
     /// Loads the asset from the asset bundle.
     /// </summary>
@@ -24,11 +47,11 @@ public class LoadableBundleAsset<T>(string name, AssetBundle bundle) : LoadableA
             return LoadedAsset;
         }
 
-        LoadedAsset = bundle.LoadAsset<T>(name);
+        LoadedAsset = _bundle.LoadAsset<T>(_name);
 
         if (LoadedAsset == null)
         {
-            throw new InvalidOperationException($"INVALID ASSET: {name}");
+            throw new InvalidOperationException($"INVALID ASSET: {_name}");
         }
 
         return LoadedAsset;

MiraAPI/Utilities/Assets/LoadableResourceAsset.cs

@@ -7,7 +7,7 @@ namespace MiraAPI.Utilities.Assets;
 /// A utility class for loading assets from embedded resources.
 /// </summary>
 /// <param name="path">The path to the embedded resource.</param>
-public class LoadableResourceAsset(string path, float pixelsPerUnit=100f) : LoadableAsset<Sprite>
+public class LoadableResourceAsset(string path) : LoadableAsset<Sprite>
 {
     private readonly Assembly _assembly = Assembly.GetCallingAssembly();
 
@@ -19,6 +19,6 @@ public class LoadableResourceAsset(string path, float pixelsPerUnit=100f) : Load
             return LoadedAsset;
         }
 
-        return LoadedAsset = SpriteTools.LoadSpriteFromPath(path, _assembly, pixelsPerUnit);
+        return LoadedAsset = SpriteTools.LoadSpriteFromPath(path, _assembly);
     }
 }

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -39,7 +39,7 @@ public static class SpriteTools
     /// <param name="resourcePath">The path to the resource.</param>
     /// <returns>A sprite made from the resource.</returns>
     /// <exception cref="Exception">The resource cannot be found.</exception>
-    public static Sprite LoadSpriteFromPath(string resourcePath, Assembly assembly, float pixelsPerUnit)
+    public static Sprite LoadSpriteFromPath(string resourcePath, Assembly assembly)
     {
         var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false);
         var myStream = assembly.GetManifestResourceStream(resourcePath);
@@ -53,6 +53,6 @@ public static class SpriteTools
             Logger<MiraApiPlugin>.Error($"Resource not found: {resourcePath}\nReturning empty sprite!");
         }
 
-        return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f), pixelsPerUnit);
+        return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
     }
 }

MiraAPI/Utilities/Extensions.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using HarmonyLib;
+using MiraAPI.Animations;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
 using Reactor.Networking.Attributes;
 using Reactor.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace MiraAPI.Utilities;
@@ -22,9 +23,7 @@ public static class Extensions
         role.ParentMod.PluginConfig.TryGetEntry<int>(role.NumConfigDefinition, out var numEntry);
         role.ParentMod.PluginConfig.TryGetEntry<int>(role.ChanceConfigDefinition, out var chanceEntry);
 
-        return new NetData(
+        return new NetData(RoleId.Get(role.GetType()), BitConverter.GetBytes(numEntry.Value).AddRangeToArray(BitConverter.GetBytes(chanceEntry.Value)));
-            RoleId.Get(role.GetType()),
-            BitConverter.GetBytes(numEntry.Value).AddRangeToArray(BitConverter.GetBytes(chanceEntry.Value)));
     }
 
     /// <summary>
@@ -114,11 +113,11 @@ public static class Extensions
     /// <returns>True if the OptionBehaviour is for a custom options, false otherwise.</returns>
     public static bool IsCustom(this OptionBehaviour optionBehaviour)
     {
-        return ModdedOptionsManager.ModdedOptions.Values.Any(
+        return ModdedOptionsManager.ModdedOptions.Values.Any(opt => opt.OptionBehaviour && opt.OptionBehaviour == optionBehaviour);
-            opt => opt.OptionBehaviour && opt.OptionBehaviour == optionBehaviour);
     }
 
-    internal static Dictionary<PlayerControl, ModifierComponent> ModifierComponents { get; } = [];
+    private static readonly Dictionary<PlayerControl, ModifierComponent> ModifierComponents = [];
+    private static readonly Dictionary<PlayerControl, CustomAnimator> AnimatorComponents = [];
 
     /// <summary>
     /// Gets the ModifierComponent for a player.
@@ -133,12 +132,32 @@ public static class Extensions
         }
 
         component = player.GetComponent<ModifierComponent>();
-        if (component == null)
+        if (component)
         {
-            return null;
+            ModifierComponents[player] = component;
+        }
+
+        return component;
+    }
+
+    /// <summary>
+    /// Gets the CustomAnimator for a player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <returns>A CustomAnimator if there is one, null otherwise.</returns>
+    public static CustomAnimator? GetCustomAnimator(this PlayerControl player)
+    {
+        if (AnimatorComponents.TryGetValue(player, out var component))
+        {
+            return component;
+        }
+
+        component = player.GetComponent<CustomAnimator>();
+        if (component)
+        {
+            AnimatorComponents[player] = component;
         }
 
-        ModifierComponents[player] = component;
         return component;
     }
 
@@ -158,7 +177,6 @@ public static class Extensions
             randomizedList.Add(list[index]);
             list.RemoveAt(index);
         }
-
         return randomizedList;
     }
 
@@ -181,8 +199,7 @@ public static class Extensions
     /// <returns>True if the Modifier is present, false otherwise.</returns>
     public static bool HasModifier<T>(this PlayerControl? player) where T : BaseModifier
     {
-        return player?.GetModifierComponent() != null &&
+        return player?.GetModifierComponent() != null && player.GetModifierComponent()!.ActiveModifiers.Exists(x => x is T);
-               player.GetModifierComponent()!.ActiveModifiers.Exists(x => x is T);
     }
 
     /// <summary>
@@ -193,8 +210,7 @@ public static class Extensions
     /// <returns>True if the Modifier is present, false otherwise.</returns>
     public static bool HasModifier(this PlayerControl? player, uint id)
     {
-        return player?.GetModifierComponent() != null &&
+        return player?.GetModifierComponent() != null && player.GetModifierComponent()!.ActiveModifiers.Exists(x => x.ModifierId == id);
-               player.GetModifierComponent()!.ActiveModifiers.Exists(x => x.ModifierId == id);
     }
 
     /// <summary>
@@ -240,7 +256,6 @@ public static class Extensions
             Logger<MiraApiPlugin>.Error($"Cannot add modifier with id {modifierId} because it is not registered.");
             return;
         }
-
         target.GetModifierComponent()?.AddModifier(type);
     }
 
@@ -312,9 +327,7 @@ public static class Extensions
     /// <returns>The dead body if it is found, or null there is none within the radius.</returns>
     public static DeadBody? GetNearestDeadBody(this PlayerControl playerControl, float radius)
     {
-        return Helpers
+        return Helpers.GetNearestDeadBodies(playerControl.GetTruePosition(), radius).Find(component => component && !component.Reported);
-            .GetNearestDeadBodies(playerControl.GetTruePosition(), radius, Helpers.CreateFilter(Constants.NotShipMask))
-            .Find(component => component && !component.Reported);
     }
 
     /// <summary>
@@ -322,46 +335,29 @@ public static class Extensions
     /// </summary>
     /// <param name="playerControl">The player object.</param>
     /// <param name="radius">The radius to search within.</param>
-    /// <param name="filter">The contact filter.</param>
     /// <param name="colliderTag">An optional collider tag.</param>
     /// <param name="predicate">Optional predicate to test if the object is valid.</param>
     /// <typeparam name="T">The type of the object.</typeparam>
     /// <returns>The object if it was found, or null if there is none within the radius.</returns>
-    public static T? GetNearestObjectOfType<T>(
+    public static T? GetNearestObjectOfType<T>(this PlayerControl playerControl, float radius, string? colliderTag = null, Predicate<T>? predicate = null) where T : Component
-        this PlayerControl playerControl,
-        float radius,
-        ContactFilter2D filter,
-        string? colliderTag = null,
-        Predicate<T>? predicate = null) where T : Component
     {
-        return Helpers.GetNearestObjectsOfType<T>(playerControl.GetTruePosition(), radius, filter, colliderTag)
+        return Helpers.GetNearestObjectsOfType<T>(playerControl.GetTruePosition(), radius, colliderTag).Find(predicate ?? (component => component));
-            .Find(predicate ?? (component => component));
     }
 
     /// <summary>
-    /// Gets the closest player that matches the given criteria.
+    /// Gets the nearest player to a player.
     /// </summary>
     /// <param name="playerControl">The player object.</param>
     /// <param name="includeImpostors">Whether impostors should be included in the search.</param>
     /// <param name="distance">The radius to search within.</param>
     /// <param name="ignoreColliders">Whether colliders should be ignored when searching.</param>
-    /// <param name="predicate">Optional predicate to test if the object is valid.</param>
     /// <returns>The closest player if there is one, false otherwise.</returns>
-    public static PlayerControl? GetClosestPlayer(
+    public static PlayerControl? GetClosestPlayer(this PlayerControl playerControl, bool includeImpostors, float distance, bool ignoreColliders = false)
-        this PlayerControl playerControl,
-        bool includeImpostors,
-        float distance,
-        bool ignoreColliders = false,
-        Predicate<PlayerControl>? predicate = null)
     {
         var filteredPlayers = Helpers.GetClosestPlayers(playerControl, distance, ignoreColliders)
-            .Where(
+            .Where(playerInfo => !playerInfo.Data.Disconnected && playerInfo.PlayerId != playerControl.PlayerId && !playerInfo.Data.IsDead &&
-                playerInfo => !playerInfo.Data.Disconnected &&
+                                 (includeImpostors || !playerInfo.Data.Role.IsImpostor));
-                              playerInfo.PlayerId != playerControl.PlayerId &&
-                              !playerInfo.Data.IsDead &&
-                              (includeImpostors || !playerInfo.Data.Role.IsImpostor))
-            .ToList();
 
-        return predicate != null ? filteredPlayers.Find(predicate) : filteredPlayers.FirstOrDefault();
+        return filteredPlayers.FirstOrDefault();
     }
 }

MiraAPI/Utilities/Helpers.cs

@@ -15,14 +15,12 @@ namespace MiraAPI.Utilities;
 public static class Helpers
 {
     /// <summary>
-    /// Creates a ContactFilter2D from a layer mask.
+    /// NotShipMask filter for collisions.
     /// </summary>
-    /// <param name="layerMask">The layer mask.</param>
+    public static readonly ContactFilter2D Filter = ContactFilter2D.CreateLegacyFilter(
-    /// <returns>A new ContactFilter2D that represents the layer mask.</returns>
+        Constants.NotShipMask,
-    public static ContactFilter2D CreateFilter(int layerMask)
+        float.MinValue,
-    {
+        float.MaxValue);
-        return ContactFilter2D.CreateLegacyFilter(layerMask, float.MinValue, float.MaxValue);
-    }
 
     /// <summary>
     /// Get the room at a specific position.
@@ -39,12 +37,11 @@ public static class Helpers
     /// </summary>
     /// <param name="source">The source location.</param>
     /// <param name="radius">The radius to search in.</param>
-    /// <param name="filter">The contact filter.</param>
     /// <returns>A list of dead bodies.</returns>
-    public static List<DeadBody> GetNearestDeadBodies(Vector2 source, float radius, ContactFilter2D filter)
+    public static List<DeadBody> GetNearestDeadBodies(Vector2 source, float radius)
     {
         var results = new Il2CppSystem.Collections.Generic.List<Collider2D>();
-        Physics2D.OverlapCircle(source, radius, filter, results);
+        Physics2D.OverlapCircle(source, radius, Filter, results);
         return results.ToArray()
             .Where(collider2D => collider2D.CompareTag("DeadBody"))
             .Select(collider2D => collider2D.GetComponent<DeadBody>()).ToList();
@@ -55,15 +52,14 @@ public static class Helpers
     /// </summary>
     /// <param name="source">The source point.</param>
     /// <param name="radius">The radius to search in.</param>
-    /// <param name="filter">The contact filter.</param>
     /// <param name="colliderTag">An optional collider tag.</param>
     /// <typeparam name="T">The type of the object.</typeparam>
     /// <returns>A list of objects of type T.</returns>
-    public static List<T> GetNearestObjectsOfType<T>(Vector2 source, float radius, ContactFilter2D filter, string? colliderTag = null)
+    public static List<T> GetNearestObjectsOfType<T>(Vector2 source, float radius, string? colliderTag = null)
         where T : Component
     {
         var results = new Il2CppSystem.Collections.Generic.List<Collider2D>();
-        Physics2D.OverlapCircle(source, radius, filter, results);
+        Physics2D.OverlapCircle(source, radius, Filter, results);
         return results.ToArray()
             .Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
             .Select(collider2D => collider2D.GetComponent<T>()).ToList();
@@ -81,7 +77,7 @@ public static class Helpers
         float radius,
         bool ignoreColliders = true)
     {
-        var newList = GetNearestObjectsOfType<PlayerControl>(source, radius, CreateFilter(Constants.NotShipMask));
+        var newList = GetNearestObjectsOfType<PlayerControl>(source, radius);
 
         if (!ignoreColliders)
         {

README.md

@@ -23,8 +23,6 @@ To start using Mira API, you need to:
 2. Add a BepInDependency on your plugin class like this: `[BepInDependency(MiraApiPlugin.Id)]`
 3. Implement the IMiraPlugin interface on your plugin class.
 
-Mira API also depends on [Reactor](https://github.com/NuclearPowered/Reactor) in order to function properly! Do not forget to include it as a reference and `BepInDependency`!
-
 For a full example, see [this file](https://github.com/All-Of-Us-Mods/MiraAPI/blob/master/MiraAPI.Example/ExamplePlugin.cs).
 
 ## Recommended Project Structure