From 7a83ed60c1d9ab8df40cbe477d576bbe3a1d2bf5 Mon Sep 17 00:00:00 2001 From: KashRas2 Date: Thu, 8 Aug 2024 14:19:34 +0300 Subject: [PATCH 1/3] Revert "[Major] Moving out Queue, Verifications and Sponsors (#1435)" This reverts commit 195c402ef10775edba3258c0f01638a275b02b80. --- Content.Client/Content.Client.csproj | 2 - .../Corvax/DiscordAuth/DiscordAuthGui.xaml | 28 ++ .../Corvax/DiscordAuth/DiscordAuthGui.xaml.cs | 35 +++ .../Corvax/DiscordAuth/DiscordAuthManager.cs | 30 ++ .../Corvax/DiscordAuth/DiscordAuthState.cs | 34 +++ .../Corvax/JoinQueue/JoinQueueManager.cs | 26 ++ Content.Client/Corvax/JoinQueue/QueueGui.xaml | 34 +++ .../Corvax/JoinQueue/QueueGui.xaml.cs | 41 +++ Content.Client/Corvax/JoinQueue/QueueState.cs | 52 ++++ .../Corvax/Sponsors/SponsorsManager.cs | 23 ++ .../Corvax/TTS/HumanoidProfileEditor.TTS.cs | 9 +- Content.Client/Entry/EntryPoint.cs | 9 + Content.Client/Humanoid/MarkingPicker.xaml.cs | 15 +- .../Humanoid/SingleMarkingPicker.xaml.cs | 15 +- Content.Client/IoC/ClientContentIoC.cs | 6 + .../Lobby/ClientPreferencesManager.cs | 9 +- Content.Server/Chat/Managers/ChatManager.cs | 15 +- .../Connection/ConnectionManager.cs | 11 +- Content.Server/Content.Server.csproj | 1 - .../Corvax/DiscordAuth/DiscordAuthManager.cs | 125 ++++++++ .../Corvax/JoinQueue/JoinQueueManager.cs | 167 ++++++++++ .../Corvax/Sponsors/SponsorsManager.cs | 91 ++++++ Content.Server/Entry/EntryPoint.cs | 6 + .../GameTicking/GameTicker.Player.cs | 6 +- .../GameTicking/GameTicker.StatusShell.cs | 11 +- Content.Server/IoC/ServerContentIoC.cs | 6 + .../Managers/ServerPreferencesManager.cs | 61 ++-- Content.Shared/Content.Shared.csproj | 1 - Content.Shared/Corvax/CCCVars/CCCVars.cs | 36 +++ .../Corvax/DiscordAuth/MsgDiscordAuthCheck.cs | 22 ++ .../DiscordAuth/MsgDiscordAuthRequired.cs | 25 ++ .../Corvax/JoinQueue/MsgQueueUpdate.cs | 36 +++ .../Corvax/Sponsors/MsgSponsorInfo.cs | 60 ++++ .../Content.Corvax.Interfaces.Client.csproj | 13 - .../IClientDiscordAuthManager.cs | 8 - .../IClientJoinQueueManager.cs | 6 - .../Content.Corvax.Interfaces.Server.csproj | 13 - .../IServerDiscordAuthManager.cs | 13 - .../IServerJoinQueueManager.cs | 10 - .../ISharedDiscordAuthManager.cs | 6 - .../ISharedSponsorsManager.cs | 19 -- SpaceStation14.sln | 37 --- Tools/package_client_build.py | 192 ++++++++++++ Tools/package_server_build.py | 289 ++++++++++++++++++ 44 files changed, 1450 insertions(+), 204 deletions(-) create mode 100644 Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml create mode 100644 Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml.cs create mode 100644 Content.Client/Corvax/DiscordAuth/DiscordAuthManager.cs create mode 100644 Content.Client/Corvax/DiscordAuth/DiscordAuthState.cs create mode 100644 Content.Client/Corvax/JoinQueue/JoinQueueManager.cs create mode 100644 Content.Client/Corvax/JoinQueue/QueueGui.xaml create mode 100644 Content.Client/Corvax/JoinQueue/QueueGui.xaml.cs create mode 100644 Content.Client/Corvax/JoinQueue/QueueState.cs create mode 100644 Content.Client/Corvax/Sponsors/SponsorsManager.cs create mode 100644 Content.Server/Corvax/DiscordAuth/DiscordAuthManager.cs create mode 100644 Content.Server/Corvax/JoinQueue/JoinQueueManager.cs create mode 100644 Content.Server/Corvax/Sponsors/SponsorsManager.cs create mode 100644 Content.Shared/Corvax/DiscordAuth/MsgDiscordAuthCheck.cs create mode 100644 Content.Shared/Corvax/DiscordAuth/MsgDiscordAuthRequired.cs create mode 100644 Content.Shared/Corvax/JoinQueue/MsgQueueUpdate.cs create mode 100644 Content.Shared/Corvax/Sponsors/MsgSponsorInfo.cs delete mode 100644 Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj delete mode 100644 Corvax/Content.Corvax.Interfaces.Client/IClientDiscordAuthManager.cs delete mode 100644 Corvax/Content.Corvax.Interfaces.Client/IClientJoinQueueManager.cs delete mode 100644 Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj delete mode 100644 Corvax/Content.Corvax.Interfaces.Server/IServerDiscordAuthManager.cs delete mode 100644 Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs delete mode 100644 Corvax/Content.Corvax.Interfaces.Shared/ISharedDiscordAuthManager.cs delete mode 100644 Corvax/Content.Corvax.Interfaces.Shared/ISharedSponsorsManager.cs create mode 100755 Tools/package_client_build.py create mode 100755 Tools/package_server_build.py diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 125bbac00df..956f2fd0351 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -22,8 +22,6 @@ - - diff --git a/Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml b/Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml new file mode 100644 index 00000000000..389854ed529 --- /dev/null +++ b/Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml @@ -0,0 +1,28 @@ + + + + + + +