aarov/BoneSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aaaaaa

Browse Source
This commit is contained in:
Aaro Varis
2025-03-07 16:42:45 +02:00
parent 84e3efe3e9
commit 54301cbf37
7 changed files with 100 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BoneSync/BoneSync.csproj
View File

@@ -89,6 +89,7 @@
<Compile Include="Data\Structs.cs" />
<Compile Include="Networking\Messages\DiscardSyncableMessage.cs" />
<Compile Include="Networking\Messages\GunSyncMessage.cs" />
<Compile Include="Patching\HolsterSlotPatches.cs" />
<Compile Include="Networking\Messages\MagazineSyncMessage.cs" />
<Compile Include="Networking\Messages\ObjectDamageMessage.cs" />
<Compile Include="Networking\Messages\ObjectSyncMessage.cs" />

48
BoneSync/Patching/HolsterSlotPatches.cs Normal file
View File

@@ -0,0 +1,48 @@
using BoneSync.Sync;
using BoneSync.Sync.Components;
using HarmonyLib;
using MelonLoader;
using StressLevelZero.Interaction;
using StressLevelZero.Props.Weapons;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
namespace BoneSync.Patching
{
internal class HolsterSlotPatches
{
[HarmonyPatch(typeof(HandWeaponSlotReciever), nameof(HandWeaponSlotReciever.MakeStatic))]
public static void StaticPatch(HandWeaponSlotReciever __instance)
{
MelonLogger.Msg("HandWeaponSlotReciever.MakeStatic: " + __instance.name);
InteractableHost interactableHost = __instance.m_WeaponHost;
if (interactableHost == null)
{
MelonLogger.Error("InteractableHost is null for " + __instance.transform.GetPath());
return;
}
Syncable syncable = ObjectSync.MakeOrGetSyncable(interactableHost);
syncable?.SetInHolster(true);
}
[HarmonyPatch(typeof(HandWeaponSlotReciever), nameof(HandWeaponSlotReciever.MakeDynamic))]
public static void DynamicPatch(HandWeaponSlotReciever __instance)
{
MelonLogger.Msg("HandWeaponSlotReciever.MakeDynamic: " + __instance.name);
InteractableHost interactableHost = __instance.m_WeaponHost;
if (interactableHost == null)
{
MelonLogger.Error("InteractableHost is null for " + __instance.transform.GetPath());
return;
}
Syncable syncable = ObjectSync.MakeOrGetSyncable(interactableHost);
syncable?.SetInHolster(false);
}
}
}

9
BoneSync/Patching/PoolPatches.cs
View File

@@ -134,10 +134,15 @@ namespace BoneSync.Patching
bool spawnNormally = BoneSync.lobby.IsHost || PoolBlacklist.IsClientSpawnPool(__instance.pool);
if (spawnNormally) return;
if (!spawnNormally) {
MelonCoroutines.Start(OnSpawnClient(__instance)); // block object from spawning
return;
}
if (syncable == null) return;
MelonLogger.Msg("Poolee.OnSpawn: " + __instance.gameObject.transform.GetPath() + " " + syncable.GetSyncId());
MelonCoroutines.Start(OnSpawnClient(__instance)); // block object from spawning
}

23
BoneSync/Sync/Components/SyncableBase.cs
View File

@@ -75,12 +75,20 @@ namespace BoneSync.Sync.Components
private ushort _syncId;
private float _lastSyncTime;
private bool _isInHolster;
private bool _attemptedRegister;
public bool Registered => _syncId != 0;
public bool isStale => Time.time - _lastSyncTime > 5f;
public bool isOwner => _ownerId == BoneSync.lobby.GetLocalId();
public void SetInHolster(bool val)
{
MelonLogger.Msg(transform.GetPath() + " hosterState:" + val);
_isInHolster = val;
FindAndUpdateComponents();
}
public bool IsHolding()
{
if (interactableManager)
@@ -119,7 +127,7 @@ namespace BoneSync.Sync.Components
private void CheckAutoSync()
{
bool shouldAutoSync = CheckIfShouldAutoSync();
bool shouldAutoSync = ShouldAutoSync();
if (shouldAutoSync && (BoneSync.lobby.IsHost || ClientSpawningAllowed()))
{
MelonLogger.Msg("AutoSyncing: " + transform.GetPath());
@@ -128,7 +136,10 @@ namespace BoneSync.Sync.Components
}
private IEnumerator _OnEnableCo()
{
yield return null; // wait a frame to make sure all components are initialized, I hate this but it works
// wait for a couple frames to make sure all components are initialized, I hate this but it works
yield return null;
yield return null;
yield return null;
FindAndUpdateComponents();
CheckAutoSync();
yield break;
@@ -143,7 +154,7 @@ namespace BoneSync.Sync.Components
MelonCoroutines.Start(_OnEnableCo());
}
public bool CheckIfShouldAutoSync()
public bool ShouldAutoSync()
{
if (InPoolManagerTransform()) return false;
if (!gameObject.activeInHierarchy) return false;
@@ -225,6 +236,7 @@ namespace BoneSync.Sync.Components
public bool IsPlugged()
{
if (plugs.Length == 0) return false;
for (int i = 0; i < plugs.Length; i++)
{
AlignPlug alignPlug = plugs[i];
@@ -245,7 +257,7 @@ namespace BoneSync.Sync.Components
bool isPlugged = IsPlugged();
bool canDiscard = isOwner && (!isPlugged || force); // only owner can discard
MelonLogger.Msg("Discarding syncable: " + transform.GetPath() + " force:" + force + " registered:" + isRegistered + " despawn:" + despawn + " isPlugged:" + isPlugged + " canDiscard:" + canDiscard);
//MelonLogger.Msg("Discarding syncable: " + transform.GetPath() + " force:" + force + " registered:" + isRegistered + " despawn:" + despawn + " isPlugged:" + isPlugged + " canDiscard:" + canDiscard);
//MelonLogger.Warning("Discarding registered syncable: " + transform.GetPath() + " force: " + force);
if (canDiscard)
@@ -256,6 +268,8 @@ namespace BoneSync.Sync.Components
if (!canDiscard && !force) return;
}
//MelonLogger.Msg("Discarding syncable: " + transform.GetPath() + " force:" + force + " registered:" + isRegistered + " despawn:" + despawn + " isPlugged:" + IsPlugged());
try
{
EjectAllPlugs(true);
@@ -317,6 +331,7 @@ namespace BoneSync.Sync.Components
public void RegisterSyncable()
{
if (!BoneSync.lobby.IsConnected()) return;
FindAndUpdateComponents();
if (Registered)
{
TryBecomeOwner();

3
BoneSync/Sync/Components/SyncableNetworking.cs
View File

@@ -61,7 +61,7 @@ namespace BoneSync.Sync.Components
private void _SendRegisterSync()
{
MelonLogger.Msg("Registering syncable object: " + gameObject.name);
MelonCoroutines.Start(__SendRegisterSyncCo());
MelonCoroutines.Start(__SendRegisterSyncCo());
}
private void _SendDiscard(bool despawn = false)
@@ -119,6 +119,7 @@ namespace BoneSync.Sync.Components
if (!Registered) return false;
if (!isOwner) return false;
if (isStale) return true;
if (_isInHolster) return true;
if (AllRigidbodiesSleeping()) return false;
return true;
}

3
BoneSync/Sync/Components/SyncablePhysics.cs
View File

@@ -93,6 +93,7 @@ namespace BoneSync.Sync.Components
public void ApplyObjectSyncTransforms(ObjectSyncTransform[] objectSyncTransforms)
{
if (IsPlugged()) { return; }
if (objectSyncTransforms.Length != rigidbodies.Length)
{
MelonLogger.Warning("ObjectSyncTransforms length mismatch: " + objectSyncTransforms.Length + " != " + _transforms.Length);
@@ -142,7 +143,7 @@ namespace BoneSync.Sync.Components
private void UpdateTransformList()
{
// get non-null rigidbodies
Rigidbody[] rbs = GetRigidbodies().Where(rb => rb != null && RigidbodyBelongsToSyncable(rb)).ToArray();
Rigidbody[] rbs = GetRigidbodies().Where(rb => rb != null).ToArray();
rigidbodies = rbs;
_transforms = rbs.Select(rb => rb.transform).ToArray();
}

31
BoneSync/Sync/ObjectSync.cs
View File

@@ -112,7 +112,7 @@ namespace BoneSync.Sync
private static Syncable _MakeOrGetSyncable(GameObject gameObject, bool deleteSubSyncabled = true)
{
//Scene scene = gameObject.scene;
//MelonLogger.Msg("Making or getting syncable for: " + gameObject.name + " in scene: " + scene.name);
//MelonLogger.Msg("Making or getting syncable for: " + gameObject.name);
if (gameObject == null)
{
return null;
@@ -122,23 +122,32 @@ namespace BoneSync.Sync
// delete all sub syncables
if (deleteSubSyncabled)
{
Syncable[] subSyncables = gameObject.GetComponentsInChildren<Syncable>(true);
for (int i = 0; i < subSyncables.Length; i++)
try
{
Syncable subSyncable = subSyncables[i];
if (subSyncable == syncable) continue;
bool isRegistered = subSyncable.Registered;
bool isPlugged = subSyncable.IsPlugged();
Syncable[] subSyncables = gameObject.GetComponentsInChildren<Syncable>(true);
for (int i = 0; i < subSyncables.Length; i++)
{
Syncable subSyncable = subSyncables[i];
if (subSyncable == syncable) continue;
if (subSyncable == null) continue;
bool isRegistered = subSyncable.Registered;
bool isPlugged = subSyncable.IsPlugged();
MelonLogger.Msg("Discarding subSyncable: " + subSyncable.transform.GetPath() + " registered:" + isRegistered + " plugged:" + isPlugged);
if (isRegistered || isPlugged) continue;
subSyncable.DiscardSyncableImmediate(true, false);
MelonLogger.Msg("Discarding subSyncable: " + subSyncable.transform.GetPath() + " registered:" + isRegistered + " plugged:" + isPlugged);
if (isRegistered || isPlugged) continue;
subSyncable.DiscardSyncable();
}
}
catch (Exception e)
{
MelonLogger.Warning("Failed to delete sub syncables: " + e.Message);
}
}
if (syncable == null)
{
syncable = gameObject.AddComponent<Syncable>();
// MelonLogger.Msg("Created syncable for: " + gameObject.name);
}
return syncable;
}
@@ -175,7 +184,7 @@ namespace BoneSync.Sync
public static Syncable MakeOrGetSyncable(InteractableHostManager interactableHostManager)
{
return _MakeOrGetSyncable(interactableHostManager.gameObject);
return _MakeOrGetSyncable(interactableHostManager.gameObject, true);
}
public static Syncable SpawnPooleeAndMakeSyncable(SpawnPoolableInfo spawnInfo)