Inline GetComponent
This commit is contained in:
@@ -7,6 +7,7 @@ using NUnit.Framework;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Maths;
|
||||
|
||||
@@ -80,7 +81,7 @@ namespace Content.IntegrationTests.Tests
|
||||
|
||||
var ent = serverEntManager.SpawnEntity(prototype, new EntityCoordinates(gridEnt, 0f, 0f));
|
||||
ent.Transform.LocalRotation = angle;
|
||||
ent.GetComponent<SpriteComponent>().Scale = (scale, scale);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(ent.Uid).Scale = (scale, scale);
|
||||
entity = ent.Uid;
|
||||
});
|
||||
|
||||
@@ -92,7 +93,7 @@ namespace Content.IntegrationTests.Tests
|
||||
await _client.WaitPost(() =>
|
||||
{
|
||||
var ent = clientEntManager.GetEntity(entity);
|
||||
var clickable = ent.GetComponent<ClickableComponent>();
|
||||
var clickable = IoCManager.Resolve<IEntityManager>().GetComponent<ClickableComponent>(ent.Uid);
|
||||
|
||||
hit = clickable.CheckClick((clickPosX, clickPosY) + worldPos!.Value, out _, out _);
|
||||
});
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace Content.IntegrationTests.Tests
|
||||
var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
|
||||
dummyUid = dummy.Uid;
|
||||
|
||||
container.GetComponent<EntityStorageComponent>().Insert(dummy);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(container.Uid).Insert(dummy);
|
||||
});
|
||||
|
||||
await RunTicksSync(c, s, 5);
|
||||
@@ -91,8 +91,8 @@ namespace Content.IntegrationTests.Tests
|
||||
c.Assert(() =>
|
||||
{
|
||||
var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
|
||||
var sprite = dummy.GetComponent<SpriteComponent>();
|
||||
var light = dummy.GetComponent<PointLightComponent>();
|
||||
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy.Uid);
|
||||
var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy.Uid);
|
||||
Assert.True(sprite.ContainerOccluded);
|
||||
Assert.True(light.ContainerOccluded);
|
||||
});
|
||||
@@ -114,7 +114,7 @@ namespace Content.IntegrationTests.Tests
|
||||
var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
|
||||
dummyUid = dummy.Uid;
|
||||
|
||||
container.GetComponent<EntityStorageComponent>().Insert(dummy);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(container.Uid).Insert(dummy);
|
||||
});
|
||||
|
||||
await RunTicksSync(c, s, 5);
|
||||
@@ -122,8 +122,8 @@ namespace Content.IntegrationTests.Tests
|
||||
c.Assert(() =>
|
||||
{
|
||||
var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
|
||||
var sprite = dummy.GetComponent<SpriteComponent>();
|
||||
var light = dummy.GetComponent<PointLightComponent>();
|
||||
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy.Uid);
|
||||
var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy.Uid);
|
||||
Assert.False(sprite.ContainerOccluded);
|
||||
Assert.False(light.ContainerOccluded);
|
||||
});
|
||||
@@ -146,8 +146,8 @@ namespace Content.IntegrationTests.Tests
|
||||
var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
|
||||
dummyUid = dummy.Uid;
|
||||
|
||||
containerA.GetComponent<EntityStorageComponent>().Insert(containerB);
|
||||
containerB.GetComponent<EntityStorageComponent>().Insert(dummy);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(containerA.Uid).Insert(containerB);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(containerB.Uid).Insert(dummy);
|
||||
});
|
||||
|
||||
await RunTicksSync(c, s, 5);
|
||||
@@ -155,8 +155,8 @@ namespace Content.IntegrationTests.Tests
|
||||
c.Assert(() =>
|
||||
{
|
||||
var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
|
||||
var sprite = dummy.GetComponent<SpriteComponent>();
|
||||
var light = dummy.GetComponent<PointLightComponent>();
|
||||
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy.Uid);
|
||||
var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy.Uid);
|
||||
Assert.True(sprite.ContainerOccluded);
|
||||
Assert.True(light.ContainerOccluded);
|
||||
});
|
||||
|
||||
@@ -5,6 +5,7 @@ using Content.Shared.Damage.Prototypes;
|
||||
using Content.Shared.FixedPoint;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
@@ -118,7 +119,7 @@ namespace Content.IntegrationTests.Tests.Damageable
|
||||
sMapManager.CreateMap(mapId);
|
||||
|
||||
sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
|
||||
sDamageableComponent = sDamageableEntity.GetComponent<DamageableComponent>();
|
||||
sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDamageableEntity.Uid);
|
||||
sDamageableSystem = sEntitySystemManager.GetEntitySystem<DamageableSystem>();
|
||||
|
||||
group1 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup1");
|
||||
|
||||
@@ -5,6 +5,7 @@ using Content.Shared.Damage.Prototypes;
|
||||
using Content.Shared.FixedPoint;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Prototypes;
|
||||
using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
|
||||
@@ -42,7 +43,7 @@ namespace Content.IntegrationTests.Tests.Destructible
|
||||
var coordinates = new EntityCoordinates(gridId, 0, 0);
|
||||
|
||||
sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDamageGroupEntityId, coordinates);
|
||||
sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
|
||||
sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
|
||||
|
||||
sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
|
||||
sTestThresholdListenerSystem.ThresholdsReached.Clear();
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests.Destructible
|
||||
var coordinates = new EntityCoordinates(gridId, 0, 0);
|
||||
|
||||
sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDamageTypeEntityId, coordinates);
|
||||
sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
|
||||
sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
|
||||
sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
|
||||
sDamageableSystem = sEntitySystemManager.GetEntitySystem<DamageableSystem>();
|
||||
});
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace Content.IntegrationTests.Tests.Destructible
|
||||
var coordinates = new EntityCoordinates(gridId, 0, 0);
|
||||
|
||||
sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDestructionEntityId, coordinates);
|
||||
sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
|
||||
sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
|
||||
sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
|
||||
});
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ using Content.Shared.Damage.Prototypes;
|
||||
using Content.Shared.FixedPoint;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Prototypes;
|
||||
using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
|
||||
@@ -47,8 +48,8 @@ namespace Content.IntegrationTests.Tests.Destructible
|
||||
var coordinates = new EntityCoordinates(gridId, 0, 0);
|
||||
|
||||
sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleEntityId, coordinates);
|
||||
sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
|
||||
sDestructibleComponent = sDestructibleEntity.GetComponent<DestructibleComponent>();
|
||||
sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
|
||||
sDestructibleComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DestructibleComponent>(sDestructibleEntity.Uid);
|
||||
|
||||
sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
|
||||
sTestThresholdListenerSystem.ThresholdsReached.Clear();
|
||||
|
||||
@@ -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(() => airlock.GetComponent<IPhysBody>().WakeBody());
|
||||
server.Post(() => IoCManager.Resolve<IEntityManager>().GetComponent<IPhysBody>(airlock.Uid).WakeBody());
|
||||
|
||||
await server.WaitRunTicks(10);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
@@ -132,7 +132,7 @@ namespace Content.IntegrationTests.Tests.Fluids
|
||||
// Check that the puddle was created
|
||||
Assert.NotNull(puddle);
|
||||
|
||||
evaporation = puddle.Owner.GetComponent<EvaporationComponent>();
|
||||
evaporation = IoCManager.Resolve<IEntityManager>().GetComponent<EvaporationComponent>(puddle.Owner.Uid);
|
||||
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(puddle.Owner.Uid).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1445
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ using Robust.Client.UserInterface;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Timing;
|
||||
using Robust.Shared.Utility;
|
||||
@@ -71,7 +72,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
|
||||
var actionsComponent = playerEnt!.GetComponent<ServerActionsComponent>();
|
||||
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!.Uid);
|
||||
|
||||
// player should begin with their innate actions granted
|
||||
innateActions.AddRange(actionsComponent.InnateActions);
|
||||
@@ -98,7 +99,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
var local = clientPlayerMgr.LocalPlayer;
|
||||
var controlled = local!.ControlledEntity;
|
||||
var actionsComponent = controlled!.GetComponent<ClientActionsComponent>();
|
||||
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!.Uid);
|
||||
|
||||
// we should have our innate actions and debug1.
|
||||
foreach (var innateAction in innateActions)
|
||||
@@ -153,7 +154,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
|
||||
var actionsComponent = playerEnt!.GetComponent<ServerActionsComponent>();
|
||||
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!.Uid);
|
||||
actionsComponent.Revoke(ActionType.DebugInstant);
|
||||
});
|
||||
|
||||
@@ -164,7 +165,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
var local = clientPlayerMgr.LocalPlayer;
|
||||
var controlled = local!.ControlledEntity;
|
||||
var actionsComponent = controlled!.GetComponent<ClientActionsComponent>();
|
||||
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!.Uid);
|
||||
|
||||
// we should have our innate actions, but debug1 should be revoked
|
||||
foreach (var innateAction in innateActions)
|
||||
@@ -245,7 +246,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
serverPlayerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
|
||||
serverActionsComponent = serverPlayerEnt!.GetComponent<ServerActionsComponent>();
|
||||
serverActionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(serverPlayerEnt!.Uid);
|
||||
|
||||
// spawn and give them an item that has actions
|
||||
serverFlashlight = serverEntManager.SpawnEntity("TestFlashlight",
|
||||
@@ -259,7 +260,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
|
||||
// grant an extra item action, before pickup, initially disabled
|
||||
itemActions.GrantOrUpdate(ItemActionType.DebugToggle, false);
|
||||
serverPlayerEnt.GetComponent<HandsComponent>().PutInHand(serverFlashlight.GetComponent<ItemComponent>(), false);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt.Uid).PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(serverFlashlight.Uid), false);
|
||||
// grant an extra item action, after pickup, with a cooldown
|
||||
itemActions.GrantOrUpdate(ItemActionType.DebugInstant, cooldown: cooldown);
|
||||
|
||||
@@ -285,7 +286,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
var local = clientPlayerMgr.LocalPlayer;
|
||||
var controlled = local!.ControlledEntity;
|
||||
clientActionsComponent = controlled!.GetComponent<ClientActionsComponent>();
|
||||
clientActionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!.Uid);
|
||||
|
||||
var lightEntry = clientActionsComponent.ItemActionStates()
|
||||
.Where(entry => entry.Value.ContainsKey(ItemActionType.ToggleLight))
|
||||
@@ -333,7 +334,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
// drop the item, and the item actions should go away
|
||||
serverPlayerEnt.GetComponent<HandsComponent>()
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt.Uid)
|
||||
.TryDropEntity(serverFlashlight, serverPlayerEnt.Transform.Coordinates, false);
|
||||
Assert.That(serverActionsComponent.ItemActionStates().ContainsKey(serverFlashlight.Uid), Is.False);
|
||||
});
|
||||
@@ -351,7 +352,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
// pick the item up again, the states should be back to what they were when dropped,
|
||||
// as the states "stick" with the item
|
||||
serverPlayerEnt.GetComponent<HandsComponent>().PutInHand(serverFlashlight.GetComponent<ItemComponent>(), false);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt.Uid).PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(serverFlashlight.Uid), false);
|
||||
Assert.That(serverActionsComponent.ItemActionStates().TryGetValue(serverFlashlight.Uid, out var lightStates));
|
||||
Assert.That(lightStates.TryGetValue(ItemActionType.ToggleLight, out var lightState));
|
||||
Assert.That(lightState.Equals(new ActionState(true, toggledOn: true)));
|
||||
|
||||
@@ -7,6 +7,8 @@ using Content.Shared.Alert;
|
||||
using NUnit.Framework;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
@@ -29,7 +31,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
|
||||
Assert.NotNull(playerEnt);
|
||||
var alertsComponent = playerEnt.GetComponent<ServerAlertsComponent>();
|
||||
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt.Uid);
|
||||
Assert.NotNull(alertsComponent);
|
||||
|
||||
// show 2 alerts
|
||||
@@ -49,7 +51,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
Assert.NotNull(local);
|
||||
var controlled = local.ControlledEntity;
|
||||
Assert.NotNull(controlled);
|
||||
var alertsComponent = controlled.GetComponent<ClientAlertsComponent>();
|
||||
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientAlertsComponent>(controlled.Uid);
|
||||
Assert.NotNull(alertsComponent);
|
||||
|
||||
// find the alertsui
|
||||
@@ -69,7 +71,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
{
|
||||
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
|
||||
Assert.NotNull(playerEnt);
|
||||
var alertsComponent = playerEnt.GetComponent<ServerAlertsComponent>();
|
||||
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt.Uid);
|
||||
Assert.NotNull(alertsComponent);
|
||||
|
||||
alertsComponent.ClearAlert(AlertType.Debug1);
|
||||
@@ -84,7 +86,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
|
||||
Assert.NotNull(local);
|
||||
var controlled = local.ControlledEntity;
|
||||
Assert.NotNull(controlled);
|
||||
var alertsComponent = controlled.GetComponent<ClientAlertsComponent>();
|
||||
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientAlertsComponent>(controlled.Uid);
|
||||
Assert.NotNull(alertsComponent);
|
||||
|
||||
// find the alertsui
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement
|
||||
// Now let's make the player enter a climbing transitioning state.
|
||||
climbing.IsClimbing = true;
|
||||
climbing.TryMoveTo(human.Transform.WorldPosition, table.Transform.WorldPosition);
|
||||
var body = human.GetComponent<IPhysBody>();
|
||||
var body = IoCManager.Resolve<IEntityManager>().GetComponent<IPhysBody>(human.Uid);
|
||||
// TODO: Check it's climbing
|
||||
|
||||
// Force the player out of climb state. It should immediately remove the ClimbController.
|
||||
|
||||
@@ -53,15 +53,15 @@ namespace Content.IntegrationTests.Tests
|
||||
Assert.That(generator.HasComponent<GravityGeneratorComponent>());
|
||||
Assert.That(generator.HasComponent<ApcPowerReceiverComponent>());
|
||||
|
||||
var powerComponent = generator.GetComponent<ApcPowerReceiverComponent>();
|
||||
var powerComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ApcPowerReceiverComponent>(generator.Uid);
|
||||
powerComponent.NeedsPower = false;
|
||||
});
|
||||
server.RunTicks(1);
|
||||
|
||||
server.Assert(() =>
|
||||
{
|
||||
var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
|
||||
var powerComponent = generator.GetComponent<ApcPowerReceiverComponent>();
|
||||
var generatorComponent = IoCManager.Resolve<IEntityManager>().GetComponent<GravityGeneratorComponent>(generator.Uid);
|
||||
var powerComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ApcPowerReceiverComponent>(generator.Uid);
|
||||
|
||||
Assert.That(generatorComponent.GravityActive, Is.True);
|
||||
|
||||
@@ -69,8 +69,8 @@ namespace Content.IntegrationTests.Tests
|
||||
var grid1Entity = entityMan.GetEntity(grid1.GridEntityId);
|
||||
var grid2Entity = entityMan.GetEntity(grid2.GridEntityId);
|
||||
|
||||
Assert.That(!grid1Entity.GetComponent<GravityComponent>().Enabled);
|
||||
Assert.That(grid2Entity.GetComponent<GravityComponent>().Enabled);
|
||||
Assert.That(!IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid1Entity.Uid).Enabled);
|
||||
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid2Entity.Uid).Enabled);
|
||||
|
||||
// Re-enable needs power so it turns off again.
|
||||
// Charge rate is ridiculously high so it finishes in one tick.
|
||||
@@ -79,14 +79,14 @@ namespace Content.IntegrationTests.Tests
|
||||
server.RunTicks(1);
|
||||
server.Assert(() =>
|
||||
{
|
||||
var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
|
||||
var generatorComponent = IoCManager.Resolve<IEntityManager>().GetComponent<GravityGeneratorComponent>(generator.Uid);
|
||||
|
||||
Assert.That(generatorComponent.GravityActive, Is.False);
|
||||
|
||||
var entityMan = IoCManager.Resolve<IEntityManager>();
|
||||
var grid2Entity = entityMan.GetEntity(grid2.GridEntityId);
|
||||
|
||||
Assert.That(grid2Entity.GetComponent<GravityComponent>().Enabled, Is.False);
|
||||
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid2Entity.Uid).Enabled, Is.False);
|
||||
});
|
||||
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace Content.IntegrationTests.Tests
|
||||
pocketItem = entityMan.SpawnEntity("FlashlightDummy", MapCoordinates.Nullspace);
|
||||
var tooBigItem = entityMan.SpawnEntity("ToolboxDummy", MapCoordinates.Nullspace);
|
||||
|
||||
inventory = human.GetComponent<InventoryComponent>();
|
||||
inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(human.Uid);
|
||||
|
||||
Assert.That(inventory.CanEquip(Slots.INNERCLOTHING, uniform));
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand);
|
||||
|
||||
Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
|
||||
Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
|
||||
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
|
||||
|
||||
interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
|
||||
Assert.That(interactUsing);
|
||||
@@ -168,7 +168,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand, Is.False);
|
||||
|
||||
Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
|
||||
Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
|
||||
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
|
||||
|
||||
interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
|
||||
Assert.That(interactUsing, Is.False);
|
||||
@@ -237,7 +237,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand);
|
||||
|
||||
Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
|
||||
Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
|
||||
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
|
||||
|
||||
interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
|
||||
Assert.That(interactUsing);
|
||||
@@ -307,7 +307,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand, Is.False);
|
||||
|
||||
Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
|
||||
Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
|
||||
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
|
||||
|
||||
interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
|
||||
Assert.That(interactUsing, Is.False);
|
||||
@@ -392,7 +392,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand);
|
||||
|
||||
Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
|
||||
Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
|
||||
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
|
||||
|
||||
interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
|
||||
Assert.That(interactUsing, Is.False);
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace Content.IntegrationTests.Tests
|
||||
var entityMan = IoCManager.Resolve<IEntityManager>();
|
||||
|
||||
human = entityMan.SpawnEntity("InventoryStunnableDummy", MapCoordinates.Nullspace);
|
||||
inventory = human.GetComponent<InventoryComponent>();
|
||||
inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(human.Uid);
|
||||
|
||||
// Can't do the test if this human doesn't have the slots for it.
|
||||
Assert.That(inventory.HasSlot(Slots.INNERCLOTHING));
|
||||
|
||||
@@ -112,8 +112,8 @@ namespace Content.IntegrationTests.Tests.Networking
|
||||
|
||||
await client.WaitPost(() =>
|
||||
{
|
||||
clientComponent = cEntityManager.GetEntity(serverEnt.Uid)
|
||||
.GetComponent<PredictionTestComponent>();
|
||||
IEntity tempQualifier = cEntityManager.GetEntity(serverEnt.Uid);
|
||||
clientComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(tempQualifier.Uid);
|
||||
});
|
||||
|
||||
Assert.That(clientComponent.Foo, Is.False);
|
||||
@@ -457,7 +457,7 @@ namespace Content.IntegrationTests.Tests.Networking
|
||||
private void HandleMessage(SetFooMessage message, EntitySessionEventArgs args)
|
||||
{
|
||||
var entity = EntityManager.GetEntity(message.Uid);
|
||||
var component = entity.GetComponent<PredictionTestComponent>();
|
||||
var component = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(entity.Uid);
|
||||
var old = component.Foo;
|
||||
if (Allow)
|
||||
{
|
||||
|
||||
@@ -9,6 +9,7 @@ using Content.Shared.Containers.ItemSlots;
|
||||
using NUnit.Framework;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.PDA
|
||||
{
|
||||
@@ -70,13 +71,13 @@ namespace Content.IntegrationTests.Tests.PDA
|
||||
|
||||
// Put PDA in hand
|
||||
var dummyPda = sEntityManager.SpawnEntity(PdaDummy, player.Transform.MapPosition);
|
||||
var pdaItemComponent = dummyPda.GetComponent<ItemComponent>();
|
||||
player.GetComponent<HandsComponent>().PutInHand(pdaItemComponent);
|
||||
var pdaItemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(dummyPda.Uid);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player.Uid).PutInHand(pdaItemComponent);
|
||||
|
||||
var pdaComponent = dummyPda.GetComponent<PDAComponent>();
|
||||
var pdaComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PDAComponent>(dummyPda.Uid);
|
||||
var pdaIdCard = sEntityManager.SpawnEntity(IdCardDummy, player.Transform.MapPosition);
|
||||
|
||||
var itemSlots = dummyPda.GetComponent<ItemSlotsComponent>();
|
||||
var itemSlots = IoCManager.Resolve<IEntityManager>().GetComponent<ItemSlotsComponent>(dummyPda.Uid);
|
||||
sEntityManager.EntitySysManager.GetEntitySystem<ItemSlotsSystem>()
|
||||
.TryInsert(dummyPda.Uid, pdaComponent.IdSlot, pdaIdCard);
|
||||
var pdaContainedId = pdaComponent.ContainedID;
|
||||
@@ -90,10 +91,10 @@ namespace Content.IntegrationTests.Tests.PDA
|
||||
|
||||
// Put ID card in hand
|
||||
var idDummy = sEntityManager.SpawnEntity(IdCardDummy, player.Transform.MapPosition);
|
||||
var idItemComponent = idDummy.GetComponent<ItemComponent>();
|
||||
player.GetComponent<HandsComponent>().PutInHand(idItemComponent);
|
||||
var idItemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(idDummy.Uid);
|
||||
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player.Uid).PutInHand(idItemComponent);
|
||||
|
||||
var idCardComponent = idDummy.GetComponent<IdCardComponent>();
|
||||
var idCardComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(idDummy.Uid);
|
||||
|
||||
// The ID in the hand should be found first
|
||||
Assert.NotNull(player.GetHeldId());
|
||||
@@ -102,7 +103,7 @@ namespace Content.IntegrationTests.Tests.PDA
|
||||
Assert.That(id, Is.EqualTo(idCardComponent));
|
||||
|
||||
// Remove all IDs and PDAs
|
||||
var inventory = player.GetComponent<InventoryComponent>();
|
||||
var inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(player.Uid);
|
||||
|
||||
foreach (var slot in inventory.Slots)
|
||||
{
|
||||
@@ -119,7 +120,7 @@ namespace Content.IntegrationTests.Tests.PDA
|
||||
}
|
||||
}
|
||||
|
||||
var hands = player.GetComponent<HandsComponent>();
|
||||
var hands = IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player.Uid);
|
||||
|
||||
hands.Drop(dummyPda, false);
|
||||
hands.Drop(idDummy, false);
|
||||
|
||||
@@ -8,6 +8,7 @@ using Content.Server.Power.Nodes;
|
||||
using Content.Shared.Coordinates;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Timing;
|
||||
@@ -204,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 = generatorEnt.GetComponent<PowerSupplierComponent>();
|
||||
consumer1 = consumerEnt1.GetComponent<PowerConsumerComponent>();
|
||||
consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
|
||||
consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
|
||||
consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
|
||||
|
||||
// Plenty of surplus and tolerance
|
||||
supplier.MaxSupply = loadPower * 4;
|
||||
@@ -258,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 = generatorEnt.GetComponent<PowerSupplierComponent>();
|
||||
consumer1 = consumerEnt1.GetComponent<PowerConsumerComponent>();
|
||||
consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
|
||||
consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
|
||||
consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
|
||||
|
||||
// Too little supply, both consumers should get 33% power.
|
||||
supplier.MaxSupply = loadPower;
|
||||
@@ -305,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 = generatorEnt.GetComponent<PowerSupplierComponent>();
|
||||
consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
|
||||
consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
|
||||
|
||||
// Supply has enough total power but needs to ramp up to match.
|
||||
supplier.MaxSupply = 400;
|
||||
@@ -375,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 = generatorEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
battery = generatorEnt.GetComponent<BatteryComponent>();
|
||||
consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
|
||||
netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(generatorEnt.Uid);
|
||||
battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(generatorEnt.Uid);
|
||||
consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
|
||||
|
||||
battery.MaxCharge = startingCharge;
|
||||
battery.CurrentCharge = startingCharge;
|
||||
@@ -453,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 = generatorEnt.GetComponent<PowerSupplierComponent>();
|
||||
var netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
battery = batteryEnt.GetComponent<BatteryComponent>();
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
|
||||
var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
|
||||
battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
|
||||
|
||||
supplier.MaxSupply = 500;
|
||||
supplier.SupplyRampTolerance = 500;
|
||||
@@ -504,10 +505,10 @@ namespace Content.IntegrationTests.Tests.Power
|
||||
var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
|
||||
var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
|
||||
|
||||
consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
|
||||
supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
|
||||
netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
battery = batteryEnt.GetComponent<BatteryComponent>();
|
||||
consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
|
||||
netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
|
||||
battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
|
||||
|
||||
// Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200.
|
||||
consumer.DrawRate = 1000;
|
||||
@@ -572,10 +573,10 @@ namespace Content.IntegrationTests.Tests.Power
|
||||
var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
|
||||
var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
|
||||
|
||||
consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
|
||||
supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
|
||||
netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
battery = batteryEnt.GetComponent<BatteryComponent>();
|
||||
consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
|
||||
netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
|
||||
battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
|
||||
|
||||
// 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.
|
||||
@@ -650,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 = consumerEnt1.GetComponent<PowerConsumerComponent>();
|
||||
consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
|
||||
supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
|
||||
var netBattery1 = batteryEnt1.GetComponent<PowerNetworkBatteryComponent>();
|
||||
var netBattery2 = batteryEnt2.GetComponent<PowerNetworkBatteryComponent>();
|
||||
var battery1 = batteryEnt1.GetComponent<BatteryComponent>();
|
||||
var battery2 = batteryEnt2.GetComponent<BatteryComponent>();
|
||||
consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
|
||||
consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
|
||||
var netBattery1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt1.Uid);
|
||||
var netBattery2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt2.Uid);
|
||||
var battery1 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt1.Uid);
|
||||
var battery2 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt2.Uid);
|
||||
|
||||
// There are two loads, 500 W and 1000 W respectively.
|
||||
// The 500 W load is behind a 50% efficient battery,
|
||||
@@ -737,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 = consumerEnt1.GetComponent<PowerConsumerComponent>();
|
||||
consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
|
||||
supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
|
||||
var netBattery1 = batteryEnt1.GetComponent<PowerNetworkBatteryComponent>();
|
||||
var netBattery2 = batteryEnt2.GetComponent<PowerNetworkBatteryComponent>();
|
||||
var battery1 = batteryEnt1.GetComponent<BatteryComponent>();
|
||||
var battery2 = batteryEnt2.GetComponent<BatteryComponent>();
|
||||
consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
|
||||
consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
|
||||
var netBattery1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt1.Uid);
|
||||
var netBattery2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt2.Uid);
|
||||
var battery1 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt1.Uid);
|
||||
var battery2 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt2.Uid);
|
||||
|
||||
consumer1.DrawRate = 500;
|
||||
consumer2.DrawRate = 1000;
|
||||
@@ -805,10 +806,10 @@ namespace Content.IntegrationTests.Tests.Power
|
||||
var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
|
||||
var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
|
||||
|
||||
consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
|
||||
supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
|
||||
netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
var battery = batteryEnt.GetComponent<BatteryComponent>();
|
||||
consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
|
||||
supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
|
||||
netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
|
||||
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
|
||||
|
||||
// Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200.
|
||||
consumer.DrawRate = 1000;
|
||||
@@ -881,10 +882,10 @@ namespace Content.IntegrationTests.Tests.Power
|
||||
terminal.Transform.LocalRotation = Angle.FromDegrees(180);
|
||||
|
||||
var battery = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
|
||||
var batteryNodeContainer = battery.GetComponent<NodeContainerComponent>();
|
||||
var batteryNodeContainer = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(battery.Uid);
|
||||
|
||||
leftNode = leftEnt.GetComponent<NodeContainerComponent>().GetNode<CableNode>("power");
|
||||
rightNode = rightEnt.GetComponent<NodeContainerComponent>().GetNode<CableNode>("power");
|
||||
leftNode = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(leftEnt.Uid).GetNode<CableNode>("power");
|
||||
rightNode = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(rightEnt.Uid).GetNode<CableNode>("power");
|
||||
|
||||
batteryInput = batteryNodeContainer.GetNode<Node>("input");
|
||||
batteryOutput = batteryNodeContainer.GetNode<Node>("output");
|
||||
@@ -930,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 = generatorEnt.GetComponent<PowerSupplierComponent>();
|
||||
substationNetBattery = substationEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
apcBattery = apcEnt.GetComponent<BatteryComponent>();
|
||||
var generatorSupplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
|
||||
substationNetBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(substationEnt.Uid);
|
||||
apcBattery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(apcEnt.Uid);
|
||||
|
||||
generatorSupplier.MaxSupply = 1000;
|
||||
generatorSupplier.SupplyRampTolerance = 1000;
|
||||
@@ -972,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 = powerReceiverEnt.GetComponent<ApcPowerReceiverComponent>();
|
||||
var battery = apcEnt.GetComponent<BatteryComponent>();
|
||||
apcNetBattery = apcEnt.GetComponent<PowerNetworkBatteryComponent>();
|
||||
receiver = IoCManager.Resolve<IEntityManager>().GetComponent<ApcPowerReceiverComponent>(powerReceiverEnt.Uid);
|
||||
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(apcEnt.Uid);
|
||||
apcNetBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(apcEnt.Uid);
|
||||
|
||||
_extensionCableSystem.SetProviderTransferRange(apcExtensionEnt.Uid, 5);
|
||||
_extensionCableSystem.SetReceiverReceptionRange(powerReceiverEnt.Uid, 5);
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
|
||||
using Content.Shared.Tag;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
@@ -60,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Tag
|
||||
{
|
||||
sMapManager.CreateNewMapEntity(MapId.Nullspace);
|
||||
sTagDummy = sEntityManager.SpawnEntity(TagEntityId, MapCoordinates.Nullspace);
|
||||
sTagComponent = sTagDummy.GetComponent<TagComponent>();
|
||||
sTagComponent = IoCManager.Resolve<IEntityManager>().GetComponent<TagComponent>(sTagDummy.Uid);
|
||||
});
|
||||
|
||||
await server.WaitAssertion(() =>
|
||||
|
||||
@@ -4,6 +4,7 @@ using Content.Shared.Containers.ItemSlots;
|
||||
using Content.Shared.Whitelist;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.Utility
|
||||
@@ -98,7 +99,7 @@ namespace Content.IntegrationTests.Tests.Utility
|
||||
|
||||
// Test from serialized
|
||||
var dummy = entityManager.SpawnEntity("WhitelistDummy", mapCoordinates);
|
||||
var whitelistSer = dummy.GetComponent<ItemSlotsComponent>().Slots.Values.First().Whitelist;
|
||||
var whitelistSer = IoCManager.Resolve<IEntityManager>().GetComponent<ItemSlotsComponent>(dummy.Uid).Slots.Values.First().Whitelist;
|
||||
Assert.That(whitelistSer, Is.Not.Null);
|
||||
|
||||
Assert.That(whitelistSer.Components, Is.Not.Null);
|
||||
|
||||
Reference in New Issue
Block a user