From 2699540526de14367446a4139f74002219c546da Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Wed, 8 Dec 2021 12:43:38 +0100 Subject: [PATCH] Remove useless resolves from a buncha tests. --- .../Preferences/UI/CharacterSetupGui.xaml.cs | 2 +- .../Recycling/RecyclerVisualizer.cs | 5 +- Content.Client/Rotation/RotationVisualizer.cs | 5 +- .../RadiationCollectorVisualizer.cs | 5 +- .../Spawners/ClientEntitySpawnerComponent.cs | 6 +- .../Trigger/TimerTriggerVisualizer.cs | 10 +- .../UI/VendingMachineVisualizer.cs | 10 +- .../VendingMachineBoundUserInterface.cs | 5 +- Content.Client/Verbs/VerbSystem.cs | 4 +- .../Wall/Components/LowWallComponent.cs | 21 ++-- .../Melee/Components/MeleeLungeComponent.cs | 6 +- .../MeleeWeaponArcAnimationComponent.cs | 15 ++- .../Tests/Body/LegTest.cs | 4 +- .../Tests/Body/LungTest.cs | 10 +- .../Tests/ClickableTest.cs | 8 +- .../Tests/ContainerOcclusionTest.cs | 8 +- .../Tests/DeleteInventoryTest.cs | 6 +- .../Tests/DeviceNetwork/DeviceNetworkTest.cs | 16 +-- .../Tests/Disposal/DisposalUnitTest.cs | 14 +-- .../Tests/Doors/AirlockTest.cs | 12 +- Content.IntegrationTests/Tests/EntityTest.cs | 10 +- .../Tests/Fluids/PuddleTest.cs | 26 +++-- .../Components/Mobs/ActionsComponentTests.cs | 4 +- .../Components/Movement/ClimbUnitTest.cs | 2 +- .../Tests/Gravity/WeightlessStatusTests.cs | 4 +- .../Tests/GravityGridTest.cs | 21 ++-- .../Tests/HumanInventoryUniformSlotsTest.cs | 2 +- .../Tests/Interaction/InRangeUnobstructed.cs | 4 +- .../Tests/MindEntityDeletionTest.cs | 18 +-- .../Tests/Power/PowerTest.cs | 110 +++++++++--------- 30 files changed, 189 insertions(+), 184 deletions(-) diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs index f08a74d1e5..d2b8060ddb 100644 --- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs +++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs @@ -163,7 +163,7 @@ namespace Content.Client.Preferences.UI var view = new SpriteView { - Sprite = IoCManager.Resolve().GetComponent(_previewDummy), + Sprite = entityManager.GetComponent(_previewDummy), Scale = (2, 2), OverrideDirection = Direction.South }; diff --git a/Content.Client/Recycling/RecyclerVisualizer.cs b/Content.Client/Recycling/RecyclerVisualizer.cs index a1580ee17b..0111100f0b 100644 --- a/Content.Client/Recycling/RecyclerVisualizer.cs +++ b/Content.Client/Recycling/RecyclerVisualizer.cs @@ -21,8 +21,9 @@ namespace Content.Client.Recycling { base.InitializeEntity(entity); - if (!IoCManager.Resolve().TryGetComponent(entity, out ISpriteComponent? sprite) || - !IoCManager.Resolve().TryGetComponent(entity, out AppearanceComponent? appearance)) + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(entity, out ISpriteComponent? sprite) || + !entMan.TryGetComponent(entity, out AppearanceComponent? appearance)) { return; } diff --git a/Content.Client/Rotation/RotationVisualizer.cs b/Content.Client/Rotation/RotationVisualizer.cs index f8a2c519bd..2021c5b76a 100644 --- a/Content.Client/Rotation/RotationVisualizer.cs +++ b/Content.Client/Rotation/RotationVisualizer.cs @@ -33,9 +33,10 @@ namespace Content.Client.Rotation private void SetRotation(AppearanceComponent component, Angle rotation) { - var sprite = IoCManager.Resolve().GetComponent(component.Owner); + var entMan = IoCManager.Resolve(); + var sprite = entMan.GetComponent(component.Owner); - if (!IoCManager.Resolve().TryGetComponent(sprite.Owner, out AnimationPlayerComponent? animation)) + if (!entMan.TryGetComponent(sprite.Owner, out AnimationPlayerComponent? animation)) { sprite.Rotation = rotation; return; diff --git a/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs index 02c527f1f6..b07424139c 100644 --- a/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs +++ b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs @@ -46,10 +46,7 @@ namespace Content.Client.Singularity.Visualizers public override void InitializeEntity(EntityUid entity) { - if (!IoCManager.Resolve().HasComponent(entity)) - { - IoCManager.Resolve().AddComponent(entity); - } + IoCManager.Resolve().EnsureComponent(entity); } public override void OnChangeData(AppearanceComponent component) diff --git a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs index 0b8a698045..0c4b5848f4 100644 --- a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs +++ b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs @@ -11,6 +11,8 @@ namespace Content.Client.Spawners [RegisterComponent] public class ClientEntitySpawnerComponent : Component { + [Dependency] private readonly IEntityManager _entMan = default!; + public override string Name => "ClientEntitySpawner"; [DataField("prototypes")] private List _prototypes = new() { "HVDummyWire" }; @@ -33,7 +35,7 @@ namespace Content.Client.Spawners { foreach (var proto in _prototypes) { - var entity = IoCManager.Resolve().SpawnEntity(proto, IoCManager.Resolve().GetComponent(Owner).Coordinates); + var entity = _entMan.SpawnEntity(proto, _entMan.GetComponent(Owner).Coordinates); _entity.Add(entity); } } @@ -42,7 +44,7 @@ namespace Content.Client.Spawners { foreach (var entity in _entity) { - IoCManager.Resolve().DeleteEntity(entity); + _entMan.DeleteEntity(entity); } } } diff --git a/Content.Client/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs index 19061d1bdc..b3406411e4 100644 --- a/Content.Client/Trigger/TimerTriggerVisualizer.cs +++ b/Content.Client/Trigger/TimerTriggerVisualizer.cs @@ -38,16 +38,14 @@ namespace Content.Client.Trigger public override void InitializeEntity(EntityUid entity) { - if (!IoCManager.Resolve().HasComponent(entity)) - { - IoCManager.Resolve().AddComponent(entity); - } + IoCManager.Resolve().EnsureComponent(entity); } public override void OnChangeData(AppearanceComponent component) { - var sprite = IoCManager.Resolve().GetComponent(component.Owner); - var animPlayer = IoCManager.Resolve().GetComponent(component.Owner); + var entMan = IoCManager.Resolve(); + var sprite = entMan.GetComponent(component.Owner); + var animPlayer = entMan.GetComponent(component.Owner); if (!component.TryGetData(TriggerVisuals.VisualState, out TriggerVisualState state)) { state = TriggerVisualState.Unprimed; diff --git a/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs b/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs index 0538828536..70167300b4 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs @@ -121,10 +121,7 @@ namespace Content.Client.VendingMachines.UI { base.InitializeEntity(entity); - if (!IoCManager.Resolve().HasComponent(entity)) - { - IoCManager.Resolve().AddComponent(entity); - } + IoCManager.Resolve().EnsureComponent(entity); } private void HideLayers(ISpriteComponent spriteComponent) @@ -141,8 +138,9 @@ namespace Content.Client.VendingMachines.UI { base.OnChangeData(component); - var sprite = IoCManager.Resolve().GetComponent(component.Owner); - var animPlayer = IoCManager.Resolve().GetComponent(component.Owner); + var entMan = IoCManager.Resolve(); + var sprite = entMan.GetComponent(component.Owner); + var animPlayer = entMan.GetComponent(component.Owner); if (!component.TryGetData(VendingMachineVisuals.VisualState, out VendingMachineVisualState state)) { state = VendingMachineVisualState.Normal; diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 57e8b14340..1e91abd42f 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -23,14 +23,15 @@ namespace Content.Client.VendingMachines { base.Open(); - if (!IoCManager.Resolve().TryGetComponent(Owner.Owner, out SharedVendingMachineComponent? vendingMachine)) + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(Owner.Owner, out SharedVendingMachineComponent? vendingMachine)) { return; } VendingMachine = vendingMachine; - _menu = new VendingMachineMenu(this) {Title = IoCManager.Resolve().GetComponent(Owner.Owner).EntityName}; + _menu = new VendingMachineMenu(this) {Title = entMan.GetComponent(Owner.Owner).EntityName}; _menu.Populate(VendingMachine.Inventory); _menu.OnClose += Close; diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index 732704bac2..51f1a03d75 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -153,12 +153,12 @@ namespace Content.Client.Verbs // Remove any entities that do not have LOS if ((visibility & MenuVisibility.NoFov) == 0) { - var playerPos = IoCManager.Resolve().GetComponent(player.Value).MapPosition; + var playerPos = EntityManager.GetComponent(player.Value).MapPosition; foreach (var entity in entities.ToList()) { if (!ExamineSystemShared.InRangeUnOccluded( playerPos, - IoCManager.Resolve().GetComponent(entity).MapPosition, + EntityManager.GetComponent(entity).MapPosition, ExamineSystemShared.ExamineRange, null)) { diff --git a/Content.Client/Wall/Components/LowWallComponent.cs b/Content.Client/Wall/Components/LowWallComponent.cs index 21d26b55c8..8c92261847 100644 --- a/Content.Client/Wall/Components/LowWallComponent.cs +++ b/Content.Client/Wall/Components/LowWallComponent.cs @@ -26,6 +26,7 @@ namespace Content.Client.Wall.Components { public override string Name => "LowWall"; + [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IMapManager _mapManager = default!; public CornerFill LastCornerNE { get; private set; } @@ -42,11 +43,11 @@ namespace Content.Client.Wall.Components { base.Startup(); - _overlayEntity = IoCManager.Resolve().SpawnEntity("LowWallOverlay", IoCManager.Resolve().GetComponent(Owner).Coordinates); - IoCManager.Resolve().GetComponent(_overlayEntity).AttachParent(Owner); - IoCManager.Resolve().GetComponent(_overlayEntity).LocalPosition = Vector2.Zero; + _overlayEntity = _entMan.SpawnEntity("LowWallOverlay", _entMan.GetComponent(Owner).Coordinates); + _entMan.GetComponent(_overlayEntity).AttachParent(Owner); + _entMan.GetComponent(_overlayEntity).LocalPosition = Vector2.Zero; - _overlaySprite = IoCManager.Resolve().GetComponent(_overlayEntity); + _overlaySprite = _entMan.GetComponent(_overlayEntity); var overState0 = $"{StateBase}over_0"; _overlaySprite.LayerMapSet(OverCornerLayers.SE, _overlaySprite.AddLayerState(overState0)); @@ -66,7 +67,7 @@ namespace Content.Client.Wall.Components EntityUid tempQualifier = _overlayEntity; if (tempQualifier != null) { - IoCManager.Resolve().DeleteEntity(tempQualifier); + _entMan.DeleteEntity(tempQualifier); } } @@ -74,13 +75,13 @@ namespace Content.Client.Wall.Components { base.CalculateNewSprite(); - if (Sprite == null || !IoCManager.Resolve().GetComponent(Owner).Anchored || _overlaySprite == null) + if (Sprite == null || !_entMan.GetComponent(Owner).Anchored || _overlaySprite == null) { return; } - var grid = _mapManager.GetGrid(IoCManager.Resolve().GetComponent(Owner).GridID); - var coords = IoCManager.Resolve().GetComponent(Owner).Coordinates; + var grid = _mapManager.GetGrid(_entMan.GetComponent(Owner).GridID); + var coords = _entMan.GetComponent(Owner).Coordinates; var (n, nl) = MatchingWall(grid.GetInDir(coords, Direction.North)); var (ne, nel) = MatchingWall(grid.GetInDir(coords, Direction.NorthEast)); @@ -208,7 +209,7 @@ namespace Content.Client.Wall.Components foreach (var entity in grid.GetLocal(coords)) { - if (IoCManager.Resolve().TryGetComponent(entity, out WindowComponent? window)) + if (_entMan.TryGetComponent(entity, out WindowComponent? window)) { //window.UpdateSprite(); } @@ -220,7 +221,7 @@ namespace Content.Client.Wall.Components { foreach (var entity in candidates) { - if (!IoCManager.Resolve().TryGetComponent(entity, out IconSmoothComponent? other)) + if (!_entMan.TryGetComponent(entity, out IconSmoothComponent? other)) { continue; } diff --git a/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs index 70b905a12c..d9e91e894b 100644 --- a/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs +++ b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs @@ -39,14 +39,16 @@ namespace Content.Client.Weapons.Melee.Components offset *= (ResetTime - _time) / ResetTime; } - if (IoCManager.Resolve().TryGetComponent(Owner, out ISpriteComponent? spriteComponent)) + var entMan = IoCManager.Resolve(); + + if (entMan.TryGetComponent(Owner, out ISpriteComponent? spriteComponent)) { spriteComponent.Offset = offset; } if (deleteSelf) { - IoCManager.Resolve().RemoveComponent(Owner); + entMan.RemoveComponent(Owner); } } } diff --git a/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs index 0c80abd800..1860c0b1a0 100644 --- a/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs +++ b/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs @@ -10,6 +10,8 @@ namespace Content.Client.Weapons.Melee.Components [RegisterComponent] public sealed class MeleeWeaponArcAnimationComponent : Component { + [Dependency] private readonly IEntityManager _entMan = default!; + public override string Name => "MeleeWeaponArcAnimation"; private MeleeWeaponAnimationPrototype? _meleeWeaponAnimation; @@ -22,7 +24,7 @@ namespace Content.Client.Weapons.Melee.Components { base.Initialize(); - _sprite = IoCManager.Resolve().GetComponent(Owner); + _sprite = _entMan.GetComponent(Owner); } public void SetData(MeleeWeaponAnimationPrototype prototype, Angle baseAngle, EntityUid attacker, bool followAttacker = true) @@ -31,7 +33,7 @@ namespace Content.Client.Weapons.Melee.Components _sprite?.AddLayer(new RSI.StateId(prototype.State)); _baseAngle = baseAngle; if(followAttacker) - IoCManager.Resolve().GetComponent(Owner).AttachParent(attacker); + _entMan.GetComponent(Owner).AttachParent(attacker); } internal void Update(float frameTime) @@ -51,16 +53,17 @@ namespace Content.Client.Weapons.Melee.Components _sprite.Color = new Color(r, g, b, a); } + var transform = _entMan.GetComponent(Owner); + switch (_meleeWeaponAnimation.ArcType) { case WeaponArcType.Slash: var angle = Angle.FromDegrees(_meleeWeaponAnimation.Width)/2; - IoCManager.Resolve().GetComponent(Owner).WorldRotation = - _baseAngle + Angle.Lerp(-angle, angle, (float) (_timer / _meleeWeaponAnimation.Length.TotalSeconds)); + transform.WorldRotation = _baseAngle + Angle.Lerp(-angle, angle, (float) (_timer / _meleeWeaponAnimation.Length.TotalSeconds)); break; case WeaponArcType.Poke: - IoCManager.Resolve().GetComponent(Owner).WorldRotation = _baseAngle; + transform.WorldRotation = _baseAngle; if (_sprite != null) { @@ -72,7 +75,7 @@ namespace Content.Client.Weapons.Melee.Components if (_meleeWeaponAnimation.Length.TotalSeconds <= _timer) { - IoCManager.Resolve().DeleteEntity(Owner); + _entMan.DeleteEntity(Owner); } } } diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs index 835d67256d..b2b484315d 100644 --- a/Content.IntegrationTests/Tests/Body/LegTest.cs +++ b/Content.IntegrationTests/Tests/Body/LegTest.cs @@ -48,8 +48,8 @@ namespace Content.IntegrationTests.Tests.Body var entityManager = IoCManager.Resolve(); var human = entityManager.SpawnEntity("HumanBodyAndAppearanceDummy", new MapCoordinates(Vector2.Zero, mapId)); - Assert.That(IoCManager.Resolve().TryGetComponent(human, out SharedBodyComponent body)); - Assert.That(IoCManager.Resolve().TryGetComponent(human, out appearance)); + Assert.That(entityManager.TryGetComponent(human, out SharedBodyComponent body)); + Assert.That(entityManager.TryGetComponent(human, out appearance)); Assert.That(!appearance.TryGetData(RotationVisuals.RotationState, out RotationState _)); diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs index 78875aecb1..ec1c809f92 100644 --- a/Content.IntegrationTests/Tests/Body/LungTest.cs +++ b/Content.IntegrationTests/Tests/Body/LungTest.cs @@ -66,11 +66,11 @@ namespace Content.IntegrationTests.Tests.Body var bodySys = EntitySystem.Get(); var lungSys = EntitySystem.Get(); - Assert.That(IoCManager.Resolve().TryGetComponent(human, out SharedBodyComponent body)); + Assert.That(entityManager.TryGetComponent(human, out SharedBodyComponent body)); var lungs = bodySys.GetComponentsOnMechanisms(human, body).ToArray(); Assert.That(lungs.Count, Is.EqualTo(1)); - Assert.That(IoCManager.Resolve().TryGetComponent(human, out BloodstreamComponent bloodstream)); + Assert.That(entityManager.TryGetComponent(human, out BloodstreamComponent bloodstream)); var gas = new GasMixture(1); @@ -171,8 +171,8 @@ namespace Content.IntegrationTests.Tests.Body var coordinates = new EntityCoordinates(grid.GridEntityId, center); human = entityManager.SpawnEntity("HumanBodyAndBloodstreamDummy", coordinates); - Assert.True(IoCManager.Resolve().HasComponent(human)); - Assert.True(IoCManager.Resolve().TryGetComponent(human, out respirator)); + Assert.True(entityManager.HasComponent(human)); + Assert.True(entityManager.TryGetComponent(human, out respirator)); Assert.False(respirator.Suffocating); }); @@ -184,7 +184,7 @@ namespace Content.IntegrationTests.Tests.Body await server.WaitRunTicks(increment); await server.WaitAssertion(() => { - Assert.False(respirator.Suffocating, $"Entity {IoCManager.Resolve().GetComponent(human).EntityName} is suffocating on tick {tick}"); + Assert.False(respirator.Suffocating, $"Entity {entityManager.GetComponent(human).EntityName} is suffocating on tick {tick}"); }); } diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs index 66a9d8b79e..9f98ccc03f 100644 --- a/Content.IntegrationTests/Tests/ClickableTest.cs +++ b/Content.IntegrationTests/Tests/ClickableTest.cs @@ -77,11 +77,11 @@ namespace Content.IntegrationTests.Tests await _server.WaitPost(() => { var gridEnt = mapManager.GetAllGrids().First().GridEntityId; - worldPos = IoCManager.Resolve().GetComponent(gridEnt).WorldPosition; + worldPos = serverEntManager.GetComponent(gridEnt).WorldPosition; var ent = serverEntManager.SpawnEntity(prototype, new EntityCoordinates(gridEnt, 0f, 0f)); - IoCManager.Resolve().GetComponent(ent).LocalRotation = angle; - IoCManager.Resolve().GetComponent(ent).Scale = (scale, scale); + serverEntManager.GetComponent(ent).LocalRotation = angle; + serverEntManager.GetComponent(ent).Scale = (scale, scale); entity = ent; }); @@ -92,7 +92,7 @@ namespace Content.IntegrationTests.Tests await _client.WaitPost(() => { - var clickable = IoCManager.Resolve().GetComponent(entity); + var clickable = clientEntManager.GetComponent(entity); hit = clickable.CheckClick((clickPosX, clickPosY) + worldPos!.Value, out _, out _); }); diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs index a63f0f0019..21fa17d50d 100644 --- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs +++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs @@ -86,7 +86,7 @@ namespace Content.IntegrationTests.Tests var container = ent.SpawnEntity("ContainerOcclusionA", pos); dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos); - IoCManager.Resolve().GetComponent(container).Insert(dummy); + ent.GetComponent(container).Insert(dummy); }); await RunTicksSync(c, s, 5); @@ -119,7 +119,7 @@ namespace Content.IntegrationTests.Tests var container = ent.SpawnEntity("ContainerOcclusionB", pos); dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos); - IoCManager.Resolve().GetComponent(container).Insert(dummy); + ent.GetComponent(container).Insert(dummy); }); await RunTicksSync(c, s, 5); @@ -153,8 +153,8 @@ namespace Content.IntegrationTests.Tests var containerB = ent.SpawnEntity("ContainerOcclusionB", pos); dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos); - IoCManager.Resolve().GetComponent(containerA).Insert(containerB); - IoCManager.Resolve().GetComponent(containerB).Insert(dummy); + ent.GetComponent(containerA).Insert(containerB); + ent.GetComponent(containerB).Insert(dummy); }); await RunTicksSync(c, s, 5); diff --git a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs index dde7ab1bab..64e87cd90c 100644 --- a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs +++ b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs @@ -28,17 +28,17 @@ namespace Content.IntegrationTests.Tests var entMgr = IoCManager.Resolve(); var container = entMgr.SpawnEntity(null, MapCoordinates.Nullspace); - var inv = IoCManager.Resolve().AddComponent(container); + var inv = entMgr.AddComponent(container); var child = entMgr.SpawnEntity(null, MapCoordinates.Nullspace); - var item = IoCManager.Resolve().AddComponent(child); + var item = entMgr.AddComponent(child); item.SlotFlags = SlotFlags.HEAD; // Equip item. Assert.That(inv.Equip(Slots.HEAD, item, false), Is.True); // Delete parent. - IoCManager.Resolve().DeleteEntity(container); + entMgr.DeleteEntity(container); // Assert that child item was also deleted. Assert.That(item.Deleted, Is.True); diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs index 7b8f0e4602..c76392ce85 100644 --- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs +++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs @@ -82,13 +82,13 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork device1 = entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace); - Assert.That(IoCManager.Resolve().TryGetComponent(device1, out networkComponent1), Is.True); + Assert.That(entityManager.TryGetComponent(device1, out networkComponent1), Is.True); Assert.That(networkComponent1.Open, Is.True); Assert.That(networkComponent1.Address, Is.Not.EqualTo(string.Empty)); device2 = entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace); - Assert.That(IoCManager.Resolve().TryGetComponent(device2, out networkComponent2), Is.True); + Assert.That(entityManager.TryGetComponent(device2, out networkComponent2), Is.True); Assert.That(networkComponent2.Open, Is.True); Assert.That(networkComponent2.Address, Is.Not.EqualTo(string.Empty)); @@ -145,14 +145,14 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork device1 = entityManager.SpawnEntity("DummyWirelessNetworkDevice", MapCoordinates.Nullspace); - Assert.That(IoCManager.Resolve().TryGetComponent(device1, out networkComponent1), Is.True); - Assert.That(IoCManager.Resolve().TryGetComponent(device1, out wirelessNetworkComponent), Is.True); + Assert.That(entityManager.TryGetComponent(device1, out networkComponent1), Is.True); + Assert.That(entityManager.TryGetComponent(device1, out wirelessNetworkComponent), Is.True); Assert.That(networkComponent1.Open, Is.True); Assert.That(networkComponent1.Address, Is.Not.EqualTo(string.Empty)); device2 = entityManager.SpawnEntity("DummyWirelessNetworkDevice", new MapCoordinates(new Robust.Shared.Maths.Vector2(0,50), MapId.Nullspace)); - Assert.That(IoCManager.Resolve().TryGetComponent(device2, out networkComponent2), Is.True); + Assert.That(entityManager.TryGetComponent(device2, out networkComponent2), Is.True); Assert.That(networkComponent2.Open, Is.True); Assert.That(networkComponent2.Address, Is.Not.EqualTo(string.Empty)); @@ -232,14 +232,14 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork device1 = entityManager.SpawnEntity("DummyWiredNetworkDevice", MapCoordinates.Nullspace); - Assert.That(IoCManager.Resolve().TryGetComponent(device1, out networkComponent1), Is.True); - Assert.That(IoCManager.Resolve().TryGetComponent(device1, out wiredNetworkComponent), Is.True); + Assert.That(entityManager.TryGetComponent(device1, out networkComponent1), Is.True); + Assert.That(entityManager.TryGetComponent(device1, out wiredNetworkComponent), Is.True); Assert.That(networkComponent1.Open, Is.True); Assert.That(networkComponent1.Address, Is.Not.EqualTo(string.Empty)); device2 = entityManager.SpawnEntity("DummyWiredNetworkDevice", new MapCoordinates(new Robust.Shared.Maths.Vector2(0, 2), MapId.Nullspace)); - Assert.That(IoCManager.Resolve().TryGetComponent(device2, out networkComponent2), Is.True); + Assert.That(entityManager.TryGetComponent(device2, out networkComponent2), Is.True); Assert.That(networkComponent2.Open, Is.True); Assert.That(networkComponent2.Address, Is.Not.EqualTo(string.Empty)); diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index 660735d28f..09d4619d40 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -147,18 +147,18 @@ namespace Content.IntegrationTests.Tests.Disposal // Test for components existing ref DisposalUnitComponent? comp = ref unit!; - Assert.True(IoCManager.Resolve().TryGetComponent(disposalUnit, out comp)); - Assert.True(IoCManager.Resolve().HasComponent(disposalTrunk)); + Assert.True(entityManager.TryGetComponent(disposalUnit, out comp)); + Assert.True(entityManager.HasComponent(disposalTrunk)); // Can't insert, unanchored and unpowered - IoCManager.Resolve().GetComponent(unit.Owner).Anchored = false; + entityManager.GetComponent(unit.Owner).Anchored = false; UnitInsertContains(unit, false, human, wrench, disposalUnit, disposalTrunk); }); await server.WaitAssertion(() => { // Anchor the disposal unit - IoCManager.Resolve().GetComponent(unit.Owner).Anchored = true; + entityManager.GetComponent(unit.Owner).Anchored = true; // No power Assert.False(unit.Powered); @@ -173,7 +173,7 @@ namespace Content.IntegrationTests.Tests.Disposal await server.WaitAssertion(() => { // Move the disposal trunk away - IoCManager.Resolve().GetComponent(disposalTrunk).WorldPosition += (1, 0); + entityManager.GetComponent(disposalTrunk).WorldPosition += (1, 0); // Fail to flush with a mob and an item Flush(unit, false, human, wrench); @@ -182,7 +182,7 @@ namespace Content.IntegrationTests.Tests.Disposal await server.WaitAssertion(() => { // Move the disposal trunk back - IoCManager.Resolve().GetComponent(disposalTrunk).WorldPosition -= (1, 0); + entityManager.GetComponent(disposalTrunk).WorldPosition -= (1, 0); // Fail to flush with a mob and an item, no power Flush(unit, false, human, wrench); @@ -191,7 +191,7 @@ namespace Content.IntegrationTests.Tests.Disposal await server.WaitAssertion(() => { // Remove power need - Assert.True(IoCManager.Resolve().TryGetComponent(disposalUnit, out ApcPowerReceiverComponent power)); + Assert.True(entityManager.TryGetComponent(disposalUnit, out ApcPowerReceiverComponent power)); power!.NeedsPower = false; Assert.True(unit.Powered); diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs index 10627b8b4b..92b1d4c877 100644 --- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs +++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs @@ -65,7 +65,7 @@ namespace Content.IntegrationTests.Tests.Doors airlock = entityManager.SpawnEntity("AirlockDummy", MapCoordinates.Nullspace); - Assert.True(IoCManager.Resolve().TryGetComponent(airlock, out doorComponent)); + Assert.True(entityManager.TryGetComponent(airlock, out doorComponent)); Assert.That(doorComponent.State, Is.EqualTo(SharedDoorComponent.DoorState.Closed)); }); @@ -97,7 +97,7 @@ namespace Content.IntegrationTests.Tests.Doors { Assert.DoesNotThrow(() => { - IoCManager.Resolve().DeleteEntity(airlock); + entityManager.DeleteEntity(airlock); }); }); @@ -136,9 +136,9 @@ namespace Content.IntegrationTests.Tests.Doors airlock = entityManager.SpawnEntity("AirlockDummy", new MapCoordinates((0, 0), mapId)); - Assert.True(IoCManager.Resolve().TryGetComponent(physicsDummy, out physBody)); + Assert.True(entityManager.TryGetComponent(physicsDummy, out physBody)); - Assert.True(IoCManager.Resolve().TryGetComponent(airlock, out doorComponent)); + Assert.True(entityManager.TryGetComponent(airlock, out doorComponent)); Assert.That(doorComponent.State, Is.EqualTo(SharedDoorComponent.DoorState.Closed)); }); @@ -151,7 +151,7 @@ namespace Content.IntegrationTests.Tests.Doors for (var i = 0; i < 240; i += 10) { // Keep the airlock awake so they collide - server.Post(() => IoCManager.Resolve().GetComponent(airlock).WakeBody()); + server.Post(() => entityManager.GetComponent(airlock).WakeBody()); await server.WaitRunTicks(10); await server.WaitIdleAsync(); @@ -164,7 +164,7 @@ namespace Content.IntegrationTests.Tests.Doors // Assert.That(physicsDummy.Transform.MapPosition.X, Is.GreaterThan(physicsDummyStartingX)); // Blocked by the airlock - await server.WaitAssertion(() => Assert.That(Math.Abs(IoCManager.Resolve().GetComponent(physicsDummy).MapPosition.X - 1) > 0.01f)); + await server.WaitAssertion(() => Assert.That(Math.Abs(entityManager.GetComponent(physicsDummy).MapPosition.X - 1) > 0.01f)); } } } diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index f4f005a830..ad10c5bfc9 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -88,7 +88,7 @@ namespace Content.IntegrationTests.Tests Logger.LogS(LogLevel.Debug, "EntityTest", $"Testing: {prototype.ID}"); testEntity = entityMan.SpawnEntity(prototype.ID, testLocation); server.RunTicks(2); - Assert.That((!IoCManager.Resolve().EntityExists(testEntity) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(testEntity).EntityLifeStage) >= EntityLifeStage.Initialized); + Assert.That(entityMan.GetComponent(testEntity).EntityInitialized); entityMan.DeleteEntity(testEntity); }, "Entity '{0}' threw an exception.", prototype.ID); @@ -173,11 +173,11 @@ namespace Content.IntegrationTests.Tests var entity = entityManager.SpawnEntity("AllComponentsOneToOneDeleteTestEntity", testLocation); - Assert.That((!IoCManager.Resolve().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(entity).EntityLifeStage) >= EntityLifeStage.Initialized); + Assert.That(entityManager.GetComponent(entity).EntityInitialized); // The component may already exist if it is a mandatory component // such as MetaData or Transform - if (IoCManager.Resolve().HasComponent(entity, type)) + if (entityManager.HasComponent(entity, type)) { continue; } @@ -302,14 +302,14 @@ namespace Content.IntegrationTests.Tests var testLocation = grid.ToCoordinates(); var entity = entityManager.SpawnEntity("AllComponentsOneEntityDeleteTestEntity", testLocation); - Assert.That((!IoCManager.Resolve().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(entity).EntityLifeStage) >= EntityLifeStage.Initialized); + Assert.That(entityManager.GetComponent(entity).EntityInitialized); foreach (var type in distinct.components) { var component = (Component) componentFactory.GetComponent(type); // If the entity already has this component, if it was ensured or added by another - if (IoCManager.Resolve().HasComponent(entity, component.GetType())) + if (entityManager.HasComponent(entity, component.GetType())) { continue; } diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index 91e644c344..98a1ec5776 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -90,6 +90,7 @@ namespace Content.IntegrationTests.Tests.Fluids var sPauseManager = server.ResolveDependency(); var sTileDefinitionManager = server.ResolveDependency(); var sGameTiming = server.ResolveDependency(); + var entityManager = server.ResolveDependency(); MapId sMapId = default; IMapGrid sGrid; @@ -105,7 +106,7 @@ namespace Content.IntegrationTests.Tests.Fluids sGrid = sMapManager.CreateGrid(sMapId); sGridId = sGrid.Index; sGridEntity = sGrid.GridEntityId; - IoCManager.Resolve().GetComponent(sGridEntity).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444 + entityManager.GetComponent(sGridEntity).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444 var tileDefinition = sTileDefinitionManager["underplating"]; var tile = new Tile(tileDefinition.TileId); @@ -119,15 +120,15 @@ namespace Content.IntegrationTests.Tests.Fluids { Assert.True(sPauseManager.IsGridPaused(sGridId)); Assert.True(sPauseManager.IsMapPaused(sMapId)); - Assert.True((!IoCManager.Resolve().EntityExists(sGridEntity) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(sGridEntity).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(sGridEntity).EntityPaused); }); float evaporateTime = default; PuddleComponent puddle = null; + MetaDataComponent meta = null; EvaporationComponent evaporation; - + var amount = 2; - + var entitySystemManager = server.ResolveDependency(); var spillSystem = entitySystemManager.GetEntitySystem(); @@ -136,15 +137,16 @@ namespace Content.IntegrationTests.Tests.Fluids { var solution = new Solution("Water", FixedPoint2.New(amount)); puddle = spillSystem.SpillAt(solution, sCoordinates, "PuddleSmear"); + meta = entityManager.GetComponent(puddle.Owner); // Check that the puddle was created Assert.NotNull(puddle); - evaporation = IoCManager.Resolve().GetComponent(puddle.Owner); + evaporation = entityManager.GetComponent(puddle.Owner); - IoCManager.Resolve().GetComponent(puddle.Owner).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1445 + meta.EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1445 - Assert.True((!IoCManager.Resolve().EntityExists(puddle.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(puddle.Owner).EntityPaused); + Assert.True(meta.EntityPaused); // Check that the puddle is going to evaporate Assert.Positive(evaporation.EvaporateTime); @@ -162,10 +164,10 @@ namespace Content.IntegrationTests.Tests.Fluids // No evaporation due to being paused await server.WaitAssertion(() => { - Assert.True((!IoCManager.Resolve().EntityExists(puddle.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(puddle.Owner).EntityPaused); + Assert.True(meta.EntityPaused); // Check that the puddle still exists - Assert.False((!IoCManager.Resolve().EntityExists(puddle.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner).EntityLifeStage) >= EntityLifeStage.Deleted); + Assert.False(meta.EntityDeleted); }); // Unpause the map @@ -176,10 +178,10 @@ namespace Content.IntegrationTests.Tests.Fluids { Assert.False(sPauseManager.IsMapPaused(sMapId)); Assert.False(sPauseManager.IsGridPaused(sGridId)); - Assert.False((!IoCManager.Resolve().EntityExists(puddle.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(puddle.Owner).EntityPaused); + Assert.False(meta.EntityPaused); // Check that the puddle still exists - Assert.False((!IoCManager.Resolve().EntityExists(puddle.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner).EntityLifeStage) >= EntityLifeStage.Deleted); + Assert.False(meta.EntityDeleted); }); // Wait enough time for it to evaporate @@ -193,4 +195,4 @@ namespace Content.IntegrationTests.Tests.Fluids }); } } -} \ No newline at end of file +} diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs index 8afc0d2820..8fc33251b6 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs @@ -159,7 +159,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs { var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault(); Assert.That(playerEnt, Is.Not.EqualTo(default)); - var actionsComponent = IoCManager.Resolve().GetComponent(playerEnt); + var actionsComponent = sEntities.GetComponent(playerEnt); actionsComponent.Revoke(ActionType.DebugInstant); }); @@ -170,7 +170,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs { var local = clientPlayerMgr.LocalPlayer; var controlled = local!.ControlledEntity; - var actionsComponent = IoCManager.Resolve().GetComponent(controlled!.Value); + var actionsComponent = cEntities.GetComponent(controlled!.Value); // we should have our innate actions, but debug1 should be revoked foreach (var innateAction in innateActions) diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs index 83b7eb0275..d70703b6bc 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs @@ -59,7 +59,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement // Now let's make the player enter a climbing transitioning state. climbing.IsClimbing = true; - climbing.TryMoveTo(IoCManager.Resolve().GetComponent(human).WorldPosition, IoCManager.Resolve().GetComponent(table).WorldPosition); + climbing.TryMoveTo(entityManager.GetComponent(human).WorldPosition, entityManager.GetComponent(table).WorldPosition); var body = entityManager.GetComponent(human); // TODO: Check it's climbing diff --git a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs index 69a3a97e7f..862c30d6fe 100644 --- a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs +++ b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs @@ -52,7 +52,7 @@ namespace Content.IntegrationTests.Tests.Gravity var coordinates = grid.ToCoordinates(); human = entityManager.SpawnEntity("HumanDummy", coordinates); - Assert.True(IoCManager.Resolve().TryGetComponent(human, out alerts)); + Assert.True(entityManager.TryGetComponent(human, out alerts)); }); // Let WeightlessSystem and GravitySystem tick @@ -63,7 +63,7 @@ namespace Content.IntegrationTests.Tests.Gravity // No gravity without a gravity generator Assert.True(alerts.IsShowingAlert(AlertType.Weightless)); - entityManager.SpawnEntity("GravityGeneratorDummy", IoCManager.Resolve().GetComponent(human).Coordinates); + entityManager.SpawnEntity("GravityGeneratorDummy", entityManager.GetComponent(human).Coordinates); }); // Let WeightlessSystem and GravitySystem tick diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index a88623551a..ced045956c 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -34,6 +34,7 @@ namespace Content.IntegrationTests.Tests var server = StartServer(options); EntityUid generator = default; + var entityMan = server.ResolveDependency(); IMapGrid grid1 = null; IMapGrid grid2 = null; @@ -47,29 +48,27 @@ namespace Content.IntegrationTests.Tests grid1 = mapMan.CreateGrid(mapId); grid2 = mapMan.CreateGrid(mapId); - var entityMan = IoCManager.Resolve(); - generator = entityMan.SpawnEntity("GravityGeneratorDummy", grid2.ToCoordinates()); - Assert.That(IoCManager.Resolve().HasComponent(generator)); - Assert.That(IoCManager.Resolve().HasComponent(generator)); + Assert.That(entityMan.HasComponent(generator)); + Assert.That(entityMan.HasComponent(generator)); - var powerComponent = IoCManager.Resolve().GetComponent(generator); + var powerComponent = entityMan.GetComponent(generator); powerComponent.NeedsPower = false; }); server.RunTicks(1); server.Assert(() => { - var generatorComponent = IoCManager.Resolve().GetComponent(generator); - var powerComponent = IoCManager.Resolve().GetComponent(generator); + var generatorComponent = entityMan.GetComponent(generator); + var powerComponent = entityMan.GetComponent(generator); Assert.That(generatorComponent.GravityActive, Is.True); var grid1Entity = grid1.GridEntityId; var grid2Entity = grid2.GridEntityId; - Assert.That(!IoCManager.Resolve().GetComponent(grid1Entity).Enabled); - Assert.That(IoCManager.Resolve().GetComponent(grid2Entity).Enabled); + Assert.That(!entityMan.GetComponent(grid1Entity).Enabled); + Assert.That(entityMan.GetComponent(grid2Entity).Enabled); // Re-enable needs power so it turns off again. // Charge rate is ridiculously high so it finishes in one tick. @@ -78,13 +77,13 @@ namespace Content.IntegrationTests.Tests server.RunTicks(1); server.Assert(() => { - var generatorComponent = IoCManager.Resolve().GetComponent(generator); + var generatorComponent = entityMan.GetComponent(generator); Assert.That(generatorComponent.GravityActive, Is.False); var grid2Entity = grid2.GridEntityId; - Assert.That(IoCManager.Resolve().GetComponent(grid2Entity).Enabled, Is.False); + Assert.That(entityMan.GetComponent(grid2Entity).Enabled, Is.False); }); await server.WaitIdleAsync(); diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs index dd149f7659..98dfd08c07 100644 --- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs +++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs @@ -81,7 +81,7 @@ namespace Content.IntegrationTests.Tests pocketItem = entityMan.SpawnEntity("FlashlightDummy", MapCoordinates.Nullspace); var tooBigItem = entityMan.SpawnEntity("ToolboxDummy", MapCoordinates.Nullspace); - inventory = IoCManager.Resolve().GetComponent(human); + inventory = entityMan.GetComponent(human); Assert.That(inventory.CanEquip(Slots.INNERCLOTHING, uniform)); diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs index b56deeb030..f09b7f2e78 100644 --- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs +++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs @@ -83,7 +83,7 @@ namespace Content.IntegrationTests.Tests.Interaction // Move them slightly apart - IoCManager.Resolve().GetComponent(origin).LocalPosition += _interactionRangeDivided15X; + sEntities.GetComponent(origin).LocalPosition += _interactionRangeDivided15X; // Entity <-> Entity Assert.True(origin.InRangeUnobstructed(other)); @@ -107,7 +107,7 @@ namespace Content.IntegrationTests.Tests.Interaction // Move them out of range - IoCManager.Resolve().GetComponent(origin).LocalPosition += _interactionRangeDivided15X; + sEntities.GetComponent(origin).LocalPosition += _interactionRangeDivided15X; // Entity <-> Entity Assert.False(origin.InRangeUnobstructed(other)); diff --git a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs index 6ae1c26fe3..fea9d938f9 100644 --- a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs +++ b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs @@ -20,6 +20,7 @@ namespace Content.IntegrationTests.Tests { var (_, server) = await StartConnectedServerDummyTickerClientPair(); + var entMan = server.ResolveDependency(); EntityUid playerEnt = default; EntityUid visitEnt = default; Mind mind = null; @@ -28,12 +29,11 @@ namespace Content.IntegrationTests.Tests var player = IoCManager.Resolve().ServerSessions.Single(); var mapMan = IoCManager.Resolve(); - var entMgr = IoCManager.Resolve(); mapMan.CreateNewMapEntity(MapId.Nullspace); - playerEnt = entMgr.SpawnEntity(null, MapCoordinates.Nullspace); - visitEnt = entMgr.SpawnEntity(null, MapCoordinates.Nullspace); + playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace); + visitEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace); mind = new Mind(player.UserId); mind.ChangeOwningPlayer(player.UserId); @@ -49,12 +49,12 @@ namespace Content.IntegrationTests.Tests server.Assert(() => { - IoCManager.Resolve().DeleteEntity(visitEnt); + entMan.DeleteEntity(visitEnt); Assert.That(mind.VisitingEntity, Is.EqualTo(default)); // This used to throw so make sure it doesn't. - IoCManager.Resolve().DeleteEntity(playerEnt); + entMan.DeleteEntity(playerEnt); }); await server.WaitIdleAsync(); @@ -66,6 +66,7 @@ namespace Content.IntegrationTests.Tests // Has to be a non-dummy ticker so we have a proper map. var (_, server) = await StartConnectedServerClientPair(); + var entMan = server.ResolveDependency(); EntityUid playerEnt = default; Mind mind = null; server.Assert(() => @@ -73,11 +74,10 @@ namespace Content.IntegrationTests.Tests var player = IoCManager.Resolve().ServerSessions.Single(); var mapMan = IoCManager.Resolve(); - var entMgr = IoCManager.Resolve(); mapMan.CreateNewMapEntity(MapId.Nullspace); - playerEnt = entMgr.SpawnEntity(null, MapCoordinates.Nullspace); + playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace); mind = new Mind(player.UserId); mind.ChangeOwningPlayer(player.UserId); @@ -91,14 +91,14 @@ namespace Content.IntegrationTests.Tests server.Post(() => { - IoCManager.Resolve().DeleteEntity(playerEnt); + entMan.DeleteEntity(playerEnt); }); server.RunTicks(1); server.Assert(() => { - Assert.That(IoCManager.Resolve().EntityExists(mind.CurrentEntity!.Value), Is.True); + Assert.That(entMan.EntityExists(mind.CurrentEntity!.Value), Is.True); }); await server.WaitIdleAsync(); diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs index 4db6e18806..e171b2aca3 100644 --- a/Content.IntegrationTests/Tests/Power/PowerTest.cs +++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs @@ -205,9 +205,9 @@ namespace Content.IntegrationTests.Tests.Power var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1)); var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); - supplier = IoCManager.Resolve().GetComponent(generatorEnt); - consumer1 = IoCManager.Resolve().GetComponent(consumerEnt1); - consumer2 = IoCManager.Resolve().GetComponent(consumerEnt2); + supplier = _entityManager.GetComponent(generatorEnt); + consumer1 = _entityManager.GetComponent(consumerEnt1); + consumer2 = _entityManager.GetComponent(consumerEnt2); // Plenty of surplus and tolerance supplier.MaxSupply = loadPower * 4; @@ -259,9 +259,9 @@ namespace Content.IntegrationTests.Tests.Power var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1)); var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); - supplier = IoCManager.Resolve().GetComponent(generatorEnt); - consumer1 = IoCManager.Resolve().GetComponent(consumerEnt1); - consumer2 = IoCManager.Resolve().GetComponent(consumerEnt2); + supplier = _entityManager.GetComponent(generatorEnt); + consumer1 = _entityManager.GetComponent(consumerEnt1); + consumer2 = _entityManager.GetComponent(consumerEnt2); // Too little supply, both consumers should get 33% power. supplier.MaxSupply = loadPower; @@ -306,8 +306,8 @@ namespace Content.IntegrationTests.Tests.Power var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); - supplier = IoCManager.Resolve().GetComponent(generatorEnt); - consumer = IoCManager.Resolve().GetComponent(consumerEnt); + supplier = _entityManager.GetComponent(generatorEnt); + consumer = _entityManager.GetComponent(consumerEnt); // Supply has enough total power but needs to ramp up to match. supplier.MaxSupply = 400; @@ -376,9 +376,9 @@ namespace Content.IntegrationTests.Tests.Power var generatorEnt = _entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates()); var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); - netBattery = IoCManager.Resolve().GetComponent(generatorEnt); - battery = IoCManager.Resolve().GetComponent(generatorEnt); - consumer = IoCManager.Resolve().GetComponent(consumerEnt); + netBattery = _entityManager.GetComponent(generatorEnt); + battery = _entityManager.GetComponent(generatorEnt); + consumer = _entityManager.GetComponent(consumerEnt); battery.MaxCharge = startingCharge; battery.CurrentCharge = startingCharge; @@ -454,9 +454,9 @@ namespace Content.IntegrationTests.Tests.Power var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); var batteryEnt = _entityManager.SpawnEntity("ChargingBatteryDummy", grid.ToCoordinates(0, 2)); - supplier = IoCManager.Resolve().GetComponent(generatorEnt); - var netBattery = IoCManager.Resolve().GetComponent(batteryEnt); - battery = IoCManager.Resolve().GetComponent(batteryEnt); + supplier = _entityManager.GetComponent(generatorEnt); + var netBattery = _entityManager.GetComponent(batteryEnt); + battery = _entityManager.GetComponent(batteryEnt); supplier.MaxSupply = 500; supplier.SupplyRampTolerance = 500; @@ -499,16 +499,16 @@ namespace Content.IntegrationTests.Tests.Power } var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); - IoCManager.Resolve().GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); + _entityManager.GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); var batteryEnt = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3)); - consumer = IoCManager.Resolve().GetComponent(consumerEnt); - supplier = IoCManager.Resolve().GetComponent(supplyEnt); - netBattery = IoCManager.Resolve().GetComponent(batteryEnt); - battery = IoCManager.Resolve().GetComponent(batteryEnt); + consumer = _entityManager.GetComponent(consumerEnt); + supplier = _entityManager.GetComponent(supplyEnt); + netBattery = _entityManager.GetComponent(batteryEnt); + battery = _entityManager.GetComponent(batteryEnt); // Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200. consumer.DrawRate = 1000; @@ -567,16 +567,16 @@ namespace Content.IntegrationTests.Tests.Power } var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); - IoCManager.Resolve().GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); + _entityManager.GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); var batteryEnt = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3)); - consumer = IoCManager.Resolve().GetComponent(consumerEnt); - supplier = IoCManager.Resolve().GetComponent(supplyEnt); - netBattery = IoCManager.Resolve().GetComponent(batteryEnt); - battery = IoCManager.Resolve().GetComponent(batteryEnt); + consumer = _entityManager.GetComponent(consumerEnt); + supplier = _entityManager.GetComponent(supplyEnt); + netBattery = _entityManager.GetComponent(batteryEnt); + battery = _entityManager.GetComponent(batteryEnt); // Consumer needs 1000 W, supply and battery can only provide 400 each. // BUT the battery has 50% input efficiency, so 50% of the power of the supply gets lost. @@ -643,7 +643,7 @@ namespace Content.IntegrationTests.Tests.Power _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); - IoCManager.Resolve().GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); + _entityManager.GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); var batteryEnt1 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1)); var batteryEnt2 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3)); @@ -651,13 +651,13 @@ namespace Content.IntegrationTests.Tests.Power var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0)); var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4)); - consumer1 = IoCManager.Resolve().GetComponent(consumerEnt1); - consumer2 = IoCManager.Resolve().GetComponent(consumerEnt2); - supplier = IoCManager.Resolve().GetComponent(supplyEnt); - var netBattery1 = IoCManager.Resolve().GetComponent(batteryEnt1); - var netBattery2 = IoCManager.Resolve().GetComponent(batteryEnt2); - var battery1 = IoCManager.Resolve().GetComponent(batteryEnt1); - var battery2 = IoCManager.Resolve().GetComponent(batteryEnt2); + consumer1 = _entityManager.GetComponent(consumerEnt1); + consumer2 = _entityManager.GetComponent(consumerEnt2); + supplier = _entityManager.GetComponent(supplyEnt); + var netBattery1 = _entityManager.GetComponent(batteryEnt1); + var netBattery2 = _entityManager.GetComponent(batteryEnt2); + var battery1 = _entityManager.GetComponent(batteryEnt1); + var battery2 = _entityManager.GetComponent(batteryEnt2); // There are two loads, 500 W and 1000 W respectively. // The 500 W load is behind a 50% efficient battery, @@ -730,7 +730,7 @@ namespace Content.IntegrationTests.Tests.Power _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); - IoCManager.Resolve().GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); + _entityManager.GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); var batteryEnt1 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1)); var batteryEnt2 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3)); @@ -738,13 +738,13 @@ namespace Content.IntegrationTests.Tests.Power var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0)); var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4)); - consumer1 = IoCManager.Resolve().GetComponent(consumerEnt1); - consumer2 = IoCManager.Resolve().GetComponent(consumerEnt2); - supplier = IoCManager.Resolve().GetComponent(supplyEnt); - var netBattery1 = IoCManager.Resolve().GetComponent(batteryEnt1); - var netBattery2 = IoCManager.Resolve().GetComponent(batteryEnt2); - var battery1 = IoCManager.Resolve().GetComponent(batteryEnt1); - var battery2 = IoCManager.Resolve().GetComponent(batteryEnt2); + consumer1 = _entityManager.GetComponent(consumerEnt1); + consumer2 = _entityManager.GetComponent(consumerEnt2); + supplier = _entityManager.GetComponent(supplyEnt); + var netBattery1 = _entityManager.GetComponent(batteryEnt1); + var netBattery2 = _entityManager.GetComponent(batteryEnt2); + var battery1 = _entityManager.GetComponent(batteryEnt1); + var battery2 = _entityManager.GetComponent(batteryEnt2); consumer1.DrawRate = 500; consumer2.DrawRate = 1000; @@ -800,16 +800,16 @@ namespace Content.IntegrationTests.Tests.Power } var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); - IoCManager.Resolve().GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); + _entityManager.GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); var batteryEnt = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3)); - consumer = IoCManager.Resolve().GetComponent(consumerEnt); - supplier = IoCManager.Resolve().GetComponent(supplyEnt); - netBattery = IoCManager.Resolve().GetComponent(batteryEnt); - var battery = IoCManager.Resolve().GetComponent(batteryEnt); + consumer = _entityManager.GetComponent(consumerEnt); + supplier = _entityManager.GetComponent(supplyEnt); + netBattery = _entityManager.GetComponent(batteryEnt); + var battery = _entityManager.GetComponent(batteryEnt); // Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200. consumer.DrawRate = 1000; @@ -879,13 +879,13 @@ namespace Content.IntegrationTests.Tests.Power var rightEnt = _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 3)); var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); - IoCManager.Resolve().GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); + _entityManager.GetComponent(terminal).LocalRotation = Angle.FromDegrees(180); var battery = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); - var batteryNodeContainer = IoCManager.Resolve().GetComponent(battery); + var batteryNodeContainer = _entityManager.GetComponent(battery); - leftNode = IoCManager.Resolve().GetComponent(leftEnt).GetNode("power"); - rightNode = IoCManager.Resolve().GetComponent(rightEnt).GetNode("power"); + leftNode = _entityManager.GetComponent(leftEnt).GetNode("power"); + rightNode = _entityManager.GetComponent(rightEnt).GetNode("power"); batteryInput = batteryNodeContainer.GetNode("input"); batteryOutput = batteryNodeContainer.GetNode("output"); @@ -931,9 +931,9 @@ namespace Content.IntegrationTests.Tests.Power var substationEnt = _entityManager.SpawnEntity("SubstationDummy", grid.ToCoordinates(0, 1)); var apcEnt = _entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 2)); - var generatorSupplier = IoCManager.Resolve().GetComponent(generatorEnt); - substationNetBattery = IoCManager.Resolve().GetComponent(substationEnt); - apcBattery = IoCManager.Resolve().GetComponent(apcEnt); + var generatorSupplier = _entityManager.GetComponent(generatorEnt); + substationNetBattery = _entityManager.GetComponent(substationEnt); + apcBattery = _entityManager.GetComponent(apcEnt); generatorSupplier.MaxSupply = 1000; generatorSupplier.SupplyRampTolerance = 1000; @@ -973,9 +973,9 @@ namespace Content.IntegrationTests.Tests.Power var apcExtensionEnt = _entityManager.SpawnEntity("CableApcExtension", grid.ToCoordinates(0, 0)); var powerReceiverEnt = _entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, 2)); - receiver = IoCManager.Resolve().GetComponent(powerReceiverEnt); - var battery = IoCManager.Resolve().GetComponent(apcEnt); - apcNetBattery = IoCManager.Resolve().GetComponent(apcEnt); + receiver = _entityManager.GetComponent(powerReceiverEnt); + var battery = _entityManager.GetComponent(apcEnt); + apcNetBattery = _entityManager.GetComponent(apcEnt); _extensionCableSystem.SetProviderTransferRange(apcExtensionEnt, 5); _extensionCableSystem.SetReceiverReceptionRange(powerReceiverEnt, 5);