From: AeonLucid <aeonlucid@gmail.com>
Date: Sat, 10 Oct 2020 23:11:32 +0000 (+0200)
Subject: Update namespaces
X-Git-Tag: v1.2.2~117^2~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=c856da1621361ab89b5c92225fa00fab94df89b0;p=rhonda%2Fimpostor.git

Update namespaces
---

diff --git a/src/Impostor.Server.Api/Events/Game/GameCreatedEvent.cs b/src/Impostor.Server.Api/Events/Game/GameCreatedEvent.cs
index 27c8b69..a916227 100644
--- a/src/Impostor.Server.Api/Events/Game/GameCreatedEvent.cs
+++ b/src/Impostor.Server.Api/Events/Game/GameCreatedEvent.cs
@@ -1,4 +1,6 @@
-namespace Impostor.Server.Events
+using Impostor.Server.Games;
+
+namespace Impostor.Server.Events
 {
     /// <summary>
     ///     Called whenever a new <see cref="IGame"/> is created.
diff --git a/src/Impostor.Server.Api/Events/Game/IGameEvent.cs b/src/Impostor.Server.Api/Events/Game/IGameEvent.cs
index a3771bc..8d77c4b 100644
--- a/src/Impostor.Server.Api/Events/Game/IGameEvent.cs
+++ b/src/Impostor.Server.Api/Events/Game/IGameEvent.cs
@@ -1,4 +1,6 @@
-namespace Impostor.Server.Events
+using Impostor.Server.Games;
+
+namespace Impostor.Server.Events
 {
     public interface IGameEvent : IEvent
     {
diff --git a/src/Impostor.Server.Api/Extensions/GameManagerExtensions.cs b/src/Impostor.Server.Api/Extensions/GameManagerExtensions.cs
index 9d41e28..df89168 100644
--- a/src/Impostor.Server.Api/Extensions/GameManagerExtensions.cs
+++ b/src/Impostor.Server.Api/Extensions/GameManagerExtensions.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Impostor.Server.Games.Managers;
 using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server
diff --git a/src/Impostor.Server.Api/Games/GameCode.cs b/src/Impostor.Server.Api/Games/GameCode.cs
index b97b1e2..0d1fd37 100644
--- a/src/Impostor.Server.Api/Games/GameCode.cs
+++ b/src/Impostor.Server.Api/Games/GameCode.cs
@@ -1,7 +1,7 @@
 using System;
 using Impostor.Shared.Innersloth;
 
-namespace Impostor.Server
+namespace Impostor.Server.Games
 {
     public readonly struct GameCode : IEquatable<GameCode>
     {
diff --git a/src/Impostor.Server.Api/Games/GameJoinError.cs b/src/Impostor.Server.Api/Games/GameJoinError.cs
index c30c27d..c4d7c6d 100644
--- a/src/Impostor.Server.Api/Games/GameJoinError.cs
+++ b/src/Impostor.Server.Api/Games/GameJoinError.cs
@@ -1,4 +1,4 @@
-namespace Impostor.Server.Net
+namespace Impostor.Server.Games
 {
     public enum GameJoinError
     {
diff --git a/src/Impostor.Server.Api/Games/GameJoinResult.cs b/src/Impostor.Server.Api/Games/GameJoinResult.cs
index 96e39e3..40babeb 100644
--- a/src/Impostor.Server.Api/Games/GameJoinResult.cs
+++ b/src/Impostor.Server.Api/Games/GameJoinResult.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Impostor.Server.Net;
 
-namespace Impostor.Server.Net
+namespace Impostor.Server.Games
 {
     public readonly struct GameJoinResult
     {
diff --git a/src/Impostor.Server.Api/Games/IGame.cs b/src/Impostor.Server.Api/Games/IGame.cs
index e130342..13ffca9 100644
--- a/src/Impostor.Server.Api/Games/IGame.cs
+++ b/src/Impostor.Server.Api/Games/IGame.cs
@@ -3,10 +3,11 @@ using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Threading.Tasks;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 using Impostor.Shared.Innersloth;
 using Impostor.Shared.Innersloth.Data;
 
-namespace Impostor.Server
+namespace Impostor.Server.Games
 {
     public interface IGame
     {
diff --git a/src/Impostor.Server.Api/Games/Managers/IGameManager.cs b/src/Impostor.Server.Api/Games/Managers/IGameManager.cs
index 4f8d33e..9cb9646 100644
--- a/src/Impostor.Server.Api/Games/Managers/IGameManager.cs
+++ b/src/Impostor.Server.Api/Games/Managers/IGameManager.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Impostor.Shared.Innersloth;
 using Impostor.Shared.Innersloth.Data;
 
-namespace Impostor.Server
+namespace Impostor.Server.Games.Managers
 {
     public interface IGameManager
     {
diff --git a/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs b/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs
index 5bb1d5a..b7884e1 100644
--- a/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs
+++ b/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Impostor.Server.Net.Messages;
 using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Net
diff --git a/src/Impostor.Server.Api/Net/IClient.cs b/src/Impostor.Server.Api/Net/IClient.cs
index e83ab90..064f51a 100644
--- a/src/Impostor.Server.Api/Net/IClient.cs
+++ b/src/Impostor.Server.Api/Net/IClient.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Net
 {
diff --git a/src/Impostor.Server.Api/Net/IClientPlayer.cs b/src/Impostor.Server.Api/Net/IClientPlayer.cs
index 0805e74..815c26c 100644
--- a/src/Impostor.Server.Api/Net/IClientPlayer.cs
+++ b/src/Impostor.Server.Api/Net/IClientPlayer.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Impostor.Server.Games;
 using Impostor.Server.Net.Manager;
 using Impostor.Shared.Innersloth.Data;
 
diff --git a/src/Impostor.Server.Api/Net/IConnection.cs b/src/Impostor.Server.Api/Net/IConnection.cs
index a1d1269..911748f 100644
--- a/src/Impostor.Server.Api/Net/IConnection.cs
+++ b/src/Impostor.Server.Api/Net/IConnection.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
+using Impostor.Server.Games;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Net
 {
diff --git a/src/Impostor.Server.Api/Net/LimboStates.cs b/src/Impostor.Server.Api/Net/LimboStates.cs
index de7f629..1812f5a 100644
--- a/src/Impostor.Server.Api/Net/LimboStates.cs
+++ b/src/Impostor.Server.Api/Net/LimboStates.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Shared.Innersloth.Data
+namespace Impostor.Server.Net
 {
     [Flags]
     public enum LimboStates
diff --git a/src/Impostor.Server.Api/Net/Manager/IMatchmaker.cs b/src/Impostor.Server.Api/Net/Manager/IMatchmaker.cs
index 244d8ec..19ef796 100644
--- a/src/Impostor.Server.Api/Net/Manager/IMatchmaker.cs
+++ b/src/Impostor.Server.Api/Net/Manager/IMatchmaker.cs
@@ -1,5 +1,7 @@
 using System.Net;
 using System.Threading.Tasks;
+using Impostor.Server.Games;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Net.Manager
 {
diff --git a/src/Impostor.Server.Api/Net/Messages/IConnectionMessageWriter.cs b/src/Impostor.Server.Api/Net/Messages/IConnectionMessageWriter.cs
index 24206e6..453eb7e 100644
--- a/src/Impostor.Server.Api/Net/Messages/IConnectionMessageWriter.cs
+++ b/src/Impostor.Server.Api/Net/Messages/IConnectionMessageWriter.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net.Messages
 {
     /// <summary>
     ///     Represents the message writer for <see cref="IConnection"/>.
diff --git a/src/Impostor.Server.Api/Net/Messages/IGameMessageWriter.cs b/src/Impostor.Server.Api/Net/Messages/IGameMessageWriter.cs
index 4b8267d..d1d769c 100644
--- a/src/Impostor.Server.Api/Net/Messages/IGameMessageWriter.cs
+++ b/src/Impostor.Server.Api/Net/Messages/IGameMessageWriter.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Server.Games;
 
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net.Messages
 {
     /// <summary>
     ///     Represents the message writer for <see cref="IGame"/>.
diff --git a/src/Impostor.Server.Api/Net/Messages/IMessage.cs b/src/Impostor.Server.Api/Net/Messages/IMessage.cs
index e829d1b..854a0d2 100644
--- a/src/Impostor.Server.Api/Net/Messages/IMessage.cs
+++ b/src/Impostor.Server.Api/Net/Messages/IMessage.cs
@@ -1,4 +1,4 @@
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net.Messages
 {
     public interface IMessage
     {
diff --git a/src/Impostor.Server.Api/Net/Messages/IMessageReader.cs b/src/Impostor.Server.Api/Net/Messages/IMessageReader.cs
index c7c288c..b080823 100644
--- a/src/Impostor.Server.Api/Net/Messages/IMessageReader.cs
+++ b/src/Impostor.Server.Api/Net/Messages/IMessageReader.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net.Messages
 {
     public interface IMessageReader
     {
diff --git a/src/Impostor.Server.Api/Net/Messages/IMessageWriter.cs b/src/Impostor.Server.Api/Net/Messages/IMessageWriter.cs
index a1f0632..77a6cf1 100644
--- a/src/Impostor.Server.Api/Net/Messages/IMessageWriter.cs
+++ b/src/Impostor.Server.Api/Net/Messages/IMessageWriter.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Net;
+using Impostor.Server.Games;
 
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net.Messages
 {
     /// <summary>
     ///     Base message writer.
diff --git a/src/Impostor.Server.Api/Net/Messages/MessageType.cs b/src/Impostor.Server.Api/Net/Messages/MessageType.cs
index 2e9dcb2..a350cb6 100644
--- a/src/Impostor.Server.Api/Net/Messages/MessageType.cs
+++ b/src/Impostor.Server.Api/Net/Messages/MessageType.cs
@@ -1,4 +1,4 @@
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net.Messages
 {
     /// <summary>
     ///     Specifies how a message should be sent between connections.
diff --git a/src/Impostor.Server.Api/Plugins/PluginBase.cs b/src/Impostor.Server.Api/Plugins/PluginBase.cs
index eb09de8..c392bba 100644
--- a/src/Impostor.Server.Api/Plugins/PluginBase.cs
+++ b/src/Impostor.Server.Api/Plugins/PluginBase.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Impostor.Server
+namespace Impostor.Server.Plugins
 {
     public class PluginBase : IPlugin
     {
diff --git a/src/Impostor.Server.Hazel/HazelConnection.cs b/src/Impostor.Server.Hazel/HazelConnection.cs
index ce87dac..da8273f 100644
--- a/src/Impostor.Server.Hazel/HazelConnection.cs
+++ b/src/Impostor.Server.Hazel/HazelConnection.cs
@@ -4,6 +4,7 @@ using System.Net;
 using System.Threading.Tasks;
 using Hazel;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 using Microsoft.Extensions.Logging;
 
 namespace Impostor.Server.Hazel
diff --git a/src/Impostor.Server.Hazel/HazelMatchmaker.cs b/src/Impostor.Server.Hazel/HazelMatchmaker.cs
index 439a773..01c7c22 100644
--- a/src/Impostor.Server.Hazel/HazelMatchmaker.cs
+++ b/src/Impostor.Server.Hazel/HazelMatchmaker.cs
@@ -4,8 +4,10 @@ using System.Net.Sockets;
 using System.Threading.Tasks;
 using Hazel;
 using Hazel.Udp;
+using Impostor.Server.Games;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Manager;
+using Impostor.Server.Net.Messages;
 using Microsoft.Extensions.Logging;
 
 namespace Impostor.Server.Hazel
diff --git a/src/Impostor.Server.Hazel/Messages/BufferMessageReader.cs b/src/Impostor.Server.Hazel/Messages/BufferMessageReader.cs
index dbf85e3..4ced4f3 100644
--- a/src/Impostor.Server.Hazel/Messages/BufferMessageReader.cs
+++ b/src/Impostor.Server.Hazel/Messages/BufferMessageReader.cs
@@ -2,6 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Hazel
 {
diff --git a/src/Impostor.Server.Hazel/Messages/HazelConnectionMessageWriter.cs b/src/Impostor.Server.Hazel/Messages/HazelConnectionMessageWriter.cs
index b12629c..96f8601 100644
--- a/src/Impostor.Server.Hazel/Messages/HazelConnectionMessageWriter.cs
+++ b/src/Impostor.Server.Hazel/Messages/HazelConnectionMessageWriter.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Hazel
 {
diff --git a/src/Impostor.Server.Hazel/Messages/HazelGameMessageWriter.cs b/src/Impostor.Server.Hazel/Messages/HazelGameMessageWriter.cs
index e1e063e..1f09ce7 100644
--- a/src/Impostor.Server.Hazel/Messages/HazelGameMessageWriter.cs
+++ b/src/Impostor.Server.Hazel/Messages/HazelGameMessageWriter.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Hazel;
+using Impostor.Server.Games;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Hazel
diff --git a/src/Impostor.Server.Hazel/Messages/HazelMessage.cs b/src/Impostor.Server.Hazel/Messages/HazelMessage.cs
index d61695e..70845c3 100644
--- a/src/Impostor.Server.Hazel/Messages/HazelMessage.cs
+++ b/src/Impostor.Server.Hazel/Messages/HazelMessage.cs
@@ -1,6 +1,7 @@
 using System;
 using Hazel;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Hazel
 {
diff --git a/src/Impostor.Server.Hazel/Messages/HazelMessageWriter.cs b/src/Impostor.Server.Hazel/Messages/HazelMessageWriter.cs
index b16a192..da046f7 100644
--- a/src/Impostor.Server.Hazel/Messages/HazelMessageWriter.cs
+++ b/src/Impostor.Server.Hazel/Messages/HazelMessageWriter.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Net;
 using Hazel;
+using Impostor.Server.Games;
 using Impostor.Server.Net;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Hazel
 {
diff --git a/src/Impostor.Server/Net/Client.cs b/src/Impostor.Server/Net/Client.cs
index b81a606..61ff3f8 100644
--- a/src/Impostor.Server/Net/Client.cs
+++ b/src/Impostor.Server/Net/Client.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Threading.Tasks;
 using Impostor.Server.Data;
+using Impostor.Server.Games;
+using Impostor.Server.Games.Managers;
 using Impostor.Server.Net.Manager;
 using Impostor.Server.Net.Messages;
 using Impostor.Shared.Innersloth;
diff --git a/src/Impostor.Server/Net/ClientBase.cs b/src/Impostor.Server/Net/ClientBase.cs
index 591d359..034ac7f 100644
--- a/src/Impostor.Server/Net/ClientBase.cs
+++ b/src/Impostor.Server/Net/ClientBase.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Net
 {
diff --git a/src/Impostor.Server/Net/Manager/GameManager.cs b/src/Impostor.Server/Net/Manager/GameManager.cs
index a2ca481..a0e8339 100644
--- a/src/Impostor.Server/Net/Manager/GameManager.cs
+++ b/src/Impostor.Server/Net/Manager/GameManager.cs
@@ -7,6 +7,8 @@ using System.Threading.Tasks;
 using Impostor.Server.Data;
 using Impostor.Server.Events;
 using Impostor.Server.Events.Managers;
+using Impostor.Server.Games;
+using Impostor.Server.Games.Managers;
 using Impostor.Server.Net.Redirector;
 using Impostor.Server.Net.State;
 using Impostor.Shared.Innersloth;
diff --git a/src/Impostor.Server/Net/Messages/Message16GetGameListV2.cs b/src/Impostor.Server/Net/Messages/Message16GetGameListV2.cs
index 4b71065..86e7f28 100644
--- a/src/Impostor.Server/Net/Messages/Message16GetGameListV2.cs
+++ b/src/Impostor.Server/Net/Messages/Message16GetGameListV2.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Impostor.Server.Games;
 using Impostor.Shared.Innersloth;
 
 namespace Impostor.Server.Net.Messages
diff --git a/src/Impostor.Server/Net/State/ClientPlayer.cs b/src/Impostor.Server/Net/State/ClientPlayer.cs
index 1f3d3da..b6734c4 100644
--- a/src/Impostor.Server/Net/State/ClientPlayer.cs
+++ b/src/Impostor.Server/Net/State/ClientPlayer.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Impostor.Server.Games;
 using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Net.State
diff --git a/src/Impostor.Server/Net/State/Game.Incoming.cs b/src/Impostor.Server/Net/State/Game.Incoming.cs
index fa8380a..af6ba6c 100644
--- a/src/Impostor.Server/Net/State/Game.Incoming.cs
+++ b/src/Impostor.Server/Net/State/Game.Incoming.cs
@@ -1,4 +1,6 @@
 using System.Threading.Tasks;
+using Impostor.Server.Games;
+using Impostor.Server.Net.Messages;
 using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Net.State
diff --git a/src/Impostor.Server/Net/State/Game.State.cs b/src/Impostor.Server/Net/State/Game.State.cs
index e581fa6..66d856d 100644
--- a/src/Impostor.Server/Net/State/Game.State.cs
+++ b/src/Impostor.Server/Net/State/Game.State.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Impostor.Server.Exceptions;
+using Impostor.Server.Net.Messages;
 using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Net.State
diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs
index d42e2b1..c20ecdd 100644
--- a/src/Impostor.Server/Net/State/Game.cs
+++ b/src/Impostor.Server/Net/State/Game.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using Impostor.Server.Games;
+using Impostor.Server.Games.Managers;
 using Impostor.Server.Net.Manager;
 using Impostor.Server.Net.Messages;
 using Impostor.Server.Net.Redirector;
diff --git a/src/Impostor.Server/Program.cs b/src/Impostor.Server/Program.cs
index 113f018..73888ad 100644
--- a/src/Impostor.Server/Program.cs
+++ b/src/Impostor.Server/Program.cs
@@ -2,6 +2,7 @@
 using Impostor.Server.Data;
 using Impostor.Server.Events;
 using Impostor.Server.Events.Managers;
+using Impostor.Server.Games.Managers;
 using Impostor.Server.Hazel;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Factories;