From c67160ae19ae193c578f9202674412615fa9961f Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Wed, 27 Oct 2021 18:10:40 +0200 Subject: [PATCH] Disable warnings that would be refactored anyway (#5047) --- .../Actions/ClientActionsComponent.cs | 8 ++++++++ Content.Client/Alerts/ClientAlertsComponent.cs | 2 ++ Content.Client/Camera/CameraRecoilComponent.cs | 1 + .../Components/CharacterInfoComponent.cs | 4 ++++ Content.Client/DoAfter/DoAfterComponent.cs | 1 + .../Instruments/InstrumentComponent.cs | 7 +++++++ .../Inventory/ClientInventoryComponent.cs | 8 ++++++++ .../Components/LightBehaviourComponent.cs | 2 ++ .../Components/ContainmentFieldComponent.cs | 2 ++ .../Storage/ClientStorageComponent.cs | 8 ++++++++ .../ClientMagazineBarrelComponent.cs | 1 + .../Ranged/ClientRangedWeaponComponent.cs | 2 ++ .../AME/Components/AMEControllerComponent.cs | 4 ++++ .../Actions/ServerActionsComponent.cs | 1 + Content.Server/Alert/ServerAlertsComponent.cs | 1 + .../Components/BlockGameArcadeComponent.cs | 3 +++ .../Components/SpaceVillainArcadeComponent.cs | 4 ++++ .../BaseComputerUserInterfaceComponent.cs | 4 ++++ .../Atmos/Components/GasTankComponent.cs | 2 ++ .../Surgery/Components/SurgeryToolComponent.cs | 2 ++ .../Messages/SurgeryWindowOpenMessage.cs | 2 ++ .../Botany/Components/PlantHolderComponent.cs | 2 ++ .../Botany/Components/SeedComponent.cs | 2 ++ .../Buckle/Components/BuckleComponent.cs | 4 ++++ .../Buckle/Components/StrapComponent.cs | 4 ++++ Content.Server/Camera/CameraRecoilComponent.cs | 2 ++ .../Cargo/Components/CargoTelepadComponent.cs | 4 ++++ .../CharacterInfo/CharacterInfoComponent.cs | 6 +++++- .../Components/ChemMasterComponent.cs | 3 +++ .../Components/ReagentDispenserComponent.cs | 3 +++ .../Climbing/Components/ClimbingComponent.cs | 5 ++++- Content.Server/Computer/ComputerComponent.cs | 4 ++++ .../Configurable/ConfigurationComponent.cs | 2 ++ .../Components/MachineBoardComponent.cs | 2 ++ .../Components/MachinePartComponent.cs | 2 ++ Content.Server/DoAfter/DoAfterComponent.cs | 2 ++ .../Electrocution/ElectrocutionSystem.cs | 4 ++-- .../Hands/Components/HandsComponent.cs | 2 ++ Content.Server/Headset/HeadsetComponent.cs | 2 ++ .../Instruments/InstrumentComponent.cs | 13 +++++++++++++ .../Interaction/InteractionSystem.cs | 4 ++++ .../Inventory/Components/InventoryComponent.cs | 1 + .../Components/EmergencyLightComponent.cs | 7 +++++++ .../Light/Components/HandheldLightComponent.cs | 2 ++ .../Mind/Components/MindComponent.cs | 2 ++ .../BodyBagEntityStorageComponent.cs | 2 ++ .../CrematoriumEntityStorageComponent.cs | 2 ++ .../Components/MorgueEntityStorageComponent.cs | 2 ++ .../NodeContainer/NodeContainerComponent.cs | 2 ++ .../Nutrition/Components/DrinkComponent.cs | 2 ++ .../Components/SliceableFoodComponent.cs | 2 ++ Content.Server/Paper/PaperComponent.cs | 2 ++ .../ParticleAcceleratorControlBoxComponent.cs | 3 +++ .../Components/ApcPowerReceiverComponent.cs | 6 ++++++ Content.Server/Power/Components/BaseCharger.cs | 3 +++ .../Components/ExaminableBatteryComponent.cs | 2 ++ .../PowerCell/Components/PowerCellComponent.cs | 2 ++ .../Components/PowerCellSlotComponent.cs | 2 ++ .../Radio/Components/HandheldRadioComponent.cs | 2 ++ .../Components/ServerStorageComponent.cs | 13 +++++++++++++ .../Suspicion/SuspicionRoleComponent.cs | 2 ++ Content.Server/Toilet/ToiletComponent.cs | 2 ++ .../VendingMachines/VendingMachineComponent.cs | 3 +++ Content.Server/Warps/WarpPointComponent.cs | 2 ++ .../Ammunition/Components/AmmoBoxComponent.cs | 2 ++ .../Ammunition/Components/AmmoComponent.cs | 2 ++ .../Components/ChemicalAmmoComponent.cs | 4 ++++ .../Components/RangedMagazineComponent.cs | 2 ++ .../Components/BoltActionBarrelComponent.cs | 2 ++ .../ServerMagazineBarrelComponent.cs | 4 ++++ .../Components/ServerRangedBarrelComponent.cs | 6 ++++++ .../Ranged/ServerRangedWeaponComponent.cs | 1 + Content.Server/Window/WindowComponent.cs | 2 ++ Content.Server/WireHacking/WiresComponent.cs | 2 ++ .../Components/SharedActionsComponent.cs | 2 ++ Content.Shared/Actions/IActionAttempt.cs | 18 ++++++++++++++++++ Content.Shared/Alert/SharedAlertsComponent.cs | 2 ++ .../Buckle/Components/SharedBuckleComponent.cs | 2 ++ .../Buckle/Components/SharedStrapComponent.cs | 2 ++ .../Camera/SharedCameraRecoilComponent.cs | 2 ++ .../SharedCharacterInfoComponent.cs | 4 ++++ .../SharedConfigurationComponent.cs | 2 ++ .../DoAfter/SharedDoAfterComponent.cs | 2 ++ .../Instruments/SharedInstrumentComponent.cs | 6 ++++++ .../Interaction/SharedInteractionSystem.cs | 2 ++ .../Inventory/SharedInventoryComponent.cs | 4 ++++ .../MobState/Components/MobStateComponent.cs | 2 ++ .../MobState/MobStateChangedMessage.cs | 2 ++ .../Preferences/HumanoidCharacterProfile.cs | 1 - .../Singularity/SingularitySoundMessage.cs | 2 ++ .../Storage/SharedStorageComponent.cs | 12 ++++++++++++ .../Components/SharedRangedWeaponComponent.cs | 2 ++ .../Weapons/Ranged/MagazineAutoEjectMessage.cs | 2 ++ 93 files changed, 302 insertions(+), 5 deletions(-) diff --git a/Content.Client/Actions/ClientActionsComponent.cs b/Content.Client/Actions/ClientActionsComponent.cs index 2eed684ae9..69858c3bb9 100644 --- a/Content.Client/Actions/ClientActionsComponent.cs +++ b/Content.Client/Actions/ClientActionsComponent.cs @@ -113,7 +113,9 @@ namespace Content.Client.Actions { case BehaviorType.Instant: // for instant actions, we immediately tell the server we're doing it +#pragma warning disable 618 SendNetworkMessage(attempt.PerformInstantActionMessage()); +#pragma warning restore 618 break; case BehaviorType.Toggle: // for toggle actions, we immediately tell the server we're toggling it. @@ -123,7 +125,9 @@ namespace Content.Client.Actions // even if it sometimes may not (it will be reset by the server if wrong). attempt.ToggleAction(this, !actionState.ToggledOn); slot.ToggledOn = !actionState.ToggledOn; +#pragma warning disable 618 SendNetworkMessage(attempt.PerformToggleActionMessage(!actionState.ToggledOn)); +#pragma warning restore 618 } else { @@ -178,7 +182,9 @@ namespace Content.Client.Actions case BehaviorType.TargetPoint: { // send our action to the server, we chose our target +#pragma warning disable 618 SendNetworkMessage(attempt.PerformTargetPointActionMessage(args)); +#pragma warning restore 618 if (!attempt.Action.Repeat) { _ui.StopTargeting(); @@ -189,7 +195,9 @@ namespace Content.Client.Actions case BehaviorType.TargetEntity when args.EntityUid != EntityUid.Invalid: { // send our action to the server, we chose our target +#pragma warning disable 618 SendNetworkMessage(attempt.PerformTargetEntityActionMessage(args)); +#pragma warning restore 618 if (!attempt.Action.Repeat) { _ui.StopTargeting(); diff --git a/Content.Client/Alerts/ClientAlertsComponent.cs b/Content.Client/Alerts/ClientAlertsComponent.cs index 9032241797..7f400dce25 100644 --- a/Content.Client/Alerts/ClientAlertsComponent.cs +++ b/Content.Client/Alerts/ClientAlertsComponent.cs @@ -208,7 +208,9 @@ namespace Content.Client.Alerts return; } +#pragma warning disable 618 SendNetworkMessage(new ClickAlertMessage(alert.Alert.AlertType)); +#pragma warning restore 618 } protected override void AfterShowAlert() diff --git a/Content.Client/Camera/CameraRecoilComponent.cs b/Content.Client/Camera/CameraRecoilComponent.cs index 016c9122b8..2a1c95c61d 100644 --- a/Content.Client/Camera/CameraRecoilComponent.cs +++ b/Content.Client/Camera/CameraRecoilComponent.cs @@ -56,6 +56,7 @@ namespace Content.Client.Camera _updateEye(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs index fd0c1d5463..575911174a 100644 --- a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs +++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs @@ -1,3 +1,4 @@ +using System; using Content.Client.CharacterInterface; using Content.Client.HUD.UI; using Content.Client.Stylesheets; @@ -35,9 +36,12 @@ namespace Content.Client.CharacterInfo.Components public void Opened() { +#pragma warning disable 618 SendNetworkMessage(new RequestCharacterInfoMessage()); +#pragma warning restore 618 } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { base.HandleNetworkMessage(message, netChannel, session); diff --git a/Content.Client/DoAfter/DoAfterComponent.cs b/Content.Client/DoAfter/DoAfterComponent.cs index 737de68901..879b15fbbc 100644 --- a/Content.Client/DoAfter/DoAfterComponent.cs +++ b/Content.Client/DoAfter/DoAfterComponent.cs @@ -22,6 +22,7 @@ namespace Content.Client.DoAfter public DoAfterGui? Gui { get; set; } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { base.HandleNetworkMessage(message, netChannel, session); diff --git a/Content.Client/Instruments/InstrumentComponent.cs b/Content.Client/Instruments/InstrumentComponent.cs index 66f5ddd458..ebc29866eb 100644 --- a/Content.Client/Instruments/InstrumentComponent.cs +++ b/Content.Client/Instruments/InstrumentComponent.cs @@ -229,7 +229,9 @@ namespace Content.Client.Instruments if (!fromStateChange) { +#pragma warning disable 618 SendNetworkMessage(new InstrumentStartMidiMessage()); +#pragma warning restore 618 } } @@ -258,7 +260,9 @@ namespace Content.Client.Instruments if (!fromStateChange && IoCManager.Resolve().IsConnected) { +#pragma warning disable 618 SendNetworkMessage(new InstrumentStopMidiMessage()); +#pragma warning restore 618 } } @@ -268,6 +272,7 @@ namespace Content.Client.Instruments EndRenderer(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); @@ -472,7 +477,9 @@ namespace Content.Client.Instruments if (eventCount == 0) return; +#pragma warning disable 618 SendNetworkMessage(new InstrumentMidiEventMessage(events)); +#pragma warning restore 618 _sentWithinASec += eventCount; diff --git a/Content.Client/Inventory/ClientInventoryComponent.cs b/Content.Client/Inventory/ClientInventoryComponent.cs index a4e378b1a7..3a653a67f7 100644 --- a/Content.Client/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/Inventory/ClientInventoryComponent.cs @@ -232,23 +232,31 @@ namespace Content.Client.Inventory public void SendEquipMessage(Slots slot) { var equipMessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Equip); +#pragma warning disable 618 SendNetworkMessage(equipMessage); +#pragma warning restore 618 } public void SendUseMessage(Slots slot) { var equipmessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Use); +#pragma warning disable 618 SendNetworkMessage(equipmessage); +#pragma warning restore 618 } public void SendHoverMessage(Slots slot) { +#pragma warning disable 618 SendNetworkMessage(new ClientInventoryMessage(slot, ClientInventoryUpdate.Hover)); +#pragma warning restore 618 } public void SendOpenStorageUIMessage(Slots slot) { +#pragma warning disable 618 SendNetworkMessage(new OpenSlotStorageUIMessage(slot)); +#pragma warning restore 618 } public void PlayerDetached() diff --git a/Content.Client/Light/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs index 4195f6b8f2..2d8ec140ad 100644 --- a/Content.Client/Light/Components/LightBehaviourComponent.cs +++ b/Content.Client/Light/Components/LightBehaviourComponent.cs @@ -395,7 +395,9 @@ namespace Content.Client.Light.Components if (Owner.TryGetComponent(out AnimationPlayerComponent? animation)) { +#pragma warning disable 618 animation.AnimationCompleted += OnAnimationCompleted; +#pragma warning restore 618 } foreach (var container in _animations) diff --git a/Content.Client/Singularity/Components/ContainmentFieldComponent.cs b/Content.Client/Singularity/Components/ContainmentFieldComponent.cs index 0222b3a226..12228d3436 100644 --- a/Content.Client/Singularity/Components/ContainmentFieldComponent.cs +++ b/Content.Client/Singularity/Components/ContainmentFieldComponent.cs @@ -23,7 +23,9 @@ namespace Content.Client.Singularity.Components } else { +#pragma warning disable 618 _spriteComponent.Directional = false; +#pragma warning restore 618 } } } diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs index ed5d05ace2..fe8d9c9c62 100644 --- a/Content.Client/Storage/ClientStorageComponent.cs +++ b/Content.Client/Storage/ClientStorageComponent.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using Content.Client.Animations; @@ -79,6 +80,7 @@ namespace Content.Client.Storage .ToList(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); @@ -180,7 +182,9 @@ namespace Content.Client.Storage { if (buttonEventArgs.Event.Function == EngineKeyFunctions.UIClick) { +#pragma warning disable 618 SendNetworkMessage(new RemoveEntityMessage(entityUid)); +#pragma warning restore 618 buttonEventArgs.Event.Handle(); } else if (Owner.EntityManager.TryGetEntity(entityUid, out var entity)) @@ -281,7 +285,9 @@ namespace Content.Client.Storage if (controlledEntity?.TryGetComponent(out HandsComponent? hands) ?? false) { +#pragma warning disable 618 StorageEntity.SendNetworkMessage(new InsertEntityMessage()); +#pragma warning restore 618 } }; @@ -316,7 +322,9 @@ namespace Content.Client.Storage public override void Close() { +#pragma warning disable 618 StorageEntity.SendNetworkMessage(new CloseStorageUIMessage()); +#pragma warning restore 618 base.Close(); } diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs index cd3701dcdb..cec82d5120 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs +++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs @@ -104,6 +104,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components _statusControl?.Update(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); diff --git a/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs index e327931bc1..9f21407bf0 100644 --- a/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs +++ b/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs @@ -33,7 +33,9 @@ namespace Content.Client.Weapons.Ranged public void SyncFirePos(GridId targetGrid, Vector2 targetPosition) { +#pragma warning disable 618 SendNetworkMessage(new FirePosComponentMessage(targetGrid, targetPosition)); +#pragma warning restore 618 } } } diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs index 6040fd00d1..cfa3b84d5c 100644 --- a/Content.Server/AME/Components/AMEControllerComponent.cs +++ b/Content.Server/AME/Components/AMEControllerComponent.cs @@ -1,3 +1,4 @@ +using System; using System.Linq; using System.Threading.Tasks; using Content.Server.Hands.Components; @@ -62,9 +63,12 @@ namespace Content.Server.AME.Components _jarSlot = ContainerHelpers.EnsureContainer(Owner, $"{Name}-fuelJarContainer"); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Actions/ServerActionsComponent.cs b/Content.Server/Actions/ServerActionsComponent.cs index 5aad2a8095..afc860891e 100644 --- a/Content.Server/Actions/ServerActionsComponent.cs +++ b/Content.Server/Actions/ServerActionsComponent.cs @@ -22,6 +22,7 @@ namespace Content.Server.Actions { [Dependency] private readonly IServerGameStateManager _stateManager = default!; + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { base.HandleNetworkMessage(message, netChannel, session); diff --git a/Content.Server/Alert/ServerAlertsComponent.cs b/Content.Server/Alert/ServerAlertsComponent.cs index 8df61ffff4..f619292635 100644 --- a/Content.Server/Alert/ServerAlertsComponent.cs +++ b/Content.Server/Alert/ServerAlertsComponent.cs @@ -41,6 +41,7 @@ namespace Content.Server.Alert base.OnRemove(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { base.HandleNetworkMessage(message, netChannel, session); diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs index dc9025f18c..d69742447b 100644 --- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs +++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs @@ -33,9 +33,12 @@ namespace Content.Server.Arcade.Components private IPlayerSession? _player; private readonly List _spectators = new(); + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index a9018095fb..7b17a5941e 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using Content.Server.Power.Components; using Content.Server.UserInterface; @@ -101,9 +102,12 @@ namespace Content.Server.Arcade.Components } } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs b/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs index d5e28c2b9a..ad039ca917 100644 --- a/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs +++ b/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs @@ -1,3 +1,4 @@ +using System; using Content.Server.Power.Components; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; @@ -82,9 +83,12 @@ namespace Content.Server.GameObjects.Components // Nothing! } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs index a9078707e7..1562433aae 100644 --- a/Content.Server/Atmos/Components/GasTankComponent.cs +++ b/Content.Server/Atmos/Components/GasTankComponent.cs @@ -32,7 +32,9 @@ namespace Content.Server.Atmos.Components { [RegisterComponent] [ComponentReference(typeof(IActivate))] +#pragma warning disable 618 public class GasTankComponent : Component, IExamine, IGasMixtureHolder, IUse, IDropped, IActivate +#pragma warning restore 618 { public override string Name => "GasTank"; diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs index 58e01a5c02..02690a615d 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs @@ -157,7 +157,9 @@ namespace Content.Server.Body.Surgery.Components var message = new SurgeryWindowOpenMessage(this); +#pragma warning disable 618 SendMessage(message); +#pragma warning restore 618 Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, message); } diff --git a/Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs b/Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs index b0238d4337..1c305079d6 100644 --- a/Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs +++ b/Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs @@ -3,7 +3,9 @@ using Robust.Shared.GameObjects; namespace Content.Server.Body.Surgery.Messages { +#pragma warning disable 618 public class SurgeryWindowOpenMessage : ComponentMessage +#pragma warning restore 618 { public SurgeryWindowOpenMessage(SurgeryToolComponent tool) { diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index 9635ae24eb..cd94fa1951 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -33,7 +33,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Botany.Components { [RegisterComponent] +#pragma warning disable 618 public class PlantHolderComponent : Component, IInteractUsing, IInteractHand, IActivate, IExamine +#pragma warning restore 618 { public const float HydroponicsSpeedMultiplier = 1f; public const float HydroponicsConsumptionMultiplier = 4f; diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs index b535d28583..5131e76117 100644 --- a/Content.Server/Botany/Components/SeedComponent.cs +++ b/Content.Server/Botany/Components/SeedComponent.cs @@ -10,7 +10,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Botany.Components { [RegisterComponent] +#pragma warning disable 618 public class SeedComponent : Component, IExamine +#pragma warning restore 618 { public override string Name => "Seed"; diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index b181d6b685..089e5631e9 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -251,7 +251,9 @@ namespace Content.Server.Buckle.Components UpdateBuckleStatus(); +#pragma warning disable 618 SendMessage(new BuckleMessage(Owner, to)); +#pragma warning restore 618 if (Owner.TryGetComponent(out SharedPullableComponent? ownerPullable)) { @@ -340,7 +342,9 @@ namespace Content.Server.Buckle.Components oldBuckledTo.Remove(this); SoundSystem.Play(Filter.Pvs(Owner), oldBuckledTo.UnbuckleSound.GetSound(), Owner); +#pragma warning disable 618 SendMessage(new UnbuckleMessage(Owner, oldBuckledTo.Owner)); +#pragma warning restore 618 return true; } diff --git a/Content.Server/Buckle/Components/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs index a94f1d6f28..33a9dcdef4 100644 --- a/Content.Server/Buckle/Components/StrapComponent.cs +++ b/Content.Server/Buckle/Components/StrapComponent.cs @@ -109,7 +109,9 @@ namespace Content.Server.Buckle.Components buckle.Appearance?.SetData(StrapVisuals.RotationAngle, _rotation); +#pragma warning disable 618 SendMessage(new StrapMessage(buckle.Owner, Owner)); +#pragma warning restore 618 return true; } @@ -124,7 +126,9 @@ namespace Content.Server.Buckle.Components if (_buckledEntities.Remove(buckle.Owner)) { _occupiedSize -= buckle.Size; +#pragma warning disable 618 SendMessage(new UnStrapMessage(buckle.Owner, Owner)); +#pragma warning restore 618 } } diff --git a/Content.Server/Camera/CameraRecoilComponent.cs b/Content.Server/Camera/CameraRecoilComponent.cs index 3064f1f50b..0d7c19dad9 100644 --- a/Content.Server/Camera/CameraRecoilComponent.cs +++ b/Content.Server/Camera/CameraRecoilComponent.cs @@ -11,7 +11,9 @@ namespace Content.Server.Camera public override void Kick(Vector2 recoil) { var msg = new RecoilKickMessage(recoil); +#pragma warning disable 618 SendNetworkMessage(msg); +#pragma warning restore 618 } } } diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index 30becc9650..56d0d28300 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using Content.Server.Power.Components; using Content.Shared.Cargo; @@ -24,9 +25,12 @@ namespace Content.Server.Cargo.Components private CargoTelepadState _currentState = CargoTelepadState.Unpowered; [DataField("teleportSound")] private SoundSpecifier _teleportSound = new SoundPathSpecifier("/Audio/Machines/phasein.ogg"); + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/CharacterInfo/CharacterInfoComponent.cs b/Content.Server/CharacterInfo/CharacterInfoComponent.cs index ca63dbee07..3613fb2fe3 100644 --- a/Content.Server/CharacterInfo/CharacterInfoComponent.cs +++ b/Content.Server/CharacterInfo/CharacterInfoComponent.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Content.Server.Mind.Components; using Content.Server.Roles; using Content.Shared.CharacterInfo; @@ -12,6 +13,7 @@ namespace Content.Server.CharacterInfo [RegisterComponent] public class CharacterInfoComponent : SharedCharacterInfoComponent { + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { if(session?.AttachedEntity != Owner) return; @@ -50,7 +52,9 @@ namespace Content.Server.CharacterInfo } } } +#pragma warning disable 618 SendNetworkMessage(new CharacterInfoMessage(jobTitle, conditions)); +#pragma warning restore 618 break; } } diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index fa1401e7a5..8946ba7bda 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -81,9 +81,12 @@ namespace Content.Server.Chemistry.Components UpdateUserInterface(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage: diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 9d338e7132..d892100ff5 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -90,9 +90,12 @@ namespace Content.Server.Chemistry.Components UpdateUserInterface(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Climbing/Components/ClimbingComponent.cs b/Content.Server/Climbing/Components/ClimbingComponent.cs index 3b5f6b3c68..94071dec59 100644 --- a/Content.Server/Climbing/Components/ClimbingComponent.cs +++ b/Content.Server/Climbing/Components/ClimbingComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Shared.Buckle.Components; using Content.Shared.Climbing; using Robust.Shared.GameObjects; @@ -52,9 +52,12 @@ namespace Content.Server.Climbing.Components } } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case BuckleMessage msg: diff --git a/Content.Server/Computer/ComputerComponent.cs b/Content.Server/Computer/ComputerComponent.cs index f20c1e5153..055ad41447 100644 --- a/Content.Server/Computer/ComputerComponent.cs +++ b/Content.Server/Computer/ComputerComponent.cs @@ -1,3 +1,4 @@ +using System; using Content.Server.Construction; using Content.Server.Construction.Components; using Content.Server.Power.Components; @@ -32,9 +33,12 @@ namespace Content.Server.Computer } } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Configurable/ConfigurationComponent.cs b/Content.Server/Configurable/ConfigurationComponent.cs index 3d25932855..570c193a95 100644 --- a/Content.Server/Configurable/ConfigurationComponent.cs +++ b/Content.Server/Configurable/ConfigurationComponent.cs @@ -107,7 +107,9 @@ namespace Content.Server.Configurable _config[key] = value; } +#pragma warning disable 618 SendMessage(new ConfigUpdatedComponentMessage(config)); +#pragma warning restore 618 } } diff --git a/Content.Server/Construction/Components/MachineBoardComponent.cs b/Content.Server/Construction/Components/MachineBoardComponent.cs index d67216aece..9a9cfda649 100644 --- a/Content.Server/Construction/Components/MachineBoardComponent.cs +++ b/Content.Server/Construction/Components/MachineBoardComponent.cs @@ -13,7 +13,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Construction.Components { [RegisterComponent] +#pragma warning disable 618 public class MachineBoardComponent : Component, IExamine +#pragma warning restore 618 { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; diff --git a/Content.Server/Construction/Components/MachinePartComponent.cs b/Content.Server/Construction/Components/MachinePartComponent.cs index 8286cbe601..d5f129df3f 100644 --- a/Content.Server/Construction/Components/MachinePartComponent.cs +++ b/Content.Server/Construction/Components/MachinePartComponent.cs @@ -9,7 +9,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Construction.Components { [RegisterComponent] +#pragma warning disable 618 public class MachinePartComponent : Component, IExamine +#pragma warning restore 618 { // I'm so sorry for hard-coding this. But trust me, it should make things less painful. public static IReadOnlyDictionary Prototypes { get; } = new Dictionary() diff --git a/Content.Server/DoAfter/DoAfterComponent.cs b/Content.Server/DoAfter/DoAfterComponent.cs index a5eb96ce23..572c141216 100644 --- a/Content.Server/DoAfter/DoAfterComponent.cs +++ b/Content.Server/DoAfter/DoAfterComponent.cs @@ -52,7 +52,9 @@ namespace Content.Server.DoAfter return; _doAfters.Remove(doAfter); +#pragma warning disable 618 SendNetworkMessage(new CancelledDoAfterMessage(index)); +#pragma warning restore 618 } /// diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index 57a4ed1f9e..252f13a102 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -46,8 +46,8 @@ namespace Content.Server.Electrocution [Dependency] private readonly DamageableSystem _damageableSystem = default!; [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!; - protected const string StatusEffectKey = "Electrocution"; - protected const string DamageType = "Shock"; + private const string StatusEffectKey = "Electrocution"; + private const string DamageType = "Shock"; // Yes, this is absurdly small for a reason. private const float ElectrifiedDamagePerWatt = 0.0015f; diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs index 021ebe3a01..cbda6dfee9 100644 --- a/Content.Server/Hands/Components/HandsComponent.cs +++ b/Content.Server/Hands/Components/HandsComponent.cs @@ -28,7 +28,9 @@ namespace Content.Server.Hands.Components [ComponentReference(typeof(IHandsComponent))] [ComponentReference(typeof(ISharedHandsComponent))] [ComponentReference(typeof(SharedHandsComponent))] +#pragma warning disable 618 public class HandsComponent : SharedHandsComponent, IHandsComponent, IBodyPartAdded, IBodyPartRemoved, IDisarmedAct +#pragma warning restore 618 { [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs index 7d8d2b4218..5256d9c8e1 100644 --- a/Content.Server/Headset/HeadsetComponent.cs +++ b/Content.Server/Headset/HeadsetComponent.cs @@ -18,7 +18,9 @@ namespace Content.Server.Headset [RegisterComponent] [ComponentReference(typeof(IRadio))] [ComponentReference(typeof(IListen))] +#pragma warning disable 618 public class HeadsetComponent : Component, IListen, IRadio, IExamine +#pragma warning restore 618 { [Dependency] private readonly IServerNetManager _netManager = default!; diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index bcbdf76fd0..bfc9c7ab66 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -178,6 +178,7 @@ namespace Content.Server.Instruments return new InstrumentState(Playing, InstrumentProgram, InstrumentBank, AllowPercussion, AllowProgramChange, RespectMidiLimits, _lastSequencerTick); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); @@ -227,7 +228,9 @@ namespace Content.Server.Instruments if (send || !_respectMidiLimits) { +#pragma warning disable 618 SendNetworkMessage(midiEventMsg); +#pragma warning restore 618 } var maxTick = midiEventMsg.MidiEvent.Max(x => x.Tick); @@ -258,7 +261,9 @@ namespace Content.Server.Instruments void IDropped.Dropped(DroppedEventArgs eventArgs) { Clean(); +#pragma warning disable 618 SendNetworkMessage(new InstrumentStopMidiMessage()); +#pragma warning restore 618 InstrumentPlayer = null; UserInterface?.CloseAll(); } @@ -266,7 +271,9 @@ namespace Content.Server.Instruments void IThrown.Thrown(ThrownEventArgs eventArgs) { Clean(); +#pragma warning disable 618 SendNetworkMessage(new InstrumentStopMidiMessage()); +#pragma warning restore 618 InstrumentPlayer = null; UserInterface?.CloseAll(); } @@ -286,7 +293,9 @@ namespace Content.Server.Instruments void IHandDeselected.HandDeselected(HandDeselectedEventArgs eventArgs) { Clean(); +#pragma warning disable 618 SendNetworkMessage(new InstrumentStopMidiMessage()); +#pragma warning restore 618 UserInterface?.CloseAll(); } @@ -324,7 +333,9 @@ namespace Content.Server.Instruments Clean(); InstrumentPlayer = null; +#pragma warning disable 618 SendNetworkMessage(new InstrumentStopMidiMessage()); +#pragma warning restore 618 } private void OpenUserInterface(IPlayerSession session) @@ -354,7 +365,9 @@ namespace Content.Server.Instruments { var mob = InstrumentPlayer.AttachedEntity; +#pragma warning disable 618 SendNetworkMessage(new InstrumentStopMidiMessage()); +#pragma warning restore 618 Playing = false; UserInterface?.CloseAll(); diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index ea8eaf19b8..4d1349fb9d 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -411,7 +411,9 @@ namespace Content.Server.Interaction foreach (var interactHandComp in interactHandComps) { // If an InteractHand returns a status completion we finish our interaction +#pragma warning disable 618 if (interactHandComp.InteractHand(interactHandEventArgs)) +#pragma warning restore 618 return; } @@ -442,7 +444,9 @@ namespace Content.Server.Interaction foreach (var t in rangedInteractions) { // If an InteractUsingRanged returns a status completion we finish our interaction +#pragma warning disable 618 if (t.RangedInteract(rangedInteractionEventArgs)) +#pragma warning restore 618 return true; } } diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs index 0e7f3e00c8..cb2d4d6056 100644 --- a/Content.Server/Inventory/Components/InventoryComponent.cs +++ b/Content.Server/Inventory/Components/InventoryComponent.cs @@ -528,6 +528,7 @@ namespace Content.Server.Inventory.Components } /// + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs index 51a07c67d2..9ab0361cdd 100644 --- a/Content.Server/Light/Components/EmergencyLightComponent.cs +++ b/Content.Server/Light/Components/EmergencyLightComponent.cs @@ -16,7 +16,9 @@ namespace Content.Server.Light.Components /// Component that represents an emergency light, it has an internal battery that charges when the power is on. /// [RegisterComponent] +#pragma warning disable 618 public class EmergencyLightComponent : SharedEmergencyLightComponent, IExamine +#pragma warning restore 618 { [ViewVariables] private EmergencyLightState State @@ -127,9 +129,14 @@ namespace Content.Server.Light.Components appearance.SetData(EmergencyLightVisuals.On, true); } +#pragma warning disable 618 + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) +#pragma warning restore 618 { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index 4ee50002c7..e728a30a2e 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/Content.Server/Light/Components/HandheldLightComponent.cs @@ -31,7 +31,9 @@ namespace Content.Server.Light.Components /// Component that represents a powered handheld light source which can be toggled on and off. /// [RegisterComponent] +#pragma warning disable 618 internal sealed class HandheldLightComponent : SharedHandheldLightComponent, IUse, IExamine, IInteractUsing +#pragma warning restore 618 { [ViewVariables(VVAccess.ReadWrite)] [DataField("wattage")] public float Wattage { get; set; } = 3f; [ViewVariables] private PowerCellSlotComponent _cellSlot = default!; diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs index 987e04db63..7331cc5607 100644 --- a/Content.Server/Mind/Components/MindComponent.cs +++ b/Content.Server/Mind/Components/MindComponent.cs @@ -18,7 +18,9 @@ namespace Content.Server.Mind.Components /// Stores a on a mob. /// [RegisterComponent] +#pragma warning disable 618 public class MindComponent : Component, IExamine +#pragma warning restore 618 { /// public override string Name => "Mind"; diff --git a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs index 55bf3ff6be..73b4586842 100644 --- a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs @@ -22,7 +22,9 @@ namespace Content.Server.Morgue.Components [ComponentReference(typeof(EntityStorageComponent))] [ComponentReference(typeof(IActivate))] [ComponentReference(typeof(IStorageComponent))] +#pragma warning disable 618 public class BodyBagEntityStorageComponent : EntityStorageComponent, IExamine, IInteractUsing +#pragma warning restore 618 { public override string Name => "BodyBagEntityStorage"; diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index ad0445578d..a8405e6b96 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -27,7 +27,9 @@ namespace Content.Server.Morgue.Components [ComponentReference(typeof(EntityStorageComponent))] [ComponentReference(typeof(IActivate))] [ComponentReference(typeof(IStorageComponent))] +#pragma warning disable 618 public class CrematoriumEntityStorageComponent : MorgueEntityStorageComponent, IExamine, ISuicideAct +#pragma warning restore 618 { public override string Name => "CrematoriumEntityStorage"; diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index 77b6ce95f1..a0e9701dde 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -29,7 +29,9 @@ namespace Content.Server.Morgue.Components [ComponentReference(typeof(EntityStorageComponent))] [ComponentReference(typeof(IActivate))] [ComponentReference(typeof(IStorageComponent))] +#pragma warning disable 618 public class MorgueEntityStorageComponent : EntityStorageComponent, IExamine +#pragma warning restore 618 { public override string Name => "MorgueEntityStorage"; diff --git a/Content.Server/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs index 391477d4da..b7ac0122b3 100644 --- a/Content.Server/NodeContainer/NodeContainerComponent.cs +++ b/Content.Server/NodeContainer/NodeContainerComponent.cs @@ -15,7 +15,9 @@ namespace Content.Server.NodeContainer /// Creates and maintains a set of s. /// [RegisterComponent] +#pragma warning disable 618 public class NodeContainerComponent : Component, IExamine +#pragma warning restore 618 { public override string Name => "NodeContainer"; diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index 1151fbc97d..31b38c3f98 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -25,7 +25,9 @@ using System.Threading.Tasks; namespace Content.Server.Nutrition.Components { [RegisterComponent] +#pragma warning disable 618 public class DrinkComponent : Component, IUse, IAfterInteract, IExamine +#pragma warning restore 618 { [DataField("solution")] public string SolutionName { get; set; } = DefaultSolutionName; diff --git a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs index 4b6be73b54..f82eaea523 100644 --- a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs +++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs @@ -19,7 +19,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Nutrition.Components { [RegisterComponent] +#pragma warning disable 618 class SliceableFoodComponent : Component, IInteractUsing, IExamine +#pragma warning restore 618 { public override string Name => "SliceableFood"; diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs index 63ed32864f..5c7a3a72b8 100644 --- a/Content.Server/Paper/PaperComponent.cs +++ b/Content.Server/Paper/PaperComponent.cs @@ -14,7 +14,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Paper { [RegisterComponent] +#pragma warning disable 618 public class PaperComponent : SharedPaperComponent, IExamine, IInteractUsing, IUse +#pragma warning restore 618 { private PaperAction _mode; [DataField("content")] diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs index f754e200c2..f3e59f2cd3 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs @@ -112,9 +112,12 @@ namespace Content.Server.ParticleAccelerator.Components _apcPowerReceiverComponent!.Load = 250; } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs index 474c414ab7..ee258033b8 100644 --- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs +++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs @@ -21,7 +21,9 @@ namespace Content.Server.Power.Components /// so that it can receive power from a . /// [RegisterComponent] +#pragma warning disable 618 public class ApcPowerReceiverComponent : Component, IExamine +#pragma warning restore 618 { public override string Name => "ApcPowerReceiver"; @@ -84,7 +86,9 @@ namespace Content.Server.Power.Components private void OnNewPowerState() { +#pragma warning disable 618 SendMessage(new PowerChangedMessage(Powered)); +#pragma warning restore 618 Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerChangedEvent(Powered)); if (Owner.TryGetComponent(out var appearance)) @@ -104,7 +108,9 @@ namespace Content.Server.Power.Components } } +#pragma warning disable 618 public class PowerChangedMessage : ComponentMessage +#pragma warning restore 618 { public readonly bool Powered; diff --git a/Content.Server/Power/Components/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs index 813d8e83c0..14be7bf44f 100644 --- a/Content.Server/Power/Components/BaseCharger.cs +++ b/Content.Server/Power/Components/BaseCharger.cs @@ -47,9 +47,12 @@ namespace Content.Server.Power.Components // Default state in the visualizer is OFF, so when this gets powered on during initialization it will generally show empty } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Power/Components/ExaminableBatteryComponent.cs b/Content.Server/Power/Components/ExaminableBatteryComponent.cs index 2327f32527..4f62721128 100644 --- a/Content.Server/Power/Components/ExaminableBatteryComponent.cs +++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs @@ -7,7 +7,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Power.Components { [RegisterComponent] +#pragma warning disable 618 public class ExaminableBatteryComponent : Component, IExamine +#pragma warning restore 618 { public override string Name => "ExaminableBattery"; diff --git a/Content.Server/PowerCell/Components/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs index 596b9d1f51..ffe4c45443 100644 --- a/Content.Server/PowerCell/Components/PowerCellComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs @@ -21,7 +21,9 @@ namespace Content.Server.PowerCell.Components /// [RegisterComponent] [ComponentReference(typeof(BatteryComponent))] +#pragma warning disable 618 public class PowerCellComponent : BatteryComponent, IExamine +#pragma warning restore 618 { public override string Name => "PowerCell"; public const string SolutionName = "powerCell"; diff --git a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs index d90757adee..37263243ba 100644 --- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs @@ -20,7 +20,9 @@ namespace Content.Server.PowerCell.Components /// . Intended to supplement other components, not very useful by itself. /// [RegisterComponent] +#pragma warning disable 618 public class PowerCellSlotComponent : Component, IExamine, IMapInit +#pragma warning restore 618 { public override string Name => "PowerCellSlot"; diff --git a/Content.Server/Radio/Components/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs index 2aaf3ef6fd..412909ad55 100644 --- a/Content.Server/Radio/Components/HandheldRadioComponent.cs +++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs @@ -17,7 +17,9 @@ namespace Content.Server.Radio.Components [RegisterComponent] [ComponentReference(typeof(IRadio))] [ComponentReference(typeof(IListen))] +#pragma warning disable 618 public class HandheldRadioComponent : Component, IUse, IListen, IRadio, IActivate, IExamine +#pragma warning restore 618 { [Dependency] private readonly IChatManager _chatManager = default!; public override string Name => "Radio"; diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 683ec6f20c..686b1af665 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -274,7 +274,9 @@ namespace Content.Server.Storage.Components Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) \"used\" by player session (UID {userSession.AttachedEntityUid})."); SubscribeSession(userSession); +#pragma warning disable 618 SendNetworkMessage(new OpenStorageUIMessage(), userSession.ConnectedClient); +#pragma warning restore 618 UpdateClientInventory(userSession); } @@ -319,7 +321,9 @@ namespace Content.Server.Storage.Components var stored = StoredEntities.Select(e => e.Uid).ToArray(); +#pragma warning disable 618 SendNetworkMessage(new StorageHeldItemsMessage(stored, _storageUsed, _storageCapacityMax), session.ConnectedClient); +#pragma warning restore 618 } /// @@ -352,7 +356,9 @@ namespace Content.Server.Storage.Components Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) unsubscribed player session (UID {session.AttachedEntityUid})."); SubscribedSessions.Remove(session); +#pragma warning disable 618 SendNetworkMessage(new CloseStorageUIMessage(), session.ConnectedClient); +#pragma warning restore 618 UpdateDoorState(); } @@ -385,6 +391,7 @@ namespace Content.Server.Storage.Components _storage.OccludesLight = _occludesLight; } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); @@ -499,7 +506,9 @@ namespace Content.Server.Storage.Components void IActivate.Activate(ActivateEventArgs eventArgs) { +#pragma warning disable 618 ((IUse) this).UseEntity(new UseEntityEventArgs(eventArgs.User)); +#pragma warning restore 618 } /// @@ -562,7 +571,9 @@ namespace Content.Server.Storage.Components if (successfullyInserted.Count > 0) { PlaySoundCollection(); +#pragma warning disable 618 SendNetworkMessage( +#pragma warning restore 618 new AnimateInsertingEntitiesMessage( successfullyInserted, successfullyInsertedPositions @@ -582,7 +593,9 @@ namespace Content.Server.Storage.Components var position = EntityCoordinates.FromMap(Owner.Transform.Parent?.Owner ?? Owner, eventArgs.Target.Transform.MapPosition); if (PlayerInsertEntityInWorld(eventArgs.User, eventArgs.Target)) { +#pragma warning disable 618 SendNetworkMessage(new AnimateInsertingEntitiesMessage( +#pragma warning restore 618 new List() { eventArgs.Target.Uid }, new List() { position } )); diff --git a/Content.Server/Suspicion/SuspicionRoleComponent.cs b/Content.Server/Suspicion/SuspicionRoleComponent.cs index 709a5b402a..60ac8c7eab 100644 --- a/Content.Server/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Server/Suspicion/SuspicionRoleComponent.cs @@ -18,7 +18,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Suspicion { [RegisterComponent] +#pragma warning disable 618 public class SuspicionRoleComponent : SharedSuspicionRoleComponent, IExamine +#pragma warning restore 618 { private Role? _role; [ViewVariables] diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs index 24334f4ea6..5fd045cab8 100644 --- a/Content.Server/Toilet/ToiletComponent.cs +++ b/Content.Server/Toilet/ToiletComponent.cs @@ -31,8 +31,10 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Toilet { [RegisterComponent] +#pragma warning disable 618 public class ToiletComponent : Component, IInteractUsing, IInteractHand, IMapInit, IExamine, ISuicideAct +#pragma warning restore 618 { public sealed override string Name => "Toilet"; diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index fbdfecbdb3..c584997030 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -117,9 +117,12 @@ namespace Content.Server.VendingMachines InitializeFromPrototype(); } + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case PowerChangedMessage powerChanged: diff --git a/Content.Server/Warps/WarpPointComponent.cs b/Content.Server/Warps/WarpPointComponent.cs index 5ca8b22926..e0b87f1ea2 100644 --- a/Content.Server/Warps/WarpPointComponent.cs +++ b/Content.Server/Warps/WarpPointComponent.cs @@ -8,7 +8,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Warps { [RegisterComponent] +#pragma warning disable 618 public sealed class WarpPointComponent : Component, IExamine +#pragma warning restore 618 { public override string Name => "WarpPoint"; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs index 8355438080..4fd4f20736 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs @@ -18,7 +18,9 @@ using Robust.Shared.Utility; namespace Content.Server.Weapon.Ranged.Ammunition.Components { [RegisterComponent] +#pragma warning disable 618 public sealed class AmmoBoxComponent : Component, IInteractUsing, IUse, IInteractHand, IMapInit, IExamine +#pragma warning restore 618 { public override string Name => "AmmoBox"; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs index 2d6ab30457..ec2cde2300 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs @@ -21,7 +21,9 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components /// Generally used for bullets but can be used for other things like bananas /// [RegisterComponent] +#pragma warning disable 618 public class AmmoComponent : Component, IExamine, ISerializationHooks +#pragma warning restore 618 { [Dependency] private readonly IGameTiming _gameTiming = default!; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs index d1f33c1052..fa4ec5e164 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using Content.Server.Weapon.Ranged.Barrels.Components; @@ -17,9 +18,12 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components [DataField("solution")] public string SolutionName { get; set; } = DefaultSolutionName; + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleMessage(ComponentMessage message, IComponent? component) { +#pragma warning disable 618 base.HandleMessage(message, component); +#pragma warning restore 618 switch (message) { case BarrelFiredMessage barrelFired: diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs index 781eb1b140..23598865f6 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs @@ -18,7 +18,9 @@ using Robust.Shared.Utility; namespace Content.Server.Weapon.Ranged.Ammunition.Components { [RegisterComponent] +#pragma warning disable 618 public class RangedMagazineComponent : Component, IMapInit, IInteractUsing, IUse, IExamine +#pragma warning restore 618 { public override string Name => "RangedMagazine"; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index f453320d04..b31d56a36b 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs @@ -26,7 +26,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components /// [RegisterComponent] [NetworkedComponent()] +#pragma warning disable 618 public sealed class BoltActionBarrelComponent : ServerRangedBarrelComponent, IMapInit, IExamine +#pragma warning restore 618 { // Originally I had this logic shared with PumpBarrel and used a couple of variables to control things // but it felt a lot messier to play around with, especially when adding verbs diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index f74f5ce318..c708cfd0ed 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs @@ -27,7 +27,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components { [RegisterComponent] [NetworkedComponent()] +#pragma warning disable 618 public sealed class ServerMagazineBarrelComponent : ServerRangedBarrelComponent, IExamine +#pragma warning restore 618 { public override string Name => "MagazineBarrel"; @@ -311,7 +313,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components SoundSystem.Play(Filter.Pvs(Owner), _soundAutoEject.GetSound(), Owner, AudioParams.Default.WithVolume(-2)); MagazineContainer.Remove(magazine); +#pragma warning disable 618 SendNetworkMessage(new MagazineAutoEjectMessage()); +#pragma warning restore 618 } return true; } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs index 68b5184cfd..09e1358054 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs @@ -34,7 +34,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components /// All of the ranged weapon components inherit from this to share mechanics like shooting etc. /// Only difference between them is how they retrieve a projectile to shoot (battery, magazine, etc.) /// +#pragma warning disable 618 public abstract class ServerRangedBarrelComponent : SharedRangedBarrelComponent, IUse, IInteractUsing, IExamine, ISerializationHooks +#pragma warning restore 618 { // There's still some of py01 and PJB's work left over, especially in underlying shooting logic, // it's just when I re-organised it changed me as the contributor @@ -359,7 +361,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components projectile.Transform.LocalRotation = projectileAngle + MathHelper.PiOver2; } +#pragma warning disable 618 ammo.SendMessage(this, new BarrelFiredMessage(firedProjectiles)); +#pragma warning restore 618 } /// @@ -415,7 +419,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components } } +#pragma warning disable 618 public class BarrelFiredMessage : ComponentMessage +#pragma warning restore 618 { public readonly List FiredProjectiles; diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs index 5034616636..f3d7da9151 100644 --- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -93,6 +93,7 @@ namespace Content.Server.Weapon.Ranged } /// + [Obsolete("Component Messages are deprecated, use Entity Events instead.")] public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null) { base.HandleNetworkMessage(message, channel, session); diff --git a/Content.Server/Window/WindowComponent.cs b/Content.Server/Window/WindowComponent.cs index a70bf7b6aa..11c9791376 100644 --- a/Content.Server/Window/WindowComponent.cs +++ b/Content.Server/Window/WindowComponent.cs @@ -24,7 +24,9 @@ namespace Content.Server.Window { [RegisterComponent] [ComponentReference(typeof(SharedWindowComponent))] +#pragma warning disable 618 public class WindowComponent : SharedWindowComponent, IExamine, IInteractHand +#pragma warning restore 618 { [Dependency] private readonly IGameTiming _gameTiming = default!; diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs index 07fd0e27eb..6fe8ebbacc 100644 --- a/Content.Server/WireHacking/WiresComponent.cs +++ b/Content.Server/WireHacking/WiresComponent.cs @@ -32,7 +32,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.WireHacking { [RegisterComponent] +#pragma warning disable 618 public class WiresComponent : SharedWiresComponent, IInteractUsing, IExamine, IMapInit +#pragma warning restore 618 { [Dependency] private readonly IRobustRandom _random = default!; diff --git a/Content.Shared/Actions/Components/SharedActionsComponent.cs b/Content.Shared/Actions/Components/SharedActionsComponent.cs index 6ad8f5295c..9bd79dac06 100644 --- a/Content.Shared/Actions/Components/SharedActionsComponent.cs +++ b/Content.Shared/Actions/Components/SharedActionsComponent.cs @@ -465,7 +465,9 @@ namespace Content.Shared.Actions.Components } [Serializable, NetSerializable] +#pragma warning disable 618 public abstract class BasePerformActionMessage : ComponentMessage +#pragma warning restore 618 { public abstract BehaviorType BehaviorType { get; } } diff --git a/Content.Shared/Actions/IActionAttempt.cs b/Content.Shared/Actions/IActionAttempt.cs index 19c9c7c8fd..b2d2965ff9 100644 --- a/Content.Shared/Actions/IActionAttempt.cs +++ b/Content.Shared/Actions/IActionAttempt.cs @@ -19,10 +19,12 @@ namespace Content.Shared.Actions /// Action Prototype attempting to be performed /// BaseActionPrototype Action { get; } +#pragma warning disable 618 ComponentMessage PerformInstantActionMessage(); ComponentMessage PerformToggleActionMessage(bool on); ComponentMessage PerformTargetPointActionMessage(PointerInputCmdHandler.PointerInputCmdArgs args); ComponentMessage PerformTargetEntityActionMessage(PointerInputCmdHandler.PointerInputCmdArgs args); +#pragma warning restore 618 /// /// Tries to get the action state for this action from the actionsComponent, returning /// true if found. @@ -99,12 +101,16 @@ namespace Content.Shared.Actions target)); } +#pragma warning disable 618 public ComponentMessage PerformInstantActionMessage() +#pragma warning restore 618 { return new PerformInstantActionMessage(_action.ActionType); } +#pragma warning disable 618 public ComponentMessage PerformToggleActionMessage(bool toggleOn) +#pragma warning restore 618 { if (toggleOn) { @@ -113,12 +119,16 @@ namespace Content.Shared.Actions return new PerformToggleOffActionMessage(_action.ActionType); } +#pragma warning disable 618 public ComponentMessage PerformTargetPointActionMessage(PointerInputCmdHandler.PointerInputCmdArgs args) +#pragma warning restore 618 { return new PerformTargetPointActionMessage(_action.ActionType, args.Coordinates); } +#pragma warning disable 618 public ComponentMessage PerformTargetEntityActionMessage(PointerInputCmdHandler.PointerInputCmdArgs args) +#pragma warning restore 618 { return new PerformTargetEntityActionMessage(_action.ActionType, args.EntityUid); } @@ -176,12 +186,16 @@ namespace Content.Shared.Actions _itemActions.Toggle(_action.ActionType, toggleOn); } +#pragma warning disable 618 public ComponentMessage PerformInstantActionMessage() +#pragma warning restore 618 { return new PerformInstantItemActionMessage(_action.ActionType, _item.Uid); } +#pragma warning disable 618 public ComponentMessage PerformToggleActionMessage(bool toggleOn) +#pragma warning restore 618 { if (toggleOn) { @@ -190,12 +204,16 @@ namespace Content.Shared.Actions return new PerformToggleOffItemActionMessage(_action.ActionType, _item.Uid); } +#pragma warning disable 618 public ComponentMessage PerformTargetPointActionMessage(PointerInputCmdHandler.PointerInputCmdArgs args) +#pragma warning restore 618 { return new PerformTargetPointItemActionMessage(_action.ActionType, _item.Uid, args.Coordinates); } +#pragma warning disable 618 public ComponentMessage PerformTargetEntityActionMessage(PointerInputCmdHandler.PointerInputCmdArgs args) +#pragma warning restore 618 { return new PerformTargetEntityItemActionMessage(_action.ActionType, _item.Uid, args.EntityUid); } diff --git a/Content.Shared/Alert/SharedAlertsComponent.cs b/Content.Shared/Alert/SharedAlertsComponent.cs index 2436ac0232..06e112a9c7 100644 --- a/Content.Shared/Alert/SharedAlertsComponent.cs +++ b/Content.Shared/Alert/SharedAlertsComponent.cs @@ -181,7 +181,9 @@ namespace Content.Shared.Alert /// A message that calls the click interaction on a alert /// [Serializable, NetSerializable] +#pragma warning disable 618 public class ClickAlertMessage : ComponentMessage +#pragma warning restore 618 { public readonly AlertType Type; diff --git a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs index 3f94cdedb7..c74ab61476 100644 --- a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs +++ b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs @@ -69,7 +69,9 @@ namespace Content.Shared.Buckle.Components } [Serializable, NetSerializable] +#pragma warning disable 618 public abstract class BuckleChangeMessage : ComponentMessage +#pragma warning restore 618 { /// /// Constructs a new instance of diff --git a/Content.Shared/Buckle/Components/SharedStrapComponent.cs b/Content.Shared/Buckle/Components/SharedStrapComponent.cs index c6ea85eb1b..4dc912f01e 100644 --- a/Content.Shared/Buckle/Components/SharedStrapComponent.cs +++ b/Content.Shared/Buckle/Components/SharedStrapComponent.cs @@ -62,7 +62,9 @@ namespace Content.Shared.Buckle.Components } [Serializable, NetSerializable] +#pragma warning disable 618 public abstract class StrapChangeMessage : ComponentMessage +#pragma warning restore 618 { /// /// Constructs a new instance of diff --git a/Content.Shared/Camera/SharedCameraRecoilComponent.cs b/Content.Shared/Camera/SharedCameraRecoilComponent.cs index 964d82e3fb..a8b20990d4 100644 --- a/Content.Shared/Camera/SharedCameraRecoilComponent.cs +++ b/Content.Shared/Camera/SharedCameraRecoilComponent.cs @@ -14,7 +14,9 @@ namespace Content.Shared.Camera public abstract void Kick(Vector2 recoil); [Serializable, NetSerializable] +#pragma warning disable 618 protected class RecoilKickMessage : ComponentMessage +#pragma warning restore 618 { public readonly Vector2 Recoil; diff --git a/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs index e3e860198f..d896245178 100644 --- a/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs +++ b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs @@ -13,7 +13,9 @@ namespace Content.Shared.CharacterInfo public override string Name => "CharacterInfo"; [Serializable, NetSerializable] +#pragma warning disable 618 protected class RequestCharacterInfoMessage : ComponentMessage +#pragma warning restore 618 { public RequestCharacterInfoMessage() { @@ -22,7 +24,9 @@ namespace Content.Shared.CharacterInfo } [Serializable, NetSerializable] +#pragma warning disable 618 protected class CharacterInfoMessage : ComponentMessage +#pragma warning restore 618 { public readonly Dictionary> Objectives; public readonly string JobTitle; diff --git a/Content.Shared/Configurable/SharedConfigurationComponent.cs b/Content.Shared/Configurable/SharedConfigurationComponent.cs index f20c17eedf..025f29336f 100644 --- a/Content.Shared/Configurable/SharedConfigurationComponent.cs +++ b/Content.Shared/Configurable/SharedConfigurationComponent.cs @@ -23,7 +23,9 @@ namespace Content.Shared.Configurable /// /// Message sent to other components on this entity when DeviceNetwork configuration updated. /// +#pragma warning disable 618 public class ConfigUpdatedComponentMessage : ComponentMessage +#pragma warning restore 618 { public Dictionary Config { get; } diff --git a/Content.Shared/DoAfter/SharedDoAfterComponent.cs b/Content.Shared/DoAfter/SharedDoAfterComponent.cs index 4d625ee35e..603a686dd2 100644 --- a/Content.Shared/DoAfter/SharedDoAfterComponent.cs +++ b/Content.Shared/DoAfter/SharedDoAfterComponent.cs @@ -25,7 +25,9 @@ namespace Content.Shared.DoAfter } [Serializable, NetSerializable] +#pragma warning disable 618 public sealed class CancelledDoAfterMessage : ComponentMessage +#pragma warning restore 618 { public byte ID { get; } diff --git a/Content.Shared/Instruments/SharedInstrumentComponent.cs b/Content.Shared/Instruments/SharedInstrumentComponent.cs index d33eb6e44a..477f5cf5e4 100644 --- a/Content.Shared/Instruments/SharedInstrumentComponent.cs +++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs @@ -37,7 +37,9 @@ namespace Content.Shared.Instruments /// This message is sent to the client to completely stop midi input and midi playback. /// [Serializable, NetSerializable] +#pragma warning disable 618 public class InstrumentStopMidiMessage : ComponentMessage +#pragma warning restore 618 { } @@ -45,7 +47,9 @@ namespace Content.Shared.Instruments /// This message is sent to the client to start the synth. /// [Serializable, NetSerializable] +#pragma warning disable 618 public class InstrumentStartMidiMessage : ComponentMessage +#pragma warning restore 618 { } @@ -54,7 +58,9 @@ namespace Content.Shared.Instruments /// This message carries a MidiEvent to be played on clients. /// [Serializable, NetSerializable] +#pragma warning disable 618 public class InstrumentMidiEventMessage : ComponentMessage +#pragma warning restore 618 { public MidiEvent[] MidiEvent; diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index a800653f45..a07a4f24b1 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -20,6 +20,8 @@ using Robust.Shared.Physics; using Robust.Shared.Random; using Robust.Shared.Serialization; +#pragma warning disable 618 + namespace Content.Shared.Interaction { /// diff --git a/Content.Shared/Inventory/SharedInventoryComponent.cs b/Content.Shared/Inventory/SharedInventoryComponent.cs index ec7ba4157c..5b1fd6eb51 100644 --- a/Content.Shared/Inventory/SharedInventoryComponent.cs +++ b/Content.Shared/Inventory/SharedInventoryComponent.cs @@ -60,7 +60,9 @@ namespace Content.Shared.Inventory } [Serializable, NetSerializable] +#pragma warning disable 618 public class ClientInventoryMessage : ComponentMessage +#pragma warning restore 618 { public Slots Inventoryslot; public ClientInventoryUpdate Updatetype; @@ -84,7 +86,9 @@ namespace Content.Shared.Inventory /// Component message for opening the Storage UI of item in Slot /// [Serializable, NetSerializable] +#pragma warning disable 618 public class OpenSlotStorageUIMessage : ComponentMessage +#pragma warning restore 618 { public Slots Slot; diff --git a/Content.Shared/MobState/Components/MobStateComponent.cs b/Content.Shared/MobState/Components/MobStateComponent.cs index 2a5cf2509b..7e00012368 100644 --- a/Content.Shared/MobState/Components/MobStateComponent.cs +++ b/Content.Shared/MobState/Components/MobStateComponent.cs @@ -312,7 +312,9 @@ namespace Content.Shared.MobState.Components state.UpdateState(Owner, threshold); var message = new MobStateChangedMessage(this, old, state); +#pragma warning disable 618 SendMessage(message); +#pragma warning restore 618 Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, message); Dirty(); diff --git a/Content.Shared/MobState/MobStateChangedMessage.cs b/Content.Shared/MobState/MobStateChangedMessage.cs index 337caa42db..97fd672489 100644 --- a/Content.Shared/MobState/MobStateChangedMessage.cs +++ b/Content.Shared/MobState/MobStateChangedMessage.cs @@ -3,7 +3,9 @@ using Robust.Shared.GameObjects; namespace Content.Shared.MobState { +#pragma warning disable 618 public class MobStateChangedMessage : ComponentMessage +#pragma warning restore 618 { public MobStateChangedMessage( IMobStateComponent component, diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 9ee15f22e2..27d3b0d52e 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -349,7 +349,6 @@ namespace Content.Shared.Preferences string RandomName() { - if (Sex == null) return "Urist McHands"; // This shouldn't happen var random = IoCManager.Resolve(); var protoMan = IoCManager.Resolve(); var firstName = random.Pick(Sex.FirstNames(protoMan).Values); diff --git a/Content.Shared/Singularity/SingularitySoundMessage.cs b/Content.Shared/Singularity/SingularitySoundMessage.cs index 6554b81b24..7a8d891cb5 100644 --- a/Content.Shared/Singularity/SingularitySoundMessage.cs +++ b/Content.Shared/Singularity/SingularitySoundMessage.cs @@ -5,7 +5,9 @@ using Robust.Shared.Serialization; namespace Content.Shared.Singularity { [Serializable, NetSerializable] +#pragma warning disable 618 public class SingularitySoundMessage : ComponentMessage +#pragma warning restore 618 { public bool Start { get; } diff --git a/Content.Shared/Storage/SharedStorageComponent.cs b/Content.Shared/Storage/SharedStorageComponent.cs index c19d535f03..0e86706903 100644 --- a/Content.Shared/Storage/SharedStorageComponent.cs +++ b/Content.Shared/Storage/SharedStorageComponent.cs @@ -74,7 +74,9 @@ namespace Content.Shared.Storage /// Updates the client component about what entities this storage is holding /// [Serializable, NetSerializable] +#pragma warning disable 618 public class StorageHeldItemsMessage : ComponentMessage +#pragma warning restore 618 { public readonly int StorageSizeMax; public readonly int StorageSizeUsed; @@ -93,7 +95,9 @@ namespace Content.Shared.Storage /// Component message for adding an entity to the storage entity. /// [Serializable, NetSerializable] +#pragma warning disable 618 public class InsertEntityMessage : ComponentMessage +#pragma warning restore 618 { public InsertEntityMessage() { @@ -105,7 +109,9 @@ namespace Content.Shared.Storage /// Component message for displaying an animation of entities flying into a storage entity /// [Serializable, NetSerializable] +#pragma warning disable 618 public class AnimateInsertingEntitiesMessage : ComponentMessage +#pragma warning restore 618 { public readonly List StoredEntities; public readonly List EntityPositions; @@ -121,7 +127,9 @@ namespace Content.Shared.Storage /// Component message for removing a contained entity from the storage entity /// [Serializable, NetSerializable] +#pragma warning disable 618 public class RemoveEntityMessage : ComponentMessage +#pragma warning restore 618 { public EntityUid EntityUid; @@ -136,7 +144,9 @@ namespace Content.Shared.Storage /// Component message for opening the storage UI /// [Serializable, NetSerializable] +#pragma warning disable 618 public class OpenStorageUIMessage : ComponentMessage +#pragma warning restore 618 { public OpenStorageUIMessage() { @@ -149,7 +159,9 @@ namespace Content.Shared.Storage /// E.g when the player moves too far away from the container. /// [Serializable, NetSerializable] +#pragma warning disable 618 public class CloseStorageUIMessage : ComponentMessage +#pragma warning restore 618 { public CloseStorageUIMessage() { diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs index b9493cb6c1..55465a6dcb 100644 --- a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs @@ -32,7 +32,9 @@ namespace Content.Shared.Weapons.Ranged.Components /// A component message raised when the weapon is fired at a position on the map. /// [Serializable, NetSerializable] +#pragma warning disable 618 public sealed class FirePosComponentMessage : ComponentMessage +#pragma warning restore 618 { /// /// If this is not invalid, the target position is relative to the grid. diff --git a/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs index 047b64c89c..089b6f5af2 100644 --- a/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs +++ b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs @@ -8,5 +8,7 @@ namespace Content.Shared.Weapons.Ranged /// This is sent if the MagazineBarrel AutoEjects the magazine /// [Serializable, NetSerializable] +#pragma warning disable 618 public sealed class MagazineAutoEjectMessage : ComponentMessage {} +#pragma warning restore 618 }