mirror of
https://github.com/All-Of-Us-Mods/MiraAPI.git
synced 2026-10-20 01:46:15 +00:00
Only run gc when using v17.4
This commit is contained in:
1 parent
e3b0eb68c0
commit
3a5a397846
14 files changed
+154
-35
No files matched your search
@@ -138,7 +138,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
|
||||
internal void DestroyComponent(ModifierUiComponent component)
|
||||
{
|
||||
_modifiers.Remove(component.Modifier!);
|
||||
component.gameObject.FakeDestroy();
|
||||
component.gameObject.DeepDestroy();
|
||||
RefreshModifiers();
|
||||
}
|
||||
|
||||
@@ -208,7 +208,7 @@ public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
|
||||
continue;
|
||||
}
|
||||
|
||||
mod.Value.gameObject.FakeDestroy();
|
||||
mod.Value.gameObject.DeepDestroy();
|
||||
_modifiers.Remove(mod.Key);
|
||||
}
|
||||
|
||||
|
||||
@@ -276,7 +276,7 @@ public static class TaskAdderPatches
|
||||
__instance.transform.FindChild("TitleText_TMP")?.gameObject.DestroyImmediate();
|
||||
}
|
||||
|
||||
__instance.ActiveItems.ToArray().Do(x => x.gameObject.FakeDestroy());
|
||||
__instance.ActiveItems.ToArray().Do(x => x.gameObject.DeepDestroy());
|
||||
__instance.ActiveItems.Clear();
|
||||
|
||||
float num = 0f;
|
||||
|
||||
@@ -143,7 +143,7 @@ public static class HudManagerPatches
|
||||
|
||||
foreach (var t in BottomLeft.GetComponentsInChildren<ActionButton>(true))
|
||||
{
|
||||
t.gameObject.FakeDestroy();
|
||||
t.gameObject.DeepDestroy();
|
||||
}
|
||||
|
||||
var gridArrange = BottomLeft.GetComponent<GridArrange>();
|
||||
|
||||
@@ -92,9 +92,9 @@ public static class HatsTabPatches
|
||||
if (loadRoutine != null) Coroutines.Stop(loadRoutine);
|
||||
|
||||
hatIndex = 0;
|
||||
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.FakeDestroy();
|
||||
foreach (var instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy();
|
||||
__instance.ColorChips.Clear();
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.FakeDestroy());
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy());
|
||||
|
||||
var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using HarmonyLib;
|
||||
using MiraAPI.LocalSettings;
|
||||
using MiraAPI.Utilities.Assets;
|
||||
@@ -13,6 +14,8 @@ namespace MiraAPI.Patches.Menu;
|
||||
[HarmonyPatch(typeof(MainMenuManager))]
|
||||
public static class MainMenuManagerPatches
|
||||
{
|
||||
internal static bool NeedsDeepDestroy { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// A postifix on Awake to load all the addressables registered.
|
||||
/// </summary>
|
||||
@@ -20,6 +23,9 @@ public static class MainMenuManagerPatches
|
||||
[HarmonyPostfix]
|
||||
public static void AwakePostfix()
|
||||
{
|
||||
var requiredVersion = new Version(2026, 6, 5);
|
||||
var version = Version.Parse(Application.version);
|
||||
NeedsDeepDestroy = version >= requiredVersion;
|
||||
AddressablesLoader.LoadAll();
|
||||
Coroutines.Start(SetFps());
|
||||
}
|
||||
|
||||
@@ -81,9 +81,9 @@ public static class NameplatesTabPatches
|
||||
|
||||
private static void GenerateHats(NameplatesTab __instance, int page)
|
||||
{
|
||||
foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.FakeDestroy();
|
||||
foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy();
|
||||
__instance.ColorChips.Clear();
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.FakeDestroy());
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy());
|
||||
|
||||
var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
|
||||
|
||||
|
||||
@@ -83,9 +83,9 @@ public static class SkinsTabPatches
|
||||
|
||||
private static void GenerateHats(SkinsTab __instance, int page)
|
||||
{
|
||||
foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.FakeDestroy();
|
||||
foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy();
|
||||
__instance.ColorChips.Clear();
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.FakeDestroy());
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy());
|
||||
|
||||
var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
|
||||
|
||||
|
||||
@@ -81,9 +81,9 @@ public static class VisorsTabPatches
|
||||
|
||||
private static void GenerateHats(VisorsTab __instance, int page)
|
||||
{
|
||||
foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.FakeDestroy();
|
||||
foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.DeepDestroy();
|
||||
__instance.ColorChips.Clear();
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.FakeDestroy());
|
||||
__instance.scroller.Inner.GetComponentsInChildren<TextMeshPro>().Do(x => x.gameObject.DeepDestroy());
|
||||
|
||||
var groupNameText = __instance.GetComponentInChildren<TextMeshPro>(false);
|
||||
|
||||
|
||||
@@ -262,7 +262,7 @@ internal static class GamePresetsTabPatches
|
||||
iconSpriteRend.sprite = MiraAssets.RefreshIcon.LoadAsset();
|
||||
|
||||
Helpers.DivideSize(refreshButton.gameObject, 2f);
|
||||
refreshButton.buttonText.gameObject.FakeDestroy();
|
||||
refreshButton.buttonText.gameObject.DeepDestroy();
|
||||
|
||||
refreshButton.OnClick = new Button.ButtonClickedEvent();
|
||||
refreshButton.OnClick.AddListener((UnityAction)Refresh);
|
||||
|
||||
@@ -59,7 +59,7 @@ public static class RoleSettingMenuPatches
|
||||
{
|
||||
continue;
|
||||
}
|
||||
obj.FakeDestroy();
|
||||
obj.DeepDestroy();
|
||||
}
|
||||
Headers.Clear();
|
||||
foreach (var obj in RoleOptionSettings)
|
||||
@@ -68,7 +68,7 @@ public static class RoleSettingMenuPatches
|
||||
{
|
||||
continue;
|
||||
}
|
||||
obj.gameObject.FakeDestroy();
|
||||
obj.gameObject.DeepDestroy();
|
||||
}
|
||||
RoleOptionSettings.Clear();
|
||||
CurrentRole = null;
|
||||
@@ -218,9 +218,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.FakeDestroy();
|
||||
chanceLabel.FakeDestroy();
|
||||
countLabel.FakeDestroy();
|
||||
blankLabel.DeepDestroy();
|
||||
chanceLabel.DeepDestroy();
|
||||
countLabel.DeepDestroy();
|
||||
|
||||
categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
|
||||
categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
|
||||
@@ -309,7 +309,7 @@ public static class RoleSettingMenuPatches
|
||||
{
|
||||
continue;
|
||||
}
|
||||
obj.FakeDestroy();
|
||||
obj.DeepDestroy();
|
||||
}
|
||||
Headers.Clear();
|
||||
foreach (var obj in RoleOptionSettings)
|
||||
@@ -318,7 +318,7 @@ public static class RoleSettingMenuPatches
|
||||
{
|
||||
continue;
|
||||
}
|
||||
obj.gameObject.FakeDestroy();
|
||||
obj.gameObject.DeepDestroy();
|
||||
}
|
||||
RoleOptionSettings.Clear();
|
||||
__instance.SetQuotaTab();
|
||||
@@ -444,7 +444,7 @@ public static class RoleSettingMenuPatches
|
||||
{
|
||||
foreach (var optBehaviour in __instance.AdvancedRolesSettings.GetComponentsInChildren<OptionBehaviour>())
|
||||
{
|
||||
optBehaviour.gameObject.FakeDestroy();
|
||||
optBehaviour.gameObject.DeepDestroy();
|
||||
}
|
||||
|
||||
CurrentRole = role;
|
||||
@@ -640,7 +640,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.FakeDestroy();
|
||||
newButton.transform.FindChild("Text_TMP").gameObject.DeepDestroy();
|
||||
newButton.activeSprites.Destroy();
|
||||
|
||||
var btnRend = newButton.transform.FindChild("ButtonSprite").GetComponent<SpriteRenderer>();
|
||||
|
||||
@@ -73,7 +73,7 @@ public static class HudManagerPatches
|
||||
}
|
||||
else if (RoleTab != null)
|
||||
{
|
||||
RoleTab.gameObject.FakeDestroy();
|
||||
RoleTab.gameObject.DeepDestroy();
|
||||
RoleTab = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ public static class PresetManager
|
||||
{
|
||||
if (btn != null)
|
||||
{
|
||||
btn.FakeDestroy();
|
||||
btn.DeepDestroy();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ public class SavePresetPopup(nint cppPtr) : Minigame(cppPtr)
|
||||
// Cleanup holder object
|
||||
public void OnDestroy()
|
||||
{
|
||||
transform.parent.gameObject.FakeDestroy();
|
||||
transform.parent.gameObject.DeepDestroy();
|
||||
}
|
||||
|
||||
public override void Close()
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
@@ -7,9 +8,11 @@ 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;
|
||||
using TMPro;
|
||||
@@ -53,7 +56,7 @@ public static class Extensions
|
||||
bool isComplete;
|
||||
if (self.amClosing == Minigame.CloseState.Closing)
|
||||
{
|
||||
self.gameObject.FakeDestroy();
|
||||
self.gameObject.DeepDestroy();
|
||||
return;
|
||||
}
|
||||
if (self.CloseSound && Constants.ShouldPlaySfx())
|
||||
@@ -223,19 +226,129 @@ public static class Extensions
|
||||
/// Hides the object away rather than destroy it to prevent memory leaks.
|
||||
/// </summary>
|
||||
/// <param name="obj">The object to hide.</param>
|
||||
public static void FakeDestroy(this GameObject obj)
|
||||
public static void DeepDestroy(this GameObject obj, bool clearGc = true)
|
||||
{
|
||||
obj.hideFlags = HideFlags.HideAndDontSave;
|
||||
if (!toDestroyHolder)
|
||||
if (MainMenuManagerPatches.NeedsDeepDestroy)
|
||||
{
|
||||
toDestroyHolder = new GameObject("ToDestroyHolder");
|
||||
toDestroyHolder.gameObject.SetActive(false);
|
||||
Coroutines.Start(Nuke(obj, clearGc));
|
||||
}
|
||||
else
|
||||
{
|
||||
obj?.Destroy();
|
||||
}
|
||||
obj.transform.SetParent(toDestroyHolder.transform);
|
||||
obj.SetActive(false);
|
||||
}
|
||||
|
||||
private static GameObject toDestroyHolder;
|
||||
private static IEnumerator Nuke(GameObject? go, bool clearGc)
|
||||
{
|
||||
if (go == null)
|
||||
yield break;
|
||||
|
||||
try
|
||||
{
|
||||
go.transform.SetParent(null, false);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
go.SetActive(false);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
|
||||
foreach (var mb in go.GetComponentsInChildren<MonoBehaviour>(true))
|
||||
{
|
||||
if (mb == null)
|
||||
continue;
|
||||
|
||||
try
|
||||
{
|
||||
mb.StopAllCoroutines();
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
mb.enabled = false;
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var renderer in go.GetComponentsInChildren<Renderer>(true))
|
||||
{
|
||||
if (renderer == null)
|
||||
continue;
|
||||
|
||||
try
|
||||
{
|
||||
foreach (var mat in renderer.materials)
|
||||
{
|
||||
if (mat != null)
|
||||
UnityEngine.Object.Destroy(mat);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var filter in go.GetComponentsInChildren<MeshFilter>(true))
|
||||
{
|
||||
if (filter == null)
|
||||
continue;
|
||||
|
||||
try
|
||||
{
|
||||
var mesh = filter.mesh;
|
||||
if (mesh != null)
|
||||
UnityEngine.Object.Destroy(mesh);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
}
|
||||
|
||||
UnityEngine.Object.Destroy(go);
|
||||
yield return null;
|
||||
if (clearGc)
|
||||
{
|
||||
yield return CoFreeResources();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clears up the Garbage Collector manually if necessary.
|
||||
/// </summary>
|
||||
public static void ClearGarbageCollector()
|
||||
{
|
||||
if (!MainMenuManagerPatches.NeedsDeepDestroy)
|
||||
{
|
||||
return;
|
||||
}
|
||||
Coroutines.Start(CoFreeResources());
|
||||
}
|
||||
|
||||
private static IEnumerator CoFreeResources()
|
||||
{
|
||||
yield return Resources.UnloadUnusedAssets();
|
||||
|
||||
GC.Collect(0, GCCollectionMode.Forced, blocking: true);
|
||||
GC.WaitForPendingFinalizers();
|
||||
GC.Collect(0, GCCollectionMode.Forced, blocking: true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets a cache of player's vote data components to improve performance.
|
||||
|
||||
Reference in new issue
Block a user