BUI changes required for Engine PR (#10608)

Content.Client/AME/UI/AMEControllerBoundUserInterface.cs

@@ -11,7 +11,7 @@ namespace Content.Client.AME.UI
     {
         private AMEWindow? _window;
 
-        public AMEControllerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public AMEControllerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -10,7 +10,7 @@ namespace Content.Client.Access.UI
     {
         private AgentIDCardWindow? _window;
 
-        public AgentIDCardBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public AgentIDCardBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -13,7 +13,7 @@ namespace Content.Client.Access.UI
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
-        public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/AirlockPainter/UI/AirlockPainterBoundUserInterface.cs

@@ -8,7 +8,7 @@ namespace Content.Client.AirlockPainter.UI
         private AirlockPainterWindow? _window;
         public List<string> Styles = new();
 
-        public AirlockPainterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public AirlockPainterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs

@@ -8,7 +8,7 @@ namespace Content.Client.Arcade.UI
     {
         private BlockGameMenu? _menu;
 
-        public BlockGameBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public BlockGameBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs

@@ -11,7 +11,7 @@ namespace Content.Client.Arcade.UI
 
         //public SharedSpaceVillainArcadeComponent SpaceVillainArcade;
 
-        public SpaceVillainArcadeBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public SpaceVillainArcadeBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             SendAction(PlayerAction.RequestData);
         }

Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs

@@ -12,7 +12,7 @@ namespace Content.Client.Atmos.Monitor.UI
     {
         private AirAlarmWindow? _window;
 
-        public AirAlarmBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public AirAlarmBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {}
 
         protected override void Open()

Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs

@@ -6,7 +6,7 @@ namespace Content.Client.Atmos.UI
 {
     public sealed class GasAnalyzerBoundUserInterface : BoundUserInterface
     {
-        public GasAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public GasAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs

@@ -14,7 +14,7 @@ namespace Content.Client.Atmos.UI
 
         private GasCanisterWindow? _window;
 
-        public GasCanisterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public GasCanisterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+        public GasFilterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+        public GasMixerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+        public GasPressurePumpBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+        public GasThermomachineBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+        public GasVolumePumpBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Body/UI/BodyScannerBoundUserInterface.cs

@@ -14,7 +14,7 @@ namespace Content.Client.Body.UI
         [ViewVariables]
         private BodyScannerDisplay? _display;
 
-        public BodyScannerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { }
+        public BodyScannerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) { }
 
         protected override void Open()
         {

Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs

@@ -39,7 +39,7 @@ namespace Content.Client.Cargo.BUI
         /// </summary>
         private CargoProductPrototype? _product;
 
-        public CargoOrderConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public CargoOrderConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs

@@ -11,7 +11,7 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
 {
     private CargoShuttleMenu? _menu;
 
-    public CargoShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+    public CargoShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
 
     protected override void Open()
     {

Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs

@@ -23,7 +23,7 @@ namespace Content.Client.CharacterAppearance
     {
         private MagicMirrorWindow? _window;
 
-        public MagicMirrorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public MagicMirrorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -14,7 +14,7 @@ namespace Content.Client.Chemistry.UI
     {
         private ChemMasterWindow? _window;
 
-        public ChemMasterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public ChemMasterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
 
         }

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, object uiKey) : base(owner, uiKey)
+        public ReagentDispenserBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs

@@ -27,7 +27,7 @@ namespace Content.Client.Chemistry.UI
             _window.OpenCentered();
         }
 
-        public TransferAmountBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public TransferAmountBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs

@@ -9,7 +9,7 @@ namespace Content.Client.CloningConsole.UI
     {
         private CloningConsoleWindow? _window;
 
-        public CloningConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public CloningConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+        public CommunicationsConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey) {}
+        public ComputerBoundUserInterface(ClientUserInterfaceComponent owner, Enum 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, object uiKey) : base(owner, uiKey) {}
+        public ComputerBoundUserInterfaceBase(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
 
         public new void SendMessage(BoundUserInterfaceMessage msg)
         {

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, object uiKey) : base(owner, uiKey)
+        public ConfigurationBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Crayon/UI/CrayonBoundUserInterface.cs

@@ -10,7 +10,7 @@ namespace Content.Client.Crayon.UI
 {
     public sealed class CrayonBoundUserInterface : BoundUserInterface
     {
-        public CrayonBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public CrayonBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs

@@ -13,7 +13,7 @@ namespace Content.Client.Disposal.UI
     {
         private DisposalRouterWindow? _window;
 
-        public DisposalRouterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public DisposalRouterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs

@@ -13,7 +13,7 @@ namespace Content.Client.Disposal.UI
     {
         private DisposalTaggerWindow? _window;
 
-        public DisposalTaggerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public DisposalTaggerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs

@@ -20,7 +20,7 @@ namespace Content.Client.Disposal.UI
         public MailingUnitWindow? MailingUnitWindow;
         public DisposalUnitWindow? DisposalUnitWindow;
 
-        public DisposalUnitBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public DisposalUnitBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Forensics/ForensicScannerBoundUserInterface.cs

@@ -7,7 +7,7 @@ namespace Content.Client.Forensics
     {
         private ForensicScannerMenu? _window;
 
-        public ForensicScannerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public ForensicScannerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs

@@ -10,7 +10,7 @@ namespace Content.Client.Gravity.UI
     {
         private GravityGeneratorWindow? _window;
 
-        public GravityGeneratorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base (owner, uiKey)
+        public GravityGeneratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base (owner, uiKey)
         {
         }
 

Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs

@@ -10,7 +10,7 @@ namespace Content.Client.HealthAnalyzer.UI
     {
         private HealthAnalyzerWindow? _window;
 
-        public HealthAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public HealthAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs

@@ -12,7 +12,7 @@ namespace Content.Client.Instruments.UI
 
         public InstrumentComponent? Instrument { get; set; }
 
-        public InstrumentBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public InstrumentBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Inventory/StrippableBoundUserInterface.cs

@@ -16,7 +16,7 @@ namespace Content.Client.Inventory
         [ViewVariables]
         private StrippingMenu? _strippingMenu;
 
-        public StrippableBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public StrippableBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs

@@ -24,7 +24,7 @@ namespace Content.Client.Kitchen.UI
         private readonly Dictionary<int, EntityUid> _solids = new();
         private readonly Dictionary<int, Solution.ReagentQuantity> _reagents =new();
 
-        public MicrowaveBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner,uiKey)
+        public MicrowaveBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner,uiKey)
         {
         }
 

Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs

@@ -16,7 +16,7 @@ namespace Content.Client.Kitchen.UI
 
         private GrinderMenu? _menu;
 
-        public ReagentGrinderBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { }
+        public ReagentGrinderBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) { }
 
         protected override void Open()
         {

Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs

@@ -11,7 +11,7 @@ namespace Content.Client.Labels.UI
     {
         private HandLabelerWindow? _window;
 
-        public HandLabelerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public HandLabelerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Lathe/UI/LatheBoundUserInterface.cs

@@ -29,7 +29,7 @@ namespace Content.Client.Lathe.UI
         public Queue<LatheRecipePrototype> QueuedRecipes => _queuedRecipes;
         private readonly Queue<LatheRecipePrototype> _queuedRecipes = new();
 
-        public LatheBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public LatheBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             SendMessage(new LatheSyncRequestMessage());
         }

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] object uiKey) : base(owner, uiKey) { }
+        public SignalPortSelectorBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] Enum uiKey) : base(owner, uiKey) { }
 
         protected override void Open()
         {

Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs

@@ -9,7 +9,7 @@ namespace Content.Client.Medical.CrewMonitoring
     {
         private CrewMonitoringWindow? _menu;
 
-        public CrewMonitoringBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] object uiKey) : base(owner, uiKey)
+        public CrewMonitoringBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs

@@ -9,7 +9,7 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface
     private NetworkConfiguratorListMenu? _listMenu;
     private NetworkConfiguratorConfigurationMenu? _configurationMenu;
 
-    public NetworkConfiguratorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+    public NetworkConfiguratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
     {
     }
 

Content.Client/Nuke/NukeBoundUserInterface.cs

@@ -10,7 +10,7 @@ namespace Content.Client.Nuke
     {
         private NukeMenu? _menu;
 
-        public NukeBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] object uiKey) : base(owner, uiKey)
+        public NukeBoundUserInterface([NotNull] ClientUserInterfaceComponent owner, [NotNull] Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/PDA/PDABoundUserInterface.cs

@@ -16,7 +16,7 @@ namespace Content.Client.PDA
 
         private PDAMenu? _menu;
 
-        public PDABoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public PDABoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             IoCManager.InjectDependencies(this);
         }

Content.Client/PDA/Ringer/RingerBoundUserInterface.cs

@@ -9,7 +9,7 @@ namespace Content.Client.PDA.Ringer
     {
         private RingtoneMenu? _menu;
 
-        public RingerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public RingerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Paper/UI/PaperBoundUserInterface.cs

@@ -12,7 +12,7 @@ namespace Content.Client.Paper.UI
     {
         private PaperWindow? _window;
 
-        public PaperBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public PaperBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs

@@ -8,7 +8,7 @@ namespace Content.Client.ParticleAccelerator.UI
     {
         private ParticleAcceleratorControlMenu? _menu;
 
-        public ParticleAcceleratorBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public ParticleAcceleratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Power/APC/ApcBoundUserInterface.cs

@@ -21,7 +21,7 @@ namespace Content.Client.Power.APC
             _menu.OpenCentered();
         }
 
-        public ApcBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public ApcBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

Content.Client/Power/PowerMonitoringWindow.xaml.cs

@@ -80,6 +80,6 @@ public sealed partial class PowerMonitoringWindow : DefaultWindow, IComputerWind
 [UsedImplicitly]
 public sealed class PowerMonitoringConsoleBoundUserInterface : ComputerBoundUserInterface<PowerMonitoringWindow, PowerMonitoringConsoleBoundInterfaceState>
 {
-    public PowerMonitoringConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+    public PowerMonitoringConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
 }
 

Content.Client/Power/SolarControlWindow.xaml.cs

@@ -161,6 +161,6 @@ namespace Content.Client.Power
     [UsedImplicitly]
     public sealed class SolarControlConsoleBoundUserInterface : ComputerBoundUserInterface<SolarControlWindow, SolarControlConsoleBoundInterfaceState>
     {
-        public SolarControlConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+        public SolarControlConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
     }
 }

Content.Client/Research/UI/ResearchClientBoundUserInterface.cs

@@ -7,7 +7,7 @@ namespace Content.Client.Research.UI
     {
         private ResearchClientServerSelectionMenu? _menu;
 
-        public ResearchClientBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public ResearchClientBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             SendMessage(new ResearchClientSyncMessage());
         }

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, object uiKey) : base(owner, uiKey)
+        public ResearchConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             SendMessage(new ConsoleServerSyncMessage());
         }

Content.Client/Shuttles/BUI/EmergencyConsoleBoundUserInterface.cs

@@ -9,5 +9,5 @@ namespace Content.Client.Shuttles.BUI;
 [UsedImplicitly]
 public sealed class EmergencyConsoleBoundUserInterface : ComputerBoundUserInterface<EmergencyConsoleWindow, EmergencyConsoleBoundUserInterfaceState>
 {
-    public EmergencyConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+    public EmergencyConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
 }

Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs

@@ -11,7 +11,7 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
 {
     private IFFConsoleWindow? _window;
 
-    public IFFConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+    public IFFConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
     {
 
     }

Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs

@@ -10,7 +10,7 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface
 {
     private RadarConsoleWindow? _window;
 
-    public RadarConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+    public RadarConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
 
     protected override void Open()
     {

Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs

@@ -12,7 +12,7 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface
 {
     private ShuttleConsoleWindow? _window;
 
-    public ShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+    public ShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
 
     protected override void Open()
     {

Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs

@@ -7,7 +7,7 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt
 {
     private GeneralStationRecordConsoleWindow? _window = default!;
 
-    public GeneralStationRecordConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+    public GeneralStationRecordConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
     {}
 
     protected override void Open()

Content.Client/Storage/StorageBoundUserInterface.cs

@@ -13,7 +13,7 @@ namespace Content.Client.Storage
     {
         [ViewVariables] private StorageWindow? _window;
 
-        public StorageBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public StorageBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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, object uiKey) : base(owner, uiKey)
+    public SurveillanceCameraMonitorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
     {
         IoCManager.InjectDependencies(this);
         _eyeLerpingSystem = _entityManager.EntitySysManager.GetEntitySystem<EyeLerpingSystem>();

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, object uiKey) : base(component, uiKey)
+    public SurveillanceCameraSetupBoundUi(ClientUserInterfaceComponent component, Enum uiKey) : base(component, uiKey)
     {
         if (uiKey is not SurveillanceCameraSetupUiKey key)
         {

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, object uiKey) :
+        public GasTankBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) :
             base(owner, uiKey)
         {
         }

Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -14,7 +14,7 @@ namespace Content.Client.VendingMachines
 
         public SharedVendingMachineComponent? VendingMachine { get; private set; }
 
-        public VendingMachineBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public VendingMachineBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             SendMessage(new InventorySyncRequestMessage());
         }

Content.Client/Wires/UI/WiresBoundUserInterface.cs

@@ -8,7 +8,7 @@ namespace Content.Client.Wires.UI
     {
         private WiresMenu? _menu;
 
-        public WiresBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        public WiresBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 

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,6 +19,7 @@ namespace Content.Server.Arcade
             base.Initialize();
             SubscribeLocalEvent<BlockGameArcadeComponent, AfterActivatableUIOpenEvent>(OnAfterUIOpen);
             SubscribeLocalEvent<SpaceVillainArcadeComponent, AfterActivatableUIOpenEvent>(OnAfterUIOpenSV);
+            SubscribeLocalEvent<BlockGameArcadeComponent, BoundUIClosedEvent>((_,c,args) => c.UnRegisterPlayerSession((IPlayerSession)args.Session));
             InitializeBlockGame();
             InitializeSpaceVillain();
         }

Content.Server/Arcade/Components/BlockGameArcadeComponent.cs

@@ -48,7 +48,7 @@ namespace Content.Server.Arcade.Components
             UpdatePlayerStatus(temp);
         }
 
-        private void UnRegisterPlayerSession(IPlayerSession session)
+        public void UnRegisterPlayerSession(IPlayerSession session)
         {
             if (_player == session)
             {
@@ -72,7 +72,6 @@ namespace Content.Server.Arcade.Components
             if (UserInterface != null)
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;
-                UserInterface.OnClosed += UnRegisterPlayerSession;
             }
             _game = new BlockGame(this);
         }

Content.Server/Atmos/Components/GasAnalyzerComponent.cs

@@ -35,7 +35,6 @@ namespace Content.Server.Atmos.Components
             if (UserInterface != null)
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage;
-                UserInterface.OnClosed += UserInterfaceOnClose;
             }
 
             _entities.TryGetComponent(Owner, out _appearance);
@@ -96,12 +95,7 @@ namespace Content.Server.Atmos.Components
             Resync();
         }
 
-        private void UserInterfaceOnClose(IPlayerSession obj)
+        public void UpdateAppearance(bool open)
-        {
-            UpdateAppearance(false);
-        }
-
-        private void UpdateAppearance(bool open)
         {
             _appearance?.SetData(GasAnalyzerVisuals.VisualState,
                 open ? GasAnalyzerVisualState.Working : GasAnalyzerVisualState.Off);

Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs

@@ -21,6 +21,7 @@ namespace Content.Server.Atmos.EntitySystems
             base.Initialize();
 
             SubscribeLocalEvent<GasAnalyzableComponent, GetVerbsEvent<ExamineVerb>>(OnGetExamineVerbs);
+            SubscribeLocalEvent<GasAnalyzerComponent, BoundUIClosedEvent>((_,c,_) => c.UpdateAppearance(false));
         }
 
         private void OnGetExamineVerbs(EntityUid uid, GasAnalyzableComponent component, GetVerbsEvent<ExamineVerb> args)

Content.Server/Storage/EntitySystems/StorageSystem.cs

@@ -653,12 +653,12 @@ namespace Content.Server.Storage.EntitySystems
                     DebugTools.Assert(storedStorageComp != storageComp, $"Storage component contains itself!? Entity: {uid}");
                 }
 
-                if (TryComp(entity, out ServerUserInterfaceComponent? uiComponent))
+                if (!TryComp(entity, out ServerUserInterfaceComponent? ui))
+                    continue;
+
+                foreach (var bui in ui.Interfaces.Values)
                 {
-                    foreach (var ui in uiComponent.Interfaces)
+                    _uiSystem.TryClose(entity, bui.UiKey, session, ui);
-                    {
-                        ui.Close(session);
-                    }
                 }
             }
         }

Content.Server/UserInterface/ActivatableUISystem.cs

@@ -17,6 +17,7 @@ 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()
         {
@@ -56,11 +57,7 @@ namespace Content.Server.UserInterface
             if (!TryComp(args.Performer, out ActorComponent? actor))
                 return;
 
-            if (!component.TryGetBoundUserInterface(args.Key, out var bui))
+            args.Handled = _uiSystem.TryToggleUi(uid, args.Key, actor.PlayerSession);
-                return;
-
-            bui.Toggle(actor.PlayerSession);
-            args.Handled = true;
         }
 
         private void AddOpenUiVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEvent<ActivationVerb> args)

Content.Server/UserInterface/UserInterfaceHelpers.cs

@@ -4,9 +4,10 @@ namespace Content.Server.UserInterface
 {
     public static class UserInterfaceHelpers
     {
-        public static BoundUserInterface? GetUIOrNull(this EntityUid entity, object uiKey)
+        [Obsolete("Use UserInterfaceSystem")]
+        public static BoundUserInterface? GetUIOrNull(this EntityUid entity, Enum uiKey)
         {
-            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ServerUserInterfaceComponent>(entity)?.GetBoundUserInterfaceOrNull(uiKey);
+            return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<UserInterfaceSystem>().GetUiOrNull(entity, uiKey);
         }
     }
 }