added "events" subnamespace

2025-02-22 12:39:51 +00:00 · 2020-11-03 17:56:48 +00:00 · 2020-11-03 17:56:48 +00:00 · 4fb2e35974
commit 4fb2e35974
parent cea3688e74
25 changed files with 50 additions and 54 deletions
--- a/QSB/Animation/Events/AnimTriggerEvent.cs
+++ b/QSB/Animation/Events/AnimTriggerEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.Animation
+namespace QSB.Animation.Events
 {
    public class AnimTriggerEvent : QSBEvent<AnimTriggerMessage>
    {
--- a/QSB/Animation/Events/AnimTriggerMessage.cs
+++ b/QSB/Animation/Events/AnimTriggerMessage.cs
@ -1,7 +1,7 @@
 using QSB.Messaging;
 using UnityEngine.Networking;

-namespace QSB.Animation
+namespace QSB.Animation.Events
 {
    public class AnimTriggerMessage : PlayerMessage
    {
--- a/QSB/ConversationSync/Events/ConversationEvent.cs
+++ b/QSB/ConversationSync/Events/ConversationEvent.cs
@ -2,7 +2,7 @@
 using QSB.Messaging;
 using QSB.WorldSync;

-namespace QSB.ConversationSync
+namespace QSB.ConversationSync.Events
 {
    public class ConversationEvent : QSBEvent<ConversationMessage>
    {
--- a/QSB/ConversationSync/Events/ConversationMessage.cs
+++ b/QSB/ConversationSync/Events/ConversationMessage.cs
@ -1,7 +1,7 @@
 using QSB.Messaging;
 using UnityEngine.Networking;

-namespace QSB.ConversationSync
+namespace QSB.ConversationSync.Events
 {
    public class ConversationMessage : PlayerMessage
    {
--- a/QSB/ConversationSync/Events/ConversationStartEndEvent.cs
+++ b/QSB/ConversationSync/Events/ConversationStartEndEvent.cs
@ -6,7 +6,7 @@ using QSB.WorldSync;
 using System.Linq;
 using UnityEngine;

-namespace QSB.ConversationSync
+namespace QSB.ConversationSync.Events
 {
    public class ConversationStartEndEvent : QSBEvent<ConversationStartEndMessage>
    {
--- a/QSB/ConversationSync/Events/ConversationStartEndMessage.cs
+++ b/QSB/ConversationSync/Events/ConversationStartEndMessage.cs
@ -1,7 +1,7 @@
 using QSB.Messaging;
 using UnityEngine.Networking;

-namespace QSB.ConversationSync
+namespace QSB.ConversationSync.Events
 {
    public class ConversationStartEndMessage : PlayerMessage
    {
--- a/QSB/DeathSync/Events/PlayerDeathEvent.cs
+++ b/QSB/DeathSync/Events/PlayerDeathEvent.cs
@ -2,7 +2,7 @@
 using QSB.Messaging;
 using QSB.Utility;

-namespace QSB.DeathSync
+namespace QSB.DeathSync.Events
 {
    public class PlayerDeathEvent : QSBEvent<PlayerDeathMessage>
    {
--- a/QSB/DeathSync/Events/PlayerDeathMessage.cs
+++ b/QSB/DeathSync/Events/PlayerDeathMessage.cs
@ -1,7 +1,7 @@
 using QSB.Messaging;
 using UnityEngine.Networking;

-namespace QSB.DeathSync
+namespace QSB.DeathSync.Events
 {
    public class PlayerDeathMessage : PlayerMessage
    {
--- a/QSB/ElevatorSync/Events/ElevatorEvent.cs
+++ b/QSB/ElevatorSync/Events/ElevatorEvent.cs
@ -2,7 +2,7 @@
 using QSB.Messaging;
 using QSB.WorldSync;

-namespace QSB.ElevatorSync
+namespace QSB.ElevatorSync.Events
 {
    public class ElevatorEvent : QSBEvent<ElevatorMessage>
    {
--- a/QSB/ElevatorSync/Events/ElevatorMessage.cs
+++ b/QSB/ElevatorSync/Events/ElevatorMessage.cs
@ -1,7 +1,7 @@
 using QSB.WorldSync;
 using UnityEngine.Networking;

-namespace QSB.ElevatorSync
+namespace QSB.ElevatorSync.Events
 {
    public class ElevatorMessage : WorldObjectMessage
    {
--- a/QSB/Events/EventList.cs
+++ b/QSB/Events/EventList.cs
@ -1,12 +1,13 @@
 using QSB.Animation;
-using QSB.ConversationSync;
-using QSB.DeathSync;
-using QSB.ElevatorSync;
-using QSB.GeyserSync;
+using QSB.Animation.Events;
+using QSB.ConversationSync.Events;
+using QSB.DeathSync.Events;
+using QSB.ElevatorSync.Events;
+using QSB.GeyserSync.Events;
 using QSB.Instruments.Events;
-using QSB.OrbSync;
-using QSB.TimeSync;
-using QSB.Tools;
+using QSB.OrbSync.Events;
+using QSB.TimeSync.Events;
+using QSB.Tools.Events;
 using QSB.TransformSync;
 using System.Collections.Generic;

--- a/QSB/GeyserSync/Events/GeyserEvent.cs
+++ b/QSB/GeyserSync/Events/GeyserEvent.cs
@ -2,7 +2,7 @@
 using QSB.Messaging;
 using QSB.WorldSync;

-namespace QSB.GeyserSync
+namespace QSB.GeyserSync.Events
 {
    public class GeyserEvent : QSBEvent<BoolWorldObjectMessage>
    {
--- a/QSB/Instruments/InstrumentType.cs
+++ b/QSB/Instruments/InstrumentType.cs
@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace QSB.Instruments
+namespace QSB.Instruments
 {
    public enum InstrumentType
    {
--- a/QSB/Instruments/InstrumentsManager.cs
+++ b/QSB/Instruments/InstrumentsManager.cs
@ -1,6 +1,5 @@
 using QSB.Events;
 using QSB.Instruments.QSBCamera;
-using QSB.Utility;
 using UnityEngine;

 namespace QSB.Instruments
--- a/QSB/OrbSync/Events/OrbSlotEvent.cs
+++ b/QSB/OrbSync/Events/OrbSlotEvent.cs
@ -2,7 +2,7 @@
 using QSB.Messaging;
 using QSB.WorldSync;

-namespace QSB.OrbSync
+namespace QSB.OrbSync.Events
 {
    public class OrbSlotEvent : QSBEvent<BoolWorldObjectMessage>
    {
--- a/QSB/OrbSync/Events/OrbUserEvent.cs
+++ b/QSB/OrbSync/Events/OrbUserEvent.cs
@ -7,7 +7,7 @@ using QSB.WorldSync;
 using System.Linq;
 using UnityEngine.Networking;

-namespace QSB.OrbSync
+namespace QSB.OrbSync.Events
 {
    public class OrbUserEvent : QSBEvent<WorldObjectMessage>
    {
--- a/QSB/QSB.csproj
+++ b/QSB/QSB.csproj
@ -123,30 +123,30 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Animation\AnimationSync.cs" />
-    <Compile Include="Animation\AnimTriggerEvent.cs" />
+    <Compile Include="Animation\Events\AnimTriggerEvent.cs" />
    <Compile Include="Animation\AnimatorMirror.cs" />
    <Compile Include="Animation\AnimControllerPatch.cs" />
    <Compile Include="Animation\AnimFloatParam.cs" />
    <Compile Include="Animation\AnimTrigger.cs" />
-    <Compile Include="Animation\AnimTriggerMessage.cs" />
+    <Compile Include="Animation\Events\AnimTriggerMessage.cs" />
    <Compile Include="Animation\CrouchSync.cs" />
-    <Compile Include="ConversationSync\ConversationEvent.cs" />
-    <Compile Include="ConversationSync\ConversationMessage.cs" />
+    <Compile Include="ConversationSync\Events\ConversationEvent.cs" />
+    <Compile Include="ConversationSync\Events\ConversationMessage.cs" />
    <Compile Include="ConversationSync\ConversationPatches.cs" />
-    <Compile Include="ConversationSync\ConversationStartEndEvent.cs" />
-    <Compile Include="ConversationSync\ConversationStartEndMessage.cs" />
+    <Compile Include="ConversationSync\Events\ConversationStartEndEvent.cs" />
+    <Compile Include="ConversationSync\Events\ConversationStartEndMessage.cs" />
    <Compile Include="ConversationSync\ConversationType.cs" />
    <Compile Include="ConversationSync\ConversationManager.cs" />
    <Compile Include="ConversationSync\QSBFacePlayerWhenTalking.cs" />
    <Compile Include="DeathSync\DeathPatches.cs" />
    <Compile Include="ElevatorSync\ElevatorDirection.cs" />
    <Compile Include="ElevatorSync\QSBElevator.cs" />
-    <Compile Include="ElevatorSync\ElevatorEvent.cs" />
+    <Compile Include="ElevatorSync\Events\ElevatorEvent.cs" />
    <Compile Include="ElevatorSync\ElevatorManager.cs" />
-    <Compile Include="ElevatorSync\ElevatorMessage.cs" />
+    <Compile Include="ElevatorSync\Events\ElevatorMessage.cs" />
    <Compile Include="ElevatorSync\ElevatorPatches.cs" />
    <Compile Include="Events\EventNames.cs" />
-    <Compile Include="DeathSync\PlayerDeathEvent.cs" />
+    <Compile Include="DeathSync\Events\PlayerDeathEvent.cs" />
    <Compile Include="Events\IQSBEvent.cs" />
    <Compile Include="Instruments\Events\PlayInstrumentEvent.cs" />
    <Compile Include="Instruments\Events\PlayInstrumentMessage.cs" />
@ -156,32 +156,32 @@
    <Compile Include="Instruments\QSBCamera\CameraMode.cs" />
    <Compile Include="Instruments\InstrumentsManager.cs" />
    <Compile Include="OrbSync\OrbManager.cs" />
-    <Compile Include="OrbSync\OrbSlotEvent.cs" />
+    <Compile Include="OrbSync\Events\OrbSlotEvent.cs" />
    <Compile Include="OrbSync\OrbPatches.cs" />
-    <Compile Include="OrbSync\OrbUserEvent.cs" />
+    <Compile Include="OrbSync\Events\OrbUserEvent.cs" />
    <Compile Include="OrbSync\QSBOrbSlot.cs" />
    <Compile Include="PlayerSyncObject.cs" />
    <Compile Include="QSBNetworkLobby.cs" />
    <Compile Include="QSBSceneManager.cs" />
    <Compile Include="TimeSync\WakeUpPatches.cs" />
-    <Compile Include="Tools\PlayerFlashlightEvent.cs" />
+    <Compile Include="Tools\Events\PlayerFlashlightEvent.cs" />
    <Compile Include="Events\PlayerJoinEvent.cs" />
    <Compile Include="Events\PlayerLeaveEvent.cs" />
-    <Compile Include="Tools\PlayerProbeEvent.cs" />
+    <Compile Include="Tools\Events\PlayerProbeEvent.cs" />
    <Compile Include="Events\PlayerReadyEvent.cs" />
    <Compile Include="TransformSync\NomaiOrbTransformSync.cs" />
    <Compile Include="TransformSync\PlayerSectorEvent.cs" />
    <Compile Include="Events\PlayerStatesRequestEvent.cs" />
    <Compile Include="Animation\PlayerSuitEvent.cs" />
-    <Compile Include="TimeSync\ServerTimeEvent.cs" />
-    <Compile Include="GeyserSync\GeyserEvent.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\PlayerDeathMessage.cs" />
+    <Compile Include="DeathSync\Events\PlayerDeathMessage.cs" />
    <Compile Include="Messaging\PlayerLeaveMessage.cs" />
-    <Compile Include="Tools\PlayerProbeLauncherEvent.cs" />
-    <Compile Include="Tools\PlayerSignalscopeEvent.cs" />
-    <Compile Include="Tools\PlayerTranslatorEvent.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="Messaging\ToggleMessage.cs" />
@ -220,7 +220,7 @@
    <Compile Include="TimeSync\PreserveTimeScale.cs" />
    <Compile Include="TransformSync\ShipTransformSync.cs" />
    <Compile Include="TransformSync\SectorSync.cs" />
-    <Compile Include="TimeSync\ServerTimeMessage.cs" />
+    <Compile Include="TimeSync\Events\ServerTimeMessage.cs" />
    <Compile Include="TimeSync\WakeUpSync.cs" />
    <Compile Include="QSBNetworkManager.cs" />
    <Compile Include="QSB.cs" />
--- a/QSB/TimeSync/Events/ServerTimeEvent.cs
+++ b/QSB/TimeSync/Events/ServerTimeEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.TimeSync
+namespace QSB.TimeSync.Events
 {
    public class ServerTimeEvent : QSBEvent<ServerTimeMessage>
    {
--- a/QSB/TimeSync/Events/ServerTimeMessage.cs
+++ b/QSB/TimeSync/Events/ServerTimeMessage.cs
@ -1,7 +1,7 @@
 using QSB.Messaging;
 using UnityEngine.Networking;

-namespace QSB.TimeSync
+namespace QSB.TimeSync.Events
 {
    public class ServerTimeMessage : PlayerMessage
    {
--- a/QSB/TimeSync/WakeUpSync.cs
+++ b/QSB/TimeSync/WakeUpSync.cs
@ -1,6 +1,7 @@
 using OWML.ModHelper.Events;
 using QSB.DeathSync;
 using QSB.Events;
+using QSB.TimeSync.Events;
 using QSB.Utility;
 using UnityEngine;
 using UnityEngine.Networking;
--- a/QSB/Tools/Events/PlayerFlashlightEvent.cs
+++ b/QSB/Tools/Events/PlayerFlashlightEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.Tools
+namespace QSB.Tools.Events
 {
    public class PlayerFlashlightEvent : QSBEvent<ToggleMessage>
    {
--- a/QSB/Tools/Events/PlayerProbeEvent.cs
+++ b/QSB/Tools/Events/PlayerProbeEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.Tools
+namespace QSB.Tools.Events
 {
    public class PlayerProbeEvent : QSBEvent<ToggleMessage>
    {
--- a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
+++ b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.Tools
+namespace QSB.Tools.Events
 {
    public class PlayerProbeLauncherEvent : QSBEvent<ToggleMessage>
    {
--- a/QSB/Tools/Events/PlayerSignalscopeEvent.cs
+++ b/QSB/Tools/Events/PlayerSignalscopeEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.Tools
+namespace QSB.Tools.Events
 {
    public class PlayerSignalscopeEvent : QSBEvent<ToggleMessage>
    {
--- a/QSB/Tools/Events/PlayerTranslatorEvent.cs
+++ b/QSB/Tools/Events/PlayerTranslatorEvent.cs
@ -1,7 +1,7 @@
 using QSB.Events;
 using QSB.Messaging;

-namespace QSB.Tools
+namespace QSB.Tools.Events
 {
    public class PlayerTranslatorEvent : QSBEvent<ToggleMessage>
    {