Merge pull request #278 from misternebula/model-ship-sync-(rigidbody-test)

Cleanup

QSB/Events/QSBEvent.cs

@@ -1,7 +1,7 @@
 using OWML.Common;
 using QSB.Messaging;
 using QSB.Player;
-using QSB.TransformSync;
+using QSB.Player.TransformSync;
 using QSB.Utility;
 using QuantumUNET;
 using QuantumUNET.Components;

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;

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
 	{

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<TransformSync.TransformSync>(message.AboutId);
+			var transformSync = QSBPlayerManager.GetSyncObject<SyncObjectTransformSync>(message.AboutId);
 
 			QSBCore.UnityEvents.RunWhen(() => transformSync?.SyncedTransform != null,
 				() => transformSync?.SetReferenceSector(sector));

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<TransformSync.TransformSync>()
+			foreach (var item in QSBPlayerManager.GetSyncObjects<SyncObjectTransformSync>()
 				.Where(x => x != null && x.IsReady && x.ReferenceSector != null))
 			{
 				QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);

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<TransformSync.TransformSync>(message.AboutId) != null,
+				() => QSBPlayerManager.GetSyncObject<SyncObjectTransformSync>(message.AboutId) != null,
 				() => QSBPlayerManager.HandleFullStateMessage(message));
 		}
 	}

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;

QSB/Player/QSBPlayerManager.cs

@@ -1,7 +1,7 @@
 using OWML.Common;
 using QSB.Player.Events;
+using QSB.Player.TransformSync;
 using QSB.Tools;
-using QSB.TransformSync;
 using QSB.Utility;
 using System;
 using System.Collections.Generic;

QSB/Player/TransformSync/PlayerCameraSync.cs

@@ -1,12 +1,12 @@
 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()
 		{

QSB/Player/TransformSync/PlayerTransformSync.cs

@@ -1,11 +1,11 @@
 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; }
 

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<ToggleMessage>
 	{

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<ToggleMessage>
 	{

QSB/ProbeSync/QSBProbe.cs

@@ -1,7 +1,7 @@
 using QSB.Utility;
 using UnityEngine;
 
-namespace QSB.Tools
+namespace QSB.ProbeSync
 {
 	public class QSBProbe : MonoBehaviour
 	{

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;
 

QSB/QSB.csproj

@@ -228,7 +228,7 @@
     <Compile Include="StatueSync\Events\StartStatueMessage.cs" />
     <Compile Include="StatueSync\Patches\StatuePatches.cs" />
     <Compile Include="StatueSync\StatueManager.cs" />
-    <Compile Include="TransformSync\RoastingStickTransformSync.cs" />
+    <Compile Include="RoastingSync\TransformSync\RoastingStickTransformSync.cs" />
     <Compile Include="TranslationSync\Events\SetAsTranslatedEvent.cs" />
     <Compile Include="TranslationSync\Events\SetAsTranslatedMessage.cs" />
     <Compile Include="TranslationSync\NomaiTextType.cs" />
@@ -242,9 +242,9 @@
     <Compile Include="TimeSync\Patches\WakeUpPatches.cs" />
     <Compile Include="Tools\Events\PlayerFlashlightEvent.cs" />
     <Compile Include="Player\Events\PlayerJoinEvent.cs" />
-    <Compile Include="Tools\Events\PlayerProbeEvent.cs" />
+    <Compile Include="ProbeSync\Events\PlayerProbeEvent.cs" />
     <Compile Include="Player\Events\PlayerReadyEvent.cs" />
-    <Compile Include="TransformSync\NomaiOrbTransformSync.cs" />
+    <Compile Include="OrbSync\TransformSync\NomaiOrbTransformSync.cs" />
     <Compile Include="Player\Events\PlayerSectorEvent.cs" />
     <Compile Include="Player\Events\PlayerStatesRequestEvent.cs" />
     <Compile Include="Animation\Events\PlayerSuitEvent.cs" />
@@ -252,7 +252,7 @@
     <Compile Include="GeyserSync\Events\GeyserEvent.cs" />
     <Compile Include="GeyserSync\GeyserManager.cs" />
     <Compile Include="GeyserSync\WorldObjects\QSBGeyser.cs" />
-    <Compile Include="Tools\Events\PlayerProbeLauncherEvent.cs" />
+    <Compile Include="ProbeSync\Events\PlayerProbeLauncherEvent.cs" />
     <Compile Include="Tools\Events\PlayerSignalscopeEvent.cs" />
     <Compile Include="Tools\Events\PlayerTranslatorEvent.cs" />
     <Compile Include="Events\QSBEvent.cs" />
@@ -260,7 +260,7 @@
     <Compile Include="Messaging\ToggleMessage.cs" />
     <Compile Include="SectorSync\WorldObjects\QSBSector.cs" />
     <Compile Include="SectorSync\SectorSync.cs" />
-    <Compile Include="TransformSync\TransformSync.cs" />
+    <Compile Include="TransformSync\SyncObjectTransformSync.cs" />
     <Compile Include="Utility\CustomCallbacks.cs" />
     <Compile Include="Utility\DebugBoxManager.cs" />
     <Compile Include="Utility\DebugZOverride.cs" />
@@ -286,10 +286,10 @@
     <Compile Include="WorldSync\Events\EnumWorldObjectMessage.cs" />
     <Compile Include="WorldSync\Events\WorldObjectMessage.cs" />
     <Compile Include="Tools\QSBFlashlight.cs" />
-    <Compile Include="Tools\QSBProbe.cs" />
+    <Compile Include="ProbeSync\QSBProbe.cs" />
     <Compile Include="Tools\QSBTool.cs" />
     <Compile Include="Tools\ToolType.cs" />
-    <Compile Include="TransformSync\PlayerProbeSync.cs" />
+    <Compile Include="ProbeSync\TransformSync\PlayerProbeSync.cs" />
     <Compile Include="Utility\DebugActions.cs" />
     <Compile Include="Events\QSBEventManager.cs" />
     <Compile Include="Player\Events\PlayerStateMessage.cs" />
@@ -302,19 +302,19 @@
     <Compile Include="Player\State.cs" />
     <Compile Include="DeathSync\RespawnOnDeath.cs" />
     <Compile Include="Player\QSBPlayerManager.cs" />
-    <Compile Include="TransformSync\PlayerCameraSync.cs" />
+    <Compile Include="Player\TransformSync\PlayerCameraSync.cs" />
     <Compile Include="Utility\FlagsHelper.cs" />
     <Compile Include="Player\PlayerHUDMarker.cs" />
     <Compile Include="Tools\PlayerToolsManager.cs" />
     <Compile Include="Utility\QuaternionHelper.cs" />
     <Compile Include="TimeSync\PreserveTimeScale.cs" />
-    <Compile Include="TransformSync\ShipTransformSync.cs" />
+    <Compile Include="ShipSync\TransformSync\ShipTransformSync.cs" />
     <Compile Include="SectorSync\QSBSectorManager.cs" />
     <Compile Include="TimeSync\Events\ServerTimeMessage.cs" />
     <Compile Include="TimeSync\WakeUpSync.cs" />
     <Compile Include="QSBNetworkManager.cs" />
     <Compile Include="QSBCore.cs" />
-    <Compile Include="TransformSync\PlayerTransformSync.cs" />
+    <Compile Include="Player\TransformSync\PlayerTransformSync.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WorldSync\FactReveal.cs" />
     <Compile Include="WorldSync\IWorldObject.cs" />

QSB/QSBCore.cs

@@ -9,13 +9,13 @@ 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;
 using QSB.SectorSync;
 using QSB.StatueSync;
 using QSB.TimeSync;
-using QSB.TransformSync;
 using QSB.TranslationSync;
 using QSB.Utility;
 using QSB.WorldSync;

QSB/QSBNetworkManager.cs

@@ -4,11 +4,15 @@ 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;
 using QSB.WorldSync;
 using QuantumUNET;

QSB/RoastingSync/TransformSync/RoastingStickTransformSync.cs

@@ -1,13 +1,13 @@
 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);

QSB/SectorSync/QSBSectorManager.cs

@@ -21,7 +21,7 @@ namespace QSB.SectorSync
 
 		public void Invoke()
 		{
-			QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
+			QSBPlayerManager.GetSyncObjects<TransformSync.SyncObjectTransformSync>()
 				.Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector);
 		}
 
@@ -54,7 +54,7 @@ namespace QSB.SectorSync
 			IsReady = QSBWorldSync.GetWorldObjects<QSBSector>().Any();
 		}
 
-		private void CheckTransformSyncSector(TransformSync.TransformSync transformSync)
+		private void CheckTransformSyncSector(TransformSync.SyncObjectTransformSync transformSync)
 		{
 			var syncedTransform = transformSync.SyncedTransform;
 			if (syncedTransform == null || syncedTransform.position == Vector3.zero)

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();
 

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;

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; }
 

QSB/Utility/DebugActions.cs

@@ -1,6 +1,6 @@
 using OWML.Utils;
 using QSB.Player;
-using QSB.TransformSync;
+using QSB.Player.TransformSync;
 using System.Linq;
 using UnityEngine;
 

QSB/Utility/Extensions.cs

@@ -1,5 +1,5 @@
 using OWML.Common;
-using QSB.TransformSync;
+using QSB.Player.TransformSync;
 using QuantumUNET;
 using System;
 using System.Reflection;

QSB/WorldSync/QSBWorldSync.cs

@@ -1,6 +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;