diff --git a/QSB/ConversationSync/Messages/ConversationStartEndMessage.cs b/QSB/ConversationSync/Messages/ConversationStartEndMessage.cs index 1a1d8eb2..8e7baecf 100644 --- a/QSB/ConversationSync/Messages/ConversationStartEndMessage.cs +++ b/QSB/ConversationSync/Messages/ConversationStartEndMessage.cs @@ -1,4 +1,5 @@ -using QSB.ConversationSync.WorldObjects; +using OWML.Utils; +using QSB.ConversationSync.WorldObjects; using QSB.Messaging; using QSB.Player; using QSB.Utility; diff --git a/QSB/ConversationSync/WorldObjects/QSBCharacterDialogueTree.cs b/QSB/ConversationSync/WorldObjects/QSBCharacterDialogueTree.cs index a631214a..4f1420f5 100644 --- a/QSB/ConversationSync/WorldObjects/QSBCharacterDialogueTree.cs +++ b/QSB/ConversationSync/WorldObjects/QSBCharacterDialogueTree.cs @@ -1,4 +1,5 @@ using Cysharp.Threading.Tasks; +using OWML.Utils; using QSB.ConversationSync.Messages; using QSB.Messaging; using QSB.Player; diff --git a/QSB/Menus/MenuManager.cs b/QSB/Menus/MenuManager.cs index 82b50da5..bdee8f69 100644 --- a/QSB/Menus/MenuManager.cs +++ b/QSB/Menus/MenuManager.cs @@ -1,5 +1,6 @@ using Mirror; using OWML.Common; +using OWML.Utils; using QSB.Localization; using QSB.Messaging; using QSB.Player.TransformSync; diff --git a/QSB/OrbSync/WorldObjects/QSBOrb.cs b/QSB/OrbSync/WorldObjects/QSBOrb.cs index 17cb102d..ae8e5d49 100644 --- a/QSB/OrbSync/WorldObjects/QSBOrb.cs +++ b/QSB/OrbSync/WorldObjects/QSBOrb.cs @@ -1,4 +1,5 @@ -using QSB.Messaging; +using OWML.Utils; +using QSB.Messaging; using QSB.OrbSync.Messages; using QSB.OrbSync.TransformSync; using QSB.Utility; diff --git a/QSB/Patches/QSBPatchManager.cs b/QSB/Patches/QSBPatchManager.cs index 6a994427..721475cc 100644 --- a/QSB/Patches/QSBPatchManager.cs +++ b/QSB/Patches/QSBPatchManager.cs @@ -1,5 +1,6 @@ using HarmonyLib; using OWML.Common; +using OWML.Utils; using QSB.Utility; using System; using System.Collections.Generic; diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs index 813ea05e..27f79e29 100644 --- a/QSB/Player/TransformSync/PlayerTransformSync.cs +++ b/QSB/Player/TransformSync/PlayerTransformSync.cs @@ -1,4 +1,5 @@ using OWML.Common; +using OWML.Utils; using QSB.Messaging; using QSB.Patches; using QSB.Player.Messages; diff --git a/QSB/QSBSceneManager.cs b/QSB/QSBSceneManager.cs index 7f0f1be7..cc29a0f8 100644 --- a/QSB/QSBSceneManager.cs +++ b/QSB/QSBSceneManager.cs @@ -1,4 +1,5 @@ using OWML.Common; +using OWML.Utils; using QSB.Utility; using System; diff --git a/QSB/QuantumSync/Patches/Common/Visibility/VisibilityShapePatches.cs b/QSB/QuantumSync/Patches/Common/Visibility/VisibilityShapePatches.cs index 8937eb32..c101785a 100644 --- a/QSB/QuantumSync/Patches/Common/Visibility/VisibilityShapePatches.cs +++ b/QSB/QuantumSync/Patches/Common/Visibility/VisibilityShapePatches.cs @@ -1,4 +1,5 @@ using HarmonyLib; +using OWML.Utils; using QSB.Patches; using QSB.Utility; diff --git a/QSB/ShipSync/Patches/ShipPatches.cs b/QSB/ShipSync/Patches/ShipPatches.cs index 8eca58c2..aaef8f6e 100644 --- a/QSB/ShipSync/Patches/ShipPatches.cs +++ b/QSB/ShipSync/Patches/ShipPatches.cs @@ -1,4 +1,5 @@ using HarmonyLib; +using OWML.Utils; using QSB.Messaging; using QSB.Patches; using QSB.ShipSync.Messages; diff --git a/QSB/ShipSync/WorldObjects/QSBShipComponent.cs b/QSB/ShipSync/WorldObjects/QSBShipComponent.cs index 27762abf..5ad2881d 100644 --- a/QSB/ShipSync/WorldObjects/QSBShipComponent.cs +++ b/QSB/ShipSync/WorldObjects/QSBShipComponent.cs @@ -1,4 +1,5 @@ -using QSB.Messaging; +using OWML.Utils; +using QSB.Messaging; using QSB.ShipSync.Messages.Component; using QSB.Utility; using QSB.WorldSync; diff --git a/QSB/ShipSync/WorldObjects/QSBShipHull.cs b/QSB/ShipSync/WorldObjects/QSBShipHull.cs index 4e2ace73..165cbbb3 100644 --- a/QSB/ShipSync/WorldObjects/QSBShipHull.cs +++ b/QSB/ShipSync/WorldObjects/QSBShipHull.cs @@ -1,4 +1,5 @@ -using QSB.Messaging; +using OWML.Utils; +using QSB.Messaging; using QSB.ShipSync.Messages.Hull; using QSB.Utility; using QSB.WorldSync; diff --git a/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs b/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs index 7b0f487a..f528e2dd 100644 --- a/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs +++ b/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs @@ -1,4 +1,5 @@ using HarmonyLib; +using OWML.Utils; using QSB.Messaging; using QSB.Patches; using QSB.Tools.ProbeTool.Messages; diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs index e56ecda7..1cf23019 100644 --- a/QSB/Utility/DebugActions.cs +++ b/QSB/Utility/DebugActions.cs @@ -1,4 +1,5 @@ using OWML.Common; +using OWML.Utils; using QSB.EchoesOfTheEye.DreamLantern; using QSB.EchoesOfTheEye.DreamLantern.WorldObjects; using QSB.ItemSync.WorldObjects.Items; diff --git a/QSB/Utility/Deterministic/DeterministicRigidbodyPatches.cs b/QSB/Utility/Deterministic/DeterministicRigidbodyPatches.cs index d342e030..6742a441 100644 --- a/QSB/Utility/Deterministic/DeterministicRigidbodyPatches.cs +++ b/QSB/Utility/Deterministic/DeterministicRigidbodyPatches.cs @@ -1,4 +1,5 @@ using HarmonyLib; +using OWML.Utils; using QSB.Patches; using System.Collections.Generic; using UnityEngine; diff --git a/QSB/Utility/Extensions.cs b/QSB/Utility/Extensions.cs index e9cc4ba5..c7f415dc 100644 --- a/QSB/Utility/Extensions.cs +++ b/QSB/Utility/Extensions.cs @@ -71,21 +71,6 @@ public static class Extensions #region C# - public static void SafeInvoke(this MulticastDelegate multicast, params object[] args) - { - foreach (var del in multicast.GetInvocationList()) - { - try - { - del.DynamicInvoke(args); - } - catch (TargetInvocationException ex) - { - DebugLog.ToConsole($"Error invoking delegate! {ex.InnerException}", MessageType.Error); - } - } - } - public static float Map(this float value, float inputFrom, float inputTo, float outputFrom, float outputTo, bool clamp) { var mappedValue = (value - inputFrom) / (inputTo - inputFrom) * (outputTo - outputFrom) + outputFrom; @@ -165,23 +150,6 @@ public static class Extensions public static bool IsInRange(this IList list, int index) => index >= 0 && index < list.Count; - public static void RaiseEvent(this T instance, string eventName, params object[] args) - { - const BindingFlags flags = BindingFlags.Instance - | BindingFlags.Static - | BindingFlags.Public - | BindingFlags.NonPublic - | BindingFlags.DeclaredOnly; - if (typeof(T) - .GetField(eventName, flags)? - .GetValue(instance) is not MulticastDelegate multiDelegate) - { - return; - } - - multiDelegate.SafeInvoke(args); - } - public static IEnumerable GetDerivedTypes(this Type type) { var assemblies = QSBCore.Addons.Values diff --git a/QSB/WorldSync/Messages/RequestInitialStatesMessage.cs b/QSB/WorldSync/Messages/RequestInitialStatesMessage.cs index 6a311f8d..a9e65242 100644 --- a/QSB/WorldSync/Messages/RequestInitialStatesMessage.cs +++ b/QSB/WorldSync/Messages/RequestInitialStatesMessage.cs @@ -1,4 +1,5 @@ -using QSB.Messaging; +using OWML.Utils; +using QSB.Messaging; using QSB.Utility; using System; diff --git a/QSB/ZeroGCaveSync/Patches/ZeroGCavePatches.cs b/QSB/ZeroGCaveSync/Patches/ZeroGCavePatches.cs index ccc8043a..6054dc63 100644 --- a/QSB/ZeroGCaveSync/Patches/ZeroGCavePatches.cs +++ b/QSB/ZeroGCaveSync/Patches/ZeroGCavePatches.cs @@ -1,4 +1,5 @@ using HarmonyLib; +using OWML.Utils; using QSB.Messaging; using QSB.Patches; using QSB.Utility; diff --git a/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs b/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs index 1f3133a7..fff74971 100644 --- a/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs +++ b/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs @@ -1,4 +1,5 @@ -using QSB.Messaging; +using OWML.Utils; +using QSB.Messaging; using QSB.Utility; using QSB.WorldSync; using QSB.ZeroGCaveSync.Messages;