diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Requests/DeltaRequest.cs b/src/GameServiceWarden.ClientAPI/Communicable/Requests/DeltaRequest.cs deleted file mode 100644 index 9f45655..0000000 --- a/src/GameServiceWarden.ClientAPI/Communicable/Requests/DeltaRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -using GameServiceWarden.ClientAPI.Module; - -namespace GameServiceWarden.ClientAPI.Communicable.Requests -{ - public struct ServiceRequest - { - public ServiceManagerAction serviceManagerAction; - } -} \ No newline at end of file diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Responses/DeltaResponse.cs b/src/GameServiceWarden.ClientAPI/Communicable/Responses/DeltaResponse.cs deleted file mode 100644 index 0f6cd2f..0000000 --- a/src/GameServiceWarden.ClientAPI/Communicable/Responses/DeltaResponse.cs +++ /dev/null @@ -1,9 +0,0 @@ -using GameServiceWarden.ClientAPI.Module; - -namespace GameServiceWarden.ClientAPI.Communicable.Responses -{ - public struct DeltaResponse - { - public ServiceManagerTotal gameServiceDelta; - } -} \ No newline at end of file diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Responses/ViewResponse.cs b/src/GameServiceWarden.ClientAPI/Communicable/Responses/ViewResponse.cs deleted file mode 100644 index 040967a..0000000 --- a/src/GameServiceWarden.ClientAPI/Communicable/Responses/ViewResponse.cs +++ /dev/null @@ -1,8 +0,0 @@ -using GameServiceWarden.ClientAPI.Module; - -namespace GameServiceWarden.ClientAPI.Communicable.Responses -{ - public struct ViewResponse { - public ServiceManagerTotal state; - } -} \ No newline at end of file diff --git a/src/GameServiceWarden.Core/GameServiceWarden.Core.csproj b/src/GameServiceWarden.Core/GameServiceWarden.Core.csproj index 58d296b..53c465a 100644 --- a/src/GameServiceWarden.Core/GameServiceWarden.Core.csproj +++ b/src/GameServiceWarden.Core/GameServiceWarden.Core.csproj @@ -2,7 +2,7 @@ - + diff --git a/src/GameServiceWarden.Core/Module/IServiceExecuter.cs b/src/GameServiceWarden.Core/Module/IServiceExecuter.cs index 6ec4f7b..ea26dc0 100644 --- a/src/GameServiceWarden.Core/Module/IServiceExecuter.cs +++ b/src/GameServiceWarden.Core/Module/IServiceExecuter.cs @@ -1,4 +1,4 @@ -using GameServiceWarden.ClientAPI.Module; +using GameServiceWarden.InteractionAPI.Module; namespace GameServiceWarden.Core.Module { diff --git a/src/GameServiceWarden.Core/Module/IServiceManagerMonitor.cs b/src/GameServiceWarden.Core/Module/IServiceManagerMonitor.cs index 60ed4e4..3acfb92 100644 --- a/src/GameServiceWarden.Core/Module/IServiceManagerMonitor.cs +++ b/src/GameServiceWarden.Core/Module/IServiceManagerMonitor.cs @@ -1,4 +1,4 @@ -using GameServiceWarden.ClientAPI.Module; +using GameServiceWarden.InteractionAPI.Module; namespace GameServiceWarden.Core.Module { diff --git a/src/GameServiceWarden.Core/Module/ServiceManager.cs b/src/GameServiceWarden.Core/Module/ServiceManager.cs index a332d38..b3af65b 100644 --- a/src/GameServiceWarden.Core/Module/ServiceManager.cs +++ b/src/GameServiceWarden.Core/Module/ServiceManager.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; -using GameServiceWarden.ClientAPI.Module; +using GameServiceWarden.InteractionAPI.Module; using GameServiceWarden.Core.Persistence; using GameServiceWarden.ModuleAPI; using GameServiceWarden.Core.Collection; diff --git a/src/GameServiceWarden.Core/UI/IPCController.cs b/src/GameServiceWarden.Core/UI/IPCController.cs index 7045c34..98ebf5d 100644 --- a/src/GameServiceWarden.Core/UI/IPCController.cs +++ b/src/GameServiceWarden.Core/UI/IPCController.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Text.Json; -using GameServiceWarden.ClientAPI; -using GameServiceWarden.ClientAPI.Communicable.Requests; +using GameServiceWarden.InteractionAPI; +using GameServiceWarden.InteractionAPI.Communicable.Requests; using GameServiceWarden.Core.Module; using GameServiceWarden.Core.Logging; diff --git a/src/GameServiceWarden.Core/UI/IPCMediator.cs b/src/GameServiceWarden.Core/UI/IPCMediator.cs index 49531d1..72b1729 100644 --- a/src/GameServiceWarden.Core/UI/IPCMediator.cs +++ b/src/GameServiceWarden.Core/UI/IPCMediator.cs @@ -7,9 +7,9 @@ using System.Net.Sockets; using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using GameServiceWarden.ClientAPI; -using GameServiceWarden.ClientAPI.Communicable.Requests; -using GameServiceWarden.ClientAPI.Communicable.Responses; +using GameServiceWarden.InteractionAPI; +using GameServiceWarden.InteractionAPI.Communicable.Requests; +using GameServiceWarden.InteractionAPI.Communicable.Responses; using GameServiceWarden.Core.Logging; namespace GameServiceWarden.Core.UI diff --git a/src/GameServiceWarden.Core/UI/IPCPresenter.cs b/src/GameServiceWarden.Core/UI/IPCPresenter.cs index 67ccc2d..e505332 100644 --- a/src/GameServiceWarden.Core/UI/IPCPresenter.cs +++ b/src/GameServiceWarden.Core/UI/IPCPresenter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Threading.Tasks; -using GameServiceWarden.ClientAPI; -using GameServiceWarden.ClientAPI.Module; +using GameServiceWarden.InteractionAPI; +using GameServiceWarden.InteractionAPI.Module; using GameServiceWarden.Core.Module; namespace GameServiceWarden.Core.UI diff --git a/src/GameServiceWarden.ClientAPI/Communicable/CommunicableType.cs b/src/GameServiceWarden.InteractionAPI/Communicable/CommunicableType.cs similarity index 79% rename from src/GameServiceWarden.ClientAPI/Communicable/CommunicableType.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/CommunicableType.cs index d311c80..9ec69e3 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/CommunicableType.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/CommunicableType.cs @@ -1,6 +1,6 @@ using System; -namespace GameServiceWarden.ClientAPI +namespace GameServiceWarden.InteractionAPI { public enum CommunicableType : uint { diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Requests/ConnectRequest.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/ConnectRequest.cs similarity index 78% rename from src/GameServiceWarden.ClientAPI/Communicable/Requests/ConnectRequest.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Requests/ConnectRequest.cs index 02d3b08..6b53642 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Requests/ConnectRequest.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/ConnectRequest.cs @@ -1,4 +1,4 @@ -namespace GameServiceWarden.ClientAPI.Communicable.Requests +namespace GameServiceWarden.InteractionAPI.Communicable.Requests { public struct ConnectRequest { diff --git a/src/GameServiceWarden.InteractionAPI/Communicable/Requests/DeltaRequest.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/DeltaRequest.cs new file mode 100644 index 0000000..6a7d85e --- /dev/null +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/DeltaRequest.cs @@ -0,0 +1,9 @@ +using GameServiceWarden.InteractionAPI.Module; + +namespace GameServiceWarden.InteractionAPI.Communicable.Requests +{ + public struct ServiceRequest + { + public ServiceManagerAction serviceManagerAction; + } +} \ No newline at end of file diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Requests/DisconnectRequest.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/DisconnectRequest.cs similarity index 65% rename from src/GameServiceWarden.ClientAPI/Communicable/Requests/DisconnectRequest.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Requests/DisconnectRequest.cs index 328a31e..77d8fd9 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Requests/DisconnectRequest.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/DisconnectRequest.cs @@ -1,4 +1,4 @@ -namespace GameServiceWarden.ClientAPI +namespace GameServiceWarden.InteractionAPI { public struct DisconnectRequest { diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Requests/RequestHeader.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/RequestHeader.cs similarity index 83% rename from src/GameServiceWarden.ClientAPI/Communicable/Requests/RequestHeader.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Requests/RequestHeader.cs index acf0bee..929ba22 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Requests/RequestHeader.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Requests/RequestHeader.cs @@ -1,7 +1,7 @@ using System; using System.IO.Pipes; -namespace GameServiceWarden.ClientAPI.Communicable.Requests +namespace GameServiceWarden.InteractionAPI.Communicable.Requests { public static class RequestHeader { diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Responses/ConnectResponse.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ConnectResponse.cs similarity index 77% rename from src/GameServiceWarden.ClientAPI/Communicable/Responses/ConnectResponse.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Responses/ConnectResponse.cs index e2ab3cf..80691e4 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Responses/ConnectResponse.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ConnectResponse.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography.X509Certificates; -namespace GameServiceWarden.ClientAPI.Communicable.Responses +namespace GameServiceWarden.InteractionAPI.Communicable.Responses { public struct ConnectResponse { diff --git a/src/GameServiceWarden.InteractionAPI/Communicable/Responses/DeltaResponse.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/DeltaResponse.cs new file mode 100644 index 0000000..2a7131b --- /dev/null +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/DeltaResponse.cs @@ -0,0 +1,9 @@ +using GameServiceWarden.InteractionAPI.Module; + +namespace GameServiceWarden.InteractionAPI.Communicable.Responses +{ + public struct DeltaResponse + { + public ServiceManagerTotal gameServiceDelta; + } +} \ No newline at end of file diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Responses/DisconnectResponse.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/DisconnectResponse.cs similarity index 65% rename from src/GameServiceWarden.ClientAPI/Communicable/Responses/DisconnectResponse.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Responses/DisconnectResponse.cs index 97776fa..63fc180 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Responses/DisconnectResponse.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/DisconnectResponse.cs @@ -1,4 +1,4 @@ -namespace GameServiceWarden.ClientAPI +namespace GameServiceWarden.InteractionAPI { public struct DisconnectResponse { diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Responses/ResponseHeader.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ResponseHeader.cs similarity index 84% rename from src/GameServiceWarden.ClientAPI/Communicable/Responses/ResponseHeader.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Responses/ResponseHeader.cs index c3f222b..496c409 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Responses/ResponseHeader.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ResponseHeader.cs @@ -1,6 +1,6 @@ using System; -namespace GameServiceWarden.ClientAPI.Communicable.Responses +namespace GameServiceWarden.InteractionAPI.Communicable.Responses { public static class ResponseHeader { diff --git a/src/GameServiceWarden.ClientAPI/Communicable/Responses/UnexpectedRequestResponse.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/UnexpectedRequestResponse.cs similarity index 66% rename from src/GameServiceWarden.ClientAPI/Communicable/Responses/UnexpectedRequestResponse.cs rename to src/GameServiceWarden.InteractionAPI/Communicable/Responses/UnexpectedRequestResponse.cs index 391820f..a768282 100644 --- a/src/GameServiceWarden.ClientAPI/Communicable/Responses/UnexpectedRequestResponse.cs +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/UnexpectedRequestResponse.cs @@ -1,4 +1,4 @@ -namespace GameServiceWarden.ClientAPI.Communicable.Responses +namespace GameServiceWarden.InteractionAPI.Communicable.Responses { public struct UnexpectedRequestResponse { diff --git a/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ViewResponse.cs b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ViewResponse.cs new file mode 100644 index 0000000..e55c4e7 --- /dev/null +++ b/src/GameServiceWarden.InteractionAPI/Communicable/Responses/ViewResponse.cs @@ -0,0 +1,8 @@ +using GameServiceWarden.InteractionAPI.Module; + +namespace GameServiceWarden.InteractionAPI.Communicable.Responses +{ + public struct ViewResponse { + public ServiceManagerTotal state; + } +} \ No newline at end of file diff --git a/src/GameServiceWarden.ClientAPI/GameServiceWarden.ClientAPI.csproj b/src/GameServiceWarden.InteractionAPI/GameServiceWarden.InteractionAPI.csproj similarity index 100% rename from src/GameServiceWarden.ClientAPI/GameServiceWarden.ClientAPI.csproj rename to src/GameServiceWarden.InteractionAPI/GameServiceWarden.InteractionAPI.csproj diff --git a/src/GameServiceWarden.ClientAPI/Module/ServiceManagerAction.cs b/src/GameServiceWarden.InteractionAPI/Module/ServiceManagerAction.cs similarity index 90% rename from src/GameServiceWarden.ClientAPI/Module/ServiceManagerAction.cs rename to src/GameServiceWarden.InteractionAPI/Module/ServiceManagerAction.cs index 4581cdf..597aedb 100644 --- a/src/GameServiceWarden.ClientAPI/Module/ServiceManagerAction.cs +++ b/src/GameServiceWarden.InteractionAPI/Module/ServiceManagerAction.cs @@ -1,4 +1,4 @@ -namespace GameServiceWarden.ClientAPI.Module +namespace GameServiceWarden.InteractionAPI.Module { public struct ServiceManagerAction { diff --git a/src/GameServiceWarden.ClientAPI/Module/ServiceManagerDelta.cs b/src/GameServiceWarden.InteractionAPI/Module/ServiceManagerDelta.cs similarity index 86% rename from src/GameServiceWarden.ClientAPI/Module/ServiceManagerDelta.cs rename to src/GameServiceWarden.InteractionAPI/Module/ServiceManagerDelta.cs index f6990f0..758a52d 100644 --- a/src/GameServiceWarden.ClientAPI/Module/ServiceManagerDelta.cs +++ b/src/GameServiceWarden.InteractionAPI/Module/ServiceManagerDelta.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace GameServiceWarden.ClientAPI.Module +namespace GameServiceWarden.InteractionAPI.Module { public struct ServiceManagerDelta { diff --git a/src/GameServiceWarden.ClientAPI/Module/ServiceManagerTotal.cs b/src/GameServiceWarden.InteractionAPI/Module/ServiceManagerTotal.cs similarity index 88% rename from src/GameServiceWarden.ClientAPI/Module/ServiceManagerTotal.cs rename to src/GameServiceWarden.InteractionAPI/Module/ServiceManagerTotal.cs index 05078b5..520e08a 100644 --- a/src/GameServiceWarden.ClientAPI/Module/ServiceManagerTotal.cs +++ b/src/GameServiceWarden.InteractionAPI/Module/ServiceManagerTotal.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace GameServiceWarden.ClientAPI.Module +namespace GameServiceWarden.InteractionAPI.Module { public struct ServiceManagerTotal { diff --git a/tests/GameServiceWarden.Core.Tests/Modules/FakeServiceManagerMonitor.cs b/tests/GameServiceWarden.Core.Tests/Modules/FakeServiceManagerMonitor.cs index 81a64f6..0028460 100644 --- a/tests/GameServiceWarden.Core.Tests/Modules/FakeServiceManagerMonitor.cs +++ b/tests/GameServiceWarden.Core.Tests/Modules/FakeServiceManagerMonitor.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using GameServiceWarden.ClientAPI.Module; +using GameServiceWarden.InteractionAPI.Module; using GameServiceWarden.Core.Module; namespace GameServiceWarden.Core.Tests.Modules