From 21dbccfec9f99bc4c007b41ad3c29b7d0d201dec Mon Sep 17 00:00:00 2001 From: Remuchi Date: Sun, 28 Jan 2024 17:32:55 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BA=D0=BB=D0=B8=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=20=D0=B8=D0=B7=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20`White`=20=D0=B2=20`=5FWhite`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Chat/UI/SpeechBubble.cs | 2 +- Content.Client/Entry/EntryPoint.cs | 12 +- .../UI/HealthAnalyzerWindow.xaml.cs | 9 +- Content.Client/Humanoid/MarkingPicker.xaml.cs | 2 +- .../Humanoid/SingleMarkingPicker.xaml.cs | 2 +- Content.Client/Info/LinkBanner.cs | 7 +- Content.Client/Info/RulesAndInfoWindow.cs | 4 +- Content.Client/Info/RulesManager.cs | 2 +- Content.Client/IoC/ClientContentIoC.cs | 14 +- .../Overlays/ShowSecurityIconsSystem.cs | 2 +- .../Preferences/ClientPreferencesManager.cs | 2 +- .../UI/HumanoidProfileEditor.xaml.cs | 2 +- .../MenuBar/GameTopMenuBarUIController.cs | 2 +- .../VendingMachineBoundUserInterface.cs | 4 +- .../White/Radials/RadialUIController.cs | 128 ------------------ .../Administration/InvisibilitySystem.cs | 3 +- .../Animations/EmoteAnimationSystem.cs | 4 +- .../AuthPanel/AuthPanelBoundUserInterface.cs | 3 +- .../AuthPanel/AuthPanelMenu.xaml | 0 .../AuthPanel/AuthPanelMenu.xaml.cs | 2 +- .../CharacterInformationSystem.cs | 2 +- .../CharacterInformationWindow.xaml | 0 .../CharacterInformationWindow.xaml.cs | 2 +- .../{White => _White}/CheZaHuetaSystem.cs | 2 +- .../CheapSurgery/CheapSurgerySystem.cs | 3 +- .../UI/Controls/RecordCard.xaml | 8 +- .../UI/Controls/RecordCard.xaml.cs | 4 +- .../UI/Controls/RecordIconButton.xaml | 8 +- .../UI/Controls/RecordIconButton.xaml.cs | 3 +- .../UI/Controls/RecordItem.xaml | 8 +- .../UI/Controls/RecordItem.xaml.cs | 2 +- .../UI/CriminalRecordsBoundUserInterface.cs | 5 +- .../UI/CriminalRecordsWindow.xaml | 14 +- .../UI/CriminalRecordsWindow.xaml.cs | 12 +- .../Crossbow/DrawableVisualizerSystem.cs | 2 +- Content.Client/_White/Cult/CultHudOverlay.cs | 2 - .../Items/VeilShifter/VeilVisualizerSystem.cs | 5 +- .../Items/VeilShifter/VeilVisualsComponent.cs | 6 +- .../VoidTorch/VoidTorchVisualizerSystem.cs | 5 +- .../VoidTorch/VoidTorchVisualsComponent.cs | 6 +- .../_White/Cult/Narsie/NarsieLayer.cs | 2 +- .../_White/Cult/Narsie/NarsieVisualizer.cs | 2 +- .../Cult/Pylon/PylonVisualsComponent.cs | 4 +- .../_White/Cult/ShowCultHudSystem.cs | 1 - .../_White/Cult/UI/Altar/AltarBUI.cs | 3 - .../_White/Cult/UI/Altar/AltarWindow.xaml.cs | 5 +- .../ConstructSelector/ConstructSelectorBui.cs | 7 +- .../UI/CultistFactory/CultistFactoryBUI.cs | 1 - .../ListViewSelector/ListViewSelectorBUI.cs | 1 - .../ListViewSelectorWindow.xaml.cs | 3 +- .../Cult/UI/NameSelector/NameSelectorBUI.cs | 1 - .../Cult/UI/SpellSelector/SpellSelectorBUI.cs | 1 - .../StructureCraftBoundUserInterface.cs | 1 - .../SummonCultistListWindowBUI.cs | 3 +- .../TeleportRunesListWindowBUI.cs | 3 +- .../Cult/UI/TeleportSpell/TeleportSpellEui.cs | 2 +- .../_White/Cult/UI/Torch/TorchWindow.xaml.cs | 1 - .../_White/Cult/UI/Torch/TorchWindowBUI.cs | 4 +- .../CustomGhostVisualizer.cs | 2 +- .../Economy/ATMVisualLayers.cs | 2 +- .../{White => _White}/Economy/Ui/ATMBui.cs | 3 +- .../Economy/Ui/AtmWindow.xaml | 0 .../Economy/Ui/AtmWindow.xaml.cs | 6 +- .../{White => _White}/Economy/Ui/BankUi.cs | 3 +- .../Economy/Ui/BankUiFragment.xaml | 8 +- .../Economy/Ui/BankUiFragment.xaml.cs | 18 +-- .../{White => _White}/Economy/Ui/EftposBui.cs | 3 +- .../Economy/Ui/EftposWindow.xaml | 0 .../Economy/Ui/EftposWindow.xaml.cs | 6 +- .../Economy/Ui/VendingItem.xaml | 0 .../Economy/Ui/VendingItem.xaml.cs | 2 +- .../Economy/Ui/VendingMenu.xaml | 0 .../Economy/Ui/VendingMenu.xaml.cs | 2 +- .../EntityCrimeRecordsOverlay.cs | 13 +- .../ShowCrimeRecordsSystem.cs | 11 +- .../EntityHealthBar/EntityHealthBarOverlay.cs | 6 +- .../EntityHealthBar/ShowHealthBarsSystem.cs | 7 +- .../EntityJobInfo/EntityJobInfoOverlay.cs | 10 +- .../EntityJobInfo/ShowJobInfoSystem.cs | 11 +- .../GhostRecruitmentEuiAccept.cs | 3 +- .../GhostRecruitmentEuiAcceptWindow.cs | 4 +- .../Items/Tricorder/TricorderSystem.cs | 4 +- .../JoinQueue/JoinQueueManager.cs | 2 +- .../{White => _White}/JoinQueue/QueueGui.xaml | 0 .../JoinQueue/QueueGui.xaml.cs | 3 +- .../{White => _White}/JoinQueue/QueueState.cs | 7 +- .../Jukebox/ClientJukeboxSongsSyncManager.cs | 2 +- .../{White => _White}/Jukebox/JukeboxBUI.cs | 3 +- .../Jukebox/JukeboxMenu.xaml | 0 .../Jukebox/JukeboxMenu.xaml.cs | 2 +- .../Jukebox/JukeboxSongEntry.xaml | 0 .../Jukebox/JukeboxSongEntry.xaml.cs | 2 +- .../Jukebox/JukeboxSystem.cs | 2 +- .../Jukebox/TapeCreatorBUI.cs | 3 +- .../Jukebox/TapeCreatorMenu.xaml | 0 .../Jukebox/TapeCreatorMenu.xaml.cs | 5 +- .../Jukebox/TapeCreatorSystem.cs | 8 +- .../MeatyOre/MeatyOreUIController.cs | 7 +- .../BodyScannerConsoleBoundUserInterface.cs | 5 +- .../BodyScanner/BodyScannerConsoleWindow.xaml | 0 .../BodyScannerConsoleWindow.xaml.cs | 12 +- .../BodyScanner/GroupDamageCardComponent.xaml | 0 .../GroupDamageCardComponent.xaml.cs | 2 +- .../Overlays/NightVisionOverlay.cs | 2 +- .../Overlays/NightVisionSystem.cs | 2 +- .../Overlays/SaturationScaleOverlay.cs | 2 +- .../Overlays/SaturationScaleSystem.cs | 3 +- .../{White => _White}/Radials/RadialSystem.cs | 3 +- .../_White/Radials/RadialUIController.cs | 114 ++++++++++++++++ .../Reputation/ReputationManager.cs | 2 +- .../Rules/RulesWikiSection.xaml | 0 .../Rules/RulesWikiSection.xaml.cs | 2 +- .../Sponsors/SponsorsManager.cs | 2 +- .../{White => _White}/Stalin/StalinManager.cs | 7 +- .../Stalin/StalinUi/StalinLinkWindow.xaml | 0 .../Stalin/StalinUi/StalinLinkWindow.xaml.cs | 3 +- .../Supermatter/Systems/SupermatterSystem.cs | 2 +- .../TTS/HumanoidProfileEditor.TTS.cs | 4 +- .../{White => _White}/TTS/TTSManager.cs | 2 +- .../{White => _White}/TTS/TTSSystem.cs | 4 +- .../Trail/Line/ITrailLine.cs | 2 +- .../Trail/Line/Manager/ITrailLineHolder.cs | 2 +- .../Trail/Line/Manager/ITrailLineManager.cs | 2 +- .../Trail/Line/Manager/TrailSplineManager.cs | 4 +- .../Trail/Line/TrailSpline.cs | 10 +- .../SplineRenderer/ITrailSplineRenderer.cs | 2 +- .../SplineRenderer/TrailSplineRenderer.cs | 2 +- .../TrailSplineRendererContinuous.cs | 6 +- .../TrailSplineRendererDebug.cs | 6 +- .../TrailSplineRendererPoint.cs | 6 +- .../{White => _White}/Trail/TrailComponent.cs | 8 +- .../{White => _White}/Trail/TrailOverlay.cs | 4 +- .../{White => _White}/Trail/TrailSystem.cs | 4 +- .../Controls/ChatRichTextEntry.cs | 2 +- .../Controls/ChatRichTextLabel.cs | 2 +- .../UserInterface/Controls/WordWrap.cs | 2 +- .../UserInterface/Radial/RadialButton.xaml | 5 +- .../UserInterface/Radial/RadialContainer.xaml | 8 +- .../Radial/RadialContainer.xaml.cs | 9 +- 139 files changed, 345 insertions(+), 434 deletions(-) delete mode 100644 Content.Client/White/Radials/RadialUIController.cs rename Content.Client/{White => _White}/Administration/InvisibilitySystem.cs (95%) rename Content.Client/{White => _White}/Animations/EmoteAnimationSystem.cs (99%) rename Content.Client/{White => _White}/AuthPanel/AuthPanelBoundUserInterface.cs (95%) rename Content.Client/{White => _White}/AuthPanel/AuthPanelMenu.xaml (100%) rename Content.Client/{White => _White}/AuthPanel/AuthPanelMenu.xaml.cs (97%) rename Content.Client/{White => _White}/CharacterExamine/CharacterInformationSystem.cs (99%) rename Content.Client/{White => _White}/CharacterExamine/CharacterInformationWindow.xaml (100%) rename Content.Client/{White => _White}/CharacterExamine/CharacterInformationWindow.xaml.cs (98%) rename Content.Client/{White => _White}/CheZaHuetaSystem.cs (90%) rename Content.Client/{White => _White}/CheapSurgery/CheapSurgerySystem.cs (93%) rename Content.Client/{White => _White}/CriminalRecords/UI/Controls/RecordCard.xaml (94%) rename Content.Client/{White => _White}/CriminalRecords/UI/Controls/RecordCard.xaml.cs (96%) rename Content.Client/{White => _White}/CriminalRecords/UI/Controls/RecordIconButton.xaml (77%) rename Content.Client/{White => _White}/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs (89%) rename Content.Client/{White => _White}/CriminalRecords/UI/Controls/RecordItem.xaml (78%) rename Content.Client/{White => _White}/CriminalRecords/UI/Controls/RecordItem.xaml.cs (81%) rename Content.Client/{White => _White}/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs (93%) rename Content.Client/{White => _White}/CriminalRecords/UI/CriminalRecordsWindow.xaml (94%) rename Content.Client/{White => _White}/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs (96%) rename Content.Client/{White => _White}/Crossbow/DrawableVisualizerSystem.cs (94%) rename Content.Client/{White => _White}/CustomGhostSpriteSystem/CustomGhostVisualizer.cs (94%) rename Content.Client/{White => _White}/Economy/ATMVisualLayers.cs (60%) rename Content.Client/{White => _White}/Economy/Ui/ATMBui.cs (91%) rename Content.Client/{White => _White}/Economy/Ui/AtmWindow.xaml (100%) rename Content.Client/{White => _White}/Economy/Ui/AtmWindow.xaml.cs (92%) rename Content.Client/{White => _White}/Economy/Ui/BankUi.cs (91%) rename Content.Client/{White => _White}/Economy/Ui/BankUiFragment.xaml (90%) rename Content.Client/{White => _White}/Economy/Ui/BankUiFragment.xaml.cs (76%) rename Content.Client/{White => _White}/Economy/Ui/EftposBui.cs (91%) rename Content.Client/{White => _White}/Economy/Ui/EftposWindow.xaml (100%) rename Content.Client/{White => _White}/Economy/Ui/EftposWindow.xaml.cs (87%) rename Content.Client/{White => _White}/Economy/Ui/VendingItem.xaml (100%) rename Content.Client/{White => _White}/Economy/Ui/VendingItem.xaml.cs (92%) rename Content.Client/{White => _White}/Economy/Ui/VendingMenu.xaml (100%) rename Content.Client/{White => _White}/Economy/Ui/VendingMenu.xaml.cs (98%) rename Content.Client/{White => _White}/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs (97%) rename Content.Client/{White => _White}/EntityCrimeRecords/ShowCrimeRecordsSystem.cs (97%) rename Content.Client/{White => _White}/EntityHealthBar/EntityHealthBarOverlay.cs (99%) rename Content.Client/{White => _White}/EntityHealthBar/ShowHealthBarsSystem.cs (96%) rename Content.Client/{White => _White}/EntityJobInfo/EntityJobInfoOverlay.cs (99%) rename Content.Client/{White => _White}/EntityJobInfo/ShowJobInfoSystem.cs (96%) rename Content.Client/{White => _White}/GhostRecruitment/GhostRecruitmentEuiAccept.cs (92%) rename Content.Client/{White => _White}/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs (97%) rename Content.Client/{White => _White}/Items/Tricorder/TricorderSystem.cs (97%) rename Content.Client/{White => _White}/JoinQueue/JoinQueueManager.cs (93%) rename Content.Client/{White => _White}/JoinQueue/QueueGui.xaml (100%) rename Content.Client/{White => _White}/JoinQueue/QueueGui.xaml.cs (95%) rename Content.Client/{White => _White}/JoinQueue/QueueState.cs (94%) rename Content.Client/{White => _White}/Jukebox/ClientJukeboxSongsSyncManager.cs (87%) rename Content.Client/{White => _White}/Jukebox/JukeboxBUI.cs (96%) rename Content.Client/{White => _White}/Jukebox/JukeboxMenu.xaml (100%) rename Content.Client/{White => _White}/Jukebox/JukeboxMenu.xaml.cs (98%) rename Content.Client/{White => _White}/Jukebox/JukeboxSongEntry.xaml (100%) rename Content.Client/{White => _White}/Jukebox/JukeboxSongEntry.xaml.cs (94%) rename Content.Client/{White => _White}/Jukebox/JukeboxSystem.cs (99%) rename Content.Client/{White => _White}/Jukebox/TapeCreatorBUI.cs (94%) rename Content.Client/{White => _White}/Jukebox/TapeCreatorMenu.xaml (100%) rename Content.Client/{White => _White}/Jukebox/TapeCreatorMenu.xaml.cs (96%) rename Content.Client/{White => _White}/Jukebox/TapeCreatorSystem.cs (89%) rename Content.Client/{White => _White}/MeatyOre/MeatyOreUIController.cs (92%) rename Content.Client/{White => _White}/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs (95%) rename Content.Client/{White => _White}/Medical/BodyScanner/BodyScannerConsoleWindow.xaml (100%) rename Content.Client/{White => _White}/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs (99%) rename Content.Client/{White => _White}/Medical/BodyScanner/GroupDamageCardComponent.xaml (100%) rename Content.Client/{White => _White}/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs (98%) rename Content.Client/{White => _White}/Overlays/NightVisionOverlay.cs (97%) rename Content.Client/{White => _White}/Overlays/NightVisionSystem.cs (98%) rename Content.Client/{White => _White}/Overlays/SaturationScaleOverlay.cs (96%) rename Content.Client/{White => _White}/Overlays/SaturationScaleSystem.cs (96%) rename Content.Client/{White => _White}/Radials/RadialSystem.cs (99%) create mode 100644 Content.Client/_White/Radials/RadialUIController.cs rename Content.Client/{White => _White}/Reputation/ReputationManager.cs (92%) rename Content.Client/{White => _White}/Rules/RulesWikiSection.xaml (100%) rename Content.Client/{White => _White}/Rules/RulesWikiSection.xaml.cs (94%) rename Content.Client/{White => _White}/Sponsors/SponsorsManager.cs (92%) rename Content.Client/{White => _White}/Stalin/StalinManager.cs (81%) rename Content.Client/{White => _White}/Stalin/StalinUi/StalinLinkWindow.xaml (100%) rename Content.Client/{White => _White}/Stalin/StalinUi/StalinLinkWindow.xaml.cs (89%) rename Content.Client/{White => _White}/Supermatter/Systems/SupermatterSystem.cs (91%) rename Content.Client/{White => _White}/TTS/HumanoidProfileEditor.TTS.cs (97%) rename Content.Client/{White => _White}/TTS/TTSManager.cs (93%) rename Content.Client/{White => _White}/TTS/TTSSystem.cs (99%) rename Content.Client/{White => _White}/Trail/Line/ITrailLine.cs (88%) rename Content.Client/{White => _White}/Trail/Line/Manager/ITrailLineHolder.cs (62%) rename Content.Client/{White => _White}/Trail/Line/Manager/ITrailLineManager.cs (84%) rename Content.Client/{White => _White}/Trail/Line/Manager/TrailSplineManager.cs (94%) rename Content.Client/{White => _White}/Trail/Line/TrailSpline.cs (98%) rename Content.Client/{White => _White}/Trail/SplineRenderer/ITrailSplineRenderer.cs (89%) rename Content.Client/{White => _White}/Trail/SplineRenderer/TrailSplineRenderer.cs (91%) rename Content.Client/{White => _White}/Trail/SplineRenderer/TrailSplineRendererContinuous.cs (98%) rename Content.Client/{White => _White}/Trail/SplineRenderer/TrailSplineRendererDebug.cs (96%) rename Content.Client/{White => _White}/Trail/SplineRenderer/TrailSplineRendererPoint.cs (97%) rename Content.Client/{White => _White}/Trail/TrailComponent.cs (88%) rename Content.Client/{White => _White}/Trail/TrailOverlay.cs (95%) rename Content.Client/{White => _White}/Trail/TrailSystem.cs (96%) rename Content.Client/{White => _White}/UserInterface/Controls/ChatRichTextEntry.cs (99%) rename Content.Client/{White => _White}/UserInterface/Controls/ChatRichTextLabel.cs (96%) rename Content.Client/{White => _White}/UserInterface/Controls/WordWrap.cs (99%) diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs index 1f69de8200..824efb40a9 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -1,7 +1,7 @@ using System.Numerics; +using Content.Client._White.UserInterface.Controls; using Content.Shared.CCVar; using Content.Shared.Chat; -using Content.Client.White.UserInterface.Controls; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 44382aee7e..f1cf3fedc7 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -1,3 +1,9 @@ +using Content.Client._White.JoinQueue; +using Content.Client._White.Jukebox; +using Content.Client._White.Reputation; +using Content.Client._White.Sponsors; +using Content.Client._White.Stalin; +using Content.Client._White.TTS; using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; @@ -21,13 +27,7 @@ using Content.Client.Singularity; using Content.Client.Stylesheets; using Content.Client.Viewport; using Content.Client.Voting; -using Content.Client.White.JoinQueue; -using Content.Client.White.Jukebox; -using Content.Client.White.Reputation; -using Content.Client.White.Sponsors; using Content.Shared.Ame; -using Content.Client.White.Stalin; -using Content.Client.White.TTS; using Content.Shared.Gravity; using Content.Shared.Localizations; using Robust.Client; diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index 2e07120827..b12b0c66a2 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -1,19 +1,12 @@ -using System.Numerics; -using System.Text; -using System.Linq; +using Content.Client._White.Medical.BodyScanner; using Content.Client.UserInterface.Controls; -using Content.Client.White.Medical.BodyScanner; using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Content.Shared.IdentityManagement; using Content.Shared.MedicalScanner; using Content.Shared.Mobs.Components; using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.Prototypes; namespace Content.Client.HealthAnalyzer.UI { diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs index 5483b1fe7e..f5b85ca89c 100644 --- a/Content.Client/Humanoid/MarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs @@ -1,5 +1,5 @@ using System.Linq; -using Content.Client.White.Sponsors; +using Content.Client._White.Sponsors; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; using Content.Shared.Humanoid.Prototypes; diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs index d54672fe06..152bba9492 100644 --- a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs @@ -1,5 +1,5 @@ using System.Linq; -using Content.Client.White.Sponsors; +using Content.Client._White.Sponsors; using Content.Shared.Humanoid.Markings; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs index 00db424c23..6a79b6056e 100644 --- a/Content.Client/Info/LinkBanner.cs +++ b/Content.Client/Info/LinkBanner.cs @@ -1,15 +1,12 @@ -using Content.Client.Changelog; -using Content.Client.UserInterface.Controls; +using Content.Client._White.Stalin; +using Content.Client.Changelog; using Content.Client.UserInterface.Systems.EscapeMenu; using Content.Client.UserInterface.Systems.Guidebook; -using Content.Client.White.Stalin; -using Content.Client.White.Stalin.StalinUi; using Content.Shared.CCVar; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Collections; using Robust.Shared.Configuration; -using Robust.Shared.Utility; namespace Content.Client.Info { diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs index 6ace01494f..47a621b58b 100644 --- a/Content.Client/Info/RulesAndInfoWindow.cs +++ b/Content.Client/Info/RulesAndInfoWindow.cs @@ -1,8 +1,6 @@ using System.Numerics; +using Content.Client._White.Rules; using Content.Client.UserInterface.Systems.EscapeMenu; -using Content.Client.White.Rules; -using Content.Shared.White; -using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/Info/RulesManager.cs b/Content.Client/Info/RulesManager.cs index 0964656136..278ed07eb1 100644 --- a/Content.Client/Info/RulesManager.cs +++ b/Content.Client/Info/RulesManager.cs @@ -1,6 +1,6 @@ +using Content.Client._White.Rules; using Content.Client.Lobby; using Content.Client.Gameplay; -using Content.Client.White.Rules; using Content.Shared.CCVar; using Content.Shared.Info; using Robust.Client.Console; diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs index a01cd183b3..2b17dc1310 100644 --- a/Content.Client/IoC/ClientContentIoC.cs +++ b/Content.Client/IoC/ClientContentIoC.cs @@ -1,3 +1,10 @@ +using Content.Client._White.JoinQueue; +using Content.Client._White.Jukebox; +using Content.Client._White.Reputation; +using Content.Client._White.Sponsors; +using Content.Client._White.Stalin; +using Content.Client._White.Trail.Line.Manager; +using Content.Client._White.TTS; using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; @@ -17,13 +24,6 @@ using Content.Client.Voting; using Content.Shared.Administration.Logs; using Content.Client.Guidebook; using Content.Client.Replay; -using Content.Client.White.JoinQueue; -using Content.Client.White.Jukebox; -using Content.Client.White.Reputation; -using Content.Client.White.Sponsors; -using Content.Client.White.Stalin; -using Content.Client.White.Trail.Line.Manager; -using Content.Client.White.TTS; using Content.Shared.Administration.Managers; namespace Content.Client.IoC diff --git a/Content.Client/Overlays/ShowSecurityIconsSystem.cs b/Content.Client/Overlays/ShowSecurityIconsSystem.cs index f374f58760..75ef5635ab 100644 --- a/Content.Client/Overlays/ShowSecurityIconsSystem.cs +++ b/Content.Client/Overlays/ShowSecurityIconsSystem.cs @@ -1,4 +1,4 @@ -using Content.Client.White.EntityCrimeRecords; +using Content.Client._White.EntityCrimeRecords; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Inventory; diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs index 9c3fd7ccd2..30407427c5 100644 --- a/Content.Client/Preferences/ClientPreferencesManager.cs +++ b/Content.Client/Preferences/ClientPreferencesManager.cs @@ -1,6 +1,6 @@ using System.Linq; +using Content.Client._White.Sponsors; using Content.Client.Administration.Managers; -using Content.Client.White.Sponsors; using Content.Shared.Administration; using Content.Shared.Preferences; using Robust.Client; diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index 820c0e8f74..488694ca34 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Numerics; +using Content.Client._White.Sponsors; using Content.Client.Administration.Managers; using Content.Client.Humanoid; using Content.Client.Lobby.UI; @@ -7,7 +8,6 @@ using Content.Client.Message; using Content.Client.Players.PlayTimeTracking; using Content.Client.Stylesheets; using Content.Client.UserInterface.Controls; -using Content.Client.White.Sponsors; using Content.Shared.Administration; using Content.Shared.CCVar; using Content.Shared.GameTicking; diff --git a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs index 426499f545..d77726a990 100644 --- a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs +++ b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs @@ -1,3 +1,4 @@ +using Content.Client._White.MeatyOre; using Content.Client.UserInterface.Systems.Actions; using Content.Client.UserInterface.Systems.Admin; using Content.Client.UserInterface.Systems.Bwoink; @@ -9,7 +10,6 @@ using Content.Client.UserInterface.Systems.Gameplay; using Content.Client.UserInterface.Systems.Guidebook; using Content.Client.UserInterface.Systems.MenuBar.Widgets; using Content.Client.UserInterface.Systems.Sandbox; -using Content.Client.White.MeatyOre; using Robust.Client.UserInterface.Controllers; namespace Content.Client.UserInterface.Systems.MenuBar; diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 669ba5a22a..f0998e0e46 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -1,8 +1,6 @@ -using Content.Client.VendingMachines.UI; using Content.Shared.VendingMachines; -using Robust.Client.UserInterface.Controls; using System.Linq; -using Content.Client.White.Economy.Ui; +using Content.Client._White.Economy.Ui; namespace Content.Client.VendingMachines { diff --git a/Content.Client/White/Radials/RadialUIController.cs b/Content.Client/White/Radials/RadialUIController.cs deleted file mode 100644 index bb813b0c62..0000000000 --- a/Content.Client/White/Radials/RadialUIController.cs +++ /dev/null @@ -1,128 +0,0 @@ -using System.Linq; -using Content.Client._White.UserInterface.Radial; -using Content.Client.CombatMode; -using Content.Client.ContextMenu.UI; -using Content.Client.Gameplay; -using Content.Client.Resources; -using Content.Client.Verbs; -using Content.Client.Verbs.UI; -using Content.Client.White.UserInterface.Controls; -using Content.Shared.Input; -using Content.Shared.Verbs; -using Content.Shared.White.Radials; -using Robust.Client.Player; -using Robust.Client.ResourceManagement; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controllers; -using Robust.Client.Utility; -using Robust.Shared.Input; - -namespace Content.Client.White.Radials; - -public sealed class RadialUIController : UIController, IOnStateEntered, IOnStateExited - { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - //[Dependency] private readonly ContextMenuUIController _context = default!; - - [UISystemDependency] private readonly CombatModeSystem _combatMode = default!; - [UISystemDependency] private readonly RadialSystem _radialSystem = default!; - - public EntityUid CurrentTarget; - public SortedSet CurrentRadials = new(); - - /// - /// Separate from , since we can open a verb menu as a submenu - /// of an entity menu element. If that happens, we need to be aware and close it properly. - /// - public RadialContainer? OpenMenu = null; - - public void OnStateEntered(GameplayState state) - { - //_context.OnContextClosed += Close; - _radialSystem.OnRadialsResponse += HandleVerbsResponse; - } - - public void OnStateExited(GameplayState state) - { - //_context.OnContextClosed -= Close; - if (_radialSystem != null) - _radialSystem.OnRadialsResponse -= HandleVerbsResponse; - Close(); - } - - /// - /// Open a verb menu and fill it with verbs applicable to the given target entity. - /// - /// Entity to get verbs on. - /// Used to force showing all verbs (mostly for admins). - /// - /// If this is not null, verbs will be placed into the given popup instead. - /// - public void OpenRadialMenu(EntityUid target, bool force = false) - { - if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} user || - _combatMode.IsInCombatMode(user)) - return; - - Close(); - - CurrentTarget = target; - CurrentRadials = _radialSystem.GetRadials(target, user, Radial.RadialTypes, force); - OpenMenu = new RadialContainer(); - OpenMenu.NormalSize = 50; - OpenMenu.FocusSize = 64; - - //Feat: Disable action text, while im not fixed it - OpenMenu.IsAction = false; - } - - private void FillRadial() - { - OpenMenu ??= new RadialContainer(); - - OpenMenu.CloseButton.Controller.OnPressed += (_) => Close(); - - foreach (var radial in CurrentRadials) - { - var button = OpenMenu.AddButton(radial.Text, radial.Icon ?? null); - button.Controller.OnPressed += (_) => { ExecuteRadial(radial); }; - } - - OpenMenu.Open(_userInterfaceManager.MousePositionScaled.Position); - } - - public void AddServerRadials(List radials) - { - CurrentRadials.UnionWith(radials); - FillRadial(); - } - - private void Close() - { - if (OpenMenu == null) - return; - - OpenMenu.Close(); - OpenMenu = null; - } - - private void HandleVerbsResponse(RadialsResponseEvent msg) - { - if (OpenMenu == null || CurrentTarget != _entityManager.GetEntity(msg.Entity)) - return; - - if (msg.Radials == null) - return; - AddServerRadials(msg.Radials); - } - - private void ExecuteRadial(Radial radial) - { - _radialSystem.ExecuteRadial(CurrentTarget, radial); - - if (radial.CloseMenu ?? radial.CloseMenuDefault) - Close(); //_context.Close(); - } - } diff --git a/Content.Client/White/Administration/InvisibilitySystem.cs b/Content.Client/_White/Administration/InvisibilitySystem.cs similarity index 95% rename from Content.Client/White/Administration/InvisibilitySystem.cs rename to Content.Client/_White/Administration/InvisibilitySystem.cs index bbf34208c7..89639c8dd0 100644 --- a/Content.Client/White/Administration/InvisibilitySystem.cs +++ b/Content.Client/_White/Administration/InvisibilitySystem.cs @@ -1,10 +1,9 @@ -using Content.Shared.Actions; using Content.Shared.Popups; using Content.Shared.White.Administration; using Robust.Client.Console; using Robust.Client.GameObjects; -namespace Content.Client.White.Administration; +namespace Content.Client._White.Administration; public sealed class InvisibilitySystem : SharedInvisibilitySystem { diff --git a/Content.Client/White/Animations/EmoteAnimationSystem.cs b/Content.Client/_White/Animations/EmoteAnimationSystem.cs similarity index 99% rename from Content.Client/White/Animations/EmoteAnimationSystem.cs rename to Content.Client/_White/Animations/EmoteAnimationSystem.cs index 1083c2ef29..f39b5a6090 100644 --- a/Content.Client/White/Animations/EmoteAnimationSystem.cs +++ b/Content.Client/_White/Animations/EmoteAnimationSystem.cs @@ -1,12 +1,12 @@ -using Content.Shared.White.Animations; using System.Numerics; +using Content.Shared.White.Animations; using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Shared.Animations; using Robust.Shared.GameStates; using static Content.Shared.White.Animations.EmoteAnimationComponent; -namespace Content.Client.White.Animations; +namespace Content.Client._White.Animations; public sealed class EmoteAnimationSystem : EntitySystem { diff --git a/Content.Client/White/AuthPanel/AuthPanelBoundUserInterface.cs b/Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs similarity index 95% rename from Content.Client/White/AuthPanel/AuthPanelBoundUserInterface.cs rename to Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs index 5c716636b7..8108ace82f 100644 --- a/Content.Client/White/AuthPanel/AuthPanelBoundUserInterface.cs +++ b/Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.White.AuthPanel; -using Robust.Client.GameObjects; -namespace Content.Client.White.AuthPanel; +namespace Content.Client._White.AuthPanel; public sealed class AuthPanelBoundUserInterface : BoundUserInterface { diff --git a/Content.Client/White/AuthPanel/AuthPanelMenu.xaml b/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml similarity index 100% rename from Content.Client/White/AuthPanel/AuthPanelMenu.xaml rename to Content.Client/_White/AuthPanel/AuthPanelMenu.xaml diff --git a/Content.Client/White/AuthPanel/AuthPanelMenu.xaml.cs b/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml.cs similarity index 97% rename from Content.Client/White/AuthPanel/AuthPanelMenu.xaml.cs rename to Content.Client/_White/AuthPanel/AuthPanelMenu.xaml.cs index c838c05dbe..e735167b51 100644 --- a/Content.Client/White/AuthPanel/AuthPanelMenu.xaml.cs +++ b/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml.cs @@ -2,7 +2,7 @@ using Content.Client.UserInterface.Controls; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; -namespace Content.Client.White.AuthPanel; +namespace Content.Client._White.AuthPanel; [GenerateTypedNameReferences] public sealed partial class AuthPanelMenu : FancyWindow diff --git a/Content.Client/White/CharacterExamine/CharacterInformationSystem.cs b/Content.Client/_White/CharacterExamine/CharacterInformationSystem.cs similarity index 99% rename from Content.Client/White/CharacterExamine/CharacterInformationSystem.cs rename to Content.Client/_White/CharacterExamine/CharacterInformationSystem.cs index 934e2e1640..4548d6ba1a 100644 --- a/Content.Client/White/CharacterExamine/CharacterInformationSystem.cs +++ b/Content.Client/_White/CharacterExamine/CharacterInformationSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.Configuration; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Client.White.CharacterExamine; +namespace Content.Client._White.CharacterExamine; public sealed class CharacterInformationSystem : EntitySystem diff --git a/Content.Client/White/CharacterExamine/CharacterInformationWindow.xaml b/Content.Client/_White/CharacterExamine/CharacterInformationWindow.xaml similarity index 100% rename from Content.Client/White/CharacterExamine/CharacterInformationWindow.xaml rename to Content.Client/_White/CharacterExamine/CharacterInformationWindow.xaml diff --git a/Content.Client/White/CharacterExamine/CharacterInformationWindow.xaml.cs b/Content.Client/_White/CharacterExamine/CharacterInformationWindow.xaml.cs similarity index 98% rename from Content.Client/White/CharacterExamine/CharacterInformationWindow.xaml.cs rename to Content.Client/_White/CharacterExamine/CharacterInformationWindow.xaml.cs index abf0d041f2..b2a12289a7 100644 --- a/Content.Client/White/CharacterExamine/CharacterInformationWindow.xaml.cs +++ b/Content.Client/_White/CharacterExamine/CharacterInformationWindow.xaml.cs @@ -6,7 +6,7 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -namespace Content.Client.White.CharacterExamine; +namespace Content.Client._White.CharacterExamine; [GenerateTypedNameReferences] public sealed partial class CharacterInformationWindow : FancyWindow diff --git a/Content.Client/White/CheZaHuetaSystem.cs b/Content.Client/_White/CheZaHuetaSystem.cs similarity index 90% rename from Content.Client/White/CheZaHuetaSystem.cs rename to Content.Client/_White/CheZaHuetaSystem.cs index d40e2459ab..ad70663215 100644 --- a/Content.Client/White/CheZaHuetaSystem.cs +++ b/Content.Client/_White/CheZaHuetaSystem.cs @@ -1,4 +1,4 @@ -namespace Content.Client.White; +namespace Content.Client._White; //Система со смешным названием, чье предназначение заключается лишь в одном - отправке нетворк ивентов. public sealed class CheZaHuetaSystem : EntitySystem diff --git a/Content.Client/White/CheapSurgery/CheapSurgerySystem.cs b/Content.Client/_White/CheapSurgery/CheapSurgerySystem.cs similarity index 93% rename from Content.Client/White/CheapSurgery/CheapSurgerySystem.cs rename to Content.Client/_White/CheapSurgery/CheapSurgerySystem.cs index f0238a9f2e..bd783b91c4 100644 --- a/Content.Client/White/CheapSurgery/CheapSurgerySystem.cs +++ b/Content.Client/_White/CheapSurgery/CheapSurgerySystem.cs @@ -1,9 +1,8 @@ using Content.Client._White.UserInterface.Radial; -using Content.Client.White.UserInterface.Controls; using Content.Shared.White.CheapSurgery; using Robust.Client.GameObjects; -namespace Content.Client.White.CheapSurgery; +namespace Content.Client._White.CheapSurgery; public sealed class CheapSurgerySystem : SharedCheapSurgerySystem { diff --git a/Content.Client/White/CriminalRecords/UI/Controls/RecordCard.xaml b/Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml similarity index 94% rename from Content.Client/White/CriminalRecords/UI/Controls/RecordCard.xaml rename to Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml index 476d22a0f8..3a74bc70db 100644 --- a/Content.Client/White/CriminalRecords/UI/Controls/RecordCard.xaml +++ b/Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml @@ -1,9 +1,9 @@ - + xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls" + x:Class="Content.Client._White.CriminalRecords.UI.Controls.RecordCard"> @@ -71,4 +71,4 @@ - + diff --git a/Content.Client/White/CriminalRecords/UI/Controls/RecordCard.xaml.cs b/Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml.cs similarity index 96% rename from Content.Client/White/CriminalRecords/UI/Controls/RecordCard.xaml.cs rename to Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml.cs index 9b80eb2962..6d3a3e52d5 100644 --- a/Content.Client/White/CriminalRecords/UI/Controls/RecordCard.xaml.cs +++ b/Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml.cs @@ -7,7 +7,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Input; using Robust.Shared.Utility; -namespace Content.Client.White.CriminalRecords.UI.Controls; +namespace Content.Client._White.CriminalRecords.UI.Controls; [GenerateTypedNameReferences, Virtual] public partial class RecordCard : Control @@ -28,7 +28,7 @@ public partial class RecordCard : Control StatusOption.AddItem(Loc.GetString("criminal-status-wanted"), (int)EnumCriminalRecordType.Wanted); StatusOption.AddItem(Loc.GetString("criminal-status-incarcerated"), (int)EnumCriminalRecordType.Incarcerated); - Input.OnKeyBindDown += args => + OnKeyBindDown += args => { if (args.Function == EngineKeyFunctions.TextSubmit) { diff --git a/Content.Client/White/CriminalRecords/UI/Controls/RecordIconButton.xaml b/Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml similarity index 77% rename from Content.Client/White/CriminalRecords/UI/Controls/RecordIconButton.xaml rename to Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml index 53ca862fae..f8730df6aa 100644 --- a/Content.Client/White/CriminalRecords/UI/Controls/RecordIconButton.xaml +++ b/Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml @@ -1,8 +1,8 @@ - + xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls" + x:Class="Content.Client._White.CriminalRecords.UI.Controls.RecordIconButton"> - + diff --git a/Content.Client/White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs b/Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs similarity index 89% rename from Content.Client/White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs rename to Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs index 8f1b995c83..47b5cf51d7 100644 --- a/Content.Client/White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs +++ b/Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs @@ -1,12 +1,11 @@ using Robust.Client.AutoGenerated; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Client.Utility; using Robust.Shared.Utility; -namespace Content.Client.White.CriminalRecords.UI.Controls; +namespace Content.Client._White.CriminalRecords.UI.Controls; [GenerateTypedNameReferences, Virtual] public partial class RecordIconButton : Control diff --git a/Content.Client/White/CriminalRecords/UI/Controls/RecordItem.xaml b/Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml similarity index 78% rename from Content.Client/White/CriminalRecords/UI/Controls/RecordItem.xaml rename to Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml index cb1d6a34ef..7d84752151 100644 --- a/Content.Client/White/CriminalRecords/UI/Controls/RecordItem.xaml +++ b/Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml @@ -1,7 +1,7 @@ - + xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls" + x:Class="Content.Client._White.CriminalRecords.UI.Controls.RecordItem"> - + diff --git a/Content.Client/White/CriminalRecords/UI/Controls/RecordItem.xaml.cs b/Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml.cs similarity index 81% rename from Content.Client/White/CriminalRecords/UI/Controls/RecordItem.xaml.cs rename to Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml.cs index ac91be8c09..87e12be540 100644 --- a/Content.Client/White/CriminalRecords/UI/Controls/RecordItem.xaml.cs +++ b/Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml.cs @@ -2,7 +2,7 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; -namespace Content.Client.White.CriminalRecords.UI.Controls; +namespace Content.Client._White.CriminalRecords.UI.Controls; [GenerateTypedNameReferences, Virtual] public partial class RecordItem : Control diff --git a/Content.Client/White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs b/Content.Client/_White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs similarity index 93% rename from Content.Client/White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs rename to Content.Client/_White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs index 9a8bddf68e..38e43f48c2 100644 --- a/Content.Client/White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs +++ b/Content.Client/_White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs @@ -1,11 +1,8 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.StationRecords; using Content.Shared.White.CriminalRecords; -using Robust.Client.GameObjects; -using Robust.Shared.Input; -using Robust.Shared.Utility; -namespace Content.Client.White.CriminalRecords.UI; +namespace Content.Client._White.CriminalRecords.UI; public sealed class CriminalRecordsBoundUserInterface : BoundUserInterface { diff --git a/Content.Client/White/CriminalRecords/UI/CriminalRecordsWindow.xaml b/Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml similarity index 94% rename from Content.Client/White/CriminalRecords/UI/CriminalRecordsWindow.xaml rename to Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml index 2459da27cd..94ede7a774 100644 --- a/Content.Client/White/CriminalRecords/UI/CriminalRecordsWindow.xaml +++ b/Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml @@ -1,8 +1,8 @@ @@ -10,7 +10,7 @@ - - + @@ -30,7 +30,7 @@ VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10 0 10 0"/> - - + - - + diff --git a/Content.Client/White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs b/Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs similarity index 96% rename from Content.Client/White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs rename to Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs index bf575f6c4c..89070ead84 100644 --- a/Content.Client/White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs +++ b/Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs @@ -1,33 +1,25 @@ -using System.Linq; +using Content.Client._White.CriminalRecords.UI.Controls; using Content.Client.Humanoid; using Content.Client.Inventory; using Content.Client.Resources; -using Content.Client.White.CriminalRecords.UI.Controls; -using Content.Shared.Access.Systems; -using Content.Shared.CrewManifest; using Content.Shared.GameTicking; using Content.Shared.Humanoid.Prototypes; using Content.Shared.Preferences; -using Content.Shared.Radio.Components; using Content.Shared.Roles; using Content.Shared.StationRecords; using Content.Shared.White.CriminalRecords; using Robust.Client.AutoGenerated; -using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Client.Utility; -using Robust.Shared.Console; -using Robust.Shared.Input; using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Client.White.CriminalRecords.UI; +namespace Content.Client._White.CriminalRecords.UI; [GenerateTypedNameReferences] public sealed partial class CriminalRecordsWindow : DefaultWindow diff --git a/Content.Client/White/Crossbow/DrawableVisualizerSystem.cs b/Content.Client/_White/Crossbow/DrawableVisualizerSystem.cs similarity index 94% rename from Content.Client/White/Crossbow/DrawableVisualizerSystem.cs rename to Content.Client/_White/Crossbow/DrawableVisualizerSystem.cs index ea30ff4016..1d25a44268 100644 --- a/Content.Client/White/Crossbow/DrawableVisualizerSystem.cs +++ b/Content.Client/_White/Crossbow/DrawableVisualizerSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Weapons.Ranged.Systems; using Content.Shared.White.Crossbow; using Robust.Client.GameObjects; -namespace Content.Client.White.Crossbow; +namespace Content.Client._White.Crossbow; public sealed class DrawableSystem : VisualizerSystem { diff --git a/Content.Client/_White/Cult/CultHudOverlay.cs b/Content.Client/_White/Cult/CultHudOverlay.cs index a0230e5148..4a7ccae512 100644 --- a/Content.Client/_White/Cult/CultHudOverlay.cs +++ b/Content.Client/_White/Cult/CultHudOverlay.cs @@ -1,10 +1,8 @@ using System.Numerics; -using Content.Shared.Humanoid; using Content.Shared.White.Cult; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.Enums; -using Robust.Shared.Prototypes; using Robust.Shared.Utility; namespace Content.Client._White.Cult; diff --git a/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualizerSystem.cs b/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualizerSystem.cs index b7157399e5..1fbbdada06 100644 --- a/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualizerSystem.cs +++ b/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualizerSystem.cs @@ -24,7 +24,10 @@ public sealed class VeilVisualizerSystem : VisualizerSystem(uid, VeilVisuals.Activated, out var activated)) diff --git a/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualsComponent.cs b/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualsComponent.cs index 212c538aaf..62cd0d1d04 100644 --- a/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualsComponent.cs +++ b/Content.Client/_White/Cult/Items/VeilShifter/VeilVisualsComponent.cs @@ -3,11 +3,9 @@ [RegisterComponent] public sealed partial class VeilVisualsComponent : Component { - [DataField("stateOn")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField("stateOn"), ViewVariables(VVAccess.ReadWrite)] public string? StateOn = "icon-on"; - [DataField("stateOff")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField("stateOff"), ViewVariables(VVAccess.ReadWrite)] public string? StateOff = "icon"; } diff --git a/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualizerSystem.cs b/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualizerSystem.cs index fd23962e38..7e4c68d1c2 100644 --- a/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualizerSystem.cs +++ b/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualizerSystem.cs @@ -5,7 +5,10 @@ namespace Content.Client._White.Cult.Items.VoidTorch; public sealed class VoidTorchVisualizerSystem : VisualizerSystem { - protected override void OnAppearanceChange(EntityUid uid, VoidTorchVisualsComponent component, ref AppearanceChangeEvent args) + protected override void OnAppearanceChange( + EntityUid uid, + VoidTorchVisualsComponent component, + ref AppearanceChangeEvent args) { base.OnAppearanceChange(uid, component, ref args); diff --git a/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualsComponent.cs b/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualsComponent.cs index 12df66913a..988402015a 100644 --- a/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualsComponent.cs +++ b/Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualsComponent.cs @@ -3,11 +3,9 @@ [RegisterComponent] public sealed partial class VoidTorchVisualsComponent : Component { - [DataField("stateOn")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField("stateOn"), ViewVariables(VVAccess.ReadWrite)] public string? StateOn = "icon-on"; - [DataField("stateOff")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField("stateOff"), ViewVariables(VVAccess.ReadWrite)] public string? StateOff = "icon"; } diff --git a/Content.Client/_White/Cult/Narsie/NarsieLayer.cs b/Content.Client/_White/Cult/Narsie/NarsieLayer.cs index 6607d586ba..45e484043d 100644 --- a/Content.Client/_White/Cult/Narsie/NarsieLayer.cs +++ b/Content.Client/_White/Cult/Narsie/NarsieLayer.cs @@ -1,4 +1,4 @@ -namespace Content.Client._White.Cult; +namespace Content.Client._White.Cult.Narsie; public enum NarsieLayer { diff --git a/Content.Client/_White/Cult/Narsie/NarsieVisualizer.cs b/Content.Client/_White/Cult/Narsie/NarsieVisualizer.cs index 08dcb9efc9..bc0b5d9fd3 100644 --- a/Content.Client/_White/Cult/Narsie/NarsieVisualizer.cs +++ b/Content.Client/_White/Cult/Narsie/NarsieVisualizer.cs @@ -3,7 +3,7 @@ using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Client.Graphics; -namespace Content.Client._White.Cult; +namespace Content.Client._White.Cult.Narsie; public sealed class NarsieVisualizer : VisualizerSystem { diff --git a/Content.Client/_White/Cult/Pylon/PylonVisualsComponent.cs b/Content.Client/_White/Cult/Pylon/PylonVisualsComponent.cs index 942e623989..fb4b5078aa 100644 --- a/Content.Client/_White/Cult/Pylon/PylonVisualsComponent.cs +++ b/Content.Client/_White/Cult/Pylon/PylonVisualsComponent.cs @@ -1,6 +1,4 @@ -using Content.Client.Storage.Visualizers; - -namespace Content.Client._White.Cult.Pylon; +namespace Content.Client._White.Cult.Pylon; [RegisterComponent] public sealed partial class PylonVisualsComponent : Component diff --git a/Content.Client/_White/Cult/ShowCultHudSystem.cs b/Content.Client/_White/Cult/ShowCultHudSystem.cs index e22fea1352..3c614ed5d8 100644 --- a/Content.Client/_White/Cult/ShowCultHudSystem.cs +++ b/Content.Client/_White/Cult/ShowCultHudSystem.cs @@ -1,5 +1,4 @@ using Content.Shared.White.Cult; -using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.Player; diff --git a/Content.Client/_White/Cult/UI/Altar/AltarBUI.cs b/Content.Client/_White/Cult/UI/Altar/AltarBUI.cs index f807d02447..b80f35e74b 100644 --- a/Content.Client/_White/Cult/UI/Altar/AltarBUI.cs +++ b/Content.Client/_White/Cult/UI/Altar/AltarBUI.cs @@ -1,8 +1,5 @@ using Content.Shared.White.Cult.UI; using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; namespace Content.Client._White.Cult.UI.Altar; diff --git a/Content.Client/_White/Cult/UI/Altar/AltarWindow.xaml.cs b/Content.Client/_White/Cult/UI/Altar/AltarWindow.xaml.cs index 9cd397ec79..332d30bf4f 100644 --- a/Content.Client/_White/Cult/UI/Altar/AltarWindow.xaml.cs +++ b/Content.Client/_White/Cult/UI/Altar/AltarWindow.xaml.cs @@ -1,9 +1,6 @@ -using Content.Client.GameTicking.Managers; -using Content.Client.TextScreen; +using Content.Client.TextScreen; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; diff --git a/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs b/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs index b68538fe11..c590df84c5 100644 --- a/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs +++ b/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs @@ -9,7 +9,6 @@ namespace Content.Client._White.Cult.UI.ConstructSelector; public sealed class ConstructSelectorBui : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; private SpriteSystem _spriteSystem = default!; @@ -29,7 +28,8 @@ public sealed class ConstructSelectorBui : BoundUserInterface shellSelector.Closed += () => { - if(_selected) return; + if (_selected) + return; SendMessage(new ConstructFormSelectedEvent(shellComponent.ConstructForms.First())); }; @@ -37,7 +37,8 @@ public sealed class ConstructSelectorBui : BoundUserInterface foreach (var form in shellComponent.ConstructForms) { var formPrototype = _prototypeManager.Index(form); - var button = shellSelector.AddButton(formPrototype.Name, _spriteSystem.GetPrototypeIcon(formPrototype).Default); + var button = shellSelector.AddButton(formPrototype.Name, + _spriteSystem.GetPrototypeIcon(formPrototype).Default); button.Controller.OnPressed += _ => { diff --git a/Content.Client/_White/Cult/UI/CultistFactory/CultistFactoryBUI.cs b/Content.Client/_White/Cult/UI/CultistFactory/CultistFactoryBUI.cs index 9bc346fdb7..9a72632094 100644 --- a/Content.Client/_White/Cult/UI/CultistFactory/CultistFactoryBUI.cs +++ b/Content.Client/_White/Cult/UI/CultistFactory/CultistFactoryBUI.cs @@ -1,7 +1,6 @@ using Content.Client._White.UserInterface.Radial; using Content.Shared.White.Cult; using Content.Shared.White.Cult.UI; -using Robust.Client.GameObjects; using Robust.Shared.Prototypes; namespace Content.Client._White.Cult.UI.CultistFactory; diff --git a/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorBUI.cs b/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorBUI.cs index 93955018f8..5863209702 100644 --- a/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorBUI.cs +++ b/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorBUI.cs @@ -1,5 +1,4 @@ using Content.Shared.White.Cult.UI; -using Robust.Client.GameObjects; using Robust.Shared.Prototypes; namespace Content.Client._White.Cult.UI.ListViewSelector; diff --git a/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorWindow.xaml.cs b/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorWindow.xaml.cs index 8c3a514a8a..f440a56b7d 100644 --- a/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorWindow.xaml.cs +++ b/Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorWindow.xaml.cs @@ -12,6 +12,7 @@ public partial class ListViewSelectorWindow : DefaultWindow public Action? ItemSelected; private readonly IPrototypeManager _prototypeManager; + public ListViewSelectorWindow(IPrototypeManager prototypeManager) { RobustXamlLoader.Load(this); @@ -29,7 +30,7 @@ public partial class ListViewSelectorWindow : DefaultWindow if (isPrototypes) { - if(_prototypeManager.TryIndex(item, out var itemPrototype)) + if (_prototypeManager.TryIndex(item, out var itemPrototype)) { itemName = itemPrototype.Name; } diff --git a/Content.Client/_White/Cult/UI/NameSelector/NameSelectorBUI.cs b/Content.Client/_White/Cult/UI/NameSelector/NameSelectorBUI.cs index 13ce8ed2b4..3208336dda 100644 --- a/Content.Client/_White/Cult/UI/NameSelector/NameSelectorBUI.cs +++ b/Content.Client/_White/Cult/UI/NameSelector/NameSelectorBUI.cs @@ -1,5 +1,4 @@ using Content.Shared.White.Cult.UI; -using Robust.Client.GameObjects; namespace Content.Client._White.Cult.UI.NameSelector; diff --git a/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs b/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs index 9173848033..195929d4d2 100644 --- a/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs +++ b/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs @@ -2,7 +2,6 @@ using Content.Shared.Actions; using Content.Shared.White.Cult; using Content.Shared.White.Cult.Components; -using Robust.Client.GameObjects; using Robust.Client.Utility; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Client/_White/Cult/UI/StructureRadial/StructureCraftBoundUserInterface.cs b/Content.Client/_White/Cult/UI/StructureRadial/StructureCraftBoundUserInterface.cs index 4b3bcb1ed8..8e80817aaf 100644 --- a/Content.Client/_White/Cult/UI/StructureRadial/StructureCraftBoundUserInterface.cs +++ b/Content.Client/_White/Cult/UI/StructureRadial/StructureCraftBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Client.Construction; using Content.Shared.Construction.Prototypes; using Content.Shared.Popups; using Content.Shared.White.Cult.Structures; -using Robust.Client.GameObjects; using Robust.Client.Placement; using Robust.Client.Player; using Robust.Shared.Enums; diff --git a/Content.Client/_White/Cult/UI/SummonCultistList/SummonCultistListWindowBUI.cs b/Content.Client/_White/Cult/UI/SummonCultistList/SummonCultistListWindowBUI.cs index 310b12d403..58fbdd0631 100644 --- a/Content.Client/_White/Cult/UI/SummonCultistList/SummonCultistListWindowBUI.cs +++ b/Content.Client/_White/Cult/UI/SummonCultistList/SummonCultistListWindowBUI.cs @@ -1,5 +1,4 @@ using Content.Shared.White.Cult.UI; -using Robust.Client.GameObjects; namespace Content.Client._White.Cult.UI.SummonCultistList; @@ -16,7 +15,7 @@ public sealed class SummonCultistListWindowBUI : BoundUserInterface { base.Open(); - _window = new(); + _window = new SummonCultistListWindow(); _window.OpenCentered(); _window.OnClose += Close; diff --git a/Content.Client/_White/Cult/UI/TeleportRunesList/TeleportRunesListWindowBUI.cs b/Content.Client/_White/Cult/UI/TeleportRunesList/TeleportRunesListWindowBUI.cs index a278f802bb..02b94ec7f1 100644 --- a/Content.Client/_White/Cult/UI/TeleportRunesList/TeleportRunesListWindowBUI.cs +++ b/Content.Client/_White/Cult/UI/TeleportRunesList/TeleportRunesListWindowBUI.cs @@ -1,5 +1,4 @@ using Content.Shared.White.Cult.UI; -using Robust.Client.GameObjects; namespace Content.Client._White.Cult.UI.TeleportRunesList; @@ -16,7 +15,7 @@ public sealed class TeleportRunesListWindowBUI : BoundUserInterface { base.Open(); - _window = new(); + _window = new TeleportRunesListWindow(); _window.OpenCentered(); _window.OnClose += Close; diff --git a/Content.Client/_White/Cult/UI/TeleportSpell/TeleportSpellEui.cs b/Content.Client/_White/Cult/UI/TeleportSpell/TeleportSpellEui.cs index ffee8dd445..1866e9866c 100644 --- a/Content.Client/_White/Cult/UI/TeleportSpell/TeleportSpellEui.cs +++ b/Content.Client/_White/Cult/UI/TeleportSpell/TeleportSpellEui.cs @@ -1,6 +1,6 @@ using System.Linq; -using Content.Client.Eui; using Content.Client._White.Cult.UI.TeleportRunesList; +using Content.Client.Eui; using Content.Shared.Eui; using Content.Shared.White.Cult.UI; diff --git a/Content.Client/_White/Cult/UI/Torch/TorchWindow.xaml.cs b/Content.Client/_White/Cult/UI/Torch/TorchWindow.xaml.cs index c85cf8a634..e59b78a13e 100644 --- a/Content.Client/_White/Cult/UI/Torch/TorchWindow.xaml.cs +++ b/Content.Client/_White/Cult/UI/Torch/TorchWindow.xaml.cs @@ -2,7 +2,6 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.Prototypes; namespace Content.Client._White.Cult.UI.Torch; diff --git a/Content.Client/_White/Cult/UI/Torch/TorchWindowBUI.cs b/Content.Client/_White/Cult/UI/Torch/TorchWindowBUI.cs index e2e44116a7..9b36bcb5d0 100644 --- a/Content.Client/_White/Cult/UI/Torch/TorchWindowBUI.cs +++ b/Content.Client/_White/Cult/UI/Torch/TorchWindowBUI.cs @@ -1,6 +1,4 @@ -using System.Data; -using Content.Shared.White.Cult.Items; -using Robust.Client.GameObjects; +using Content.Shared.White.Cult.Items; using Robust.Shared.Prototypes; namespace Content.Client._White.Cult.UI.Torch; diff --git a/Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs b/Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs similarity index 94% rename from Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs rename to Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs index 875ca08cdb..73c19d3b82 100644 --- a/Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs +++ b/Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs @@ -3,7 +3,7 @@ using Content.Shared.Ghost; using Content.Shared.White.CustomGhostSystem; using Robust.Client.GameObjects; -namespace Content.Client.White.CustomGhostSpriteSystem; +namespace Content.Client._White.CustomGhostSpriteSystem; public sealed class CustomGhostVisualizer : VisualizerSystem { diff --git a/Content.Client/White/Economy/ATMVisualLayers.cs b/Content.Client/_White/Economy/ATMVisualLayers.cs similarity index 60% rename from Content.Client/White/Economy/ATMVisualLayers.cs rename to Content.Client/_White/Economy/ATMVisualLayers.cs index 84c3d9c366..bbf0c2da7b 100644 --- a/Content.Client/White/Economy/ATMVisualLayers.cs +++ b/Content.Client/_White/Economy/ATMVisualLayers.cs @@ -1,4 +1,4 @@ -namespace Content.Client.White.Economy; +namespace Content.Client._White.Economy; public enum ATMVisualLayers : byte { diff --git a/Content.Client/White/Economy/Ui/ATMBui.cs b/Content.Client/_White/Economy/Ui/ATMBui.cs similarity index 91% rename from Content.Client/White/Economy/Ui/ATMBui.cs rename to Content.Client/_White/Economy/Ui/ATMBui.cs index ac2b22a4af..7ac914dea7 100644 --- a/Content.Client/White/Economy/Ui/ATMBui.cs +++ b/Content.Client/_White/Economy/Ui/ATMBui.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; -using Robust.Client.GameObjects; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [UsedImplicitly] diff --git a/Content.Client/White/Economy/Ui/AtmWindow.xaml b/Content.Client/_White/Economy/Ui/AtmWindow.xaml similarity index 100% rename from Content.Client/White/Economy/Ui/AtmWindow.xaml rename to Content.Client/_White/Economy/Ui/AtmWindow.xaml diff --git a/Content.Client/White/Economy/Ui/AtmWindow.xaml.cs b/Content.Client/_White/Economy/Ui/AtmWindow.xaml.cs similarity index 92% rename from Content.Client/White/Economy/Ui/AtmWindow.xaml.cs rename to Content.Client/_White/Economy/Ui/AtmWindow.xaml.cs index 74650768e1..62852553d2 100644 --- a/Content.Client/White/Economy/Ui/AtmWindow.xaml.cs +++ b/Content.Client/_White/Economy/Ui/AtmWindow.xaml.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Timing; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [GenerateTypedNameReferences] public sealed partial class AtmWindow : DefaultWindow @@ -22,7 +22,7 @@ public sealed partial class AtmWindow : DefaultWindow WithdrawButton.OnButtonDown += args => { if(PinLineEdit.Text.Length != 4) return; - OnWithdrawAttempt?.Invoke(new ATMRequestWithdrawMessage(WithdrawSlider.Value, int.Parse(PinLineEdit.Text))); + OnWithdrawAttempt?.Invoke(new ATMRequestWithdrawMessage(WithdrawSlider.Value, int.Parse((string) PinLineEdit.Text))); }; PinLineEdit.OnTextChanged += _ => @@ -61,7 +61,7 @@ public sealed partial class AtmWindow : DefaultWindow WithdrawButton.Visible = true; WithdrawSlider.MaxValue = cast.AccountBalance; - WithdrawSlider.Value = Math.Min(WithdrawSlider.Value, cast.AccountBalance); + WithdrawSlider.Value = Math.Min((int) WithdrawSlider.Value, cast.AccountBalance); return; } diff --git a/Content.Client/White/Economy/Ui/BankUi.cs b/Content.Client/_White/Economy/Ui/BankUi.cs similarity index 91% rename from Content.Client/White/Economy/Ui/BankUi.cs rename to Content.Client/_White/Economy/Ui/BankUi.cs index cce84aafca..369bebb791 100644 --- a/Content.Client/White/Economy/Ui/BankUi.cs +++ b/Content.Client/_White/Economy/Ui/BankUi.cs @@ -2,10 +2,9 @@ using Content.Client.UserInterface.Fragments; using Content.Shared.CartridgeLoader; using Content.Shared.White.Economy; using JetBrains.Annotations; -using Robust.Client.GameObjects; using Robust.Client.UserInterface; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [UsedImplicitly] public sealed partial class BankUi : UIFragment diff --git a/Content.Client/White/Economy/Ui/BankUiFragment.xaml b/Content.Client/_White/Economy/Ui/BankUiFragment.xaml similarity index 90% rename from Content.Client/White/Economy/Ui/BankUiFragment.xaml rename to Content.Client/_White/Economy/Ui/BankUiFragment.xaml index 0d9074407a..830d38f22e 100644 --- a/Content.Client/White/Economy/Ui/BankUiFragment.xaml +++ b/Content.Client/_White/Economy/Ui/BankUiFragment.xaml @@ -1,6 +1,6 @@ - + @@ -27,4 +27,4 @@ - + diff --git a/Content.Client/White/Economy/Ui/BankUiFragment.xaml.cs b/Content.Client/_White/Economy/Ui/BankUiFragment.xaml.cs similarity index 76% rename from Content.Client/White/Economy/Ui/BankUiFragment.xaml.cs rename to Content.Client/_White/Economy/Ui/BankUiFragment.xaml.cs index a997fe3298..d070d5dd14 100644 --- a/Content.Client/White/Economy/Ui/BankUiFragment.xaml.cs +++ b/Content.Client/_White/Economy/Ui/BankUiFragment.xaml.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Timing; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [GenerateTypedNameReferences] public sealed partial class BankUiFragment : BoxContainer @@ -49,8 +49,8 @@ public sealed partial class BankUiFragment : BoxContainer if (PinLineEdit.Text.Length != 4 || AccountLineEdit.Text.Length != 6) return; - var accountId = int.Parse(AccountLineEdit.Text); - var pin = int.Parse(PinLineEdit.Text); + var accountId = int.Parse((string) AccountLineEdit.Text); + var pin = int.Parse((string) PinLineEdit.Text); AccountLinkResultLabel.Visible = true; _accountLinkActive = false; OnLinkAttempt?.Invoke(new BankAccountLinkMessage(accountId, pin)); @@ -61,24 +61,24 @@ public sealed partial class BankUiFragment : BoxContainer { var accountLinked = state.AccountId != null; - AccountLinkMessageLabel.SetMarkup(state.AccountLinkMessage); - AccountLinkResultLabel.SetMarkup(state.AccountLinkResult); + RichTextLabelExt.SetMarkup(AccountLinkMessageLabel, state.AccountLinkMessage); + RichTextLabelExt.SetMarkup(AccountLinkResultLabel, state.AccountLinkResult); LinkedAccount.Visible = accountLinked; NoLinkedAccountLabel.Visible = !accountLinked; if (accountLinked) { - LinkedAccountNumberLabel.SetMarkup(Loc.GetString("bank-program-ui-account-number-text", + RichTextLabelExt.SetMarkup(LinkedAccountNumberLabel, Loc.GetString("bank-program-ui-account-number-text", ("account", state.AccountId!.Value))); - LinkedAccountNameLabel.SetMarkup(Loc.GetString("bank-program-ui-account-owner-text", + RichTextLabelExt.SetMarkup(LinkedAccountNameLabel, Loc.GetString("bank-program-ui-account-owner-text", ("owner", state.OwnerName))); - LinkedAccountBalanceLabel.SetMarkup(Loc.GetString("atm-ui-balance", ("balance", state.Balance))); + RichTextLabelExt.SetMarkup(LinkedAccountBalanceLabel, Loc.GetString("atm-ui-balance", ("balance", state.Balance))); UpdateAccountLinkUi(); return; } - NoLinkedAccountLabel.SetMarkup(Loc.GetString("bank-program-ui-no-account")); + RichTextLabelExt.SetMarkup(NoLinkedAccountLabel, Loc.GetString("bank-program-ui-no-account")); UpdateAccountLinkUi(); } diff --git a/Content.Client/White/Economy/Ui/EftposBui.cs b/Content.Client/_White/Economy/Ui/EftposBui.cs similarity index 91% rename from Content.Client/White/Economy/Ui/EftposBui.cs rename to Content.Client/_White/Economy/Ui/EftposBui.cs index ee566a5868..50e1d2869a 100644 --- a/Content.Client/White/Economy/Ui/EftposBui.cs +++ b/Content.Client/_White/Economy/Ui/EftposBui.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; -using Robust.Client.GameObjects; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [UsedImplicitly] public sealed class EftposBui : BoundUserInterface diff --git a/Content.Client/White/Economy/Ui/EftposWindow.xaml b/Content.Client/_White/Economy/Ui/EftposWindow.xaml similarity index 100% rename from Content.Client/White/Economy/Ui/EftposWindow.xaml rename to Content.Client/_White/Economy/Ui/EftposWindow.xaml diff --git a/Content.Client/White/Economy/Ui/EftposWindow.xaml.cs b/Content.Client/_White/Economy/Ui/EftposWindow.xaml.cs similarity index 87% rename from Content.Client/White/Economy/Ui/EftposWindow.xaml.cs rename to Content.Client/_White/Economy/Ui/EftposWindow.xaml.cs index e4f20a4cb6..9d4e239076 100644 --- a/Content.Client/White/Economy/Ui/EftposWindow.xaml.cs +++ b/Content.Client/_White/Economy/Ui/EftposWindow.xaml.cs @@ -3,7 +3,7 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [GenerateTypedNameReferences] public sealed partial class EftposWindow : DefaultWindow @@ -17,7 +17,7 @@ public sealed partial class EftposWindow : DefaultWindow AmountLineEdit.OnTextChanged += _ => { - if (!int.TryParse(AmountLineEdit.Text, out var result) || result <= 0) + if (!int.TryParse((string?) AmountLineEdit.Text, out var result) || result <= 0) AmountLineEdit.Text = string.Empty; AmountLineEdit.Text = result.ToString(); @@ -25,7 +25,7 @@ public sealed partial class EftposWindow : DefaultWindow CardButton.OnPressed += _ => { - if (!int.TryParse(AmountLineEdit.Text, out var result) || result < 0) + if (!int.TryParse((string?) AmountLineEdit.Text, out var result) || result < 0) result = 0; OnCardButtonPressed?.Invoke(new EftposLockMessage(result)); diff --git a/Content.Client/White/Economy/Ui/VendingItem.xaml b/Content.Client/_White/Economy/Ui/VendingItem.xaml similarity index 100% rename from Content.Client/White/Economy/Ui/VendingItem.xaml rename to Content.Client/_White/Economy/Ui/VendingItem.xaml diff --git a/Content.Client/White/Economy/Ui/VendingItem.xaml.cs b/Content.Client/_White/Economy/Ui/VendingItem.xaml.cs similarity index 92% rename from Content.Client/White/Economy/Ui/VendingItem.xaml.cs rename to Content.Client/_White/Economy/Ui/VendingItem.xaml.cs index 5b9e2a35a2..a0e26080ed 100644 --- a/Content.Client/White/Economy/Ui/VendingItem.xaml.cs +++ b/Content.Client/_White/Economy/Ui/VendingItem.xaml.cs @@ -3,7 +3,7 @@ using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [GenerateTypedNameReferences] public sealed partial class VendingItem : Control diff --git a/Content.Client/White/Economy/Ui/VendingMenu.xaml b/Content.Client/_White/Economy/Ui/VendingMenu.xaml similarity index 100% rename from Content.Client/White/Economy/Ui/VendingMenu.xaml rename to Content.Client/_White/Economy/Ui/VendingMenu.xaml diff --git a/Content.Client/White/Economy/Ui/VendingMenu.xaml.cs b/Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs similarity index 98% rename from Content.Client/White/Economy/Ui/VendingMenu.xaml.cs rename to Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs index 01354460c3..806135ad25 100644 --- a/Content.Client/White/Economy/Ui/VendingMenu.xaml.cs +++ b/Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs @@ -7,7 +7,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; -namespace Content.Client.White.Economy.Ui; +namespace Content.Client._White.Economy.Ui; [GenerateTypedNameReferences] public sealed partial class VendingMenu : DefaultWindow diff --git a/Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs b/Content.Client/_White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs similarity index 97% rename from Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs rename to Content.Client/_White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs index fc5b3d7e08..f41a5b244e 100644 --- a/Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs +++ b/Content.Client/_White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs @@ -1,19 +1,16 @@ +using System.Numerics; +using Content.Shared.Access.Components; using Content.Shared.Humanoid; using Content.Shared.Inventory; using Content.Shared.PDA; +using Content.Shared.White.CriminalRecords; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.Enums; -using Robust.Shared.Prototypes; -using Robust.Shared.Utility; -using Content.Shared.Access.Components; -using Content.Shared.Roles; -using System.Diagnostics.CodeAnalysis; -using System.Numerics; -using Content.Shared.White.CriminalRecords; using Robust.Shared.Map; +using Robust.Shared.Utility; -namespace Content.Client.White.EntityCrimeRecords; +namespace Content.Client._White.EntityCrimeRecords; public sealed class EntityCrimeRecordsOverlay : Overlay { diff --git a/Content.Client/White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs b/Content.Client/_White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs similarity index 97% rename from Content.Client/White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs rename to Content.Client/_White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs index f9842337f4..f9e931c298 100644 --- a/Content.Client/White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs +++ b/Content.Client/_White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs @@ -1,16 +1,15 @@ -using Content.Shared.White.EntityCrimeRecords; using Content.Shared.GameTicking; using Content.Shared.Humanoid; using Content.Shared.IdentityManagement.Components; -using Robust.Client.Player; -using Robust.Client.Graphics; -using Robust.Client.GameObjects; -using Robust.Shared.Prototypes; using Content.Shared.Inventory; +using Content.Shared.White.EntityCrimeRecords; +using Robust.Client.Graphics; +using Robust.Client.Player; using Robust.Shared.Enums; using Robust.Shared.Player; +using Robust.Shared.Prototypes; -namespace Content.Client.White.EntityCrimeRecords +namespace Content.Client._White.EntityCrimeRecords { public sealed class ShowCrimeRecordsSystem : EntitySystem { diff --git a/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs b/Content.Client/_White/EntityHealthBar/EntityHealthBarOverlay.cs similarity index 99% rename from Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs rename to Content.Client/_White/EntityHealthBar/EntityHealthBarOverlay.cs index 92aefd4e67..5f1144c1a5 100644 --- a/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs +++ b/Content.Client/_White/EntityHealthBar/EntityHealthBarOverlay.cs @@ -1,16 +1,16 @@ using System.Numerics; using Content.Shared.Damage; +using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; -using Content.Shared.FixedPoint; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.Enums; -using Robust.Shared.Utility; using Robust.Shared.Timing; +using Robust.Shared.Utility; -namespace Content.Client.White.EntityHealthBar; +namespace Content.Client._White.EntityHealthBar; /// /// Yeah a lot of this is duplicated from doafters. diff --git a/Content.Client/White/EntityHealthBar/ShowHealthBarsSystem.cs b/Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs similarity index 96% rename from Content.Client/White/EntityHealthBar/ShowHealthBarsSystem.cs rename to Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs index 17aab45d73..f88d4aee6c 100644 --- a/Content.Client/White/EntityHealthBar/ShowHealthBarsSystem.cs +++ b/Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs @@ -1,11 +1,10 @@ -using Content.Shared.White.EntityHealthBar; using Content.Shared.GameTicking; -using Robust.Client.Player; +using Content.Shared.White.EntityHealthBar; using Robust.Client.Graphics; +using Robust.Client.Player; using Robust.Shared.Player; -using Robust.Shared.Prototypes; -namespace Content.Client.White.EntityHealthBar +namespace Content.Client._White.EntityHealthBar { public sealed class ShowHealthBarsSystem : EntitySystem { diff --git a/Content.Client/White/EntityJobInfo/EntityJobInfoOverlay.cs b/Content.Client/_White/EntityJobInfo/EntityJobInfoOverlay.cs similarity index 99% rename from Content.Client/White/EntityJobInfo/EntityJobInfoOverlay.cs rename to Content.Client/_White/EntityJobInfo/EntityJobInfoOverlay.cs index 8eef408442..03478fe34e 100644 --- a/Content.Client/White/EntityJobInfo/EntityJobInfoOverlay.cs +++ b/Content.Client/_White/EntityJobInfo/EntityJobInfoOverlay.cs @@ -1,17 +1,17 @@ +using System.Diagnostics.CodeAnalysis; +using System.Numerics; +using Content.Shared.Access.Components; using Content.Shared.Humanoid; using Content.Shared.Inventory; using Content.Shared.PDA; +using Content.Shared.Roles; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.Enums; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using Content.Shared.Access.Components; -using Content.Shared.Roles; -using System.Diagnostics.CodeAnalysis; -using System.Numerics; -namespace Content.Client.White.EntityJobInfo; +namespace Content.Client._White.EntityJobInfo; public sealed class EntityJobInfoOverlay : Overlay { diff --git a/Content.Client/White/EntityJobInfo/ShowJobInfoSystem.cs b/Content.Client/_White/EntityJobInfo/ShowJobInfoSystem.cs similarity index 96% rename from Content.Client/White/EntityJobInfo/ShowJobInfoSystem.cs rename to Content.Client/_White/EntityJobInfo/ShowJobInfoSystem.cs index 2b1c6adeb6..8410aef932 100644 --- a/Content.Client/White/EntityJobInfo/ShowJobInfoSystem.cs +++ b/Content.Client/_White/EntityJobInfo/ShowJobInfoSystem.cs @@ -1,13 +1,12 @@ -using Content.Shared.White.EntityJobInfo; using Content.Shared.GameTicking; -using Robust.Client.Player; -using Robust.Client.Graphics; -using Robust.Client.GameObjects; -using Robust.Shared.Prototypes; using Content.Shared.Inventory; +using Content.Shared.White.EntityJobInfo; +using Robust.Client.Graphics; +using Robust.Client.Player; using Robust.Shared.Player; +using Robust.Shared.Prototypes; -namespace Content.Client.White.EntityJobInfo; +namespace Content.Client._White.EntityJobInfo; public sealed class ShowJobInfoSystem : EntitySystem { diff --git a/Content.Client/White/GhostRecruitment/GhostRecruitmentEuiAccept.cs b/Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAccept.cs similarity index 92% rename from Content.Client/White/GhostRecruitment/GhostRecruitmentEuiAccept.cs rename to Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAccept.cs index a7bdc570d0..507b78e8b4 100644 --- a/Content.Client/White/GhostRecruitment/GhostRecruitmentEuiAccept.cs +++ b/Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAccept.cs @@ -1,9 +1,8 @@ using Content.Client.Eui; -using Content.Shared.Cloning; using Content.Shared.White.GhostRecruitment; using Robust.Client.Graphics; -namespace Content.Client.White.GhostRecruitment; +namespace Content.Client._White.GhostRecruitment; public sealed class GhostRecruitmentEuiAccept : BaseEui { diff --git a/Content.Client/White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs b/Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs similarity index 97% rename from Content.Client/White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs rename to Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs index 4066a159af..6858d3be9e 100644 --- a/Content.Client/White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs +++ b/Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs @@ -1,10 +1,10 @@ -using Robust.Client.UserInterface.CustomControls; using System.Numerics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; using static Robust.Client.UserInterface.Controls.BoxContainer; -namespace Content.Client.White.GhostRecruitment; +namespace Content.Client._White.GhostRecruitment; public sealed class GhostRecruitmentEuiAcceptWindow : DefaultWindow { diff --git a/Content.Client/White/Items/Tricorder/TricorderSystem.cs b/Content.Client/_White/Items/Tricorder/TricorderSystem.cs similarity index 97% rename from Content.Client/White/Items/Tricorder/TricorderSystem.cs rename to Content.Client/_White/Items/Tricorder/TricorderSystem.cs index 3fe0137fbf..cced6ff012 100644 --- a/Content.Client/White/Items/Tricorder/TricorderSystem.cs +++ b/Content.Client/_White/Items/Tricorder/TricorderSystem.cs @@ -7,7 +7,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Shared.GameStates; using Robust.Shared.Timing; -namespace Content.Client.White.Items.Tricorder; +namespace Content.Client._White.Items.Tricorder; /// public sealed class TricorderSystem : SharedTricorderSystem @@ -70,4 +70,4 @@ public sealed class TricorderSystem : SharedTricorderSystem ("mode", Robust.Shared.Localization.Loc.GetString(modeLocString)))); } } -} \ No newline at end of file +} diff --git a/Content.Client/White/JoinQueue/JoinQueueManager.cs b/Content.Client/_White/JoinQueue/JoinQueueManager.cs similarity index 93% rename from Content.Client/White/JoinQueue/JoinQueueManager.cs rename to Content.Client/_White/JoinQueue/JoinQueueManager.cs index 994927f683..04a8925e53 100644 --- a/Content.Client/White/JoinQueue/JoinQueueManager.cs +++ b/Content.Client/_White/JoinQueue/JoinQueueManager.cs @@ -2,7 +2,7 @@ using Content.Shared.White.JoinQueue; using Robust.Client.State; using Robust.Shared.Network; -namespace Content.Client.White.JoinQueue; +namespace Content.Client._White.JoinQueue; public sealed class JoinQueueManager { diff --git a/Content.Client/White/JoinQueue/QueueGui.xaml b/Content.Client/_White/JoinQueue/QueueGui.xaml similarity index 100% rename from Content.Client/White/JoinQueue/QueueGui.xaml rename to Content.Client/_White/JoinQueue/QueueGui.xaml diff --git a/Content.Client/White/JoinQueue/QueueGui.xaml.cs b/Content.Client/_White/JoinQueue/QueueGui.xaml.cs similarity index 95% rename from Content.Client/White/JoinQueue/QueueGui.xaml.cs rename to Content.Client/_White/JoinQueue/QueueGui.xaml.cs index d34b0d447a..0e5d670088 100644 --- a/Content.Client/White/JoinQueue/QueueGui.xaml.cs +++ b/Content.Client/_White/JoinQueue/QueueGui.xaml.cs @@ -5,8 +5,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; - -namespace Content.Client.White.JoinQueue; +namespace Content.Client._White.JoinQueue; [GenerateTypedNameReferences] public sealed partial class QueueGui : Control diff --git a/Content.Client/White/JoinQueue/QueueState.cs b/Content.Client/_White/JoinQueue/QueueState.cs similarity index 94% rename from Content.Client/White/JoinQueue/QueueState.cs rename to Content.Client/_White/JoinQueue/QueueState.cs index 637dc6d54f..f3a7b4efc0 100644 --- a/Content.Client/White/JoinQueue/QueueState.cs +++ b/Content.Client/_White/JoinQueue/QueueState.cs @@ -1,12 +1,11 @@ +using Content.Shared.White.JoinQueue; +using Robust.Client.Audio; using Robust.Client.Console; -using Robust.Client.GameObjects; using Robust.Client.State; using Robust.Client.UserInterface; using Robust.Shared.Player; -using Content.Shared.White.JoinQueue; -using Robust.Client.Audio; -namespace Content.Client.White.JoinQueue; +namespace Content.Client._White.JoinQueue; public sealed class QueueState : State { diff --git a/Content.Client/White/Jukebox/ClientJukeboxSongsSyncManager.cs b/Content.Client/_White/Jukebox/ClientJukeboxSongsSyncManager.cs similarity index 87% rename from Content.Client/White/Jukebox/ClientJukeboxSongsSyncManager.cs rename to Content.Client/_White/Jukebox/ClientJukeboxSongsSyncManager.cs index 685d10492f..80b2f237eb 100644 --- a/Content.Client/White/Jukebox/ClientJukeboxSongsSyncManager.cs +++ b/Content.Client/_White/Jukebox/ClientJukeboxSongsSyncManager.cs @@ -1,6 +1,6 @@ using Content.Shared.White.Jukebox; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; public sealed class ClientJukeboxSongsSyncManager : JukeboxSongsSyncManager { diff --git a/Content.Client/White/Jukebox/JukeboxBUI.cs b/Content.Client/_White/Jukebox/JukeboxBUI.cs similarity index 96% rename from Content.Client/White/Jukebox/JukeboxBUI.cs rename to Content.Client/_White/Jukebox/JukeboxBUI.cs index 4e514af02e..61fecde1e9 100644 --- a/Content.Client/White/Jukebox/JukeboxBUI.cs +++ b/Content.Client/_White/Jukebox/JukeboxBUI.cs @@ -1,9 +1,8 @@ using Content.Shared.Popups; using Content.Shared.White.Jukebox; -using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; public sealed class JukeboxBUI : BoundUserInterface { diff --git a/Content.Client/White/Jukebox/JukeboxMenu.xaml b/Content.Client/_White/Jukebox/JukeboxMenu.xaml similarity index 100% rename from Content.Client/White/Jukebox/JukeboxMenu.xaml rename to Content.Client/_White/Jukebox/JukeboxMenu.xaml diff --git a/Content.Client/White/Jukebox/JukeboxMenu.xaml.cs b/Content.Client/_White/Jukebox/JukeboxMenu.xaml.cs similarity index 98% rename from Content.Client/White/Jukebox/JukeboxMenu.xaml.cs rename to Content.Client/_White/Jukebox/JukeboxMenu.xaml.cs index 6cb49525b4..bf58bf2417 100644 --- a/Content.Client/White/Jukebox/JukeboxMenu.xaml.cs +++ b/Content.Client/_White/Jukebox/JukeboxMenu.xaml.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Timing; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; [GenerateTypedNameReferences] public sealed partial class JukeboxMenu : DefaultWindow diff --git a/Content.Client/White/Jukebox/JukeboxSongEntry.xaml b/Content.Client/_White/Jukebox/JukeboxSongEntry.xaml similarity index 100% rename from Content.Client/White/Jukebox/JukeboxSongEntry.xaml rename to Content.Client/_White/Jukebox/JukeboxSongEntry.xaml diff --git a/Content.Client/White/Jukebox/JukeboxSongEntry.xaml.cs b/Content.Client/_White/Jukebox/JukeboxSongEntry.xaml.cs similarity index 94% rename from Content.Client/White/Jukebox/JukeboxSongEntry.xaml.cs rename to Content.Client/_White/Jukebox/JukeboxSongEntry.xaml.cs index 928f5607ad..36425ef303 100644 --- a/Content.Client/White/Jukebox/JukeboxSongEntry.xaml.cs +++ b/Content.Client/_White/Jukebox/JukeboxSongEntry.xaml.cs @@ -3,7 +3,7 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; [GenerateTypedNameReferences] public sealed partial class JukeboxSongEntry : Control diff --git a/Content.Client/White/Jukebox/JukeboxSystem.cs b/Content.Client/_White/Jukebox/JukeboxSystem.cs similarity index 99% rename from Content.Client/White/Jukebox/JukeboxSystem.cs rename to Content.Client/_White/Jukebox/JukeboxSystem.cs index 3f06ce8d68..f27f330e09 100644 --- a/Content.Client/White/Jukebox/JukeboxSystem.cs +++ b/Content.Client/_White/Jukebox/JukeboxSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Physics; using Robust.Shared.Physics.Systems; using Robust.Shared.Utility; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; public sealed class JukeboxSystem : EntitySystem { diff --git a/Content.Client/White/Jukebox/TapeCreatorBUI.cs b/Content.Client/_White/Jukebox/TapeCreatorBUI.cs similarity index 94% rename from Content.Client/White/Jukebox/TapeCreatorBUI.cs rename to Content.Client/_White/Jukebox/TapeCreatorBUI.cs index 22a3b49976..89f8560902 100644 --- a/Content.Client/White/Jukebox/TapeCreatorBUI.cs +++ b/Content.Client/_White/Jukebox/TapeCreatorBUI.cs @@ -1,8 +1,7 @@ using Content.Shared.Popups; using Content.Shared.White.Jukebox; -using Robust.Client.GameObjects; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; public sealed class TapeCreatorBUI : BoundUserInterface { diff --git a/Content.Client/White/Jukebox/TapeCreatorMenu.xaml b/Content.Client/_White/Jukebox/TapeCreatorMenu.xaml similarity index 100% rename from Content.Client/White/Jukebox/TapeCreatorMenu.xaml rename to Content.Client/_White/Jukebox/TapeCreatorMenu.xaml diff --git a/Content.Client/White/Jukebox/TapeCreatorMenu.xaml.cs b/Content.Client/_White/Jukebox/TapeCreatorMenu.xaml.cs similarity index 96% rename from Content.Client/White/Jukebox/TapeCreatorMenu.xaml.cs rename to Content.Client/_White/Jukebox/TapeCreatorMenu.xaml.cs index fb0f149079..344fff683d 100644 --- a/Content.Client/White/Jukebox/TapeCreatorMenu.xaml.cs +++ b/Content.Client/_White/Jukebox/TapeCreatorMenu.xaml.cs @@ -1,20 +1,17 @@ using System.Text.RegularExpressions; -using Content.Shared.CCVar; using Content.Shared.Popups; using Content.Shared.White; using Content.Shared.White.Jukebox; -using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; -using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Utility; -namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; [GenerateTypedNameReferences] public sealed partial class TapeCreatorMenu : DefaultWindow diff --git a/Content.Client/White/Jukebox/TapeCreatorSystem.cs b/Content.Client/_White/Jukebox/TapeCreatorSystem.cs similarity index 89% rename from Content.Client/White/Jukebox/TapeCreatorSystem.cs rename to Content.Client/_White/Jukebox/TapeCreatorSystem.cs index 82db73a62e..7aed0f8f14 100644 --- a/Content.Client/White/Jukebox/TapeCreatorSystem.cs +++ b/Content.Client/_White/Jukebox/TapeCreatorSystem.cs @@ -1,8 +1,8 @@ - using Content.Shared.White.Jukebox; - using Robust.Client.GameObjects; - using Robust.Shared.GameStates; +using Content.Shared.White.Jukebox; +using Robust.Client.GameObjects; +using Robust.Shared.GameStates; - namespace Content.Client.White.Jukebox; +namespace Content.Client._White.Jukebox; public sealed class TapeCreatorSystem : EntitySystem { diff --git a/Content.Client/White/MeatyOre/MeatyOreUIController.cs b/Content.Client/_White/MeatyOre/MeatyOreUIController.cs similarity index 92% rename from Content.Client/White/MeatyOre/MeatyOreUIController.cs rename to Content.Client/_White/MeatyOre/MeatyOreUIController.cs index 8ff7de6cf6..803ac8e630 100644 --- a/Content.Client/White/MeatyOre/MeatyOreUIController.cs +++ b/Content.Client/_White/MeatyOre/MeatyOreUIController.cs @@ -1,8 +1,7 @@ -using Content.Client.Administration.Managers; +using Content.Client._White.Sponsors; +using Content.Client.Administration.Managers; using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Systems.MenuBar.Widgets; -using Content.Client.White.Sponsors; -using Content.Shared.Administration; using Content.Shared.Humanoid; using Content.Shared.White.MeatyOre; using Robust.Client.Player; @@ -10,7 +9,7 @@ using Robust.Client.UserInterface.Controllers; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; -namespace Content.Client.White.MeatyOre; +namespace Content.Client._White.MeatyOre; public sealed class MeatyOreUIController : UIController { diff --git a/Content.Client/White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs similarity index 95% rename from Content.Client/White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs rename to Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs index 012777362b..390ceab97d 100644 --- a/Content.Client/White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs +++ b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs @@ -1,8 +1,7 @@ -using JetBrains.Annotations; -using Robust.Client.GameObjects; using Content.Shared.White.Medical.BodyScanner; +using JetBrains.Annotations; -namespace Content.Client.White.Medical.BodyScanner +namespace Content.Client._White.Medical.BodyScanner { [UsedImplicitly] public sealed class BodyScannerConsoleBoundUserInterface : BoundUserInterface diff --git a/Content.Client/White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml similarity index 100% rename from Content.Client/White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml rename to Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml diff --git a/Content.Client/White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs similarity index 99% rename from Content.Client/White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs rename to Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs index 75e721c03b..26733a31a9 100644 --- a/Content.Client/White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs +++ b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs @@ -1,14 +1,14 @@ +using Content.Client.UserInterface.Controls; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; +using Content.Shared.White.Medical.BodyScanner; using Robust.Client.AutoGenerated; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -using Content.Client.UserInterface.Controls; -using Content.Shared.White.Medical.BodyScanner; -using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; -using Robust.Client.Graphics; -using Content.Shared.Chemistry.Reagent; -namespace Content.Client.White.Medical.BodyScanner +namespace Content.Client._White.Medical.BodyScanner { [GenerateTypedNameReferences] public sealed partial class BodyScannerConsoleWindow : FancyWindow diff --git a/Content.Client/White/Medical/BodyScanner/GroupDamageCardComponent.xaml b/Content.Client/_White/Medical/BodyScanner/GroupDamageCardComponent.xaml similarity index 100% rename from Content.Client/White/Medical/BodyScanner/GroupDamageCardComponent.xaml rename to Content.Client/_White/Medical/BodyScanner/GroupDamageCardComponent.xaml diff --git a/Content.Client/White/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs b/Content.Client/_White/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs similarity index 98% rename from Content.Client/White/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs rename to Content.Client/_White/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs index 551743b80a..f7537014ee 100644 --- a/Content.Client/White/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs +++ b/Content.Client/_White/Medical/BodyScanner/GroupDamageCardComponent.xaml.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; -namespace Content.Client.White.Medical.BodyScanner +namespace Content.Client._White.Medical.BodyScanner { [GenerateTypedNameReferences] public sealed partial class GroupDamageCardComponent : Control diff --git a/Content.Client/White/Overlays/NightVisionOverlay.cs b/Content.Client/_White/Overlays/NightVisionOverlay.cs similarity index 97% rename from Content.Client/White/Overlays/NightVisionOverlay.cs rename to Content.Client/_White/Overlays/NightVisionOverlay.cs index adc646a2e2..96488ac8cd 100644 --- a/Content.Client/White/Overlays/NightVisionOverlay.cs +++ b/Content.Client/_White/Overlays/NightVisionOverlay.cs @@ -4,7 +4,7 @@ using Robust.Client.Player; using Robust.Shared.Enums; using Robust.Shared.Prototypes; -namespace Content.Client.White.Overlays +namespace Content.Client._White.Overlays { public sealed class NightVisionOverlay : Overlay { diff --git a/Content.Client/White/Overlays/NightVisionSystem.cs b/Content.Client/_White/Overlays/NightVisionSystem.cs similarity index 98% rename from Content.Client/White/Overlays/NightVisionSystem.cs rename to Content.Client/_White/Overlays/NightVisionSystem.cs index 8736e25a56..01efe7490a 100644 --- a/Content.Client/White/Overlays/NightVisionSystem.cs +++ b/Content.Client/_White/Overlays/NightVisionSystem.cs @@ -4,7 +4,7 @@ using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.Player; -namespace Content.Client.White.Overlays; +namespace Content.Client._White.Overlays; public sealed class NightVisionSystem : EntitySystem { diff --git a/Content.Client/White/Overlays/SaturationScaleOverlay.cs b/Content.Client/_White/Overlays/SaturationScaleOverlay.cs similarity index 96% rename from Content.Client/White/Overlays/SaturationScaleOverlay.cs rename to Content.Client/_White/Overlays/SaturationScaleOverlay.cs index 272b34fc46..8a1a5a83de 100644 --- a/Content.Client/White/Overlays/SaturationScaleOverlay.cs +++ b/Content.Client/_White/Overlays/SaturationScaleOverlay.cs @@ -2,7 +2,7 @@ using Robust.Shared.Enums; using Robust.Shared.Prototypes; -namespace Content.Client.White.Overlays; +namespace Content.Client._White.Overlays; public sealed class SaturationScaleOverlay : Overlay { diff --git a/Content.Client/White/Overlays/SaturationScaleSystem.cs b/Content.Client/_White/Overlays/SaturationScaleSystem.cs similarity index 96% rename from Content.Client/White/Overlays/SaturationScaleSystem.cs rename to Content.Client/_White/Overlays/SaturationScaleSystem.cs index 0f58aa37c3..484e527dc0 100644 --- a/Content.Client/White/Overlays/SaturationScaleSystem.cs +++ b/Content.Client/_White/Overlays/SaturationScaleSystem.cs @@ -1,11 +1,10 @@ using Content.Shared.GameTicking; using Content.Shared.White.Overlays; -using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.Player; -namespace Content.Client.White.Overlays; +namespace Content.Client._White.Overlays; public sealed class SaturationScaleSystem : EntitySystem { diff --git a/Content.Client/White/Radials/RadialSystem.cs b/Content.Client/_White/Radials/RadialSystem.cs similarity index 99% rename from Content.Client/White/Radials/RadialSystem.cs rename to Content.Client/_White/Radials/RadialSystem.cs index 1886ef4a51..e9de109a4a 100644 --- a/Content.Client/White/Radials/RadialSystem.cs +++ b/Content.Client/_White/Radials/RadialSystem.cs @@ -5,7 +5,6 @@ using Content.Client.Gameplay; using Content.Client.Popups; using Content.Shared.Examine; using Content.Shared.Tag; -using Content.Shared.Verbs; using Content.Shared.White.Radials; using Content.Shared.White.Radials.Systems; using JetBrains.Annotations; @@ -16,7 +15,7 @@ using Robust.Client.State; using Robust.Shared.Map; using Robust.Shared.Utility; -namespace Content.Client.White.Radials; +namespace Content.Client._White.Radials; [UsedImplicitly] public sealed class RadialSystem : SharedRadialSystem diff --git a/Content.Client/_White/Radials/RadialUIController.cs b/Content.Client/_White/Radials/RadialUIController.cs new file mode 100644 index 0000000000..eb3ce5ff76 --- /dev/null +++ b/Content.Client/_White/Radials/RadialUIController.cs @@ -0,0 +1,114 @@ +using Content.Client._White.UserInterface.Radial; +using Content.Client.CombatMode; +using Content.Client.ContextMenu.UI; +using Content.Client.Gameplay; +using Content.Shared.White.Radials; +using Robust.Client.Player; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controllers; + +namespace Content.Client._White.Radials; + +public sealed class RadialUIController : UIController, IOnStateEntered, IOnStateExited +{ + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + + [UISystemDependency] private readonly CombatModeSystem _combatMode = default!; + [UISystemDependency] private readonly RadialSystem _radialSystem = default!; + + public EntityUid CurrentTarget; + public SortedSet CurrentRadials = new(); + + /// + /// Separate from , since we can open a verb menu as a submenu + /// of an entity menu element. If that happens, we need to be aware and close it properly. + /// + public RadialContainer? OpenMenu; + + public void OnStateEntered(GameplayState state) + { + //_context.OnContextClosed += Close; + _radialSystem.OnRadialsResponse += HandleVerbsResponse; + } + + public void OnStateExited(GameplayState state) + { + //_context.OnContextClosed -= Close; + _radialSystem.OnRadialsResponse -= HandleVerbsResponse; + Close(); + } + + /// + /// Open a verb menu and fill it with verbs applicable to the given target entity. + /// + /// Entity to get verbs on. + /// Used to force showing all verbs (mostly for admins). + public void OpenRadialMenu(EntityUid target, bool force = false) + { + if (_playerManager.LocalSession?.AttachedEntity is not { Valid: true } user || + _combatMode.IsInCombatMode(user)) + return; + + Close(); + + CurrentTarget = target; + CurrentRadials = _radialSystem.GetRadials(target, user, Radial.RadialTypes, force); + OpenMenu = new RadialContainer(); + OpenMenu.NormalSize = 50; + OpenMenu.FocusSize = 64; + + //Feat: Disable action text, while im not fixed it + OpenMenu.IsAction = false; + } + + private void FillRadial() + { + OpenMenu ??= new RadialContainer(); + + OpenMenu.CloseButton.Controller.OnPressed += _ => Close(); + + foreach (var radial in CurrentRadials) + { + var button = OpenMenu.AddButton(radial.Text, radial.Icon ?? null); + button.Controller.OnPressed += _ => { ExecuteRadial(radial); }; + } + + OpenMenu.Open(_userInterfaceManager.MousePositionScaled.Position); + } + + public void AddServerRadials(List radials) + { + CurrentRadials.UnionWith(radials); + FillRadial(); + } + + private void Close() + { + if (OpenMenu == null) + return; + + OpenMenu.Close(); + OpenMenu = null; + } + + private void HandleVerbsResponse(RadialsResponseEvent msg) + { + if (OpenMenu == null || CurrentTarget != _entityManager.GetEntity(msg.Entity)) + return; + + if (msg.Radials == null) + return; + + AddServerRadials(msg.Radials); + } + + private void ExecuteRadial(Radial radial) + { + _radialSystem.ExecuteRadial(CurrentTarget, radial); + + if (radial.CloseMenu ?? radial.CloseMenuDefault) + Close(); //_context.Close(); + } +} diff --git a/Content.Client/White/Reputation/ReputationManager.cs b/Content.Client/_White/Reputation/ReputationManager.cs similarity index 92% rename from Content.Client/White/Reputation/ReputationManager.cs rename to Content.Client/_White/Reputation/ReputationManager.cs index 7a39791ac4..9127c7d6ae 100644 --- a/Content.Client/White/Reputation/ReputationManager.cs +++ b/Content.Client/_White/Reputation/ReputationManager.cs @@ -2,7 +2,7 @@ using Content.Shared.White.Reputation; using Robust.Shared.Network; -namespace Content.Client.White.Reputation; +namespace Content.Client._White.Reputation; public sealed class ReputationManager { diff --git a/Content.Client/White/Rules/RulesWikiSection.xaml b/Content.Client/_White/Rules/RulesWikiSection.xaml similarity index 100% rename from Content.Client/White/Rules/RulesWikiSection.xaml rename to Content.Client/_White/Rules/RulesWikiSection.xaml diff --git a/Content.Client/White/Rules/RulesWikiSection.xaml.cs b/Content.Client/_White/Rules/RulesWikiSection.xaml.cs similarity index 94% rename from Content.Client/White/Rules/RulesWikiSection.xaml.cs rename to Content.Client/_White/Rules/RulesWikiSection.xaml.cs index 5305ff43d7..d94bc62c41 100644 --- a/Content.Client/White/Rules/RulesWikiSection.xaml.cs +++ b/Content.Client/_White/Rules/RulesWikiSection.xaml.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; -namespace Content.Client.White.Rules; +namespace Content.Client._White.Rules; [GenerateTypedNameReferences] public sealed partial class RulesWikiSection : BoxContainer diff --git a/Content.Client/White/Sponsors/SponsorsManager.cs b/Content.Client/_White/Sponsors/SponsorsManager.cs similarity index 92% rename from Content.Client/White/Sponsors/SponsorsManager.cs rename to Content.Client/_White/Sponsors/SponsorsManager.cs index b9de50b68c..30264fab6f 100644 --- a/Content.Client/White/Sponsors/SponsorsManager.cs +++ b/Content.Client/_White/Sponsors/SponsorsManager.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Content.Shared.White.Sponsors; using Robust.Shared.Network; -namespace Content.Client.White.Sponsors; +namespace Content.Client._White.Sponsors; public sealed class SponsorsManager { diff --git a/Content.Client/White/Stalin/StalinManager.cs b/Content.Client/_White/Stalin/StalinManager.cs similarity index 81% rename from Content.Client/White/Stalin/StalinManager.cs rename to Content.Client/_White/Stalin/StalinManager.cs index e05b3e72b1..62ee7bdcce 100644 --- a/Content.Client/White/Stalin/StalinManager.cs +++ b/Content.Client/_White/Stalin/StalinManager.cs @@ -1,12 +1,9 @@ -using Content.Client.UserInterface.Controls; -using Content.Client.White.Stalin.StalinUi; +using Content.Client._White.Stalin.StalinUi; using Content.Shared.White.SaltedYayca; using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Shared.Network; -using Robust.Shared.Utility; -namespace Content.Client.White.Stalin; +namespace Content.Client._White.Stalin; public sealed class StalinManager { diff --git a/Content.Client/White/Stalin/StalinUi/StalinLinkWindow.xaml b/Content.Client/_White/Stalin/StalinUi/StalinLinkWindow.xaml similarity index 100% rename from Content.Client/White/Stalin/StalinUi/StalinLinkWindow.xaml rename to Content.Client/_White/Stalin/StalinUi/StalinLinkWindow.xaml diff --git a/Content.Client/White/Stalin/StalinUi/StalinLinkWindow.xaml.cs b/Content.Client/_White/Stalin/StalinUi/StalinLinkWindow.xaml.cs similarity index 89% rename from Content.Client/White/Stalin/StalinUi/StalinLinkWindow.xaml.cs rename to Content.Client/_White/Stalin/StalinUi/StalinLinkWindow.xaml.cs index b5ff00945c..c824f983db 100644 --- a/Content.Client/White/Stalin/StalinUi/StalinLinkWindow.xaml.cs +++ b/Content.Client/_White/Stalin/StalinUi/StalinLinkWindow.xaml.cs @@ -2,9 +2,8 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; -using Robust.Shared.Utility; -namespace Content.Client.White.Stalin.StalinUi; +namespace Content.Client._White.Stalin.StalinUi; [GenerateTypedNameReferences] public sealed partial class StalinLinkWindow : FancyWindow diff --git a/Content.Client/White/Supermatter/Systems/SupermatterSystem.cs b/Content.Client/_White/Supermatter/Systems/SupermatterSystem.cs similarity index 91% rename from Content.Client/White/Supermatter/Systems/SupermatterSystem.cs rename to Content.Client/_White/Supermatter/Systems/SupermatterSystem.cs index 36d4ded82c..42cd9c6e22 100644 --- a/Content.Client/White/Supermatter/Systems/SupermatterSystem.cs +++ b/Content.Client/_White/Supermatter/Systems/SupermatterSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.White.Supermatter.Systems; using Robust.Shared.GameStates; -namespace Content.Client.White.Supermatter.Systems; +namespace Content.Client._White.Supermatter.Systems; public sealed class SupermatterSystem : SharedSupermatterSystem { diff --git a/Content.Client/White/TTS/HumanoidProfileEditor.TTS.cs b/Content.Client/_White/TTS/HumanoidProfileEditor.TTS.cs similarity index 97% rename from Content.Client/White/TTS/HumanoidProfileEditor.TTS.cs rename to Content.Client/_White/TTS/HumanoidProfileEditor.TTS.cs index 00baa33a00..e2ffc3b70d 100644 --- a/Content.Client/White/TTS/HumanoidProfileEditor.TTS.cs +++ b/Content.Client/_White/TTS/HumanoidProfileEditor.TTS.cs @@ -1,6 +1,6 @@ using System.Linq; -using Content.Client.White.Sponsors; -using Content.Client.White.TTS; +using Content.Client._White.Sponsors; +using Content.Client._White.TTS; using Content.Shared.Preferences; using Content.Shared.White.TTS; using Robust.Shared.Random; diff --git a/Content.Client/White/TTS/TTSManager.cs b/Content.Client/_White/TTS/TTSManager.cs similarity index 93% rename from Content.Client/White/TTS/TTSManager.cs rename to Content.Client/_White/TTS/TTSManager.cs index 6afcee4693..b902d765f9 100644 --- a/Content.Client/White/TTS/TTSManager.cs +++ b/Content.Client/_White/TTS/TTSManager.cs @@ -1,7 +1,7 @@ using Content.Shared.White.TTS; using Robust.Shared.Network; -namespace Content.Client.White.TTS; +namespace Content.Client._White.TTS; // ReSharper disable once InconsistentNaming public sealed class TTSManager diff --git a/Content.Client/White/TTS/TTSSystem.cs b/Content.Client/_White/TTS/TTSSystem.cs similarity index 99% rename from Content.Client/White/TTS/TTSSystem.cs rename to Content.Client/_White/TTS/TTSSystem.cs index b2411cd752..a4c9f651a2 100644 --- a/Content.Client/White/TTS/TTSSystem.cs +++ b/Content.Client/_White/TTS/TTSSystem.cs @@ -1,9 +1,9 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; -using Content.Shared.White.TTS; using Content.Shared.Physics; using Content.Shared.White; +using Content.Shared.White.TTS; using Robust.Client.Audio; using Robust.Client.Graphics; using Robust.Shared.Audio.Sources; @@ -12,7 +12,7 @@ using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Physics.Systems; -namespace Content.Client.White.TTS; +namespace Content.Client._White.TTS; /// /// Plays TTS audio in world diff --git a/Content.Client/White/Trail/Line/ITrailLine.cs b/Content.Client/_White/Trail/Line/ITrailLine.cs similarity index 88% rename from Content.Client/White/Trail/Line/ITrailLine.cs rename to Content.Client/_White/Trail/Line/ITrailLine.cs index 91b73d8b3a..cbc2fa6193 100644 --- a/Content.Client/White/Trail/Line/ITrailLine.cs +++ b/Content.Client/_White/Trail/Line/ITrailLine.cs @@ -3,7 +3,7 @@ using Content.Shared.White.Trail; using Robust.Client.Graphics; using Robust.Shared.Map; -namespace Content.Client.White.Trail.Line; +namespace Content.Client._White.Trail.Line; public interface ITrailLine { diff --git a/Content.Client/White/Trail/Line/Manager/ITrailLineHolder.cs b/Content.Client/_White/Trail/Line/Manager/ITrailLineHolder.cs similarity index 62% rename from Content.Client/White/Trail/Line/Manager/ITrailLineHolder.cs rename to Content.Client/_White/Trail/Line/Manager/ITrailLineHolder.cs index 4bb9d6c430..fb88a8b298 100644 --- a/Content.Client/White/Trail/Line/Manager/ITrailLineHolder.cs +++ b/Content.Client/_White/Trail/Line/Manager/ITrailLineHolder.cs @@ -1,4 +1,4 @@ -namespace Content.Client.White.Trail.Line.Manager; +namespace Content.Client._White.Trail.Line.Manager; public interface ITrailLineHolder { diff --git a/Content.Client/White/Trail/Line/Manager/ITrailLineManager.cs b/Content.Client/_White/Trail/Line/Manager/ITrailLineManager.cs similarity index 84% rename from Content.Client/White/Trail/Line/Manager/ITrailLineManager.cs rename to Content.Client/_White/Trail/Line/Manager/ITrailLineManager.cs index 663a7b4bd3..d10a7d334c 100644 --- a/Content.Client/White/Trail/Line/Manager/ITrailLineManager.cs +++ b/Content.Client/_White/Trail/Line/Manager/ITrailLineManager.cs @@ -1,7 +1,7 @@ using Content.Shared.White.Trail; using Robust.Shared.Map; -namespace Content.Client.White.Trail.Line.Manager; +namespace Content.Client._White.Trail.Line.Manager; public interface ITrailLineManager { diff --git a/Content.Client/White/Trail/Line/Manager/TrailSplineManager.cs b/Content.Client/_White/Trail/Line/Manager/TrailSplineManager.cs similarity index 94% rename from Content.Client/White/Trail/Line/Manager/TrailSplineManager.cs rename to Content.Client/_White/Trail/Line/Manager/TrailSplineManager.cs index f55a5a7660..ba8c216190 100644 --- a/Content.Client/White/Trail/Line/Manager/TrailSplineManager.cs +++ b/Content.Client/_White/Trail/Line/Manager/TrailSplineManager.cs @@ -1,9 +1,9 @@ -using Content.Client.White.Trail.SplineRenderer; +using Content.Client._White.Trail.SplineRenderer; using Content.Shared.White.Spline; using Content.Shared.White.Trail; using Robust.Shared.Map; -namespace Content.Client.White.Trail.Line.Manager; +namespace Content.Client._White.Trail.Line.Manager; public sealed class TrailSplineManager : ITrailLineManager { diff --git a/Content.Client/White/Trail/Line/TrailSpline.cs b/Content.Client/_White/Trail/Line/TrailSpline.cs similarity index 98% rename from Content.Client/White/Trail/Line/TrailSpline.cs rename to Content.Client/_White/Trail/Line/TrailSpline.cs index a20e50d294..b210fb592b 100644 --- a/Content.Client/White/Trail/Line/TrailSpline.cs +++ b/Content.Client/_White/Trail/Line/TrailSpline.cs @@ -1,16 +1,16 @@ -using Content.Client.White.Trail.SplineRenderer; +using System.Linq; +using System.Numerics; +using System.Runtime.CompilerServices; +using Content.Client._White.Trail.SplineRenderer; using Content.Shared.White.Spline; using Content.Shared.White.Spline.Linear; using Content.Shared.White.Trail; using Robust.Client.Graphics; using Robust.Shared.Map; using Robust.Shared.Random; -using System.Linq; -using System.Numerics; -using System.Runtime.CompilerServices; using Vector4 = Robust.Shared.Maths.Vector4; -namespace Content.Client.White.Trail.Line; +namespace Content.Client._White.Trail.Line; public sealed class TrailSpline : ITrailLine { diff --git a/Content.Client/White/Trail/SplineRenderer/ITrailSplineRenderer.cs b/Content.Client/_White/Trail/SplineRenderer/ITrailSplineRenderer.cs similarity index 89% rename from Content.Client/White/Trail/SplineRenderer/ITrailSplineRenderer.cs rename to Content.Client/_White/Trail/SplineRenderer/ITrailSplineRenderer.cs index 460a3b43db..83ca13f303 100644 --- a/Content.Client/White/Trail/SplineRenderer/ITrailSplineRenderer.cs +++ b/Content.Client/_White/Trail/SplineRenderer/ITrailSplineRenderer.cs @@ -4,7 +4,7 @@ using Content.Shared.White.Trail; using Robust.Client.Graphics; using Vector4 = Robust.Shared.Maths.Vector4; -namespace Content.Client.White.Trail.SplineRenderer; +namespace Content.Client._White.Trail.SplineRenderer; public interface ITrailSplineRenderer { diff --git a/Content.Client/White/Trail/SplineRenderer/TrailSplineRenderer.cs b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRenderer.cs similarity index 91% rename from Content.Client/White/Trail/SplineRenderer/TrailSplineRenderer.cs rename to Content.Client/_White/Trail/SplineRenderer/TrailSplineRenderer.cs index 53b0a6e3b0..895157ea39 100644 --- a/Content.Client/White/Trail/SplineRenderer/TrailSplineRenderer.cs +++ b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRenderer.cs @@ -1,6 +1,6 @@ using Content.Shared.White.Trail; -namespace Content.Client.White.Trail.SplineRenderer; +namespace Content.Client._White.Trail.SplineRenderer; public static class TrailSplineRenderer { diff --git a/Content.Client/White/Trail/SplineRenderer/TrailSplineRendererContinuous.cs b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererContinuous.cs similarity index 98% rename from Content.Client/White/Trail/SplineRenderer/TrailSplineRendererContinuous.cs rename to Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererContinuous.cs index a7c74211bc..784bb92e94 100644 --- a/Content.Client/White/Trail/SplineRenderer/TrailSplineRendererContinuous.cs +++ b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererContinuous.cs @@ -1,11 +1,11 @@ +using System.Linq; +using System.Numerics; using Content.Shared.White.Spline; using Content.Shared.White.Trail; using Robust.Client.Graphics; -using System.Linq; -using System.Numerics; using Vector4 = Robust.Shared.Maths.Vector4; -namespace Content.Client.White.Trail.SplineRenderer; +namespace Content.Client._White.Trail.SplineRenderer; public sealed class TrailSplineRendererContinuous : ITrailSplineRenderer { diff --git a/Content.Client/White/Trail/SplineRenderer/TrailSplineRendererDebug.cs b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererDebug.cs similarity index 96% rename from Content.Client/White/Trail/SplineRenderer/TrailSplineRendererDebug.cs rename to Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererDebug.cs index 503b3e5d12..54bc98667b 100644 --- a/Content.Client/White/Trail/SplineRenderer/TrailSplineRendererDebug.cs +++ b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererDebug.cs @@ -1,11 +1,11 @@ +using System.Linq; +using System.Numerics; using Content.Shared.White.Spline; using Content.Shared.White.Trail; using Robust.Client.Graphics; -using System.Linq; -using System.Numerics; using Vector4 = Robust.Shared.Maths.Vector4; -namespace Content.Client.White.Trail.SplineRenderer; +namespace Content.Client._White.Trail.SplineRenderer; public sealed class TrailSplineRendererDebug : ITrailSplineRenderer { diff --git a/Content.Client/White/Trail/SplineRenderer/TrailSplineRendererPoint.cs b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererPoint.cs similarity index 97% rename from Content.Client/White/Trail/SplineRenderer/TrailSplineRendererPoint.cs rename to Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererPoint.cs index 3d84c42239..b2660831bc 100644 --- a/Content.Client/White/Trail/SplineRenderer/TrailSplineRendererPoint.cs +++ b/Content.Client/_White/Trail/SplineRenderer/TrailSplineRendererPoint.cs @@ -1,11 +1,11 @@ +using System.Linq; +using System.Numerics; using Content.Shared.White.Spline; using Content.Shared.White.Trail; using Robust.Client.Graphics; -using System.Linq; -using System.Numerics; using Vector4 = Robust.Shared.Maths.Vector4; -namespace Content.Client.White.Trail.SplineRenderer; +namespace Content.Client._White.Trail.SplineRenderer; public sealed class TrailSplineRendererPoint : ITrailSplineRenderer { diff --git a/Content.Client/White/Trail/TrailComponent.cs b/Content.Client/_White/Trail/TrailComponent.cs similarity index 88% rename from Content.Client/White/Trail/TrailComponent.cs rename to Content.Client/_White/Trail/TrailComponent.cs index 31ae97cbcc..73e98f92c9 100644 --- a/Content.Client/White/Trail/TrailComponent.cs +++ b/Content.Client/_White/Trail/TrailComponent.cs @@ -1,10 +1,10 @@ -using Content.Client.White.Trail.Line; -using Content.Client.White.Trail.Line.Manager; -using Content.Client.White.Trail.SplineRenderer; +using Content.Client._White.Trail.Line; +using Content.Client._White.Trail.Line.Manager; +using Content.Client._White.Trail.SplineRenderer; using Content.Shared.White.Spline; using Content.Shared.White.Trail; -namespace Content.Client.White.Trail; +namespace Content.Client._White.Trail; [RegisterComponent] public sealed partial class TrailComponent : SharedTrailComponent, ITrailLineHolder diff --git a/Content.Client/White/Trail/TrailOverlay.cs b/Content.Client/_White/Trail/TrailOverlay.cs similarity index 95% rename from Content.Client/White/Trail/TrailOverlay.cs rename to Content.Client/_White/Trail/TrailOverlay.cs index 07b1380d74..2af717bb15 100644 --- a/Content.Client/White/Trail/TrailOverlay.cs +++ b/Content.Client/_White/Trail/TrailOverlay.cs @@ -1,10 +1,10 @@ -using Content.Client.White.Trail.Line.Manager; +using Content.Client._White.Trail.Line.Manager; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Shared.Enums; using Robust.Shared.Prototypes; -namespace Content.Client.White.Trail; +namespace Content.Client._White.Trail; public sealed class TrailOverlay : Overlay { diff --git a/Content.Client/White/Trail/TrailSystem.cs b/Content.Client/_White/Trail/TrailSystem.cs similarity index 96% rename from Content.Client/White/Trail/TrailSystem.cs rename to Content.Client/_White/Trail/TrailSystem.cs index 6ad6d3b07a..0b1c519527 100644 --- a/Content.Client/White/Trail/TrailSystem.cs +++ b/Content.Client/_White/Trail/TrailSystem.cs @@ -1,4 +1,4 @@ -using Content.Client.White.Trail.Line.Manager; +using Content.Client._White.Trail.Line.Manager; using Content.Shared.White.Trail; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; @@ -7,7 +7,7 @@ using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -namespace Content.Client.White.Trail; +namespace Content.Client._White.Trail; public sealed class TrailSystem : EntitySystem { diff --git a/Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs b/Content.Client/_White/UserInterface/Controls/ChatRichTextEntry.cs similarity index 99% rename from Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs rename to Content.Client/_White/UserInterface/Controls/ChatRichTextEntry.cs index 7ccb7a50cb..53ebcbe31f 100644 --- a/Content.Client/White/UserInterface/Controls/ChatRichTextEntry.cs +++ b/Content.Client/_White/UserInterface/Controls/ChatRichTextEntry.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.RichText; using Robust.Shared.Collections; using Robust.Shared.Utility; -namespace Content.Client.White.UserInterface.Controls; +namespace Content.Client._White.UserInterface.Controls; internal struct ChatRichTextEntry { diff --git a/Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs b/Content.Client/_White/UserInterface/Controls/ChatRichTextLabel.cs similarity index 96% rename from Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs rename to Content.Client/_White/UserInterface/Controls/ChatRichTextLabel.cs index 6a40ae4f31..028f4aa2be 100644 --- a/Content.Client/White/UserInterface/Controls/ChatRichTextLabel.cs +++ b/Content.Client/_White/UserInterface/Controls/ChatRichTextLabel.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.RichText; using Robust.Shared.Utility; -namespace Content.Client.White.UserInterface.Controls; +namespace Content.Client._White.UserInterface.Controls; public class ChatRichTextLabel : Control { diff --git a/Content.Client/White/UserInterface/Controls/WordWrap.cs b/Content.Client/_White/UserInterface/Controls/WordWrap.cs similarity index 99% rename from Content.Client/White/UserInterface/Controls/WordWrap.cs rename to Content.Client/_White/UserInterface/Controls/WordWrap.cs index b9c3514513..780f86c344 100644 --- a/Content.Client/White/UserInterface/Controls/WordWrap.cs +++ b/Content.Client/_White/UserInterface/Controls/WordWrap.cs @@ -3,7 +3,7 @@ using System.Text; using Robust.Client.Graphics; using Robust.Shared.Utility; -namespace Content.Client.White.UserInterface.Controls; +namespace Content.Client._White.UserInterface.Controls; internal struct WordWrap { diff --git a/Content.Client/_White/UserInterface/Radial/RadialButton.xaml b/Content.Client/_White/UserInterface/Radial/RadialButton.xaml index 10a743e831..85e9d3a2fc 100644 --- a/Content.Client/_White/UserInterface/Radial/RadialButton.xaml +++ b/Content.Client/_White/UserInterface/Radial/RadialButton.xaml @@ -1,7 +1,4 @@ - - + - - + diff --git a/Content.Client/_White/UserInterface/Radial/RadialContainer.xaml.cs b/Content.Client/_White/UserInterface/Radial/RadialContainer.xaml.cs index 5f9adafd6b..bfb312240c 100644 --- a/Content.Client/_White/UserInterface/Radial/RadialContainer.xaml.cs +++ b/Content.Client/_White/UserInterface/Radial/RadialContainer.xaml.cs @@ -1,7 +1,6 @@ using System.Linq; using System.Numerics; using System.Text; -using System.Threading.Tasks; using Content.Client.Message; using Content.Client.Resources; using Robust.Client.Animations; @@ -222,7 +221,7 @@ public partial class RadialContainer : Control button.Controller.OnMouseEntered += (_) => { PlaySizeAnimation(button, _focusSize, OutSizeAnimationKey, InSizeAnimationKey); - ActionLabel.SetMarkup(button.Content ?? string.Empty); + RichTextLabelExt.SetMarkup(ActionLabel, button.Content ?? string.Empty); ActionLabel.Visible = IsAction; }; button.Controller.OnMouseExited += (_) => @@ -237,7 +236,7 @@ public partial class RadialContainer : Control CloseButton.Controller.OnMouseEntered += (_) => { PlaySizeAnimation(CloseButton, _focusSize, OutSizeAnimationKey, InSizeAnimationKey); - ActionLabel.SetMarkup(CloseButton.Content ?? string.Empty); + RichTextLabelExt.SetMarkup(ActionLabel, CloseButton.Content ?? string.Empty); ActionLabel.Visible = true; }; @@ -405,10 +404,10 @@ public partial class RadialContainer : Control { var distance = FocusSize * 1.2f; - if (Layout.Children.Count() <= MaxButtons) + if (Enumerable.Count(Layout.Children) <= MaxButtons) return distance + offset; - for (var i = 0; i < (Layout.Children.Count() - MaxButtons); i++) + for (var i = 0; i < (Enumerable.Count(Layout.Children) - MaxButtons); i++) { distance += (NormalSize/3); }