Merge branch 'dev' into android

# Conflicts:
#	MiraAPI/Patches/IntroCutscenePatches.cs

AmongUs.props

@@ -2,12 +2,12 @@
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.10.14" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Android" Version="2025.9.9" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
     </ItemGroup>
-    
+
     <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
         <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" UseSymboliclinksIfPossible="true" />
     </Target>

Directory.Build.props

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

MiraAPI/Events/MiraEventManager.cs

@@ -34,7 +34,7 @@ public static class MiraEventManager
             }
             catch (Exception ex)
             {
-                Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
             }
         }
 
@@ -63,7 +63,7 @@ public static class MiraEventManager
             }
             catch (Exception ex)
             {
-                Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
             }
         }
 

MiraAPI/GameEnd/GameOverManager.cs

@@ -30,13 +30,13 @@ public static class GameOverManager
 
         if (gameOverType.IsAbstract)
         {
-            Error("The type must not be abstract.");
+            Logger<MiraApiPlugin>.Error("The type must not be abstract.");
             return false;
         }
 
         if (gameOverType.GetConstructor(Type.EmptyTypes) == null)
         {
-            Error("The type must have a parameterless constructor.");
+            Logger<MiraApiPlugin>.Error("The type must have a parameterless constructor.");
             return false;
         }
 

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -37,7 +37,7 @@ public static class CustomGameModeManager
             return;
         }
 
-        Error($"No gamemode with id {id} found!");
+        Logger<MiraApiPlugin>.Error($"No gamemode with id {id} found!");
     }
 
     /// <summary>
@@ -48,7 +48,7 @@ public static class CustomGameModeManager
     {
         if (!typeof(CustomGameMode).IsAssignableFrom(gameModeType))
         {
-            Warning($"{gameModeType.Name} does not inherit CustomGameMode!");
+            Logger<MiraApiPlugin>.Warning($"{gameModeType.Name} does not inherit CustomGameMode!");
             return;
         }
 
@@ -56,13 +56,13 @@ public static class CustomGameModeManager
 
         if (modeObj is not CustomGameMode gameMode)
         {
-            Error($"Failed to create instance of {gameModeType.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to create instance of {gameModeType.Name}");
             return;
         }
 
         if (GameModes.Any(x => x.Key == gameMode.Id))
         {
-            Error($"ID for gamemode {gameMode.Name} already exists!");
+            Logger<MiraApiPlugin>.Error($"ID for gamemode {gameMode.Name} already exists!");
             return;
         }
 

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -39,7 +39,7 @@ public static class ModdedOptionsManager
 
         if (TypeToGroup.ContainsKey(type))
         {
-            Error($"Group {type.Name} already exists.");
+            Logger<MiraApiPlugin>.Error($"Group {type.Name} already exists.");
             return false;
         }
 
@@ -60,13 +60,13 @@ public static class ModdedOptionsManager
     {
         if (!TypeToGroup.TryGetValue(type, out var group))
         {
-            Error($"Failed to get group for {type.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get group for {type.Name}");
             return;
         }
 
         if (property.GetValue(group) is not IModdedOption option)
         {
-            Error($"Failed to get option for {property.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get option for {property.Name}");
             return;
         }
 
@@ -81,13 +81,13 @@ public static class ModdedOptionsManager
     {
         if (OptionAttributes.ContainsKey(property))
         {
-            Error($"Property {property.Name} already has an attribute registered.");
+            Logger<MiraApiPlugin>.Error($"Property {property.Name} already has an attribute registered.");
             return;
         }
 
         if (!TypeToGroup.TryGetValue(type, out var group))
         {
-            Error($"Failed to get group for {type.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get group for {type.Name}");
             return;
         }
 
@@ -95,7 +95,7 @@ public static class ModdedOptionsManager
 
         if (option == null)
         {
-            Error($"Failed to get option for {property.Name}");
+            Logger<MiraApiPlugin>.Error($"Failed to get option for {property.Name}");
             return;
         }
 

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -125,7 +125,7 @@ public abstract class ModdedOption<T> : IModdedOption
     {
         if (ConfigDefinition is null)
         {
-            Error($"Attempted to save {Title} to preset, but ConfigDefinition is null.");
+            Logger<MiraApiPlugin>.Error($"Attempted to save {Title} to preset, but ConfigDefinition is null.");
             return;
         }
         Bind(presetConfig);
@@ -147,7 +147,7 @@ public abstract class ModdedOption<T> : IModdedOption
         }
         else
         {
-            Error($"Attempted to load {Title} from preset, but ConfigDefinition is not found in preset.");
+            Logger<MiraApiPlugin>.Error($"Attempted to load {Title} from preset, but ConfigDefinition is not found in preset.");
         }
     }
 

MiraAPI/Hud/CustomActionButton.cs

@@ -233,7 +233,7 @@ public abstract class CustomActionButton
             return;
         }
 
-        Location = location;
+        this.Location = location;
 
         if (!moveButton)
         {

MiraAPI/Keybinds/KeybindManager.cs

@@ -26,11 +26,11 @@ public static class KeybindManager
         try
         {
             var instance = KeybindUtils.RewiredInputManager!;
-            foreach (var keybind in Keybinds)
+            foreach (var keybind in KeybindManager.Keybinds)
             {
                 if (instance.userData.actions.ToArray().Any(x => x.name == keybind.Id))
                 {
-                    Warning($"Keybind of id {keybind.Id} already exists. Skipping it");
+                    Logger<MiraApiPlugin>.Warning($"Keybind of id {keybind.Id} already exists. Skipping it");
                     continue;
                 }
 
@@ -44,7 +44,7 @@ public static class KeybindManager
         }
         catch (Exception e)
         {
-            Error($"Error while registering keybinds in Rewired: {e}");
+            Logger<MiraApiPlugin>.Error($"Error while registering keybinds in Rewired: {e}");
         }
     }
 

MiraAPI/LocalSettings/LocalSettingsManager.cs

@@ -24,7 +24,7 @@ public static class LocalSettingsManager
 
         if (TypeToTab.ContainsKey(type))
         {
-            Error($"Local settings tab {type.Name} already exists.");
+            Logger<MiraApiPlugin>.Error($"Local settings tab {type.Name} already exists.");
             return false;
         }
 

MiraAPI/MiraApiPlugin.cs

@@ -1,5 +1,4 @@
-global using static Reactor.Utilities.Logger<MiraAPI.MiraApiPlugin>;
+using BepInEx;
-using BepInEx;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using MiraAPI.PluginLoading;

MiraAPI/Modifiers/ModifierComponent.cs

@@ -47,7 +47,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _player = GetComponent<PlayerControl>();
         if (_player == null)
         {
-            Error("ModifierComponent could not find PlayerControl on the same GameObject.");
+            Logger<MiraApiPlugin>.Error("ModifierComponent could not find PlayerControl on the same GameObject.");
             Destroy(this);
             return;
         }
@@ -77,7 +77,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
             }
 
             Modifiers.Remove(modifier);
@@ -95,7 +95,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
             }
 
             if (modifier is TimedModifier { AutoStart: true } timer)
@@ -122,7 +122,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
             }
         }
 
@@ -153,7 +153,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
             catch (Exception e)
             {
-                Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
+                Logger<MiraApiPlugin>.Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
             }
         }
     }
@@ -336,7 +336,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         var modifier = modifiers.FirstOrDefault();
         if (modifier is null)
         {
-            Error($"Cannot remove modifier {type.Name} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {type.Name} because it is not active.");
             return;
         }
 
@@ -352,7 +352,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         if (!ActiveModifiers.Contains(modifier))
         {
-            Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
             return;
         }
 
@@ -382,7 +382,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         var modifier = GetModifier(uniqueId);
         if (modifier == null)
         {
-            Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
+            Logger<MiraApiPlugin>.Error($"Cannot remove modifier with unique id {uniqueId} because it is not active.");
             return;
         }
 
@@ -412,19 +412,19 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         // TODO: Make a proper synchronization system.
         if (LobbyBehaviour.Instance)
         {
-            Warning($"Modifiers added in the lobby won't sync to new players!");
+            Logger<MiraApiPlugin>.Warning($"Modifiers added in the lobby won't sync to new players!");
         }
 
         var id = modifier.TypeId;
         if (modifier.Unique && ActiveModifiers.Find(x => x.TypeId == id) != null)
         {
-            Error($"Player already has modifier with id {id}!");
+            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {id}!");
             return null;
         }
 
         if (ActiveModifiers.Contains(modifier))
         {
-            Error($"Player already has this modifier!");
+            Logger<MiraApiPlugin>.Error($"Player already has this modifier!");
             return null;
         }
 

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -83,7 +83,7 @@ public static class ModifierExtensions
         var modifier = target.GetModifier(typeId, predicate);
         if (modifier is null)
         {
-            Error($"Player {target.PlayerId} does not have modifier with type ID {typeId}.");
+            Logger<MiraApiPlugin>.Error($"Player {target.PlayerId} does not have modifier with type ID {typeId}.");
             return;
         }
 

MiraAPI/Modifiers/ModifierManager.cs

@@ -97,7 +97,7 @@ public static class ModifierManager
 
         if (modifierType.GetConstructor(Type.EmptyTypes) == null)
         {
-            Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
+            Logger<MiraApiPlugin>.Error($"Game Modifier {modifierType.FullName} does not have a parameterless constructor!");
             return false;
         }
 
@@ -137,7 +137,7 @@ public static class ModifierManager
             var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
             if (validPlayers.Count == 0)
             {
-                Warning($"No valid players for modifier {modifier.ModifierName}");
+                Logger<MiraApiPlugin>.Warning($"No valid players for modifier {modifier.ModifierName}");
                 continue;
             }
 
@@ -158,7 +158,7 @@ public static class ModifierManager
 
                 if (candidates.Count == 0)
                 {
-                    Warning(
+                    Logger<MiraApiPlugin>.Warning(
                         $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
                     break;
                 }
@@ -166,7 +166,7 @@ public static class ModifierManager
                 var plr = candidates.Random();
                 if (plr == null)
                 {
-                    Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    Logger<MiraApiPlugin>.Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
                     continue;
                 }
 

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -80,7 +80,7 @@ public abstract class TimedModifier : BaseModifier
     {
         if (TimerActive)
         {
-            Error("Can't start a timer that has already been started.");
+            Logger<MiraApiPlugin>.Error("Can't start a timer that has already been started.");
             return;
         }
 

MiraAPI/Networking/CustomGameOverRpc.cs

@@ -50,7 +50,7 @@ public class CustomGameOverRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<
         {
             if (!gameOver.VerifyCondition(innerNetObject, [.. data.Winners]))
             {
-                Info($"Game over condition not met for {gameOver.GetType().Name}");
+                Logger<MiraApiPlugin>.Info($"Game over condition not met for {gameOver.GetType().Name}");
                 return;
             }
 
@@ -64,7 +64,7 @@ public class CustomGameOverRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<
         else
         {
             CustomGameOver.Instance = null;
-            Error($"Unknown game over reason: {data.Reason}");
+            Logger<MiraApiPlugin>.Error($"Unknown game over reason: {data.Reason}");
         }
     }
 }

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections;
-using System.Collections;
 using System.Linq;
 using AmongUs.Data;
 using AmongUs.GameOptions;
@@ -9,10 +8,8 @@ using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace MiraAPI.Networking;
 
@@ -172,14 +169,7 @@ public static class CustomMurderRpc
 
             if (showKillAnim)
             {
-                try
+                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
-                {
-                    HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
-                }
-                catch (Exception e)
-                {
-                    Error($"Error with kill animation: {e.ToString()}");
-                }
             }
 
             target.cosmetics.SetNameMask(false);
@@ -212,7 +202,7 @@ public static class CustomMurderRpc
         bool teleportMurderer = true)
     {
         var cam = Camera.main?.GetComponent<FollowerCamera>();
-        var isParticipant = source.AmOwner || target.AmOwner;
+        var isParticipant = PlayerControl.LocalPlayer == source || PlayerControl.LocalPlayer == target;
         var sourcePhys = source.MyPhysics;
 
         if (teleportMurderer)
@@ -232,7 +222,7 @@ public static class CustomMurderRpc
 
         if (createDeadBody)
         {
-            deadBody = Object.Instantiate(GameManager.Instance.GetDeadBody(source.Data.Role));
+            deadBody = Object.Instantiate(GameManager.Instance.deadBodyPrefab[0]);
             deadBody.enabled = false;
             deadBody.ParentId = target.PlayerId;
             deadBody.bodyRenderers.ToList().ForEach(target.SetPlayerMaterialColors);
@@ -243,13 +233,6 @@ public static class CustomMurderRpc
             deadBody.transform.position = vector;
         }
 
-        source.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
-        target.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
-
-        // no idea if this causes bugs, but innersloth is brain-dead
-        // I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF
-        PlayerControl.LocalPlayer.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
-
         if (isParticipant)
         {
             if (cam != null)

MiraAPI/Patches/DetectiveNotesMinigamePatch.cs

@@ -7,12 +7,12 @@ using UnityEngine;
 
 namespace MiraAPI.Patches;
 
-[HarmonyPatch(typeof(DetectiveNotesMinigame), nameof(DetectiveNotesMinigame.SetImpostorPopup))]
+[HarmonyPatch(typeof(DetectiveNotesMinigame), nameof(DetectiveNotesMinigame.OpenBodyPopup))]
 public static class DetectiveNotesMinigamePatch
 {
     public static void Prefix(DetectiveNotesMinigame __instance, bool active)
     {
-        __instance.impostorTypePopup.gameObject.SetActive(active);
+        __instance.impostorTypePopup.SetActive(active);
         if (!active)
         {
             ControllerManager.Instance.CloseOverlayMenu(__instance.ImpostorOverlay);
@@ -22,21 +22,23 @@ public static class DetectiveNotesMinigamePatch
         }
         if (__instance.impostorButton != null)
         {
-            ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, __instance.impostorTypePopup, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
+            ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, null, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
             return;
         }
         __instance.impostorButton = new List<GameObject>();
+        int num = 0;
         var allRoles = DestroyableSingleton<RoleManager>.Instance.AllRoles;
         var customRoles = CustomRoleManager.CustomRoleBehaviours;
         foreach (var role in allRoles)
         {
             if (role.TeamType != RoleTeamTypes.Impostor || role.Role == RoleTypes.ImpostorGhost || customRoles.Contains(role) )
                 continue;
-            var gameObject = Object.Instantiate(__instance.impostorTypePrefab, __instance.impostorTypeParent);
+            GameObject gameObject = Object.Instantiate<GameObject>(__instance.impostorTypePrefab, __instance.impostorTypeParent);
             __instance.impostorButton.Add(gameObject);
             gameObject.GetComponent<DetectiveImpostorType>().Initialize(__instance, role);
+            num++;
             __instance.ImpostorIconControllerSelectables.Add(gameObject.GetComponent<PassiveButton>());
         }
-        ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, __instance.impostorTypePopup, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
+        ControllerManager.Instance.OpenOverlayMenu(__instance.ImpostorOverlay, null, __instance.ImpostorIconControllerSelectables[0], __instance.ImpostorIconControllerSelectables, false);
     }
-}
+}

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -7,6 +7,15 @@ namespace MiraAPI.Patches.Events;
 
 internal static class EndGamePatches
 {
+    [HarmonyPatch(typeof(GameManager), nameof(GameManager.Awake))]
+    public static class GameManagerAwakePatch
+    {
+        public static void Postfix(GameManager __instance)
+        {
+            __instance.enabled = true;
+        }
+    }
+
     [HarmonyPatch(typeof(GameManager), nameof(GameManager.RpcEndGame))]
     public static class GameManagerRpcEndGamePatch
     {

MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs

@@ -1,20 +1,13 @@
-using System.Reflection;
+using HarmonyLib;
-using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
-[HarmonyPatch]
+[HarmonyPatch(typeof(TutorialManager._RunTutorial_d__3), nameof(TutorialManager._RunTutorial_d__3.MoveNext))]
 public static class FreeplayRoundStartPatch
 {
-    public static MethodBase TargetMethod()
+    public static void Postfix(TutorialManager._RunTutorial_d__3 __instance, ref bool __result)
-    {
-        return Helpers.GetStateMachineMoveNext<TutorialManager>(nameof(TutorialManager.RunTutorial))!;
-    }
-
-    public static void Postfix(ref bool __result)
     {
         if (!__result)
         {

MiraAPI/Patches/Events/KillAnimationMurderEventPatch.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using HarmonyLib;
-using Il2CppInterop.Runtime.InteropTypes;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patch to invoke AfterMurderEvent after a kill animation is performed.
-/// </summary>
-[HarmonyPatch]
-public static class KillAnimationMurderEventPatch
-{
-    public static MethodBase TargetMethod()
-    {
-        return Helpers.GetStateMachineMoveNext<KillAnimation>(nameof(KillAnimation.CoPerformKill))!;
-    }
-
-    public static void Postfix(Il2CppObjectBase __instance)
-    {
-        var wrapper = new StateMachineWrapper<KillAnimation>(__instance);
-        if (wrapper.GetState() != 1)
-        {
-            return;
-        }
-
-        var source = wrapper.GetParameter<PlayerControl>("source");
-        var target = wrapper.GetParameter<PlayerControl>("target");
-
-        var afterMurderEvent = new AfterMurderEvent(source, target, Helpers.GetBodyById(target.PlayerId));
-        MiraEventManager.InvokeEvent(afterMurderEvent);
-    }
-}

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -0,0 +1,30 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Utilities;
+
+namespace MiraAPI.Patches.Events;
+
+/// <summary>
+/// General patches for the KillAnimation class.
+/// </summary>
+[HarmonyPatch]
+public static class KillAnimationPatches
+{
+    /// <summary>
+    /// Used to trigger the <see cref="AfterMurderEvent"/>.
+    /// </summary>
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(KillAnimation._CoPerformKill_d__2), nameof(KillAnimation._CoPerformKill_d__2.MoveNext))]
+    public static void KillAnimPostfix(KillAnimation._CoPerformKill_d__2 __instance)
+    {
+        // Checking if state is -1 to wait for the end of coroutine.
+        if (__instance.__1__state != -1)
+        {
+            return;
+        }
+
+        var afterMurderEvent = new AfterMurderEvent(__instance.source, __instance.target, Helpers.GetBodyById(__instance.target.PlayerId));
+        MiraEventManager.InvokeEvent(afterMurderEvent);
+    }
+}

MiraAPI/Patches/Events/ReportBodyEventPatch.cs

@@ -41,7 +41,7 @@ public static class ReportBodyEventPatch
         var source = AmongUsClient.Instance.FindObjectByNetId<PlayerControl>(reportBodyMessage.rpcObjectNetId);
         if (source == null)
         {
-            Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
+            Logger<MiraApiPlugin>.Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
             return true;
         }
 

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -18,7 +18,7 @@ public static class ButtonResetPatches
             }
             catch (System.Exception ex)
             {
-                Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
+                Logger<MiraApiPlugin>.Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
             }
 
             if (customActionButton.UsesMode == ButtonUsesMode.PerRound)

MiraAPI/Patches/HudManagerPatches.cs

@@ -73,21 +73,17 @@ public static class HudManagerPatches
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
-        if (Constants.GetPlatformType() is Platforms.Android or Platforms.IPhone)
+        var fakeButton = Object.Instantiate(__instance.AbilityButton, BottomLeft.transform);
+        foreach (var renderer in fakeButton.GetComponentsInChildren<Renderer>())
         {
-            var fakeButton = Object.Instantiate(__instance.AbilityButton, BottomLeft.transform);
+            renderer.enabled = false;
-            foreach (var renderer in fakeButton.GetComponentsInChildren<Renderer>())
-            {
-                renderer.enabled = false;
-            }
-
-            fakeButton.buttonLabelText.Destroy();
-            fakeButton.cooldownTimerText.Destroy();
-            fakeButton.usesRemainingText.Destroy();
-            fakeButton.GetComponent<PassiveButton>().Destroy();
-            fakeButton.ToggleVisible(true);
-            fakeButton.Destroy();
         }
+        fakeButton.buttonLabelText.Destroy();
+        fakeButton.cooldownTimerText.Destroy();
+        fakeButton.usesRemainingText.Destroy();
+        fakeButton.GetComponent<PassiveButton>().Destroy();
+        fakeButton.ToggleVisible(true);
+        fakeButton.Destroy();
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
@@ -109,7 +105,7 @@ public static class HudManagerPatches
             }
             catch (System.Exception e)
             {
-                Error($"Failed to create custom button {button.GetType().Name}: {e}");
+                Logger<MiraApiPlugin>.Error($"Failed to create custom button {button.GetType().Name}: {e}");
             }
         }
 
@@ -171,7 +167,7 @@ public static class HudManagerPatches
             }
             catch (System.Exception e)
             {
-                Error($"Failed to set custom button {button.GetType().Name} active: {e}");
+                Logger<MiraApiPlugin>.Error($"Failed to set custom button {button.GetType().Name} active: {e}");
             }
         }
     }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -38,7 +38,7 @@ public static class IntroCutscenePatches
     {
         public static MethodBase TargetMethod()
         {
-            return Helpers.GetStateMachineMoveNext<IntroCutscene>(nameof(IntroCutscene.ShowRole))!;
+            return Helpers.GetStateMachineMoveNext<IntroCutscene>("ShowRole")!;
         }
 
         public static void Postfix(Il2CppObjectBase __instance)
@@ -52,7 +52,7 @@ public static class IntroCutscenePatches
 
             var introCutscene = wrapper.Instance;
 
-            Info("IntroCutscene ShowRole reached");
+            Logger<MiraApiPlugin>.Info("IntroCutscene ShowRole reached");
             var @event = new IntroRoleRevealEvent(introCutscene);
             MiraEventManager.InvokeEvent(@event);
         }
@@ -96,12 +96,12 @@ public static class IntroCutscenePatches
             if (onDestroy != null)
             {
                 _usedFallback = false;
-                Info("Using OnDestroy for IntroCutsceneDestroyPatch");
+                Logger<MiraApiPlugin>.Info("Using OnDestroy for IntroCutsceneDestroyPatch");
                 return onDestroy;
             }
 
             _usedFallback = true;
-            return Helpers.GetStateMachineMoveNext<IntroCutscene>(nameof(IntroCutscene.CoBegin))!;
+            return Helpers.GetStateMachineMoveNext<IntroCutscene>("CoBegin")!;
         }
 
         public static void Postfix(Il2CppObjectBase __instance)
@@ -124,7 +124,7 @@ public static class IntroCutscenePatches
             }
 
 
-            Info("IntroCutscene ended");
+            Logger<MiraApiPlugin>.Info("IntroCutscene ended");
 
             MiraEventManager.InvokeEvent(new IntroEndEvent(introCutscene));
 

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

@@ -117,7 +117,7 @@ internal static class GamePresetsTabPatches
         // ReSharper disable once InconsistentNaming
         public static void Postfix()
         {
-            Error("OnDisable called");
+            Logger<MiraApiPlugin>.Error("OnDisable called");
 
             if (_saveButton)
             {
@@ -155,7 +155,7 @@ internal static class GamePresetsTabPatches
         var prefab = GameSettingMenu.Instance.GameSettingsButton;
         if (prefab == null)
         {
-            Error("GameSettingsButton prefab is null");
+            Logger<MiraApiPlugin>.Error("GameSettingsButton prefab is null");
             return;
         }
 
@@ -318,10 +318,10 @@ internal static class GamePresetsTabPatches
 
     private static void Refresh()
     {
-        Error("Refreshing presets");
+        Logger<MiraApiPlugin>.Error("Refreshing presets");
         if (GameSettingMenuPatches.SelectedMod == null)
         {
-            Error("Selected mod is null, cannot refresh presets");
+            Logger<MiraApiPlugin>.Error("Selected mod is null, cannot refresh presets");
             return;
         }
         lock (Lock)

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -344,7 +344,7 @@ public static class LobbyViewPanePatches
                 }
 
                 viewSettingsInfoPanelRoleVariant.SetInfo(
-                    roleBehaviour.GetRoleName(),
+                    roleBehaviour.NiceName,
                     numPerGame,
                     chancePerGame,
                     61,

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -392,7 +392,7 @@ public static class RoleSettingMenuPatches
         }
         catch (Exception e)
         {
-            Warning(e);
+            Logger<MiraApiPlugin>.Warning(e);
         }
 
         roleSetting.UpdateValuesAndText(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions);
@@ -466,14 +466,16 @@ public static class RoleSettingMenuPatches
     {
         if (role is not ICustomRole customRole)
         {
-            Error($"Role {role.NiceName} is not a custom role.");
+            Logger<MiraApiPlugin>.Error($"Role {role.NiceName} is not a custom role.");
             return;
         }
 
         RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
-        __instance.roleTitleText.text = role.GetRoleName();
+        __instance.roleTitleText.text = TranslationController.Instance.GetString(
+            role.StringName,
+            new Il2CppReferenceArray<Il2CppSystem.Object>(0));
 
         var imgBg = __instance.AdvancedRolesSettings.transform.FindChild("Imagebackground");
         var labelBg = __instance.AdvancedRolesSettings.transform.FindChild("InfoLabelBackground");
@@ -560,7 +562,7 @@ public static class RoleSettingMenuPatches
     {
         if (role is not ICustomRole customRole)
         {
-            Error($"Role {role.NiceName} is not a custom role.");
+            Logger<MiraApiPlugin>.Error($"Role {role.NiceName} is not a custom role.");
             return null;
         }
 
@@ -577,7 +579,6 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.transform.localPosition = new Vector3(-0.1f, ScrollerNum, -2f);
 
         roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20);
-        roleOptionSetting.titleText.text = role.GetRoleName();
         roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);

MiraAPI/Patches/PlayerControlPatches.cs

@@ -145,7 +145,7 @@ internal static class PlayerControlPatches
             }
             catch (System.Exception e)
             {
-                Error($"Failed to update custom button {button.GetType().Name}: {e}");
+                Logger<MiraApiPlugin>.Error($"Failed to update custom button {button.GetType().Name}: {e}");
             }
         }
     }

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -1,12 +1,11 @@
 using HarmonyLib;
 using MiraAPI.Roles;
-using MiraAPI.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Patches the haunt menu to show the actual role name rather than team.
+/// Patches the haunt menu to show the actual role name rather then team.
 /// </summary>
 [HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetHauntTarget))]
 // SetFilterText was INLINED
@@ -23,7 +22,7 @@ public static class HauntMenuMinigamePatch
         var role = __instance.HauntTarget.Data.Role;
         var color = role is ICustomRole custom ? custom.RoleColor : role.TeamColor;
 
-        __instance.FilterText.text = role.GetRoleName();
+        __instance.FilterText.text = role.NiceName;
         __instance.FilterText.color = color;
     }
 }

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -25,7 +25,7 @@ public static class RoleManagerPatches
         var data = targetPlayer.Data;
         if (data == null)
         {
-            Error("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection.");
+            Debug.LogError("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection.");
             return false;
         }
         if (data.Role)

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -51,7 +51,7 @@ public static class RoleOptionsCollectionPatch
         var chance = customRole.GetChance();
         if (chance == null)
         {
-            Error($"Chance is null, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error($"Chance is null, defaulting to zero.");
             chance = 0;
         }
 
@@ -81,7 +81,7 @@ public static class RoleOptionsCollectionPatch
         var count = customRole.GetCount();
         if (count == null)
         {
-            Error($"Count is null, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error($"Count is null, defaulting to zero.");
             count = 0;
         }
 

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -70,14 +70,14 @@ public sealed class MiraPluginManager
 
                     if (!method.IsStatic)
                     {
-                        Error($"Event method {method.Name} in {type.Name} must be static.");
+                        Logger<MiraApiPlugin>.Error($"Event method {method.Name} in {type.Name} must be static.");
                         continue;
                     }
 
                     var parameters = method.GetParameters();
                     if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
                     {
-                        Error($"Invalid event registration method {method.Name} in {type.Name}");
+                        Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
                         continue;
                     }
 
@@ -131,7 +131,7 @@ public sealed class MiraPluginManager
             info.SavePublicCollections();
             PresetManager.CreateDefaultPreset(info);
             PresetManager.LoadPresets(info);
-            Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
+            Logger<MiraApiPlugin>.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
         };
         IL2CPPChainloader.Instance.Finished += PaletteManager.RegisterAllColors;
         IL2CPPChainloader.Instance.Finished += () =>
@@ -167,7 +167,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register game over {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register game over {type.Name}: {e}");
             return false;
         }
     }
@@ -190,7 +190,7 @@ public sealed class MiraPluginManager
             {
                 if (property.GetMethod?.IsStatic == true)
                 {
-                    Error($"Option property {property.Name} in {type.Name} must not be static.");
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} must not be static.");
                     continue;
                 }
 
@@ -211,14 +211,14 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(IModdedOption))))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for options.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for options.");
             }
 
             return true;
         }
         catch (Exception e)
         {
-            Error($"Failed to register options for {type.Name}: {e.ToString()}");
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e.ToString()}");
         }
         return false;
     }
@@ -235,7 +235,7 @@ public sealed class MiraPluginManager
 
             if (!ModList.GetById(pluginInfo.PluginId).IsRequiredOnAllClients)
             {
-                Error("Custom roles are only supported on all clients.");
+                Logger<MiraApiPlugin>.Error("Custom roles are only supported on all clients.");
                 return false;
             }
 
@@ -244,7 +244,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register role for {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register role for {type.Name}: {e}");
         }
         return false;
     }
@@ -260,7 +260,7 @@ public sealed class MiraPluginManager
 
             if (!type.IsStatic())
             {
-                Error($"Color class {type.Name} must be static.");
+                Logger<MiraApiPlugin>.Error($"Color class {type.Name} must be static.");
                 return;
             }
 
@@ -273,7 +273,7 @@ public sealed class MiraPluginManager
 
                 if (property.GetValue(null) is not CustomColor color)
                 {
-                    Error($"Color property {property.Name} in {type.Name} is not a CustomColor.");
+                    Logger<MiraApiPlugin>.Error($"Color property {property.Name} in {type.Name} is not a CustomColor.");
                     continue;
                 }
 
@@ -282,12 +282,12 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(CustomColor))))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for colors.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for colors.");
             }
         }
         catch (Exception e)
         {
-            Error($"Failed to register color class {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register color class {type.Name}: {e}");
         }
     }
 
@@ -299,7 +299,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register modifier {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register modifier {type.Name}: {e}");
             return false;
         }
     }
@@ -312,7 +312,7 @@ public sealed class MiraPluginManager
         }
         catch (Exception e)
         {
-            Error($"Failed to register button {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register button {type.Name}: {e}");
         }
 
         return false;
@@ -355,13 +355,13 @@ public sealed class MiraPluginManager
 
                 if (property.GetMethod?.IsStatic == true)
                 {
-                    Error($"Option property {property.Name} in {type.Name} must not be static.");
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} must not be static.");
                     continue;
                 }
 
                 if (property.GetValue(tabInstance) is not ConfigEntryBase configEntry)
                 {
-                    Error($"Option property {property.Name} in {type.Name} has to be a config entry.");
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} has to be a config entry.");
                     continue;
                 }
 
@@ -376,14 +376,14 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(ConfigEntryBase)) && f.GetCustomAttribute<LocalSettingAttribute>() != null))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for local settings.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for local settings.");
             }
 
             return true;
         }
         catch (Exception e)
         {
-            Error($"Failed to register options for {type.Name}: {e.ToString()}");
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e.ToString()}");
         }
 
         return false;
@@ -400,7 +400,7 @@ public sealed class MiraPluginManager
 
             if (!type.IsStatic())
             {
-                Error($"Keybinds class {type.Name} must be static.");
+                Logger<MiraApiPlugin>.Error($"Keybinds class {type.Name} must be static.");
                 return;
             }
 
@@ -413,7 +413,7 @@ public sealed class MiraPluginManager
 
                 if (property.GetValue(null) is not MiraKeybind keybind)
                 {
-                    Error($"Keybind property {property.Name} in {type.Name} is not a MiraKeybind.");
+                    Logger<MiraApiPlugin>.Error($"Keybind property {property.Name} in {type.Name} is not a MiraKeybind.");
                     continue;
                 }
 
@@ -430,12 +430,12 @@ public sealed class MiraPluginManager
 
             foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(MiraKeybind))))
             {
-                Error($"{field.Name} is a field, not a property. Use properties for keybinds.");
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for keybinds.");
             }
         }
         catch (Exception e)
         {
-            Error($"Failed to register keybind class {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register keybind class {type.Name}: {e}");
         }
     }
 }

MiraAPI/Presets/PresetManager.cs

@@ -70,7 +70,7 @@ public static class PresetManager
         foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
         {
             var fileName = Path.GetFileName(file);
-            Info($"Loading preset file {fileName}");
+            Logger<MiraApiPlugin>.Info($"Loading preset file {fileName}");
             var presetName = Path.GetFileNameWithoutExtension(file);
             var presetConfig = new ConfigFile(file, false)
             {

MiraAPI/Roles/CustomRoleManager.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using AmongUs.GameOptions;
 using Il2CppInterop.Runtime;
 using Il2CppInterop.Runtime.Injection;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
@@ -54,9 +53,6 @@ public static class CustomRoleManager
     internal static readonly Dictionary<ushort, RoleBehaviour> CustomRoles = [];
     internal static readonly Dictionary<Type, ushort> RoleIds = [];
 
-    private static Il2CppSystem.Collections.Generic.List<BaseGameSetting>? _emptySettings;
-    private static Il2CppReferenceArray<OverlayKillAnimation>? _emptyKillAnimations;
-
     private static ushort _roleId = 100;
 
     private static ushort GetNextRoleId()
@@ -108,7 +104,7 @@ public static class CustomRoleManager
     {
         if (!(typeof(RoleBehaviour).IsAssignableFrom(roleType) && typeof(ICustomRole).IsAssignableFrom(roleType)))
         {
-            Error($"{roleType.Name} does not inherit from RoleBehaviour or ICustomRole.");
+            Logger<MiraApiPlugin>.Error($"{roleType.Name} does not inherit from RoleBehaviour or ICustomRole.");
             return null;
         }
 
@@ -137,12 +133,6 @@ public static class CustomRoleManager
         roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount;
         roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot?.LoadAsset();
 
-        _emptySettings ??= new(0);
-        _emptyKillAnimations ??= new(0);
-
-        roleBehaviour.AllGameSettings = _emptySettings;
-        roleBehaviour.CustomKillAnimations = _emptyKillAnimations;
-
         if (customRole.Configuration.Icon != null)
         {
             var asset = customRole.Configuration.Icon.LoadAsset();
@@ -168,7 +158,7 @@ public static class CustomRoleManager
 
         if (useTaskHint && !overridesTaskText)
         {
-            Error($"Role {customRole.RoleName} is using RoleHintType.TaskHint but does not override SpawnTaskHeader!");
+            Logger<MiraApiPlugin>.Error($"Role {customRole.RoleName} is using RoleHintType.TaskHint but does not override SpawnTaskHeader!");
         }
 
         CustomRoles.Add(roleId, roleBehaviour);
@@ -298,7 +288,7 @@ public static class CustomRoleManager
             }
             catch (Exception e)
             {
-                Error(e);
+                Logger<MiraApiPlugin>.Error(e);
             }
         }
 

MiraAPI/Roles/ICustomRole.cs

@@ -156,7 +156,7 @@ public interface ICustomRole : IOptionable
     {
         if (!Configuration.CanModifyChance)
         {
-            Error($"Cannot modify chance for role: {RoleName}");
+            Logger<MiraApiPlugin>.Error($"Cannot modify chance for role: {RoleName}");
             return;
         }
 
@@ -166,7 +166,7 @@ public interface ICustomRole : IOptionable
             return;
         }
 
-        Error($"Error getting chance configuration for role: {RoleName}");
+        Logger<MiraApiPlugin>.Error($"Error getting chance configuration for role: {RoleName}");
     }
 
     /// <summary>
@@ -181,7 +181,7 @@ public interface ICustomRole : IOptionable
             return;
         }
 
-        Error($"Error getting count configuration for role: {RoleName}");
+        Logger<MiraApiPlugin>.Error($"Error getting count configuration for role: {RoleName}");
     }
 
     /// <summary>

MiraAPI/Utilities/Assets/AddressablesLoader.cs

@@ -33,7 +33,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more catalogs.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more catalogs.");
             return;
         }
 
@@ -48,7 +48,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for hats.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for hats.");
             return;
         }
 
@@ -63,7 +63,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for skins.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for skins.");
             return;
         }
 
@@ -79,7 +79,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for nameplates.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for nameplates.");
             return;
         }
 
@@ -95,7 +95,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized, cannot register more keys for visors.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized, cannot register more keys for visors.");
             return;
         }
 
@@ -106,7 +106,7 @@ public static class AddressablesLoader
     {
         if (_isInitialized)
         {
-            Error("AddressablesLoader has already been initialized.");
+            Logger<MiraApiPlugin>.Error("AddressablesLoader has already been initialized.");
             return;
         }
 
@@ -129,10 +129,10 @@ public static class AddressablesLoader
         // Check for errors
         if (catalogOperation.Status != AsyncOperationStatus.Succeeded)
         {
-            Error($"Failed to load catalog {location}.");
+            Logger<MiraApiPlugin>.Error($"Failed to load catalog {location}.");
         }
 
-        Info($"Loaded addressables {location}.");
+        Logger<MiraApiPlugin>.Info($"Loaded addressables {location}.");
         LoadedLocations.Add(location);
     }
 
@@ -193,7 +193,7 @@ public static class AddressablesLoader
             }
             catch
             {
-                Error($"Failed to find tag {tag}");
+                Logger<MiraApiPlugin>.Error($"Failed to find tag {tag}");
             }
         }
         return behaviours;
@@ -214,7 +214,7 @@ public static class AddressablesLoader
             }
             catch
             {
-                Error($"Failed to find tag {tag}");
+                Logger<MiraApiPlugin>.Error($"Failed to find tag {tag}");
             }
         }
         return behaviours;

MiraAPI/Utilities/Assets/LoadableAddressableAsset.cs

@@ -38,7 +38,7 @@ public class LoadableAddressableAsset<T>(string uid) : LoadableAsset<T> where T
 
         var remoteReference = new AssetReference(uid);
 
-        if (!GC.TryStartNoGCRegion(4096, true)) Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
+        if (!GC.TryStartNoGCRegion(4096, true)) Logger<MiraApiPlugin>.Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
 
         LoadedAsset = remoteReference.LoadAssetAsync<T>().WaitForCompletion();
         if (LoadedAsset == null)

MiraAPI/Utilities/Assets/LoadableAddressableAssets.cs

@@ -45,7 +45,7 @@ public class LoadableAddressableAssets<T>(string key) where T : UnityEngine.Obje
 
         var locations = Addressables.LoadResourceLocationsAsync(key).WaitForCompletion();
 
-        if (!GC.TryStartNoGCRegion(4096, true)) Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
+        if (!GC.TryStartNoGCRegion(4096, true)) Logger<MiraApiPlugin>.Error("Could not start NoGCRegion of size 4kb, there is the possibility of injected unmanaged classes being garbage collected as per BepInEx/Il2CppInterop/issues/40");
 
         var assetsIList = Addressables.LoadAssetsAsync<T>(locations, null, false).WaitForCompletion();
         if (assetsIList == null)

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -19,10 +19,7 @@ public static class SpriteTools
     /// <exception cref="ArgumentException">Thrown when the resource cannot be found in the specified assembly.</exception>
     public static Texture2D LoadTextureFromResourcePath(string resourcePath, Assembly assembly)
     {
-        var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false)
+        var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false);
-        {
-            wrapMode = TextureWrapMode.Clamp,
-        };
         var myStream = assembly.GetManifestResourceStream(resourcePath);
         if (myStream != null)
         {

MiraAPI/Utilities/Extensions.cs

@@ -29,13 +29,13 @@ public static class Extensions
 
         if (count == null)
         {
-            Error("Couldn't get role count for NetData, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error("Couldn't get role count for NetData, defaulting to zero.");
             count = 0;
         }
 
         if (chance == null)
         {
-            Error("Couldn't get role chance for NetData, defaulting to zero.");
+            Logger<MiraApiPlugin>.Error("Couldn't get role chance for NetData, defaulting to zero.");
             chance = 0;
         }
 
@@ -398,7 +398,7 @@ public static class Extensions
 
             if (length > chunkSize)
             {
-                Info($"NetData length is greater than chunk size: {length} > {chunkSize}");
+                Logger<MiraApiPlugin>.Info($"NetData length is greater than chunk size: {length} > {chunkSize}");
                 continue;
             }
 

MiraAPI/Utilities/Helpers.cs

@@ -49,18 +49,18 @@ public static class Helpers
 
         if (showRoleStateMachine == null)
         {
-            Error($"Failed to find {methodName} state machine for {typeName}");
+            Logger<MiraApiPlugin>.Error($"Failed to find {methodName} state machine for {typeName}");
             return null;
         }
 
         var moveNext = AccessTools.Method(showRoleStateMachine, "MoveNext");
         if (moveNext == null)
         {
-            Error($"Failed to find MoveNext method for {typeName}.{methodName}");
+            Logger<MiraApiPlugin>.Error($"Failed to find MoveNext method for {typeName}.{methodName}");
             return null;
         }
 
-        Info($"Found {methodName}.MoveNext");
+        Logger<MiraApiPlugin>.Info($"Found {methodName}.MoveNext");
         return moveNext;
     }
 
@@ -139,7 +139,7 @@ public static class Helpers
                 return true;
             default:
                 {
-                    var num = Random.RandomRangeInt(1, 101);
+                    var num = UnityEngine.Random.RandomRangeInt(1, 101);
                     return num <= probability;
                 }
         }
@@ -500,7 +500,7 @@ public static class Helpers
     public static string RandomString(int length, string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
     {
         return new string(Enumerable.Repeat(chars, length)
-            .Select(s => s[Random.RandomRangeInt(0, s.Length)]).ToArray());
+            .Select(s => s[UnityEngine.Random.RandomRangeInt(0, s.Length)]).ToArray());
     }
 
     /// <summary>

MiraAPI/Utilities/StateMachineWrapper.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Reflection;
-using System.Collections.Generic;
-using System.Reflection;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes;
 
@@ -13,11 +11,8 @@ namespace MiraAPI.Utilities;
 public class StateMachineWrapper<T> where T : Il2CppObjectBase
 {
     private readonly Il2CppObjectBase _stateMachine;
-
-    // normally it is fields, but IL2CPP turns them into properties
     private readonly PropertyInfo _thisProperty;
     private readonly PropertyInfo _stateProperty;
-    private readonly Dictionary<string, PropertyInfo> _propertyCache;
 
     private T? _parentInstance;
 
@@ -37,13 +32,6 @@ public class StateMachineWrapper<T> where T : Il2CppObjectBase
         var type = _stateMachine.GetType();
         _thisProperty = AccessTools.Property(type, "__4__this");
         _stateProperty = AccessTools.Property(type, "__1__state");
-
-        if (_thisProperty == null || _stateProperty == null)
-        {
-            throw new MissingMemberException($"Could not find required properties in type '{type}'.");
-        }
-
-        _propertyCache = [];
     }
 
     /// <summary>
@@ -51,25 +39,4 @@ public class StateMachineWrapper<T> where T : Il2CppObjectBase
     /// </summary>
     /// <returns>The current state as an integer.</returns>
     public int GetState() => (int)_stateProperty.GetValue(_stateMachine)!;
-
-    /// <summary>
-    /// Gets a parameter from the state machine by its name.
-    /// </summary>
-    /// <param name="parameterName">The name of the parameter to retrieve.</param>
-    /// <typeparam name="TField">The type of the parameter to retrieve.</typeparam>
-    /// <returns>>The value of the specified parameter.</returns>
-    /// <exception cref="MissingFieldException">Thrown if the specified parameter does not exist.</exception>
-    public TField GetParameter<TField>(string parameterName)
-    {
-        if (_propertyCache.TryGetValue(parameterName, out var property))
-        {
-            return (TField)property.GetValue(_stateMachine)!;
-        }
-
-        property = AccessTools.Property(_stateMachine.GetType(), parameterName)
-                   ?? throw new MissingFieldException($"Could not find parameter '{parameterName}' in state machine of type '{_stateMachine.GetType()}'.");
-
-        _propertyCache[parameterName] = property;
-        return (TField)property.GetValue(_stateMachine)!;
-    }
 }

MiraAPI/Voting/VotingUtils.cs

@@ -224,7 +224,7 @@ public static class VotingUtils
                 var playerById = GameData.Instance.GetPlayerById(vote.Voter);
                 if (playerById == null)
                 {
-                    Error($"Couldn't find player info for voter: {vote.Voter}");
+                    Logger<MiraApiPlugin>.Error($"Couldn't find player info for voter: {vote.Voter}");
                 }
                 else if (i == 0 && vote.Suspect == SkipVoteId)
                 {

nuget.config

@@ -6,6 +6,6 @@
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
         <add key="Reactor" value="https://nuget.reactor.gg/v3/index.json" />
         <add key="Samboy063" value="https://nuget.samboy.dev/v3/index.json" />
-        <add key="local" value="./packages" />
+        <add key="Local" value="packages/" />
     </packageSources>
 </configuration>

packages/packages.txt

@@ -1,3 +0,0 @@
-here to ensure git doesn't delete empty folders
-
-local packages are stored in this directory