From 1477cd4d0aeed3575afc14ed755a888af7e593cf Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Thu, 18 Feb 2021 09:09:07 +0100 Subject: [PATCH] Make component states dependant on the player getting them (#3280) * Make component states dependant on the player getting them Co-authored-by: Metal Gear Sloth * Updated submodule to v0.3.7. Co-authored-by: Metal Gear Sloth Co-authored-by: Acruid --- .../Tests/Buckle/BuckleTest.cs | 13 +++++++++---- .../Networking/SimplePredictReconcileTest.cs | 11 ++++++----- .../ActionBlocking/CuffableComponent.cs | 3 ++- .../ActionBlocking/HandcuffComponent.cs | 3 ++- .../Components/Atmos/GasAnalyzerComponent.cs | 9 +++++---- .../Components/Buckle/BuckleComponent.cs | 3 ++- .../Cargo/CargoOrderDatabaseComponent.cs | 3 ++- .../Cargo/GalacticMarketComponent.cs | 3 ++- .../Components/Chemistry/HyposprayComponent.cs | 3 ++- .../Components/Chemistry/InjectorComponent.cs | 3 ++- .../GameObjects/Components/CrayonComponent.cs | 7 ++++--- .../GameObjects/Components/DoAfterComponent.cs | 3 ++- .../Components/Doors/ServerDoorComponent.cs | 3 ++- .../Components/GUI/HandsComponent.cs | 2 +- .../Components/GUI/InventoryComponent.cs | 2 +- .../Instruments/InstrumentComponent.cs | 2 +- .../Interactable/HandheldLightComponent.cs | 3 ++- .../Interactable/MultitoolComponent.cs | 3 ++- .../Components/Interactable/WelderComponent.cs | 3 ++- .../Items/Clothing/ClothingComponent.cs | 3 ++- .../Components/Items/Storage/ItemComponent.cs | 3 ++- .../Items/Storage/StorableComponent.cs | 3 ++- .../Components/MagbootsComponent.cs | 3 ++- .../Components/Mobs/StunnableComponent.cs | 3 ++- .../Components/Movement/ClimbingComponent.cs | 3 ++- .../Components/Movement/SlipperyComponent.cs | 3 ++- .../Components/Nutrition/HungerComponent.cs | 3 ++- .../Components/Nutrition/ThirstComponent.cs | 3 ++- .../Components/Observer/GhostComponent.cs | 18 +++++++++--------- .../Components/PlaceableSurfaceComponent.cs | 3 ++- .../Projectiles/ProjectileComponent.cs | 3 ++- .../Research/LatheDatabaseComponent.cs | 3 ++- .../Research/MaterialStorageComponent.cs | 3 ++- .../Research/ProtolatheDatabaseComponent.cs | 3 ++- .../Research/TechnologyDatabaseComponent.cs | 3 ++- .../StationEvents/RadiationPulseComponent.cs | 3 ++- .../Components/Strap/StrapComponent.cs | 3 ++- .../Suspicion/SuspicionRoleComponent.cs | 3 ++- .../Components/Weapon/FlashableComponent.cs | 3 ++- .../Barrels/BoltActionBarrelComponent.cs | 3 ++- .../Ranged/Barrels/PumpBarrelComponent.cs | 3 ++- .../Ranged/Barrels/RevolverBarrelComponent.cs | 3 ++- .../Barrels/ServerBatteryBarrelComponent.cs | 3 ++- .../Barrels/ServerMagazineBarrelComponent.cs | 3 ++- .../Ranged/ServerRangedWeaponComponent.cs | 3 +-- .../Body/Part/SharedBodyPartComponent.cs | 3 ++- .../Components/Body/SharedBodyComponent.cs | 4 ++-- .../SharedSolutionContainerComponent.cs | 7 ++++--- .../Components/Damage/DamageableComponent.cs | 5 +++-- .../Components/Items/ItemCooldownComponent.cs | 3 ++- .../Components/Mobs/SharedActionsComponent.cs | 3 ++- .../Components/Mobs/SharedAlertsComponent.cs | 3 ++- .../Mobs/SharedCombatModeComponent.cs | 3 ++- .../Mobs/SharedHumanoidAppearanceComponent.cs | 3 ++- .../Mobs/State/SharedMobStateComponent.cs | 4 +++- .../SharedPlayerInputMoverComponent.cs | 3 ++- .../Pulling/SharedPullableComponent.cs | 3 ++- .../Components/SharedStackComponent.cs | 3 ++- .../GameObjects/Components/Tag/TagComponent.cs | 3 ++- .../Mobs/ServerAlertsComponentTests.cs | 6 +++--- RobustToolbox | 2 +- 61 files changed, 145 insertions(+), 88 deletions(-) diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs index 25d2eae216..db2c86a507 100644 --- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs +++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.Linq; +using System.Threading.Tasks; using Content.Server.GameObjects.Components.Buckle; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; @@ -10,6 +11,7 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using Content.Shared.Utility; using NUnit.Framework; +using Robust.Server.Player; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; @@ -52,8 +54,9 @@ namespace Content.IntegrationTests.Tests.Buckle [Test] public async Task BuckleUnbuckleCooldownRangeTest() { - var options = new ServerIntegrationOptions {ExtraPrototypes = Prototypes}; - var server = StartServer(options); + var cOptions = new ClientIntegrationOptions {ExtraPrototypes = Prototypes}; + var sOptions = new ServerIntegrationOptions {ExtraPrototypes = Prototypes}; + var (client, server) = await StartConnectedServerClientPair(cOptions, sOptions); IEntity human = null; IEntity chair = null; @@ -91,7 +94,9 @@ namespace Content.IntegrationTests.Tests.Buckle Assert.True(buckle.TryBuckle(human, chair)); Assert.NotNull(buckle.BuckledTo); Assert.True(buckle.Buckled); - Assert.True(((BuckleComponentState) buckle.GetComponentState()).Buckled); + + var player = IoCManager.Resolve().GetAllPlayers().Single(); + Assert.True(((BuckleComponentState) buckle.GetComponentState(player)).Buckled); Assert.False(ActionBlockerSystem.CanMove(human)); Assert.False(ActionBlockerSystem.CanChangeDirection(human)); Assert.False(EffectBlockerSystem.CanFall(human)); diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 6ff8eee2b5..4eb8c427e2 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -1,19 +1,20 @@ #nullable enable +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Shared.GameObjects; using NUnit.Framework; using Robust.Client.GameObjects; +using Robust.Client.GameStates; +using Robust.Server.Player; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Reflection; -using Robust.Shared.Timing; -using System; -using Robust.Client.GameStates; -using Robust.Server.Player; using Robust.Shared.Serialization; +using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests.Networking { @@ -408,7 +409,7 @@ namespace Content.IntegrationTests.Tests.Networking Foo = pred.Foo; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new PredictionComponentState(Foo); } diff --git a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs index cb342632ca..660aef7a44 100644 --- a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs +++ b/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs @@ -16,6 +16,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.ActionBlocking @@ -55,7 +56,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking Owner.EnsureComponentWarn(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { // there are 2 approaches i can think of to handle the handcuff overlay on players // 1 - make the current RSI the handcuff type that's currently active. all handcuffs on the player will appear the same. diff --git a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs b/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs index 4490bfecc8..af50391eaf 100644 --- a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs +++ b/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs @@ -13,6 +13,7 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -136,7 +137,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking serializer.DataField(this, x => x.BrokenDesc, "brokenDesc", string.Empty); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new HandcuffedComponentState(Broken ? BrokenState : string.Empty); } diff --git a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs index 32804ad986..baf42d1418 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs @@ -1,4 +1,6 @@ #nullable enable +using System.Collections.Generic; +using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; @@ -9,13 +11,12 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.ViewVariables; -using System.Collections.Generic; -using System.Threading.Tasks; -using Robust.Server.Player; namespace Content.Server.GameObjects.Components.Atmos { @@ -44,7 +45,7 @@ namespace Content.Server.GameObjects.Components.Atmos Owner.TryGetComponent(out _appearance); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new GasAnalyzerComponentState(_pressureDanger); } diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs index 3dd0e534f4..692855085f 100644 --- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs @@ -21,6 +21,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; @@ -408,7 +409,7 @@ namespace Content.Server.GameObjects.Components.Buckle UpdateBuckleStatus(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { int? drawDepth = null; diff --git a/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs b/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs index cac12d409d..235ab61f6c 100644 --- a/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs @@ -2,6 +2,7 @@ using Content.Server.Cargo; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Cargo; using Robust.Shared.GameObjects; +using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Cargo { @@ -18,7 +19,7 @@ namespace Content.Server.GameObjects.Components.Cargo Database = EntitySystem.Get().StationOrderDatabase; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { if (!ConnectedToDatabase) return new CargoOrderDatabaseState(null); diff --git a/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs b/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs index 2bbbcc2618..1fa261d5cd 100644 --- a/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs @@ -1,12 +1,13 @@ using Content.Shared.GameObjects.Components.Cargo; using Robust.Shared.GameObjects; +using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Cargo { [RegisterComponent] public class GalacticMarketComponent : SharedGalacticMarketComponent { - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new GalacticMarketState(GetProductIdList()); } diff --git a/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs b/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs index 756252181f..e78036b393 100644 --- a/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs @@ -11,6 +11,7 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -129,7 +130,7 @@ namespace Content.Server.GameObjects.Components.Chemistry Dirty(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { if (_solution == null) return new HyposprayComponentState(ReagentUnit.Zero, ReagentUnit.Zero); diff --git a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs index 651e71f223..9f73405034 100644 --- a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -291,7 +292,7 @@ namespace Content.Server.GameObjects.Components.Chemistry Dirty(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { Owner.TryGetComponent(out SolutionContainerComponent? solution); diff --git a/Content.Server/GameObjects/Components/CrayonComponent.cs b/Content.Server/GameObjects/Components/CrayonComponent.cs index ce2443207f..18cd8bdc1d 100644 --- a/Content.Server/GameObjects/Components/CrayonComponent.cs +++ b/Content.Server/GameObjects/Components/CrayonComponent.cs @@ -1,4 +1,6 @@ #nullable enable +using System.Linq; +using System.Threading.Tasks; using Content.Server.Utility; using Content.Shared.Audio; using Content.Shared.GameObjects.Components; @@ -10,11 +12,10 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System.Linq; -using System.Threading.Tasks; namespace Content.Server.GameObjects.Components { @@ -83,7 +84,7 @@ namespace Content.Server.GameObjects.Components } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new CrayonComponentState(_color, SelectedState, Charges, Capacity); } diff --git a/Content.Server/GameObjects/Components/DoAfterComponent.cs b/Content.Server/GameObjects/Components/DoAfterComponent.cs index c467b6541c..277c44eda8 100644 --- a/Content.Server/GameObjects/Components/DoAfterComponent.cs +++ b/Content.Server/GameObjects/Components/DoAfterComponent.cs @@ -4,6 +4,7 @@ using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.GameObjects; +using Robust.Shared.Players; namespace Content.Server.GameObjects.Components { @@ -17,7 +18,7 @@ namespace Content.Server.GameObjects.Components // we'll just send them the index. Doesn't matter if it wraps around. private byte _runningIndex; - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var toAdd = new List(); diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index c6b2825d54..a54dcc9335 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -24,6 +24,7 @@ using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Physics; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using Timer = Robust.Shared.Timers.Timer; @@ -640,7 +641,7 @@ namespace Content.Server.GameObjects.Components.Doors return false; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new DoorComponentState(State, StateChangeStartTime, CurrentlyCrushing, GameTiming.CurTime); } diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index d3a6fe78b2..dbbfd9790a 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -497,7 +497,7 @@ namespace Content.Server.GameObjects.Components.GUI return _hands.Any(hand => hand.Name == name); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var hands = new SharedHand[_hands.Count]; diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs index 354fab4f21..93ad67d792 100644 --- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs @@ -604,7 +604,7 @@ namespace Content.Server.GameObjects.Components.GUI } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var list = new List>(); foreach (var (slot, container) in _slotContainers) diff --git a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs index 5a8f478a6d..a2c2cb25ff 100644 --- a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs +++ b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs @@ -175,7 +175,7 @@ namespace Content.Server.GameObjects.Components.Instruments serializer.DataField(ref _respectMidiLimits, "respectMidiLimits", true); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new InstrumentState(Playing, InstrumentProgram, InstrumentBank, AllowPercussion, AllowProgramChange, RespectMidiLimits, _lastSequencerTick); } diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 82b7f132d0..4e777d26bc 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -17,6 +17,7 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -244,7 +245,7 @@ namespace Content.Server.GameObjects.Components.Interactable return (byte?) ContentHelpers.RoundToNearestLevels(currentCharge / Cell.MaxCharge * 255, 255, StatusLevels); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new HandheldLightComponentState(GetLevel()); } diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs index 14710189b6..502336ba5d 100644 --- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Interactable @@ -107,7 +108,7 @@ namespace Content.Server.GameObjects.Components.Interactable return true; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new MultiToolComponentState(_tool.Qualities); } diff --git a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs index 91a5c21057..fad7009cb5 100644 --- a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs @@ -20,6 +20,7 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -98,7 +99,7 @@ namespace Content.Server.GameObjects.Components.Interactable serializer.DataField(this, collection => WeldSoundCollection, "weldSoundCollection", string.Empty); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new WelderComponentState(FuelCapacity, Fuel, WelderLit); } diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs index 521b59fa66..c12066b38e 100644 --- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.GameObjects.Components.Storage; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; @@ -66,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Items.Clothing serializer.DataFieldCached(ref _heatResistance, "HeatResistance", 323); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ClothingComponentState(ClothingEquippedPrefix, EquippedPrefix); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index 9423c51eb3..da37b1240b 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -13,6 +13,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Items.Storage @@ -129,7 +130,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession session) { return new ItemComponentState(EquippedPrefix); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs index fabf505c9e..45efc80ffb 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.GameObjects.Components.Storage; using Robust.Shared.GameObjects; +using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Items.Storage { @@ -25,7 +26,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new StorableComponentState(_size); } diff --git a/Content.Server/GameObjects/Components/MagbootsComponent.cs b/Content.Server/GameObjects/Components/MagbootsComponent.cs index fcc21bda21..650185a05c 100644 --- a/Content.Server/GameObjects/Components/MagbootsComponent.cs +++ b/Content.Server/GameObjects/Components/MagbootsComponent.cs @@ -15,6 +15,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; @@ -112,7 +113,7 @@ namespace Content.Server.GameObjects.Components Toggle(eventArgs.User); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new MagbootsComponentState(On); } diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 29662ab12a..4e5ed66067 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -10,6 +10,7 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -115,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Mobs .PlayFromEntity("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.05f)); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new StunnableComponentState(StunnedTimer, KnockdownTimer, SlowdownTimer, WalkModifierOverride, RunModifierOverride); diff --git a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs b/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs index 72d6d72a6b..c67aabec71 100644 --- a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Physics; using Robust.Shared.GameObjects; using Robust.Shared.Maths; +using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Movement { @@ -79,7 +80,7 @@ namespace Content.Server.GameObjects.Components.Movement IsOnClimbableThisFrame = false; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ClimbModeComponentState(_isClimbing); } diff --git a/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs b/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs index 01d2b90de1..006b24b684 100644 --- a/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.GameObjects.Components.Movement; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -102,7 +103,7 @@ namespace Content.Server.GameObjects.Components.Movement } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new SlipperyComponentState(_paralyzeTime, _intersectPercentage, _requiredSlipSpeed, _launchForwardsMultiplier, _slippery); } diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs index 8af1490c51..7d0c858817 100644 --- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.GameObjects.Components.Nutrition; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Players; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -213,7 +214,7 @@ namespace Content.Server.GameObjects.Components.Nutrition UpdateCurrentThreshold(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new HungerComponentState(_currentHungerThreshold); } diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs index 2de91d269b..d447eb83df 100644 --- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.GameObjects.Components.Nutrition; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Players; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -209,7 +210,7 @@ namespace Content.Server.GameObjects.Components.Nutrition UpdateCurrentThreshold(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ThirstComponentState(_currentThirstThreshold); } diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs index 9f1f72df37..6d636e30ff 100644 --- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs +++ b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs @@ -1,22 +1,22 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Markers; -using Content.Server.Players; using Content.Server.GameObjects.Components.Mobs; using Content.Server.Mobs; +using Content.Server.Players; using Content.Shared.GameObjects.Components.Observer; +using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Players; -using Robust.Shared.ViewVariables; -using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.Utility; using Robust.Shared.Localization; -using System; -using Robust.Server.Player; using Robust.Shared.Network; +using Robust.Shared.Players; using Robust.Shared.Timing; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; #nullable enable namespace Content.Server.GameObjects.Components.Observer @@ -47,7 +47,7 @@ namespace Content.Server.GameObjects.Components.Observer _timeOfDeath = _gameTimer.RealTime; } - public override ComponentState GetComponentState() => new GhostComponentState(CanReturnToBody); + public override ComponentState GetComponentState(ICommonSession player) => new GhostComponentState(CanReturnToBody); public override void HandleMessage(ComponentMessage message, IComponent? component) { diff --git a/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs b/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs index a22651afa0..6940c345d7 100644 --- a/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs +++ b/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -82,7 +83,7 @@ namespace Content.Server.GameObjects.Components serializer.DataField(ref _positionOffset, "positionOffset", Vector2.Zero); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new PlaceableSurfaceComponentState(_isPlaceable,_placeCentered,_positionOffset); } diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index fa45883333..daa721cc10 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Projectiles; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -114,7 +115,7 @@ namespace Content.Server.GameObjects.Components.Projectiles if (collideCount > 0 && DeleteOnCollide && _internalDeleteOnCollide) Owner.Delete(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ProjectileComponentState(NetID!.Value, _shooter, IgnoreShooter); } diff --git a/Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs b/Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs index 6ee60465e8..474f412d4b 100644 --- a/Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -17,7 +18,7 @@ namespace Content.Server.GameObjects.Components.Research public bool Static => _static; private bool _static = false; - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new LatheDatabaseState(GetRecipeIdList()); } diff --git a/Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs b/Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs index 5a59e55c62..11207827ea 100644 --- a/Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Content.Shared.GameObjects.Components.Research; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -20,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Research public int StorageLimit => _storageLimit; private int _storageLimit; - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new MaterialStorageState(Storage); } diff --git a/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs b/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs index 2179def87c..0d3b90f473 100644 --- a/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Prototypes; namespace Content.Server.GameObjects.Components.Research @@ -14,7 +15,7 @@ namespace Content.Server.GameObjects.Components.Research public override string Name => "ProtolatheDatabase"; - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ProtolatheDatabaseState(GetRecipeIdList()); } diff --git a/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs b/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs index 1d17fbcb12..df82955d9e 100644 --- a/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs @@ -1,13 +1,14 @@ using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Shared.GameObjects; +using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Research { [RegisterComponent] public class TechnologyDatabaseComponent : SharedTechnologyDatabaseComponent { - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new TechnologyDatabaseState(_technologies); } diff --git a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs b/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs index 9d169c75ac..d68fa49cec 100644 --- a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs +++ b/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs @@ -3,6 +3,7 @@ using Content.Shared.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.Timing; @@ -102,7 +103,7 @@ namespace Content.Server.GameObjects.Components.StationEvents Dirty(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new RadiationPulseState(_radsPerSecond, _range, Draw, Decay, _endTime); } diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index ec84e9a200..af9d88c38a 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Utility; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -163,7 +164,7 @@ namespace Content.Server.GameObjects.Components.Strap _occupiedSize = 0; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new StrapComponentState(Position); } diff --git a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs b/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs index 9c655841dd..e916ad8b14 100644 --- a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Players; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -140,7 +141,7 @@ namespace Content.Server.GameObjects.Components.Suspicion message.AddMarkup(tooltip); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return Role == null ? new SuspicionRoleComponentState(null, null, Array.Empty<(string, EntityUid)>()) diff --git a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs b/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs index 91ba89dba2..5dfbf79023 100644 --- a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.Utility; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Weapon @@ -23,7 +24,7 @@ namespace Content.Server.GameObjects.Components.Weapon Dirty(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new FlashComponentState(_duration, _lastFlash); } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs index 0689a1b819..fa01354a1f 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -14,6 +14,7 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -128,7 +129,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels UpdateAppearance(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { (int, int)? count = (ShotsLeft, Capacity); var chamberedExists = _chamberContainer.ContainedEntity != null; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs index 0ee9ba49fd..7bbc89e9c7 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs @@ -11,6 +11,7 @@ using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -82,7 +83,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels UpdateAppearance(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { (int, int)? count = (ShotsLeft, Capacity); var chamberedExists = _chamberContainer.ContainedEntity != null; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs index a9e7fe8455..6405df9047 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs @@ -13,6 +13,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -66,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _soundSpin, "soundSpin", "/Audio/Weapons/Guns/Misc/revolver_spin.ogg"); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var slotsSpent = new bool?[Capacity]; for (var i = 0; i < Capacity; i++) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs index 63f61cbd9a..aa5fcae4df 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs @@ -16,6 +16,7 @@ using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -89,7 +90,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _soundPowerCellEject, "soundPowerCellEject", null); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { (int, int)? count = (ShotsLeft, Capacity); diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs index 5fbf6563af..445d885ccb 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -18,6 +18,7 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -164,7 +165,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels return types; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { (int, int)? count = null; var magazine = _magazineContainer.ContainedEntity; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs index c5875dba60..1953361f91 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -18,7 +18,6 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Network; using Robust.Shared.Players; -using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; @@ -120,7 +119,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new RangedWeaponComponentState(FireRateSelector); } diff --git a/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs b/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs index 2e24c734e3..19eed73698 100644 --- a/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.GameObjects.Components.Body.Surgery; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -134,7 +135,7 @@ namespace Content.Shared.GameObjects.Components.Body.Part serializer.DataField(ref _mechanismIds, "mechanisms", new List()); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var mechanismIds = new EntityUid[_mechanisms.Count]; diff --git a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs b/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs index 6dca869d52..1140ac691e 100644 --- a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs @@ -13,11 +13,11 @@ using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using Component = Robust.Shared.GameObjects.Component; namespace Content.Shared.GameObjects.Components.Body { @@ -653,7 +653,7 @@ namespace Content.Shared.GameObjects.Components.Body Connections = cleanedConnections; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var parts = new (string slot, EntityUid partId)[_parts.Count]; diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs index 9f17b97ae2..d6e189a834 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs @@ -1,4 +1,6 @@ #nullable enable +using System; +using System.Collections.Generic; using Content.Shared.Chemistry; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; @@ -6,12 +8,11 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Players; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; namespace Content.Shared.GameObjects.Components.Chemistry { @@ -261,7 +262,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry return new SolutionContainerVisualState(Color, filledVolumeFraction); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new SolutionContainerComponentState(Solution); } diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs index 157c11e29e..acec7f81c4 100644 --- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs @@ -5,10 +5,11 @@ using System.Linq; using Content.Shared.Damage; using Content.Shared.Damage.DamageContainer; using Content.Shared.Damage.ResistanceSet; -using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -165,7 +166,7 @@ namespace Content.Shared.GameObjects.Components.Damage ForceHealthChangedEvent(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new DamageableComponentState(_damageList, _flags); } diff --git a/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs b/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs index 1851ddd2df..45315b39bb 100644 --- a/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs +++ b/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs @@ -1,5 +1,6 @@ using System; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -51,7 +52,7 @@ namespace Content.Shared.GameObjects.Components.Items } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ItemCooldownComponentState { diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs index aa12668bd0..317bc284cb 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Actions; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; @@ -76,7 +77,7 @@ namespace Content.Shared.GameObjects.Components.Mobs } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new ActionComponentState(_actions, _itemActions); } diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs index 1adb20d45c..1609266843 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.Alert; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -35,7 +36,7 @@ namespace Content.Shared.GameObjects.Components.Mobs _alerts = state.Alerts; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new AlertsComponentState(_alerts); } diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs index 12e284e87d..f491b9ba57 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs @@ -1,5 +1,6 @@ using System; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -47,7 +48,7 @@ namespace Content.Shared.GameObjects.Components.Mobs } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new CombatModeComponentState(IsInCombatMode, ActiveZone); } diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs index 38c985bb1e..2316316039 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.Preferences; using Robust.Shared.GameObjects; using Robust.Shared.Localization.Macros; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -49,7 +50,7 @@ namespace Content.Shared.GameObjects.Components.Mobs } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new HumanoidAppearanceComponentState(Appearance, Sex, Gender); } diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs b/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs index ff8658db3e..e80169cdad 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Robust.Shared.GameObjects; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -28,6 +29,7 @@ namespace Content.Shared.GameObjects.Components.Mobs.State /// States that this mapped to /// the amount of damage at which they are triggered. /// A threshold is reached when the total damage of an entity is equal + /// A threshold is reached when the total damage of an entity is equal /// to or higher than the int key, but lower than the next threshold. /// Ordered from lowest to highest. /// @@ -75,7 +77,7 @@ namespace Content.Shared.GameObjects.Components.Mobs.State base.OnRemove(); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new MobStateComponentState(CurrentThreshold); } diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs index b56fa9ad8c..4a6fa3a52d 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs @@ -8,6 +8,7 @@ using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; +using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; @@ -228,7 +229,7 @@ namespace Content.Shared.GameObjects.Components.Movement } } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new MoverComponentState(_heldMoveButtons); } diff --git a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs b/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs index 7672043d93..d5e7526370 100644 --- a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs +++ b/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs @@ -10,6 +10,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Physics; +using Robust.Shared.Players; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Pulling @@ -253,7 +254,7 @@ namespace Content.Shared.GameObjects.Components.Pulling return controller.TryMoveTo(Puller.Transform.Coordinates, to); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new PullableComponentState(Puller?.Uid); } diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 4eda42eb7d..18e83f0b44 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -1,6 +1,7 @@ using System; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -85,7 +86,7 @@ namespace Content.Shared.GameObjects.Components StackType = stackType; } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { return new StackComponentState(Count, MaxCount); } diff --git a/Content.Shared/GameObjects/Components/Tag/TagComponent.cs b/Content.Shared/GameObjects/Components/Tag/TagComponent.cs index d01333b13d..d4c2572eaf 100644 --- a/Content.Shared/GameObjects/Components/Tag/TagComponent.cs +++ b/Content.Shared/GameObjects/Components/Tag/TagComponent.cs @@ -4,6 +4,7 @@ using System.Linq; using Content.Shared.Prototypes.Tag; using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Players; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -41,7 +42,7 @@ namespace Content.Shared.GameObjects.Components.Tag () => _tags); } - public override ComponentState GetComponentState() + public override ComponentState GetComponentState(ICommonSession player) { var tags = new string[_tags.Count]; var i = 0; diff --git a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs index f68ad44c00..6139717185 100644 --- a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs +++ b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs @@ -48,18 +48,18 @@ namespace Content.Tests.Server.GameObjects.Components.Mobs Assert.That(alertManager.TryGet(AlertType.HighPressure, out var highpressure)); alertsComponent.ShowAlert(AlertType.LowPressure); - var alertState = alertsComponent.GetComponentState() as AlertsComponentState; + var alertState = alertsComponent.GetComponentState(null) as AlertsComponentState; Assert.NotNull(alertState); Assert.That(alertState.Alerts.Count, Is.EqualTo(1)); Assert.That(alertState.Alerts.ContainsKey(lowpressure.AlertKey)); alertsComponent.ShowAlert(AlertType.HighPressure); - alertState = alertsComponent.GetComponentState() as AlertsComponentState; + alertState = alertsComponent.GetComponentState(null) as AlertsComponentState; Assert.That(alertState.Alerts.Count, Is.EqualTo(1)); Assert.That(alertState.Alerts.ContainsKey(highpressure.AlertKey)); alertsComponent.ClearAlertCategory(AlertCategory.Pressure); - alertState = alertsComponent.GetComponentState() as AlertsComponentState; + alertState = alertsComponent.GetComponentState(null) as AlertsComponentState; Assert.That(alertState.Alerts.Count, Is.EqualTo(0)); } } diff --git a/RobustToolbox b/RobustToolbox index 9e3f3f0c1c..3ef4ac7452 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 9e3f3f0c1c98f52ae8d3fc1597a5ace0eff34978 +Subproject commit 3ef4ac74524a2532cb2ba62820db9abf16076e66