logging fixes
This commit is contained in:
@@ -4,6 +4,7 @@ using System.Linq;
|
|||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using BoneSync.Data;
|
||||||
using BoneSync.Networking.LobbyManager;
|
using BoneSync.Networking.LobbyManager;
|
||||||
using Facepunch.Steamworks;
|
using Facepunch.Steamworks;
|
||||||
using Facepunch.Steamworks.Data;
|
using Facepunch.Steamworks.Data;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace BoneSync.Patching
|
|||||||
[HarmonyPatch(nameof(PoolSpawner.SpawnProjectile)), HarmonyPrefix]
|
[HarmonyPatch(nameof(PoolSpawner.SpawnProjectile)), HarmonyPrefix]
|
||||||
private static void SpawnProjectilePrefix(Vector3 position, Quaternion rotation, BulletObject bulletObject, string weaponName, TriggerRefProxy proxy)
|
private static void SpawnProjectilePrefix(Vector3 position, Quaternion rotation, BulletObject bulletObject, string weaponName, TriggerRefProxy proxy)
|
||||||
{
|
{
|
||||||
MelonLoader.SyncLogger.Msg("PoolSpawner.SpawnProjectile " + weaponName);
|
SyncLogger.Msg("PoolSpawner.SpawnProjectile " + weaponName);
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using BoneSync.Data;
|
||||||
using BoneSync.Sync;
|
using BoneSync.Sync;
|
||||||
using BoneSync.Sync.Components;
|
using BoneSync.Sync.Components;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using BoneSync.Data;
|
||||||
using BoneSync.Networking.Messages;
|
using BoneSync.Networking.Messages;
|
||||||
using BoneSync.Sync;
|
using BoneSync.Sync;
|
||||||
using BoneSync.Sync.Components;
|
using BoneSync.Sync.Components;
|
||||||
@@ -26,7 +27,7 @@ namespace BoneSync.Patching
|
|||||||
[HarmonyPatch(nameof(Gun.OnFire)), HarmonyPrefix]
|
[HarmonyPatch(nameof(Gun.OnFire)), HarmonyPrefix]
|
||||||
public static void OnFirePatch(Gun __instance)
|
public static void OnFirePatch(Gun __instance)
|
||||||
{
|
{
|
||||||
MelonLoader.SyncLogger.Msg("Gun.OnFire: " + __instance.name);
|
SyncLogger.Msg("Gun.OnFire: " + __instance.name);
|
||||||
if (!BoneSync.IsConnected) return;
|
if (!BoneSync.IsConnected) return;
|
||||||
|
|
||||||
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance.gameObject);
|
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance.gameObject);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using BoneSync.Sync;
|
using BoneSync.Data;
|
||||||
|
using BoneSync.Sync;
|
||||||
using BoneSync.Sync.Components;
|
using BoneSync.Sync.Components;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using MelonLoader;
|
using MelonLoader;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using BoneSync.Data;
|
||||||
using BoneSync.Sync;
|
using BoneSync.Sync;
|
||||||
using BoneSync.Sync.Components;
|
using BoneSync.Sync.Components;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
@@ -18,7 +19,7 @@ namespace BoneSync.Patching
|
|||||||
[HarmonyPatch(nameof(InteractableHost.OnEnable)), HarmonyPostfix]
|
[HarmonyPatch(nameof(InteractableHost.OnEnable)), HarmonyPostfix]
|
||||||
public static void OnEnablePatch(InteractableHost __instance)
|
public static void OnEnablePatch(InteractableHost __instance)
|
||||||
{
|
{
|
||||||
//MelonLoader.SyncLogger.Msg("InteractableHost enabled: " + __instance.name + " Manager: " + __instance?.manager?.name);
|
//SyncLogger.Msg("InteractableHost enabled: " + __instance.name + " Manager: " + __instance?.manager?.name);
|
||||||
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance);
|
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -40,7 +41,7 @@ namespace BoneSync.Patching
|
|||||||
/*[HarmonyPatch(nameof(InteractableHost.AddForcePullGrip)), HarmonyPostfix]
|
/*[HarmonyPatch(nameof(InteractableHost.AddForcePullGrip)), HarmonyPostfix]
|
||||||
public static void AddForcePullGripPatch(InteractableHost __instance, ForcePullGrip grip)
|
public static void AddForcePullGripPatch(InteractableHost __instance, ForcePullGrip grip)
|
||||||
{
|
{
|
||||||
MelonLoader.SyncLogger.Msg("AddForcePullGrip to hand: " + __instance.name + " Hand: " + grip.name);
|
SyncLogger.Msg("AddForcePullGrip to hand: " + __instance.name + " Hand: " + grip.name);
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -51,7 +52,7 @@ namespace BoneSync.Patching
|
|||||||
[HarmonyPatch(nameof(InteractableHostManager.Start)), HarmonyPostfix]
|
[HarmonyPatch(nameof(InteractableHostManager.Start)), HarmonyPostfix]
|
||||||
public static void OnEnablePatch(InteractableHostManager __instance)
|
public static void OnEnablePatch(InteractableHostManager __instance)
|
||||||
{
|
{
|
||||||
MelonLoader.SyncLogger.Msg("InteractableHostManager started: " + __instance.transform.GetPath());
|
SyncLogger.Msg("InteractableHostManager started: " + __instance.transform.GetPath());
|
||||||
ObjectSync.MakeOrGetSyncable(__instance);
|
ObjectSync.MakeOrGetSyncable(__instance);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,13 +26,13 @@ namespace BoneSync.Patching
|
|||||||
if (CallPatchedMethods.allowPatchedMethodCall) return true;
|
if (CallPatchedMethods.allowPatchedMethodCall) return true;
|
||||||
if (!BoneSync.IsConnected) return true;
|
if (!BoneSync.IsConnected) return true;
|
||||||
if (damage < 0.05f) return true; // ignore small damage (e.g. a little bit of fall damage)
|
if (damage < 0.05f) return true; // ignore small damage (e.g. a little bit of fall damage)
|
||||||
//MelonLoader.SyncLogger.Msg("ObjectDestructable.TakeDamage: " + damage);
|
//SyncLogger.Msg("ObjectDestructable.TakeDamage: " + damage);
|
||||||
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance.gameObject);
|
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance.gameObject);
|
||||||
if (syncable != null)
|
if (syncable != null)
|
||||||
{
|
{
|
||||||
if (damage > 0.5f) syncable.RegisterSyncable(); // register syncable if damage is very significant, e.g. a bullet hit
|
if (damage > 0.5f) syncable.RegisterSyncable(); // register syncable if damage is very significant, e.g. a bullet hit
|
||||||
if (syncable.Registered && !syncable.isOwner) return false;
|
if (syncable.Registered && !syncable.isOwner) return false;
|
||||||
//MelonLoader.SyncLogger.Msg("Patch: ObjectDestructable.TakeDamage: " + damage + " " + syncable.gameObject.name);
|
//SyncLogger.Msg("Patch: ObjectDestructable.TakeDamage: " + damage + " " + syncable.gameObject.name);
|
||||||
ObjectHealthInfo objectHealthInfo = new ObjectHealthInfo(__instance._health, __instance._hits, normal, damage, crit, attackType);
|
ObjectHealthInfo objectHealthInfo = new ObjectHealthInfo(__instance._health, __instance._hits, normal, damage, crit, attackType);
|
||||||
|
|
||||||
ObjectSync.SendObjectDamageMessage(syncable, ObjectDamageType.DestructibleTakeDamage, objectHealthInfo);
|
ObjectSync.SendObjectDamageMessage(syncable, ObjectDamageType.DestructibleTakeDamage, objectHealthInfo);
|
||||||
@@ -67,13 +67,13 @@ namespace BoneSync.Patching
|
|||||||
{
|
{
|
||||||
if (CallPatchedMethods.allowPatchedMethodCall) return true;
|
if (CallPatchedMethods.allowPatchedMethodCall) return true;
|
||||||
if (!BoneSync.IsConnected) return true;
|
if (!BoneSync.IsConnected) return true;
|
||||||
//MelonLoader.SyncLogger.Msg("Prop_Health.TAKEDAMAGE: " + damage);
|
//SyncLogger.Msg("Prop_Health.TAKEDAMAGE: " + damage);
|
||||||
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance.gameObject);
|
Syncable syncable = ObjectSync.MakeOrGetSyncable(__instance.gameObject);
|
||||||
if (syncable != null)
|
if (syncable != null)
|
||||||
{
|
{
|
||||||
if (damage > 0.5f) syncable.RegisterSyncable();
|
if (damage > 0.5f) syncable.RegisterSyncable();
|
||||||
if (syncable.Registered && !syncable.isOwner) return false;
|
if (syncable.Registered && !syncable.isOwner) return false;
|
||||||
//MelonLoader.SyncLogger.Msg("Patch: Prop_Health.TAKEDAMAGE: " + damage + " " + syncable.gameObject.name);
|
//SyncLogger.Msg("Patch: Prop_Health.TAKEDAMAGE: " + damage + " " + syncable.gameObject.name);
|
||||||
ObjectHealthInfo objectHealthInfo = new ObjectHealthInfo(__instance.cur_Health, __instance.hits, Vector3.zero, damage, crit, attackType);
|
ObjectHealthInfo objectHealthInfo = new ObjectHealthInfo(__instance.cur_Health, __instance.hits, Vector3.zero, damage, crit, attackType);
|
||||||
|
|
||||||
ObjectSync.SendObjectDamageMessage(syncable, ObjectDamageType.PropHealthTakeDamage, objectHealthInfo);
|
ObjectSync.SendObjectDamageMessage(syncable, ObjectDamageType.PropHealthTakeDamage, objectHealthInfo);
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using BoneSync.Data;
|
||||||
using BoneSync.Networking.Messages;
|
using BoneSync.Networking.Messages;
|
||||||
using BoneSync.Sync;
|
using BoneSync.Sync;
|
||||||
using BoneSync.Sync.Components;
|
using BoneSync.Sync.Components;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using MelonLoader;
|
using MelonLoader;
|
||||||
using StressLevelZero.Interaction;
|
using StressLevelZero.Interaction;
|
||||||
using static MelonLoader.SyncLogger;
|
|
||||||
|
|
||||||
namespace BoneSync.Patching
|
namespace BoneSync.Patching
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user