bump version

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.1.7</VersionPrefix>
+        <VersionPrefix>0.1.8</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.HasModifier<CaptainModifier>();
+        return PlayerControl.LocalPlayer != null && PlayerControl.LocalPlayer.HasModifier<CaptainModifier>();
     }
 
     protected override void OnClick()

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -45,6 +45,10 @@ 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)
     {
-        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
+        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);
-        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(
+        HudManager.Instance.Notifier.AddSettingsChangeMessage(
             StringName,
             Data?.GetValueString(Value),
             false);

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

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

MiraAPI/Modifiers/ModifierComponent.cs

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

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -39,6 +39,9 @@ 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>
@@ -53,25 +56,18 @@ public abstract class TimedModifier : BaseModifier
     /// </summary>
     public override void FixedUpdate()
     {
-        if (Player?.AmOwner == false)
+        if (!TimerActive)
         {
             return;
         }
 
-        if (TimeRemaining > 0 && TimerActive)
+        if (TimeRemaining > 0)
         {
             TimeRemaining -= Time.fixedDeltaTime;
         }
         else
         {
-            TimerActive = false;
-            TimeRemaining = Duration;
-            OnTimerComplete();
-
-            if (RemoveOnComplete)
-            {
-                ModifierComponent?.RemoveModifier(ModifierId);
-            }
+            StopTimer();
         }
     }
 
@@ -86,7 +82,52 @@ 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);
-                DestroyableSingleton<AchievementManager>.Instance.OnProtectACrewmate();
+                AchievementManager.Instance.OnProtectACrewmate();
             }
 
             if (source.AmOwner || flag)
@@ -115,7 +115,7 @@ public static class CustomMurderRpc
             return;
         }
 
-        DestroyableSingleton<DebugAnalytics>.Instance.Analytics.Kill(target.Data, source.Data);
+        DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
         if (source.AmOwner)
         {
             StatsManager.Instance.IncrementStat(
@@ -139,7 +139,7 @@ public static class CustomMurderRpc
             }
         }
 
-        DestroyableSingleton<UnityTelemetry>.Instance.WriteMurder();
+        UnityTelemetry.Instance.WriteMurder();
         target.gameObject.layer = LayerMask.NameToLayer("Ghost");
         if (target.AmOwner)
         {
@@ -159,14 +159,14 @@ public static class CustomMurderRpc
 
             if (showKillAnim)
             {
-                DestroyableSingleton<HudManager>.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
+                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
             }
 
             target.cosmetics.SetNameMask(false);
             target.RpcSetScanner(false);
         }
 
-        DestroyableSingleton<AchievementManager>.Instance.OnMurder(
+        AchievementManager.Instance.OnMurder(
             source.AmOwner,
             target.AmOwner,
             source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -32,16 +32,25 @@ public static class GameOptionsMenuPatch
         var num = 2.1f;
         var filteredGroups =
             GameSettingMenuPatches.SelectedMod?.OptionGroups.Where(
-                x => x.GroupVisible.Invoke() && x.AdvancedRole is null) ?? [];
+                x => x.AdvancedRole is null) ?? [];
 
         foreach (var group in filteredGroups)
         {
-            var filteredOpts = group.Options.Where(x => x.Visible.Invoke()).ToList();
-            if (filteredOpts.Count == 0 || group.Header is null)
+            if (group.Options.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/NotificationPopperPatch.cs

@@ -27,12 +27,12 @@ public static class NotificationPopperPatch
             ? Palette.CrewmateSettingChangeText.ToTextColor()
             : Palette.ImpostorRed.ToTextColor();
 
-        var item = DestroyableSingleton<TranslationController>.Instance.GetString(
+        var item = TranslationController.Instance.GetString(
             StringNames.LobbyChangeSettingNotificationRole,
             string.Concat(
                 "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
                 text,
-                DestroyableSingleton<TranslationController>.Instance.GetString(key, Array.Empty<Object>()),
+                TranslationController.Instance.GetString(key, Array.Empty<Object>()),
                 "</color></font>"
             ),
             "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">" + roleCount + "</font>",

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -17,7 +17,7 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
@@ -39,7 +39,7 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
@@ -61,8 +61,8 @@ public static class OptionsPatches
         }
 
         __instance.TitleText.text =
-            DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
-        __instance.ValueText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
+            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.ValueText.text = 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);
-        DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(
+        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 = DestroyableSingleton<TranslationController>.Instance.GetString(
+        __instance.roleTitleText.text = TranslationController.Instance.GetString(
             role.StringName,
             new Il2CppReferenceArray<Il2CppSystem.Object>(0));
         __instance.roleScreenshot.sprite = Sprite.Create(

MiraAPI/Patches/Options/SettingPatches.cs

@@ -39,7 +39,7 @@ 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) + "%",
-                _ => DestroyableSingleton<TranslationController>.Instance.GetString(
+                _ => TranslationController.Instance.GetString(
                     StringNames.GameSecondsAbbrev,
                     (Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
             };

MiraAPI/Patches/PlayerControlPatches.cs

@@ -15,6 +15,7 @@ public static class PlayerControlPatches
     /// <summary>
     /// Adds the modifier component to the player on start.
     /// </summary>
+    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.Start))]
     public static void PlayerControlStartPostfix(PlayerControl __instance)
@@ -30,6 +31,7 @@ public static class PlayerControlPatches
     /// <summary>
     /// Calls the OnDeath method for all active modifiers.
     /// </summary>
+    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Die))]
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
@@ -45,6 +47,7 @@ public static class PlayerControlPatches
     /// <summary>
     /// FixedUpdate handler for custom roles and custom buttons.
     /// </summary>
+    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
@@ -74,4 +77,15 @@ 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

@@ -29,8 +29,8 @@ public static class HudManagerPatches
 
         if (role is ICustomRole customRole)
         {
-            __instance.KillButton.ToggleVisible(isActive && role.CanUseKillButton && !flag);
-            __instance.ImpostorVentButton.ToggleVisible(isActive && role.CanVent && !flag);
+            __instance.KillButton.ToggleVisible(isActive && customRole.UseVanillaKillButton && !flag);
+            __instance.ImpostorVentButton.ToggleVisible(isActive && customRole.CanUseVent && !flag);
             __instance.SabotageButton.gameObject.SetActive(isActive && customRole.CanUseSabotage);
         }
 

MiraAPI/Patches/Roles/SabotageButtonPatch.cs

@@ -25,7 +25,7 @@ public class SabotageButtonPatch
             return false;
         }
 
-        DestroyableSingleton<HudManager>.Instance.ToggleMapVisible(
+        HudManager.Instance.ToggleMapVisible(
             new MapOptions
             {
                 Mode = MapOptions.Modes.Sabotage,

MiraAPI/Patches/Roles/TaskAdderPatch.cs

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

MiraAPI/Patches/Roles/VentPatches.cs

@@ -6,12 +6,17 @@ using UnityEngine;
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Set vent outline color based on the player's role.
+/// Vent patches for Roles.
 /// </summary>
-[HarmonyPatch(typeof(Vent), nameof(Vent.SetOutline))]
-public static class VentOutlinePatch
+[HarmonyPatch(typeof(Vent))]
+public static class VentPatches
 {
-    public static void Postfix(Vent __instance, bool on, bool mainTarget)
+    /// <summary>
+    /// 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/Patches/VentPatches.cs

@@ -1,26 +1,35 @@
 using HarmonyLib;
+using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using UnityEngine;
 
-namespace MiraAPI.Patches.Modifiers;
+namespace MiraAPI.Patches;
 
+/// <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 CanUseVentPatch(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
+    public static void VentCanUsePostfix(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 (role.CanVent)
+        switch (canVent)
         {
             case true when modifiers.Exists(x => !x.CanVent()):
                 couldUse = canUse = false;

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);
 
-            DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
+            HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
 
             try
             {

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) : LoadableAsset<Sprite>
+public class LoadableResourceAsset(string path, float pixelsPerUnit=100f) : LoadableAsset<Sprite>
 {
     private readonly Assembly _assembly = Assembly.GetCallingAssembly();
 
@@ -19,6 +19,6 @@ public class LoadableResourceAsset(string path) : LoadableAsset<Sprite>
             return LoadedAsset;
         }
 
-        return LoadedAsset = SpriteTools.LoadSpriteFromPath(path, _assembly);
+        return LoadedAsset = SpriteTools.LoadSpriteFromPath(path, _assembly, pixelsPerUnit);
     }
 }

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)
+    public static Sprite LoadSpriteFromPath(string resourcePath, Assembly assembly, float pixelsPerUnit)
     {
         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));
+        return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f), pixelsPerUnit);
     }
 }

MiraAPI/Utilities/Extensions.cs

@@ -22,7 +22,9 @@ 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(RoleId.Get(role.GetType()), BitConverter.GetBytes(numEntry.Value).AddRangeToArray(BitConverter.GetBytes(chanceEntry.Value)));
+        return new NetData(
+            RoleId.Get(role.GetType()),
+            BitConverter.GetBytes(numEntry.Value).AddRangeToArray(BitConverter.GetBytes(chanceEntry.Value)));
     }
 
     /// <summary>
@@ -112,10 +114,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(opt => opt.OptionBehaviour && opt.OptionBehaviour == optionBehaviour);
+        return ModdedOptionsManager.ModdedOptions.Values.Any(
+            opt => opt.OptionBehaviour && opt.OptionBehaviour == optionBehaviour);
     }
 
-    private static readonly Dictionary<PlayerControl, ModifierComponent> ModifierComponents = [];
+    internal static Dictionary<PlayerControl, ModifierComponent> ModifierComponents { get; } = [];
 
     /// <summary>
     /// Gets the ModifierComponent for a player.
@@ -130,11 +133,12 @@ public static class Extensions
         }
 
         component = player.GetComponent<ModifierComponent>();
-        if (component)
+        if (component == null)
         {
-            ModifierComponents[player] = component;
+            return null;
         }
 
+        ModifierComponents[player] = component;
         return component;
     }
 
@@ -154,6 +158,7 @@ public static class Extensions
             randomizedList.Add(list[index]);
             list.RemoveAt(index);
         }
+
         return randomizedList;
     }
 
@@ -176,7 +181,8 @@ 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 && player.GetModifierComponent()!.ActiveModifiers.Exists(x => x is T);
+        return player?.GetModifierComponent() != null &&
+               player.GetModifierComponent()!.ActiveModifiers.Exists(x => x is T);
     }
 
     /// <summary>
@@ -187,7 +193,8 @@ 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 && player.GetModifierComponent()!.ActiveModifiers.Exists(x => x.ModifierId == id);
+        return player?.GetModifierComponent() != null &&
+               player.GetModifierComponent()!.ActiveModifiers.Exists(x => x.ModifierId == id);
     }
 
     /// <summary>
@@ -233,6 +240,7 @@ public static class Extensions
             Logger<MiraApiPlugin>.Error($"Cannot add modifier with id {modifierId} because it is not registered.");
             return;
         }
+
         target.GetModifierComponent()?.AddModifier(type);
     }
 
@@ -304,7 +312,9 @@ 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.GetNearestDeadBodies(playerControl.GetTruePosition(), radius).Find(component => component && !component.Reported);
+        return Helpers
+            .GetNearestDeadBodies(playerControl.GetTruePosition(), radius, Helpers.CreateFilter(Constants.NotShipMask))
+            .Find(component => component && !component.Reported);
     }
 
     /// <summary>
@@ -312,29 +322,46 @@ 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>(this PlayerControl playerControl, float radius, string? colliderTag = null, Predicate<T>? predicate = null) where T : Component
+    public static T? GetNearestObjectOfType<T>(
+        this PlayerControl playerControl,
+        float radius,
+        ContactFilter2D filter,
+        string? colliderTag = null,
+        Predicate<T>? predicate = null) where T : Component
     {
-        return Helpers.GetNearestObjectsOfType<T>(playerControl.GetTruePosition(), radius, colliderTag).Find(predicate ?? (component => component));
+        return Helpers.GetNearestObjectsOfType<T>(playerControl.GetTruePosition(), radius, filter, colliderTag)
+            .Find(predicate ?? (component => component));
     }
 
     /// <summary>
-    /// Gets the nearest player to a player.
+    /// Gets the closest player that matches the given criteria.
     /// </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(this PlayerControl playerControl, bool includeImpostors, float distance, bool ignoreColliders = false)
+    public static PlayerControl? GetClosestPlayer(
+        this PlayerControl playerControl,
+        bool includeImpostors,
+        float distance,
+        bool ignoreColliders = false,
+        Predicate<PlayerControl>? predicate = null)
     {
         var filteredPlayers = Helpers.GetClosestPlayers(playerControl, distance, ignoreColliders)
-            .Where(playerInfo => !playerInfo.Data.Disconnected && playerInfo.PlayerId != playerControl.PlayerId && !playerInfo.Data.IsDead &&
-                                 (includeImpostors || !playerInfo.Data.Role.IsImpostor));
+            .Where(
+                playerInfo => !playerInfo.Data.Disconnected &&
+                              playerInfo.PlayerId != playerControl.PlayerId &&
+                              !playerInfo.Data.IsDead &&
+                              (includeImpostors || !playerInfo.Data.Role.IsImpostor))
+            .ToList();
 
-        return filteredPlayers.FirstOrDefault();
+        return predicate != null ? filteredPlayers.Find(predicate) : filteredPlayers.FirstOrDefault();
     }
 }

MiraAPI/Utilities/Helpers.cs

@@ -15,12 +15,14 @@ namespace MiraAPI.Utilities;
 public static class Helpers
 {
     /// <summary>
-    /// NotShipMask filter for collisions.
+    /// Creates a ContactFilter2D from a layer mask.
     /// </summary>
-    public static readonly ContactFilter2D Filter = ContactFilter2D.CreateLegacyFilter(
-        Constants.NotShipMask,
-        float.MinValue,
-        float.MaxValue);
+    /// <param name="layerMask">The layer mask.</param>
+    /// <returns>A new ContactFilter2D that represents the layer mask.</returns>
+    public static ContactFilter2D CreateFilter(int layerMask)
+    {
+        return ContactFilter2D.CreateLegacyFilter(layerMask, float.MinValue, float.MaxValue);
+    }
 
     /// <summary>
     /// Get the room at a specific position.
@@ -37,11 +39,12 @@ 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)
+    public static List<DeadBody> GetNearestDeadBodies(Vector2 source, float radius, ContactFilter2D filter)
     {
         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();
@@ -52,14 +55,15 @@ 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, string? colliderTag = null)
+    public static List<T> GetNearestObjectsOfType<T>(Vector2 source, float radius, ContactFilter2D filter, 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();
@@ -77,7 +81,7 @@ public static class Helpers
         float radius,
         bool ignoreColliders = true)
     {
-        var newList = GetNearestObjectsOfType<PlayerControl>(source, radius);
+        var newList = GetNearestObjectsOfType<PlayerControl>(source, radius, CreateFilter(Constants.NotShipMask));
 
         if (!ignoreColliders)
         {