From cedec8d415a6f6ce6f69c686f539dcb5f052fce3 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:16:24 +1200 Subject: [PATCH] Ensure EUIs close themselves (#15860) --- .../Administration/UI/AdminMenuWindowEui.cs | 3 ++- .../Administration/UI/BanList/BanListEui.cs | 13 +++++++++++++ .../Administration/UI/Logs/AdminLogsEui.cs | 17 ++++++++++++----- .../UI/ManageSolutions/EditSolutionsEui.cs | 3 +-- .../Administration/UI/Notes/AdminNotesEui.cs | 12 ++++++++++++ .../Administration/UI/PermissionsEui.cs | 1 + .../Administration/UI/SetOutfit/SetOutfitEui.cs | 6 ++++++ .../UI/SpawnExplosion/SpawnExplosionEui.cs | 2 +- Content.Client/Cloning/UI/AcceptCloningEui.cs | 2 ++ Content.Client/CrewManifest/CrewManifestEui.cs | 2 +- Content.Client/NPC/NPCEui.cs | 7 +++++++ .../Ghost/Controls/Roles/GhostRolesEui.cs | 2 +- .../Ghost/Controls/Roles/MakeGhostRoleEui.cs | 2 +- .../Administration/Logs/AdminLogsEui.cs | 7 ++----- .../Administration/Notes/AdminNotesEui.cs | 5 ----- .../Administration/UI/AdminAnnounceEui.cs | 5 ++--- .../Administration/UI/EditSolutionsEui.cs | 10 ---------- .../Administration/UI/PermissionsEui.cs | 8 ++------ .../Administration/UI/SpawnExplosionEui.cs | 6 +----- Content.Server/CrewManifest/CrewManifestEui.cs | 12 ------------ Content.Server/EUI/BaseEui.cs | 2 ++ Content.Server/Fax/AdminUI/AdminFaxEui.cs | 7 ++----- Content.Server/Ghost/Roles/UI/GhostRolesEui.cs | 3 --- .../Ghost/Roles/UI/MakeGhostRoleEui.cs | 12 ------------ .../Administration/AdminAnnounceEuiState.cs | 6 ------ .../Administration/EditSolutionsEuiState.cs | 6 ------ .../Administration/Logs/AdminLogsEuiState.cs | 5 ----- .../Administration/Notes/AdminNotesEuiState.cs | 5 ----- .../Administration/PermissionsEuiState.cs | 5 ----- .../Administration/SpawnExplosionEuiMsg.cs | 3 --- .../CrewManifest/SharedCrewManifestSystem.cs | 4 ---- Content.Shared/Eui/EuiMessageBase.cs | 9 ++++++++- .../Ghost/Roles/GhostRolesEuiMessages.cs | 5 ----- .../Roles/MakeGhostRoleWindowClosedMessage.cs | 10 ---------- 34 files changed, 79 insertions(+), 128 deletions(-) delete mode 100644 Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs diff --git a/Content.Client/Administration/UI/AdminMenuWindowEui.cs b/Content.Client/Administration/UI/AdminMenuWindowEui.cs index 7b9691ff94..8c1b257d9e 100644 --- a/Content.Client/Administration/UI/AdminMenuWindowEui.cs +++ b/Content.Client/Administration/UI/AdminMenuWindowEui.cs @@ -1,5 +1,6 @@ using Content.Client.Eui; using Content.Shared.Administration; +using Content.Shared.Eui; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; @@ -12,7 +13,7 @@ namespace Content.Client.Administration.UI public AdminAnnounceEui() { _window = new AdminAnnounceWindow(); - _window.OnClose += () => SendMessage(new AdminAnnounceEuiMsg.Close()); + _window.OnClose += () => SendMessage(new CloseEuiMessage()); _window.AnnounceButton.OnPressed += AnnounceButtonOnOnPressed; } diff --git a/Content.Client/Administration/UI/BanList/BanListEui.cs b/Content.Client/Administration/UI/BanList/BanListEui.cs index 86f2541e51..07eb2e61f4 100644 --- a/Content.Client/Administration/UI/BanList/BanListEui.cs +++ b/Content.Client/Administration/UI/BanList/BanListEui.cs @@ -1,6 +1,7 @@ using Content.Client.Eui; using Content.Shared.Administration.BanList; using Content.Shared.Eui; +using Content.Shared.Ghost.Roles; namespace Content.Client.Administration.UI.BanList; @@ -9,9 +10,21 @@ public sealed class BanListEui : BaseEui public BanListEui() { BanWindow = new BanListWindow(); + BanWindow.OnClose += OnClosed; BanControl = BanWindow.BanList; } + private void OnClosed() + { + SendMessage(new CloseEuiMessage()); + } + + public override void Closed() + { + base.Closed(); + BanWindow.Close(); + } + private BanListWindow BanWindow { get; } private BanListControl BanControl { get; } diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs index b5117dc685..0a1982ae0a 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs @@ -19,6 +19,7 @@ public sealed class AdminLogsEui : BaseEui public AdminLogsEui() { LogsWindow = new AdminLogsWindow(); + LogsWindow.OnClose += OnCloseWindow; LogsControl = LogsWindow.Logs; LogsControl.LogSearch.OnTextEntered += _ => RequestLogs(); @@ -39,7 +40,13 @@ public sealed class AdminLogsEui : BaseEui private void OnRequestClosed(WindowRequestClosedEventArgs args) { - SendMessage(new Close()); + SendMessage(new CloseEuiMessage()); + } + + private void OnCloseWindow() + { + if (ClydeWindow == null) + SendMessage(new CloseEuiMessage()); } private void RequestLogs() @@ -74,10 +81,6 @@ public sealed class AdminLogsEui : BaseEui return; } - LogsControl.Orphan(); - LogsWindow.Dispose(); - LogsWindow = null; - var monitor = _clyde.EnumerateMonitors().First(); ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters @@ -89,6 +92,10 @@ public sealed class AdminLogsEui : BaseEui Height = 400 }); + LogsControl.Orphan(); + LogsWindow.Dispose(); + LogsWindow = null; + ClydeWindow.RequestClosed += OnRequestClosed; ClydeWindow.DisposeOnClose = true; diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs index 3de3193008..4bee78fa09 100644 --- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs +++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs @@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.ManageSolutions public EditSolutionsEui() { _window = new EditSolutionsWindow(); - _window.OnClose += () => SendMessage(new EditSolutionsEuiMsg.Close()); + _window.OnClose += () => SendMessage(new CloseEuiMessage()); } public override void Opened() @@ -28,7 +28,6 @@ namespace Content.Client.Administration.UI.ManageSolutions public override void Closed() { base.Closed(); - _window.OnClose -= () => SendMessage(new EditSolutionsEuiMsg.Close()); _window.Close(); } diff --git a/Content.Client/Administration/UI/Notes/AdminNotesEui.cs b/Content.Client/Administration/UI/Notes/AdminNotesEui.cs index 97edf1d63a..0e95209f41 100644 --- a/Content.Client/Administration/UI/Notes/AdminNotesEui.cs +++ b/Content.Client/Administration/UI/Notes/AdminNotesEui.cs @@ -17,6 +17,18 @@ public sealed class AdminNotesEui : BaseEui NoteControl.OnNoteChanged += (id, text) => SendMessage(new EditNoteRequest(id, text)); NoteControl.OnNewNoteEntered += text => SendMessage(new CreateNoteRequest(text)); NoteControl.OnNoteDeleted += id => SendMessage(new DeleteNoteRequest(id)); + NoteWindow.OnClose += OnClosed; + } + + private void OnClosed() + { + SendMessage(new CloseEuiMessage()); + } + + public override void Closed() + { + base.Closed(); + NoteWindow.Close(); } private AdminNotesWindow NoteWindow { get; } diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs index 202df1b7b3..97842261f0 100644 --- a/Content.Client/Administration/UI/PermissionsEui.cs +++ b/Content.Client/Administration/UI/PermissionsEui.cs @@ -45,6 +45,7 @@ namespace Content.Client.Administration.UI { base.Closed(); + SendMessage(new CloseEuiMessage()); CloseEverything(); } diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs index 2731aad170..c277116526 100644 --- a/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs +++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs @@ -12,6 +12,12 @@ namespace Content.Client.Administration.UI.SetOutfit public SetOutfitEui() { _window = new SetOutfitMenu(); + _window.OnClose += OnClosed; + } + + private void OnClosed() + { + SendMessage(new CloseEuiMessage()); } public override void Opened() diff --git a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs index 14eeb06386..5413b953f8 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs @@ -38,7 +38,7 @@ public sealed class SpawnExplosionEui : BaseEui public void SendClosedMessage() { - SendMessage(new SpawnExplosionEuiMsg.Close()); + SendMessage(new CloseEuiMessage()); } public void ClearOverlay() diff --git a/Content.Client/Cloning/UI/AcceptCloningEui.cs b/Content.Client/Cloning/UI/AcceptCloningEui.cs index 30f9a513df..99f4568e96 100644 --- a/Content.Client/Cloning/UI/AcceptCloningEui.cs +++ b/Content.Client/Cloning/UI/AcceptCloningEui.cs @@ -20,6 +20,8 @@ namespace Content.Client.Cloning.UI _window.Close(); }; + _window.OnClose += () => SendMessage(new AcceptCloningChoiceMessage(AcceptCloningUiButton.Deny)); + _window.AcceptButton.OnPressed += _ => { SendMessage(new AcceptCloningChoiceMessage(AcceptCloningUiButton.Accept)); diff --git a/Content.Client/CrewManifest/CrewManifestEui.cs b/Content.Client/CrewManifest/CrewManifestEui.cs index 546e8ccc99..500f91019d 100644 --- a/Content.Client/CrewManifest/CrewManifestEui.cs +++ b/Content.Client/CrewManifest/CrewManifestEui.cs @@ -16,7 +16,7 @@ public sealed class CrewManifestEui : BaseEui _window.OnClose += () => { - SendMessage(new CrewManifestEuiClosed()); + SendMessage(new CloseEuiMessage()); }; } diff --git a/Content.Client/NPC/NPCEui.cs b/Content.Client/NPC/NPCEui.cs index d5f91fb914..35b1329681 100644 --- a/Content.Client/NPC/NPCEui.cs +++ b/Content.Client/NPC/NPCEui.cs @@ -1,4 +1,5 @@ using Content.Client.Eui; +using Content.Shared.Eui; namespace Content.Client.NPC; @@ -11,6 +12,12 @@ public sealed class NPCEui : BaseEui base.Opened(); _window = new NPCWindow(); _window.OpenCentered(); + _window.OnClose += OnClosed; + } + + private void OnClosed() + { + SendMessage(new CloseEuiMessage()); } public override void Closed() diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs index a41a2b42fd..f52bf9fc4b 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs @@ -40,7 +40,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles _window.OnClose += () => { - SendMessage(new GhostRoleWindowCloseMessage()); + SendMessage(new CloseEuiMessage()); }; } diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs index 4a1357c0e5..a6d27a7793 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs @@ -70,7 +70,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles private void OnClose() { base.Closed(); - SendMessage(new MakeGhostRoleWindowClosedMessage()); + SendMessage(new CloseEuiMessage()); } } } diff --git a/Content.Server/Administration/Logs/AdminLogsEui.cs b/Content.Server/Administration/Logs/AdminLogsEui.cs index 7700f02a3b..48c76205e6 100644 --- a/Content.Server/Administration/Logs/AdminLogsEui.cs +++ b/Content.Server/Administration/Logs/AdminLogsEui.cs @@ -92,6 +92,8 @@ public sealed class AdminLogsEui : BaseEui public override async void HandleMessage(EuiMessageBase msg) { + base.HandleMessage(msg); + if (!_adminManager.HasAdminFlag(Player, AdminFlags.Logs)) { return; @@ -99,11 +101,6 @@ public sealed class AdminLogsEui : BaseEui switch (msg) { - case Close _: - { - Close(); - break; - } case LogsRequest request: { _sawmill.Info($"Admin log request from admin with id {Player.UserId.UserId} and name {Player.Name}"); diff --git a/Content.Server/Administration/Notes/AdminNotesEui.cs b/Content.Server/Administration/Notes/AdminNotesEui.cs index 5aadd1520e..d71575903b 100644 --- a/Content.Server/Administration/Notes/AdminNotesEui.cs +++ b/Content.Server/Administration/Notes/AdminNotesEui.cs @@ -58,11 +58,6 @@ public sealed class AdminNotesEui : BaseEui switch (msg) { - case Close _: - { - Close(); - break; - } case CreateNoteRequest {Message: var message}: { if (!_notesMan.CanCreate(Player)) diff --git a/Content.Server/Administration/UI/AdminAnnounceEui.cs b/Content.Server/Administration/UI/AdminAnnounceEui.cs index f316642a77..b6a6ba9984 100644 --- a/Content.Server/Administration/UI/AdminAnnounceEui.cs +++ b/Content.Server/Administration/UI/AdminAnnounceEui.cs @@ -32,11 +32,10 @@ namespace Content.Server.Administration.UI public override void HandleMessage(EuiMessageBase msg) { + base.HandleMessage(msg); + switch (msg) { - case AdminAnnounceEuiMsg.Close: - Close(); - break; case AdminAnnounceEuiMsg.DoAnnounce doAnnounce: if (!_adminManager.HasAdminFlag(Player, AdminFlags.Admin)) { diff --git a/Content.Server/Administration/UI/EditSolutionsEui.cs b/Content.Server/Administration/UI/EditSolutionsEui.cs index 419425c356..cb5ce8fbfa 100644 --- a/Content.Server/Administration/UI/EditSolutionsEui.cs +++ b/Content.Server/Administration/UI/EditSolutionsEui.cs @@ -38,15 +38,5 @@ namespace Content.Server.Administration.UI var solutions = _entityManager.GetComponentOrNull(Target)?.Solutions; return new EditSolutionsEuiState(Target, solutions); } - - public override void HandleMessage(EuiMessageBase msg) - { - switch (msg) - { - case EditSolutionsEuiMsg.Close: - Close(); - break; - } - } } } diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs index 8445636b44..82ec10577d 100644 --- a/Content.Server/Administration/UI/PermissionsEui.cs +++ b/Content.Server/Administration/UI/PermissionsEui.cs @@ -86,14 +86,10 @@ namespace Content.Server.Administration.UI public override async void HandleMessage(EuiMessageBase msg) { + base.HandleMessage(msg); + switch (msg) { - case Close _: - { - Close(); - break; - } - case AddAdmin ca: { await HandleCreateAdmin(ca); diff --git a/Content.Server/Administration/UI/SpawnExplosionEui.cs b/Content.Server/Administration/UI/SpawnExplosionEui.cs index e2c1626b23..98dc307278 100644 --- a/Content.Server/Administration/UI/SpawnExplosionEui.cs +++ b/Content.Server/Administration/UI/SpawnExplosionEui.cs @@ -14,11 +14,7 @@ public sealed class SpawnExplosionEui : BaseEui { public override void HandleMessage(EuiMessageBase msg) { - if (msg is SpawnExplosionEuiMsg.Close) - { - Close(); - return; - } + base.HandleMessage(msg); if (msg is not SpawnExplosionEuiMsg.PreviewRequest request) return; diff --git a/Content.Server/CrewManifest/CrewManifestEui.cs b/Content.Server/CrewManifest/CrewManifestEui.cs index 0f9394f53a..fbda27657d 100644 --- a/Content.Server/CrewManifest/CrewManifestEui.cs +++ b/Content.Server/CrewManifest/CrewManifestEui.cs @@ -33,18 +33,6 @@ public sealed class CrewManifestEui : BaseEui return new(name, entries); } - public override void HandleMessage(EuiMessageBase msg) - { - base.HandleMessage(msg); - - switch (msg) - { - case CrewManifestEuiClosed: - Closed(); - break; - } - } - public override void Closed() { base.Closed(); diff --git a/Content.Server/EUI/BaseEui.cs b/Content.Server/EUI/BaseEui.cs index 9f60766eb0..b569f9e87c 100644 --- a/Content.Server/EUI/BaseEui.cs +++ b/Content.Server/EUI/BaseEui.cs @@ -49,6 +49,8 @@ namespace Content.Server.EUI /// public virtual void HandleMessage(EuiMessageBase msg) { + if (msg is CloseEuiMessage) + Close(); } /// diff --git a/Content.Server/Fax/AdminUI/AdminFaxEui.cs b/Content.Server/Fax/AdminUI/AdminFaxEui.cs index 87dd44a28d..fd8942d418 100644 --- a/Content.Server/Fax/AdminUI/AdminFaxEui.cs +++ b/Content.Server/Fax/AdminUI/AdminFaxEui.cs @@ -38,13 +38,10 @@ public sealed class AdminFaxEui : BaseEui public override void HandleMessage(EuiMessageBase msg) { + base.HandleMessage(msg); + switch (msg) { - case AdminFaxEuiMsg.Close: - { - Close(); - break; - } case AdminFaxEuiMsg.Follow followData: { if (Player.AttachedEntity == null || diff --git a/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs b/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs index ea63235291..627231db9e 100644 --- a/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs +++ b/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs @@ -23,9 +23,6 @@ namespace Content.Server.Ghost.Roles.UI case GhostRoleFollowRequestMessage req: EntitySystem.Get().Follow(Player, req.Identifier); break; - case GhostRoleWindowCloseMessage _: - Closed(); - break; } } diff --git a/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs b/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs index df6608cdb2..c2f46f7c79 100644 --- a/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs +++ b/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs @@ -18,18 +18,6 @@ namespace Content.Server.Ghost.Roles.UI return new MakeGhostRoleEuiState(EntityUid); } - public override void HandleMessage(EuiMessageBase msg) - { - base.HandleMessage(msg); - - switch (msg) - { - case MakeGhostRoleWindowClosedMessage _: - Closed(); - break; - } - } - public override void Closed() { base.Closed(); diff --git a/Content.Shared/Administration/AdminAnnounceEuiState.cs b/Content.Shared/Administration/AdminAnnounceEuiState.cs index 32bfd611fb..189a603207 100644 --- a/Content.Shared/Administration/AdminAnnounceEuiState.cs +++ b/Content.Shared/Administration/AdminAnnounceEuiState.cs @@ -16,12 +16,6 @@ namespace Content.Shared.Administration public static class AdminAnnounceEuiMsg { - [Serializable, NetSerializable] - public sealed class Close : EuiMessageBase - { - - } - [Serializable, NetSerializable] public sealed class DoAnnounce : EuiMessageBase { diff --git a/Content.Shared/Administration/EditSolutionsEuiState.cs b/Content.Shared/Administration/EditSolutionsEuiState.cs index 3e72298630..218202ff3d 100644 --- a/Content.Shared/Administration/EditSolutionsEuiState.cs +++ b/Content.Shared/Administration/EditSolutionsEuiState.cs @@ -16,10 +16,4 @@ namespace Content.Shared.Administration Solutions = solutions; } } - - public static class EditSolutionsEuiMsg - { - [Serializable, NetSerializable] - public sealed class Close : EuiMessageBase { } - } } diff --git a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs index 7fb62a9c98..6e4d439c32 100644 --- a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs +++ b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs @@ -22,11 +22,6 @@ public sealed class AdminLogsEuiState : EuiStateBase public static class AdminLogsEuiMsg { - [Serializable, NetSerializable] - public sealed class Close : EuiMessageBase - { - } - [Serializable, NetSerializable] public sealed class SetLogFilter : EuiMessageBase { diff --git a/Content.Shared/Administration/Notes/AdminNotesEuiState.cs b/Content.Shared/Administration/Notes/AdminNotesEuiState.cs index 90a84b9467..ac9a8152da 100644 --- a/Content.Shared/Administration/Notes/AdminNotesEuiState.cs +++ b/Content.Shared/Administration/Notes/AdminNotesEuiState.cs @@ -24,11 +24,6 @@ public sealed class AdminNotesEuiState : EuiStateBase public static class AdminNoteEuiMsg { - [Serializable, NetSerializable] - public sealed class Close : EuiMessageBase - { - } - [Serializable, NetSerializable] public sealed class CreateNoteRequest : EuiMessageBase { diff --git a/Content.Shared/Administration/PermissionsEuiState.cs b/Content.Shared/Administration/PermissionsEuiState.cs index 428f15b536..4aa622f45e 100644 --- a/Content.Shared/Administration/PermissionsEuiState.cs +++ b/Content.Shared/Administration/PermissionsEuiState.cs @@ -33,11 +33,6 @@ namespace Content.Shared.Administration public static class PermissionsEuiMsg { - [Serializable, NetSerializable] - public sealed class Close : EuiMessageBase - { - } - [Serializable, NetSerializable] public sealed class AddAdmin : EuiMessageBase { diff --git a/Content.Shared/Administration/SpawnExplosionEuiMsg.cs b/Content.Shared/Administration/SpawnExplosionEuiMsg.cs index 38fd820996..910399a95c 100644 --- a/Content.Shared/Administration/SpawnExplosionEuiMsg.cs +++ b/Content.Shared/Administration/SpawnExplosionEuiMsg.cs @@ -7,9 +7,6 @@ namespace Content.Shared.Administration; public static class SpawnExplosionEuiMsg { - [Serializable, NetSerializable] - public sealed class Close : EuiMessageBase { } - /// /// This message is sent to the server to request explosion preview data. /// diff --git a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs index 72872708c5..0f174175fc 100644 --- a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs +++ b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs @@ -32,10 +32,6 @@ public sealed class CrewManifestEuiState : EuiStateBase } } -[Serializable, NetSerializable] -public sealed class CrewManifestEuiClosed : EuiMessageBase -{} - [Serializable, NetSerializable] public sealed class CrewManifestEntries { diff --git a/Content.Shared/Eui/EuiMessageBase.cs b/Content.Shared/Eui/EuiMessageBase.cs index 8943337d98..6ed2b7c49b 100644 --- a/Content.Shared/Eui/EuiMessageBase.cs +++ b/Content.Shared/Eui/EuiMessageBase.cs @@ -1,8 +1,15 @@ -namespace Content.Shared.Eui +using Robust.Shared.Serialization; + +namespace Content.Shared.Eui { [Serializable] public abstract class EuiMessageBase { } + + [Serializable, NetSerializable] + public sealed class CloseEuiMessage : EuiMessageBase + { + } } diff --git a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs index d527620529..31672c7a9e 100644 --- a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs +++ b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs @@ -44,9 +44,4 @@ namespace Content.Shared.Ghost.Roles Identifier = identifier; } } - - [NetSerializable, Serializable] - public sealed class GhostRoleWindowCloseMessage : EuiMessageBase - { - } } diff --git a/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs deleted file mode 100644 index ff9830da67..0000000000 --- a/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Content.Shared.Eui; -using Robust.Shared.Serialization; - -namespace Content.Shared.Ghost.Roles -{ - [Serializable, NetSerializable] - public sealed class MakeGhostRoleWindowClosedMessage : EuiMessageBase - { - } -}