From 94e2b431ce089a4f4618eb4b70fcaf020ce66dbf Mon Sep 17 00:00:00 2001 From: 13lackHawk Date: Sat, 1 Jun 2024 21:07:57 +0300 Subject: [PATCH 01/12] Huge revert to new Corvax sponsor stuff etc. --- Content.Client/Content.Client.csproj | 2 + .../Corvax/JoinQueue/JoinQueueManager.cs | 26 --- Content.Client/Corvax/JoinQueue/QueueGui.xaml | 34 ---- .../Corvax/JoinQueue/QueueGui.xaml.cs | 41 ----- Content.Client/Corvax/JoinQueue/QueueState.cs | 54 ------ .../Corvax/Sponsors/SponsorsManager.cs | 23 --- .../Corvax/TTS/HumanoidProfileEditor.TTS.cs | 36 ++-- Content.Client/Entry/EntryPoint.cs | 7 - Content.Client/Humanoid/MarkingPicker.xaml.cs | 15 +- .../Humanoid/SingleMarkingPicker.xaml.cs | 15 +- Content.Client/IoC/ClientContentIoC.cs | 6 +- Content.Packaging/ClientPackaging.cs | 23 ++- Content.Packaging/ServerPackaging.cs | 4 +- Content.Server/Antag/AntagSelectionSystem.cs | 2 - Content.Server/Chat/Managers/ChatManager.cs | 20 ++- .../Connection/ConnectionManager.cs | 30 +++- Content.Server/Content.Server.csproj | 1 + .../Corvax/DiscordAuth/DiscordAuthManager.cs | 127 ------------- .../Corvax/JoinQueue/JoinQueueManager.cs | 169 ------------------ .../Corvax/Sponsors/SponsorsManager.cs | 101 ----------- Content.Server/Entry/EntryPoint.cs | 6 - .../GameTicking/GameTicker.Player.cs | 6 +- .../GameTicking/GameTicker.StatusShell.cs | 12 +- .../GameTicking/Rules/TraitorRuleSystem.cs | 2 - Content.Server/IoC/ServerContentIoC.cs | 8 - .../Managers/ServerPreferencesManager.cs | 70 ++++---- Content.Shared/Content.Shared.csproj | 1 + Content.Shared/Corvax/CCCVars/CCCVars.cs | 44 +---- .../Corvax/DiscordAuth/MsgDiscordAuthCheck.cs | 22 --- .../DiscordAuth/MsgDiscordAuthRequired.cs | 25 --- .../Corvax/JoinQueue/MsgQueueUpdate.cs | 36 ---- .../Corvax/Sponsors/MsgSponsorInfo.cs | 64 ------- .../Humanoid/Prototypes/SpeciesPrototype.cs | 8 + .../Preferences/HumanoidCharacterProfile.cs | 8 + .../Content.Corvax.Interfaces.Client.csproj | 13 ++ .../IClientDiscordAuthManager.cs | 8 + .../IClientJoinQueueManager.cs | 6 + .../ISponsorWindowCreator.cs | 6 + .../Content.Corvax.Interfaces.Server.csproj | 13 ++ .../IServerDiscordAuthManager.cs | 13 ++ .../IServerJoinQueueManager.cs | 10 ++ .../IServerVPNGuardManager.cs | 9 + .../Content.Corvax.Interfaces.Shared.csproj | 10 ++ .../ISharedDiscordAuthManager.cs | 6 + .../ISharedSponsorsManager.cs | 19 ++ .../Fills/Backpacks/StarterGear/backpack.yml | 14 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 14 +- .../Fills/Backpacks/StarterGear/satchel.yml | 14 +- SpaceStation14.sln | 13 +- 49 files changed, 300 insertions(+), 916 deletions(-) delete mode 100644 Content.Client/Corvax/JoinQueue/JoinQueueManager.cs delete mode 100644 Content.Client/Corvax/JoinQueue/QueueGui.xaml delete mode 100644 Content.Client/Corvax/JoinQueue/QueueGui.xaml.cs delete mode 100644 Content.Client/Corvax/JoinQueue/QueueState.cs delete mode 100644 Content.Client/Corvax/Sponsors/SponsorsManager.cs delete mode 100644 Content.Server/Corvax/DiscordAuth/DiscordAuthManager.cs delete mode 100644 Content.Server/Corvax/JoinQueue/JoinQueueManager.cs delete mode 100644 Content.Server/Corvax/Sponsors/SponsorsManager.cs delete mode 100644 Content.Shared/Corvax/DiscordAuth/MsgDiscordAuthCheck.cs delete mode 100644 Content.Shared/Corvax/DiscordAuth/MsgDiscordAuthRequired.cs delete mode 100644 Content.Shared/Corvax/JoinQueue/MsgQueueUpdate.cs delete mode 100644 Content.Shared/Corvax/Sponsors/MsgSponsorInfo.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj create mode 100644 Corvax/Content.Corvax.Interfaces.Client/IClientDiscordAuthManager.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Client/IClientJoinQueueManager.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Client/ISponsorWindowCreator.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj create mode 100644 Corvax/Content.Corvax.Interfaces.Server/IServerDiscordAuthManager.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Server/IServerVPNGuardManager.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Shared/Content.Corvax.Interfaces.Shared.csproj create mode 100644 Corvax/Content.Corvax.Interfaces.Shared/ISharedDiscordAuthManager.cs create mode 100644 Corvax/Content.Corvax.Interfaces.Shared/ISharedSponsorsManager.cs diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 956f2fd0351..125bbac00df 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -22,6 +22,8 @@ + + diff --git a/Content.Client/Corvax/JoinQueue/JoinQueueManager.cs b/Content.Client/Corvax/JoinQueue/JoinQueueManager.cs deleted file mode 100644 index 78a5ed3de70..00000000000 --- a/Content.Client/Corvax/JoinQueue/JoinQueueManager.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Shared.Corvax.JoinQueue; -using Robust.Client.State; -using Robust.Shared.Network; - -namespace Content.Client.Corvax.JoinQueue; - -public sealed class JoinQueueManager -{ - [Dependency] private readonly IClientNetManager _netManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - - public void Initialize() - { - _netManager.RegisterNetMessage(OnQueueUpdate); - } - - private void OnQueueUpdate(MsgQueueUpdate msg) - { - if (_stateManager.CurrentState is not QueueState) - { - _stateManager.RequestStateChange(); - } - - ((QueueState) _stateManager.CurrentState).OnQueueUpdate(msg); - } -} \ No newline at end of file diff --git a/Content.Client/Corvax/JoinQueue/QueueGui.xaml b/Content.Client/Corvax/JoinQueue/QueueGui.xaml deleted file mode 100644 index 5ad739b4f9f..00000000000 --- a/Content.Client/Corvax/JoinQueue/QueueGui.xaml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -