From f75daded8453ad98666b6ee68fc68f573a286511 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 11 Apr 2021 15:28:45 +0100 Subject: [PATCH 1/6] change name --- QSB/ModelShipSync/ModelShipManager.cs | 11 +++++++++++ QSB/Player/Events/PlayerSectorEvent.cs | 3 ++- QSB/Player/Events/PlayerStatesRequestEvent.cs | 3 ++- QSB/Player/Events/ServerSendPlayerStatesEvent.cs | 3 ++- QSB/QSB.csproj | 8 ++++++-- QSB/SectorSync/QSBSectorManager.cs | 5 +++-- QSB/TransformSync/PlayerCameraSync.cs | 2 +- ...{TransformSync.cs => PlayerObjectTransformSync.cs} | 2 +- QSB/TransformSync/PlayerProbeSync.cs | 2 +- QSB/TransformSync/PlayerTransformSync.cs | 2 +- QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs | 11 +++++++++++ QSB/TransformSync/RoastingStickTransformSync.cs | 2 +- QSB/TransformSync/ShipTransformSync.cs | 2 +- 13 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 QSB/ModelShipSync/ModelShipManager.cs rename QSB/TransformSync/{TransformSync.cs => PlayerObjectTransformSync.cs} (98%) create mode 100644 QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs diff --git a/QSB/ModelShipSync/ModelShipManager.cs b/QSB/ModelShipSync/ModelShipManager.cs new file mode 100644 index 00000000..a1eadd9b --- /dev/null +++ b/QSB/ModelShipSync/ModelShipManager.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace QSB.ModelShipSync +{ + class ModelShipManager + { + } +} diff --git a/QSB/Player/Events/PlayerSectorEvent.cs b/QSB/Player/Events/PlayerSectorEvent.cs index f331d99e..b4722b7a 100644 --- a/QSB/Player/Events/PlayerSectorEvent.cs +++ b/QSB/Player/Events/PlayerSectorEvent.cs @@ -1,6 +1,7 @@ using OWML.Common; using QSB.Events; using QSB.SectorSync.WorldObjects; +using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using QSB.WorldSync.Events; @@ -36,7 +37,7 @@ namespace QSB.Player.Events return; } - var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); + var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); QSBCore.UnityEvents.RunWhen(() => transformSync?.SyncedTransform != null, () => transformSync?.SetReferenceSector(sector)); diff --git a/QSB/Player/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs index 74fec7ee..6990f7c5 100644 --- a/QSB/Player/Events/PlayerStatesRequestEvent.cs +++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs @@ -3,6 +3,7 @@ using QSB.CampfireSync.WorldObjects; using QSB.Events; using QSB.Messaging; using QSB.QuantumSync; +using QSB.TransformSync; using QSB.TranslationSync; using QSB.TranslationSync.WorldObjects; using QSB.Utility; @@ -30,7 +31,7 @@ namespace QSB.Player.Events { DebugLog.DebugWrite($"Get state request from {message.FromId} - isServer?{server}"); QSBEventManager.FireEvent(EventNames.QSBServerSendPlayerStates); - foreach (var item in QSBPlayerManager.GetSyncObjects() + foreach (var item in QSBPlayerManager.GetSyncObjects() .Where(x => x != null && x.IsReady && x.ReferenceSector != null)) { QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); diff --git a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs index 12013428..e6a64bc2 100644 --- a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs +++ b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs @@ -1,5 +1,6 @@ using OWML.Common; using QSB.Events; +using QSB.TransformSync; using QSB.Utility; namespace QSB.Player.Events @@ -32,7 +33,7 @@ namespace QSB.Player.Events { DebugLog.DebugWrite($"Received playerstate of player ID {message.AboutId}", MessageType.Info); QSBCore.UnityEvents.RunWhen( - () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, + () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, () => QSBPlayerManager.HandleFullStateMessage(message)); } } diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index 02f62f3a..b283ac97 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -142,6 +142,7 @@ + @@ -228,6 +229,7 @@ + @@ -260,7 +262,7 @@ - + @@ -342,7 +344,9 @@ 1.1.8 - + + + xcopy /e /i /y "$(TargetDir)*" "$(OwmlDir)\Mods\$(ProjectName)" diff --git a/QSB/SectorSync/QSBSectorManager.cs b/QSB/SectorSync/QSBSectorManager.cs index d6345750..605c3c42 100644 --- a/QSB/SectorSync/QSBSectorManager.cs +++ b/QSB/SectorSync/QSBSectorManager.cs @@ -2,6 +2,7 @@ using QSB.Events; using QSB.Player; using QSB.SectorSync.WorldObjects; +using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using System.Collections.Generic; @@ -21,7 +22,7 @@ namespace QSB.SectorSync public void Invoke() { - QSBPlayerManager.GetSyncObjects() + QSBPlayerManager.GetSyncObjects() .Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector); } @@ -54,7 +55,7 @@ namespace QSB.SectorSync IsReady = QSBWorldSync.GetWorldObjects().Any(); } - private void CheckTransformSyncSector(TransformSync.TransformSync transformSync) + private void CheckTransformSyncSector(PlayerObjectTransformSync transformSync) { var syncedTransform = transformSync.SyncedTransform; if (syncedTransform == null || syncedTransform.position == Vector3.zero) diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs index f03d2509..a8838d7b 100644 --- a/QSB/TransformSync/PlayerCameraSync.cs +++ b/QSB/TransformSync/PlayerCameraSync.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class PlayerCameraSync : TransformSync + public class PlayerCameraSync : PlayerObjectTransformSync { protected override Transform InitLocalTransform() { diff --git a/QSB/TransformSync/TransformSync.cs b/QSB/TransformSync/PlayerObjectTransformSync.cs similarity index 98% rename from QSB/TransformSync/TransformSync.cs rename to QSB/TransformSync/PlayerObjectTransformSync.cs index 80a830ce..02ea15aa 100644 --- a/QSB/TransformSync/TransformSync.cs +++ b/QSB/TransformSync/PlayerObjectTransformSync.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace QSB.TransformSync { - public abstract class TransformSync : PlayerSyncObject + public abstract class PlayerObjectTransformSync : PlayerSyncObject { public abstract bool IsReady { get; } diff --git a/QSB/TransformSync/PlayerProbeSync.cs b/QSB/TransformSync/PlayerProbeSync.cs index 1b560a8d..e6d56556 100644 --- a/QSB/TransformSync/PlayerProbeSync.cs +++ b/QSB/TransformSync/PlayerProbeSync.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class PlayerProbeSync : TransformSync + public class PlayerProbeSync : PlayerObjectTransformSync { private Transform _disabledSocket; diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/TransformSync/PlayerTransformSync.cs index e56cb79e..6f28f9e9 100644 --- a/QSB/TransformSync/PlayerTransformSync.cs +++ b/QSB/TransformSync/PlayerTransformSync.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class PlayerTransformSync : TransformSync + public class PlayerTransformSync : PlayerObjectTransformSync { public static PlayerTransformSync LocalInstance { get; private set; } diff --git a/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs b/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs new file mode 100644 index 00000000..09a0a83f --- /dev/null +++ b/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace QSB.TransformSync.RigidbodyTransformSync +{ + class RigidbodyTransformSync + { + } +} diff --git a/QSB/TransformSync/RoastingStickTransformSync.cs b/QSB/TransformSync/RoastingStickTransformSync.cs index 1bd8122c..0ceb2b28 100644 --- a/QSB/TransformSync/RoastingStickTransformSync.cs +++ b/QSB/TransformSync/RoastingStickTransformSync.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace QSB.TransformSync { - internal class RoastingStickTransformSync : TransformSync + internal class RoastingStickTransformSync : PlayerObjectTransformSync { private Transform _stickTip; private Transform _networkStickTip => gameObject.transform.GetChild(0); diff --git a/QSB/TransformSync/ShipTransformSync.cs b/QSB/TransformSync/ShipTransformSync.cs index 81cf02ce..9e39bfdd 100644 --- a/QSB/TransformSync/ShipTransformSync.cs +++ b/QSB/TransformSync/ShipTransformSync.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class ShipTransformSync : TransformSync + public class ShipTransformSync : PlayerObjectTransformSync { private Transform GetShipModel() => Locator.GetShipTransform(); From 9dc06b91346775f6c00412cce12f632ffddbb024 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 11 Apr 2021 16:10:23 +0100 Subject: [PATCH 2/6] remove rigidbody sync --- QSB/QSB.csproj | 1 - QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index b283ac97..47873e07 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -229,7 +229,6 @@ - diff --git a/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs b/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs deleted file mode 100644 index 09a0a83f..00000000 --- a/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace QSB.TransformSync.RigidbodyTransformSync -{ - class RigidbodyTransformSync - { - } -} From 942dff93328f490c01b81d4031658ac387b4a3c0 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 11 Apr 2021 16:48:58 +0100 Subject: [PATCH 3/6] Revert "remove rigidbody sync" This reverts commit 9dc06b91346775f6c00412cce12f632ffddbb024. --- QSB/QSB.csproj | 1 + QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index 47873e07..b283ac97 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -229,6 +229,7 @@ + diff --git a/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs b/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs new file mode 100644 index 00000000..09a0a83f --- /dev/null +++ b/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace QSB.TransformSync.RigidbodyTransformSync +{ + class RigidbodyTransformSync + { + } +} From ad9ad8a676c1bc245a72db9f2e79984793a4ee08 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 11 Apr 2021 16:49:07 +0100 Subject: [PATCH 4/6] Revert "change name" This reverts commit f75daded8453ad98666b6ee68fc68f573a286511. --- QSB/ModelShipSync/ModelShipManager.cs | 11 ----------- QSB/Player/Events/PlayerSectorEvent.cs | 3 +-- QSB/Player/Events/PlayerStatesRequestEvent.cs | 3 +-- QSB/Player/Events/ServerSendPlayerStatesEvent.cs | 3 +-- QSB/QSB.csproj | 8 ++------ QSB/SectorSync/QSBSectorManager.cs | 5 ++--- QSB/TransformSync/PlayerCameraSync.cs | 2 +- QSB/TransformSync/PlayerProbeSync.cs | 2 +- QSB/TransformSync/PlayerTransformSync.cs | 2 +- QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs | 11 ----------- QSB/TransformSync/RoastingStickTransformSync.cs | 2 +- QSB/TransformSync/ShipTransformSync.cs | 2 +- ...{PlayerObjectTransformSync.cs => TransformSync.cs} | 2 +- 13 files changed, 13 insertions(+), 43 deletions(-) delete mode 100644 QSB/ModelShipSync/ModelShipManager.cs delete mode 100644 QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs rename QSB/TransformSync/{PlayerObjectTransformSync.cs => TransformSync.cs} (98%) diff --git a/QSB/ModelShipSync/ModelShipManager.cs b/QSB/ModelShipSync/ModelShipManager.cs deleted file mode 100644 index a1eadd9b..00000000 --- a/QSB/ModelShipSync/ModelShipManager.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace QSB.ModelShipSync -{ - class ModelShipManager - { - } -} diff --git a/QSB/Player/Events/PlayerSectorEvent.cs b/QSB/Player/Events/PlayerSectorEvent.cs index b4722b7a..f331d99e 100644 --- a/QSB/Player/Events/PlayerSectorEvent.cs +++ b/QSB/Player/Events/PlayerSectorEvent.cs @@ -1,7 +1,6 @@ using OWML.Common; using QSB.Events; using QSB.SectorSync.WorldObjects; -using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using QSB.WorldSync.Events; @@ -37,7 +36,7 @@ namespace QSB.Player.Events return; } - var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); + var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); QSBCore.UnityEvents.RunWhen(() => transformSync?.SyncedTransform != null, () => transformSync?.SetReferenceSector(sector)); diff --git a/QSB/Player/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs index 6990f7c5..74fec7ee 100644 --- a/QSB/Player/Events/PlayerStatesRequestEvent.cs +++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs @@ -3,7 +3,6 @@ using QSB.CampfireSync.WorldObjects; using QSB.Events; using QSB.Messaging; using QSB.QuantumSync; -using QSB.TransformSync; using QSB.TranslationSync; using QSB.TranslationSync.WorldObjects; using QSB.Utility; @@ -31,7 +30,7 @@ namespace QSB.Player.Events { DebugLog.DebugWrite($"Get state request from {message.FromId} - isServer?{server}"); QSBEventManager.FireEvent(EventNames.QSBServerSendPlayerStates); - foreach (var item in QSBPlayerManager.GetSyncObjects() + foreach (var item in QSBPlayerManager.GetSyncObjects() .Where(x => x != null && x.IsReady && x.ReferenceSector != null)) { QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); diff --git a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs index e6a64bc2..12013428 100644 --- a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs +++ b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs @@ -1,6 +1,5 @@ using OWML.Common; using QSB.Events; -using QSB.TransformSync; using QSB.Utility; namespace QSB.Player.Events @@ -33,7 +32,7 @@ namespace QSB.Player.Events { DebugLog.DebugWrite($"Received playerstate of player ID {message.AboutId}", MessageType.Info); QSBCore.UnityEvents.RunWhen( - () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, + () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, () => QSBPlayerManager.HandleFullStateMessage(message)); } } diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index b283ac97..02f62f3a 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -142,7 +142,6 @@ - @@ -229,7 +228,6 @@ - @@ -262,7 +260,7 @@ - + @@ -344,9 +342,7 @@ 1.1.8 - - - + xcopy /e /i /y "$(TargetDir)*" "$(OwmlDir)\Mods\$(ProjectName)" diff --git a/QSB/SectorSync/QSBSectorManager.cs b/QSB/SectorSync/QSBSectorManager.cs index 605c3c42..d6345750 100644 --- a/QSB/SectorSync/QSBSectorManager.cs +++ b/QSB/SectorSync/QSBSectorManager.cs @@ -2,7 +2,6 @@ using QSB.Events; using QSB.Player; using QSB.SectorSync.WorldObjects; -using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using System.Collections.Generic; @@ -22,7 +21,7 @@ namespace QSB.SectorSync public void Invoke() { - QSBPlayerManager.GetSyncObjects() + QSBPlayerManager.GetSyncObjects() .Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector); } @@ -55,7 +54,7 @@ namespace QSB.SectorSync IsReady = QSBWorldSync.GetWorldObjects().Any(); } - private void CheckTransformSyncSector(PlayerObjectTransformSync transformSync) + private void CheckTransformSyncSector(TransformSync.TransformSync transformSync) { var syncedTransform = transformSync.SyncedTransform; if (syncedTransform == null || syncedTransform.position == Vector3.zero) diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs index a8838d7b..f03d2509 100644 --- a/QSB/TransformSync/PlayerCameraSync.cs +++ b/QSB/TransformSync/PlayerCameraSync.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class PlayerCameraSync : PlayerObjectTransformSync + public class PlayerCameraSync : TransformSync { protected override Transform InitLocalTransform() { diff --git a/QSB/TransformSync/PlayerProbeSync.cs b/QSB/TransformSync/PlayerProbeSync.cs index e6d56556..1b560a8d 100644 --- a/QSB/TransformSync/PlayerProbeSync.cs +++ b/QSB/TransformSync/PlayerProbeSync.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class PlayerProbeSync : PlayerObjectTransformSync + public class PlayerProbeSync : TransformSync { private Transform _disabledSocket; diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/TransformSync/PlayerTransformSync.cs index 6f28f9e9..e56cb79e 100644 --- a/QSB/TransformSync/PlayerTransformSync.cs +++ b/QSB/TransformSync/PlayerTransformSync.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class PlayerTransformSync : PlayerObjectTransformSync + public class PlayerTransformSync : TransformSync { public static PlayerTransformSync LocalInstance { get; private set; } diff --git a/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs b/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs deleted file mode 100644 index 09a0a83f..00000000 --- a/QSB/TransformSync/Rigidbody/RigidbodyTransformSync.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace QSB.TransformSync.RigidbodyTransformSync -{ - class RigidbodyTransformSync - { - } -} diff --git a/QSB/TransformSync/RoastingStickTransformSync.cs b/QSB/TransformSync/RoastingStickTransformSync.cs index 0ceb2b28..1bd8122c 100644 --- a/QSB/TransformSync/RoastingStickTransformSync.cs +++ b/QSB/TransformSync/RoastingStickTransformSync.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace QSB.TransformSync { - internal class RoastingStickTransformSync : PlayerObjectTransformSync + internal class RoastingStickTransformSync : TransformSync { private Transform _stickTip; private Transform _networkStickTip => gameObject.transform.GetChild(0); diff --git a/QSB/TransformSync/ShipTransformSync.cs b/QSB/TransformSync/ShipTransformSync.cs index 9e39bfdd..81cf02ce 100644 --- a/QSB/TransformSync/ShipTransformSync.cs +++ b/QSB/TransformSync/ShipTransformSync.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace QSB.TransformSync { - public class ShipTransformSync : PlayerObjectTransformSync + public class ShipTransformSync : TransformSync { private Transform GetShipModel() => Locator.GetShipTransform(); diff --git a/QSB/TransformSync/PlayerObjectTransformSync.cs b/QSB/TransformSync/TransformSync.cs similarity index 98% rename from QSB/TransformSync/PlayerObjectTransformSync.cs rename to QSB/TransformSync/TransformSync.cs index 02ea15aa..80a830ce 100644 --- a/QSB/TransformSync/PlayerObjectTransformSync.cs +++ b/QSB/TransformSync/TransformSync.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace QSB.TransformSync { - public abstract class PlayerObjectTransformSync : PlayerSyncObject + public abstract class TransformSync : PlayerSyncObject { public abstract bool IsReady { get; } From 4f1b2c31c188c5a866420e085f41774b114c7d39 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 11 Apr 2021 17:05:02 +0100 Subject: [PATCH 5/6] move things around --- QSB/Events/QSBEvent.cs | 1 + .../TransformSync/NomaiOrbTransformSync.cs | 2 +- QSB/Player/Events/PlayerSectorEvent.cs | 3 ++- QSB/Player/Events/PlayerStatesRequestEvent.cs | 3 ++- QSB/Player/Events/ServerSendPlayerStatesEvent.cs | 3 ++- QSB/Player/QSBPlayerManager.cs | 1 + QSB/{ => Player}/TransformSync/PlayerCameraSync.cs | 5 +++-- .../TransformSync/PlayerTransformSync.cs | 5 +++-- .../TransformSync/PlayerProbeSync.cs | 5 +++-- QSB/QSB.csproj | 14 +++++++------- QSB/QSBCore.cs | 1 + QSB/QSBNetworkManager.cs | 5 +++++ .../TransformSync/RoastingStickTransformSync.cs | 5 +++-- QSB/SectorSync/QSBSectorManager.cs | 4 ++-- .../TransformSync/ShipTransformSync.cs | 5 +++-- ...TransformSync.cs => SyncObjectTransformSync.cs} | 3 ++- QSB/Utility/DebugActions.cs | 1 + QSB/Utility/Extensions.cs | 1 + QSB/WorldSync/QSBWorldSync.cs | 1 + 19 files changed, 44 insertions(+), 24 deletions(-) rename QSB/{ => OrbSync}/TransformSync/NomaiOrbTransformSync.cs (98%) rename QSB/{ => Player}/TransformSync/PlayerCameraSync.cs (92%) rename QSB/{ => Player}/TransformSync/PlayerTransformSync.cs (94%) rename QSB/{ => ProbeSync}/TransformSync/PlayerProbeSync.cs (95%) rename QSB/{ => RoastingSync}/TransformSync/RoastingStickTransformSync.cs (96%) rename QSB/{ => ShipSync}/TransformSync/ShipTransformSync.cs (94%) rename QSB/TransformSync/{TransformSync.cs => SyncObjectTransformSync.cs} (98%) diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs index 6c601c06..ff9d8796 100644 --- a/QSB/Events/QSBEvent.cs +++ b/QSB/Events/QSBEvent.cs @@ -1,6 +1,7 @@ using OWML.Common; using QSB.Messaging; using QSB.Player; +using QSB.Player.TransformSync; using QSB.TransformSync; using QSB.Utility; using QuantumUNET; diff --git a/QSB/TransformSync/NomaiOrbTransformSync.cs b/QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs similarity index 98% rename from QSB/TransformSync/NomaiOrbTransformSync.cs rename to QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs index ddf762e2..304e2234 100644 --- a/QSB/TransformSync/NomaiOrbTransformSync.cs +++ b/QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs @@ -3,7 +3,7 @@ using QSB.WorldSync; using QuantumUNET; using UnityEngine; -namespace QSB.TransformSync +namespace QSB.OrbSync.TransformSync { public class NomaiOrbTransformSync : QNetworkBehaviour { diff --git a/QSB/Player/Events/PlayerSectorEvent.cs b/QSB/Player/Events/PlayerSectorEvent.cs index f331d99e..654102d5 100644 --- a/QSB/Player/Events/PlayerSectorEvent.cs +++ b/QSB/Player/Events/PlayerSectorEvent.cs @@ -1,6 +1,7 @@ using OWML.Common; using QSB.Events; using QSB.SectorSync.WorldObjects; +using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using QSB.WorldSync.Events; @@ -36,7 +37,7 @@ namespace QSB.Player.Events return; } - var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); + var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); QSBCore.UnityEvents.RunWhen(() => transformSync?.SyncedTransform != null, () => transformSync?.SetReferenceSector(sector)); diff --git a/QSB/Player/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs index 74fec7ee..6071b19d 100644 --- a/QSB/Player/Events/PlayerStatesRequestEvent.cs +++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs @@ -3,6 +3,7 @@ using QSB.CampfireSync.WorldObjects; using QSB.Events; using QSB.Messaging; using QSB.QuantumSync; +using QSB.TransformSync; using QSB.TranslationSync; using QSB.TranslationSync.WorldObjects; using QSB.Utility; @@ -30,7 +31,7 @@ namespace QSB.Player.Events { DebugLog.DebugWrite($"Get state request from {message.FromId} - isServer?{server}"); QSBEventManager.FireEvent(EventNames.QSBServerSendPlayerStates); - foreach (var item in QSBPlayerManager.GetSyncObjects() + foreach (var item in QSBPlayerManager.GetSyncObjects() .Where(x => x != null && x.IsReady && x.ReferenceSector != null)) { QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); diff --git a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs index 12013428..67a60670 100644 --- a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs +++ b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs @@ -1,5 +1,6 @@ using OWML.Common; using QSB.Events; +using QSB.TransformSync; using QSB.Utility; namespace QSB.Player.Events @@ -32,7 +33,7 @@ namespace QSB.Player.Events { DebugLog.DebugWrite($"Received playerstate of player ID {message.AboutId}", MessageType.Info); QSBCore.UnityEvents.RunWhen( - () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, + () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, () => QSBPlayerManager.HandleFullStateMessage(message)); } } diff --git a/QSB/Player/QSBPlayerManager.cs b/QSB/Player/QSBPlayerManager.cs index 1b381a15..65318dd2 100644 --- a/QSB/Player/QSBPlayerManager.cs +++ b/QSB/Player/QSBPlayerManager.cs @@ -1,5 +1,6 @@ using OWML.Common; using QSB.Player.Events; +using QSB.Player.TransformSync; using QSB.Tools; using QSB.TransformSync; using QSB.Utility; diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/Player/TransformSync/PlayerCameraSync.cs similarity index 92% rename from QSB/TransformSync/PlayerCameraSync.cs rename to QSB/Player/TransformSync/PlayerCameraSync.cs index f03d2509..6095d349 100644 --- a/QSB/TransformSync/PlayerCameraSync.cs +++ b/QSB/Player/TransformSync/PlayerCameraSync.cs @@ -1,12 +1,13 @@ using QSB.Events; using QSB.Player; using QSB.Tools; +using QSB.TransformSync; using QSB.Utility; using UnityEngine; -namespace QSB.TransformSync +namespace QSB.Player.TransformSync { - public class PlayerCameraSync : TransformSync + public class PlayerCameraSync : SyncObjectTransformSync { protected override Transform InitLocalTransform() { diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs similarity index 94% rename from QSB/TransformSync/PlayerTransformSync.cs rename to QSB/Player/TransformSync/PlayerTransformSync.cs index e56cb79e..73ddf067 100644 --- a/QSB/TransformSync/PlayerTransformSync.cs +++ b/QSB/Player/TransformSync/PlayerTransformSync.cs @@ -1,11 +1,12 @@ using QSB.Animation; using QSB.Instruments; using QSB.Player; +using QSB.TransformSync; using UnityEngine; -namespace QSB.TransformSync +namespace QSB.Player.TransformSync { - public class PlayerTransformSync : TransformSync + public class PlayerTransformSync : SyncObjectTransformSync { public static PlayerTransformSync LocalInstance { get; private set; } diff --git a/QSB/TransformSync/PlayerProbeSync.cs b/QSB/ProbeSync/TransformSync/PlayerProbeSync.cs similarity index 95% rename from QSB/TransformSync/PlayerProbeSync.cs rename to QSB/ProbeSync/TransformSync/PlayerProbeSync.cs index 1b560a8d..7f4ae1bf 100644 --- a/QSB/TransformSync/PlayerProbeSync.cs +++ b/QSB/ProbeSync/TransformSync/PlayerProbeSync.cs @@ -1,12 +1,13 @@ using OWML.Common; using QSB.Player; using QSB.Tools; +using QSB.TransformSync; using QSB.Utility; using UnityEngine; -namespace QSB.TransformSync +namespace QSB.ProbeSync.TransformSync { - public class PlayerProbeSync : TransformSync + public class PlayerProbeSync : SyncObjectTransformSync { private Transform _disabledSocket; diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index 02f62f3a..7992f6d3 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -228,7 +228,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -302,19 +302,19 @@ - + - + - + diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs index ba190d51..3b173e58 100644 --- a/QSB/QSBCore.cs +++ b/QSB/QSBCore.cs @@ -9,6 +9,7 @@ using QSB.ItemSync; using QSB.OrbSync; using QSB.Patches; using QSB.Player; +using QSB.Player.TransformSync; using QSB.PoolSync; using QSB.QuantumSync; using QSB.QuantumSync.WorldObjects; diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index df07397b..ba2a92a3 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -4,9 +4,14 @@ using QSB.Animation; using QSB.DeathSync; using QSB.Events; using QSB.Instruments; +using QSB.OrbSync.TransformSync; using QSB.Patches; using QSB.Player; +using QSB.Player.TransformSync; using QSB.PoolSync; +using QSB.ProbeSync.TransformSync; +using QSB.RoastingSync.TransformSync; +using QSB.ShipSync.TransformSync; using QSB.TimeSync; using QSB.TransformSync; using QSB.Utility; diff --git a/QSB/TransformSync/RoastingStickTransformSync.cs b/QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs similarity index 96% rename from QSB/TransformSync/RoastingStickTransformSync.cs rename to QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs index 1bd8122c..ab94f769 100644 --- a/QSB/TransformSync/RoastingStickTransformSync.cs +++ b/QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs @@ -1,13 +1,14 @@ using OWML.Utils; using QSB.Player; using QSB.RoastingSync; +using QSB.TransformSync; using QSB.Utility; using System.Linq; using UnityEngine; -namespace QSB.TransformSync +namespace QSB.RoastingSync.TransformSync { - internal class RoastingStickTransformSync : TransformSync + internal class RoastingStickTransformSync : SyncObjectTransformSync { private Transform _stickTip; private Transform _networkStickTip => gameObject.transform.GetChild(0); diff --git a/QSB/SectorSync/QSBSectorManager.cs b/QSB/SectorSync/QSBSectorManager.cs index d6345750..3178db04 100644 --- a/QSB/SectorSync/QSBSectorManager.cs +++ b/QSB/SectorSync/QSBSectorManager.cs @@ -21,7 +21,7 @@ namespace QSB.SectorSync public void Invoke() { - QSBPlayerManager.GetSyncObjects() + QSBPlayerManager.GetSyncObjects() .Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector); } @@ -54,7 +54,7 @@ namespace QSB.SectorSync IsReady = QSBWorldSync.GetWorldObjects().Any(); } - private void CheckTransformSyncSector(TransformSync.TransformSync transformSync) + private void CheckTransformSyncSector(TransformSync.SyncObjectTransformSync transformSync) { var syncedTransform = transformSync.SyncedTransform; if (syncedTransform == null || syncedTransform.position == Vector3.zero) diff --git a/QSB/TransformSync/ShipTransformSync.cs b/QSB/ShipSync/TransformSync/ShipTransformSync.cs similarity index 94% rename from QSB/TransformSync/ShipTransformSync.cs rename to QSB/ShipSync/TransformSync/ShipTransformSync.cs index 81cf02ce..4d082f91 100644 --- a/QSB/TransformSync/ShipTransformSync.cs +++ b/QSB/ShipSync/TransformSync/ShipTransformSync.cs @@ -1,9 +1,10 @@ using QSB.Player; +using QSB.TransformSync; using UnityEngine; -namespace QSB.TransformSync +namespace QSB.ShipSync.TransformSync { - public class ShipTransformSync : TransformSync + public class ShipTransformSync : SyncObjectTransformSync { private Transform GetShipModel() => Locator.GetShipTransform(); diff --git a/QSB/TransformSync/TransformSync.cs b/QSB/TransformSync/SyncObjectTransformSync.cs similarity index 98% rename from QSB/TransformSync/TransformSync.cs rename to QSB/TransformSync/SyncObjectTransformSync.cs index 80a830ce..4c49d0b2 100644 --- a/QSB/TransformSync/TransformSync.cs +++ b/QSB/TransformSync/SyncObjectTransformSync.cs @@ -1,5 +1,6 @@ using OWML.Common; using QSB.Player; +using QSB.Player.TransformSync; using QSB.SectorSync.WorldObjects; using QSB.Utility; using System.Linq; @@ -7,7 +8,7 @@ using UnityEngine; namespace QSB.TransformSync { - public abstract class TransformSync : PlayerSyncObject + public abstract class SyncObjectTransformSync : PlayerSyncObject { public abstract bool IsReady { get; } diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs index 54f76362..d2a1310e 100644 --- a/QSB/Utility/DebugActions.cs +++ b/QSB/Utility/DebugActions.cs @@ -1,5 +1,6 @@ using OWML.Utils; using QSB.Player; +using QSB.Player.TransformSync; using QSB.TransformSync; using System.Linq; using UnityEngine; diff --git a/QSB/Utility/Extensions.cs b/QSB/Utility/Extensions.cs index 051c0fbd..f614345c 100644 --- a/QSB/Utility/Extensions.cs +++ b/QSB/Utility/Extensions.cs @@ -1,4 +1,5 @@ using OWML.Common; +using QSB.Player.TransformSync; using QSB.TransformSync; using QuantumUNET; using System; diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs index e6bbad14..4c5a5ffe 100644 --- a/QSB/WorldSync/QSBWorldSync.cs +++ b/QSB/WorldSync/QSBWorldSync.cs @@ -1,4 +1,5 @@ using OWML.Common; +using QSB.OrbSync.TransformSync; using QSB.OrbSync.WorldObjects; using QSB.TransformSync; using QSB.Utility; From a806db5424234fb2de501971d0022ad5895789ac Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 11 Apr 2021 17:08:18 +0100 Subject: [PATCH 6/6] move probe events --- QSB/Events/QSBEvent.cs | 1 - QSB/Events/QSBEventManager.cs | 1 + QSB/Player/PlayerInfo.cs | 1 + QSB/Player/QSBPlayerManager.cs | 1 - QSB/Player/TransformSync/PlayerCameraSync.cs | 1 - QSB/Player/TransformSync/PlayerTransformSync.cs | 1 - QSB/{Tools => ProbeSync}/Events/PlayerProbeEvent.cs | 2 +- QSB/{Tools => ProbeSync}/Events/PlayerProbeLauncherEvent.cs | 2 +- QSB/{Tools => ProbeSync}/QSBProbe.cs | 2 +- QSB/QSB.csproj | 6 +++--- QSB/QSBCore.cs | 1 - QSB/QSBNetworkManager.cs | 1 - .../TransformSync/RoastingStickTransformSync.cs | 1 - QSB/Tools/PlayerToolsManager.cs | 1 + QSB/Utility/DebugActions.cs | 1 - QSB/Utility/Extensions.cs | 1 - QSB/WorldSync/QSBWorldSync.cs | 1 - 17 files changed, 9 insertions(+), 16 deletions(-) rename QSB/{Tools => ProbeSync}/Events/PlayerProbeEvent.cs (97%) rename QSB/{Tools => ProbeSync}/Events/PlayerProbeLauncherEvent.cs (97%) rename QSB/{Tools => ProbeSync}/QSBProbe.cs (91%) diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs index ff9d8796..4f16c4b6 100644 --- a/QSB/Events/QSBEvent.cs +++ b/QSB/Events/QSBEvent.cs @@ -2,7 +2,6 @@ using QSB.Messaging; using QSB.Player; using QSB.Player.TransformSync; -using QSB.TransformSync; using QSB.Utility; using QuantumUNET; using QuantumUNET.Components; diff --git a/QSB/Events/QSBEventManager.cs b/QSB/Events/QSBEventManager.cs index 4f98cc97..fbb51fc5 100644 --- a/QSB/Events/QSBEventManager.cs +++ b/QSB/Events/QSBEventManager.cs @@ -10,6 +10,7 @@ using QSB.ItemSync.Events; using QSB.LogSync.Events; using QSB.OrbSync.Events; using QSB.Player.Events; +using QSB.ProbeSync.Events; using QSB.QuantumSync.Events; using QSB.RoastingSync.Events; using QSB.StatueSync.Events; diff --git a/QSB/Player/PlayerInfo.cs b/QSB/Player/PlayerInfo.cs index 933c3d65..d4e3665a 100644 --- a/QSB/Player/PlayerInfo.cs +++ b/QSB/Player/PlayerInfo.cs @@ -1,5 +1,6 @@ using QSB.Animation; using QSB.CampfireSync.WorldObjects; +using QSB.ProbeSync; using QSB.QuantumSync; using QSB.RoastingSync; using QSB.Tools; diff --git a/QSB/Player/QSBPlayerManager.cs b/QSB/Player/QSBPlayerManager.cs index 65318dd2..34da4f85 100644 --- a/QSB/Player/QSBPlayerManager.cs +++ b/QSB/Player/QSBPlayerManager.cs @@ -2,7 +2,6 @@ using QSB.Player.Events; using QSB.Player.TransformSync; using QSB.Tools; -using QSB.TransformSync; using QSB.Utility; using System; using System.Collections.Generic; diff --git a/QSB/Player/TransformSync/PlayerCameraSync.cs b/QSB/Player/TransformSync/PlayerCameraSync.cs index 6095d349..abece828 100644 --- a/QSB/Player/TransformSync/PlayerCameraSync.cs +++ b/QSB/Player/TransformSync/PlayerCameraSync.cs @@ -1,5 +1,4 @@ using QSB.Events; -using QSB.Player; using QSB.Tools; using QSB.TransformSync; using QSB.Utility; diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs index 73ddf067..539e2766 100644 --- a/QSB/Player/TransformSync/PlayerTransformSync.cs +++ b/QSB/Player/TransformSync/PlayerTransformSync.cs @@ -1,6 +1,5 @@ using QSB.Animation; using QSB.Instruments; -using QSB.Player; using QSB.TransformSync; using UnityEngine; diff --git a/QSB/Tools/Events/PlayerProbeEvent.cs b/QSB/ProbeSync/Events/PlayerProbeEvent.cs similarity index 97% rename from QSB/Tools/Events/PlayerProbeEvent.cs rename to QSB/ProbeSync/Events/PlayerProbeEvent.cs index bda5b516..973b8df0 100644 --- a/QSB/Tools/Events/PlayerProbeEvent.cs +++ b/QSB/ProbeSync/Events/PlayerProbeEvent.cs @@ -2,7 +2,7 @@ using QSB.Messaging; using QSB.Player; -namespace QSB.Tools.Events +namespace QSB.ProbeSync.Events { public class PlayerProbeEvent : QSBEvent { diff --git a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs b/QSB/ProbeSync/Events/PlayerProbeLauncherEvent.cs similarity index 97% rename from QSB/Tools/Events/PlayerProbeLauncherEvent.cs rename to QSB/ProbeSync/Events/PlayerProbeLauncherEvent.cs index d744b191..ed6c707d 100644 --- a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs +++ b/QSB/ProbeSync/Events/PlayerProbeLauncherEvent.cs @@ -2,7 +2,7 @@ using QSB.Messaging; using QSB.Player; -namespace QSB.Tools.Events +namespace QSB.ProbeSync.Events { public class PlayerProbeLauncherEvent : QSBEvent { diff --git a/QSB/Tools/QSBProbe.cs b/QSB/ProbeSync/QSBProbe.cs similarity index 91% rename from QSB/Tools/QSBProbe.cs rename to QSB/ProbeSync/QSBProbe.cs index d7ce49fc..212adc51 100644 --- a/QSB/Tools/QSBProbe.cs +++ b/QSB/ProbeSync/QSBProbe.cs @@ -1,7 +1,7 @@ using QSB.Utility; using UnityEngine; -namespace QSB.Tools +namespace QSB.ProbeSync { public class QSBProbe : MonoBehaviour { diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index 7992f6d3..9c0a9055 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -242,7 +242,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -286,7 +286,7 @@ - + diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs index 3b173e58..eb3b97eb 100644 --- a/QSB/QSBCore.cs +++ b/QSB/QSBCore.cs @@ -16,7 +16,6 @@ using QSB.QuantumSync.WorldObjects; using QSB.SectorSync; using QSB.StatueSync; using QSB.TimeSync; -using QSB.TransformSync; using QSB.TranslationSync; using QSB.Utility; using QSB.WorldSync; diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index ba2a92a3..a0fa5687 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -13,7 +13,6 @@ using QSB.ProbeSync.TransformSync; using QSB.RoastingSync.TransformSync; using QSB.ShipSync.TransformSync; using QSB.TimeSync; -using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using QuantumUNET; diff --git a/QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs b/QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs index ab94f769..e3545720 100644 --- a/QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs +++ b/QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs @@ -1,6 +1,5 @@ using OWML.Utils; using QSB.Player; -using QSB.RoastingSync; using QSB.TransformSync; using QSB.Utility; using System.Linq; diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs index 2e82f252..a1e80d52 100644 --- a/QSB/Tools/PlayerToolsManager.cs +++ b/QSB/Tools/PlayerToolsManager.cs @@ -1,5 +1,6 @@ using OWML.Utils; using QSB.Player; +using QSB.ProbeSync; using QSB.Utility; using System.Linq; using UnityEngine; diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs index d2a1310e..db350b41 100644 --- a/QSB/Utility/DebugActions.cs +++ b/QSB/Utility/DebugActions.cs @@ -1,7 +1,6 @@ using OWML.Utils; using QSB.Player; using QSB.Player.TransformSync; -using QSB.TransformSync; using System.Linq; using UnityEngine; diff --git a/QSB/Utility/Extensions.cs b/QSB/Utility/Extensions.cs index f614345c..0f2f5659 100644 --- a/QSB/Utility/Extensions.cs +++ b/QSB/Utility/Extensions.cs @@ -1,6 +1,5 @@ using OWML.Common; using QSB.Player.TransformSync; -using QSB.TransformSync; using QuantumUNET; using System; using System.Reflection; diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs index 4c5a5ffe..830cee88 100644 --- a/QSB/WorldSync/QSBWorldSync.cs +++ b/QSB/WorldSync/QSBWorldSync.cs @@ -1,7 +1,6 @@ using OWML.Common; using QSB.OrbSync.TransformSync; using QSB.OrbSync.WorldObjects; -using QSB.TransformSync; using QSB.Utility; using System; using System.Collections.Generic;