Merge branch 'dev' into pr/95

This commit is contained in:
Atony committed 2026-07-23 19:27:45 -05:00
commit ca27188229
61 files changed
+205 -200

No files matched your search

+1 -2
View File
@@ -1,5 +1,4 @@
using System.Linq;
using BepInEx;
using BepInEx;
using BepInEx.Configuration;
using BepInEx.Unity.IL2CPP;
using HarmonyLib;
@@ -3,8 +3,6 @@ using MiraAPI.GameOptions;
using MiraAPI.GameOptions.Attributes;
using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using TMPro;
using UnityEngine;
namespace MiraAPI.Example.Options.Roles;
-1
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using Reactor.Utilities;
namespace MiraAPI.Events;
@@ -1,6 +1,4 @@
using MiraAPI.Voting;
namespace MiraAPI.Events.Vanilla.Meeting.Voting;
namespace MiraAPI.Events.Vanilla.Meeting.Voting;
/// <summary>
/// Event that is invoked after the local player successfully votes a player or skips. This event is not cancelable.
@@ -1,6 +1,4 @@
using MiraAPI.Voting;
namespace MiraAPI.Events.Vanilla.Meeting.Voting;
namespace MiraAPI.Events.Vanilla.Meeting.Voting;
/// <summary>
/// Event that is invoked before the local player confirms a vote on a player or when skipping. This event is cancelable.
-1
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Reactor.Utilities;
namespace MiraAPI.GameEnd;
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Reactor.Utilities;
namespace MiraAPI.GameModes;
+2 -2
View File
@@ -2,10 +2,8 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Il2CppInterop.Runtime.Attributes;
using MiraAPI.Modifiers;
using MiraAPI.Roles;
using TMPro;
using UnityEngine;
namespace MiraAPI.GameOptions;
@@ -70,6 +68,8 @@ public abstract class AbstractOptionGroup
internal bool AllOptionsHidden { get; set; }
internal CategoryHeaderMasked? Header { get; set; }
internal Coroutine? CreationCoroutine { get; set; }
}
/// <summary>
@@ -1,11 +1,9 @@
using System;
using BepInEx.Configuration;
using Il2CppInterop.Runtime.Attributes;
using MiraAPI.Networking;
using MiraAPI.PluginLoading;
using Reactor.Localization.Utilities;
using Reactor.Networking.Rpc;
using TMPro;
using UnityEngine;
namespace MiraAPI.GameOptions.OptionTypes;
-1
View File
@@ -7,7 +7,6 @@ using MiraAPI.LocalSettings;
using MiraAPI.Patches;
using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities;
using Rewired;
using TMPro;
using UnityEngine;
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
using System.Reflection;
using MiraAPI.Events.Mira;
using MiraAPI.PluginLoading;
using UnityEngine;
namespace MiraAPI.Hud;
-1
View File
@@ -1,6 +1,5 @@
using System.Linq;
using HarmonyLib;
using Reactor.Utilities.Extensions;
using UnityEngine;
namespace MiraAPI.Hud;
-1
View File
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Il2CppInterop.Runtime.Attributes;
using MiraAPI.Utilities;
using Reactor.Utilities;
using Rewired;
namespace MiraAPI.Keybinds;
-1
View File
@@ -1,5 +1,4 @@
using System.Globalization;
using Rewired;
namespace MiraAPI.Keybinds;
@@ -1,5 +1,4 @@
using System;
using BepInEx.Configuration;
namespace MiraAPI.LocalSettings.Attributes;
@@ -1,6 +1,5 @@
using System;
using MiraAPI.Utilities;
using Reactor.Localization.Utilities;
using Reactor.Utilities.Extensions;
using TMPro;
using UnityEngine;
@@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Reflection;
using BepInEx.Unity.IL2CPP;
using MiraAPI.GameOptions;
using Reactor.Utilities;
namespace MiraAPI.LocalSettings;
-1
View File
@@ -8,7 +8,6 @@ using MiraAPI.LocalSettings;
using MiraAPI.Modifiers.ModifierDisplay;
using MiraAPI.Modifiers.Types;
using MiraAPI.Patches.Roles;
using Reactor.Utilities;
using Reactor.Utilities.Attributes;
using UnityEngine;
@@ -4,7 +4,6 @@ using System.Linq;
using HarmonyLib;
using Il2CppInterop.Runtime.Attributes;
using MiraAPI.LocalSettings;
using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities.Attributes;
using Reactor.Utilities.Extensions;
@@ -138,7 +137,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
internal void DestroyComponent(ModifierUiComponent component)
{
_modifiers.Remove(component.Modifier!);
component.gameObject.DeepDestroy();
component.gameObject.Destroy();
RefreshModifiers();
}
@@ -208,7 +207,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
continue;
}
mod.Value.gameObject.DeepDestroy();
mod.Value.gameObject.Destroy();
_modifiers.Remove(mod.Key);
}
-1
View File
@@ -5,7 +5,6 @@ using MiraAPI.Networking;
using MiraAPI.Networking.Modifiers;
using Reactor.Networking.Attributes;
using Reactor.Networking.Rpc;
using Reactor.Utilities;
namespace MiraAPI.Modifiers;
-1
View File
@@ -6,7 +6,6 @@ using MiraAPI.Modifiers.Types;
using MiraAPI.PluginLoading;
using MiraAPI.Roles;
using MiraAPI.Utilities;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using Random = System.Random;
-1
View File
@@ -1,5 +1,4 @@
using System;
using Reactor.Utilities;
using UnityEngine;
namespace MiraAPI.Modifiers.Types;
-1
View File
@@ -4,7 +4,6 @@ using InnerNet;
using MiraAPI.GameEnd;
using Reactor.Networking.Attributes;
using Reactor.Networking.Rpc;
using Reactor.Utilities;
namespace MiraAPI.Networking;
-3
View File
@@ -10,9 +10,6 @@ using MiraAPI.Events.Vanilla.Gameplay;
using MiraAPI.Utilities;
using Reactor.Networking.Attributes;
using Reactor.Networking.Rpc;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using Rewired;
using UnityEngine;
using Object = UnityEngine.Object;
@@ -4,7 +4,6 @@ using InnerNet;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Meeting;
using MiraAPI.Utilities;
using Reactor.Utilities;
namespace MiraAPI.Patches.Events;
@@ -1,9 +1,7 @@
using System.Linq;
using AmongUs.GameOptions;
using AmongUs.GameOptions;
using HarmonyLib;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Gameplay;
using MiraAPI.Events.Vanilla.Usables;
namespace MiraAPI.Patches.Events;
@@ -1,6 +1,5 @@
using HarmonyLib;
using MiraAPI.Hud;
using Reactor.Utilities;
namespace MiraAPI.Patches.Hud;
+1 -1
View File
@@ -148,7 +148,7 @@ public static class HudManagerPatches
foreach (var t in BottomLeft.GetComponentsInChildren<ActionButton>(true))
{
t.gameObject.DeepDestroy(false);
t.gameObject.Destroy();
}
Utilities.Extensions.ClearGarbageCollector();
+1 -3
View File
@@ -1,12 +1,10 @@
using System.Linq;
using System.Reflection;
using System.Reflection;
using HarmonyLib;
using Il2CppInterop.Runtime.InteropTypes;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Gameplay;
using MiraAPI.Roles;
using MiraAPI.Utilities;
using Reactor.Utilities;
namespace MiraAPI.Patches;
@@ -1,13 +1,8 @@
using System.Linq;
using HarmonyLib;
using MiraAPI.Keybinds;
using MiraAPI.LocalSettings;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using Rewired.UI.ControlMapper;
using TMPro;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.UI;
namespace MiraAPI.Patches.Keybinds;
@@ -1,6 +1,5 @@
using HarmonyLib;
using MiraAPI.Keybinds;
using MonoMod.Utils;
using Rewired;
namespace MiraAPI.Patches.Keybinds;
@@ -3,7 +3,6 @@ using System.Linq;
using HarmonyLib;
using MiraAPI.LocalSettings;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using UnityEngine;
using UnityEngine.Events;
+1 -1
View File
@@ -100,7 +100,7 @@ public static class HatsTabPatches
if (loadRoutine != null) Coroutines.Stop(loadRoutine);
hatIndex = 0;
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy(false);
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
__instance.ColorChips.Clear();
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy(false));
+1 -1
View File
@@ -81,7 +81,7 @@ public static class NameplatesTabPatches
private static void GenerateHats(NameplatesTab __instance, int page)
{
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy(false);
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
__instance.ColorChips.Clear();
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy(false));
+1 -1
View File
@@ -83,7 +83,7 @@ public static class SkinsTabPatches
private static void GenerateHats(SkinsTab __instance, int page)
{
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy(false);
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
__instance.ColorChips.Clear();
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy(false));
+1 -1
View File
@@ -80,7 +80,7 @@ public static class VisorsTabPatches
private static void GenerateHats(VisorsTab __instance, int page)
{
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy(false);
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
__instance.ColorChips.Clear();
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy(false));
+35 -23
View File
@@ -1,8 +1,8 @@
using System;
using System.Collections;
using System.Linq;
using AmongUs.GameOptions;
using BepInEx.Unity.IL2CPP.Utils.Collections;
using HarmonyLib;
using Il2CppInterop.Runtime.Attributes;
using MiraAPI.GameOptions;
using MiraAPI.Modifiers;
using MiraAPI.Presets;
@@ -81,9 +81,9 @@ internal static class GameOptionsMenuPatch
__instance.scrollBar.SetYBoundsMax(-num - 1.65f);
}
private static void UpdateGroup(AbstractOptionGroup group, ref float num)
private static void UpdateGroup(AbstractOptionGroup? group, ref float num)
{
if (group.Options.Count == 0 || group.Header is null)
if (group is null || group.Options.Count == 0 || group.Header is null || group.CreationCoroutine is not null)
{
return;
}
@@ -109,7 +109,7 @@ internal static class GameOptionsMenuPatch
{
var newOpt = opt.OptionBehaviour;
if (newOpt is null)
if (!newOpt || newOpt == null)
{
continue;
}
@@ -178,7 +178,8 @@ internal static class GameOptionsMenuPatch
private static void ModifiersUpdate(ref float num)
{
var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
.Where(x => x.ParentMenu is MenuCategory.Modifiers || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
.Where(x => x.ParentMenu is MenuCategory.Modifiers ||
x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
foreach (var modGroup in groups)
{
@@ -189,7 +190,8 @@ internal static class GameOptionsMenuPatch
private static void ModifiersCreate(GameOptionsMenu menu)
{
var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
.Where(x => x.ParentMenu is MenuCategory.Modifiers || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
.Where(x => x.ParentMenu is MenuCategory.Modifiers ||
x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
foreach (var group in groups)
{
CreateGroup(menu, group);
@@ -208,20 +210,17 @@ internal static class GameOptionsMenuPatch
__instance.MapPicker.gameObject.SetActive(false);
if (__instance.name == "MODIFIERS TAB")
switch (__instance.name)
{
ModifiersCreate(__instance);
return false;
}
else if (__instance.name == "CUSTOM TAB 1")
{
CustomMenuOneCreate(__instance);
return false;
}
else if (__instance.name == "CUSTOM TAB 2")
{
CustomMenuTwoCreate(__instance);
return false;
case "MODIFIERS TAB":
ModifiersCreate(__instance);
return false;
case "CUSTOM TAB 1":
CustomMenuOneCreate(__instance);
return false;
case "CUSTOM TAB 2":
CustomMenuTwoCreate(__instance);
return false;
}
var filteredGroups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
@@ -271,7 +270,7 @@ internal static class GameOptionsMenuPatch
return false;
}
private static void CreateGroup(GameOptionsMenu menu, AbstractOptionGroup group)
private static IEnumerator CoCreateGroup(GameOptionsMenu menu, AbstractOptionGroup group)
{
var categoryHeaderMasked = Object.Instantiate(
menu.categoryHeaderOrigin,
@@ -318,7 +317,7 @@ internal static class GameOptionsMenuPatch
defaultPreset = preset;
}
foreach (var newOpt in options)
yield return options.CoLoopWithBudget(newOpt =>
{
newOpt.SetClickMask(menu.ButtonClickMask);
@@ -421,6 +420,7 @@ internal static class GameOptionsMenuPatch
defaultPreset!.ResetOption(strOpt);
}));
}
if (!defaultPreset!.IsOptionInPreset(newOpt))
{
resetBtn.Destroy();
@@ -428,7 +428,7 @@ internal static class GameOptionsMenuPatch
newOpt.Initialize();
newOpt.gameObject.SetActive(false);
}
}).WrapToIl2Cpp();
var boxCol = categoryHeaderMasked.gameObject.AddComponent<BoxCollider2D>();
boxCol.size = new Vector2(7, 0.7f);
@@ -447,5 +447,17 @@ internal static class GameOptionsMenuPatch
: "<size=70%>(Click to close)</size>";
}));
headerBtn.SetButtonEnableState(true);
group.CreationCoroutine = null;
}
private static void CreateGroup(GameOptionsMenu menu, AbstractOptionGroup group)
{
if (group.CreationCoroutine != null)
{
GameSettingMenu.Instance.StopCoroutine(group.CreationCoroutine);
}
group.CreationCoroutine = GameSettingMenu.Instance.StartCoroutine(CoCreateGroup(menu, group).WrapToIl2Cpp());
}
}
@@ -8,7 +8,6 @@ using MiraAPI.Presets;
using MiraAPI.Roles;
using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using TMPro;
using UnityEngine;
@@ -262,7 +261,7 @@ internal static class GamePresetsTabPatches
iconSpriteRend.sprite = MiraAssets.RefreshIcon.LoadAsset();
Helpers.DivideSize(refreshButton.gameObject, 2f);
refreshButton.buttonText.gameObject.DeepDestroy();
refreshButton.buttonText.gameObject.Destroy();
refreshButton.OnClick = new Button.ButtonClickedEvent();
refreshButton.OnClick.AddListener((UnityAction)Refresh);
@@ -419,6 +419,8 @@ internal static class GameSettingMenuPatches
_customTwoButton!.transform.localPosition = _customTwoBtnOgPos;
menu.RoleSettingsButton.transform.localPosition = _roleBtnOgPos;
CleanupTab(settings, roles);
if (SelectedModIdx != 0)
{
_customOneButton.buttonText.text = SelectedMod!.MiraPlugin.CustomOptionMenuNameOne;
@@ -560,8 +562,6 @@ internal static class GameSettingMenuPatches
{
menu.ChangeTab(0, false);
}
CleanupTab(settings, roles);
}
private static void ClearOptions(Il2CppSystem.Collections.Generic.List<OptionBehaviour> options)
@@ -606,6 +606,8 @@ internal static class GameSettingMenuPatches
CleanupSettings(_customTwoTab, MenuCategory.CustomTwo);
}
Utilities.Extensions.ClearGarbageCollector();
void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
{
if (rolesMenu.advancedSettingChildren != null)
@@ -1,8 +1,6 @@
using System.Linq;
using HarmonyLib;
using Il2CppSystem;
using MiraAPI.Roles;
using Object = Il2CppSystem.Object;
namespace MiraAPI.Patches.Options;
+1 -4
View File
@@ -1,9 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using HarmonyLib;
using HarmonyLib;
using Il2CppSystem;
using MiraAPI.GameOptions;
using MiraAPI.GameOptions.OptionTypes;
using MiraAPI.Roles;
using MiraAPI.Utilities;
using UnityEngine;
@@ -1,12 +1,8 @@
using System;
using System.Linq;
using System.Linq;
using HarmonyLib;
using MiraAPI.GameOptions;
using MiraAPI.GameOptions.OptionTypes;
using MiraAPI.Utilities;
using Reactor.Utilities;
using UnityEngine;
using Object = Il2CppSystem.Object;
namespace MiraAPI.Patches.Options;
+103 -71
View File
@@ -1,9 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using AmongUs.GameOptions;
using BepInEx.Unity.IL2CPP.Utils.Collections;
using HarmonyLib;
using Il2CppInterop.Runtime.InteropTypes.Arrays;
using MiraAPI.GameOptions;
using MiraAPI.Networking;
using MiraAPI.Roles;
@@ -11,7 +12,6 @@ using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using Reactor.Localization.Utilities;
using Reactor.Networking.Rpc;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using TMPro;
using UnityEngine;
@@ -49,9 +49,7 @@ public static class RoleSettingMenuPatches
__instance.scrollBar.SetScrollBounds(__instance);
}
[HarmonyPrefix]
[HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
private static IEnumerator CoQuotaTabPatch(RolesSettingsMenu roleMenu)
{
foreach (var obj in Headers)
{
@@ -59,8 +57,10 @@ public static class RoleSettingMenuPatches
{
continue;
}
obj.DeepDestroy(false);
obj.Destroy();
}
Headers.Clear();
foreach (var obj in RoleOptionSettings)
{
@@ -68,24 +68,26 @@ public static class RoleSettingMenuPatches
{
continue;
}
obj.gameObject.DeepDestroy(false);
obj.gameObject.Destroy();
}
RoleOptionSettings.Clear();
CurrentRole = null;
CurrentRoleOptions = null;
__instance.roleChances = new Il2CppSystem.Collections.Generic.List<RoleOptionSetting>();
__instance.advancedSettingChildren = new Il2CppSystem.Collections.Generic.List<OptionBehaviour>();
roleMenu.roleChances = new Il2CppSystem.Collections.Generic.List<RoleOptionSetting>();
roleMenu.advancedSettingChildren = new Il2CppSystem.Collections.Generic.List<OptionBehaviour>();
var maskBg = __instance.scrollBar.transform.FindChild("MaskBg");
var hitbox = __instance.scrollBar.transform.FindChild("Hitbox");
var dividerImage = __instance.transform.FindChild("HeaderButtons/DividerImage");
var maskBg = roleMenu.scrollBar.transform.FindChild("MaskBg");
var hitbox = roleMenu.scrollBar.transform.FindChild("Hitbox");
var dividerImage = roleMenu.transform.FindChild("HeaderButtons/DividerImage");
if (GameSettingMenuPatches.SelectedModIdx == 0)
{
__instance.AllButton.transform.parent.gameObject.SetActive(true);
__instance.AllButton.gameObject.SetActive(true);
__instance.scrollBar.transform.localPosition = new Vector3(-1.4957f, 0.657f, -4);
roleMenu.AllButton.transform.parent.gameObject.SetActive(true);
roleMenu.AllButton.gameObject.SetActive(true);
roleMenu.scrollBar.transform.localPosition = new Vector3(-1.4957f, 0.657f, -4);
maskBg.localPosition = new Vector3(1.5353f, -.5734f, -.1f);
maskBg.localScale = new Vector3(6.6811f, 3.3563f, 0.5598f);
hitbox.localPosition = new Vector3(0.3297f, -.2333f, 4f);
@@ -94,67 +96,70 @@ public static class RoleSettingMenuPatches
var num = 0.662f;
var list = CustomRoleManager.AllRoles.Where(
r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
r.Role != RoleTypes.CrewmateGhost).ToList();
var list2 = CustomRoleManager.AllRoles.Where(
r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
r.Role != RoleTypes.ImpostorGhost).ToList();
var list = CustomRoleManager.AllRoles.Where(r =>
!r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Crewmate &&
r.Role != RoleTypes.Crewmate &&
r.Role != RoleTypes.CrewmateGhost).ToList();
var list2 = CustomRoleManager.AllRoles.Where(r =>
!r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Impostor &&
r.Role != RoleTypes.Impostor &&
r.Role != RoleTypes.ImpostorGhost).ToList();
if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
if (roleMenu.roleTabs == null || roleMenu.roleTabs.Count == 0)
{
var num2 = -1.928f;
__instance.roleTabs = new();
__instance.roleTabs.Add(__instance.AllButton);
roleMenu.roleTabs = new();
roleMenu.roleTabs.Add(roleMenu.AllButton);
foreach (var t in list)
{
__instance.AddRoleTab(t, ref num2);
roleMenu.AddRoleTab(t, ref num2);
}
foreach (var t in list2)
{
__instance.AddRoleTab(t, ref num2);
roleMenu.AddRoleTab(t, ref num2);
}
}
var categoryHeaderEditRole = Object.Instantiate(
__instance.categoryHeaderEditRoleOrigin,
roleMenu.categoryHeaderEditRoleOrigin,
Vector3.zero,
Quaternion.identity,
__instance.RoleChancesSettings.transform);
roleMenu.RoleChancesSettings.transform);
categoryHeaderEditRole.SetHeader(StringNames.CrewmateRolesHeader, 20);
categoryHeaderEditRole.transform.localPosition = new Vector3(4.986f, num, -2f);
num -= 0.522f;
var num3 = 0;
foreach (var t in list)
{
__instance.CreateQuotaOption(t, ref num, num3);
roleMenu.CreateQuotaOption(t, ref num, num3);
num3++;
}
num -= 0.22f;
var categoryHeaderEditRole2 = Object.Instantiate(
__instance.categoryHeaderEditRoleOrigin,
roleMenu.categoryHeaderEditRoleOrigin,
Vector3.zero,
Quaternion.identity,
__instance.RoleChancesSettings.transform);
roleMenu.RoleChancesSettings.transform);
categoryHeaderEditRole2.SetHeader(StringNames.ImpostorRolesHeader, 20);
categoryHeaderEditRole2.transform.localPosition = new Vector3(4.986f, num, -2f);
num -= 0.522f;
foreach (var t in list2)
{
__instance.CreateQuotaOption(t, ref num, num3);
roleMenu.CreateQuotaOption(t, ref num, num3);
num3++;
}
return false;
Info($"Created {num3} role options for the default game.");
yield return null;
}
ScrollerNum = 0.522f;
__instance.AllButton.transform.parent.gameObject.SetActive(false);
__instance.AllButton.gameObject.SetActive(false);
__instance.scrollBar.transform.localPosition = new Vector3(-1.4957f, 1.5261f, -4);
roleMenu.AllButton.transform.parent.gameObject.SetActive(false);
roleMenu.AllButton.gameObject.SetActive(false);
roleMenu.scrollBar.transform.localPosition = new Vector3(-1.4957f, 1.5261f, -4);
maskBg.localPosition = new Vector3(1.5353f, -1.0607f, -.1f);
maskBg.localScale = new Vector3(6.6811f, 4.1563f, 0.5598f);
hitbox.localPosition = new Vector3(0.3297f, -.6333f, 4f);
@@ -168,7 +173,8 @@ public static class RoleSettingMenuPatches
if (roleGroups is null)
{
return false;
Error("No role groups found for the selected mod.");
yield break;
}
// sort the groups by priority
@@ -176,13 +182,14 @@ public static class RoleSettingMenuPatches
.OrderBy(x => x.Key.Priority)
.ThenBy(x => x.Key.Name);
var quotaThing = __instance.categoryHeaderEditRoleOrigin.transform.FindChild("QuotaHeader");
var quotaThing = roleMenu.categoryHeaderEditRoleOrigin.transform.FindChild("QuotaHeader");
var usingNewQuota = false;
var template = __instance.transform.parent.parent.GetComponent<GameSettingMenu>().GameSettingsTab.categoryHeaderOrigin;
var template = roleMenu.transform.parent.parent.GetComponent<GameSettingMenu>().GameSettingsTab
.categoryHeaderOrigin;
foreach (var grouping in sortedRoleGroups)
{
if (!grouping.Any() || grouping.All(x=> x.Configuration.HideSettings || !x.VisibleInSettings()))
if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings || !x.VisibleInSettings()))
{
continue;
}
@@ -202,7 +209,7 @@ public static class RoleSettingMenuPatches
template,
Vector3.zero,
Quaternion.identity,
__instance.RoleChancesSettings.transform);
roleMenu.RoleChancesSettings.transform);
categoryHeaderMasked.SetHeader(name, 20);
@@ -221,9 +228,9 @@ public static class RoleSettingMenuPatches
var blankLabel = quotaInst.transform.FindChild("BlankLabel").gameObject;
var chanceLabel = quotaInst.transform.FindChild("Chance Label").gameObject;
var countLabel = quotaInst.transform.FindChild("# Label").gameObject;
blankLabel.DeepDestroy(false);
chanceLabel.DeepDestroy(false);
countLabel.DeepDestroy(false);
blankLabel.Destroy();
chanceLabel.Destroy();
countLabel.Destroy();
usingNewQuota = true;
quotaThing = quotaInst;
}
@@ -245,19 +252,23 @@ public static class RoleSettingMenuPatches
categoryHeaderMasked.Background.color = Palette.ImpostorRoleHeaderRed;
break;
default:
categoryHeaderMasked.Title.color = group.Color.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.Color.FindAlternateColor();
categoryHeaderMasked.Title.color = group.Color.Equals(MiraApiPlugin.DefaultHeaderColor)
? Color.white
: group.Color.FindAlternateColor();
categoryHeaderMasked.Divider.color = group.Color;
categoryHeaderMasked.Background.color = group.Color;
break;
}
categoryHeaderMasked.Title.fontStyle = __instance.categoryHeaderEditRoleOrigin.Title.fontStyle;
categoryHeaderMasked.Title.font = __instance.categoryHeaderEditRoleOrigin.Title.font;
categoryHeaderMasked.Title.fontMaterial = __instance.categoryHeaderEditRoleOrigin.Title.fontMaterial;
categoryHeaderMasked.Title.fontStyle = roleMenu.categoryHeaderEditRoleOrigin.Title.fontStyle;
categoryHeaderMasked.Title.font = roleMenu.categoryHeaderEditRoleOrigin.Title.font;
categoryHeaderMasked.Title.fontMaterial = roleMenu.categoryHeaderEditRoleOrigin.Title.fontMaterial;
categoryHeaderMasked.Divider.color = categoryHeaderMasked.Background.color;
categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.55f, -0.1833f, 0);
categoryHeaderMasked.Background.size = new Vector2(categoryHeaderMasked.Background.size.x + 1.5f, categoryHeaderMasked.Background.size.y);
categoryHeaderMasked.Background.size = new Vector2(
categoryHeaderMasked.Background.size.x + 1.5f,
categoryHeaderMasked.Background.size.y);
categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f;
categoryHeaderMasked.transform.localPosition = new Vector3(-0.44f, ScrollerNum, -2f);
@@ -277,20 +288,21 @@ public static class RoleSettingMenuPatches
if (!RoleGroupHidden[group])
{
foreach (var role in grouping)
{
if (role is not RoleBehaviour roleBehaviour)
yield return
grouping.CoLoopWithBudget(role =>
{
continue;
}
if (role is not RoleBehaviour roleBehaviour)
{
return;
}
var option = CreateQuotaOption(__instance, roleBehaviour, num4);
if (option is not null)
{
RoleOptionSettings.Add(option);
num4++;
}
}
var option = CreateQuotaOption(roleMenu, roleBehaviour, num4);
if (option is not null)
{
RoleOptionSettings.Add(option);
num4++;
}
});
}
var boxCol = categoryHeaderMasked.gameObject.AddComponent<BoxCollider2D>();
@@ -298,25 +310,28 @@ public static class RoleSettingMenuPatches
boxCol.offset = new Vector2(1.5f, -0.3f);
var headerBtn = categoryHeaderMasked.gameObject.AddComponent<PassiveButton>();
headerBtn.ClickSound = __instance.BackButton.GetComponent<PassiveButton>().ClickSound;
headerBtn.ClickSound = roleMenu.BackButton.GetComponent<PassiveButton>().ClickSound;
headerBtn.OnMouseOver = new UnityEvent();
headerBtn.OnMouseOut = new UnityEvent();
headerBtn.OnClick.AddListener(
(UnityAction)(() =>
{
RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
RolePositions[GameSettingMenuPatches.SelectedModIdx] = roleMenu.scrollBar.Inner.localPosition;
if (RoleGroupHidden.TryGetValue(group, out var groupHidden))
{
RoleGroupHidden[group] = !groupHidden;
}
foreach (var obj in Headers)
{
if (!obj)
{
continue;
}
obj.DeepDestroy(false);
obj.Destroy();
}
Headers.Clear();
foreach (var obj in RoleOptionSettings)
{
@@ -324,10 +339,12 @@ public static class RoleSettingMenuPatches
{
continue;
}
obj.gameObject.DeepDestroy(false);
obj.gameObject.Destroy();
}
RoleOptionSettings.Clear();
__instance.SetQuotaTab();
roleMenu.SetQuotaTab();
}));
headerBtn.SetButtonEnableState(true);
@@ -337,7 +354,22 @@ public static class RoleSettingMenuPatches
}
}
__instance.scrollBar.SetScrollBounds(__instance);
roleMenu.scrollBar.SetScrollBounds(roleMenu);
_quotaTabCoroutine = null;
}
private static Coroutine? _quotaTabCoroutine;
[HarmonyPrefix]
[HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
{
if (_quotaTabCoroutine != null)
{
GameSettingMenu.Instance.StopCoroutine(_quotaTabCoroutine);
}
_quotaTabCoroutine = GameSettingMenu.Instance.StartCoroutine(CoQuotaTabPatch(__instance).WrapToIl2Cpp());
return false;
}
@@ -362,6 +394,7 @@ public static class RoleSettingMenuPatches
}
[HarmonyPrefix]
// TODO: turn this into a fixed update
[HarmonyPatch(nameof(RolesSettingsMenu.Update))]
public static bool UpdatePatch(RolesSettingsMenu __instance)
{
@@ -449,7 +482,7 @@ public static class RoleSettingMenuPatches
{
foreach (var optBehaviour in __instance.AdvancedRolesSettings.GetComponentsInChildren<OptionBehaviour>())
{
optBehaviour.gameObject.DeepDestroy(false);
optBehaviour.gameObject.Destroy();
}
CurrentRole = role;
@@ -461,8 +494,6 @@ public static class RoleSettingMenuPatches
.SelectMany(x => x.Options)
.ToList() ?? [];
CurrentRoleOptions = filteredOptions;
foreach (var option in filteredOptions)
{
var newOpt = option.CreateOption(
@@ -493,6 +524,7 @@ public static class RoleSettingMenuPatches
newOpt.Initialize();
}
CurrentRoleOptions = filteredOptions;
__instance.scrollBar.ScrollToTop();
}
@@ -645,7 +677,7 @@ public static class RoleSettingMenuPatches
var newButton = Object.Instantiate(roleOptionSetting.buttons[0], roleOptionSetting.transform);
newButton.name = "ConfigButton";
newButton.transform.localPosition = new Vector3(0.4473f, -0.3f, -2f);
newButton.transform.FindChild("Text_TMP").gameObject.DeepDestroy();
newButton.transform.FindChild("Text_TMP").gameObject.Destroy();
newButton.activeSprites.Destroy();
var btnRend = newButton.transform.FindChild("ButtonSprite").GetComponent<SpriteRenderer>();
-1
View File
@@ -8,7 +8,6 @@ using MiraAPI.Hud;
using MiraAPI.Modifiers;
using MiraAPI.Utilities;
using MiraAPI.Voting;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
namespace MiraAPI.Patches;
+1 -2
View File
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq;
using AmongUs.GameOptions;
using HarmonyLib;
using MiraAPI.Roles;
+1 -3
View File
@@ -1,9 +1,7 @@
using HarmonyLib;
using InnerNet;
using MiraAPI.Roles;
using MiraAPI.Utilities;
using Reactor.Utilities.Extensions;
using UnityEngine;
namespace MiraAPI.Patches.Roles;
@@ -73,7 +71,7 @@ public static class HudManagerPatches
}
else if (RoleTab != null)
{
RoleTab.gameObject.DeepDestroy();
RoleTab.gameObject.Destroy();
RoleTab = null;
}
}
@@ -1,7 +1,6 @@
using System.Linq;
using AmongUs.GameOptions;
using HarmonyLib;
using InnerNet;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Gameplay;
using MiraAPI.Modifiers;
@@ -2,7 +2,6 @@
using HarmonyLib;
using Il2CppSystem.Collections.Generic;
using MiraAPI.Roles;
using Reactor.Utilities;
namespace MiraAPI.Patches.Roles;
-1
View File
@@ -1,6 +1,5 @@
using System.Linq;
using HarmonyLib;
using Reactor.Utilities;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.SceneManagement;
-1
View File
@@ -1,4 +1,3 @@
using System.Linq;
using HarmonyLib;
using MiraAPI.Utilities.Assets;
using TMPro;
@@ -7,7 +7,6 @@ using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Meeting.Voting;
using MiraAPI.Utilities;
using MiraAPI.Voting;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using UnityEngine;
-1
View File
@@ -5,7 +5,6 @@ using BepInEx.Configuration;
using MiraAPI.GameModes;
using MiraAPI.GameOptions;
using MiraAPI.Hud;
using MiraAPI.LocalSettings;
using MiraAPI.Modifiers;
using MiraAPI.Presets;
+2 -3
View File
@@ -4,8 +4,7 @@ using System.Linq;
using BepInEx.Configuration;
using MiraAPI.PluginLoading;
using MiraAPI.Roles;
using MiraAPI.Utilities;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using UnityEngine;
namespace MiraAPI.Presets;
@@ -62,7 +61,7 @@ public static class PresetManager
{
if (btn != null)
{
btn.DeepDestroy();
btn.Destroy();
}
}
+1 -1
View File
@@ -26,7 +26,7 @@ public class SavePresetPopup(nint cppPtr) : Minigame(cppPtr)
// Cleanup holder object
public void OnDestroy()
{
transform.parent.gameObject.DeepDestroy();
transform.parent.gameObject.Destroy();
}
public override void Close()
-1
View File
@@ -11,7 +11,6 @@ using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using Reactor.Localization.Utilities;
using Reactor.Networking.Rpc;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using TMPro;
using UnityEngine;
-2
View File
@@ -4,8 +4,6 @@ using BepInEx.Configuration;
using MiraAPI.GameOptions;
using MiraAPI.Modifiers;
using MiraAPI.PluginLoading;
using Reactor.Utilities;
using TMPro;
using UnityEngine;
namespace MiraAPI.Roles;
@@ -1,5 +1,4 @@
using System;
using Reactor.Utilities;
using UnityEngine.AddressableAssets;
namespace MiraAPI.Utilities.Assets;
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Reactor.Utilities;
using UnityEngine.AddressableAssets;
namespace MiraAPI.Utilities.Assets;
+41 -10
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Reflection;
@@ -8,10 +9,8 @@ using System.Text.RegularExpressions;
using HarmonyLib;
using MiraAPI.GameOptions;
using MiraAPI.Networking;
using MiraAPI.Patches.Menu;
using MiraAPI.Roles;
using MiraAPI.Voting;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
using Rewired;
using Rewired.Data;
@@ -56,7 +55,7 @@ public static class Extensions
bool isComplete;
if (self.amClosing == Minigame.CloseState.Closing)
{
self.gameObject.DeepDestroy();
self.gameObject.Destroy();
return;
}
if (self.CloseSound && Constants.ShouldPlaySfx())
@@ -229,13 +228,44 @@ public static class Extensions
/// <param name="clearGc">Whether to run the garbage collector immediately.</param>
public static void DeepDestroy(this GameObject obj, bool clearGc = true)
{
if (MainMenuManagerPatches.NeedsDeepDestroy)
obj.Destroy();
}
/// <summary>
/// Runs a given action in a loop with a frame budget based on the current target frame rate. Once the budget is hit, the loop continues on the next frame.
/// </summary>
/// <param name="collection">The collection to iterate over.</param>
/// <param name="action">The action to perform on each item.</param>
/// <typeparam name="T">The type of the collection.</typeparam>
/// <returns>Coroutine.</returns>
public static IEnumerator CoLoopWithBudget<T>(this IEnumerable<T> collection, Action<T> action)
{
var fps = Application.targetFrameRate > 0 ? Application.targetFrameRate : 60;
long budget = 1 / (fps * 2); // default is half of current frame time.
yield return collection.CoLoopWithBudget(budget, action);
}
/// <summary>
/// Runs a given action in a loop with a given frame budget. Once the budget is hit, the loop continues on the next frame.
/// </summary>
/// <param name="collection">The collection to iterate over.</param>
/// <param name="frameBudget">The # of milliseconds to spend in the loop.</param>
/// <param name="action">The action to perform on each item.</param>
/// <typeparam name="T">The type of the collection.</typeparam>
/// <returns>Coroutine.</returns>
public static IEnumerator CoLoopWithBudget<T>(this IEnumerable<T> collection, long frameBudget, Action<T> action)
{
var timer = new Stopwatch();
timer.Start();
foreach (var item in collection)
{
Coroutines.Start(Nuke(obj, clearGc));
}
else
{
obj?.Destroy();
action(item);
if (timer.ElapsedMilliseconds > frameBudget)
{
timer.Restart();
yield return null;
}
}
}
@@ -336,7 +366,8 @@ public static class Extensions
public static void ClearGarbageCollector()
{
Resources.UnloadUnusedAssets();
GC.Collect();
Il2CppSystem.GC.Collect(0, Il2CppSystem.GCCollectionMode.Forced);
GC.Collect(0, GCCollectionMode.Forced);
}
/// <summary>
-2
View File
@@ -2,12 +2,10 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using AmongUs.GameOptions;
using HarmonyLib;
using Il2CppInterop.Runtime.InteropTypes.Arrays;
using MiraAPI.Roles;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities;
using Rewired;
using TMPro;
using UnityEngine;
-1
View File
@@ -5,7 +5,6 @@ using MiraAPI.Events.Vanilla.Meeting.Voting;
using MiraAPI.Networking;
using MiraAPI.Utilities;
using Reactor.Networking.Attributes;
using Reactor.Utilities;
namespace MiraAPI.Voting;