cleanup...

QSB/Animation/AnimationSync.cs

@@ -1,5 +1,6 @@
 using OWML.ModHelper.Events;
 using QSB.Events;
+using QSB.Player;
 using System;
 using System.Linq;
 using UnityEngine;

QSB/Animation/Events/AnimTriggerEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Animation.Events
 {

QSB/Animation/Events/PlayerSuitEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Animation
 {

QSB/ConversationSync/ConversationManager.cs

@@ -1,6 +1,7 @@
 using OWML.Common;
 using OWML.ModHelper.Events;
 using QSB.Events;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 using System.Collections.Generic;

QSB/ConversationSync/ConversationPatches.cs

@@ -1,4 +1,5 @@
 using OWML.Common;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 using System.Collections.Generic;

QSB/ConversationSync/Events/ConversationEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.WorldSync;
 
 namespace QSB.ConversationSync.Events

QSB/ConversationSync/Events/ConversationStartEndEvent.cs

@@ -1,6 +1,7 @@
 using OWML.Common;
 using OWML.ModHelper.Events;
 using QSB.Events;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 using System.Linq;

QSB/DeathSync/Events/PlayerDeathEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.Utility;
 
 namespace QSB.DeathSync.Events

QSB/Events/PlayerStateEvent.cs

@@ -1,11 +1,13 @@
 using QSB.Messaging;
+using QSB.Player;
+using QSB.Player.Events;
 using UnityEngine.Networking;
 
 namespace QSB.Events
 {
-    public class PlayerState : NetworkBehaviour
+    public class PlayerStateEvent : NetworkBehaviour
     {
-        public static PlayerState LocalInstance { get; private set; }
+        public static PlayerStateEvent LocalInstance { get; private set; }
 
         private MessageHandler<PlayerStateMessage> _messageHandler;
 

QSB/Events/QSBEvent.cs

@@ -1,4 +1,5 @@
 using QSB.Messaging;
+using QSB.Player;
 using QSB.TransformSync;
 using UnityEngine.Networking;
 

QSB/Events/QSBEventManager.cs

@@ -7,6 +7,7 @@ using QSB.ElevatorSync.Events;
 using QSB.GeyserSync.Events;
 using QSB.Instruments.Events;
 using QSB.OrbSync.Events;
+using QSB.Player.Events;
 using QSB.TimeSync.Events;
 using QSB.Tools.Events;
 using QSB.TransformSync;

QSB/Instruments/Events/PlayInstrumentEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.Utility;
 using System;
 

QSB/Instruments/InstrumentsManager.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Instruments.QSBCamera;
+using QSB.Player;
 using UnityEngine;
 
 namespace QSB.Instruments

QSB/Player/Events/PlayerJoinEvent.cs

@@ -1,8 +1,9 @@
 using OWML.Common;
+using QSB.Events;
 using QSB.Messaging;
 using QSB.Utility;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerJoinEvent : QSBEvent<PlayerJoinMessage>
     {

QSB/Player/Events/PlayerJoinMessage.cs

@@ -1,6 +1,7 @@
-using UnityEngine.Networking;
+using QSB.Messaging;
+using UnityEngine.Networking;
 
-namespace QSB.Messaging
+namespace QSB.Player.Events
 {
     public class PlayerJoinMessage : PlayerMessage
     {

QSB/Player/Events/PlayerLeaveEvent.cs

@@ -1,9 +1,10 @@
 using OWML.Common;
+using QSB.Events;
 using QSB.Messaging;
 using QSB.Utility;
 using System.Linq;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerLeaveEvent : QSBEvent<PlayerLeaveMessage>
     {

QSB/Player/Events/PlayerLeaveMessage.cs

@@ -1,8 +1,9 @@
-using System;
+using QSB.Messaging;
+using System;
 using System.Linq;
 using UnityEngine.Networking;
 
-namespace QSB.Messaging
+namespace QSB.Player.Events
 {
     public class PlayerLeaveMessage : PlayerMessage
     {

QSB/Player/Events/PlayerReadyEvent.cs

@@ -1,10 +1,11 @@
 using OWML.Common;
+using QSB.Events;
 using QSB.Messaging;
 using QSB.TransformSync;
 using QSB.Utility;
 using System.Linq;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerReadyEvent : QSBEvent<ToggleMessage>
     {
@@ -30,7 +31,7 @@ namespace QSB.Events
                 return;
             }
             QSBPlayerManager.GetPlayer(message.AboutId).IsReady = message.ToggleValue;
-            PlayerState.LocalInstance.Send();
+            PlayerStateEvent.LocalInstance.Send();
         }
 
         public override void OnReceiveRemote(ToggleMessage message)

QSB/Player/Events/PlayerStateMessage.cs

@@ -1,6 +1,7 @@
-using UnityEngine.Networking;
+using QSB.Messaging;
+using UnityEngine.Networking;
 
-namespace QSB.Messaging
+namespace QSB.Player.Events
 {
     public class PlayerStateMessage : PlayerMessage
     {

QSB/Player/Events/PlayerStatesRequestEvent.cs

@@ -1,9 +1,10 @@
-using QSB.Messaging;
+using QSB.Events;
+using QSB.Messaging;
 using QSB.TransformSync;
 using QSB.Utility;
 using System.Linq;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerStatesRequestEvent : QSBEvent<PlayerMessage>
     {
@@ -23,7 +24,7 @@ namespace QSB.Events
         public override void OnServerReceive(PlayerMessage message)
         {
             DebugLog.DebugWrite($"[S] Get state request from {message.FromId}");
-            PlayerState.LocalInstance.Send();
+            PlayerStateEvent.LocalInstance.Send();
             foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
                 .Where(x => x != null && x.IsReady && x.ReferenceSector != null))
             {

QSB/Player/PlayerInfo.cs

@@ -6,7 +6,7 @@ using QSB.Utility;
 using System.Linq;
 using UnityEngine;
 
-namespace QSB
+namespace QSB.Player
 {
     public class PlayerInfo
     {

QSB/Player/PlayerSyncObject.cs

@@ -1,6 +1,6 @@
 using UnityEngine.Networking;
 
-namespace QSB
+namespace QSB.Player
 {
     public abstract class PlayerSyncObject : NetworkBehaviour
     {

QSB/Player/QSBPlayerManager.cs

@@ -1,5 +1,6 @@
 using OWML.Common;
 using QSB.Messaging;
+using QSB.Player.Events;
 using QSB.TransformSync;
 using QSB.Utility;
 using System.Collections.Generic;
@@ -7,7 +8,7 @@ using System.Diagnostics;
 using System.Linq;
 using UnityEngine.Networking;
 
-namespace QSB
+namespace QSB.Player
 {
     public static class QSBPlayerManager
     {

QSB/Player/State.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace QSB
+namespace QSB.Player
 {
     [Flags]
     public enum State

QSB/QSB.csproj

@@ -159,32 +159,32 @@
     <Compile Include="OrbSync\Events\OrbUserEvent.cs" />
     <Compile Include="OrbSync\QSBOrbSlot.cs" />
     <Compile Include="Patches\QSBPatchManager.cs" />
-    <Compile Include="PlayerSyncObject.cs" />
+    <Compile Include="Player\PlayerSyncObject.cs" />
     <Compile Include="QSBNetworkLobby.cs" />
     <Compile Include="Patches\QSBPatch.cs" />
     <Compile Include="Patches\QSBPatchTypes.cs" />
     <Compile Include="QSBSceneManager.cs" />
     <Compile Include="TimeSync\WakeUpPatches.cs" />
     <Compile Include="Tools\Events\PlayerFlashlightEvent.cs" />
-    <Compile Include="Events\PlayerJoinEvent.cs" />
+    <Compile Include="Player\Events\PlayerJoinEvent.cs" />
-    <Compile Include="Events\PlayerLeaveEvent.cs" />
+    <Compile Include="Player\Events\PlayerLeaveEvent.cs" />
     <Compile Include="Tools\Events\PlayerProbeEvent.cs" />
-    <Compile Include="Events\PlayerReadyEvent.cs" />
+    <Compile Include="Player\Events\PlayerReadyEvent.cs" />
     <Compile Include="TransformSync\NomaiOrbTransformSync.cs" />
     <Compile Include="TransformSync\PlayerSectorEvent.cs" />
-    <Compile Include="Events\PlayerStatesRequestEvent.cs" />
+    <Compile Include="Player\Events\PlayerStatesRequestEvent.cs" />
-    <Compile Include="Animation\PlayerSuitEvent.cs" />
+    <Compile Include="Animation\Events\PlayerSuitEvent.cs" />
     <Compile Include="TimeSync\Events\ServerTimeEvent.cs" />
     <Compile Include="GeyserSync\Events\GeyserEvent.cs" />
     <Compile Include="GeyserSync\GeyserManager.cs" />
     <Compile Include="GeyserSync\QSBGeyser.cs" />
     <Compile Include="DeathSync\Events\PlayerDeathMessage.cs" />
-    <Compile Include="Messaging\PlayerLeaveMessage.cs" />
+    <Compile Include="Player\Events\PlayerLeaveMessage.cs" />
     <Compile Include="Tools\Events\PlayerProbeLauncherEvent.cs" />
     <Compile Include="Tools\Events\PlayerSignalscopeEvent.cs" />
     <Compile Include="Tools\Events\PlayerTranslatorEvent.cs" />
     <Compile Include="Events\QSBEvent.cs" />
-    <Compile Include="Messaging\PlayerJoinMessage.cs" />
+    <Compile Include="Player\Events\PlayerJoinMessage.cs" />
     <Compile Include="Messaging\ToggleMessage.cs" />
     <Compile Include="TransformSync\QSBSector.cs" />
     <Compile Include="TransformSync\QSBSectorManager.cs" />
@@ -200,18 +200,18 @@
     <Compile Include="TransformSync\PlayerProbeSync.cs" />
     <Compile Include="Utility\DebugActions.cs" />
     <Compile Include="Events\QSBEventManager.cs" />
-    <Compile Include="Messaging\PlayerStateMessage.cs" />
+    <Compile Include="Player\Events\PlayerStateMessage.cs" />
-    <Compile Include="Events\PlayerState.cs" />
+    <Compile Include="Events\PlayerStateEvent.cs" />
     <Compile Include="DeathSync\Necronomicon.cs" />
     <Compile Include="Utility\DebugLog.cs" />
     <Compile Include="Messaging\PlayerMessage.cs" />
     <Compile Include="Messaging\MessageHandler.cs" />
     <Compile Include="Messaging\EventType.cs" />
-    <Compile Include="PlayerInfo.cs" />
+    <Compile Include="Player\PlayerInfo.cs" />
-    <Compile Include="State.cs" />
+    <Compile Include="Player\State.cs" />
     <Compile Include="DeathSync\PreventShipDestruction.cs" />
     <Compile Include="DeathSync\RespawnOnDeath.cs" />
-    <Compile Include="QSBPlayerManager.cs" />
+    <Compile Include="Player\QSBPlayerManager.cs" />
     <Compile Include="TransformSync\PlayerCameraSync.cs" />
     <Compile Include="Utility\FlagsHelper.cs" />
     <Compile Include="TransformSync\PlayerHUDMarker.cs" />

QSB/QSBNetworkManager.cs

@@ -8,6 +8,7 @@ using QSB.Events;
 using QSB.GeyserSync;
 using QSB.OrbSync;
 using QSB.Patches;
+using QSB.Player;
 using QSB.TimeSync;
 using QSB.TransformSync;
 using QSB.Utility;
@@ -101,7 +102,7 @@ namespace QSB
             channels.Add(QosType.Reliable);
             channels.Add(QosType.Unreliable);
 
-            gameObject.AddComponent<Events.PlayerState>();
+            gameObject.AddComponent<Events.PlayerStateEvent>();
         }
 
         public override void OnStartServer()

QSB/Tools/Events/PlayerFlashlightEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {

QSB/Tools/Events/PlayerProbeEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {

QSB/Tools/Events/PlayerProbeLauncherEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {

QSB/Tools/Events/PlayerSignalscopeEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {

QSB/Tools/Events/PlayerTranslatorEvent.cs

@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {

QSB/Tools/PlayerToolsManager.cs

@@ -1,4 +1,5 @@
 using OWML.ModHelper.Events;
+using QSB.Player;
 using QSB.Utility;
 using System.Linq;
 using UnityEngine;

QSB/TransformSync/PlayerCameraSync.cs

@@ -1,4 +1,5 @@
 using QSB.Events;
+using QSB.Player;
 using QSB.Tools;
 using QSB.Utility;
 using UnityEngine;

QSB/TransformSync/PlayerHUDMarker.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using QSB.Player;
+using UnityEngine;
 
 namespace QSB.TransformSync
 {

QSB/TransformSync/PlayerProbeSync.cs

@@ -1,4 +1,5 @@
 using OWML.Common;
+using QSB.Player;
 using QSB.Tools;
 using QSB.Utility;
 using UnityEngine;

QSB/TransformSync/PlayerSectorEvent.cs

@@ -1,6 +1,7 @@
 using OWML.Common;
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 

QSB/TransformSync/PlayerTransformSync.cs

@@ -1,4 +1,5 @@
 using QSB.Animation;
+using QSB.Player;
 using UnityEngine;
 
 namespace QSB.TransformSync

QSB/TransformSync/SectorSync.cs

@@ -1,4 +1,5 @@
 using QSB.Events;
+using QSB.Player;
 using System.Linq;
 using UnityEngine;
 

QSB/TransformSync/ShipTransformSync.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using QSB.Player;
+using UnityEngine;
 
 namespace QSB.TransformSync
 {

QSB/TransformSync/TransformSync.cs

@@ -1,4 +1,5 @@
 using OWML.Common;
+using QSB.Player;
 using QSB.Utility;
 using UnityEngine;