From a9a43f25ce3b7720441ac0a6345920777b7627f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= Date: Sun, 31 May 2020 19:58:49 +0200 Subject: [PATCH] Remove unused IEntitySystemManager dependencies. --- .../Components/Construction/ConstructorComponent.cs | 1 - .../GameObjects/Components/Fluids/BucketComponent.cs | 1 - Content.Server/GameObjects/Components/Fluids/MopComponent.cs | 1 - .../Components/Interactable/HandheldLightComponent.cs | 1 - .../GameObjects/Components/Interactable/MultitoolComponent.cs | 4 ---- Content.Server/GameObjects/Components/Items/DiceComponent.cs | 1 - .../GameObjects/Components/Items/FloorTileItemComponent.cs | 1 - .../Components/Items/Storage/EntityStorageComponent.cs | 3 --- .../GameObjects/Components/Kitchen/MicrowaveComponent.cs | 1 - .../GameObjects/Components/Mining/AsteroidRockComponent.cs | 1 - .../GameObjects/Components/Mobs/StunnableComponent.cs | 1 - Content.Server/GameObjects/Components/Power/ApcComponent.cs | 3 --- .../GameObjects/Components/Power/PoweredLightComponent.cs | 4 ---- .../Components/Research/ResearchConsoleComponent.cs | 1 - .../GameObjects/Components/Sound/FootstepModifierComponent.cs | 1 - .../GameObjects/Components/Weapon/Melee/StunbatonComponent.cs | 1 - .../Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs | 3 --- .../Ranged/Projectile/BallisticMagazineWeaponComponent.cs | 4 ---- .../Components/Weapon/Ranged/Projectile/BallisticWeapon.cs | 4 ---- .../Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs | 1 - Content.Server/GameObjects/EntitySystems/GravitySystem.cs | 1 - 21 files changed, 39 deletions(-) diff --git a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs index 187ec275c4..81ed05c74e 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs @@ -29,7 +29,6 @@ namespace Content.Server.GameObjects.Components.Construction [Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IMapManager _mapManager; [Dependency] private readonly IServerEntityManager _serverEntityManager; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null) diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs index bad8fbae25..7a6362cb59 100644 --- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs @@ -23,7 +23,6 @@ namespace Content.Server.GameObjects.Components.Fluids { #pragma warning disable 649 [Dependency] private readonly ILocalizationManager _localizationManager; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 public override string Name => "Bucket"; diff --git a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs index 2d07242116..da1fe70e05 100644 --- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs @@ -23,7 +23,6 @@ namespace Content.Server.GameObjects.Components.Fluids { #pragma warning disable 649 [Dependency] private readonly ILocalizationManager _localizationManager; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 public override string Name => "Mop"; diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index de692d0250..1af9f3cdea 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -29,7 +29,6 @@ namespace Content.Server.GameObjects.Components.Interactable #pragma warning disable 649 [Dependency] private readonly ISharedNotifyManager _notifyManager; [Dependency] private readonly ILocalizationManager _localizationManager; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 [ViewVariables(VVAccess.ReadWrite)] public float Wattage { get; set; } = 10; diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs index 201db6a3ec..5dfc8514b8 100644 --- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs @@ -48,10 +48,6 @@ namespace Content.Server.GameObjects.Components.Interactable } } -#pragma warning disable 649 - [Dependency] private IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 - public override string Name => "MultiTool"; public override uint? NetID => ContentNetIDs.MULTITOOLS; private List _tools; diff --git a/Content.Server/GameObjects/Components/Items/DiceComponent.cs b/Content.Server/GameObjects/Components/Items/DiceComponent.cs index 4b09b28c6c..6fc0407b37 100644 --- a/Content.Server/GameObjects/Components/Items/DiceComponent.cs +++ b/Content.Server/GameObjects/Components/Items/DiceComponent.cs @@ -25,7 +25,6 @@ namespace Content.Server.GameObjects.Components.Items #pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IRobustRandom _random; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 public override string Name => "Dice"; diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index 5d661e74b2..d2ce9b31ae 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -21,7 +21,6 @@ namespace Content.Server.GameObjects.Components.Items { #pragma warning disable 649 [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IMapManager _mapManager; #pragma warning restore 649 diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 5720cd7528..45447a87a1 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -30,9 +30,6 @@ namespace Content.Server.GameObjects.Components [ComponentReference(typeof(IStorageComponent))] public class EntityStorageComponent : Component, IActivate, IStorageComponent, IInteractUsing { -#pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 public override string Name => "EntityStorage"; private const float MaxSize = 1.0f; // maximum width or height of an entity allowed inside the storage. diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index 466aefcfd7..d5402489ec 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -34,7 +34,6 @@ namespace Content.Server.GameObjects.Components.Kitchen public class MicrowaveComponent : SharedMicrowaveComponent, IActivate, IInteractUsing, ISolutionChange { #pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IEntityManager _entityManager; [Dependency] private readonly RecipeManager _recipeManager; [Dependency] private readonly IServerNotifyManager _notifyManager; diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs index 230a5fcf94..3b268ab71a 100644 --- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs @@ -23,7 +23,6 @@ namespace Content.Server.GameObjects.Components.Mining #pragma warning disable 649 [Dependency] private readonly IRobustRandom _random; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 public override void Initialize() diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 1c429d1dab..43f0fb4abb 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -28,7 +28,6 @@ namespace Content.Server.GameObjects.Components.Mobs public override string Name => "Stunnable"; #pragma warning disable 649 - [Dependency] private IEntitySystemManager _entitySystemManager; [Dependency] private IGameTiming _gameTiming; #pragma warning restore 649 diff --git a/Content.Server/GameObjects/Components/Power/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcComponent.cs index bcd6f56cb4..41e577cc63 100644 --- a/Content.Server/GameObjects/Components/Power/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcComponent.cs @@ -16,9 +16,6 @@ namespace Content.Server.GameObjects.Components.Power [ComponentReference(typeof(IActivate))] public sealed class ApcComponent : SharedApcComponent, IActivate { -#pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 PowerStorageComponent Storage; AppearanceComponent Appearance; private PowerProviderComponent _provider; diff --git a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs index 0809c193c4..d01520ec21 100644 --- a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs @@ -23,10 +23,6 @@ namespace Content.Server.GameObjects.Components.Power [RegisterComponent] public class PoweredLightComponent : Component, IInteractHand, IInteractUsing { - -#pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 public override string Name => "PoweredLight"; private static readonly TimeSpan _thunkDelay = TimeSpan.FromSeconds(2); diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs index a061f10044..6c74400096 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs @@ -25,7 +25,6 @@ namespace Content.Server.GameObjects.Components.Research { #pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IRobustRandom _random; #pragma warning restore 649 diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs index b3989ed6a5..81f045259a 100644 --- a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs @@ -21,7 +21,6 @@ namespace Content.Server.GameObjects.Components.Sound #pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IRobustRandom _footstepRandom; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 /// /// diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 7ee36834d6..9b95978d11 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -28,7 +28,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee { #pragma warning disable 649 [Dependency] private IRobustRandom _robustRandom; - [Dependency] private IEntitySystemManager _entitySystemManager; [Dependency] private readonly ISharedNotifyManager _notifyManager; [Dependency] private readonly ILocalizationManager _localizationManager; #pragma warning restore 649 diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 75da303098..1e6d7aa95c 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -27,9 +27,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan [RegisterComponent] public class HitscanWeaponComponent : Component, IInteractUsing { -#pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 private const float MaxLength = 20; public override string Name => "HitscanWeapon"; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index d8d829bf3f..42471b8191 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -30,10 +30,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile [RegisterComponent] public class BallisticMagazineWeaponComponent : BallisticWeaponComponent, IUse, IInteractUsing, IMapInit { - -#pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 private const float BulletOffset = 0.2f; public override string Name => "BallisticMagazineWeapon"; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs index 3e30f26b43..6bfed83aa7 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs @@ -16,10 +16,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile /// public abstract class BallisticWeaponComponent : BaseProjectileWeaponComponent { -#pragma warning disable 649 - [Dependency] private readonly IEntitySystemManager _entitySystemManager; -#pragma warning restore 649 - private Chamber[] _chambers; /// diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs index 1633028588..6bd4aec1e5 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs @@ -29,7 +29,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile #pragma warning disable 649 [Dependency] private IRobustRandom _spreadRandom; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; #pragma warning restore 649 public override void ExposeData(ObjectSerializer serializer) diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs index 55de5563e4..5bfb57b4d8 100644 --- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs @@ -24,7 +24,6 @@ namespace Content.Server.GameObjects.EntitySystems #pragma warning disable 649 [Dependency] private readonly IMapManager _mapManager; [Dependency] private readonly IPlayerManager _playerManager; - [Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IRobustRandom _random; #pragma warning restore 649