remove unnecessary icustomrole methods

MiraAPI.Example/ExampleEventHandlers.cs

@@ -38,12 +38,9 @@ public static class ExampleEventHandlers
     [RegisterEvent]
     public static void StartMeetingEvent(StartMeetingEvent _)
     {
-        foreach (var plr in PlayerControl.AllPlayerControls)
+        foreach (var plr in PlayerControl.AllPlayerControls.ToArray().Where(player => player.Data.Role is MayorRole))
         {
-            if (plr.Data.Role is MayorRole)
-            {
-                plr.GetVoteData().IncreaseRemainingVotes(1);
-            }
+            plr.GetVoteData().IncreaseRemainingVotes(1);
         }
     }
 

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,4 +1,6 @@
-using MiraAPI.Roles;
+using AmongUs.GameOptions;
+using MiraAPI.Roles;
+using MiraAPI.Utilities;
 using TMPro;
 using UnityEngine;
 
@@ -12,9 +14,10 @@ public class ChameloenRole : CrewmateRole, ICustomRole
     public Color RoleColor => Palette.AcceptedGreen;
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
 
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
+    public CustomRoleConfiguration Configuration => new(this)
     {
         OptionsScreenshot = ExampleAssets.Banner,
+        IntroSound = CustomRoleUtils.GetIntroSound(RoleTypes.Shapeshifter),
     };
 
     public void PlayerControlFixedUpdate(PlayerControl playerControl)

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -79,17 +79,7 @@ public abstract class ModdedOption<T> : IModdedOption
     /// <summary>
     /// Gets or sets the config definition of the option.
     /// </summary>
-    public ConfigDefinition? ConfigDefinition
-    {
-        get => _configDefinition;
-        set
-        {
-            if (_configDefinition is not null) return;
-            _configDefinition = value;
-        }
-    }
-
-    private ConfigDefinition? _configDefinition;
+    public ConfigDefinition? ConfigDefinition { get; set; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ModdedOption{T}"/> class.

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -250,14 +250,9 @@ public static class LobbyViewPanePatches
 
         var list = new List<Type>();
 
-        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
+        var roleGroups = SelectedMod.CustomRoles.Values.OfType<ICustomRole>()
             .ToLookup(x => x.RoleOptionsGroup);
 
-        if (roleGroups is null)
-        {
-            return;
-        }
-
         // sort the groups by priority
         var sortedRoleGroups = roleGroups
             .OrderBy(x => x.Key.Priority)

MiraAPI/Patches/PlayerControlPatches.cs

@@ -99,11 +99,6 @@ public static class PlayerControlPatches
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
     {
-        if (__instance.Data?.Role is ICustomRole customRole)
-        {
-            customRole.PlayerControlFixedUpdate(__instance);
-        }
-
         if (!__instance.AmOwner)
         {
             return;

MiraAPI/Patches/Roles/GameStartupPatch.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 
 namespace MiraAPI.Patches.Roles;
@@ -21,6 +22,14 @@ public static class GameStartupPatch
         }
 
         _runOnce = true;
+
+        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0) return;
+        foreach (var queue in MiraPluginManager.Instance.QueuedRoleRegistrations)
+        {
+            CustomRoleManager.RegisterRoleTypes(queue.Value, queue.Key);
+        }
+
+        MiraPluginManager.Instance.QueuedRoleRegistrations.Clear();
         CustomRoleManager.RegisterInRoleManager();
     }
 }

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -5,29 +5,15 @@ using Reactor.Utilities.Extensions;
 
 namespace MiraAPI.Patches.Roles;
 
-/// <summary>
-/// HudManager patches for roles.
-/// </summary>
 [HarmonyPatch(typeof(HudManager))]
-public static class HudManagerPatches
+internal static class HudManagerPatches
 {
-    // Custom role tab.
     private static TaskPanelBehaviour? _roleTab;
 
-    /// <summary>
-    /// Fixes Kill Button not showing for Neutral killing role.
-    /// </summary>
-    /// <param name="__instance">HudManager instance.</param>
-    /// <param name="localPlayer">The local PlayerControl.</param>
-    /// <param name="role">The player's RoleBehaviour.</param>
-    /// <param name="isActive">Whether the Hud should be set active or not.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(HudManager.SetHudActive), typeof(PlayerControl), typeof(RoleBehaviour), typeof(bool))]
-    public static void SetHudActivePostfix(
-        HudManager __instance,
-        PlayerControl localPlayer,
-        RoleBehaviour role,
-        bool isActive)
+    // ReSharper disable once InconsistentNaming
+    public static void SetHudActivePostfix(HudManager __instance, PlayerControl localPlayer, RoleBehaviour role, bool isActive)
     {
         var flag = localPlayer.Data != null && localPlayer.Data.IsDead;
 
@@ -44,11 +30,9 @@ public static class HudManagerPatches
         }
     }
 
-    /// <summary>
-    /// Update custom role tab and custom role hud elements.
-    /// </summary>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(HudManager.Update))]
+    // ReSharper disable once InconsistentNaming
     public static void UpdatePostfix(HudManager __instance)
     {
         var local = PlayerControl.LocalPlayer;
@@ -62,8 +46,6 @@ public static class HudManagerPatches
 
         if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
         {
-            customRole.HudUpdate(__instance);
-
             if (_roleTab == null)
             {
                 _roleTab = CustomRoleManager.CreateRoleTab(customRole);
@@ -71,9 +53,9 @@ public static class HudManagerPatches
 
             CustomRoleManager.UpdateRoleTab(_roleTab, customRole);
         }
-        else if (_roleTab)
+        else if (_roleTab != null)
         {
-            _roleTab?.gameObject.Destroy();
+            _roleTab.gameObject.Destroy();
         }
     }
 }

MiraAPI/Patches/Roles/RoleBehaviourPatch.cs

@@ -22,4 +22,4 @@ public static class RoleBehaviourPatch
         __result = behaviour.RoleColor;
         return false;
     }
-}
+}

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -27,7 +27,7 @@ public sealed class MiraPluginManager
     private readonly Dictionary<Assembly, MiraPluginInfo> _registeredPlugins = [];
 
     internal MiraPluginInfo[] RegisteredPlugins() => [.. _registeredPlugins.Values];
-
+    internal Dictionary<MiraPluginInfo, List<Type>> QueuedRoleRegistrations { get; } = new();
     internal static MiraPluginManager Instance { get; private set; } = new();
 
     internal void Initialize()
@@ -97,7 +97,7 @@ public sealed class MiraPluginManager
             }
 
             info.OptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
-            CustomRoleManager.RegisterRoleTypes(roles, info);
+            QueuedRoleRegistrations.Add(info, roles);
 
             _registeredPlugins.Add(assembly, info);
             Logger<MiraApiPlugin>.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");

MiraAPI/Roles/CustomRoleConfiguration.cs

@@ -34,6 +34,9 @@ public record struct CustomRoleConfiguration
         TasksCountForProgress = role.Team is ModdedRoleTeams.Crewmate;
         HideSettings = roleBehaviour?.IsDead == true;
         ShowInFreeplay = roleBehaviour?.IsDead == false;
+        IntroSound = role.Team is ModdedRoleTeams.Crewmate
+            ? CustomRoleManager.CrewmateIntroSound
+            : CustomRoleManager.ImpostorIntroSound;
     }
 
     /// <summary>

MiraAPI/Roles/CustomRoleManager.cs

@@ -7,6 +7,7 @@ using Il2CppInterop.Runtime.Injection;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
+using MiraAPI.Utilities.Assets;
 using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
 using Reactor.Utilities;
@@ -23,6 +24,18 @@ namespace MiraAPI.Roles;
 /// </summary>
 public static class CustomRoleManager
 {
+    /// <summary>
+    /// The default Among Us Crewmate Intro Sound.
+    /// </summary>
+    public static readonly LoadableAsset<AudioClip> CrewmateIntroSound =
+        CustomRoleUtils.GetIntroSound(RoleTypes.Crewmate)!;
+
+    /// <summary>
+    /// The default Among Us Impostor Intro Sound.
+    /// </summary>
+    public static readonly LoadableAsset<AudioClip> ImpostorIntroSound =
+        CustomRoleUtils.GetIntroSound(RoleTypes.Impostor)!;
+
     internal static readonly Dictionary<ushort, RoleBehaviour> CustomRoles = [];
     internal static readonly Dictionary<Type, ushort> RoleIds = [];
 

MiraAPI/Roles/CustomRoleUtils.cs

@@ -3,6 +3,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using AmongUs.GameOptions;
+using MiraAPI.Utilities.Assets;
 using UnityEngine;
 
 namespace MiraAPI.Roles;
@@ -46,4 +47,16 @@ public static class CustomRoleUtils
         taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleLongDescription}");
         return taskStringBuilder;
     }
+
+    /// <summary>
+    /// Returns an intro sound from a role.
+    /// </summary>
+    /// <param name="roleType">The role type.</param>
+    /// <returns>The intro sound.</returns>
+    public static LoadableAsset<AudioClip>? GetIntroSound(RoleTypes roleType)
+    {
+        var role = RoleManager.Instance.AllRoles.FirstOrDefault(role => role.Role == roleType);
+        if (role is ICustomRole customRole) return customRole.Configuration.IntroSound;
+        return new PreloadedAsset<AudioClip>(role!.IntroSound);
+    }
 }

MiraAPI/Roles/ICustomRole.cs

@@ -74,14 +74,6 @@ public interface ICustomRole : IOptionable
     /// </summary>
     MiraPluginInfo ParentMod => CustomRoleManager.FindParentMod(this);
 
-    /// <summary>
-    /// This method runs on the PlayerControl.FixedUpdate method for ALL players with this role.
-    /// </summary>
-    /// <param name="playerControl">The PlayerControl that has this role.</param>
-    void PlayerControlFixedUpdate(PlayerControl playerControl)
-    {
-    }
-
     internal ConfigDefinition NumConfigDefinition => new("Roles", $"Num {GetType().FullName}");
     internal ConfigDefinition ChanceConfigDefinition => new("Roles", $"Chance {GetType().FullName}");
 
@@ -184,14 +176,6 @@ public interface ICustomRole : IOptionable
         return true;
     }
 
-    /// <summary>
-    /// This method runs on the HudManager.Update method ONLY when the LOCAL player has this role.
-    /// </summary>
-    /// <param name="hudManager">Reference to HudManager instance.</param>
-    void HudUpdate(HudManager hudManager)
-    {
-    }
-
     /// <summary>
     /// Gets a custom ejection message for the role. Return null to use the default message.
     /// </summary>

MiraAPI/Utilities/Assets/PreloadedAsset.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace MiraAPI.Utilities.Assets;
+
+/// <summary>
+/// An implementation for creating loadable assets from preloaded assets.
+/// </summary>
+/// <inheritdoc cref="LoadableAsset{T}"/>
+/// <inheritdoc />
+public class PreloadedAsset<T>(T asset) : LoadableAsset<T> where T : UnityEngine.Object
+{
+    private readonly T loadedAsset = asset ?? throw new ArgumentNullException(nameof(asset));
+
+    /// <inheritdoc />
+    public override T LoadAsset()
+    {
+        return loadedAsset;
+    }
+}

MiraAPI/Utilities/Extensions.cs

@@ -283,12 +283,13 @@ public static class Extensions
 
             if (count + length > chunkSize)
             {
-                chunks.Enqueue(current.ToArray());
+                chunks.Enqueue([.. current]);
                 current.Clear();
                 count = 0;
             }
 
             current.Add(netData);
+            count += length;
         }
 
         if (current.Count > 0)

MiraAPI/Utilities/Helpers.cs

@@ -1,17 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Text;
-using AmongUs.GameOptions;
-using HarmonyLib;
-using MiraAPI.Roles;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;
-using UnityEngine.TextCore;
 using Object = UnityEngine.Object;
 
 namespace MiraAPI.Utilities;