kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[LazyPrune] Moved to patching ObjectLoader directly, LoadedObject is not assigned when Spawnable is first enabled

Browse source
This commit is contained in:
NotAKidoS 2024-06-04 13:59:05 -05:00
parent 7f89a37aef
commit 601193694a
1 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

60
LazyPrune/Main.cs
View file

@ -1,5 +1,7 @@
using System.Reflection; using System.Reflection;
using ABI_RC.Core.EventSystem;
using ABI_RC.Core.IO; using ABI_RC.Core.IO;
using ABI_RC.Core.Networking.API.Responses;
using ABI_RC.Systems.GameEventSystem; using ABI_RC.Systems.GameEventSystem;
using ABI.CCK.Components; using ABI.CCK.Components;
using HarmonyLib; using HarmonyLib;
@ -28,30 +30,26 @@ public class LazyPrune : MelonMod
// listen for world load // listen for world load
CVRGameEventSystem.World.OnLoad.AddListener(OnWorldLoaded); CVRGameEventSystem.World.OnLoad.AddListener(OnWorldLoaded);
// listen for local avatar load/clear events // listen for local avatar bundle load
HarmonyInstance.Patch( HarmonyInstance.Patch(
typeof(CVRAvatar).GetMethod(nameof(CVRAvatar.Awake), typeof(CVRObjectLoader).GetMethod(nameof(CVRObjectLoader.InstantiateAvatarFromExistingPrefab),
BindingFlags.NonPublic | BindingFlags.Instance), // earliest callback BindingFlags.NonPublic | BindingFlags.Instance), // earliest callback
prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnObjectCreated), prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnInstantiateAvatarFromExistingPrefab),
BindingFlags.NonPublic | BindingFlags.Static))
);
HarmonyInstance.Patch(
typeof(CVRAvatar).GetMethod(nameof(CVRAvatar.OnDestroy),
BindingFlags.NonPublic | BindingFlags.Instance), // earliest callback
prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnObjectDestroyed),
BindingFlags.NonPublic | BindingFlags.Static)) BindingFlags.NonPublic | BindingFlags.Static))
); );
// listen for prop load/clear events // listen for prop bundle load
HarmonyInstance.Patch( HarmonyInstance.Patch(
typeof(CVRSpawnable).GetMethod(nameof(CVRSpawnable.OnEnable), typeof(CVRObjectLoader).GetMethod(nameof(CVRObjectLoader.InstantiateSpawnableFromExistingPrefab),
BindingFlags.NonPublic | BindingFlags.Instance), // earliest callback BindingFlags.NonPublic | BindingFlags.Instance), // earliest callback
prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnObjectCreated), prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnInstantiateSpawnableFromExistingPrefab),
BindingFlags.NonPublic | BindingFlags.Static)) BindingFlags.NonPublic | BindingFlags.Static))
); );
// listen for object destruction
HarmonyInstance.Patch( HarmonyInstance.Patch(
typeof(CVRSpawnable).GetMethod(nameof(CVRSpawnable.OnDestroy), typeof(CVRObjectLoader).GetMethod(nameof(CVRObjectLoader.CheckForDestruction),
BindingFlags.Public | BindingFlags.Instance), // earliest callback (why is this public?) BindingFlags.NonPublic | BindingFlags.Instance), // earliest callback
prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnObjectDestroyed), prefix: new HarmonyMethod(typeof(LazyPrune).GetMethod(nameof(OnObjectDestroyed),
BindingFlags.NonPublic | BindingFlags.Static)) BindingFlags.NonPublic | BindingFlags.Static))
); );
@ -59,6 +57,23 @@ public class LazyPrune : MelonMod
#region Game Events #region Game Events
// fucking dumb
private static void OnInstantiateAvatarFromExistingPrefab(string objectId, string instantiationTarget,
GameObject prefabObject,
ref CVRObjectLoader.LoadedObject loadedObject, string blockReason, AssetManagement.AvatarTags? avatarTags,
bool shouldFilter, bool isBlocked,
CompatibilityVersions compatibilityVersion)
{
OnObjectCreated(ref loadedObject);
}
private static void OnInstantiateSpawnableFromExistingPrefab(string objectId, string instantiationTarget,
GameObject prefabObject, CVRObjectLoader.LoadedObject loadedObject, AssetManagement.PropTags propTags,
CompatibilityVersions compatibilityVersion)
{
OnObjectCreated(ref loadedObject);
}
private static void OnWorldLoaded(string guid) private static void OnWorldLoaded(string guid)
{ {
if (_lastLoadedWorld != guid) if (_lastLoadedWorld != guid)
@ -71,7 +86,10 @@ public class LazyPrune : MelonMod
private static void OnObjectCreated(ref CVRObjectLoader.LoadedObject ___loadedObject) private static void OnObjectCreated(ref CVRObjectLoader.LoadedObject ___loadedObject)
{ {
if (___loadedObject == null) if (___loadedObject == null)
{
Logger.Error("Avatar/Prop created with no backed LoadedObject.");
return; // uhh return; // uhh
}
if (_loadedObjects.ContainsKey(___loadedObject)) if (_loadedObjects.ContainsKey(___loadedObject))
{ {
@ -83,19 +101,19 @@ public class LazyPrune : MelonMod
_loadedObjects.Add(___loadedObject, -1); // mark as ineligible for pruning _loadedObjects.Add(___loadedObject, -1); // mark as ineligible for pruning
} }
private static void OnObjectDestroyed(ref CVRObjectLoader.LoadedObject ___loadedObject) private static void OnObjectDestroyed(CVRObjectLoader.LoadedObject loadedObject)
{ {
if (___loadedObject == null) if (loadedObject == null)
{ {
Logger.Error("Avatar/Prop destroyed with no backed LoadedObject. This is bad."); Logger.Error("Avatar/Prop destroyed with no backed LoadedObject.");
return; // handled by AttemptPruneObject return; // handled by AttemptPruneObject
} }
if (___loadedObject.refCount > 2) if (loadedObject.refCount > 1)
return; // we added our own ref, so begin death count at 2 (decrements one more after this callback) return; // we added our own ref, so begin death count at 1 (we are the last one)
if (_loadedObjects.ContainsKey(___loadedObject)) if (_loadedObjects.ContainsKey(loadedObject))
_loadedObjects[___loadedObject] = Time.time + OBJECT_CACHE_TIMEOUT * 60f; _loadedObjects[loadedObject] = Time.time + OBJECT_CACHE_TIMEOUT * 60f;
} }
#endregion Game Events #endregion Game Events