From dc530406c6aa4e5fee4723bfefc138e03ab8a997 Mon Sep 17 00:00:00 2001 From: miniduikboot Date: Mon, 29 Aug 2022 19:02:36 +0200 Subject: [PATCH] Move config files to API This makes it possible to access these from a plugin --- .../Config/AntiCheatConfig.cs | 2 +- .../Config/CompatibilityConfig.cs | 2 +- src/{Impostor.Server => Impostor.Api}/Config/DebugConfig.cs | 2 +- .../Config/DisconnectMessages.cs | 2 +- .../Config/ServerConfig.cs | 6 +++--- .../Config/ServerRedirectorConfig.cs | 2 +- .../Config/ServerRedirectorNode.cs | 2 +- src/{Impostor.Server => Impostor.Api}/Utils/IpUtils.cs | 3 +-- src/Impostor.Server/Net/Client.cs | 2 +- src/Impostor.Server/Net/Manager/ClientManager.cs | 2 +- src/Impostor.Server/Net/Manager/GameManager.cs | 2 +- src/Impostor.Server/Net/MatchmakerService.cs | 2 +- src/Impostor.Server/Net/Redirector/ClientRedirector.cs | 2 +- src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs | 2 +- src/Impostor.Server/Net/Redirector/NodeLocatorUDPService.cs | 2 +- src/Impostor.Server/Net/Redirector/NodeProviderConfig.cs | 2 +- src/Impostor.Server/Net/State/Game.cs | 2 +- src/Impostor.Server/Program.cs | 2 +- src/Impostor.Server/Recorder/ClientRecorder.cs | 2 +- src/Impostor.Server/Recorder/PacketRecorder.cs | 2 +- 20 files changed, 22 insertions(+), 23 deletions(-) rename src/{Impostor.Server => Impostor.Api}/Config/AntiCheatConfig.cs (85%) rename src/{Impostor.Server => Impostor.Api}/Config/CompatibilityConfig.cs (87%) rename src/{Impostor.Server => Impostor.Api}/Config/DebugConfig.cs (85%) rename src/{Impostor.Server => Impostor.Api}/Config/DisconnectMessages.cs (97%) rename src/{Impostor.Server => Impostor.Api}/Config/ServerConfig.cs (87%) rename src/{Impostor.Server => Impostor.Api}/Config/ServerRedirectorConfig.cs (94%) rename src/{Impostor.Server => Impostor.Api}/Config/ServerRedirectorNode.cs (86%) rename src/{Impostor.Server => Impostor.Api}/Utils/IpUtils.cs (96%) diff --git a/src/Impostor.Server/Config/AntiCheatConfig.cs b/src/Impostor.Api/Config/AntiCheatConfig.cs similarity index 85% rename from src/Impostor.Server/Config/AntiCheatConfig.cs rename to src/Impostor.Api/Config/AntiCheatConfig.cs index ee1f62a..d9eb532 100644 --- a/src/Impostor.Server/Config/AntiCheatConfig.cs +++ b/src/Impostor.Api/Config/AntiCheatConfig.cs @@ -1,4 +1,4 @@ -namespace Impostor.Server.Config +namespace Impostor.Api.Config { public class AntiCheatConfig { diff --git a/src/Impostor.Server/Config/CompatibilityConfig.cs b/src/Impostor.Api/Config/CompatibilityConfig.cs similarity index 87% rename from src/Impostor.Server/Config/CompatibilityConfig.cs rename to src/Impostor.Api/Config/CompatibilityConfig.cs index d9fea81..c18c7d8 100644 --- a/src/Impostor.Server/Config/CompatibilityConfig.cs +++ b/src/Impostor.Api/Config/CompatibilityConfig.cs @@ -1,4 +1,4 @@ -namespace Impostor.Server.Config +namespace Impostor.Api.Config { public class CompatibilityConfig { diff --git a/src/Impostor.Server/Config/DebugConfig.cs b/src/Impostor.Api/Config/DebugConfig.cs similarity index 85% rename from src/Impostor.Server/Config/DebugConfig.cs rename to src/Impostor.Api/Config/DebugConfig.cs index 72529de..47cddac 100644 --- a/src/Impostor.Server/Config/DebugConfig.cs +++ b/src/Impostor.Api/Config/DebugConfig.cs @@ -1,4 +1,4 @@ -namespace Impostor.Server.Config +namespace Impostor.Api.Config { public class DebugConfig { diff --git a/src/Impostor.Server/Config/DisconnectMessages.cs b/src/Impostor.Api/Config/DisconnectMessages.cs similarity index 97% rename from src/Impostor.Server/Config/DisconnectMessages.cs rename to src/Impostor.Api/Config/DisconnectMessages.cs index 3384f32..353b79b 100644 --- a/src/Impostor.Server/Config/DisconnectMessages.cs +++ b/src/Impostor.Api/Config/DisconnectMessages.cs @@ -1,4 +1,4 @@ -namespace Impostor.Server.Config +namespace Impostor.Api.Config { public static class DisconnectMessages { diff --git a/src/Impostor.Server/Config/ServerConfig.cs b/src/Impostor.Api/Config/ServerConfig.cs similarity index 87% rename from src/Impostor.Server/Config/ServerConfig.cs rename to src/Impostor.Api/Config/ServerConfig.cs index 7ed3ae6..afcca03 100644 --- a/src/Impostor.Server/Config/ServerConfig.cs +++ b/src/Impostor.Api/Config/ServerConfig.cs @@ -1,8 +1,8 @@ -using Impostor.Server.Utils; +using Impostor.Api.Utils; -namespace Impostor.Server.Config +namespace Impostor.Api.Config { - internal class ServerConfig + public class ServerConfig { public const string Section = "Server"; diff --git a/src/Impostor.Server/Config/ServerRedirectorConfig.cs b/src/Impostor.Api/Config/ServerRedirectorConfig.cs similarity index 94% rename from src/Impostor.Server/Config/ServerRedirectorConfig.cs rename to src/Impostor.Api/Config/ServerRedirectorConfig.cs index 686ad7f..0d11ab1 100644 --- a/src/Impostor.Server/Config/ServerRedirectorConfig.cs +++ b/src/Impostor.Api/Config/ServerRedirectorConfig.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Impostor.Server.Config +namespace Impostor.Api.Config { public class ServerRedirectorConfig { diff --git a/src/Impostor.Server/Config/ServerRedirectorNode.cs b/src/Impostor.Api/Config/ServerRedirectorNode.cs similarity index 86% rename from src/Impostor.Server/Config/ServerRedirectorNode.cs rename to src/Impostor.Api/Config/ServerRedirectorNode.cs index c479512..9980bd4 100644 --- a/src/Impostor.Server/Config/ServerRedirectorNode.cs +++ b/src/Impostor.Api/Config/ServerRedirectorNode.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace Impostor.Server.Config +namespace Impostor.Api.Config { public class ServerRedirectorNode { diff --git a/src/Impostor.Server/Utils/IpUtils.cs b/src/Impostor.Api/Utils/IpUtils.cs similarity index 96% rename from src/Impostor.Server/Utils/IpUtils.cs rename to src/Impostor.Api/Utils/IpUtils.cs index 649d45a..c50eccf 100644 --- a/src/Impostor.Server/Utils/IpUtils.cs +++ b/src/Impostor.Api/Utils/IpUtils.cs @@ -1,9 +1,8 @@ using System.Linq; using System.Net; using System.Net.Sockets; -using Impostor.Api; -namespace Impostor.Server.Utils +namespace Impostor.Api.Utils { internal static class IpUtils { diff --git a/src/Impostor.Server/Net/Client.cs b/src/Impostor.Server/Net/Client.cs index 7a28371..1b2dcde 100644 --- a/src/Impostor.Server/Net/Client.cs +++ b/src/Impostor.Server/Net/Client.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using System.Threading.Tasks; using Impostor.Api; +using Impostor.Api.Config; using Impostor.Api.Games; using Impostor.Api.Innersloth; using Impostor.Api.Net; @@ -10,7 +11,6 @@ using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; using Impostor.Api.Net.Messages.S2C; using Impostor.Hazel; -using Impostor.Server.Config; using Impostor.Server.Net.Manager; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Impostor.Server/Net/Manager/ClientManager.cs b/src/Impostor.Server/Net/Manager/ClientManager.cs index 34001de..efff8c9 100644 --- a/src/Impostor.Server/Net/Manager/ClientManager.cs +++ b/src/Impostor.Server/Net/Manager/ClientManager.cs @@ -4,12 +4,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Impostor.Api.Config; using Impostor.Api.Events.Managers; using Impostor.Api.Innersloth; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Hazel; -using Impostor.Server.Config; using Impostor.Server.Events.Client; using Impostor.Server.Net.Factories; using Microsoft.Extensions.Logging; diff --git a/src/Impostor.Server/Net/Manager/GameManager.cs b/src/Impostor.Server/Net/Manager/GameManager.cs index f567f61..f4c6b1d 100644 --- a/src/Impostor.Server/Net/Manager/GameManager.cs +++ b/src/Impostor.Server/Net/Manager/GameManager.cs @@ -5,12 +5,12 @@ using System.Linq; using System.Net; using System.Threading.Tasks; using Impostor.Api; +using Impostor.Api.Config; using Impostor.Api.Events.Managers; using Impostor.Api.Games; using Impostor.Api.Games.Managers; using Impostor.Api.Innersloth; using Impostor.Api.Net; -using Impostor.Server.Config; using Impostor.Server.Events; 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 bd9a855..35ff6df 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.Config; +using Impostor.Api.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 f463abb..67ad048 100644 --- a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs +++ b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; +using Impostor.Api.Config; using Impostor.Api.Innersloth; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; using Impostor.Api.Net.Messages.S2C; using Impostor.Hazel; -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 c75392a..4b640a9 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.Config; +using Impostor.Api.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 781e91f..fba9ac1 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.Config; +using Impostor.Api.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 7e2982e..7111bd0 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.Config; +using Impostor.Api.Config; using Microsoft.Extensions.Options; namespace Impostor.Server.Net.Redirector diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs index 5da19d4..63680f8 100644 --- a/src/Impostor.Server/Net/State/Game.cs +++ b/src/Impostor.Server/Net/State/Game.cs @@ -6,13 +6,13 @@ using System.Linq; using System.Net; using System.Numerics; using System.Threading.Tasks; +using Impostor.Api.Config; using Impostor.Api.Events.Managers; using Impostor.Api.Games; using Impostor.Api.Innersloth; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.S2C; -using Impostor.Server.Config; using Impostor.Server.Events; using Impostor.Server.Net.Manager; using Microsoft.Extensions.Logging; diff --git a/src/Impostor.Server/Program.cs b/src/Impostor.Server/Program.cs index 1c575dd..ed972ca 100644 --- a/src/Impostor.Server/Program.cs +++ b/src/Impostor.Server/Program.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Runtime.Loader; +using Impostor.Api.Config; using Impostor.Api.Events.Managers; using Impostor.Api.Games; using Impostor.Api.Games.Managers; @@ -11,7 +12,6 @@ using Impostor.Api.Net.Manager; using Impostor.Api.Net.Messages; using Impostor.Api.Utils; using Impostor.Hazel.Extensions; -using Impostor.Server.Config; using Impostor.Server.Events; using Impostor.Server.Net; using Impostor.Server.Net.Custom; diff --git a/src/Impostor.Server/Recorder/ClientRecorder.cs b/src/Impostor.Server/Recorder/ClientRecorder.cs index 4acf2a5..3029652 100644 --- a/src/Impostor.Server/Recorder/ClientRecorder.cs +++ b/src/Impostor.Server/Recorder/ClientRecorder.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; +using Impostor.Api.Config; using Impostor.Api.Innersloth; using Impostor.Api.Net.Custom; using Impostor.Api.Net.Messages; -using Impostor.Server.Config; using Impostor.Server.Net; using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; diff --git a/src/Impostor.Server/Recorder/PacketRecorder.cs b/src/Impostor.Server/Recorder/PacketRecorder.cs index 12985f1..704f26b 100644 --- a/src/Impostor.Server/Recorder/PacketRecorder.cs +++ b/src/Impostor.Server/Recorder/PacketRecorder.cs @@ -4,9 +4,9 @@ using System.Net; using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; +using Impostor.Api.Config; using Impostor.Api.Games; using Impostor.Api.Net.Messages; -using Impostor.Server.Config; using Impostor.Server.Net; using Impostor.Server.Utils; using Microsoft.Extensions.Hosting; -- 2.39.5