Begin teams ig

.editorconfig

@@ -1,2 +0,0 @@
-[*.{cs,vb}]
-dotnet_diagnostic.CA1707.severity = none

.github/workflows/main.yaml

@@ -1,51 +0,0 @@
-name: CI
-
-on: ["workflow_dispatch", "push", "pull_request"]
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.nuget/packages
-            ~/.cache/bepinex
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-nuget-
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 8.0.x
-
-      - name: Run the Cake script
-        uses: cake-build/cake-action@v2
-        with:
-          verbosity: Diagnostic
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: MiraAPI.dll
-          path: MiraAPI/bin/Release/net6.0/MiraAPI.dll
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: AllOfUs.MiraAPI.nupkg
-          path: MiraAPI/bin/Release/AllOfUs.MiraAPI.*.nupkg
-          
-      - uses: softprops/action-gh-release@v1
-        if: github.ref_type == 'tag'
-        with:
-          draft: true
-          files: MiraAPI/bin/Release/net6.0/MiraAPI.dll
-          
-      - name: Push NuGet package
-        if: github.ref_type == 'tag'
-        run: |
-          dotnet nuget push MiraAPI/bin/Release/AllOfUs.MiraAPI.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}

.gitignore

@@ -4,5 +4,4 @@
 obj/
 bin/
 
-*.user
-*.lock.json
+*.user

AmongUs.props

@@ -1,14 +0,0 @@
-<Project>
-    <ItemGroup>
-        <PackageReference Include="Reactor" Version="2.3.1" />
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.9.4" PrivateAssets="all" />
-
-        <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
-        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" />
-    </ItemGroup>
-
-    <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
-        <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" UseSymboliclinksIfPossible="true" />
-    </Target>
-</Project>

Directory.Build.props

@@ -1,45 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <DebugType>embedded</DebugType>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-
-        <VersionPrefix>0.1.9</VersionPrefix>
-        <VersionSuffix>dev</VersionSuffix>
-
-        <Authors>All Of Us, XtraCube, Angxl</Authors>
-        <Company>All Of Us</Company>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/All-Of-Us-Mods/MiraAPI</RepositoryUrl>
-        <PackageLicenseExpression>LGPL-2.1-or-later</PackageLicenseExpression>
-
-        <!-- SourceLink -->
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <AnalysisLevel>latest</AnalysisLevel>
-        <AnalysisMode>recommended</AnalysisMode>
-        <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
-        <AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" Visible="false" />
-
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\stylecop.ruleset</CodeAnalysisRuleSet>
-    </PropertyGroup>
-</Project>

MiraAPI.Example/Buttons/ExampleButton.cs

@@ -0,0 +1,26 @@
+using MiraAPI.Hud;
+using MiraAPI.Utilities.Assets;
+using Reactor.Utilities;
+using UnityEngine;
+
+namespace MiraAPI.Example.Buttons;
+
+[RegisterButton]
+public class ExampleButton : CustomActionButton
+{
+    public override string Name => "Example Button";
+    public override float Cooldown => 5f;
+    public override float EffectDuration => 0f;
+    public override int MaxUses => 5;
+    public override LoadableAsset<Sprite> Sprite { get; } = ExampleAssets.ExampleButton;
+    
+    protected override void OnClick()
+    {
+        Logger<ExamplePlugin>.Info("Example button clicked!");
+    }
+
+    public override bool Enabled(RoleBehaviour role)
+    {
+        return true;
+    }
+}

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -1,45 +0,0 @@
-using MiraAPI.Example.Modifiers.Freezer;
-using MiraAPI.Example.Options.Roles;
-using MiraAPI.Example.Roles;
-using MiraAPI.GameOptions;
-using MiraAPI.Hud;
-using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Example.Buttons.Freezer;
-
-[RegisterButton]
-public class FreezeButton : CustomActionButton<PlayerControl>
-{
-    public override string Name => "Freeze";
-    public override float Cooldown => OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeDuration;
-    public override float EffectDuration => 0f;
-    public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
-    public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-
-    protected override void OnClick()
-    {
-        Target?.RpcAddModifier<FreezeModifier>();
-    }
-
-    public override PlayerControl? GetTarget()
-    {
-        return PlayerControl.LocalPlayer.GetClosestPlayer(true, Distance);
-    }
-
-    public override void SetOutline(bool active)
-    {
-        Target?.cosmetics.SetOutline(active, new Il2CppSystem.Nullable<Color>(Palette.Blue));
-    }
-
-    public override bool IsTargetValid(PlayerControl? target)
-    {
-        return true;
-    }
-
-    public override bool Enabled(RoleBehaviour? role)
-    {
-        return role is FreezerRole;
-    }
-}

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -1,48 +0,0 @@
-using MiraAPI.Example.Modifiers;
-using MiraAPI.Hud;
-using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Example.Buttons;
-
-[RegisterButton]
-public class MeetingButton : CustomActionButton
-{
-    public override string Name => "Call Meeting";
-
-    public override float Cooldown => 15;
-
-    public override float EffectDuration => 0;
-
-    public override int MaxUses => 3;
-
-    public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
-
-    public override bool Enabled(RoleBehaviour? role)
-    {
-        return PlayerControl.LocalPlayer != null && PlayerControl.LocalPlayer.HasModifier<CaptainModifier>();
-    }
-
-    protected override void OnClick()
-    {
-        var bt = ShipStatus.Instance.EmergencyButton;
-
-        PlayerControl.LocalPlayer.NetTransform.Halt();
-        var minigame = Object.Instantiate(bt.MinigamePrefab, Camera.main!.transform, false);
-
-        var taskAdderGame = minigame as TaskAdderGame;
-        if (taskAdderGame != null)
-        {
-            taskAdderGame.SafePositionWorld = bt.SafePositionLocal + (Vector2)bt.transform.position;
-        }
-
-        minigame.transform.localPosition = new Vector3(0f, 0f, -50f);
-        minigame.Begin(null);
-
-        if (UsesLeft == 0 && PlayerControl.LocalPlayer.HasModifier<CaptainModifier>())
-        {
-            PlayerControl.LocalPlayer.RpcRemoveModifier<CaptainModifier>();
-        }
-    }
-}

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -1,89 +0,0 @@
-using System.Collections;
-using MiraAPI.Example.Options.Roles;
-using MiraAPI.Example.Roles;
-using MiraAPI.GameOptions;
-using MiraAPI.Hud;
-using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Example.Buttons.Teleporter;
-[RegisterButton]
-public class TeleportButton : CustomActionButton
-{
-    public override string Name => "Teleport";
-
-    public override float Cooldown => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportCooldown.Value;
-
-    public override float EffectDuration => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportDuration;
-
-    public override int MaxUses => 0;
-
-    public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
-    public static bool IsZoom { get; private set; }
-
-    public override bool Enabled(RoleBehaviour? role)
-    {
-        return role is TeleporterRole;
-    }
-    protected override void OnClick()
-    {
-        Coroutines.Start(ZoomOutCoroutine());
-    }
-
-    public override void OnEffectEnd()
-    {
-        Coroutines.Start(ZoomInCoroutine());
-    }
-
-    protected override void FixedUpdate(PlayerControl playerControl)
-    {
-        base.FixedUpdate(playerControl);
-
-        if (!EffectActive)
-        {
-            return;
-        }
-
-        if (Input.GetKey(KeyCode.Mouse0))
-        {
-            playerControl.NetTransform.RpcSnapTo(Camera.main.ScreenToWorldPoint(Input.mousePosition));
-            ResetCooldownAndOrEffect();
-        }
-    }
-
-    private static IEnumerator ZoomOutCoroutine()
-    {
-        HudManager.Instance.ShadowQuad.gameObject.SetActive(false);
-        IsZoom = true;
-        var zoomDistance = OptionGroupSingleton<TeleporterOptions>.Instance.ZoomDistance;
-        for (var ft = Camera.main!.orthographicSize; ft < zoomDistance; ft += 0.3f)
-        {
-            Camera.main.orthographicSize = MeetingHud.Instance ? 3f : ft;
-            ResolutionManager.ResolutionChanged.Invoke((float)Screen.width / Screen.height, Screen.width, Screen.height, Screen.fullScreen);
-            foreach (var cam in Camera.allCameras) cam.orthographicSize = Camera.main.orthographicSize;
-            yield return null;
-        }
-
-        foreach (var cam in Camera.allCameras) cam.orthographicSize = zoomDistance;
-        ResolutionManager.ResolutionChanged.Invoke((float)Screen.width / Screen.height, Screen.width, Screen.height, Screen.fullScreen);
-    }
-
-    private static IEnumerator ZoomInCoroutine()
-    {
-        for (var ft = Camera.main!.orthographicSize; ft > 3f; ft -= 0.3f)
-        {
-            Camera.main.orthographicSize = MeetingHud.Instance ? 3f : ft;
-            ResolutionManager.ResolutionChanged.Invoke((float)Screen.width / Screen.height, Screen.width, Screen.height, Screen.fullScreen);
-            foreach (var cam in Camera.allCameras) cam.orthographicSize = Camera.main.orthographicSize;
-
-            yield return null;
-        }
-
-        foreach (var cam in Camera.allCameras) cam.orthographicSize = 3f;
-        HudManager.Instance.ShadowQuad.gameObject.SetActive(true);
-        IsZoom = false;
-
-        ResolutionManager.ResolutionChanged.Invoke((float)Screen.width / Screen.height, Screen.width, Screen.height, Screen.fullScreen);
-    }
-}

MiraAPI.Example/Cosmetics/ExampleCosmeticGroup.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using MiraAPI.Cosmetics;
-
-namespace MiraAPI.Example.Cosmetics;
-public class ExampleCosmeticGroup : AbstractCosmeticsGroup
-{
-    public override string GroupName => "Example";
-
-    [RegisterCustomCosmetic()]
-    public List<HatData> hats { get; set;  } = new();
-    [RegisterCustomCosmetic()]
-    public List<NamePlateData> namePlates { get; set;} = new();
-    [RegisterCustomCosmetic()]
-    public List<SkinData> skins { get; set; } = new();
-    [RegisterCustomCosmetic()]
-    public List<VisorData> visors { get; set; } = new();
-}

MiraAPI.Example/ExampleAssets.cs

@@ -5,8 +5,5 @@ namespace MiraAPI.Example;
 public static class ExampleAssets
 {
     public static LoadableResourceAsset ExampleButton { get; } = new("MiraAPI.Example.Resources.ExampleButton.png");
-
-    // Credit to EpicHorrors for the teleport button asset.
-    public static LoadableResourceAsset TeleportButton { get; } = new("MiraAPI.Example.Resources.TeleportButton.png");
     public static LoadableResourceAsset Banner { get; } = new("MiraAPI.Example.Resources.FortniteBanner.jpeg");
-}
+}

MiraAPI.Example/ExampleColors.cs

@@ -1,14 +0,0 @@
-using MiraAPI.Colors;
-using UnityEngine;
-
-namespace MiraAPI.Example;
-
-[RegisterCustomColors]
-public static class ExampleColors
-{
-    public static CustomColor Cerulean { get; } = new("Cerulean", new Color(0.0f, 0.48f, 0.65f));
-
-    public static CustomColor Rose { get; } = new("Rose", new Color(0.98f, 0.26f, 0.62f));
-
-    public static CustomColor Gold { get; } = new("Gold", new Color(1.0f, 0.84f, 0.0f));
-}

MiraAPI.Example/ExamplePlugin.cs

@@ -2,18 +2,14 @@
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
-using MiraAPI.Cosmetics;
-using MiraAPI.Example.Cosmetics;
 using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
-using MiraAPI.Utilities.Assets.Addressable;
 using Reactor;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
 
 namespace MiraAPI.Example;
 
-[BepInAutoPlugin("mira.example", "MiraExampleMod")]
+[BepInAutoPlugin("mira.example", "MiraAPIExample")]
 [BepInProcess("Among Us.exe")]
 [BepInDependency(ReactorPlugin.Id)]
 [BepInDependency(MiraApiPlugin.Id)]
@@ -21,17 +17,9 @@ namespace MiraAPI.Example;
 public partial class ExamplePlugin : BasePlugin, IMiraPlugin
 {
     public Harmony Harmony { get; } = new(Id);
-    public string OptionsTitleText => "Mira API\nExample Mod";
     public ConfigFile GetConfigFile() => Config;
     public override void Load()
     {
         Harmony.PatchAll();
-        AddComponent<MiraDebugWindow>();
-
-        new Catalog("Output".ToLocalPath()).LoadCatalog();
-        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.hats = new LoadableAddressableGroupAsset<HatData>(CatalogTools.GetResourceLocation("hatdata")).LoadAsset();
-        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.namePlates = new LoadableAddressableGroupAsset<NamePlateData>(CatalogTools.GetResourceLocation("nameplatedata")).LoadAsset();
-        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.skins = new LoadableAddressableGroupAsset<SkinData>(CatalogTools.GetResourceLocation("skindata")).LoadAsset();
-        CosmeticGroupSingleton<ExampleCosmeticGroup>.Instance.visors = new LoadableAddressableGroupAsset<VisorData>(CatalogTools.GetResourceLocation("visordata")).LoadAsset();
     }
-}
+}

MiraAPI.Example/MiraAPI.Example.csproj

@@ -1,9 +1,26 @@
- <Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>1.0.0</Version>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
+		<DebugType>embedded</DebugType>
+
+		<VersionPrefix>1.0.0</VersionPrefix>
+		<VersionSuffix>dev</VersionSuffix>
 		<Description>Example mod for Mira API</Description>
 		<Authors>Angxl, XtraCube</Authors>
 	</PropertyGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="Reactor" Version="2.3.0" />
+		<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
+		<PackageReference Include="Iced" Version="1.21.0" />
+		<PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.8.13" PrivateAssets="all" />
+
+		<PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
+		<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime">
+			<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\MiraAPI\MiraAPI.csproj" />
@@ -12,8 +29,9 @@
 	<ItemGroup>
 		<EmbeddedResource Include="Resources\ExampleButton.png" />
 		<EmbeddedResource Include="Resources\FortniteBanner.jpeg" />
-		<EmbeddedResource Include="Resources\TeleportButton.png" />
 	</ItemGroup>
 
-	<Import Project="..\AmongUs.props" />
+	<Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
+		<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" UseSymboliclinksIfPossible="true" />
+	</Target>
 </Project>

MiraAPI.Example/MiraDebugWindow.cs

@@ -1,27 +0,0 @@
-using System;
-using Il2CppInterop.Runtime.Attributes;
-using Reactor.Utilities.Attributes;
-using Reactor.Utilities.ImGui;
-using UnityEngine;
-
-namespace MiraAPI.Example;
-
-[RegisterInIl2Cpp]
-public class MiraDebugWindow(IntPtr cppPtr) : MonoBehaviour(cppPtr)
-{
-    [HideFromIl2Cpp]
-    public DragWindow DebuggingWindow { get; } = new(
-        new Rect(10, 10, 0, 0),
-        "MIRA API DEBUGGING",
-        () =>
-        {
-        })
-    {
-        Enabled = true,
-    };
-
-    public void OnGUI()
-    {
-        DebuggingWindow.OnGUI();
-    }
-}

MiraAPI.Example/ModifierExample.cs

@@ -0,0 +1,8 @@
+namespace MiraAPI.Example;
+
+public class ModifierExample
+{
+    //name, role specific, etc
+
+    // mono behaviour stuff here (ModdedPlayerModifier inherits monobehaviour)
+}

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,20 +0,0 @@
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
-
-namespace MiraAPI.Example.Modifiers;
-
-[RegisterModifier]
-public class CaptainModifier : GameModifier
-{
-    public override string ModifierName => "Captain";
-
-    public override int GetAmountPerGame()
-    {
-        return 1;
-    }
-
-    public override int GetAssignmentChance()
-    {
-        return 100;
-    }
-}

MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs

@@ -1,43 +0,0 @@
-using Il2CppSystem;
-using MiraAPI.Example.Roles;
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
-using UnityEngine;
-
-namespace MiraAPI.Example.Modifiers.Freezer;
-
-[RegisterModifier]
-public class FreezeModifier : TimedModifier
-{
-    public override string ModifierName => "Freezed";
-    public override bool HideOnUi => false;
-    public override float Duration => 15f;
-    public override bool AutoStart => true;
-    public override bool RemoveOnComplete => true;
-
-    public override void OnActivate()
-    {
-        if (Player?.AmOwner == true)
-        {
-            Player.moveable = false;
-        }
-    }
-
-    public override void FixedUpdate()
-    {
-        base.FixedUpdate();
-
-        if (Player?.AmOwner == true || PlayerControl.LocalPlayer.Data.Role is FreezerRole)
-        {
-            Player?.cosmetics.SetOutline(true, new Nullable<Color>(Palette.LightBlue));
-        }
-    }
-
-    public override void OnTimerComplete()
-    {
-        if (Player?.AmOwner == true)
-        {
-            Player.moveable = true;
-        }
-    }
-}

MiraAPI.Example/Options/ExampleOptions.cs

@@ -1,31 +1,33 @@
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
-using MiraAPI.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Example.Options;
 
 public class ExampleOptions : AbstractOptionGroup
 {
-    public override string GroupName => "Example Options 1";
-    public override Color GroupColor => Color.green;
+    public override string GroupName => "General Group";
+    public override Color GroupColor => Color.red;
 
-    [ModdedToggleOption("Toggle Opt 1")]
-    public bool ToggleOpt { get; set; } = false;
+    [ModdedToggleOption("Use Thing")]
+    public bool UseThing { get; set; } = false;
 
-    [ModdedToggleOption("Toggle Opt 2")]
-    public bool ToggleOpt2 { get; set; } = true;
+    [ModdedToggleOption("Use another thing")]
+    public bool UseAnotherThing { get; set; } = true;
 
-    [ModdedNumberOption("Number Opt", min: 0, max: 10, suffixType: MiraNumberSuffixes.Percent)]
-    public float NumberOpt { get; set; } = 4f;
+    [ModdedNumberOption("Sussy level", min: 0, max: 10)]
+    public float SussyLevel { get; set; } = 4f;
 
-    [ModdedEnumOption("Best API", typeof(BestApi), ["Mira API", "Mitochondria", "Reactor"])]
-    public BestApi Opt { get; set; } = BestApi.MiraAPI;
+    [ModdedStringOption("Sus choices", ["hello", "hello 2", "hello 3"])]
+    public int SusChoices { get; set; } = 2;
+
+    [ModdedEnumOption("Enum test", typeof(TestEnum))]
+    public TestEnum EnumTest { get; set; } = TestEnum.Bye;
 }
 
-public enum BestApi
+public enum TestEnum
 {
-    MiraAPI,
-    Mitochondria,
-    Reactor,
-}
+    Hello,
+    Hi,
+    Bye
+}

MiraAPI.Example/Options/ExampleOptions2.cs

@@ -1,31 +1,27 @@
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.OptionTypes;
-using Reactor.Utilities;
 
 namespace MiraAPI.Example.Options;
 
 public class ExampleOptions2 : AbstractOptionGroup
 {
-    public override string GroupName => "Example Options 2";
-
-    public override uint GroupPriority => 0; // This group will be displayed first. The default value is uint.MaxValue.
-
-    public ModdedToggleOption ToggleOpt1 { get; } = new("Toggle Option 1", false);
-
-    public ModdedToggleOption ToggleOpt2 { get; } = new("Toggle Option 2", false)
-    {
-        Visible = () => OptionGroupSingleton<ExampleOptions2>.Instance.ToggleOpt1.Value,
-    };
-
-    public ModdedEnumOption EnumOpt { get; } = new("Enum Opt", 0, typeof(TestingData))
-    {
-        ChangedEvent = x => Logger<ExamplePlugin>.Info($"changed Enum Opt to {x}"),
-    };
+    public override string GroupName => "Example 2";
+    
+    public ModdedToggleOption UseThing { get; } = new("Use Thingy 5", false);
+    
+    public ModdedToggleOption UseThing2 { get; } = new("Use Thingy 6", false);
+    
+    public ModdedStringOption Sussy { get; } = new("Sussy", 0, ["Sussy 1", "Sussy 2", "Sussy 3"]);
+    
+    public ModdedEnumOption SussyEnum { get; } = new("Sussy Enum", 0, typeof(SussyEnum));
+    
+    public ModdedNumberOption YeezyLevel { get; } = new("Yeezy Level", 50, 0, 100, 25, NumberSuffixes.Multiplier);
 }
 
-public enum TestingData
+public enum SussyEnum
 {
-    Happy,
-    Sad,
-    Neutral,
-}
+    Sussy,
+    Baka,
+    Imposter,
+    Kanye
+}

MiraAPI.Example/Options/Roles/CustomRole2Settings.cs

@@ -0,0 +1,16 @@
+using System;
+using MiraAPI.Example.Roles;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+
+namespace MiraAPI.Example.Options.Roles;
+
+public class CustomRole2Settings : AbstractOptionGroup
+{
+    public override string GroupName => "Custom Role";
+
+    public override Type AdvancedRole => typeof(CustomRole2);
+    
+    [ModdedToggleOption("Teleportation ability")] public bool Teleport { get; set; } = true;
+
+}

MiraAPI.Example/Options/Roles/CustomRoleSettings.cs

@@ -0,0 +1,16 @@
+using System;
+using MiraAPI.Example.Roles;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+
+namespace MiraAPI.Example.Options.Roles;
+
+public class CustomRoleSettings : AbstractOptionGroup
+{
+    public override string GroupName => "Custom Role";
+
+    public override Type AdvancedRole => typeof(CustomRole);
+    
+    [ModdedNumberOption("Testing level", min: 3, max: 9)] public float TestingLevel { get; set; } = 4;
+
+}

MiraAPI.Example/Options/Roles/FreezerRoleSettings.cs

@@ -1,20 +0,0 @@
-using System;
-using MiraAPI.Example.Roles;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.Attributes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Example.Options.Roles;
-
-public class FreezerRoleSettings : AbstractOptionGroup
-{
-    public override string GroupName => "Custom Role";
-
-    public override Type AdvancedRole => typeof(FreezerRole);
-
-    [ModdedNumberOption("Freeze Duration", 1, 15, 1, MiraNumberSuffixes.Seconds)]
-    public float FreezeDuration { get; set; } = 5;
-
-    [ModdedNumberOption("Freeze Uses", 1, 5)]
-    public float FreezeUses { get; set; } = 1;
-}

MiraAPI.Example/Options/Roles/TeleporterOptions.cs

@@ -1,23 +0,0 @@
-using System;
-using MiraAPI.Example.Roles;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.Attributes;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Example.Options.Roles;
-
-public class TeleporterOptions : AbstractOptionGroup
-{
-    public override string GroupName => "Teleporter";
-
-    public override Type AdvancedRole => typeof(TeleporterRole);
-
-    public ModdedNumberOption TeleportCooldown { get; set; } = new("Teleport Cooldown", 10, 5, 60, 2.5f, MiraNumberSuffixes.Seconds);
-
-    [ModdedNumberOption("Teleport Duration", 5, 25, 1, MiraNumberSuffixes.Seconds)]
-    public float TeleportDuration { get; set; } = 10;
-
-    [ModdedNumberOption("Zoom Distance", 4, 15)]
-    public float ZoomDistance { get; set; } = 6;
-}

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,47 +0,0 @@
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Example.Roles;
-
-[RegisterCustomRole]
-public class ChameloenRole : CrewmateRole, ICustomRole
-{
-    public string RoleName => "Chamelon";
-    public string RoleLongDescription => "Stay invisible while not moving.";
-    public string RoleDescription => RoleLongDescription;
-    public Color RoleColor => Palette.AcceptedGreen;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        OptionsScreenshot = ExampleAssets.Banner,
-    };
-
-    public void PlayerControlFixedUpdate(PlayerControl playerControl)
-    {
-        if (playerControl.MyPhysics.Velocity.magnitude > 0)
-        {
-            var rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            var tmp = playerControl.cosmetics.nameText;
-            tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, 1), Time.deltaTime * 4f);
-            rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
-
-            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
-            {
-                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
-            }
-        }
-        else
-        {
-            var rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            var tmp = playerControl.cosmetics.nameText;
-            tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
-            rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
-
-            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
-            {
-                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
-            }
-        }
-    }
-}

MiraAPI.Example/Roles/CustomRole.cs

@@ -0,0 +1,17 @@
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
+
+namespace MiraAPI.Example.Roles;
+
+[RegisterCustomRole]
+public class CustomRole : ImpostorRole, ICustomRole
+{
+    public string RoleName => "fortnite killer";
+    public string RoleLongDescription => "ok so your objective is to eliminate everyone with your fortnite tactical shotgun, good luck";
+    public string RoleDescription => RoleLongDescription;
+    public Color RoleColor => Palette.Black;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Impostor;
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+    
+}

MiraAPI.Example/Roles/CustomRole2.cs

@@ -0,0 +1,17 @@
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
+
+namespace MiraAPI.Example.Roles;
+
+[RegisterCustomRole]
+public class CustomRole2 : CrewmateRole, ICustomRole
+{
+    public string RoleName => "fortnite defender";
+    public string RoleLongDescription => "ok so your objective is to save everyone from the fortnite killer";
+    public string RoleDescription => RoleLongDescription;
+    public Color RoleColor => Palette.AcceptedGreen;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+    
+}

MiraAPI.Example/Roles/CustomRole3.cs

@@ -0,0 +1,17 @@
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
+
+namespace MiraAPI.Example.Roles;
+
+[RegisterCustomRole]
+public class CustomRole3 : CrewmateRole, ICustomRole
+{
+    public string RoleName => "fortnite helper";
+    public string RoleLongDescription => "ok so your objective is to help";
+    public string RoleDescription => RoleLongDescription;
+    public Color RoleColor => Palette.Brown;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+
+}

MiraAPI.Example/Roles/FreezerRole.cs

@@ -1,20 +0,0 @@
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Example.Roles;
-
-[RegisterCustomRole]
-public class FreezerRole : ImpostorRole, ICustomRole
-{
-    public string RoleName => "Freezer";
-    public string RoleLongDescription => "Freeze another player for a duration of time.";
-    public string RoleDescription => RoleLongDescription;
-    public Color RoleColor => Palette.Blue;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Impostor;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        OptionsScreenshot = ExampleAssets.Banner,
-        MaxRoleCount = 2,
-    };
-}

MiraAPI.Example/Roles/NeutralKillerRole.cs

@@ -1,31 +0,0 @@
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Example.Roles;
-
-[RegisterCustomRole]
-public class NeutralKillerRole : ImpostorRole, ICustomRole
-{
-    public string RoleName => "Neutral Killer";
-    public string RoleDescription => "Neutral who can kill.";
-    public string RoleLongDescription => RoleDescription;
-    public Color RoleColor => Color.magenta;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Neutral;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        UseVanillaKillButton = true,
-        CanGetKilled = true,
-        CanUseVent = true,
-    };
-
-    public override void SpawnTaskHeader(PlayerControl playerControl)
-    {
-        // remove existing task header.
-    }
-
-    public override bool DidWin(GameOverReason gameOverReason)
-    {
-        return GameManager.Instance.DidHumansWin(gameOverReason);
-    }
-}

MiraAPI.Example/Roles/TeleporterRole.cs

@@ -1,22 +0,0 @@
-using MiraAPI.Roles;
-using UnityEngine;
-
-namespace MiraAPI.Example.Roles;
-
-[RegisterCustomRole]
-public class TeleporterRole : CrewmateRole, ICustomRole
-{
-    public string RoleName => "Teleporter";
-    public string RoleLongDescription => "Zoom out and teleport across the map!";
-    public string RoleDescription => RoleLongDescription;
-    public Color RoleColor => new Color32(221, 176, 152, 255);
-    public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
-
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
-    {
-        OptionsScreenshot = ExampleAssets.Banner,
-        CanModifyChance = false,
-        DefaultChance = 73,
-        DefaultRoleCount = 4,
-    };
-}

MiraAPI/Colors/CustomColor.cs

@@ -1,44 +0,0 @@
-using MiraAPI.Utilities;
-using Reactor.Localization.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Colors;
-
-/// <summary>
-/// Represents a custom color with a main color and a shadow color.
-/// </summary>
-/// <param name="name">The name of the option.</param>
-/// <param name="mainColor">The main color.</param>
-/// <param name="shadowColor">The shadow color.</param>
-public sealed class CustomColor(StringNames name, Color32 mainColor, Color32 shadowColor)
-{
-    /// <summary>
-    /// Gets the main color.
-    /// </summary>
-    public Color32 MainColor { get; } = mainColor;
-
-    /// <summary>
-    /// Gets the shadow color.
-    /// </summary>
-    public Color32 ShadowColor { get; } = shadowColor;
-
-    /// <summary>
-    /// Gets the name of the color.
-    /// </summary>
-    public StringNames Name { get; } = name;
-
-    /// <inheritdoc />
-    public CustomColor(StringNames name, Color32 mainColor) : this(name, mainColor, mainColor.GetShadowColor(60))
-    {
-    }
-
-    /// <inheritdoc />
-    public CustomColor(string name, Color32 mainColor) : this(name, mainColor, mainColor.GetShadowColor(60))
-    {
-    }
-
-    /// <inheritdoc />
-    public CustomColor(string name, Color32 mainColor, Color32 shadowColor) : this(CustomStringName.CreateAndRegister(name), mainColor, shadowColor)
-    {
-    }
-}

MiraAPI/Colors/PaletteManager.cs

@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
-
-namespace MiraAPI.Colors;
-
-/// <summary>
-/// Used to register and track custom colors.
-/// </summary>
-public static class PaletteManager
-{
-    /// <summary>
-    /// Gets all registered custom colors.
-    /// </summary>
-    public static CustomColor[] RegisteredColors => [.. CustomColors];
-
-    internal static readonly List<CustomColor> CustomColors = [];
-
-    internal static void RegisterAllColors()
-    {
-        var colors = CustomColors.Select(x => x.MainColor).ToArray();
-        var shadowColors = CustomColors.Select(x => x.ShadowColor).ToArray();
-        var stringNames = CustomColors.Select(x => x.Name).ToArray();
-
-        Palette.PlayerColors = Palette.PlayerColors.ToArray().AddRangeToArray(colors);
-        Palette.ShadowColors = Palette.ShadowColors.ToArray().AddRangeToArray(shadowColors);
-        Palette.ColorNames = Palette.ColorNames.ToArray().AddRangeToArray(stringNames);
-
-        Palette.TextColors = Palette.TextColors.ToArray().AddRangeToArray(colors);
-        Palette.TextOutlineColors = Palette.TextOutlineColors.ToArray().AddRangeToArray(shadowColors);
-    }
-}

MiraAPI/Colors/RegisterCustomColorsAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.Colors;
-
-/// <summary>
-/// Used to mark a class for custom colors registration.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterCustomColorsAttribute : Attribute;

MiraAPI/Cosmetics/AbstractCosmeticsGroup.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MiraAPI.Cosmetics;
-public abstract class AbstractCosmeticsGroup
-{
-    public List<HatData> Hats { get; } = [];
-    public List<SkinData> Skins { get; } = [];
-    public List<VisorData> Visors { get; } = [];
-    public List<NamePlateData> Nameplates { get; } = [];
-
-    /// <summary>
-    /// Gets the name of the group. Visible in options menu.
-    /// </summary>
-    public abstract string GroupName { get; }
-
-    /// <summary>
-    /// Gets a function that determines whether the group should be visible or not.
-    /// </summary>
-    public virtual Func<bool> GroupVisible => () => true;
-
-    /// <summary>
-    /// Gets the sorting mode of individual hats within this group.
-    /// </summary>
-    public virtual SortingMode SortingMode => SortingMode.AlphabeticName;
-
-    /// <summary>
-    /// Gets the priority of a group for sorting groups.
-    /// </summary>
-    public virtual int SortingPriority { get; }
-}
-
-public enum SortingMode
-{
-    Priority,
-    AlphabeticProductId,
-    AlphabeticStoreName,
-    AlphabeticName,
-}

MiraAPI/Cosmetics/AbstractCosmeticsGroupComparer.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MiraAPI.Cosmetics;
-internal sealed class AbstractCosmeticsGroupComparer : Comparer<AbstractCosmeticsGroup>
-{
-    public override int Compare(AbstractCosmeticsGroup? x, AbstractCosmeticsGroup? y)
-    {
-        switch (x)
-        {
-            case not null when y is null:
-                return 1;
-            case null when y is null:
-                return 0;
-            case null:
-                return -1;
-        }
-
-        var p = x.SortingPriority - y.SortingPriority;
-        return p == 0 ? StringComparer.InvariantCultureIgnoreCase.Compare(x.GroupName, y.GroupName) : p;
-    }
-}

MiraAPI/Cosmetics/CosmeticComparer.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MiraAPI.Cosmetics;
-internal sealed class CosmeticComparer(AbstractCosmeticsGroup group) : Comparer<CosmeticData>
-{
-    internal static readonly string[] NoCosmetics = ["hat_NoHat", "skin_None", "nameplate_NoPlate", "visor_EmptyVisor"];
-    public override int Compare(CosmeticData? x, CosmeticData? y)
-    {
-        if (NoCosmetics.Contains(x?.ProdId))
-        {
-            return -1;
-        }
-
-        if (NoCosmetics.Contains(y?.ProdId))
-        {
-            return 1;
-        }
-
-        return group.SortingMode switch
-        {
-            SortingMode.AlphabeticProductId => StringComparer.InvariantCultureIgnoreCase.Compare(x?.ProductId, y?.ProductId),
-            SortingMode.Priority => CustomCosmeticManager.CosmeticToPriority[x!] - CustomCosmeticManager.CosmeticToPriority[y!],
-            SortingMode.AlphabeticStoreName => x switch
-            {
-                HatData h1 when y is HatData h2 => StringComparer.InvariantCultureIgnoreCase.Compare(
-                    h1.StoreName,
-                    h2.StoreName),
-                SkinData s1 when y is SkinData s2 => StringComparer.InvariantCultureIgnoreCase.Compare(
-                    s1.StoreName,
-                    s2.StoreName),
-                _ => StringComparer.InvariantCultureIgnoreCase.Compare(x?.GetItemName(), y?.GetItemName()),
-            },
-            _ => StringComparer.InvariantCultureIgnoreCase.Compare(x?.GetItemName(), y?.GetItemName()),
-        };
-    }
-}

MiraAPI/Cosmetics/CosmeticGroupSingleton.cs

@@ -1,19 +0,0 @@
-using System.Linq;
-
-namespace MiraAPI.Cosmetics;
-
-/// <summary>
-/// Used to get access to a CosmeticGroup.
-/// </summary>
-/// <typeparam name="T">The type.</typeparam>
-public static class CosmeticGroupSingleton<T> where T : AbstractCosmeticsGroup
-{
-    private static T? _instance;
-
-    /// <summary>
-    /// Gets instance of the cosmetic group.
-    /// </summary>
-#pragma warning disable CA1000
-    public static T Instance => _instance ??= CustomCosmeticManager.Groups.OfType<T>().Single();
-#pragma warning restore CA1000
-}

MiraAPI/Cosmetics/CustomCosmeticManager.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using HarmonyLib;
-using MiraAPI.PluginLoading;
-using MonoMod.Utils;
-using Reactor.Utilities;
-
-namespace MiraAPI.Cosmetics;
-public static class CustomCosmeticManager
-{
-    private static readonly Dictionary<PropertyInfo, RegisterCustomCosmeticAttribute> OptionAttributes = [];
-    private static readonly Dictionary<Type, AbstractCosmeticsGroup> TypeToGroup = [];
-    internal static readonly Dictionary<CosmeticData, int> CosmeticToPriority = [];
-    internal static readonly Dictionary<CosmeticData, AbstractCosmeticsGroup> CosmeticToGroup = [];
-
-    internal static readonly List<AbstractCosmeticsGroup> Groups = [];
-
-    internal static void RegisterVanilla()
-    {
-        if (Activator.CreateInstance(typeof(VanillaCosmeticsGroup)) is not AbstractCosmeticsGroup group)
-        {
-            Logger<MiraApiPlugin>.Error($"Failed to create group from Vanilla");
-            return;
-        }
-        if (TypeToGroup.ContainsKey(typeof(VanillaCosmeticsGroup)))
-        {
-            Logger<MiraApiPlugin>.Error($"Vanilla group already exists.");
-            return;
-        }
-
-        Groups.Add(group);
-        TypeToGroup.Add(typeof(VanillaCosmeticsGroup), group);
-    }
-
-    internal static bool RegisterGroup(Type type, MiraPluginInfo pluginInfo)
-    {
-        if (Activator.CreateInstance(type) is not AbstractCosmeticsGroup group)
-        {
-            Logger<MiraApiPlugin>.Error($"Failed to create group from {type.Name}");
-            return false;
-        }
-
-        if (TypeToGroup.ContainsKey(type))
-        {
-            Logger<MiraApiPlugin>.Error($"Group {type.Name} already exists.");
-            return false;
-        }
-
-        Groups.Add(group);
-        TypeToGroup.Add(type, group);
-        pluginInfo.CosmeticGroups.Add(group);
-
-        return true;
-    }
-
-    internal static void RegisterAttributeOption(Type type, RegisterCustomCosmeticAttribute attribute, PropertyInfo property, MiraPluginInfo pluginInfo)
-    {
-        if (OptionAttributes.ContainsKey(property))
-        {
-            Logger<MiraApiPlugin>.Error($"Property {property.Name} already has an attribute registered.");
-            return;
-        }
-
-        if (!TypeToGroup.TryGetValue(type, out var group))
-        {
-            Logger<MiraApiPlugin>.Error($"Failed to get group for {type.Name}");
-            return;
-        }
-
-        OptionAttributes.Add(property, attribute);
-    }
-
-    internal static void LoadCosmetic(PropertyInfo property, RegisterCustomCosmeticAttribute attribute)
-    {
-        if (!TypeToGroup.TryGetValue(property.DeclaringType, out var group))
-        {
-            Logger<MiraApiPlugin>.Error($"Failed to get group for {property.DeclaringType.Name}");
-            return;
-        }
-
-        if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<HatData>)))
-        {
-            group.Hats.AddRange((IEnumerable<HatData>)property.GetValue(group));
-        }
-        else if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<SkinData>)))
-        {
-            group.Skins.AddRange((IEnumerable<SkinData>)property.GetValue(group));
-        }
-        else if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<VisorData>)))
-        {
-            group.Visors.AddRange((IEnumerable<VisorData>)property.GetValue(group));
-        }
-        else if (property.PropertyType.IsAssignableTo(typeof(IEnumerable<NamePlateData>)))
-        {
-            group.Nameplates.AddRange((IEnumerable<NamePlateData>)property.GetValue(group));
-        }
-        else
-        {
-            Logger<MiraApiPlugin>.Error($"Failed to get enumerable for {property.Name}");
-            return;
-        }
-
-        CosmeticToPriority.AddRange(((IEnumerable<CosmeticData>)property.GetValue(group)).ToDictionary(y => y, x => attribute.Priority));
-        CosmeticToGroup.AddRange(((IEnumerable<CosmeticData>)property.GetValue(group)).ToDictionary(y => y, x => group));
-    }
-
-    internal static bool Registered { get; set; }
-    internal static void LoadAll()
-    {
-        CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.runtimeRegister();
-        if (Registered || !CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.registered)
-        {
-            return;
-        }
-
-        Registered = true;
-        CosmeticToPriority.AddRange(CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.Cosmetics.ToDictionary(y => y, x => 0));
-        CosmeticToGroup.AddRange(CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance.Cosmetics.ToDictionary(y => y, x => CosmeticGroupSingleton<VanillaCosmeticsGroup>.Instance));
-        OptionAttributes.Do(x => LoadCosmetic(x.Key, x.Value));
-        DestroyableSingleton<HatManager>.Instance.allHats = CosmeticToGroup.Keys.OfType<HatData>().ToArray();
-        DestroyableSingleton<HatManager>.Instance.allVisors = CosmeticToGroup.Keys.OfType<VisorData>().ToArray();
-        DestroyableSingleton<HatManager>.Instance.allSkins = CosmeticToGroup.Keys.OfType<SkinData>().ToArray();
-        DestroyableSingleton<HatManager>.Instance.allNamePlates = CosmeticToGroup.Keys.OfType<NamePlateData>().ToArray();
-    }
-}

MiraAPI/Cosmetics/RegisterCustomCosmeticAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.Cosmetics;
-
-[AttributeUsage(AttributeTargets.Property)]
-public class RegisterCustomCosmeticAttribute(int priority = 0) : Attribute
-{
-    public int Priority { get; } = priority;
-}

MiraAPI/Cosmetics/VanillaCosmeticsGroup.cs

@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-
-namespace MiraAPI.Cosmetics;
-public class VanillaCosmeticsGroup : AbstractCosmeticsGroup
-{
-    public override string GroupName => "Vanilla";
-    internal static HatData[] VanillaHats => DestroyableSingleton<HatManager>.Instance.allHats;
-    internal static VisorData[] VanillaVisors => DestroyableSingleton<HatManager>.Instance.allVisors;
-    internal static SkinData[] VanillaSkins => DestroyableSingleton<HatManager>.Instance.allSkins;
-    internal static NamePlateData[] VanillaNameplates => DestroyableSingleton<HatManager>.Instance.allNamePlates;
-
-    internal List<CosmeticData> Cosmetics { get; } = [];
-
-    internal bool registered { get; set; }
-    internal bool runtimeRegister()
-    {
-        if (registered)
-        {
-            return true;
-        }
-
-        if (!DestroyableSingleton<HatManager>.InstanceExists || VanillaHats.Length == 0
-                                                             || VanillaVisors.Length == 0 || VanillaSkins.Length == 0
-                                                             || VanillaNameplates.Length == 0)
-        {
-            return false;
-        }
-
-        registered = true;
-        Hats.AddRange(VanillaHats);
-        Visors.AddRange(VanillaVisors);
-        Skins.AddRange(VanillaSkins);
-        Nameplates.AddRange(VanillaNameplates);
-        Cosmetics.AddRange(Hats);
-        Cosmetics.AddRange(Visors);
-        Cosmetics.AddRange(Skins);
-        Cosmetics.AddRange(Nameplates);
-        return true;
-    }
-}

MiraAPI/GameModes/CustomGameMode.cs

@@ -3,82 +3,74 @@
 namespace MiraAPI.GameModes;
 
 /// <summary>
-/// Base class for custom gamemodes.
+/// Base class for custom gamemodes
 /// </summary>
 public abstract class CustomGameMode
 {
     /// <summary>
-    /// Gets the game mode name.
+    /// Game mode name
     /// </summary>
     public abstract string Name { get; }
 
     /// <summary>
-    /// Gets the game mode description.
+    /// Game mode description
     /// </summary>
     public abstract string Description { get; }
 
     /// <summary>
-    /// Gets the game mode ID.
+    /// Game mode ID
     /// </summary>
     public abstract int Id { get; }
 
     /// <summary>
-    /// Called when Intro Cutscene is destroyed.
+    /// Called when Intro Cutscene is destroyed
     /// </summary>
-    public virtual void Initialize()
-    {
-    }
+    public virtual void Initialize() { }
 
     /// <summary>
-    /// Called on HudManager.Start().
+    /// Called on HudManager.Start()
     /// </summary>
-    /// <param name="instance">Instance of HudManager.</param>
-    public virtual void HudStart(HudManager instance)
-    {
-    }
+    /// <param name="instance">Instance of HudManager</param>
+    public virtual void HudStart(HudManager instance) { }
 
     /// <summary>
-    /// Called every frame on HudManager.Update().
+    /// Called every frame on HudManager.Update()
     /// </summary>
-    /// <param name="instance">Instance of HudManager.</param>
-    public virtual void HudUpdate(HudManager instance)
-    {
-    }
+    /// <param name="instance">Instance of HudManager</param>
+    public virtual void HudUpdate(HudManager instance) { }
 
     /// <summary>
-    /// Called when a player is killed.
+    /// Called when a player is killed
     /// </summary>
-    /// <param name="player">PlayerControl that was killed.</param>
-    public virtual void OnDeath(PlayerControl player)
-    {
-    }
+    /// <param name="player">PlayerControl that was killed</param>
+    public virtual void OnDeath(PlayerControl player) { }
 
     /// <summary>
-    /// Calculate Game End logic.
+    /// Calculate Game End logic
     /// </summary>
-    /// <param name="runOriginal">Should original game end logic be used.</param>
-    /// <param name="instance">Instance of LogicGameFlowNormal.</param>
+    /// <param name="runOriginal">Should original game end logic be used</param>
+    /// <param name="instance">Instance of LogicGameFlowNormal</param>
     public virtual void CheckGameEnd(out bool runOriginal, LogicGameFlowNormal instance)
     {
         runOriginal = true;
     }
 
     /// <summary>
-    /// Custom role assignment.
+    /// Custom role assignment
     /// </summary>
-    /// <param name="runOriginal">Should original role assignment be used.</param>
-    /// <param name="instance">Instance of LogicRoleSelection.</param>
+    /// <param name="runOriginal">Should original role assignment be used</param>
+    /// <param name="instance">Instance of LogicRoleSelection</param>
     public virtual void AssignRoles(out bool runOriginal, LogicRoleSelectionNormal instance)
     {
         runOriginal = true;
     }
 
     /// <summary>
-    /// Custom murder logic.
+    /// Custom murder logic
     /// </summary>
-    /// <param name="runOriginal">Should the original murder logic be used.</param>
-    /// <param name="result">Result of custom murder logic.</param>
-    /// <param name="target">Target player for murder.</param>
+    /// <param name="runOriginal">Should original murder logic be used</param>
+    /// <param name="result">Result of custom murder logic</param>
+    /// <param name="target">Target player for murder</param>
     public virtual void CanKill(out bool runOriginal, out bool result, PlayerControl target)
     {
         result = false;
@@ -86,69 +78,61 @@ public abstract class CustomGameMode
     }
 
     /// <summary>
-    /// Should Roles Settings be available when this gamemode is selected.
+    /// Should Roles Settings be available when this gamemode is selected?
     /// </summary>
-    /// <returns>True if Role Settings are enabled in this game mode.</returns>
-    public virtual bool AreRoleSettingsEnabled() => true;
+    public virtual bool CanAccessRolesTab() => true;
 
     /// <summary>
-    /// Should Game Settings be available when this gamemode is selected.
+    /// Should Game Settings be available when this gamemode is selected?
     /// </summary>
-    /// <returns>True if Game Settings are enabled in this mode.</returns>
-    public virtual bool AreGameSettingsEnabled() => true;
+    public virtual bool CanAccessSettingsTab() => true;
 
     /// <summary>
-    /// Custom winner selection.
+    /// Custom winner selection
     /// </summary>
-    /// <returns>List of winners or null.</returns>
-    public virtual List<NetworkedPlayerInfo>? CalculateWinners() => null;
+    /// <returns>List of winners</returns>
+    public virtual List<NetworkedPlayerInfo> CalculateWinners() => null;
 
     /// <summary>
-    /// Show gamemode in Intro Cutscene.
+    /// Show gamemode in Intro Cutscene
     /// </summary>
-    /// <returns>True if the game mode should be shown in the intro cutscene.</returns>
-    public virtual bool ShowGameModeIntroCutscene() => false;
+    public virtual bool ShowCustomRoleScreen() => false;
 
     /// <summary>
-    /// Can Admin be used in this gamemode.
+    /// Can Admin be used in this gamemode
     /// </summary>
-    /// <param name="console">Admin Console.</param>
-    /// <returns>True if Admin console is enabled.</returns>
+    /// <param name="console">Admin Console</param>
     public virtual bool CanUseMapConsole(MapConsole console) => true;
 
     /// <summary>
-    /// Can a body be reported in this gamemode.
+    /// Can a body be reported in this gamemode
     /// </summary>
-    /// <param name="body">Target body for reporting.</param>
-    /// <returns>True if dead bodies can be reported.</returns>
+    /// <param name="body">Target body for reporting</param>
     public virtual bool CanReport(DeadBody body) => true;
 
     /// <summary>
-    /// Can system consoles be used in this gamemode.
+    /// Can system consoles be used in this gamemode
     /// </summary>
-    /// <param name="console">System Console.</param>
-    /// <returns>True if system consoles are enabled in this mode.</returns>
+    /// <param name="console">System Console</param>
     public virtual bool CanUseSystemConsole(SystemConsole console) => true;
 
     /// <summary>
-    /// Can tasks be interacted with in this gamemode.
+    /// Can tasks be interacted with in this gamemode
     /// </summary>
-    /// <param name="console">Task console.</param>
-    /// <returns>True if tasks are enabled in this mode.</returns>
-    public virtual bool CanUseTasks(Console console) => true;
+    /// <param name="console">Task console</param>
+    public virtual bool CanUseConsole(Console console) => true;
 
     /// <summary>
-    /// Should the sabotage map be used when attempting to open sabotage overlay.
+    /// Should the sabotage map be used when attempting to open sabotage overlay
     /// </summary>
-    /// <param name="map">MapBehaviour object.</param>
-    /// <returns>True if the sabotage map should be shown.</returns>
+    /// <param name="map">MapBehaviour object</param>
     public virtual bool ShouldShowSabotageMap(MapBehaviour map) => true;
 
     /// <summary>
-    /// Can a player vent in this gamemode.
+    /// Can a player vent in this gamemode
     /// </summary>
-    /// <param name="vent">Target vent.</param>
-    /// <param name="playerInfo">Player attempting to vent.</param>
-    /// <returns>True if venting is enabled in this mode.</returns>
+    /// <param name="vent">Target vent</param>
+    /// <param name="playerInfo">Player attempting to vent</param>
     public virtual bool CanVent(Vent vent, NetworkedPlayerInfo playerInfo) => true;
-}
+
+}

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -1,19 +1,20 @@
-using System;
+#nullable enable
+using Reactor.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Reactor.Utilities;
 
 namespace MiraAPI.GameModes;
 
 /// <summary>
-/// Manages custom gamemodes.
+/// Manages custom gamemodes
 /// </summary>
 public static class CustomGameModeManager
 {
     /// <summary>
-    /// List of registered gamemodes.
+    /// List of registered gamemodes
     /// </summary>
-    internal static readonly Dictionary<int, CustomGameMode> GameModes = [];
+    public static readonly Dictionary<int, CustomGameMode> GameModes = [];
 
     public static bool IsDefault()
     {
@@ -21,15 +22,15 @@ public static class CustomGameModeManager
     }
 
     /// <summary>
-    /// Gets current gamemode.
+    /// Current gamemode
     /// </summary>
-    public static CustomGameMode? ActiveMode { get; internal set; } = new DefaultMode();
+    public static CustomGameMode? ActiveMode = new DefaultMode();
 
     /// <summary>
-    /// Set current gamemode.
+    /// Set current gamemode
     /// </summary>
-    /// <param name="id">gamemode ID.</param>
-    internal static void SetGameMode(int id)
+    /// <param name="id">gamemode ID</param>
+    public static void SetGameMode(int id)
     {
         if (GameModes.TryGetValue(id, out var gameMode))
         {
@@ -41,9 +42,9 @@ public static class CustomGameModeManager
     }
 
     /// <summary>
-    /// Register gamemode from type.
+    /// Register gamemode from type 
     /// </summary>
-    /// <param name="gameModeType">Type of gamemode class, should inherit from <see cref="CustomGameMode"/>.</param>
+    /// <param name="gameModeType">Type of gamemode class, should inherit from <see cref="CustomGameMode"/></param>
     internal static void RegisterGameMode(Type gameModeType)
     {
         if (!typeof(CustomGameMode).IsAssignableFrom(gameModeType))
@@ -59,7 +60,7 @@ public static class CustomGameModeManager
             Logger<MiraApiPlugin>.Error($"Failed to create instance of {gameModeType.Name}");
             return;
         }
-
+        
         if (GameModes.Any(x => x.Key == gameMode.Id))
         {
             Logger<MiraApiPlugin>.Error($"ID for gamemode {gameMode.Name} already exists!");
@@ -68,4 +69,4 @@ public static class CustomGameModeManager
 
         GameModes.Add(gameMode.Id, gameMode);
     }
-}
+}

MiraAPI/GameModes/DefaultMode.cs

@@ -6,4 +6,4 @@ public class DefaultMode : CustomGameMode
     public override string Name => "Default";
     public override string Description => "Default Among Us GameMode";
     public override int Id => 0;
-}
+}

MiraAPI/GameModes/RegisterGameModeAttribute.cs

@@ -25,4 +25,4 @@ public class RegisterGameModeAttribute : Attribute
             }
         }
     }
-}
+}

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -4,40 +4,27 @@ using UnityEngine;
 
 namespace MiraAPI.GameOptions;
 
-/// <summary>
-/// Base class for option groups. An option group is a collection of options that are displayed together in the options menu.
-/// </summary>
 public abstract class AbstractOptionGroup
 {
-    internal List<IModdedOption> Options { get; } = [];
-
+    public List<IModdedOption> Options { get; } = [];
+    
     /// <summary>
-    /// Gets the name of the group. Visible in options menu.
+    /// The name of the group. Visible in options menu.
     /// </summary>
     public abstract string GroupName { get; }
-
+    
     /// <summary>
-    /// Gets the function that determines whether the group should be visible or not.
+    /// A function that returns whether the group should be visible or not.
     /// </summary>
     public virtual Func<bool> GroupVisible => () => true;
-
+    
     /// <summary>
-    /// Gets the group color. This is used to color the group in the options menu.
+    /// The group color. This is used to color the group in the options menu.
     /// </summary>
     public virtual Color GroupColor => Color.clear;
-
+    
     /// <summary>
-    /// Gets the group priority. This is used to determine the order in which groups are displayed in the options menu.
-    /// Zero is the highest priority, and the default value is the max uint value.
+    /// The role the group is associated with. This is used for the advanced role options menu.
     /// </summary>
-    public virtual uint GroupPriority => uint.MaxValue;
-
-    /// <summary>
-    /// Gets the role the group is associated with. This is used for the advanced role options menu.
-    /// </summary>
-    public virtual Type? AdvancedRole => null;
-
-    internal bool AllOptionsHidden { get; set; }
-
-    internal CategoryHeaderMasked? Header { get; set; }
-}
+    public virtual Type AdvancedRole => null;
+}

MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs

@@ -1,36 +1,27 @@
-using System;
+using MiraAPI.GameOptions.OptionTypes;
+using System;
 using System.Reflection;
-using MiraAPI.GameOptions.OptionTypes;
 
 namespace MiraAPI.GameOptions.Attributes;
 
-/// <summary>
-/// Attribute for creating an enum option.
-/// </summary>
-[AttributeUsage(AttributeTargets.Property)]
-public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? values = null, Type? roleType = null)
+public class ModdedEnumOptionAttribute(string title, Type enumType, Type roleType = null)
     : ModdedOptionAttribute(title, roleType)
 {
-    internal override IModdedOption CreateOption(object? value, PropertyInfo property)
+    internal override IModdedOption CreateOption(object value, PropertyInfo property)
     {
-        var opt = new ModdedEnumOption(Title, (int)(value ?? 0), enumType, values, RoleType);
+        var opt = new ModdedEnumOption(Title, (int)value, enumType, RoleType);
         return opt;
     }
 
-    /// <inheritdoc />
     public override void SetValue(object value)
     {
-        var opt = HolderOption as ModdedEnumOption;
-        opt?.SetValue((int)value);
+        ModdedEnumOption opt = HolderOption as ModdedEnumOption;
+        opt.SetValue((int)value);
     }
 
-    /// <inheritdoc />
     public override object GetValue()
     {
-        if (HolderOption is ModdedEnumOption opt)
-        {
-            return Enum.ToObject(enumType, opt.Value);
-        }
-        throw new InvalidOperationException($"HolderOption for option \"{Title}\" with EnumType ${enumType.FullName} is not a ModdedEnumOption");
+        ModdedEnumOption opt = HolderOption as ModdedEnumOption;
+        return Enum.ToObject(enumType, opt.Value);
     }
-}
+}

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -1,43 +1,34 @@
-using System;
+using MiraAPI.GameOptions.OptionTypes;
+using System;
 using System.Reflection;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
 
 namespace MiraAPI.GameOptions.Attributes;
 
-/// <summary>
-/// A number option attribute for the modded options system.
-/// </summary>
-[AttributeUsage(AttributeTargets.Property)]
 public class ModdedNumberOptionAttribute(
     string title,
     float min,
     float max,
     float increment = 1,
-    MiraNumberSuffixes suffixType = MiraNumberSuffixes.None,
+    NumberSuffixes suffixType = NumberSuffixes.None,
     bool zeroInfinity = false,
-    Type? roleType = null)
+    Type roleType = null)
     : ModdedOptionAttribute(title, roleType)
 {
-    internal override IModdedOption CreateOption(object? value, PropertyInfo property)
+    internal override IModdedOption CreateOption(object value, PropertyInfo property)
     {
-        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, zeroInfinity, RoleType);
+        var toggleOpt = new ModdedNumberOption(Title, (float)value, min, max, increment, suffixType, zeroInfinity, RoleType);
+        return toggleOpt;
     }
 
-    /// <inheritdoc />
     public override void SetValue(object value)
     {
-        var opt = HolderOption as ModdedNumberOption;
-        opt?.SetValue((float)value);
+        ModdedNumberOption toggleOpt = HolderOption as ModdedNumberOption;
+        toggleOpt.SetValue((float)value);
     }
 
-    /// <inheritdoc />
     public override object GetValue()
     {
-        if (HolderOption is ModdedNumberOption opt)
-        {
-            return opt.Value;
-        }
-        throw new InvalidOperationException($"HolderOption for option \"{Title}\" is not a ModdedNumberOption");
+        ModdedNumberOption toggleOpt = HolderOption as ModdedNumberOption;
+        return toggleOpt.Value;
     }
-}
+}

MiraAPI/GameOptions/Attributes/ModdedOptionAttribute.cs

@@ -3,37 +3,18 @@ using System.Reflection;
 
 namespace MiraAPI.GameOptions.Attributes;
 
-/// <summary>
-/// Represents an attribute that is used to define a modded option.
-/// </summary>
-/// <param name="title">The option title.</param>
-/// <param name="roleType">Optional parameter to specify a role Type.</param>
 [AttributeUsage(AttributeTargets.Property)]
-public abstract class ModdedOptionAttribute(string title, Type? roleType = null) : Attribute
+public abstract class ModdedOptionAttribute(string title, Type roleType = null) : Attribute
 {
-    internal IModdedOption? HolderOption { get; set; }
-
-    /// <summary>
-    /// Gets the title of the option.
-    /// </summary>
+    public IModdedOption HolderOption { get; set; }
+    
     public string Title { get; private set; } = title;
+    
+    protected Type RoleType { get; private set; } = roleType;
 
-    /// <summary>
-    /// Gets the role type of the option.
-    /// </summary>
-    protected Type? RoleType { get; private set; } = roleType;
-
-    /// <summary>
-    /// Sets the value of the option.
-    /// </summary>
-    /// <param name="value">The new value as an object.</param>
-    public abstract void SetValue(object value);
-
-    /// <summary>
-    /// Gets the value of the option.
-    /// </summary>
-    /// <returns>The value of the option as an object.</returns>
+    public abstract void SetValue(object val);
+    
     public abstract object GetValue();
 
-    internal abstract IModdedOption? CreateOption(object? value, PropertyInfo property);
-}
+    internal abstract IModdedOption CreateOption(object value, PropertyInfo property);
+}

MiraAPI/GameOptions/Attributes/ModdedStringOptionAttribute.cs

@@ -0,0 +1,27 @@
+using MiraAPI.GameOptions.OptionTypes;
+using System;
+using System.Reflection;
+
+namespace MiraAPI.GameOptions.Attributes;
+
+public class ModdedStringOptionAttribute(string title, string[] values, Type roleType = null)
+    : ModdedOptionAttribute(title, roleType)
+{
+    internal override IModdedOption CreateOption(object value, PropertyInfo property)
+    {
+        var opt = new ModdedStringOption(Title, (int)value, values, RoleType);
+        return opt;
+    }
+
+    public override void SetValue(object value)
+    {
+        ModdedStringOption opt = HolderOption as ModdedStringOption;
+        opt.SetValue((int)value);
+    }
+
+    public override object GetValue()
+    {
+        ModdedStringOption opt = HolderOption as ModdedStringOption;
+        return opt.Value;
+    }
+}

MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs

@@ -1,37 +1,26 @@
-using System;
+using MiraAPI.GameOptions.OptionTypes;
+using System;
 using System.Reflection;
-using MiraAPI.GameOptions.OptionTypes;
 
 namespace MiraAPI.GameOptions.Attributes;
 
-/// <summary>
-/// Attribute for a toggle option.
-/// </summary>
-/// <param name="title">The option title.</param>
-/// <param name="roleType">An optional role type.</param>
-[AttributeUsage(AttributeTargets.Property)]
-public class ModdedToggleOptionAttribute(string title, Type? roleType = null) : ModdedOptionAttribute(title, roleType)
+public class ModdedToggleOptionAttribute(string title, Type roleType = null) : ModdedOptionAttribute(title, roleType)
 {
-    internal override IModdedOption CreateOption(object? value, PropertyInfo property)
+    internal override IModdedOption CreateOption(object value, PropertyInfo property)
     {
-        var toggleOpt = new ModdedToggleOption(Title, (bool)(value ?? false), RoleType);
+        var toggleOpt = new ModdedToggleOption(Title, (bool)value, RoleType);
         return toggleOpt;
     }
 
-    /// <inheritdoc />
     public override void SetValue(object value)
     {
-        var opt = HolderOption as ModdedToggleOption;
-        opt?.SetValue((bool)value);
+        ModdedToggleOption toggleOpt = HolderOption as ModdedToggleOption;
+        toggleOpt.SetValue((bool)value);
     }
 
-    /// <inheritdoc />
     public override object GetValue()
     {
-        if (HolderOption is ModdedToggleOption opt)
-        {
-            return opt.Value;
-        }
-        throw new InvalidOperationException($"Holder option for {Title} is not a ModdedToggleOption.");
+        ModdedToggleOption toggleOpt = HolderOption as ModdedToggleOption;
+        return toggleOpt.Value;
     }
-}
+}

MiraAPI/GameOptions/IModdedOption.cs

@@ -1,25 +1,24 @@
-using System;
+using MiraAPI.PluginLoading;
+using System;
 using BepInEx.Configuration;
 using MiraAPI.Networking;
-using MiraAPI.PluginLoading;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions;
 
 public interface IModdedOption
 {
-    uint Id { get; }
-    string Title { get; }
-    StringNames StringName { get; }
-    IMiraPlugin? ParentMod { get; set; }
-    BaseGameSetting Data { get; }
-    Type? AdvancedRole { get; set; }
-    OptionBehaviour? OptionBehaviour { get; }
-    Func<bool> Visible { get; set; }
-    ConfigDefinition? ConfigDefinition { get; set; }
-    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
-    float GetFloatData();
-    NetData GetNetData();
-    void HandleNetData(byte[] data);
-    void ResetToConfig();
-}
+    public uint Id { get; }
+    public BaseGameSetting Data { get; }
+    public IMiraPlugin ParentMod { get; set; }
+    public Type AdvancedRole { get; set; }
+    public OptionBehaviour OptionBehaviour { get; protected set; }
+    public string Title { get; }
+    public StringNames StringName { get; }
+    public Func<bool> Visible { get; set; }
+    public ConfigDefinition ConfigDefinition { get; }
+    public void ValueChanged(OptionBehaviour optionBehaviour);
+    public OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
+    public NetData GetNetData();
+    public void HandleNetData(byte[] data);
+}

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -1,32 +1,27 @@
-using System;
+using HarmonyLib;
+using MiraAPI.GameOptions.Attributes;
+using Reactor.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using BepInEx.Configuration;
-using HarmonyLib;
-using MiraAPI.GameOptions.Attributes;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
-using MiraAPI.Utilities;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 
 namespace MiraAPI.GameOptions;
 
-/// <summary>
-/// Handles modded options.
-/// </summary>
-public static class ModdedOptionsManager
+public class ModdedOptionsManager
 {
-    private static readonly Dictionary<PropertyInfo, ModdedOptionAttribute> OptionAttributes = [];
-    private static readonly Dictionary<Type, AbstractOptionGroup> TypeToGroup = [];
+    private static readonly Dictionary<PropertyInfo, ModdedOptionAttribute> OptionAttributes = new();
+    private static readonly Dictionary<Type, AbstractOptionGroup> TypeToGroup = new();
 
-    internal static readonly Dictionary<uint, IModdedOption> ModdedOptions = [];
-    internal static readonly List<AbstractOptionGroup> Groups = [];
-
-    internal static uint NextId => _nextId++;
+    public static readonly Dictionary<uint, IModdedOption> ModdedOptions = new();
+    public static readonly List<AbstractOptionGroup> Groups = [];
+    
+    public static uint NextId => _nextId++;
     private static uint _nextId = 1;
-
+    
     internal static bool RegisterGroup(Type type, MiraPluginInfo pluginInfo)
     {
         if (Activator.CreateInstance(type) is not AbstractOptionGroup group)
@@ -44,14 +39,10 @@ public static class ModdedOptionsManager
         Groups.Add(group);
         TypeToGroup.Add(type, group);
         pluginInfo.OptionGroups.Add(group);
-
-        typeof(OptionGroupSingleton<>).MakeGenericType(type)
-            .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-            .SetValue(null, group);
-
+        
         return true;
     }
-
+    
     internal static void RegisterPropertyOption(Type type, PropertyInfo property, MiraPluginInfo pluginInfo)
     {
         if (!TypeToGroup.TryGetValue(type, out var group))
@@ -65,15 +56,11 @@ public static class ModdedOptionsManager
             Logger<MiraApiPlugin>.Error($"Failed to get option for {property.Name}");
             return;
         }
-
-        RegisterOption(option, group, property.Name, pluginInfo);
+        
+        RegisterOption(option, group, pluginInfo);
     }
-
-    internal static void RegisterAttributeOption(
-        Type type,
-        ModdedOptionAttribute attribute,
-        PropertyInfo property,
-        MiraPluginInfo pluginInfo)
+    
+    internal static void RegisterAttributeOption(Type type, ModdedOptionAttribute attribute, PropertyInfo property, MiraPluginInfo pluginInfo)
     {
         if (OptionAttributes.ContainsKey(property))
         {
@@ -88,13 +75,13 @@ public static class ModdedOptionsManager
         }
 
         var option = attribute.CreateOption(property.GetValue(group), property);
-
+        
         if (option == null)
         {
             Logger<MiraApiPlugin>.Error($"Failed to get option for {property.Name}");
             return;
         }
-
+        
         var setterOriginal = property.GetSetMethod();
         var setterPatch = typeof(ModdedOptionsManager).GetMethod(nameof(PropertySetterPatch));
         PluginSingleton<MiraApiPlugin>.Instance.Harmony.Patch(setterOriginal, postfix: new HarmonyMethod(setterPatch));
@@ -105,92 +92,80 @@ public static class ModdedOptionsManager
 
         OptionAttributes.Add(property, attribute);
         attribute.HolderOption = option;
-
-        RegisterOption(option, group, property.Name, pluginInfo);
+        
+        RegisterOption(option, group, pluginInfo);
     }
 
-    private static void RegisterOption(
-        IModdedOption option,
-        AbstractOptionGroup group,
-        string propertyName,
-        MiraPluginInfo pluginInfo)
+    private static void RegisterOption(IModdedOption option, AbstractOptionGroup group, MiraPluginInfo pluginInfo)
     {
-        var groupName = group.GetType().FullName;
-
-        option.ConfigDefinition = new ConfigDefinition(groupName, propertyName);
-
         option.ParentMod = pluginInfo.MiraPlugin;
         option.AdvancedRole = group.AdvancedRole;
-
+        
         pluginInfo.Options.Add(option);
-
+        
         ModdedOptions.Add(option.Id, option);
         group.Options.Add(option);
     }
-
-    internal static void SyncAllOptions(int targetId = -1)
+    
+    internal static void SyncAllOptions(int targetId=-1)
     {
-        var chunks = ModdedOptions.Values.Select(option => option.GetNetData()).ChunkNetData(1000);
-
-        while (chunks.Count > 0)
+        List<NetData> data = [];
+        
+        var count = 0;
+        foreach (var netData in ModdedOptions.Values.Select(option => option.GetNetData()))
         {
-            Rpc<SyncOptionsRpc>.Instance.SendTo(PlayerControl.LocalPlayer, targetId, chunks.Dequeue());
+            data.Add(netData);
+            count += netData.GetLength();
+
+            if (count <= 1000)
+            {
+                continue;
+            }
+            
+            Rpc<SyncOptionsRpc>.Instance.SendTo(PlayerControl.LocalPlayer, targetId, data.ToArray());
+            data.Clear();
+            count = 0;
+        }
+        
+        if (data.Count > 0)
+        {
+            Rpc<SyncOptionsRpc>.Instance.SendTo(PlayerControl.LocalPlayer, targetId, data.ToArray());
         }
     }
 
+
     internal static void HandleSyncOptions(NetData[] data)
     {
-        // necessary to disable then re-enable this setting
-        // we dont know how other plugins handle their configs
-        var oldConfigSetting = new Dictionary<MiraPluginInfo, bool>();
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
-        {
-            oldConfigSetting.Add(plugin, plugin.PluginConfig.SaveOnConfigSet);
-            plugin.PluginConfig.SaveOnConfigSet = false;
-        }
-
         foreach (var netData in data)
         {
             if (!ModdedOptions.TryGetValue(netData.Id, out var option))
             {
                 continue;
             }
-
+            
+            Logger<MiraApiPlugin>.Error("Handling option " + option.Title);
             option.HandleNetData(netData.Data);
         }
-
-        foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
-        {
-            plugin.PluginConfig.SaveOnConfigSet = oldConfigSetting[plugin];
-        }
-
-        if (LobbyInfoPane.Instance)
-        {
-            LobbyInfoPane.Instance.RefreshPane();
-        }
     }
-
-    /// <summary>
-    /// Patches the setter of a property to update the value of the option.
-    /// </summary>
-    /// <param name="__originalMethod">The original setter method.</param>
-    /// <param name="value">The new object value.</param>
+        
+        
     public static void PropertySetterPatch(MethodBase __originalMethod, object value)
     {
-        var attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod() == __originalMethod).Value;
-        attribute.SetValue(value);
+        ModdedOptionAttribute attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod().Equals(__originalMethod)).Value;
+
+        attribute?.SetValue(value);
     }
 
-    /// <summary>
-    /// Patches the getter of a property to return the value of the option.
-    /// </summary>
-    /// <param name="__originalMethod">The original getter method.</param>
-    /// <param name="__result">The result of the property getter.</param>
-    /// <returns>False so the original getter gets skipped.</returns>
     public static bool PropertyGetterPatch(MethodBase __originalMethod, ref object __result)
     {
-        var attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod() == __originalMethod).Value;
+        ModdedOptionAttribute attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod().Equals(__originalMethod)).Value;
+
+        if (attribute == null)
+        {
+            return true;
+        }
+        
         __result = attribute.GetValue();
         return false;
     }
-}
+}

MiraAPI/GameOptions/OptionGroupSingleton.cs

@@ -1,19 +1,23 @@
-using System.Linq;
+using System;
+using System.Linq;
 
 namespace MiraAPI.GameOptions;
 
-/// <summary>
-/// Singleton for option groups.
-/// </summary>
-/// <typeparam name="T">The option group type.</typeparam>
-public static class OptionGroupSingleton<T> where T : AbstractOptionGroup
+public class OptionGroupSingleton<T> where T : AbstractOptionGroup
 {
-    private static T? _instance;
+    private static T _instance;
 
-    /// <summary>
-    /// Gets the instance of the option group.
-    /// </summary>
-#pragma warning disable CA1000
-    public static T Instance => _instance ??= ModdedOptionsManager.Groups.OfType<T>().Single();
-#pragma warning restore CA1000
-}
+    public static T Instance
+    {
+        get => _instance ??= ModdedOptionsManager.Groups.OfType<T>().Single();
+        set
+        {
+            if (_instance != null)
+            {
+                throw new InvalidOperationException($"Instance for {typeof(T)} is already set");
+            }
+
+            _instance = value;
+        }
+    }
+}

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -1,103 +1,77 @@
-using System;
+using Reactor.Localization.Utilities;
+using System;
 using System.Linq;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Networking;
-using Reactor.Localization.Utilities;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace MiraAPI.GameOptions.OptionTypes;
 
-/// <summary>
-/// An option for selecting an enum value.
-/// </summary>
 public class ModdedEnumOption : ModdedOption<int>
 {
-    /// <summary>
-    /// Gets the string values of the enum.
-    /// </summary>
-    public string[]? Values { get; }
+    public string[] Values { get; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedEnumOption"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="defaultValue">The default value as an int.</param>
-    /// <param name="enumType">The Enum type.</param>
-    /// <param name="values">An option list of string values to use in place of the enum name.</param>
-    /// <param name="roleType">An optional role type to specify for a specific role.</param>
-    public ModdedEnumOption(string title, int defaultValue, Type enumType, string[]? values = null, Type? roleType = null) : base(title, defaultValue, roleType)
+    public ModdedEnumOption(string title, int defaultValue, Type enumType, Type roleType=null) : base(title, defaultValue, roleType)
     {
-        Values = values ?? Enum.GetNames(enumType);
+        Values = Enum.GetNames(enumType);
         Data = ScriptableObject.CreateInstance<StringGameSetting>();
         var data = (StringGameSetting)Data;
-
+            
         data.Title = StringName;
         data.Type = global::OptionTypes.String;
-        data.Values = values is null ?
-            Enum.GetNames(enumType).Select(CustomStringName.CreateAndRegister).ToArray()
-            : values.Select(CustomStringName.CreateAndRegister).ToArray();
-
+        data.Values = Values.Select(CustomStringName.CreateAndRegister).ToArray();
         data.Index = Value;
     }
 
-    /// <inheritdoc />
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
 
         stringOption.SetUpFromData(Data, 20);
         stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
-
+            
         // SetUpFromData method doesnt work correctly so we must set the values manually
         stringOption.Title = StringName;
-        stringOption.Values = (Data as StringGameSetting)?.Values ?? new Il2CppStructArray<StringNames>(0);
+        stringOption.Values = ((StringGameSetting)Data).Values;
         stringOption.Value = Value;
 
         OptionBehaviour = stringOption;
 
         return stringOption;
     }
-
-    /// <inheritdoc />
-    public override float GetFloatData()
-    {
-        return Value;
-    }
-
-    /// <inheritdoc />
+        
     public override NetData GetNetData()
     {
         return new NetData(Id, BitConverter.GetBytes(Value));
     }
 
-    /// <inheritdoc />
     public override void HandleNetData(byte[] data)
     {
         SetValue(BitConverter.ToInt32(data));
     }
 
-    /// <inheritdoc />
+    public override string GetHudStringText()
+    {
+        return Title + ": " + Values[Value];
+    }
+
     public override int GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
     {
         return optionBehaviour.GetInt();
     }
 
-    /// <inheritdoc />
-    protected override void OnValueChanged(int newValue)
+    public override void OnValueChanged(int newValue)
     {
-        if (HudManager.InstanceExists)
-        {
-            HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
-        }
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
         if (!OptionBehaviour)
         {
             return;
         }
 
-        if (OptionBehaviour is StringOption opt)
+        var opt = OptionBehaviour as StringOption;
+        if (opt)
         {
             opt.Value = newValue;
         }
     }
-}
+}

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -7,56 +7,19 @@ using Object = UnityEngine.Object;
 
 namespace MiraAPI.GameOptions.OptionTypes;
 
-/// <summary>
-/// Represents a modded number option.
-/// </summary>
 public class ModdedNumberOption : ModdedOption<float>
 {
-    /// <summary>
-    /// Gets the minimum value of the option.
-    /// </summary>
-    public float Min { get; }
-
-    /// <summary>
-    /// Gets the maximum value of the option.
-    /// </summary>
+    public float Min { get;}
+    
     public float Max { get; }
-
-    /// <summary>
-    /// Gets the increment value of the option.
-    /// </summary>
+    
     public float Increment { get; }
-
-    /// <summary>
-    /// Gets the suffix type of the option.
-    /// </summary>
-    public MiraNumberSuffixes SuffixType { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether zero is infinity.
-    /// </summary>
+    
+    public NumberSuffixes SuffixType { get; }
+    
     public bool ZeroInfinity { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="defaultValue">The default value as a float.</param>
-    /// <param name="min">The minimum value.</param>
-    /// <param name="max">The maximum value.</param>
-    /// <param name="increment">The increment.</param>
-    /// <param name="suffixType">The suffix type.</param>
-    /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
-    /// <param name="roleType">An optional role type.</param>
-    public ModdedNumberOption(
-        string title,
-        float defaultValue,
-        float min,
-        float max,
-        float increment,
-        MiraNumberSuffixes suffixType,
-        bool zeroInfinity = false,
-        Type? roleType = null) : base(title, defaultValue, roleType)
+    
+    public ModdedNumberOption(string title, float defaultValue, float min, float max, float increment, NumberSuffixes suffixType, bool zeroInfinity=false, Type roleType=null) : base(title, defaultValue, roleType)
     {
         Min = min;
         Max = max;
@@ -65,86 +28,77 @@ public class ModdedNumberOption : ModdedOption<float>
         ZeroInfinity = zeroInfinity;
 
         Value = Mathf.Clamp(defaultValue, min, max);
-
+            
         Data = ScriptableObject.CreateInstance<FloatGameSetting>();
-
+            
         var data = (FloatGameSetting)Data;
         data.Type = global::OptionTypes.Float;
         data.Title = StringName;
         data.Value = Value;
         data.Increment = Increment;
         data.ValidRange = new FloatRange(Min, Max);
-        data.FormatString = Increment % 1 == 0 && Value % 1 == 0 && Min % 1 == 0 && Max % 1 == 0 ? "0" : "0.0"; // not sure if the == checks will work since this is floats but we'll find out
+        data.FormatString = Increment % 1 == 0 && Value % 1 == 0  && Min % 1 == 0  && Max % 1 == 0 ? "0" : "0.0";
         data.ZeroIsInfinity = ZeroInfinity;
-        data.SuffixType = (NumberSuffixes)SuffixType;
+        data.SuffixType = SuffixType;
         data.OptionName = FloatOptionNames.Invalid;
     }
 
-    /// <inheritdoc />
-    public override OptionBehaviour CreateOption(
-        ToggleOption toggleOpt,
-        NumberOption numberOpt,
-        StringOption stringOpt,
-        Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
     {
         var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);
 
         numberOption.SetUpFromData(Data, 20);
         numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
-
+            
         numberOption.Title = StringName;
         numberOption.Value = Value;
         numberOption.Increment = Increment;
         numberOption.ValidRange = new FloatRange(Min, Max);
-        numberOption.FormatString = (Data as FloatGameSetting)?.FormatString ?? "0.0";
+        numberOption.FormatString = ((FloatGameSetting)Data).FormatString;
         numberOption.ZeroIsInfinity = ZeroInfinity;
-        numberOption.SuffixType = (NumberSuffixes)SuffixType;
+        numberOption.SuffixType = SuffixType;
         numberOption.floatOptionName = FloatOptionNames.Invalid;
-
+            
+            
         OptionBehaviour = numberOption;
 
         return numberOption;
     }
 
-    /// <inheritdoc />
-    public override float GetFloatData()
-    {
-        return Value;
-    }
-
-    /// <inheritdoc />
     public override NetData GetNetData()
     {
         return new NetData(Id, BitConverter.GetBytes(Value));
     }
 
-    /// <inheritdoc />
     public override void HandleNetData(byte[] data)
     {
         SetValue(BitConverter.ToSingle(data));
     }
 
-    /// <inheritdoc />
+    public override string GetHudStringText()
+    {
+        return Title + ": " + Value + Helpers.GetSuffix(SuffixType);
+    }
+
     public override float GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
     {
         return Mathf.Clamp(optionBehaviour.GetFloat(), Min, Max);
     }
 
-    /// <inheritdoc />
-    protected override void OnValueChanged(float newValue)
+    public override void OnValueChanged(float newValue)
     {
         Value = Mathf.Clamp(newValue, Min, Max);
-        if (HudManager.InstanceExists)
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(Value), false);
+
+        if (!OptionBehaviour)
         {
-            HudManager.Instance.Notifier.AddSettingsChangeMessage(
-                StringName,
-                Data.GetValueString(Value),
-                false);
+            return;
         }
 
-        if (OptionBehaviour is NumberOption opt)
+        var opt = OptionBehaviour as NumberOption;
+        if (opt)
         {
-            opt.Value = Value;
+            opt.Value = newValue;
         }
     }
-}
+}

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -1,103 +1,41 @@
-using System;
-using BepInEx.Configuration;
-using MiraAPI.Networking;
-using MiraAPI.PluginLoading;
+using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using Reactor.Localization.Utilities;
+using System;
+using BepInEx.Configuration;
+using MiraAPI.Networking;
 using Reactor.Networking.Rpc;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions.OptionTypes;
 
-/// <summary>
-/// Represents a modded option.
-/// </summary>
-/// <typeparam name="T">The value type.</typeparam>
 public abstract class ModdedOption<T> : IModdedOption
 {
-    private IMiraPlugin? _parentMod;
-
-    /// <summary>
-    /// Gets the unique identifier of the option.
-    /// </summary>
+    private IMiraPlugin _parentMod;
+    
     public uint Id { get; }
-
-    /// <summary>
-    /// Gets the title of the option.
-    /// </summary>
-    public string Title { get; }
-
-    /// <summary>
-    /// Gets the StringName object of the option.
-    /// </summary>
-    public StringNames StringName { get; }
-
-    /// <summary>
-    /// Gets the BaseGameSetting data of the option.
-    /// </summary>
     public BaseGameSetting Data { get; protected init; }
-
-    /// <summary>
-    /// Gets or sets the parent mod of the option.
-    /// </summary>
-    public IMiraPlugin? ParentMod
+    public IMiraPlugin ParentMod
     {
         get => _parentMod;
         set
         {
-            if (_parentMod != null || value == null)
-            {
-                return;
-            }
-
             _parentMod = value;
             var entry = _parentMod.GetConfigFile().Bind(ConfigDefinition, DefaultValue);
             Value = entry.Value;
         }
     }
-
-    /// <summary>
-    /// Gets or sets the value of the option.
-    /// </summary>
     public T Value { get; protected set; }
-
-    /// <summary>
-    /// Gets the default value of the option.
-    /// </summary>
-    public T DefaultValue { get; }
-
-    /// <summary>
-    /// Gets or sets the event that is invoked when the value of the option changes.
-    /// </summary>
-    public Action<T>? ChangedEvent { get; set; }
-
-    /// <summary>
-    /// Gets or sets the visibility of the option.
-    /// </summary>
+    public T DefaultValue { get; init; }
+    public Action<T> ChangedEvent { get; set; }
+    public string Title { get; }
+    public StringNames StringName { get; }
     public Func<bool> Visible { get; set; }
+    public Type AdvancedRole { get; set; }
+    public OptionBehaviour OptionBehaviour { get; set; }
+    public ConfigDefinition ConfigDefinition => new ("Options", Title);
 
-    /// <summary>
-    /// Gets or sets the advanced role of the option.
-    /// </summary>
-    public Type? AdvancedRole { get; set; }
-
-    /// <summary>
-    /// Gets or sets the option behaviour of the option.
-    /// </summary>
-    public OptionBehaviour? OptionBehaviour { get; protected set; }
-
-    /// <summary>
-    /// Gets or sets the config definition of the option.
-    /// </summary>
-    public ConfigDefinition? ConfigDefinition { get; set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedOption{T}"/> class.
-    /// </summary>
-    /// <param name="title">The option title.</param>
-    /// <param name="defaultValue">The default value.</param>
-    /// <param name="roleType">The Role Type or null if it doesn't belong to a role.</param>
-    protected ModdedOption(string title, T defaultValue, Type? roleType)
+    protected ModdedOption(string title, T defaultValue, Type roleType)
     {
         Id = ModdedOptionsManager.NextId;
         Title = title;
@@ -112,88 +50,43 @@ public abstract class ModdedOption<T> : IModdedOption
         }
     }
 
-    internal void ValueChanged(OptionBehaviour optionBehaviour)
+    public void ValueChanged(OptionBehaviour optionBehaviour)
     {
         SetValue(GetValueFromOptionBehaviour(optionBehaviour));
     }
 
-    /// <summary>
-    /// Sets the value of the option.
-    /// </summary>
-    /// <param name="newValue">The new value.</param>
     public void SetValue(T newValue)
     {
         var oldVal = Value;
         Value = newValue;
-
-        if (Value?.Equals(oldVal) == false)
+        if (!Value.Equals(oldVal) && ChangedEvent != null)
         {
-            ChangedEvent?.Invoke(Value);
+            ChangedEvent.Invoke(Value);
         }
 
         if (AmongUsClient.Instance.AmHost)
         {
-            if (ParentMod?.GetConfigFile().TryGetEntry<T>(ConfigDefinition, out var entry) == true)
-            {
-                entry.Value = Value;
-            }
-
             Rpc<SyncOptionsRpc>.Instance.Send(PlayerControl.LocalPlayer, [GetNetData()], true);
         }
-
+        
+        if (ParentMod is not null &&
+            ParentMod.GetConfigFile().TryGetEntry<T>(ConfigDefinition, out var entry))
+        {
+            entry.Value = Value;
+        }
+        
         OnValueChanged(newValue);
     }
 
-    /// <summary>
-    /// Gets the float data of the option.
-    /// </summary>
-    /// <returns>A float object representing the option's value.</returns>
-    public abstract float GetFloatData();
-
-    /// <summary>
-    /// Gets the net data of the option.
-    /// </summary>
-    /// <returns>A NetData object representing this option's data.</returns>
     public abstract NetData GetNetData();
-
-    /// <summary>
-    /// Handles incoming net data.
-    /// </summary>
-    /// <param name="data">The NetData's byte array.</param>
+        
     public abstract void HandleNetData(byte[] data);
 
-    public void ResetToConfig()
-    {
-        if (ParentMod?.GetConfigFile().TryGetEntry<T>(ConfigDefinition, out var entry) == true)
-        {
-            SetValue(entry.Value);
-        }
-    }
+    public abstract void OnValueChanged(T newValue);
 
-    /// <summary>
-    /// Handles the value changed event.
-    /// </summary>
-    /// <param name="newValue">The new value.</param>
-    protected abstract void OnValueChanged(T newValue);
-
-    /// <summary>
-    /// Gets the value from the option behaviour.
-    /// </summary>
-    /// <param name="optionBehaviour">The OptionBehaviour.</param>
-    /// <returns>The value.</returns>
     public abstract T GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour);
 
-    /// <summary>
-    /// Creates the option behaviour.
-    /// </summary>
-    /// <param name="toggleOpt">The ToggleOption prefab.</param>
-    /// <param name="numberOpt">The NumberOption prefab.</param>
-    /// <param name="stringOpt">The StringOption prefab.</param>
-    /// <param name="container">The options container.</param>
-    /// <returns>A new OptionBehaviour for this modded option.</returns>
-    public abstract OptionBehaviour CreateOption(
-        ToggleOption toggleOpt,
-        NumberOption numberOpt,
-        StringOption stringOpt,
-        Transform container);
-}
+    public abstract OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
+
+    public abstract string GetHudStringText();
+}

MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs

@@ -0,0 +1,77 @@
+using Reactor.Localization.Utilities;
+using System;
+using System.Linq;
+using MiraAPI.Networking;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace MiraAPI.GameOptions.OptionTypes;
+
+public class ModdedStringOption : ModdedOption<int>
+{
+    public string[] Values { get; }
+    
+    public ModdedStringOption(string title, int defaultValue, string[] values, Type roleType=null) : base(title, defaultValue, roleType)
+    {
+        Values = values;
+        Data = ScriptableObject.CreateInstance<StringGameSetting>();
+        var data = (StringGameSetting)Data;
+            
+        data.Title = StringName;
+        data.Type = global::OptionTypes.String;
+        data.Values = Values.Select(CustomStringName.CreateAndRegister).ToArray();
+        data.Index = Value;
+    }
+
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
+    {
+        var stringOption = Object.Instantiate(stringOpt, container);
+
+        stringOption.SetUpFromData(Data, 20);
+        stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
+
+        // SetUpFromData method doesnt work correctly so we must set the values manually
+        stringOption.Title = StringName;
+        stringOption.Values = ((StringGameSetting)Data).Values;
+        stringOption.Value = Value;
+            
+        OptionBehaviour = stringOption;
+            
+        return stringOption;
+    }
+
+    public override NetData GetNetData()
+    {
+        return new NetData(Id, BitConverter.GetBytes(Value));
+    }
+
+    public override void HandleNetData(byte[] data)
+    {
+        SetValue(BitConverter.ToInt32(data));
+    }
+
+    public override string GetHudStringText()
+    {
+        return Title + ": " + Values[Value];
+    }
+
+    public override int GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
+    {
+        return optionBehaviour.GetInt();
+    }
+
+    public override void OnValueChanged(int newValue)
+    {
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
+        if (!OptionBehaviour)
+        {
+            return;
+        }
+
+        var opt = OptionBehaviour as StringOption;
+        if (opt)
+        {
+            opt.Value = newValue;
+        }
+    }
+}

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -1,22 +1,13 @@
-using System;
-using MiraAPI.Networking;
+using MiraAPI.Networking;
+using System;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace MiraAPI.GameOptions.OptionTypes;
 
-/// <summary>
-/// A modded toggle option.
-/// </summary>
 public class ModdedToggleOption : ModdedOption<bool>
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedToggleOption"/> class.
-    /// </summary>
-    /// <param name="title">The option title.</param>
-    /// <param name="defaultValue">The default value.</param>
-    /// <param name="roleType">An optional role type.</param>
-    public ModdedToggleOption(string title, bool defaultValue, Type? roleType = null) : base(title, defaultValue, roleType)
+    public ModdedToggleOption(string title, bool defaultValue, Type roleType = null) : base(title, defaultValue, roleType)
     {
         Data = ScriptableObject.CreateInstance<CheckboxGameSetting>();
 
@@ -25,7 +16,6 @@ public class ModdedToggleOption : ModdedOption<bool>
         data.Type = global::OptionTypes.Checkbox;
     }
 
-    /// <inheritdoc />
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
     {
         var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container);
@@ -42,45 +32,38 @@ public class ModdedToggleOption : ModdedOption<bool>
         return toggleOption;
     }
 
-    /// <inheritdoc />
-    public override float GetFloatData()
-    {
-        return Value ? 1 : 0;
-    }
-
-    /// <inheritdoc />
     public override NetData GetNetData()
     {
         return new NetData(Id, BitConverter.GetBytes(Value));
     }
 
-    /// <inheritdoc />
     public override void HandleNetData(byte[] data)
     {
         SetValue(BitConverter.ToBoolean(data));
     }
 
-    /// <inheritdoc />
+    public override string GetHudStringText()
+    {
+        return Title + ": " + (Value ? "On" : "Off");
+    }
+
     public override bool GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
     {
         return optionBehaviour.GetBool();
     }
 
-    /// <inheritdoc />
-    protected override void OnValueChanged(bool newValue)
+    public override void OnValueChanged(bool newValue)
     {
-        if (HudManager.InstanceExists)
-        {
-            HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
-        }
+        DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
         if (!OptionBehaviour)
         {
             return;
         }
 
-        if (OptionBehaviour is ToggleOption toggleOpt)
+        var toggleOpt = OptionBehaviour as ToggleOption;
+        if (toggleOpt)
         {
             toggleOpt.CheckMark.enabled = newValue;
         }
     }
-}
+}

MiraAPI/Hud/ButtonLocation.cs

@@ -1,17 +0,0 @@
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// The location of the custom button on the screen.
-/// </summary>
-public enum ButtonLocation
-{
-    /// <summary>
-    /// Placed in the bottom left.
-    /// </summary>
-    BottomLeft,
-
-    /// <summary>
-    /// Placed in the bottom right.
-    /// </summary>
-    BottomRight,
-}

MiraAPI/Hud/CustomActionButton.cs

@@ -1,75 +1,66 @@
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.UI;
 
 namespace MiraAPI.Hud;
 
-/// <summary>
-/// Class for making custom action buttons. More customizable than the default Action/Ability buttons in the base game.
-/// </summary>
 public abstract class CustomActionButton
 {
     /// <summary>
-    /// Gets the name and text of the button.
+    /// The name and text of the button.
     /// </summary>
     public abstract string Name { get; }
 
     /// <summary>
-    /// Gets the button's cooldown duration in seconds.
+    /// How long the button takes to cooldown.
     /// </summary>
     public abstract float Cooldown { get; }
 
     /// <summary>
-    /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
+    /// If the button has an effect ability, how long the effect should last. To disable effects, set to 0.
     /// </summary>
     public abstract float EffectDuration { get; }
 
     /// <summary>
-    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
+    /// If the button has limited uses, how many uses it has. To make the button infinite, set to 0.
     /// </summary>
     public abstract int MaxUses { get; }
 
     /// <summary>
-    /// Gets the sprite of the button. Use <see cref="LoadableResourceAsset"/> to load a sprite from a resource path. Use <see cref="LoadableBundleAsset{T}"/> to load a sprite from an asset bundle.
+    /// The sprite of the button. Use <see cref="LoadableResourceAsset"/> to load a sprite from a resource path. Use <see cref="LoadableBundleAsset{T}"/> to load a sprite from an asset bundle.
     /// </summary>
     public abstract LoadableAsset<Sprite> Sprite { get; }
 
     /// <summary>
-    /// Gets the location of the button on the screen.
-    /// </summary>
-    public virtual ButtonLocation Location => ButtonLocation.BottomLeft;
-
-    /// <summary>
-    /// Gets a value indicating whether the button has an effect ability.
+    /// Returns true if the button has an effect ability.
     /// </summary>
     public bool HasEffect => EffectDuration > 0;
 
     /// <summary>
-    /// Gets a value indicating whether the button has limited uses.
+    /// Returns true if the button has limited uses.
     /// </summary>
     public bool LimitedUses => MaxUses > 0;
 
     /// <summary>
-    /// Gets or sets a value indicating whether the effect is currently active, if there is one.
+    /// Returns true if the effect is currently active.
     /// </summary>
-    public bool EffectActive { get; protected set; }
+    protected bool EffectActive;
 
     /// <summary>
-    /// Gets or sets the amount of uses left.
+    /// A timer variable to measure cooldowns and effects.
     /// </summary>
-    public int UsesLeft { get; protected set; }
+    protected float Timer;
 
     /// <summary>
-    /// Gets or sets the timer variable to measure cooldowns and effects.
+    /// Returns the amount of uses left.
     /// </summary>
-    public float Timer { get; protected set; }
+    protected int UsesLeft;
 
     /// <summary>
-    /// Gets the button object in game. This is created by Mira API automatically.
+    /// The button object in game. This is created by Mira API automatically.
     /// </summary>
-    protected ActionButton? Button { get; private set; }
-
+    protected ActionButton Button { get; private set; }
+    
     internal void CreateButton(Transform parent)
     {
         if (Button)
@@ -83,7 +74,7 @@ public abstract class CustomActionButton
 
         Button = Object.Instantiate(HudManager.Instance.AbilityButton, parent);
         Button.name = Name + "Button";
-        Button.OverrideText(Name.ToUpperInvariant());
+        Button.OverrideText(Name.ToUpper());
 
         Button.graphic.sprite = Sprite.LoadAsset();
 
@@ -94,110 +85,50 @@ public abstract class CustomActionButton
         }
 
         var pb = Button.GetComponent<PassiveButton>();
-        pb.OnClick = new Button.ButtonClickedEvent();
+        pb.OnClick.RemoveAllListeners();
         pb.OnClick.AddListener((UnityAction)ClickHandler);
     }
 
     /// <summary>
-    /// A utility function to reset the cooldown and/or effect of the button.
+    /// A utility function to reset the cooldown of the button.
     /// </summary>
-    public void ResetCooldownAndOrEffect()
+    public void ResetCooldown()
     {
         Timer = Cooldown;
         if (EffectActive)
         {
             OnEffectEnd();
         }
-
+        
         EffectActive = false;
     }
-
+    
     /// <summary>
     /// A utility function to override the sprite of the button.
     /// </summary>
-    /// <param name="sprite">The new sprite to override with.</param>
+    /// <param name="sprite">The new sprite to override with</param>
     public void OverrideSprite(Sprite sprite)
     {
-        if (Button != null)
-        {
-            Button.graphic.sprite = sprite;
-        }
+        Button.graphic.sprite = sprite;
     }
 
     /// <summary>
     /// A utility function to override the name of the button.
     /// </summary>
-    /// <param name="name">The new name to override with.</param>
+    /// <param name="name">The new name to override with</param>
     public void OverrideName(string name)
     {
-        Button?.OverrideText(name);
+        Button.OverrideText(name);
     }
 
     /// <summary>
-    /// Set the button's timer.
+    /// A utility function that runs with the local PlayerControl's FixedUpdate.
     /// </summary>
-    /// <param name="time">The time you want to set to.</param>
-    public void SetTimer(float time)
-    {
-        Timer = Mathf.Clamp(time, -1, float.MaxValue);
-    }
+    /// <param name="playerControl">the local PlayerControl</param>
+    protected virtual void FixedUpdate(PlayerControl playerControl) { }
 
     /// <summary>
-    /// Increase the button's timer.
-    /// </summary>
-    /// <param name="amount">The amount you want to increase by.</param>
-    public void IncreaseTimer(float amount)
-    {
-        SetTimer(Timer + amount);
-    }
-
-    /// <summary>
-    /// Decrease the button's timer.
-    /// </summary>
-    /// <param name="amount">The amount you want to decrease by.</param>
-    public void DecreaseTimer(float amount)
-    {
-        SetTimer(Timer - amount);
-    }
-
-    /// <summary>
-    /// Set the amount of uses this button has left.
-    /// </summary>
-    /// <param name="amount">The amount you want to set to.</param>
-    public void SetUses(int amount)
-    {
-        UsesLeft = Mathf.Clamp(amount, 0, int.MaxValue);
-        Button?.SetUsesRemaining(MaxUses);
-    }
-
-    /// <summary>
-    /// Increase the amount of uses this button has left.
-    /// </summary>
-    /// <param name="amount">The amount you want to increase by. Default: 1.</param>
-    public void IncreaseUses(int amount = 1)
-    {
-        SetUses(UsesLeft + amount);
-    }
-
-    /// <summary>
-    /// Decrease the amount of uses this button has left.
-    /// </summary>
-    /// <param name="amount">The amount you want to decrease by. Default: 1.</param>
-    public void DecreaseUses(int amount = 1)
-    {
-        SetUses(UsesLeft - amount);
-    }
-
-    /// <summary>
-    /// A utility function that runs with the local PlayerControl's FixedUpdate if the button is enabled.
-    /// </summary>
-    /// <param name="playerControl">the local PlayerControl.</param>
-    protected virtual void FixedUpdate(PlayerControl playerControl)
-    {
-    }
-
-    /// <summary>
-    /// Callback method for the button click event.
+    /// Runs when the button is clicked.
     /// </summary>
     protected abstract void OnClick();
 
@@ -206,16 +137,12 @@ public abstract class CustomActionButton
     /// True means the button is active, false means the button is disabled.
     /// </summary>
     /// <param name="role">The role of the local player.</param>
-    /// <returns>True if the button is enabled, false otherwise.</returns>
-    public abstract bool Enabled(RoleBehaviour? role);
+    public abstract bool Enabled(RoleBehaviour role);
 
     /// <summary>
-    /// Given that there is an effect, this method runs when the effect ends.
-    /// <br /> <br /> THIS IS A CALLBACK METHOD! Use <see cref="ResetCooldownAndOrEffect" /> if you want to end the effect.
+    /// Given that there is an effect, this method that runs when the effect ends.
     /// </summary>
-    public virtual void OnEffectEnd()
-    {
-    }
+    public virtual void OnEffectEnd() { }
 
     /// <summary>
     /// When the button is enabled, this method is called to determine if the button can be used.
@@ -233,11 +160,11 @@ public abstract class CustomActionButton
     /// The default behavior is to show the button if the <paramref name="visible"/> parameter and the <see cref="Enabled"/> method return true.
     /// It can be overridden for custom behavior.
     /// </summary>
-    /// <param name="visible">Passed in from HudManager.SetHudActive, should hud be active.</param>
+    /// <param name="visible">Passed in from HudManager.SetHudActive, should hud be active?</param>
     /// <param name="role">Passed in from HudManager.SetHudActive, the current role of the player.</param>
     public virtual void SetActive(bool visible, RoleBehaviour role)
     {
-        Button?.ToggleVisible(visible && Enabled(role));
+        Button.ToggleVisible(visible && Enabled(role));
     }
 
     /// <summary>
@@ -245,7 +172,7 @@ public abstract class CustomActionButton
     /// This method takes into account cooldowns, effects, and uses, before calling the <see cref="OnClick"/> method.
     /// It can be overridden for custom behavior.
     /// </summary>
-    protected virtual void ClickHandler()
+    public virtual void ClickHandler()
     {
         if (!CanUse())
         {
@@ -255,11 +182,11 @@ public abstract class CustomActionButton
         if (LimitedUses)
         {
             UsesLeft--;
-            Button?.SetUsesRemaining(UsesLeft);
+            Button.SetUsesRemaining(UsesLeft);
         }
 
         OnClick();
-        Button?.SetDisabled();
+        Button.SetDisabled();
         if (HasEffect)
         {
             EffectActive = true;
@@ -276,7 +203,7 @@ public abstract class CustomActionButton
     /// By default, it handles the cooldown and effect timers, and sets the button to enabled or disabled.
     /// It can be overridden for custom behavior.
     /// </summary>
-    /// <param name="playerControl">The local PlayerControl.</param>
+    /// <param name="playerControl">The local PlayerControl</param>
     public virtual void FixedUpdateHandler(PlayerControl playerControl)
     {
         if (Timer >= 0)
@@ -292,69 +219,15 @@ public abstract class CustomActionButton
 
         if (CanUse())
         {
-            Button?.SetEnabled();
+            Button.SetEnabled();
         }
         else
         {
-            Button?.SetDisabled();
+            Button.SetDisabled();
         }
-
-        Button?.SetCoolDown(Timer, EffectActive ? EffectDuration : Cooldown);
+        
+        Button.SetCoolDown(Timer, EffectActive ? EffectDuration : Cooldown);
 
         FixedUpdate(playerControl);
     }
-}
-
-/// <summary>
-/// Custom action button that has a target object.
-/// </summary>
-/// <typeparam name="T">The type of the target object.</typeparam>
-public abstract class CustomActionButton<T> : CustomActionButton where T : MonoBehaviour
-{
-    /// <summary>
-    /// Gets or sets the target object of the button.
-    /// </summary>
-    public T? Target { get; protected set; }
-
-    /// <summary>
-    /// Gets the distance the player must be from the target object to use the button.
-    /// </summary>
-    public virtual float Distance => PlayerControl.LocalPlayer.Data.Role.GetAbilityDistance();
-
-    /// <summary>
-    /// Determines if the target object is valid.
-    /// </summary>
-    /// <param name="target">The target object being checked.</param>
-    /// <returns>True if the target object is valid, false otherwise.</returns>
-    public virtual bool IsTargetValid(T? target)
-    {
-        return target != null;
-    }
-
-    /// <summary>
-    /// The method used to get the target object.
-    /// </summary>
-    /// <returns>The target object or null if it isn't found.</returns>
-    public abstract T? GetTarget();
-
-    /// <summary>
-    /// Sets the outline of the target object.
-    /// </summary>
-    /// <param name="active">Should the outline be active.</param>
-    public abstract void SetOutline(bool active);
-
-    /// <inheritdoc />
-    public override bool CanUse()
-    {
-        var newTarget = GetTarget();
-        if (newTarget != Target)
-        {
-            SetOutline(false);
-        }
-
-        Target = IsTargetValid(newTarget) ? newTarget : null;
-        SetOutline(true);
-
-        return base.CanUse() && Target != null;
-    }
-}
+}

MiraAPI/Hud/CustomButtonManager.cs

@@ -1,16 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using MiraAPI.PluginLoading;
 using Reactor.Utilities;
 
 namespace MiraAPI.Hud;
 
-internal static class CustomButtonManager
+public static class CustomButtonManager
 {
-    internal static readonly List<CustomActionButton> CustomButtons = [];
+    public static readonly List<CustomActionButton> CustomButtons = [];
 
-    internal static void RegisterButton(Type buttonType, MiraPluginInfo pluginInfo)
+    internal static void RegisterButton(Type buttonType)
     {
         if (!typeof(CustomActionButton).IsAssignableFrom(buttonType))
         {
@@ -23,11 +22,10 @@ internal static class CustomButtonManager
             Logger<MiraApiPlugin>.Error($"Failed to create button from {buttonType.Name}");
             return;
         }
-
+        
         CustomButtons.Add(button);
-        pluginInfo.Buttons.Add(button);
         typeof(CustomButtonSingleton<>).MakeGenericType(buttonType)
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
             .SetValue(null, button);
     }
-}
+}

MiraAPI/Hud/CustomButtonSingleton.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+#nullable enable
+using System;
+using System.Linq;
 
 namespace MiraAPI.Hud;
 
@@ -6,14 +8,26 @@ namespace MiraAPI.Hud;
 /// A utility class to get the instance of a custom action button.
 /// </summary>
 /// <typeparam name="T">The type of the button you are trying to access.</typeparam>
-public static class CustomButtonSingleton<T> where T : CustomActionButton
+public class CustomButtonSingleton<T> where T : CustomActionButton
 {
     private static T? _instance;
 
-    /// <summary>
-    /// Gets the instance of the button.
-    /// </summary>
-#pragma warning disable CA1000
-    public static T Instance => _instance ??= CustomButtonManager.CustomButtons.OfType<T>().Single();
-#pragma warning restore CA1000
-}
+    public static T Instance
+    {
+        get => _instance ??= CustomButtonManager.CustomButtons.OfType<T>().Single();
+        set
+        {
+            if (_instance == value)
+            {
+                return;
+            }
+
+            if (_instance != null)
+            {
+                throw new InvalidOperationException($"Instance for {typeof(T)} is already set");
+            }
+
+            _instance = value;
+        }
+    }
+}

MiraAPI/Hud/CustomPlayerMenu.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.GameOptions;
-using MiraAPI.Patches.Stubs;
-using Reactor.Utilities.Attributes;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
-using UnityEngine.Events;
-
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// Custom Player Menu using the ShapeshifterPanel as a base.
-/// </summary>
-/// <param name="il2CppPtr">Used by Il2Cpp. Do not use constructor, this is a MonoBehaviour.</param>
-[RegisterInIl2Cpp]
-public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
-{
-    public ShapeshifterPanel PanelPrefab;
-
-    public float XStart = -0.8f;
-
-    public float YStart = 2.15f;
-
-    public float XOffset = 1.95f;
-
-    public float YOffset = -0.65f;
-
-    public UiElement BackButton;
-
-    public UiElement DefaultButtonSelected;
-
-    public List<ShapeshifterPanel> potentialVictims;
-
-    /// <summary>
-    /// Creates a CustomPlayerMenu.
-    /// </summary>
-    /// <returns>New CustomPlayerMenu object.</returns>
-    public static CustomPlayerMenu Create()
-    {
-        var shapeShifterRole = RoleManager.Instance.GetRole(RoleTypes.Shapeshifter);
-
-        var ogMenu = shapeShifterRole.TryCast<ShapeshifterRole>().ShapeshifterMenu;
-        var newMenu = Instantiate(ogMenu);
-        var customMenu = newMenu.gameObject.AddComponent<CustomPlayerMenu>();
-
-        customMenu.PanelPrefab = newMenu.PanelPrefab;
-        customMenu.XStart = newMenu.XStart;
-        customMenu.YStart = newMenu.YStart;
-        customMenu.XOffset = newMenu.XOffset;
-        customMenu.YOffset = newMenu.YOffset;
-        customMenu.BackButton = newMenu.BackButton;
-        var back = customMenu.BackButton.GetComponent<PassiveButton>();
-        back.OnClick.RemoveAllListeners();
-        back.OnClick.AddListener((UnityAction)(() =>
-        {
-            Instance.Close();
-        }));
-
-        customMenu.CloseSound = newMenu.CloseSound;
-        customMenu.logger = newMenu.logger;
-        customMenu.OpenSound = newMenu.OpenSound;
-
-        newMenu.DestroyImmediate();
-
-        customMenu.transform.SetParent(Camera.main.transform, false);
-        customMenu.transform.localPosition = new Vector3(0f, 0f, -50f);
-        return customMenu;
-    }
-
-    private void OnDisable()
-    {
-        ControllerManager.Instance.CloseOverlayMenu(name);
-    }
-
-    public override void Begin(PlayerTask task)
-    {
-        throw new NotImplementedException("Use the other Begin method.");
-    }
-
-    /// <summary>
-    /// Begins/opens the custom player menu.
-    /// </summary>
-    /// <param name="playerMatch">Function to determine if player should show in the custom menu.</param>
-    /// <param name="onClick">Onclick action for player.</param>
-    public void Begin(Func<PlayerControl, bool> playerMatch, Action<PlayerControl> onClick)
-    {
-        MinigameStubs.Begin(this, null);
-
-        DestroyableSingleton<DebugAnalytics>.Instance.Analytics.MinigameOpened(PlayerControl.LocalPlayer.Data, TaskType);
-        var list = PlayerControl.AllPlayerControls.ToArray().Where(playerMatch).ToList();
-        potentialVictims = [];
-        var list2 = new Il2CppSystem.Collections.Generic.List<UiElement>();
-
-        for (var i = 0; i < list.Count; i++)
-        {
-            var player = list[i];
-            var num = i % 3;
-            var num2 = i / 3;
-            var flag = PlayerControl.LocalPlayer.Data.Role.NameColor == player.Data.Role.NameColor;
-            var shapeshifterPanel = Instantiate(PanelPrefab, transform);
-            shapeshifterPanel.transform.localPosition = new Vector3(XStart + num * XOffset, YStart + num2 * YOffset, -1f);
-            shapeshifterPanel.SetPlayer(i, player.Data, (Il2CppSystem.Action)(() => { onClick(player); }));
-            shapeshifterPanel.NameText.color = flag ? player.Data.Role.NameColor : Color.white;
-            potentialVictims.Add(shapeshifterPanel);
-            list2.Add(shapeshifterPanel.Button);
-        }
-        ControllerManager.Instance.OpenOverlayMenu(name, BackButton, DefaultButtonSelected, list2);
-    }
-}

MiraAPI/Hud/RegisterButtonAttribute.cs

@@ -6,4 +6,4 @@ namespace MiraAPI.Hud;
 /// Attribute to register a button in the HUD. Necessary for the button to be recognized by Mira.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class)]
-public class RegisterButtonAttribute : Attribute;
+public class RegisterButtonAttribute : Attribute;

MiraAPI/MiraAPI.csproj

@@ -1,19 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>latest</LangVersion>
+        <DebugType>embedded</DebugType>
+
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
         <Description>Simple and easy to use Among Us modding API.</Description>
-        <PackageId>AllOfUs.MiraAPI</PackageId>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <Authors>Angxl, XtraCube</Authors>
     </PropertyGroup>
     
     <ItemGroup>
-        <None Include="..\README.md" Pack="true" PackagePath="\" />
+        <EmbeddedResource Include="Resources\Cog.png" />
+        <EmbeddedResource Include="Resources\CogActive.png" />
+        <EmbeddedResource Include="Resources\NextButton.png" />
+        <EmbeddedResource Include="Resources\NextButtonActive.png" />
+        <EmbeddedResource Include="Resources\Empty.png" />
+    </ItemGroup>
+	
+    <ItemGroup>
+        <PackageReference Include="Reactor" Version="2.3.0" />
+        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
+        <PackageReference Include="Iced" Version="1.21.0" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.8.13" PrivateAssets="all" />
+
+        <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
+        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime">
+            <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\**\*.*" />
-    </ItemGroup>
-    
-    <Import Project="../AmongUs.props" />
+    <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
+        <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" />
+    </Target>
 </Project>

MiraAPI/MiraApiPlugin.cs

@@ -3,9 +3,11 @@ using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using MiraAPI.PluginLoading;
 using Reactor;
+using Reactor.Patches;
+using System;
+using System.Text;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
-using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI;
@@ -16,18 +18,32 @@ namespace MiraAPI;
 [ReactorModFlags(ModFlags.RequireOnAllClients)]
 public partial class MiraApiPlugin : BasePlugin
 {
-    private static MiraPluginManager? PluginManager { get; set; }
-
     public Harmony Harmony { get; } = new(Id);
-    public static Color MiraColor { get; } = new Color32(238, 154, 112, 255);
+    private static MiraPluginManager PluginManager { get; set; }
+    
+    public static Color MiraColor = new Color32(238, 154, 112, 255);
 
     public override void Load()
     {
         Harmony.PatchAll();
 
-        ReactorCredits.Register("Mira API", Version, true, ReactorCredits.AlwaysShow);
-
         PluginManager = new MiraPluginManager();
         PluginManager.Initialize();
+
+        ReactorVersionShower.TextUpdated += text =>
+        {
+            text.text = new StringBuilder($"{MiraColor.ToTextColor()}Mira API</color> ")
+            .Append(GetShortHashVersion(Version))
+            .Append('\n')
+            .Append(text.text)
+            .ToString();
+        };
+    }
+
+    private static string GetShortHashVersion(string version)
+    {
+        var index = version.IndexOf("+", StringComparison.Ordinal);
+
+        return index < 0 ? version : version[..(index + 3)];
     }
 }

MiraAPI/Modifiers/BaseModifier.cs

@@ -1,80 +0,0 @@
-namespace MiraAPI.Modifiers;
-
-/// <summary>
-/// Base class for all modifiers.
-/// </summary>
-public abstract class BaseModifier
-{
-    /// <summary>
-    /// Gets the player that the modifier is attached to.
-    /// </summary>
-    public PlayerControl? Player { get; internal set; }
-
-    /// <summary>
-    /// Gets the modifier component that the modifier is attached to.
-    /// </summary>
-    public ModifierComponent? ModifierComponent { get; internal set; }
-
-    /// <summary>
-    /// Gets the modifier id.
-    /// </summary>
-    public uint ModifierId { get; internal set; }
-
-    /// <summary>
-    /// Gets the modifier name.
-    /// </summary>
-    public abstract string ModifierName { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier is hidden on the UI.
-    /// </summary>
-    public virtual bool HideOnUi => false;
-
-    /// <summary>
-    /// Gets the HUD information for this modifier. Defaults to the modifier name. Does nothing if <see cref="HideOnUi"/> is true.
-    /// </summary>
-    /// <returns>The information string for the HUD.</returns>
-    public virtual string GetHudString() => ModifierName;
-
-    /// <summary>
-    /// Called when the modifier is activated.
-    /// </summary>
-    public virtual void OnActivate()
-    {
-    }
-
-    /// <summary>
-    /// Called when the modifier is deactivated.
-    /// </summary>
-    public virtual void OnDeactivate()
-    {
-    }
-
-    /// <summary>
-    /// Called when the modifier is updated. Attached to the ModifierComponent's Update method.
-    /// </summary>
-    public virtual void Update()
-    {
-    }
-
-    /// <summary>
-    /// Called when the modifier is updated. Attached to the ModifierComponent's FixedUpdate method.
-    /// </summary>
-    public virtual void FixedUpdate()
-    {
-    }
-
-    /// <summary>
-    /// Called when the player dies.
-    /// </summary>
-    /// <param name="reason">The Death Reason.</param>
-    public virtual void OnDeath(DeathReason reason)
-    {
-    }
-
-    /// <summary>
-    /// Determines whether the player can vent.
-    /// </summary>
-    /// <returns>True if the player can vent, false otherwise. Null for no effect.</returns>
-    public virtual bool? CanVent() => null;
-}

MiraAPI/Modifiers/ModifierComponent.cs

@@ -1,262 +0,0 @@
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using Reactor.Utilities.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using TMPro;
-using UnityEngine;
-
-namespace MiraAPI.Modifiers;
-
-/// <summary>
-/// The component for handling modifiers.
-/// </summary>
-[RegisterInIl2Cpp]
-public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
-{
-    /// <summary>
-    /// Gets the active modifiers on the player.
-    /// </summary>
-    [HideFromIl2Cpp]
-    public ImmutableList<BaseModifier> ActiveModifiers => Modifiers.ToImmutableList();
-
-    [HideFromIl2Cpp]
-    private List<BaseModifier> Modifiers { get; set; } = [];
-
-    private PlayerControl? _player;
-
-    private TextMeshPro? _modifierText;
-
-    private readonly List<BaseModifier> _toRemove = [];
-
-    private readonly List<BaseModifier> _toAdd = [];
-
-    internal void ClearModifiers()
-    {
-        _toRemove.AddRange(Modifiers);
-    }
-
-    private void Start()
-    {
-        _player = GetComponent<PlayerControl>();
-        Modifiers = [];
-
-        if (!_player.AmOwner)
-        {
-            return;
-        }
-
-        _modifierText = Helpers.CreateTextLabel("ModifierText", HudManager.Instance.transform, AspectPosition.EdgeAlignments.RightTop, new Vector3(10.1f, 3.5f, 0), textAlignment: TextAlignmentOptions.Right);
-        _modifierText.verticalAlignment = VerticalAlignmentOptions.Top;
-    }
-
-    private void FixedUpdate()
-    {
-        foreach (var modifier in _toRemove)
-        {
-            modifier.OnDeactivate();
-            Modifiers.Remove(modifier);
-        }
-
-        foreach (var modifier in _toAdd)
-        {
-            Modifiers.Add(modifier);
-            modifier.OnActivate();
-
-            if (modifier is TimedModifier { AutoStart: true } timer)
-            {
-                timer.StartTimer();
-            }
-        }
-
-        if (_toAdd.Count > 0 || _toRemove.Count > 0)
-        {
-            if (_player?.AmOwner == true)
-            {
-                HudManager.Instance?.SetHudActive(HudManager.Instance.TaskPanel.isActiveAndEnabled);
-            }
-            _toAdd.Clear();
-            _toRemove.Clear();
-        }
-
-        foreach (var modifier in Modifiers)
-        {
-            modifier.FixedUpdate();
-        }
-    }
-
-    private void Update()
-    {
-        foreach (var modifier in Modifiers)
-        {
-            modifier.Update();
-        }
-
-        if (!_modifierText || _player?.AmOwner == false)
-        {
-            return;
-        }
-
-        var filteredModifiers = Modifiers.Where(mod => !mod.HideOnUi);
-
-        var baseModifiers = filteredModifiers as BaseModifier[] ?? filteredModifiers.ToArray();
-
-        var inMeeting = MeetingHud.Instance != null;
-
-        _modifierText!.gameObject.SetActive(!inMeeting);
-
-        if (baseModifiers.Length != 0)
-        {
-            var stringBuild = new StringBuilder();
-            foreach (var mod in baseModifiers)
-            {
-                stringBuild.Append(CultureInfo.InvariantCulture, $"\n{mod.GetHudString()}");
-            }
-            _modifierText!.text = $"<b><size=130%>Modifiers:</b></size>{stringBuild}";
-        }
-        else if (_modifierText!.text != string.Empty)
-        {
-            _modifierText.text = string.Empty;
-        }
-    }
-
-    /// <summary>
-    /// Removes a modifier from the player.
-    /// </summary>
-    /// <param name="type">The modifier type.</param>
-    [HideFromIl2Cpp]
-    public void RemoveModifier(Type type)
-    {
-        var modifier = Modifiers.Find(x => x.GetType() == type);
-
-        if (modifier is null)
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {type.Name} because it is not active.");
-            return;
-        }
-
-        RemoveModifier(modifier);
-    }
-
-    /// <summary>
-    /// Removes a modifier from the player.
-    /// </summary>
-    /// <typeparam name="T">The modifier type.</typeparam>
-    [HideFromIl2Cpp]
-    public void RemoveModifier<T>() where T : BaseModifier
-    {
-        RemoveModifier(typeof(T));
-    }
-
-    /// <summary>
-    /// Removes a modifier from the player.
-    /// </summary>
-    /// <param name="modifierId">The modifier ID.</param>
-    [HideFromIl2Cpp]
-    public void RemoveModifier(uint modifierId)
-    {
-        var modifier = Modifiers.Find(x => x.ModifierId == modifierId);
-
-        if (modifier is null)
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot remove modifier with id {modifierId} because it is not active.");
-            return;
-        }
-
-        RemoveModifier(modifier);
-    }
-
-    /// <summary>
-    /// Removes a modifier from the player.
-    /// </summary>
-    /// <param name="modifier">The modifier object.</param>
-    [HideFromIl2Cpp]
-    public void RemoveModifier(BaseModifier modifier)
-    {
-        if (!Modifiers.Contains(modifier))
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player.");
-            return;
-        }
-
-        _toRemove.Add(modifier);
-    }
-
-    /// <summary>
-    /// Adds a modifier to the player.
-    /// </summary>
-    /// <param name="modifier">The modifier to add.</param>
-    /// <returns>The modifier that was added.</returns>
-    [HideFromIl2Cpp]
-    public BaseModifier? AddModifier(BaseModifier modifier)
-    {
-        if (Modifiers.Contains(modifier))
-        {
-            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {modifier.ModifierId}!");
-            return null;
-        }
-
-        var modifierId = ModifierManager.GetModifierId(modifier.GetType());
-
-        if (modifierId == null)
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot add modifier {modifier.GetType().Name} because it has no ID!");
-            return null;
-        }
-
-        _toAdd.Add(modifier);
-        modifier.Player = _player;
-        modifier.ModifierComponent = this;
-        modifier.ModifierId = modifierId.Value;
-        return modifier;
-    }
-
-    /// <summary>
-    /// Adds a modifier to the player.
-    /// </summary>
-    /// <param name="type">The modifier type.</param>
-    /// <returns>The modifier that was added.</returns>
-    [HideFromIl2Cpp]
-    public BaseModifier? AddModifier(Type type)
-    {
-        var modifierId = ModifierManager.GetModifierId(type);
-        if (modifierId == null)
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot add modifier {type.Name} because it is not registered.");
-            return null;
-        }
-
-        if (Modifiers.Find(x => x.ModifierId == modifierId) != null)
-        {
-            Logger<MiraApiPlugin>.Error($"Player already has modifier with id {modifierId}!");
-            return null;
-        }
-
-        if (Activator.CreateInstance(type) is not BaseModifier modifier)
-        {
-            Logger<MiraApiPlugin>.Error($"Cannot add modifier {type.Name} because it is null.");
-            return null;
-        }
-
-        AddModifier(modifier);
-
-        return modifier;
-    }
-
-    /// <summary>
-    /// Adds a modifier to the player.
-    /// </summary>
-    /// <typeparam name="T">The Type of the modifier.</typeparam>
-    /// <returns>The new modifier.</returns>
-    [HideFromIl2Cpp]
-    public T? AddModifier<T>() where T : BaseModifier
-    {
-        return AddModifier(typeof(T)) as T;
-    }
-}

MiraAPI/Modifiers/ModifierManager.cs

@@ -1,202 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MiraAPI.Modifiers.Types;
-using MiraAPI.Networking;
-using MiraAPI.Roles;
-using MiraAPI.Utilities;
-using Reactor.Networking.Rpc;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using Random = System.Random;
-
-namespace MiraAPI.Modifiers;
-
-/// <summary>
-/// The manager for handling modifiers.
-/// </summary>
-public static class ModifierManager
-{
-    private static readonly Dictionary<uint, Type> IdToTypeModifierMap = [];
-    private static readonly Dictionary<Type, uint> TypeToIdModifierMap = [];
-
-    private static uint _nextId;
-
-    private static uint GetNextId()
-    {
-        _nextId++;
-        return _nextId;
-    }
-
-    /// <summary>
-    /// Gets the modifier type from the id.
-    /// </summary>
-    /// <param name="id">The ID.</param>
-    /// <returns>The Type of the modifier.</returns>
-    public static Type? GetModifierType(uint id)
-    {
-        return IdToTypeModifierMap.GetValueOrDefault(id);
-    }
-
-    /// <summary>
-    /// Gets the modifier id from the type.
-    /// </summary>
-    /// <param name="type">The Type.</param>
-    /// <returns>The ID of the modifier.</returns>
-    public static uint? GetModifierId(Type type)
-    {
-        return TypeToIdModifierMap.GetValueOrDefault(type);
-    }
-
-    internal static void RegisterModifier(Type modifierType)
-    {
-        if (!typeof(BaseModifier).IsAssignableFrom(modifierType))
-        {
-            return;
-        }
-
-        IdToTypeModifierMap.Add(GetNextId(), modifierType);
-        TypeToIdModifierMap.Add(modifierType, _nextId);
-    }
-
-    internal static void AssignModifiers(List<PlayerControl> plrs)
-    {
-        var rand = new Random();
-
-        List<uint> filteredModifiers = [];
-
-        foreach (var modifier in IdToTypeModifierMap.Where(pair => pair.Value.IsAssignableTo(typeof(GameModifier))))
-        {
-            if (Activator.CreateInstance(modifier.Value) is not GameModifier mod)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to create instance of {modifier.Value.Name}");
-                continue;
-            }
-
-            if (!plrs.Exists(x => IsGameModifierValid(x, mod, modifier.Key)))
-            {
-                Logger<MiraApiPlugin>.Warning("No players are valid for modifier: " + mod.ModifierName);
-                continue;
-            }
-
-            var maxCount = plrs.Count(x => IsGameModifierValid(x, mod, modifier.Key));
-
-            var num = Math.Clamp(mod.GetAmountPerGame(), 0, maxCount);
-            var chance = mod.GetAssignmentChance();
-
-            for (var i = 0; i < num; i++)
-            {
-                var randomNum = rand.Next(100);
-
-                if (randomNum < Math.Clamp(chance, 0, 100))
-                {
-                    filteredModifiers.Add(TypeToIdModifierMap[modifier.Value]);
-                }
-            }
-        }
-
-        var shuffledModifiers = filteredModifiers.Randomize();
-        if (shuffledModifiers.Count > plrs.Count)
-        {
-            shuffledModifiers = shuffledModifiers.GetRange(0, plrs.Count);
-        }
-
-        while (shuffledModifiers.Count > 0)
-        {
-            var id = shuffledModifiers[0];
-
-            if (Activator.CreateInstance(IdToTypeModifierMap[id]) is not GameModifier mod)
-            {
-                Logger<MiraApiPlugin>.Error($"Failed to create instance of {IdToTypeModifierMap[id].Name}");
-                continue;
-            }
-
-            if (!plrs.Exists(x => IsGameModifierValid(x, mod, id)))
-            {
-                shuffledModifiers.RemoveAt(0);
-                continue;
-            }
-
-            var plr = plrs.Random();
-
-            if (plr == null || !IsGameModifierValid(plr, mod, id))
-            {
-                continue;
-            }
-
-            shuffledModifiers.RemoveAt(0);
-            plr.RpcAddModifier(id);
-        }
-    }
-
-    private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
-    {
-        return (player.Data.Role is not ICustomRole role || role.IsModifierApplicable(modifier)) &&
-               modifier.IsModifierValidOn(player.Data.Role) &&
-               !player.HasModifier(modifierId);
-    }
-
-    internal static void SyncAllModifiers(int targetId = -1)
-    {
-        var data = new List<NetData>();
-
-        foreach (var player in PlayerControl.AllPlayerControls)
-        {
-            data.Add(GetPlayerModifiers(player));
-        }
-
-        Rpc<SyncModifiersRpc>.Instance.SendTo(PlayerControl.LocalPlayer, targetId, [.. data]);
-    }
-
-    internal static void HandleSyncModifiers(NetData[] data)
-    {
-        foreach (var netData in data)
-        {
-            var ids = new uint[netData.Data.Length / 4];
-            Buffer.BlockCopy(netData.Data, 0, ids, 0, netData.Data.Length);
-
-            var plr = GameData.Instance.GetPlayerById((byte)netData.Id).Object;
-            var modifierComponent = plr.GetComponent<ModifierComponent>();
-
-            if (!modifierComponent)
-            {
-                continue;
-            }
-
-            modifierComponent.ClearModifiers();
-
-            foreach (var id in ids)
-            {
-                if (!IdToTypeModifierMap.TryGetValue(id, out var type))
-                {
-                    Logger<MiraApiPlugin>.Error($"Cannot add modifier with id {id} because it is not registered.");
-                    continue;
-                }
-
-                modifierComponent.AddModifier(type);
-            }
-        }
-    }
-
-    private static NetData GetPlayerModifiers(PlayerControl? player)
-    {
-        if (player == null || !player)
-        {
-            return new NetData(0, []);
-        }
-
-        List<byte> bytes = [];
-        var modifierComponent = player.GetComponent<ModifierComponent>();
-        if (modifierComponent == null || !modifierComponent)
-        {
-            return new NetData(player.PlayerId, []);
-        }
-
-        foreach (var modifier in modifierComponent.ActiveModifiers)
-        {
-            bytes.AddRange(BitConverter.GetBytes(TypeToIdModifierMap[modifier.GetType()]));
-        }
-
-        return new NetData(player.PlayerId, [.. bytes]);
-    }
-}

MiraAPI/Modifiers/RegisterModifierAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.Modifiers;
-
-/// <summary>
-/// Marks a class as a modifier that can be registered with the <see cref="ModifierManager"/>.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterModifierAttribute : Attribute;

MiraAPI/Modifiers/Types/GameModifier.cs

@@ -1,32 +0,0 @@
-namespace MiraAPI.Modifiers.Types;
-
-/// <summary>
-/// The base class for a game modifier. Game modifiers are applied at the start of the game on top of the player's role.
-/// </summary>
-public abstract class GameModifier : BaseModifier
-{
-    /// <summary>
-    /// Gets the chance of the modifier being assigned to a player.
-    /// </summary>
-    /// <returns>An int value between 0 and 100 representing percent.</returns>
-    public abstract int GetAssignmentChance();
-
-    /// <summary>
-    /// Gets the amount of players that can have this modifier in a game.
-    /// </summary>
-    /// <returns>An int value greater than or equal to zero.</returns>
-    public abstract int GetAmountPerGame();
-
-    /// <summary>
-    /// Determines whether the modifier is valid on a role.
-    /// </summary>
-    /// <param name="role">The role to be checked.</param>
-    /// <returns>True if the modifier is valid on the role, otherwise false.</returns>
-    public virtual bool IsModifierValidOn(RoleBehaviour role) => true;
-
-    /// <summary>
-    /// Determines whether the player won the game with this modifier.
-    /// </summary>
-    /// <returns>True if the player won, false if they lost. Return null to use the player's default win condition.</returns>
-    public virtual bool? DidWin(GameOverReason reason) => null;
-}

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -1,133 +0,0 @@
-using System;
-using Reactor.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Modifiers.Types;
-
-/// <summary>
-/// The base class for all timed modifiers. Timed modifiers have a duration and can be started and stopped.
-/// </summary>
-public abstract class TimedModifier : BaseModifier
-{
-    /// <summary>
-    /// Gets the duration of the modifier.
-    /// </summary>
-    public abstract float Duration { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the timer should start automatically when added.
-    /// </summary>
-    public virtual bool AutoStart => false;
-
-    /// <summary>
-    /// Gets a value indicating whether the modifier should be removed when the timer completes.
-    /// </summary>
-    public virtual bool RemoveOnComplete => true;
-
-    /// <summary>
-    /// Called when the timer completes.
-    /// </summary>
-    public abstract void OnTimerComplete();
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the timer is active.
-    /// </summary>
-    public bool TimerActive { get; protected set; }
-
-    /// <summary>
-    /// Gets or sets the time remaining on the timer.
-    /// </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>
-    /// <returns>A string with the hud information + timer.</returns>
-    public override string GetHudString()
-    {
-        return base.GetHudString() + $" <size=70%>({Math.Round(Duration - TimeRemaining, 0)}s/{Duration}s)</size>";
-    }
-
-    /// <summary>
-    /// The FixedUpdate method for timed modifiers. Automatically handles the timer logic.
-    /// </summary>
-    public override void FixedUpdate()
-    {
-        if (!TimerActive)
-        {
-            return;
-        }
-
-        if (TimeRemaining > 0)
-        {
-            TimeRemaining -= Time.fixedDeltaTime;
-        }
-        else
-        {
-            StopTimer();
-        }
-    }
-
-    /// <summary>
-    /// Starts the timer.
-    /// </summary>
-    public void StartTimer()
-    {
-        if (TimerActive)
-        {
-            Logger<MiraApiPlugin>.Error("Can't start a timer that has already been started.");
-            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

@@ -1,272 +0,0 @@
-using System.Collections;
-using System.Linq;
-using AmongUs.GameOptions;
-using Assets.CoreScripts;
-using BepInEx.Unity.IL2CPP.Utils;
-using Reactor.Networking.Attributes;
-using Reactor.Networking.Rpc;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
-
-namespace MiraAPI.Networking;
-
-/// <summary>
-/// Custom murder RPCs to fix issues with default ones.
-/// </summary>
-public static class CustomMurderRpc
-{
-    /// <summary>
-    /// Networked Custom Murder method.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="didSucceed">Whether the murder was successful or not.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before, SendImmediately = true)]
-    public static void RpcCustomMurder(
-        this PlayerControl source,
-        PlayerControl target,
-        bool didSucceed = true,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
-        var murderResultFlags2 = MurderResultFlags.DecisionByHost | murderResultFlags;
-
-        source.CustomMurder(
-            target,
-            murderResultFlags2,
-            resetKillTimer,
-            createDeadBody,
-            teleportMurderer,
-            showKillAnim,
-            playKillSound);
-    }
-
-    /// <summary>
-    /// Custom Murder method without networking. If you need a networked version, use <see cref="RpcCustomMurder"/>.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="resultFlags">Murder result flags.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    public static void CustomMurder(
-        this PlayerControl source,
-        PlayerControl target,
-        MurderResultFlags resultFlags,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        source.isKilling = false;
-        Logger<MiraApiPlugin>.Error($"{source.PlayerId} trying to murder {target.PlayerId}");
-        var data = target.Data;
-        if (resultFlags.HasFlag(MurderResultFlags.FailedError))
-        {
-            return;
-        }
-
-        if (resultFlags.HasFlag(MurderResultFlags.FailedProtected) ||
-            (resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.protectedByGuardianId > -1))
-        {
-            target.protectedByGuardianThisRound = true;
-            var flag = PlayerControl.LocalPlayer.Data.Role.Role == RoleTypes.GuardianAngel;
-            if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
-            {
-                StatsManager.Instance.IncrementStat(StringNames.StatsGuardianAngelCrewmatesProtected);
-                AchievementManager.Instance.OnProtectACrewmate();
-            }
-
-            if (source.AmOwner || flag)
-            {
-                target.ShowFailedMurder();
-
-                if (resetKillTimer)
-                {
-                    source.SetKillTimer(
-                        GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown) / 2f);
-                }
-            }
-            else
-            {
-                target.RemoveProtection();
-            }
-
-            Logger<MiraApiPlugin>.Error($"{source.PlayerId} failed to murder {target.PlayerId} due to guardian angel protection");
-            return;
-        }
-
-        if (!resultFlags.HasFlag(MurderResultFlags.Succeeded) &&
-            !resultFlags.HasFlag(MurderResultFlags.DecisionByHost))
-        {
-            return;
-        }
-
-        DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
-        if (source.AmOwner)
-        {
-            StatsManager.Instance.IncrementStat(
-                GameManager.Instance.IsHideAndSeek()
-                    ? StringNames.StatsImpostorKills_HideAndSeek
-                    : StringNames.StatsImpostorKills);
-
-            if (source.CurrentOutfitType == PlayerOutfitType.Shapeshifted)
-            {
-                StatsManager.Instance.IncrementStat(StringNames.StatsShapeshifterShiftedKills);
-            }
-
-            if (Constants.ShouldPlaySfx() && playKillSound)
-            {
-                SoundManager.Instance.PlaySound(source.KillSfx, false, 0.8f);
-            }
-
-            if (resetKillTimer)
-            {
-                source.SetKillTimer(GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown));
-            }
-        }
-
-        UnityTelemetry.Instance.WriteMurder();
-        target.gameObject.layer = LayerMask.NameToLayer("Ghost");
-        if (target.AmOwner)
-        {
-            StatsManager.Instance.IncrementStat(StringNames.StatsTimesMurdered);
-            if (Minigame.Instance)
-            {
-                try
-                {
-                    Minigame.Instance.Close();
-                    Minigame.Instance.Close();
-                }
-                catch
-                {
-                    // ignored
-                }
-            }
-
-            if (showKillAnim)
-            {
-                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
-            }
-
-            target.cosmetics.SetNameMask(false);
-            target.RpcSetScanner(false);
-        }
-
-        AchievementManager.Instance.OnMurder(
-            source.AmOwner,
-            target.AmOwner,
-            source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,
-            source.shapeshiftTargetPlayerId,
-            target.PlayerId);
-        source.MyPhysics.StartCoroutine(source.KillAnimations.Random()?.CoPerformCustomKill(source, target, createDeadBody, teleportMurderer));
-        Logger<MiraApiPlugin>.Error($"{source.PlayerId} succeeded in murdering {target.PlayerId}");
-    }
-
-    /// <summary>
-    /// Perform a custom kill animation.
-    /// </summary>
-    /// <param name="anim">The kill animation.</param>
-    /// <param name="source">The murderer.</param>
-    /// <param name="target">The murdered player.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the murder be teleported.</param>
-    /// <returns>Coroutine.</returns>
-    public static IEnumerator CoPerformCustomKill(
-        this KillAnimation anim,
-        PlayerControl source,
-        PlayerControl target,
-        bool createDeadBody = true,
-        bool teleportMurderer = true)
-    {
-        var cam = Camera.main?.GetComponent<FollowerCamera>();
-        var isParticipant = PlayerControl.LocalPlayer == source || PlayerControl.LocalPlayer == target;
-        var sourcePhys = source.MyPhysics;
-
-        if (teleportMurderer)
-        {
-            KillAnimation.SetMovement(source, false);
-        }
-
-        KillAnimation.SetMovement(target, false);
-
-        if (isParticipant)
-        {
-            PlayerControl.LocalPlayer.isKilling = true;
-            source.isKilling = true;
-        }
-
-        DeadBody? deadBody = null;
-
-        if (createDeadBody)
-        {
-            deadBody = Object.Instantiate(GameManager.Instance.DeadBodyPrefab);
-            deadBody.enabled = false;
-            deadBody.ParentId = target.PlayerId;
-            deadBody.bodyRenderers.ToList().ForEach(target.SetPlayerMaterialColors);
-
-            target.SetPlayerMaterialColors(deadBody.bloodSplatter);
-            var vector = target.transform.position + anim.BodyOffset;
-            vector.z = vector.y / 1000f;
-            deadBody.transform.position = vector;
-        }
-
-        if (isParticipant)
-        {
-            if (cam != null)
-            {
-                cam.Locked = true;
-            }
-
-            ConsoleJoystick.SetMode_Task();
-            if (PlayerControl.LocalPlayer.AmOwner)
-            {
-                PlayerControl.LocalPlayer.MyPhysics.inputHandler.enabled = true;
-            }
-        }
-
-        target.Die(DeathReason.Kill, true);
-        yield return source.MyPhysics.Animations.CoPlayCustomAnimation(anim.BlurAnim);
-        sourcePhys.Animations.PlayIdleAnimation();
-
-        if (teleportMurderer)
-        {
-            source.NetTransform.SnapTo(target.transform.position);
-            KillAnimation.SetMovement(source, true);
-        }
-
-        KillAnimation.SetMovement(target, true);
-
-        if (deadBody != null)
-        {
-            deadBody.enabled = true;
-        }
-
-        if (!isParticipant)
-        {
-            yield break;
-        }
-
-        if (cam != null)
-        {
-            cam.Locked = false;
-        }
-
-        PlayerControl.LocalPlayer.isKilling = false;
-        source.isKilling = false;
-    }
-}

MiraAPI/Networking/MiraRpc.cs

@@ -1,37 +1,7 @@
 namespace MiraAPI.Networking;
 
-/// <summary>
-/// Mira RPCs.
-/// </summary>
 public enum MiraRpc : uint
 {
-    /// <summary>
-    /// Syncs the game options.
-    /// </summary>
     SyncGameOptions,
-
-    /// <summary>
-    /// Syncs the role options.
-    /// </summary>
-    SyncRoleOptions,
-
-    /// <summary>
-    /// Adds a modifier to a player.
-    /// </summary>
-    AddModifier,
-
-    /// <summary>
-    /// Removes a modifier from a player.
-    /// </summary>
-    RemoveModifier,
-
-    /// <summary>
-    /// Syncs all modifiers at once.
-    /// </summary>
-    SyncModifiers,
-
-    /// <summary>
-    /// Custom Murder RPC.
-    /// </summary>
-    CustomMurder,
-}
+    SyncRoleOptions
+}

MiraAPI/Networking/NetData.cs

@@ -1,25 +1,10 @@
-namespace MiraAPI.Networking;
+using System;
+
+namespace MiraAPI.Networking;
 
-/// <summary>
-/// Used to network data and mark it with an ID.
-/// </summary>
-/// <param name="id">The ID of the data.</param>
-/// <param name="data">The byte[] data.</param>
 public readonly struct NetData(uint id, byte[] data)
 {
-    /// <summary>
-    /// Gets the ID of the data.
-    /// </summary>
     public uint Id { get; } = id;
-
-    /// <summary>
-    /// Gets the byte[] data.
-    /// </summary>
     public byte[] Data { get; } = data;
-
-    /// <summary>
-    /// Gets the length of the data in bytes.
-    /// </summary>
-    /// <returns>An int representing the number of bytes this NetData takes up.</returns>
-    public int GetLength() => 4 + Data.Length;
-}
+    public int GetLength() => BitConverter.GetBytes(Id).Length + Data.Length;
+}

MiraAPI/Networking/SyncModifiersRpc.cs

@@ -1,52 +0,0 @@
-using Hazel;
-using MiraAPI.Modifiers;
-using Reactor.Networking.Attributes;
-using Reactor.Networking.Rpc;
-
-namespace MiraAPI.Networking;
-
-[RegisterCustomRpc((uint)MiraRpc.SyncModifiers)]
-internal sealed class SyncModifiersRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<MiraApiPlugin, NetData[]>(plugin, id)
-{
-    public override RpcLocalHandling LocalHandling => RpcLocalHandling.None;
-
-    public override void Write(MessageWriter writer, NetData[]? data)
-    {
-        if (data == null)
-        {
-            writer.WritePacked(0U);
-            return;
-        }
-
-        writer.WritePacked((uint)data.Length);
-        foreach (var netData in data)
-        {
-            writer.WritePacked(netData.Id);
-            writer.WriteBytesAndSize(netData.Data);
-        }
-    }
-
-    public override NetData[] Read(MessageReader reader)
-    {
-        var length = reader.ReadPackedUInt32();
-        var data = new NetData[length];
-        for (var i = 0; i < length; i++)
-        {
-            var dataId = reader.ReadPackedUInt32();
-            var bytes = reader.ReadBytesAndSize();
-            data[i] = new NetData(dataId, bytes);
-        }
-
-        return data;
-    }
-
-    public override void Handle(PlayerControl playerControl, NetData[]? data)
-    {
-        if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
-        {
-            return;
-        }
-
-        ModifierManager.HandleSyncModifiers(data ?? []);
-    }
-}

MiraAPI/Networking/SyncOptionsRpc.cs

@@ -7,18 +7,12 @@ namespace MiraAPI.Networking;
 
 // METHOD RPC DOESNT WORK WITH THE ARRAYS AND STUFF SO THIS IS HOW WE WILL DO IT FOR NOW
 [RegisterCustomRpc((uint)MiraRpc.SyncGameOptions)]
-internal sealed class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<MiraApiPlugin, NetData[]>(plugin, id)
+public class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<MiraApiPlugin, NetData[]>(plugin, id)
 {
     public override RpcLocalHandling LocalHandling => RpcLocalHandling.None;
-
-    public override void Write(MessageWriter writer, NetData[]? data)
+    
+    public override void Write(MessageWriter writer, NetData[] data)
     {
-        if (data == null)
-        {
-            writer.WritePacked(0U);
-            return;
-        }
-
         writer.WritePacked((uint)data.Length);
         foreach (var netData in data)
         {
@@ -33,21 +27,21 @@ internal sealed class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCust
         var data = new NetData[length];
         for (var i = 0; i < length; i++)
         {
-            var dataId = reader.ReadPackedUInt32();
+            var id = reader.ReadPackedUInt32();
             var bytes = reader.ReadBytesAndSize();
-            data[i] = new NetData(dataId, bytes);
+            data[i] = new NetData(id, bytes);
         }
 
         return data;
     }
 
-    public override void Handle(PlayerControl playerControl, NetData[]? data)
+    public override void Handle(PlayerControl playerControl, NetData[] data)
     {
         if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
         {
             return;
         }
 
-        ModdedOptionsManager.HandleSyncOptions(data ?? []);
+        ModdedOptionsManager.HandleSyncOptions(data);
     }
-}
+}

MiraAPI/Networking/SyncRoleOptionsRpc.cs

@@ -6,18 +6,13 @@ using Reactor.Networking.Rpc;
 namespace MiraAPI.Networking;
 
 [RegisterCustomRpc((uint)MiraRpc.SyncRoleOptions)]
-internal sealed class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<MiraApiPlugin, NetData[]>(plugin, id)
+public class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<MiraApiPlugin, NetData[]>(plugin, id)
 {
+
     public override RpcLocalHandling LocalHandling => RpcLocalHandling.None;
 
-    public override void Write(MessageWriter writer, NetData[]? data)
+    public override void Write(MessageWriter writer, NetData[] data)
     {
-        if (data == null)
-        {
-            writer.WritePacked(0U);
-            return;
-        }
-
         writer.WritePacked((uint)data.Length);
         foreach (var netData in data)
         {
@@ -32,21 +27,21 @@ internal sealed class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : Player
         var data = new NetData[length];
         for (var i = 0; i < length; i++)
         {
-            var dataId = reader.ReadPackedUInt32();
+            var id = reader.ReadPackedUInt32();
             var bytes = reader.ReadBytesAndSize();
-            data[i] = new NetData(dataId, bytes);
+            data[i] = new NetData(id, bytes);
         }
 
         return data;
     }
 
-    public override void Handle(PlayerControl playerControl, NetData[]? data)
+    public override void Handle(PlayerControl playerControl, NetData[] data)
     {
         if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
         {
             return;
         }
 
-        CustomRoleManager.HandleSyncRoleOptions(data ?? []);
+        CustomRoleManager.HandleSyncRoleOptions(data);
     }
-}
+}

MiraAPI/Patches/AmongUsClientSyncPatch.cs

@@ -1,14 +1,10 @@
 using HarmonyLib;
 using InnerNet;
 using MiraAPI.GameOptions;
-using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 
 namespace MiraAPI.Patches;
 
-/// <summary>
-/// Sync all options, role settings, and modifiers to the player when they join the game.
-/// </summary>
 [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CreatePlayer))]
 public static class AmongUsClientSyncPatch
 {
@@ -18,7 +14,7 @@ public static class AmongUsClientSyncPatch
         {
             return;
         }
-
+        
         if (clientData.Id == AmongUsClient.Instance.HostId)
         {
             return;
@@ -26,6 +22,5 @@ public static class AmongUsClientSyncPatch
 
         ModdedOptionsManager.SyncAllOptions(clientData.Id);
         CustomRoleManager.SyncAllRoleSettings(clientData.Id);
-        ModifierManager.SyncAllModifiers(clientData.Id);
     }
-}
+}

MiraAPI/Patches/Colors/ScrollingColorsPatch.cs

@@ -1,58 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Colors;
-
-[HarmonyPatch(typeof(PlayerTab))]
-public static class ScrollingColorsPatch
-{
-    // Collider
-    private static BoxCollider2D? _collider;
-
-    /// <summary>
-    /// Add scrolling to the colors tab.
-    /// </summary>
-    [HarmonyPostfix, HarmonyPatch("OnEnable")]
-    public static void AddScrollingToColorsTabPatch(PlayerTab __instance)
-    {
-        if (!PlayerCustomizationMenu.Instance)
-        {
-            return;
-        }
-
-        var tab = PlayerCustomizationMenu.Instance.Tabs[1].Tab;
-
-        if (__instance.scroller == null)
-        {
-            var newScroller = Object.Instantiate(tab.scroller, __instance.transform, true);
-            newScroller.Inner.transform.DestroyChildren();
-
-            var maskObj = new GameObject
-            {
-                layer = 5,
-                name = "SpriteMask",
-            };
-            maskObj.transform.SetParent(__instance.transform);
-            maskObj.transform.localPosition = new Vector3(0, 0, 0);
-            maskObj.transform.localScale = new Vector3(500, 4.76f);
-
-            var mask = maskObj.AddComponent<SpriteMask>();
-            mask.sprite = MiraAssets.Empty.LoadAsset();
-
-            _collider = maskObj.AddComponent<BoxCollider2D>();
-            _collider.size = new Vector2(1f, 0.75f);
-            _collider.enabled = true;
-            __instance.scroller = newScroller;
-        }
-
-        foreach (var chip in __instance.ColorChips)
-        {
-            chip.transform.SetParent(__instance.scroller.Inner);
-            chip.Button.ClickMask = _collider;
-            chip.GetComponent<SpriteRenderer>().maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-        }
-
-        __instance.SetScrollerBounds();
-    }
-}

MiraAPI/Patches/Cosmetics/HatsTabPatch.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Cosmetics;
-using MonoMod.Utils;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Cosmetics;
-
-[HarmonyPatch(typeof(HatsTab), nameof(HatsTab.OnEnable))]
-public static class HatsTabPatch
-{
-    public static bool Prefix(HatsTab __instance)
-    {
-        var hatGroups = new SortedList<AbstractCosmeticsGroup, List<HatData>>(
-            new AbstractCosmeticsGroupComparer()
-        );
-        CustomCosmeticManager.Groups.Do(x => x.Hats.Sort(new CosmeticComparer(x)));
-        var c = CustomCosmeticManager.Groups.Select(x => new KeyValuePair<AbstractCosmeticsGroup, List<HatData>>(x, x.Hats)).
-            ToDictionary(x => x.Key, x => x.Value.Where(x=>x.Free || DataManager.Player.Purchases.GetPurchase(x.ProductId, x.BundleId)).ToList());
-        hatGroups.AddRange<AbstractCosmeticsGroup, List<HatData>>(c);
-
-        foreach (var colorchip in __instance.ColorChips) colorchip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-        var hatIdx = 0;
-
-        __instance.currentHat = DestroyableSingleton<HatManager>.Instance.GetHatById(DataManager.Player.Customization.Hat);
-
-        foreach (var (group, hats) in hatGroups.Where(x=>x.Key.GroupVisible() && x.Key.Hats.Count > 0))
-        {
-            var text = UnityEngine.Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.text = group.GroupName;
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-
-            hatIdx = (hatIdx + 4) / 5 * 5;
-
-            var xLerp = __instance.XRange.Lerp(0.5f);
-            var yLerp = __instance.YStart - (hatIdx / __instance.NumPerRow) * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-            hatIdx += 5;
-
-            foreach (var hat in hats)
-            {
-                var num = __instance.XRange.Lerp(hatIdx % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                var num2 = __instance.YStart - hatIdx / __instance.NumPerRow * __instance.YOffset;
-                var colorChip = UnityEngine.Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-                colorChip.transform.localPosition = new Vector3(num, num2, -1f);
-                colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectHat(hat)));
-                colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-                colorChip.Inner.SetMaskType(PlayerMaterial.MaskType.SimpleUI);
-                __instance.UpdateMaterials(colorChip.Inner.FrontLayer, hat);
-                colorChip.Inner.SetHat(hat, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color);
-                colorChip.Inner.transform.localPosition = hat.ChipOffset + new Vector2(0f, -0.3f);
-                colorChip.Tag = hat;
-                colorChip.SelectionHighlight.gameObject.SetActive(false);
-                __instance.ColorChips.Add(colorChip);
-                hatIdx += 1;
-            }
-        }
-
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIdx + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
-        __instance.currentHatIsEquipped = true;
-
-        return false;
-    }
-}

MiraAPI/Patches/Cosmetics/InventoryManagerPatch.cs

@@ -1,13 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Cosmetics;
-
-namespace MiraAPI.Patches.Cosmetics;
-
-[HarmonyPatch(typeof(InventoryManager), nameof(InventoryManager.CheckUnlockedItems))]
-public static class InventoryManagerPatch
-{
-    public static void Prefix()
-    {
-        CustomCosmeticManager.LoadAll();
-    }
-}

MiraAPI/Patches/Cosmetics/NameplatesTabPatch.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Cosmetics;
-using MiraAPI.Utilities.Assets.Addressable;
-using MonoMod.Utils;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
-
-namespace MiraAPI.Patches.Cosmetics;
-[HarmonyPatch(typeof(NameplatesTab), nameof(NameplatesTab.OnEnable))]
-public static class NameplatesTabPatch
-{
-    public static bool Prefix(NameplatesTab __instance)
-    {
-        var groups = new SortedList<AbstractCosmeticsGroup, List<NamePlateData>>(
-            new AbstractCosmeticsGroupComparer()
-        );
-        CustomCosmeticManager.Groups.Do(x => x.Nameplates.Sort(new CosmeticComparer(x)));
-        var c = CustomCosmeticManager.Groups.Select(x => new KeyValuePair<AbstractCosmeticsGroup, List<NamePlateData>>(x, x.Nameplates)).
-            ToDictionary(x => x.Key, x => x.Value.Where(x => x.Free || DataManager.Player.Purchases.GetPurchase(x.ProductId, x.BundleId)).ToList());
-        groups.AddRange<AbstractCosmeticsGroup, List<NamePlateData>>(c);
-        Logger<MiraApiPlugin>.Info($"{c.Count}");
-
-        foreach (var colorchip in __instance.ColorChips) colorchip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-        var hatIdx = 0;
-
-        __instance.PlayerPreview.gameObject.SetActive(false);
-        __instance.StartCoroutine(__instance.CoLoadNameplatePreview());
-
-        foreach (var (group, hats) in groups.Where(x => x.Key.GroupVisible() && x.Key.Nameplates.Count > 0))
-        {
-            var text = UnityEngine.Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.text = group.GroupName;
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-
-            hatIdx = (hatIdx + 1) / 2 * 2;
-
-            var xLerp = __instance.XRange.Lerp(0.5f);
-            var yLerp = __instance.YStart - (hatIdx / __instance.NumPerRow) * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-            hatIdx += 2;
-
-            foreach (var hat in hats)
-            {
-                var num = __instance.XRange.Lerp(hatIdx % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                var num2 = __instance.YStart - hatIdx / __instance.NumPerRow * __instance.YOffset;
-
-                var colorChip = UnityEngine.Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-                colorChip.transform.localPosition = new Vector3(num, num2, -1f);
-
-                colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectNameplate(hat)));
-                colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-
-                colorChip.ProductId = hat.ProductId;
-
-                var handle = Addressables.LoadAssetAsync<NamePlateViewData>(hat.ViewDataRef);
-                Coroutines.Start(SetupColorChip(colorChip.TryCast<NameplateChip>(), handle));
-                __instance.ColorChips.Add(colorChip);
-                hatIdx += 1;
-            }
-        }
-
-        __instance.GetDefaultSelectable().PlayerEquippedForeground.SetActive(true);
-        __instance.plateId = DataManager.Player.Customization.NamePlate;
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIdx + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
-        __instance.currentNameplateIsEquipped = true;
-
-        return false;
-    }
-
-    private static IEnumerator SetupColorChip(NameplateChip colorChip, AsyncOperationHandle<NamePlateViewData> handle)
-    {
-        yield return new WaitForAsyncOperationHandleFinish(handle);
-        colorChip.image.sprite = handle.Result?.Image;
-    }
-}

MiraAPI/Patches/Cosmetics/SkinsTabPatch.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Cosmetics;
-using MiraAPI.Utilities.Assets.Addressable;
-using MonoMod.Utils;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
-
-namespace MiraAPI.Patches.Cosmetics;
-[HarmonyPatch(typeof(SkinsTab), nameof(SkinsTab.OnEnable))]
-public static class SkinsTabPatch
-{
-    public static bool Prefix(SkinsTab __instance)
-    {
-        var groups = new SortedList<AbstractCosmeticsGroup, List<SkinData>>(
-            new AbstractCosmeticsGroupComparer()
-        );
-        CustomCosmeticManager.Groups.Do(x => x.Skins.Sort(new CosmeticComparer(x)));
-        var c = CustomCosmeticManager.Groups.Select(x => new KeyValuePair<AbstractCosmeticsGroup, List<SkinData>>(x, x.Skins)).
-            ToDictionary(x => x.Key, x => x.Value.Where(x => x.Free || DataManager.Player.Purchases.GetPurchase(x.ProductId, x.BundleId)).ToList());
-        groups.AddRange<AbstractCosmeticsGroup, List<SkinData>>(c);
-
-        foreach (var colorchip in __instance.ColorChips) colorchip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-        var hatIdx = 0;
-
-        foreach (var (group, skins) in groups.Where(x => x.Key.GroupVisible() && x.Key.Skins.Count > 0))
-        {
-            var text = UnityEngine.Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.text = group.GroupName;
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-
-            hatIdx = (hatIdx + 4) / 5 * 5;
-
-            var xLerp = __instance.XRange.Lerp(0.5f);
-            var yLerp = __instance.YStart - (hatIdx / __instance.NumPerRow) * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-            hatIdx += 5;
-
-            foreach (var skin in skins)
-            {
-                var num = __instance.XRange.Lerp(hatIdx % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                var num2 = __instance.YStart - hatIdx / __instance.NumPerRow * __instance.YOffset;
-                var colorChip = UnityEngine.Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-                colorChip.transform.localPosition = new Vector3(num, num2, -1f);
-                colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectSkin(skin)));
-                colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-                colorChip.ProductId = skin.ProductId;
-                __instance.UpdateMaterials(colorChip.Inner.FrontLayer, skin);
-
-                var handle = Addressables.LoadAssetAsync<SkinViewData>(skin.ViewDataRef);
-                Coroutines.Start(SetupColorChip(handle, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color, colorChip));
-                colorChip.SelectionHighlight.gameObject.SetActive(false);
-                __instance.ColorChips.Add(colorChip);
-                hatIdx += 1;
-            }
-        }
-
-        __instance.skinId = DataManager.Player.Customization.Skin;
-        __instance.currentSkinIsEquipped = true;
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIdx + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
-
-        return false;
-    }
-
-    internal static IEnumerator SetupColorChip(AsyncOperationHandle<SkinViewData> handle, int colorId, ColorChip colorChip)
-    {
-        yield return new WaitForAsyncOperationHandleFinish(handle);
-        colorChip.Inner.FrontLayer.sprite = handle.Result?.IdleFrame;
-        PlayerMaterial.SetColors(colorId, colorChip.Inner.FrontLayer);
-    }
-}

MiraAPI/Patches/Cosmetics/VisorsTabPatch.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.Data;
-using HarmonyLib;
-using MiraAPI.Cosmetics;
-using MiraAPI.Utilities.Assets.Addressable;
-using MonoMod.Utils;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
-
-namespace MiraAPI.Patches.Cosmetics;
-[HarmonyPatch(typeof(VisorsTab), nameof(VisorsTab.OnEnable))]
-public static class VisorsTabPatch
-{
-    public static bool Prefix(VisorsTab __instance)
-    {
-        var groups = new SortedList<AbstractCosmeticsGroup, List<VisorData>>(
-            new AbstractCosmeticsGroupComparer()
-        );
-        CustomCosmeticManager.Groups.Do(x => x.Visors.Sort(new CosmeticComparer(x)));
-        var c = CustomCosmeticManager.Groups.Select(x => new KeyValuePair<AbstractCosmeticsGroup, List<VisorData>>(x, x.Visors)).
-            ToDictionary(x => x.Key, x => x.Value.Where(x => x.Free || DataManager.Player.Purchases.GetPurchase(x.ProductId, x.BundleId)).ToList());
-        groups.AddRange<AbstractCosmeticsGroup, List<VisorData>>(c);
-
-        foreach (var colorchip in __instance.ColorChips) colorchip.gameObject.Destroy();
-        __instance.ColorChips.Clear();
-        var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
-        var hatIdx = 0;
-
-        foreach (var (group, visors) in groups.Where(x => x.Key.GroupVisible() && x.Key.Visors.Count > 0))
-        {
-            var text = UnityEngine.Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.text = group.GroupName;
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-
-            hatIdx = (hatIdx + 4) / 5 * 5;
-
-            var xLerp = __instance.XRange.Lerp(0.5f);
-            var yLerp = __instance.YStart - (hatIdx / __instance.NumPerRow) * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-            hatIdx += 5;
-
-            foreach (var visor in visors)
-            {
-                var num = __instance.XRange.Lerp(hatIdx % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                var num2 = __instance.YStart - hatIdx / __instance.NumPerRow * __instance.YOffset;
-                var colorChip = UnityEngine.Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
-                colorChip.transform.localPosition = new Vector3(num, num2, -1f);
-                colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectVisor(visor)));
-                colorChip.Button.ClickMask = __instance.scroller.Hitbox;
-                colorChip.ProductId = visor.ProductId;
-                __instance.UpdateMaterials(colorChip.Inner.FrontLayer, visor);
-
-                var handle = Addressables.LoadAssetAsync<VisorViewData>(visor.ViewDataRef);
-                Coroutines.Start(SetupColorChip(handle, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color, colorChip));
-                colorChip.SelectionHighlight.gameObject.SetActive(false);
-                __instance.ColorChips.Add(colorChip);
-                hatIdx += 1;
-            }
-        }
-
-        __instance.visorId = DataManager.Player.Customization.Visor;
-        __instance.currentVisorIsEquipped = true;
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIdx + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
-
-        return false;
-    }
-
-    internal static IEnumerator SetupColorChip(AsyncOperationHandle<VisorViewData> handle, int colorId, ColorChip colorChip)
-    {
-        yield return new WaitForAsyncOperationHandleFinish(handle);
-        colorChip.Inner.FrontLayer.sprite = handle.Result?.IdleFrame;
-        PlayerMaterial.SetColors(colorId, colorChip.Inner.FrontLayer);
-    }
-}

MiraAPI/Patches/GameModes/ConsolePatches.cs

@@ -1,4 +1,5 @@
-/*
+
+/*
 [HarmonyPatch]
 public static class ConsolePatches
 {
@@ -68,4 +69,4 @@ public static class ConsolePatches
         canUse = couldUse = true;
         return true;
     }
-}*/
+}*/

MiraAPI/Patches/GameModes/DeadBodyPatch.cs

@@ -1,4 +1,6 @@
-/*
+
+
+/*
 [HarmonyPatch(typeof(DeadBody))]
 public static class DeadBodyPatch
 {
@@ -8,4 +10,4 @@ public static class DeadBodyPatch
     {
         return CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanReport(__instance);
     }
-}*/
+}*/

MiraAPI/Patches/GameModes/GameLogicPatches.cs

@@ -1,4 +1,6 @@
-/*
+
+
+/*
 [HarmonyPatch]
 public static class GameLogicPatches
 {
@@ -17,4 +19,4 @@ public static class GameLogicPatches
         CustomGameModeManager.ActiveMode?.AssignRoles(out runOriginal, __instance);
         return runOriginal;
     }
-}*/
+}*/

MiraAPI/Patches/GameModes/ImpostorTargetPatch.cs

@@ -1,4 +1,6 @@
-/*
+
+
+/*
 /// <summary>
 /// Allow Impostors to kill each other if can kill is enabled in gamemode or friendly fire is toggled on
 /// </summary>
@@ -14,11 +16,11 @@ public static class ImpostorTargetPatch
         {
             return true;
         }
-
+        
         __result = target is { Disconnected: false, IsDead: false } &&
                    target.PlayerId != __instance.Player.PlayerId && !(target.Role == null) &&
                    !(target.Object == null) && !target.Object.inVent && !target.Object.inMovingPlat;
         return false;
 
     }
-}*/
+}*/

MiraAPI/Patches/GameModes/MapBehaviourPatch.cs

@@ -1,4 +1,6 @@
-/*
+
+
+/*
 [HarmonyPatch(typeof(MapBehaviour))]
 public static class MapBehaviourPatch
 {
@@ -15,4 +17,4 @@ public static class MapBehaviourPatch
 
         return true;
     }
-}*/
+}*/

MiraAPI/Patches/GameModes/OnDeathPatch.cs

@@ -1,4 +1,6 @@
-/*
+
+
+/*
 [HarmonyPatch(typeof(KillAnimation))]
 public static class OnDeathPatch
 {
@@ -8,4 +10,4 @@ public static class OnDeathPatch
     {
         CustomGameModeManager.ActiveMode?.OnDeath(target);
     }
-}*/
+}*/

MiraAPI/Patches/GameModes/VentPatches.cs

@@ -1,7 +1,10 @@
-/*
+
+
+/*
 [HarmonyPatch(typeof(Vent))]
 public static class VentPatches
 {
+    
     [HarmonyPrefix]
     [HarmonyPatch(nameof(Vent.CanUse))]
     public static bool CanUseVentPatch(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
@@ -44,4 +47,5 @@ public static class VentPatches
 
         return false;
     }
-}*/
+    
+}*/

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -1,37 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Hud;
-
-namespace MiraAPI.Patches.Hud;
-
-/// <summary>
-/// Reset button patches.
-/// </summary>
-[HarmonyPatch]
-public static class ButtonResetPatches
-{
-    /// <summary>
-    /// Resets the cooldown and effect of all custom buttons when the meeting starts.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
-    public static void MeetingHudStartPostfix()
-    {
-        foreach (var customActionButton in CustomButtonManager.CustomButtons)
-        {
-            customActionButton.ResetCooldownAndOrEffect();
-        }
-    }
-
-    /// <summary>
-    /// Resets the cooldown and effect of all custom buttons after the exile screen is closed.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
-    public static void ExileControllerReEnableGameplayPostfix()
-    {
-        foreach (var customActionButton in CustomButtonManager.CustomButtons)
-        {
-            customActionButton.ResetCooldownAndOrEffect();
-        }
-    }
-}

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,19 +1,64 @@
 using HarmonyLib;
+using InnerNet;
 using MiraAPI.Hud;
+using MiraAPI.Roles;
 using Reactor.Utilities.Extensions;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches;
 
-/// <summary>
-/// General patches for the HudManager class.
-/// </summary>
 [HarmonyPatch(typeof(HudManager))]
 public static class HudManagerPatches
 {
-    // Custom buttons parent.
-    private static GameObject? _bottomLeft;
+    /// Custom buttons parent
+    private static GameObject _bottomLeft;
+
+    /// Custom role tab
+    private static TaskPanelBehaviour _roleTab;
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(HudManager.Update))]
+    public static void UpdatePostfix(HudManager __instance)
+    {
+        var local = PlayerControl.LocalPlayer;
+
+        if (AmongUsClient.Instance.GameState != InnerNetClient.GameStates.Started && !ShipStatus.Instance)
+        {
+            return;
+        }
+        
+        //CustomGameModeManager.ActiveMode?.HudUpdate(__instance);
+
+        if (local?.Data?.Role is null)
+        {
+            return;
+        }
+
+        if (local.Data.Role is ICustomRole customRole)
+        {
+            customRole.HudUpdate(__instance);
+
+            if (customRole.SetTabText() != null)
+            {
+                if (!_roleTab)
+                {
+                    _roleTab = CustomRoleManager.CreateRoleTab(customRole);
+                }
+                else
+                {
+                    CustomRoleManager.UpdateRoleTab(_roleTab, customRole);
+                }
+            }
+            else if (customRole.SetTabText() == null && _roleTab)
+            {
+                _roleTab.gameObject.Destroy();
+            }
+        }
+        else if (_roleTab)
+        {
+            _roleTab.gameObject.Destroy();
+        }
+    }
 
     /*
     /// <summary>
@@ -27,19 +72,16 @@ public static class HudManagerPatches
     }*/
 
     /// <summary>
-    /// Create custom buttons and arrange them on the hud.
+    /// Create custom buttons parent
     /// </summary>
-    /// <param name="__instance">The HudManager instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        var buttons = __instance.transform.Find("Buttons");
-        var bottomRight = buttons.Find("BottomRight");
-
-        if (_bottomLeft == null)
+        if (!_bottomLeft)
         {
-            _bottomLeft = Object.Instantiate(bottomRight.gameObject, buttons);
+            var buttons = __instance.transform.Find("Buttons");
+            _bottomLeft = Object.Instantiate(buttons.Find("BottomRight").gameObject, buttons);
         }
 
         foreach (var t in _bottomLeft.GetComponentsInChildren<ActionButton>(true))
@@ -56,19 +98,7 @@ public static class HudManagerPatches
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
-            var location = button.Location switch
-            {
-                ButtonLocation.BottomLeft => _bottomLeft.transform,
-                ButtonLocation.BottomRight => bottomRight,
-                _ => null,
-            };
-
-            if (location is null)
-            {
-                continue;
-            }
-
-            button.CreateButton(location);
+            button.CreateButton(_bottomLeft.transform);
         }
 
         gridArrange.Start();
@@ -78,25 +108,28 @@ public static class HudManagerPatches
     }
 
     /// <summary>
-    /// Set the custom buttons active when the hud is active.
+    /// Make sure all launchpad hud elements are inactive/active when appropriate
     /// </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)
+    public static void SetHudActivePostfix(HudManager __instance, [HarmonyArgument(0)] PlayerControl player, [HarmonyArgument(1)] RoleBehaviour roleBehaviour, [HarmonyArgument(2)] bool isActive)
     {
-        __instance.AdminButton.ToggleVisible(isActive && role.IsImpostor && GameOptionsManager.Instance.CurrentGameOptions.GameMode == AmongUs.GameOptions.GameModes.HideNSeek);
-        if (localPlayer.Data == null)
+        if (!player.Data)
         {
             return;
         }
 
-        foreach (var button in CustomButtonManager.CustomButtons)
+        if (_roleTab)
         {
-            button.SetActive(isActive, role);
+            _roleTab.gameObject.SetActive(isActive);
+        }
+
+        foreach (var button in CustomButtonManager.CustomButtons)
+            button.SetActive(isActive, roleBehaviour);
+
+        if (roleBehaviour is ICustomRole role)
+        {
+            __instance.ImpostorVentButton.gameObject.SetActive(isActive && role.CanUseVent);
         }
     }
-}
+}

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -19,38 +19,33 @@ public static class IntroCutscenePatches
             __instance.TeamTitle.text = $"<size=70%>{mode.Name}</size>\n<size=20%>{mode.Description}</size>";
         }
     }*/
-
+    
     [HarmonyPrefix]
     [HarmonyPatch(nameof(IntroCutscene.BeginCrewmate))]
     public static bool BeginCrewmatePatch(IntroCutscene __instance)
     {
-        if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole customRole)
+        if (PlayerControl.LocalPlayer.Data.Role is ICustomRole customRole)
         {
-            return true;
+            if (!customRole.IsNeutral)
+            {
+                return true;
+            }
+
+            var barTransform = __instance.BackgroundBar.transform;
+            var position = barTransform.position;
+            position.y -= 0.25f;
+            barTransform.position = position;
+
+            __instance.BackgroundBar.material.SetColor(ShaderID.Color, Color.gray);
+            __instance.TeamTitle.text = "OUTCAST";
+            __instance.impostorScale = 1f;
+            __instance.ImpostorText.text = "You are an Outcast. You do not have a team.";
+            __instance.TeamTitle.color = Color.gray;
+
+            __instance.ourCrewmate = __instance.CreatePlayer(0, Mathf.CeilToInt(7.5f), PlayerControl.LocalPlayer.Data, false);
+            return false;
         }
-
-        if (customRole.Team is not ModdedRoleTeams.Neutral)
-        {
-            return true;
-        }
-
-        var barTransform = __instance.BackgroundBar.transform;
-        var position = barTransform.position;
-        position.y -= 0.25f;
-        barTransform.position = position;
-
-        __instance.BackgroundBar.material.SetColor(ShaderID.Color, Color.gray);
-        __instance.TeamTitle.text = "NEUTRAL";
-        __instance.impostorScale = 1f;
-        __instance.ImpostorText.text = "You are Neutral. You do not have a team.";
-        __instance.TeamTitle.color = Color.gray;
-
-        __instance.ourCrewmate = __instance.CreatePlayer(
-            0,
-            Mathf.CeilToInt(7.5f),
-            PlayerControl.LocalPlayer.Data,
-            false);
-        return false;
+        return true;
     }
 
     /*
@@ -60,4 +55,4 @@ public static class IntroCutscenePatches
     {
         CustomGameModeManager.ActiveMode?.Initialize();
     }*/
-}
+}

MiraAPI/Patches/MeetingHudPatches.cs

@@ -0,0 +1,18 @@
+using HarmonyLib;
+using MiraAPI.Hud;
+
+namespace MiraAPI.Patches;
+
+[HarmonyPatch(typeof(MeetingHud))]
+public static class MeetingHudPatches
+{
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.VotingComplete))]
+    public static void VotingCompletePostfix()
+    {
+        foreach (var customActionButton in CustomButtonManager.CustomButtons)
+        {
+            customActionButton.ResetCooldown();
+        }
+    }
+}

MiraAPI/Patches/Modifiers/EndGameDidWinPatch.cs

@@ -1,40 +0,0 @@
-using System.Linq;
-using HarmonyLib;
-using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.Patches.Modifiers;
-
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CoEndGame))]
-public static class EndGameDidWinPatch
-{
-    public static void Prefix()
-    {
-        var gameOverReason = EndGameResult.CachedGameOverReason;
-        EndGameResult.CachedWinners.Clear();
-
-        var players = GameData.Instance.AllPlayers.ToArray();
-        for (var i = 0; i < GameData.Instance.PlayerCount; i++)
-        {
-            var networkedPlayerInfo = players[i];
-            if (networkedPlayerInfo == null)
-            {
-                continue;
-            }
-
-            var didWin = networkedPlayerInfo.Role.DidWin(gameOverReason);
-
-            var modifierWin = networkedPlayerInfo.Object?.GetModifierComponent()?.ActiveModifiers.OfType<GameModifier>()
-                .FirstOrDefault(x => x.DidWin(gameOverReason) != null)?.DidWin(gameOverReason);
-            if (modifierWin != null)
-            {
-                didWin = modifierWin.Value;
-            }
-
-            if (didWin)
-            {
-                EndGameResult.CachedWinners.Add(new CachedPlayerData(networkedPlayerInfo));
-            }
-        }
-    }
-}

MiraAPI/Patches/Options/CreateOptionsPatch.cs

@@ -1,16 +0,0 @@
-using HarmonyLib;
-using MiraAPI.GameOptions;
-
-namespace MiraAPI.Patches.Options;
-
-[HarmonyPatch(typeof(CreateOptionsPicker), nameof(CreateOptionsPicker.Start))]
-public static class CreateOptionsPatch
-{
-    public static void Postfix()
-    {
-        foreach (var (_, value) in ModdedOptionsManager.ModdedOptions)
-        {
-            value.ResetToConfig();
-        }
-    }
-}