From 45bd1edd5b4ab099f57d88cd84030dfcfdb46bee Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 6 Aug 2022 16:48:21 +1000 Subject: [PATCH] Revert "Update submodule to 0.34.0.0 (#10356)" (#10359) --- .../AME/UI/AMEControllerBoundUserInterface.cs | 2 +- .../Access/UI/AgentIDCardBoundUserInterface.cs | 2 +- .../Access/UI/IdCardConsoleBoundUserInterface.cs | 2 +- .../UI/AirlockPainterBoundUserInterface.cs | 2 +- .../Arcade/UI/BlockGameBoundUserInterface.cs | 2 +- .../Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs | 2 +- .../Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs | 2 +- .../Atmos/UI/GasAnalyzerBoundUserInterface.cs | 2 +- .../Atmos/UI/GasCanisterBoundUserInterface.cs | 2 +- Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs | 2 +- Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs | 2 +- .../Atmos/UI/GasPressurePumpBoundUserInterface.cs | 2 +- .../Atmos/UI/GasThermomachineBoundUserInterface.cs | 2 +- .../Atmos/UI/GasVolumePumpBoundUserInterface.cs | 2 +- .../Body/UI/BodyScannerBoundUserInterface.cs | 2 +- .../Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs | 2 +- .../Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs | 2 +- .../MagicMirrorBoundUserInterface.cs | 2 +- .../Chemistry/UI/ChemMasterBoundUserInterface.cs | 2 +- .../Chemistry/UI/ReagentDispenserBoundUserInterface.cs | 2 +- .../Chemistry/UI/TransferAmountBoundUserInterface.cs | 2 +- .../UI/CloningConsoleBoundUserInterface.cs | 2 +- .../UI/CommunicationsConsoleBoundUserInterface.cs | 2 +- Content.Client/Computer/ComputerBoundUserInterface.cs | 4 ++-- .../Configurable/UI/ConfigurationBoundUserInterface.cs | 2 +- Content.Client/Crayon/UI/CrayonBoundUserInterface.cs | 2 +- .../Disposal/UI/DisposalRouterBoundUserInterface.cs | 2 +- .../Disposal/UI/DisposalTaggerBoundUserInterface.cs | 2 +- .../Disposal/UI/DisposalUnitBoundUserInterface.cs | 2 +- .../Forensics/ForensicScannerBoundUserInterface.cs | 2 +- .../Gravity/UI/GravityGeneratorBoundUserInterface.cs | 2 +- .../UI/HealthAnalyzerBoundUserInterface.cs | 2 +- .../Instruments/UI/InstrumentBoundUserInterface.cs | 2 +- .../Inventory/StrippableBoundUserInterface.cs | 2 +- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 2 +- .../Kitchen/UI/ReagentGrinderBoundUserInterface.cs | 2 +- .../Labels/UI/HandLabelerBoundUserInterface.cs | 2 +- Content.Client/Lathe/UI/LatheBoundUserInterface.cs | 2 +- .../UI/SignalPortSelectorBoundUserInterface.cs | 2 +- .../CrewMonitoring/CrewMonitoringBoundUserInterface.cs | 2 +- .../NetworkConfiguratorBoundUserInterface.cs | 2 +- Content.Client/Nuke/NukeBoundUserInterface.cs | 2 +- Content.Client/PDA/PDABoundUserInterface.cs | 2 +- Content.Client/PDA/Ringer/RingerBoundUserInterface.cs | 2 +- Content.Client/Paper/UI/PaperBoundUserInterface.cs | 2 +- .../UI/ParticleAcceleratorBoundUserInterface.cs | 2 +- Content.Client/Power/APC/ApcBoundUserInterface.cs | 2 +- Content.Client/Power/PowerMonitoringWindow.xaml.cs | 2 +- Content.Client/Power/SolarControlWindow.xaml.cs | 2 +- .../Research/UI/ResearchClientBoundUserInterface.cs | 2 +- .../Research/UI/ResearchConsoleBoundUserInterface.cs | 2 +- .../Shuttles/BUI/EmergencyConsoleBoundUserInterface.cs | 2 +- .../Shuttles/BUI/RadarConsoleBoundUserInterface.cs | 2 +- .../Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs | 2 +- Content.Client/Storage/StorageBoundUserInterface.cs | 2 +- .../UI/SurveillanceCameraMonitorBoundUi.cs | 2 +- .../UI/SurveillanceCameraSetupBoundUi.cs | 2 +- .../Traitor/Uplink/UplinkBoundUserInterface.cs | 2 +- .../Atmos/GasTank/GasTankBoundUserInterface.cs | 2 +- .../VendingMachineBoundUserInterface.cs | 2 +- Content.Client/Wires/UI/WiresBoundUserInterface.cs | 2 +- Content.Server/Arcade/ArcadeSystem.cs | 5 ++--- .../Arcade/Components/BlockGameArcadeComponent.cs | 3 ++- .../Atmos/Components/GasAnalyzerComponent.cs | 8 +++++++- .../Atmos/EntitySystems/GasAnalyzableSystem.cs | 1 - Content.Server/Storage/EntitySystems/StorageSystem.cs | 10 +++++----- Content.Server/UserInterface/ActivatableUISystem.cs | 7 +++++-- Content.Server/UserInterface/UserInterfaceHelpers.cs | 5 ++--- RobustToolbox | 2 +- 69 files changed, 86 insertions(+), 79 deletions(-) diff --git a/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs index 45bcce40a24..47002924009 100644 --- a/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs +++ b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs @@ -11,7 +11,7 @@ namespace Content.Client.AME.UI { private AMEWindow? _window; - public AMEControllerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public AMEControllerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs index b9880eb8b6e..bb0f870f5a7 100644 --- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs +++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs @@ -10,7 +10,7 @@ namespace Content.Client.Access.UI { private AgentIDCardWindow? _window; - public AgentIDCardBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public AgentIDCardBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs index 97125169ad3..897000c1842 100644 --- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs +++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs @@ -12,7 +12,7 @@ namespace Content.Client.Access.UI [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; - public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/AirlockPainter/UI/AirlockPainterBoundUserInterface.cs b/Content.Client/AirlockPainter/UI/AirlockPainterBoundUserInterface.cs index 12c8de926ea..ba3681cda78 100644 --- a/Content.Client/AirlockPainter/UI/AirlockPainterBoundUserInterface.cs +++ b/Content.Client/AirlockPainter/UI/AirlockPainterBoundUserInterface.cs @@ -8,7 +8,7 @@ namespace Content.Client.AirlockPainter.UI private AirlockPainterWindow? _window; public List Styles = new(); - public AirlockPainterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public AirlockPainterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs index cd74077c12f..b1182199f74 100644 --- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs @@ -8,7 +8,7 @@ namespace Content.Client.Arcade.UI { private BlockGameMenu? _menu; - public BlockGameBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public BlockGameBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs index bb1582d1279..c9f4d9b79be 100644 --- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs @@ -11,7 +11,7 @@ namespace Content.Client.Arcade.UI //public SharedSpaceVillainArcadeComponent SpaceVillainArcade; - public SpaceVillainArcadeBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public SpaceVillainArcadeBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { SendAction(PlayerAction.RequestData); } diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs index d7208d3a346..df419b282cc 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs @@ -12,7 +12,7 @@ namespace Content.Client.Atmos.Monitor.UI { private AirAlarmWindow? _window; - public AirAlarmBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public AirAlarmBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} protected override void Open() diff --git a/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs b/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs index c79fa03a388..fe91547f5a4 100644 --- a/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs @@ -6,7 +6,7 @@ namespace Content.Client.Atmos.UI { public sealed class GasAnalyzerBoundUserInterface : BoundUserInterface { - public GasAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs index ba9c7037edb..c1f4d5205dc 100644 --- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs @@ -14,7 +14,7 @@ namespace Content.Client.Atmos.UI private GasCanisterWindow? _window; - public GasCanisterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasCanisterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs index 21600cc63b2..c0c59449958 100644 --- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs @@ -18,7 +18,7 @@ namespace Content.Client.Atmos.UI private GasFilterWindow? _window; private const float MaxTransferRate = Atmospherics.MaxTransferRate; - public GasFilterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasFilterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs index 2cd140ef55f..900b91fea21 100644 --- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs +++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs @@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI private GasMixerWindow? _window; private const float MaxPressure = Atmospherics.MaxOutputPressure; - public GasMixerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasMixerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs index 2c7302f0568..75a129fad78 100644 --- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs @@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI private GasPressurePumpWindow? _window; private const float MaxPressure = Atmospherics.MaxOutputPressure; - public GasPressurePumpBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasPressurePumpBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs index 5eee70808ab..eb809e6f7c6 100644 --- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs @@ -18,7 +18,7 @@ namespace Content.Client.Atmos.UI private float _minTemp = 0.0f; private float _maxTemp = 0.0f; - public GasThermomachineBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasThermomachineBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs index e211a58fed4..5348416f073 100644 --- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs @@ -16,7 +16,7 @@ namespace Content.Client.Atmos.UI private GasVolumePumpWindow? _window; private const float MaxTransferRate = Atmospherics.MaxTransferRate; - public GasVolumePumpBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public GasVolumePumpBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs b/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs index e5aacdb31cf..2b84e8764e4 100644 --- a/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs +++ b/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs @@ -14,7 +14,7 @@ namespace Content.Client.Body.UI [ViewVariables] private BodyScannerDisplay? _display; - public BodyScannerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) { } + public BodyScannerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } protected override void Open() { diff --git a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs index 83f07a3678f..95f7e84291a 100644 --- a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs @@ -39,7 +39,7 @@ namespace Content.Client.Cargo.BUI /// private CargoProductPrototype? _product; - public CargoOrderConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public CargoOrderConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs index f10ef90fbe7..6dd3df5f6ec 100644 --- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs @@ -11,7 +11,7 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface { private CargoShuttleMenu? _menu; - public CargoShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public CargoShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} protected override void Open() { diff --git a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs index 924f4093cb2..20cd1bcd899 100644 --- a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs +++ b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs @@ -23,7 +23,7 @@ namespace Content.Client.CharacterAppearance { private MagicMirrorWindow? _window; - public MagicMirrorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public MagicMirrorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs index 6217ad22882..04b9cc67ed9 100644 --- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs @@ -14,7 +14,7 @@ namespace Content.Client.Chemistry.UI { private ChemMasterWindow? _window; - public ChemMasterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ChemMasterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs index 7f7b0bb6301..b1b2ef0413e 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs @@ -17,7 +17,7 @@ namespace Content.Client.Chemistry.UI private ReagentDispenserWindow? _window; private ReagentDispenserBoundUserInterfaceState? _lastState; - public ReagentDispenserBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ReagentDispenserBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs index cca7310efd9..fd501a8fa3a 100644 --- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs @@ -27,7 +27,7 @@ namespace Content.Client.Chemistry.UI _window.OpenCentered(); } - public TransferAmountBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public TransferAmountBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs index 8ab2c346277..77b2d9e807e 100644 --- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs +++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs @@ -9,7 +9,7 @@ namespace Content.Client.CloningConsole.UI { private CloningConsoleWindow? _window; - public CloningConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public CloningConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index f8dbfc0fe47..30cb4db8cf0 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -26,7 +26,7 @@ namespace Content.Client.Communications.UI public int Countdown => _expectedCountdownTime == null ? 0 : Math.Max((int)_expectedCountdownTime.Value.Subtract(_gameTiming.CurTime).TotalSeconds, 0); private TimeSpan? _expectedCountdownTime; - public CommunicationsConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public CommunicationsConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Computer/ComputerBoundUserInterface.cs b/Content.Client/Computer/ComputerBoundUserInterface.cs index 2dccd68d214..cb216fc76e0 100644 --- a/Content.Client/Computer/ComputerBoundUserInterface.cs +++ b/Content.Client/Computer/ComputerBoundUserInterface.cs @@ -26,7 +26,7 @@ namespace Content.Client.Computer } // Alas, this constructor has to be copied to the subclass. :( - public ComputerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public ComputerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} protected override void UpdateState(BoundUserInterfaceState state) { @@ -58,7 +58,7 @@ namespace Content.Client.Computer [Virtual] public class ComputerBoundUserInterfaceBase : BoundUserInterface { - public ComputerBoundUserInterfaceBase(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public ComputerBoundUserInterfaceBase(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} public new void SendMessage(BoundUserInterfaceMessage msg) { diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs index 9ec62e01a00..0bbec641261 100644 --- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs +++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs @@ -10,7 +10,7 @@ namespace Content.Client.Configurable.UI { public Regex? Validation { get; internal set; } - public ConfigurationBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ConfigurationBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index b6634ca8132..d31eb35db91 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -10,7 +10,7 @@ namespace Content.Client.Crayon.UI { public sealed class CrayonBoundUserInterface : BoundUserInterface { - public CrayonBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public CrayonBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs index f883fe42d18..207d332793c 100644 --- a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs @@ -13,7 +13,7 @@ namespace Content.Client.Disposal.UI { private DisposalRouterWindow? _window; - public DisposalRouterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public DisposalRouterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs index 6c2da1e4ff2..09d42372d94 100644 --- a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs @@ -13,7 +13,7 @@ namespace Content.Client.Disposal.UI { private DisposalTaggerWindow? _window; - public DisposalTaggerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public DisposalTaggerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs index fca83f8e9a7..dd4965210b2 100644 --- a/Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs @@ -16,7 +16,7 @@ namespace Content.Client.Disposal.UI { public DisposalUnitWindow? Window; - public DisposalUnitBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public DisposalUnitBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs index 0534793df07..c5d3f156595 100644 --- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs +++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs @@ -7,7 +7,7 @@ namespace Content.Client.Forensics { private ForensicScannerMenu? _window; - public ForensicScannerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ForensicScannerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs index cac4e31b624..28ebdf9dfa0 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs @@ -10,7 +10,7 @@ namespace Content.Client.Gravity.UI { private GravityGeneratorWindow? _window; - public GravityGeneratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base (owner, uiKey) + public GravityGeneratorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base (owner, uiKey) { } diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs index a5dbe2d7dc6..c7bfffe41d8 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs @@ -10,7 +10,7 @@ namespace Content.Client.HealthAnalyzer.UI { private HealthAnalyzerWindow? _window; - public HealthAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public HealthAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs index 2279e3e09db..629f442b0d9 100644 --- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs +++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs @@ -12,7 +12,7 @@ namespace Content.Client.Instruments.UI public InstrumentComponent? Instrument { get; set; } - public InstrumentBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public InstrumentBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index cb4554d689b..d7eb9952e2d 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -16,7 +16,7 @@ namespace Content.Client.Inventory [ViewVariables] private StrippingMenu? _strippingMenu; - public StrippableBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public StrippableBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs index fb5ae91f2b4..e9394338a86 100644 --- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs @@ -25,7 +25,7 @@ namespace Content.Client.Kitchen.UI private readonly Dictionary _solids = new(); private readonly Dictionary _reagents =new(); - public MicrowaveBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner,uiKey) + public MicrowaveBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner,uiKey) { } diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs index e4e8c6a073d..5ab9462aa1b 100644 --- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs @@ -16,7 +16,7 @@ namespace Content.Client.Kitchen.UI private GrinderMenu? _menu; - public ReagentGrinderBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) { } + public ReagentGrinderBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } protected override void Open() { diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 40677e15123..1c29d947036 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -11,7 +11,7 @@ namespace Content.Client.Labels.UI { private HandLabelerWindow? _window; - public HandLabelerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public HandLabelerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs index 233c6170e80..b738e371e2c 100644 --- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs +++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs @@ -29,7 +29,7 @@ namespace Content.Client.Lathe.UI public Queue QueuedRecipes => _queuedRecipes; private readonly Queue _queuedRecipes = new(); - public LatheBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public LatheBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { SendMessage(new LatheSyncRequestMessage()); } diff --git a/Content.Client/MachineLinking/UI/SignalPortSelectorBoundUserInterface.cs b/Content.Client/MachineLinking/UI/SignalPortSelectorBoundUserInterface.cs index 82ce7d10818..ca386d0bd35 100644 --- a/Content.Client/MachineLinking/UI/SignalPortSelectorBoundUserInterface.cs +++ b/Content.Client/MachineLinking/UI/SignalPortSelectorBoundUserInterface.cs @@ -12,7 +12,7 @@ namespace Content.Client.MachineLinking.UI private string? _selectedTransmitterPort; private string? _selectedReceiverPort; - public SignalPortSelectorBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] Enum uiKey) : base(owner, uiKey) { } + public SignalPortSelectorBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] object uiKey) : base(owner, uiKey) { } protected override void Open() { diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs index f818f0595ad..08904e553ce 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs @@ -9,7 +9,7 @@ namespace Content.Client.Medical.CrewMonitoring { private CrewMonitoringWindow? _menu; - public CrewMonitoringBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] Enum uiKey) : base(owner, uiKey) + public CrewMonitoringBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs index 86490b5147a..fffe60c9fd8 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs @@ -9,7 +9,7 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface private NetworkConfiguratorListMenu? _listMenu; private NetworkConfiguratorConfigurationMenu? _configurationMenu; - public NetworkConfiguratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public NetworkConfiguratorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Nuke/NukeBoundUserInterface.cs b/Content.Client/Nuke/NukeBoundUserInterface.cs index 33f99ea9b5c..e05725745b9 100644 --- a/Content.Client/Nuke/NukeBoundUserInterface.cs +++ b/Content.Client/Nuke/NukeBoundUserInterface.cs @@ -10,7 +10,7 @@ namespace Content.Client.Nuke { private NukeMenu? _menu; - public NukeBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] Enum uiKey) : base(owner, uiKey) + public NukeBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/PDA/PDABoundUserInterface.cs b/Content.Client/PDA/PDABoundUserInterface.cs index 01501b43660..841902c58c2 100644 --- a/Content.Client/PDA/PDABoundUserInterface.cs +++ b/Content.Client/PDA/PDABoundUserInterface.cs @@ -11,7 +11,7 @@ namespace Content.Client.PDA { private PDAMenu? _menu; - public PDABoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public PDABoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs index 78231a6cd02..1ccda7164e5 100644 --- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs +++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs @@ -9,7 +9,7 @@ namespace Content.Client.PDA.Ringer { private RingtoneMenu? _menu; - public RingerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public RingerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index b6804c12385..ff3ab237c7f 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -12,7 +12,7 @@ namespace Content.Client.Paper.UI { private PaperWindow? _window; - public PaperBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public PaperBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs index 858ea90752f..b140aac80b9 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs @@ -8,7 +8,7 @@ namespace Content.Client.ParticleAccelerator.UI { private ParticleAcceleratorControlMenu? _menu; - public ParticleAcceleratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ParticleAcceleratorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs index 65ba4c7ec04..4d0562cf4fc 100644 --- a/Content.Client/Power/APC/ApcBoundUserInterface.cs +++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs @@ -21,7 +21,7 @@ namespace Content.Client.Power.APC _menu.OpenCentered(); } - public ApcBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ApcBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.cs index 76e5840bba4..f3343fce7b1 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.cs @@ -80,6 +80,6 @@ public sealed partial class PowerMonitoringWindow : DefaultWindow, IComputerWind [UsedImplicitly] public sealed class PowerMonitoringConsoleBoundUserInterface : ComputerBoundUserInterface { - public PowerMonitoringConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public PowerMonitoringConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} } diff --git a/Content.Client/Power/SolarControlWindow.xaml.cs b/Content.Client/Power/SolarControlWindow.xaml.cs index f9d535e099d..391eff0495e 100644 --- a/Content.Client/Power/SolarControlWindow.xaml.cs +++ b/Content.Client/Power/SolarControlWindow.xaml.cs @@ -161,6 +161,6 @@ namespace Content.Client.Power [UsedImplicitly] public sealed class SolarControlConsoleBoundUserInterface : ComputerBoundUserInterface { - public SolarControlConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public SolarControlConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} } } diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs index ca8534eebcc..7720fd5e6b5 100644 --- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs @@ -7,7 +7,7 @@ namespace Content.Client.Research.UI { private ResearchClientServerSelectionMenu? _menu; - public ResearchClientBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ResearchClientBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { SendMessage(new ResearchClientSyncMessage()); } diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index e7333ca2984..adb7a437146 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -13,7 +13,7 @@ namespace Content.Client.Research.UI private ResearchConsoleMenu? _consoleMenu; private TechnologyDatabaseComponent? _technologyDatabase; - public ResearchConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public ResearchConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { SendMessage(new ConsoleServerSyncMessage()); } diff --git a/Content.Client/Shuttles/BUI/EmergencyConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/EmergencyConsoleBoundUserInterface.cs index 4d32d585dd0..2783f286b7c 100644 --- a/Content.Client/Shuttles/BUI/EmergencyConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/EmergencyConsoleBoundUserInterface.cs @@ -9,5 +9,5 @@ namespace Content.Client.Shuttles.BUI; [UsedImplicitly] public sealed class EmergencyConsoleBoundUserInterface : ComputerBoundUserInterface { - public EmergencyConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public EmergencyConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} } diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs index 6278389fff0..75d542501fc 100644 --- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs @@ -10,7 +10,7 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface { private RadarConsoleWindow? _window; - public RadarConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public RadarConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} protected override void Open() { diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs index b67664020ec..d4056584201 100644 --- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs @@ -12,7 +12,7 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface { private ShuttleConsoleWindow? _window; - public ShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {} + public ShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {} protected override void Open() { diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs index adfc82fbb0b..4389663d424 100644 --- a/Content.Client/Storage/StorageBoundUserInterface.cs +++ b/Content.Client/Storage/StorageBoundUserInterface.cs @@ -13,7 +13,7 @@ namespace Content.Client.Storage { [ViewVariables] private StorageWindow? _window; - public StorageBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public StorageBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs index f247a0550ae..6202364c277 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs @@ -13,7 +13,7 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter private SurveillanceCameraMonitorWindow? _window; private EntityUid? _currentCamera; - public SurveillanceCameraMonitorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public SurveillanceCameraMonitorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { IoCManager.InjectDependencies(this); _eyeLerpingSystem = _entityManager.EntitySysManager.GetEntitySystem(); diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs index 7fc86141468..0f6a5bd3079 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs @@ -8,7 +8,7 @@ public sealed class SurveillanceCameraSetupBoundUi : BoundUserInterface private SurveillanceCameraSetupWindow? _window; private SurveillanceCameraSetupUiKey _type; - public SurveillanceCameraSetupBoundUi(ClientUserInterfaceComponent component, Enum uiKey) : base(component, uiKey) + public SurveillanceCameraSetupBoundUi(ClientUserInterfaceComponent component, object uiKey) : base(component, uiKey) { if (uiKey is not SurveillanceCameraSetupUiKey key) { diff --git a/Content.Client/Traitor/Uplink/UplinkBoundUserInterface.cs b/Content.Client/Traitor/Uplink/UplinkBoundUserInterface.cs index f50dc88ac26..c7051756f7b 100644 --- a/Content.Client/Traitor/Uplink/UplinkBoundUserInterface.cs +++ b/Content.Client/Traitor/Uplink/UplinkBoundUserInterface.cs @@ -9,7 +9,7 @@ namespace Content.Client.Traitor.Uplink { private UplinkMenu? _menu; - public UplinkBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public UplinkBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs index 2740deff277..71405dfb2f9 100644 --- a/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs +++ b/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs @@ -9,7 +9,7 @@ namespace Content.Client.UserInterface.Atmos.GasTank public sealed class GasTankBoundUserInterface : BoundUserInterface { - public GasTankBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : + public GasTankBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 688a54f50d9..3902bfec23e 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -14,7 +14,7 @@ namespace Content.Client.VendingMachines public SharedVendingMachineComponent? VendingMachine { get; private set; } - public VendingMachineBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public VendingMachineBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { SendMessage(new InventorySyncRequestMessage()); } diff --git a/Content.Client/Wires/UI/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs index cd2b3ea02e9..1386c0d8c53 100644 --- a/Content.Client/Wires/UI/WiresBoundUserInterface.cs +++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs @@ -8,7 +8,7 @@ namespace Content.Client.Wires.UI { private WiresMenu? _menu; - public WiresBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) + public WiresBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { } diff --git a/Content.Server/Arcade/ArcadeSystem.cs b/Content.Server/Arcade/ArcadeSystem.cs index 679f35bdfbb..fa4c81626d1 100644 --- a/Content.Server/Arcade/ArcadeSystem.cs +++ b/Content.Server/Arcade/ArcadeSystem.cs @@ -1,10 +1,10 @@ -using System.Linq; +using System.Linq; using Content.Server.Arcade.Components; using Content.Server.UserInterface; using Content.Shared.Arcade; using Robust.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.Player; + namespace Content.Server.Arcade { @@ -19,7 +19,6 @@ namespace Content.Server.Arcade base.Initialize(); SubscribeLocalEvent(OnAfterUIOpen); SubscribeLocalEvent(OnAfterUIOpenSV); - SubscribeLocalEvent((_,c,args) => c.UnRegisterPlayerSession((IPlayerSession)args.Session)); InitializeBlockGame(); InitializeSpaceVillain(); } diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs index 924b5709ca7..85c45ae2f5f 100644 --- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs +++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs @@ -48,7 +48,7 @@ namespace Content.Server.Arcade.Components UpdatePlayerStatus(temp); } - public void UnRegisterPlayerSession(IPlayerSession session) + private void UnRegisterPlayerSession(IPlayerSession session) { if (_player == session) { @@ -72,6 +72,7 @@ namespace Content.Server.Arcade.Components if (UserInterface != null) { UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage; + UserInterface.OnClosed += UnRegisterPlayerSession; } _game = new BlockGame(this); } diff --git a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs index 39263dd61b0..876a922d810 100644 --- a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs +++ b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs @@ -35,6 +35,7 @@ namespace Content.Server.Atmos.Components if (UserInterface != null) { UserInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage; + UserInterface.OnClosed += UserInterfaceOnClose; } _entities.TryGetComponent(Owner, out _appearance); @@ -95,7 +96,12 @@ namespace Content.Server.Atmos.Components Resync(); } - public void UpdateAppearance(bool open) + private void UserInterfaceOnClose(IPlayerSession obj) + { + UpdateAppearance(false); + } + + private void UpdateAppearance(bool open) { _appearance?.SetData(GasAnalyzerVisuals.VisualState, open ? GasAnalyzerVisualState.Working : GasAnalyzerVisualState.Off); diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs index bd98f5183f1..c54bc6412c6 100644 --- a/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs @@ -21,7 +21,6 @@ namespace Content.Server.Atmos.EntitySystems base.Initialize(); SubscribeLocalEvent>(OnGetExamineVerbs); - SubscribeLocalEvent((_,c,_) => c.UpdateAppearance(false)); } private void OnGetExamineVerbs(EntityUid uid, GasAnalyzableComponent component, GetVerbsEvent args) diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs index 645b6668ecc..66a6b6f23c9 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs @@ -645,12 +645,12 @@ namespace Content.Server.Storage.EntitySystems DebugTools.Assert(storedStorageComp != storageComp, $"Storage component contains itself!? Entity: {uid}"); } - if (!TryComp(entity, out ServerUserInterfaceComponent? ui)) - continue; - - foreach (var bui in ui.Interfaces.Values) + if (TryComp(entity, out ServerUserInterfaceComponent? uiComponent)) { - _uiSystem.TryClose(uid, bui.UiKey, session, ui); + foreach (var ui in uiComponent.Interfaces) + { + ui.Close(session); + } } } } diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs index 40d86c48da9..b48bd6c3d08 100644 --- a/Content.Server/UserInterface/ActivatableUISystem.cs +++ b/Content.Server/UserInterface/ActivatableUISystem.cs @@ -17,7 +17,6 @@ namespace Content.Server.UserInterface { [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly ActionBlockerSystem _blockerSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; public override void Initialize() { @@ -57,7 +56,11 @@ namespace Content.Server.UserInterface if (!TryComp(args.Performer, out ActorComponent? actor)) return; - args.Handled = _uiSystem.TryToggleUi(uid, args.Key, actor.PlayerSession); + if (!component.TryGetBoundUserInterface(args.Key, out var bui)) + return; + + bui.Toggle(actor.PlayerSession); + args.Handled = true; } private void AddOpenUiVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEvent args) diff --git a/Content.Server/UserInterface/UserInterfaceHelpers.cs b/Content.Server/UserInterface/UserInterfaceHelpers.cs index 4a0e9d15438..b76639f81ee 100644 --- a/Content.Server/UserInterface/UserInterfaceHelpers.cs +++ b/Content.Server/UserInterface/UserInterfaceHelpers.cs @@ -4,10 +4,9 @@ namespace Content.Server.UserInterface { public static class UserInterfaceHelpers { - [Obsolete("Use UserInterfaceSystem")] - public static BoundUserInterface? GetUIOrNull(this EntityUid entity, Enum uiKey) + public static BoundUserInterface? GetUIOrNull(this EntityUid entity, object uiKey) { - return IoCManager.Resolve().GetEntitySystem().GetUiOrNull(entity, uiKey); + return IoCManager.Resolve().GetComponentOrNull(entity)?.GetBoundUserInterfaceOrNull(uiKey); } } } diff --git a/RobustToolbox b/RobustToolbox index ef351876242..01b55494e8b 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit ef351876242967d6a2369b76cbb53dda6356cb33 +Subproject commit 01b55494e8b6aa18721cb8c770f1bbb8b2f3cab7