From: AeonLucid <aeonlucid@outlook.com>
Date: Sat, 24 Oct 2020 19:08:45 +0000 (+0200)
Subject: Update Data namespace
X-Git-Tag: v1.2.2~96^2~11
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=f5e454856ae65955393e413c344367ecff2fac25;p=rhonda%2Fimpostor.git

Update Data namespace
---

diff --git a/src/Impostor.Server/Config/DebugConfig.cs b/src/Impostor.Server/Config/DebugConfig.cs
new file mode 100644
index 0000000..1758366
--- /dev/null
+++ b/src/Impostor.Server/Config/DebugConfig.cs
@@ -0,0 +1,10 @@
+namespace Impostor.Server.Config
+{
+    public class DebugConfig
+    {
+        public const string Section = "Debug";
+
+        public bool GameRecorderEnabled { get; set; }
+        public string GameRecorderPath { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Server/Config/DisconnectMessages.cs b/src/Impostor.Server/Config/DisconnectMessages.cs
new file mode 100644
index 0000000..6f2bf70
--- /dev/null
+++ b/src/Impostor.Server/Config/DisconnectMessages.cs
@@ -0,0 +1,17 @@
+namespace Impostor.Server.Config
+{
+    public static class DisconnectMessages
+    {
+        public const string Error = "There was an internal server error. " +
+                                    "Check the server console for more information. " +
+                                    "Please report the issue on the AmongUsServer GitHub if it keeps happening.";
+
+        public const string Destroyed = "The game you tried to join is being destroyed. " +
+                                        "Please create a new game.";
+
+        public const string NotImplemented = "Game listing has not been implemented in Impostor yet for servers " +
+                                             "running in server redirection mode.";
+
+        public const string UsernameLength = "Your username is too long, please make it shorter.";
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Server/Config/ServerConfig.cs b/src/Impostor.Server/Config/ServerConfig.cs
new file mode 100644
index 0000000..d6afcb5
--- /dev/null
+++ b/src/Impostor.Server/Config/ServerConfig.cs
@@ -0,0 +1,15 @@
+namespace Impostor.Server.Config
+{
+    internal class ServerConfig
+    {
+        public const string Section = "Server";
+
+        public string PublicIp { get; set; } = "127.0.0.1";
+
+        public ushort PublicPort { get; set; } = 22023;
+
+        public string ListenIp { get; set; } = "127.0.0.1";
+
+        public ushort ListenPort { get; set; } = 22023;
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Server/Config/ServerRedirectorConfig.cs b/src/Impostor.Server/Config/ServerRedirectorConfig.cs
new file mode 100644
index 0000000..0ccfa0d
--- /dev/null
+++ b/src/Impostor.Server/Config/ServerRedirectorConfig.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Impostor.Server.Config
+{
+    public class ServerRedirectorConfig
+    {
+        public const string Section = "ServerRedirector";
+
+        public bool Enabled { get; set; }
+
+        public bool Master { get; set; }
+
+        public NodeLocator Locator { get; set; }
+
+        public List<ServerRedirectorNode> Nodes { get; set; }
+
+        public class NodeLocator
+        {
+            public string Redis { get; set; }
+
+            public string UdpMasterEndpoint { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Server/Config/ServerRedirectorNode.cs b/src/Impostor.Server/Config/ServerRedirectorNode.cs
new file mode 100644
index 0000000..d11b60f
--- /dev/null
+++ b/src/Impostor.Server/Config/ServerRedirectorNode.cs
@@ -0,0 +1,9 @@
+namespace Impostor.Server.Config
+{
+    public class ServerRedirectorNode
+    {
+        public string Ip { get; set; }
+
+        public ushort Port { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Server/Data/DebugConfig.cs b/src/Impostor.Server/Data/DebugConfig.cs
deleted file mode 100644
index 2f7d4b3..0000000
--- a/src/Impostor.Server/Data/DebugConfig.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Impostor.Server.Data
-{
-    public class DebugConfig
-    {
-        public const string Section = "Debug";
-
-        public bool GameRecorderEnabled { get; set; }
-        public string GameRecorderPath { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Server/Data/DisconnectMessages.cs b/src/Impostor.Server/Data/DisconnectMessages.cs
deleted file mode 100644
index fd5b48e..0000000
--- a/src/Impostor.Server/Data/DisconnectMessages.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Impostor.Server.Data
-{
-    public static class DisconnectMessages
-    {
-        public const string Error = "There was an internal server error. " +
-                                    "Check the server console for more information. " +
-                                    "Please report the issue on the AmongUsServer GitHub if it keeps happening.";
-
-        public const string Destroyed = "The game you tried to join is being destroyed. " +
-                                        "Please create a new game.";
-
-        public const string NotImplemented = "Game listing has not been implemented in Impostor yet for servers " +
-                                             "running in server redirection mode.";
-
-        public const string UsernameLength = "Your username is too long, please make it shorter.";
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Server/Data/ServerConfig.cs b/src/Impostor.Server/Data/ServerConfig.cs
deleted file mode 100644
index da5f5a7..0000000
--- a/src/Impostor.Server/Data/ServerConfig.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Impostor.Server.Data
-{
-    internal class ServerConfig
-    {
-        public const string Section = "Server";
-
-        public string PublicIp { get; set; } = "127.0.0.1";
-
-        public ushort PublicPort { get; set; } = 22023;
-
-        public string ListenIp { get; set; } = "127.0.0.1";
-
-        public ushort ListenPort { get; set; } = 22023;
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Server/Data/ServerRedirectorConfig.cs b/src/Impostor.Server/Data/ServerRedirectorConfig.cs
deleted file mode 100644
index 5b14ef1..0000000
--- a/src/Impostor.Server/Data/ServerRedirectorConfig.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-
-namespace Impostor.Server.Data
-{
-    public class ServerRedirectorConfig
-    {
-        public const string Section = "ServerRedirector";
-
-        public bool Enabled { get; set; }
-
-        public bool Master { get; set; }
-
-        public NodeLocator Locator { get; set; }
-
-        public List<ServerRedirectorNode> Nodes { get; set; }
-
-        public class NodeLocator
-        {
-            public string Redis { get; set; }
-
-            public string UdpMasterEndpoint { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Server/Data/ServerRedirectorNode.cs b/src/Impostor.Server/Data/ServerRedirectorNode.cs
deleted file mode 100644
index 2e6a0b8..0000000
--- a/src/Impostor.Server/Data/ServerRedirectorNode.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Impostor.Server.Data
-{
-    public class ServerRedirectorNode
-    {
-        public string Ip { get; set; }
-
-        public ushort Port { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Server/Impostor.Server.csproj b/src/Impostor.Server/Impostor.Server.csproj
index 9924aa7..4dcf406 100644
--- a/src/Impostor.Server/Impostor.Server.csproj
+++ b/src/Impostor.Server/Impostor.Server.csproj
@@ -48,7 +48,7 @@
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
         </Content>
-        <Content Include="config.full.json">
+        <Content Include="config-full.json">
             <CopyToPublishDirectory>Never</CopyToPublishDirectory>
             <CopyToOutputDirectory>Never</CopyToOutputDirectory>
             <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
diff --git a/src/Impostor.Server/Net/Client.cs b/src/Impostor.Server/Net/Client.cs
index f0711b2..65defdf 100644
--- a/src/Impostor.Server/Net/Client.cs
+++ b/src/Impostor.Server/Net/Client.cs
@@ -9,7 +9,7 @@ using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.C2S;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Manager;
 using Microsoft.Extensions.Logging;
diff --git a/src/Impostor.Server/Net/Manager/ClientManager.cs b/src/Impostor.Server/Net/Manager/ClientManager.cs
index 3c4e8e8..f6d4c40 100644
--- a/src/Impostor.Server/Net/Manager/ClientManager.cs
+++ b/src/Impostor.Server/Net/Manager/ClientManager.cs
@@ -9,7 +9,7 @@ using Impostor.Api.Net.Manager;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Impostor.Server.Net.Factories;
 using Impostor.Server.Net.Hazel;
 using Microsoft.Extensions.Logging;
diff --git a/src/Impostor.Server/Net/Manager/GameManager.cs b/src/Impostor.Server/Net/Manager/GameManager.cs
index bc65c25..a7ea1dc 100644
--- a/src/Impostor.Server/Net/Manager/GameManager.cs
+++ b/src/Impostor.Server/Net/Manager/GameManager.cs
@@ -11,7 +11,7 @@ using Impostor.Api.Games;
 using Impostor.Api.Games.Managers;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Innersloth.Data;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Impostor.Server.Extensions;
 using Impostor.Server.Net.Redirector;
 using Impostor.Server.Net.State;
diff --git a/src/Impostor.Server/Net/MatchmakerService.cs b/src/Impostor.Server/Net/MatchmakerService.cs
index cd6d70e..227d6e3 100644
--- a/src/Impostor.Server/Net/MatchmakerService.cs
+++ b/src/Impostor.Server/Net/MatchmakerService.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs
index 0c6d468..cab531b 100644
--- a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs
+++ b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs
@@ -5,7 +5,7 @@ using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.C2S;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Manager;
 using Serilog;
diff --git a/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs b/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
index ed19b06..c0f881f 100644
--- a/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
+++ b/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
@@ -4,7 +4,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
diff --git a/src/Impostor.Server/Net/Redirector/NodeLocatorUDPService.cs b/src/Impostor.Server/Net/Redirector/NodeLocatorUDPService.cs
index 8258198..e8e2676 100644
--- a/src/Impostor.Server/Net/Redirector/NodeLocatorUDPService.cs
+++ b/src/Impostor.Server/Net/Redirector/NodeLocatorUDPService.cs
@@ -4,7 +4,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/src/Impostor.Server/Net/Redirector/NodeProviderConfig.cs b/src/Impostor.Server/Net/Redirector/NodeProviderConfig.cs
index 158090c..4e19c43 100644
--- a/src/Impostor.Server/Net/Redirector/NodeProviderConfig.cs
+++ b/src/Impostor.Server/Net/Redirector/NodeProviderConfig.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Net;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Microsoft.Extensions.Options;
 
 namespace Impostor.Server.Net.Redirector
diff --git a/src/Impostor.Server/Program.cs b/src/Impostor.Server/Program.cs
index 8f0fc26..54c4969 100644
--- a/src/Impostor.Server/Program.cs
+++ b/src/Impostor.Server/Program.cs
@@ -3,7 +3,7 @@ using Impostor.Api.Events.Managers;
 using Impostor.Api.Games;
 using Impostor.Api.Games.Managers;
 using Impostor.Api.Net.Manager;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Impostor.Server.Events;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Factories;
diff --git a/src/Impostor.Server/Recorder/PacketRecorder.cs b/src/Impostor.Server/Recorder/PacketRecorder.cs
index 1fa40ac..fc78c57 100644
--- a/src/Impostor.Server/Recorder/PacketRecorder.cs
+++ b/src/Impostor.Server/Recorder/PacketRecorder.cs
@@ -5,7 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api.Games;
 using Impostor.Api.Net.Messages;
-using Impostor.Server.Data;
+using Impostor.Server.Config;
 using Impostor.Server.Net;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ObjectPool;