tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace IEntityManager resolves in systems for cached EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 13:00:43 +01:00
parent 2699540526
commit c8b65be747
98 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Server.AI.EntitySystems
public Faction GetHostileFactions(Faction faction) => _hostileFactions.TryGetValue(faction, out var hostiles) ? hostiles : Faction.None;
public Faction GetFactions(EntityUid entity) =>
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out AiFactionTagComponent? factionTags)
EntityManager.TryGetComponent(entity, out AiFactionTagComponent? factionTags)
? factionTags.Factions
: Faction.None;
@@ -72,9 +72,9 @@ namespace Content.Server.AI.EntitySystems
{
if ((component.Factions & hostile) == 0)
continue;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).MapID != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapID)
if (EntityManager.GetComponent<TransformComponent>(component.Owner).MapID != EntityManager.GetComponent<TransformComponent>(entity).MapID)
continue;
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).MapPosition.InRange(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapPosition, range))
if (!EntityManager.GetComponent<TransformComponent>(component.Owner).MapPosition.InRange(EntityManager.GetComponent<TransformComponent>(entity).MapPosition, range))
continue;
yield return component.Owner;

6
Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
View File

@@ -214,7 +214,7 @@ namespace Content.Server.AI.Pathfinding.Accessible
return false;
}
var entityTile = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID).GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates);
var entityTile = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID).GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
var entityNode = _pathfindingSystem.GetNode(entityTile);
var entityRegion = GetRegion(entityNode);
var targetRegion = GetRegion(targetNode);
@@ -424,12 +424,12 @@ namespace Content.Server.AI.Pathfinding.Accessible
/// <returns></returns>
public PathfindingRegion? GetRegion(EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).GridID.IsValid())
if (!EntityManager.GetComponent<TransformComponent>(entity).GridID.IsValid())
{
return null;
}
var entityTile = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).GridID).GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates);
var entityTile = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID).GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
var entityNode = _pathfindingSystem.GetNode(entityTile);
return GetRegion(entityNode);
}

20
Content.Server/AI/Pathfinding/PathfindingSystem.cs
View File

@@ -183,7 +183,7 @@ namespace Content.Server.AI.Pathfinding
/// <returns></returns>
public PathfindingNode GetNode(EntityUid entity)
{
var tile = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).GridID).GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates);
var tile = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID).GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
return GetNode(tile);
}
@@ -264,16 +264,16 @@ namespace Content.Server.AI.Pathfinding
/// <param name="entity"></param>
private void HandleEntityAdd(EntityUid entity)
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted ||
if ((!EntityManager.EntityExists(entity) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted ||
_lastKnownPositions.ContainsKey(entity) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics) ||
!EntityManager.TryGetComponent(entity, out IPhysBody? physics) ||
!PathfindingNode.IsRelevant(entity, physics))
{
return;
}
var grid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).GridID);
var tileRef = grid.GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates);
var grid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID);
var tileRef = grid.GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
var chunk = GetChunk(tileRef);
var node = chunk.GetNode(tileRef);
@@ -304,8 +304,8 @@ namespace Content.Server.AI.Pathfinding
private void HandleEntityMove(MoveEvent moveEvent)
{
// If we've moved to space or the likes then remove us.
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(moveEvent.Sender) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(moveEvent.Sender).EntityLifeStage) >= EntityLifeStage.Deleted ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(moveEvent.Sender, out IPhysBody? physics) ||
if ((!EntityManager.EntityExists(moveEvent.Sender) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(moveEvent.Sender).EntityLifeStage) >= EntityLifeStage.Deleted ||
!EntityManager.TryGetComponent(moveEvent.Sender, out IPhysBody? physics) ||
!PathfindingNode.IsRelevant(moveEvent.Sender, physics) ||
moveEvent.NewPosition.GetGridId(EntityManager) == GridId.Invalid)
{
@@ -314,9 +314,9 @@ namespace Content.Server.AI.Pathfinding
}
// Memory leak protection until grid parenting confirmed fix / you REALLY need the performance
var gridBounds = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(moveEvent.Sender).GridID).WorldBounds;
var gridBounds = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(moveEvent.Sender).GridID).WorldBounds;
if (!gridBounds.Contains(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(moveEvent.Sender).WorldPosition))
if (!gridBounds.Contains(EntityManager.GetComponent<TransformComponent>(moveEvent.Sender).WorldPosition))
{
HandleEntityRemove(moveEvent.Sender);
return;
@@ -370,7 +370,7 @@ namespace Content.Server.AI.Pathfinding
public bool CanTraverse(EntityUid entity, PathfindingNode node)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics) &&
if (EntityManager.TryGetComponent(entity, out IPhysBody? physics) &&
(physics.CollisionMask & node.BlockedCollisionMask) != 0)
{
return false;

6
Content.Server/Access/Systems/IdCardSystem.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Server.Access.Systems
private void OnInit(EntityUid uid, IdCardComponent id, ComponentInit args)
{
id.OriginalOwnerName ??= IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityName;
id.OriginalOwnerName ??= EntityManager.GetComponent<MetaDataComponent>(id.Owner).EntityName;
UpdateEntityName(uid, id);
}
@@ -67,7 +67,7 @@ namespace Content.Server.Access.Systems
if (string.IsNullOrWhiteSpace(id.FullName) && string.IsNullOrWhiteSpace(id.JobTitle))
{
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityName = id.OriginalOwnerName;
EntityManager.GetComponent<MetaDataComponent>(id.Owner).EntityName = id.OriginalOwnerName;
return;
}
@@ -80,7 +80,7 @@ namespace Content.Server.Access.Systems
: Loc.GetString("access-id-card-component-owner-full-name-job-title-text",
("fullName", id.FullName),
("jobSuffix", jobSuffix));
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityName = val;
EntityManager.GetComponent<MetaDataComponent>(id.Owner).EntityName = val;
}
/// <summary>

2
Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
View File

@@ -33,7 +33,7 @@ namespace Content.Server.Atmos.EntitySystems
foreach (var entity in _gridtileLookupSystem.GetEntitiesIntersecting(tile.GridIndex, tile.GridIndices))
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics)
if (!EntityManager.TryGetComponent(entity, out IPhysBody? physics)
|| !entity.IsMovedByPressure(out var pressure)
|| entity.IsInContainer())
continue;

4
Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
View File

@@ -75,9 +75,9 @@ namespace Content.Server.Atmos.EntitySystems
{
foreach (var exposed in EntityManager.EntityQuery<AtmosExposedComponent>())
{
var tile = GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(exposed.Owner).Coordinates);
var tile = GetTileMixture(EntityManager.GetComponent<TransformComponent>(exposed.Owner).Coordinates);
if (tile == null) continue;
var updateEvent = new AtmosExposedUpdateEvent(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(exposed.Owner).Coordinates, tile);
var updateEvent = new AtmosExposedUpdateEvent(EntityManager.GetComponent<TransformComponent>(exposed.Owner).Coordinates, tile);
RaiseLocalEvent(exposed.Owner, ref updateEvent);
}

2
Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
View File

@@ -86,7 +86,7 @@ namespace Content.Server.Atmos.EntitySystems
var uid = barotrauma.Owner;
var status = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ServerAlertsComponent>(barotrauma.Owner);
var status = EntityManager.GetComponentOrNull<ServerAlertsComponent>(barotrauma.Owner);
var pressure = 1f;

2
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -224,7 +224,7 @@ namespace Content.Server.Atmos.EntitySystems
flammable.FireStacks = MathF.Min(0, flammable.FireStacks + 1);
}
IoCManager.Resolve<IEntityManager>().TryGetComponent(flammable.Owner, out ServerAlertsComponent? status);
EntityManager.TryGetComponent(flammable.Owner, out ServerAlertsComponent? status);
if (!flammable.OnFire)
{

2
Content.Server/Atmos/EntitySystems/GasTankSystem.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.Atmos.EntitySystems
private void AddOpenUIVerb(EntityUid uid, GasTankComponent component, GetActivationVerbsEvent args)
{
if (!args.CanAccess || !IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
if (!args.CanAccess || !EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
Verb verb = new();

6
Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -196,17 +196,17 @@ namespace Content.Server.Atmos.EntitySystems
// This is the max in any direction that we can get a chunk (e.g. max 2 chunks away of data).
var (maxXDiff, maxYDiff) = ((int) (_updateRange / ChunkSize) + 1, (int) (_updateRange / ChunkSize) + 1);
var worldBounds = Box2.CenteredAround(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).WorldPosition,
var worldBounds = Box2.CenteredAround(EntityManager.GetComponent<TransformComponent>(entity).WorldPosition,
new Vector2(_updateRange, _updateRange));
foreach (var grid in _mapManager.FindGridsIntersecting(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapID, worldBounds))
foreach (var grid in _mapManager.FindGridsIntersecting(EntityManager.GetComponent<TransformComponent>(entity).MapID, worldBounds))
{
if (!_overlay.TryGetValue(grid.Index, out var chunks))
{
continue;
}
var entityTile = grid.GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates).GridIndices;
var entityTile = grid.GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates).GridIndices;
for (var x = -maxXDiff; x <= maxXDiff; x++)
{

4
Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnGasDualPortVentPumpUpdated(EntityUid uid, GasDualPortVentPumpComponent vent, AtmosDeviceUpdateEvent args)
{
var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(vent.Owner);
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(vent.Owner);
if (vent.Welded)
{
@@ -45,7 +45,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
return;
}
var environment = _atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(vent.Owner).Coordinates, true);
var environment = _atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(vent.Owner).Coordinates, true);
// We're in an air-blocked tile... Do nothing.
if (environment == null)

10
Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnExamined(EntityUid uid, GasPressurePumpComponent pump, ExaminedEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pump.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
if (!EntityManager.GetComponent<TransformComponent>(pump.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
return;
if (Loc.TryGetString("gas-pressure-pump-system-examined", out var str,
@@ -50,7 +50,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, AtmosDeviceUpdateEvent args)
{
var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(pump.Owner);
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(pump.Owner);
if (!pump.Enabled
|| !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
@@ -92,10 +92,10 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnPumpInteractHand(EntityUid uid, GasPressurePumpComponent component, InteractHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if (EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
{
_userInterfaceSystem.TryOpen(uid, GasPressurePumpUiKey.Key, actor.PlayerSession);
DirtyUI(uid, component);
@@ -127,7 +127,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
return;
_userInterfaceSystem.TrySetUiState(uid, GasPressurePumpUiKey.Key,
new GasPressurePumpBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(pump.Owner).EntityName, pump.TargetPressure, pump.Enabled));
new GasPressurePumpBoundUserInterfaceState(EntityManager.GetComponent<MetaDataComponent>(pump.Owner).EntityName, pump.TargetPressure, pump.Enabled));
}
}
}

2
Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnExamined(EntityUid uid, GasValveComponent valve, ExaminedEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(valve.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
if (!EntityManager.GetComponent<TransformComponent>(valve.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
return;
if (Loc.TryGetString("gas-valve-system-examined", out var str,

10
Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnExamined(EntityUid uid, GasVolumePumpComponent pump, ExaminedEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pump.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
if (!EntityManager.GetComponent<TransformComponent>(pump.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
return;
if (Loc.TryGetString("gas-volume-pump-system-examined", out var str,
@@ -83,7 +83,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
// Some of the gas from the mixture leaks when overclocked.
if (pump.Overclocked)
{
var tile = _atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pump.Owner).Coordinates, true);
var tile = _atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(pump.Owner).Coordinates, true);
if (tile != null)
{
@@ -97,10 +97,10 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnPumpInteractHand(EntityUid uid, GasVolumePumpComponent component, InteractHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if (EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
{
_userInterfaceSystem.TryOpen(uid, GasVolumePumpUiKey.Key, actor.PlayerSession);
DirtyUI(uid, component);
@@ -132,7 +132,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
return;
_userInterfaceSystem.TrySetUiState(uid, GasVolumePumpUiKey.Key,
new GasVolumePumpBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(pump.Owner).EntityName, pump.TransferRate, pump.Enabled));
new GasVolumePumpBoundUserInterfaceState(EntityManager.GetComponent<MetaDataComponent>(pump.Owner).EntityName, pump.TransferRate, pump.Enabled));
}
}
}

4
Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
private bool CanJoinAtmosphere(AtmosDeviceComponent component)
{
return !component.RequireAnchored || IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored;
return !component.RequireAnchored || EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored;
}
public void JoinAtmosphere(AtmosDeviceComponent component)
@@ -104,7 +104,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
if (!component.RequireAnchored)
return;
if(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if(EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
JoinAtmosphere(component);
else
LeaveAtmosphere(component);

4
Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
if (!component.Enabled || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
return;
if (_atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates) is not {} environment)
if (_atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates) is not {} environment)
return;
foreach (var node in nodes.Nodes.Values)
@@ -52,7 +52,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
if (!component.Enabled || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
return;
if (_atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates, true) is not {} environment)
if (_atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates, true) is not {} environment)
environment = GasMixture.SpaceGas;
var lost = 0f;

4
Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
View File

@@ -37,10 +37,10 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
private bool CheckMinerOperation(GasMinerComponent miner, [NotNullWhen(true)] out GasMixture? environment)
{
environment = _atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(miner.Owner).Coordinates, true);
environment = _atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(miner.Owner).Coordinates, true);
// Space.
if (_atmosphereSystem.IsTileSpace(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(miner.Owner).Coordinates))
if (_atmosphereSystem.IsTileSpace(EntityManager.GetComponent<TransformComponent>(miner.Owner).Coordinates))
{
miner.Broken = true;
return false;

8
Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, AtmosDeviceUpdateEvent args)
{
var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(filter.Owner);
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(filter.Owner);
if (!filter.Enabled
|| !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
@@ -81,10 +81,10 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
private void OnFilterInteractHand(EntityUid uid, GasFilterComponent component, InteractHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if (EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
{
_userInterfaceSystem.TryOpen(uid, GasFilterUiKey.Key, actor.PlayerSession);
DirtyUI(uid, component);
@@ -104,7 +104,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
return;
_userInterfaceSystem.TrySetUiState(uid, GasFilterUiKey.Key,
new GasFilterBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(filter.Owner).EntityName, filter.TransferRate, filter.Enabled, filter.FilteredGas));
new GasFilterBoundUserInterfaceState(EntityManager.GetComponent<MetaDataComponent>(filter.Owner).EntityName, filter.TransferRate, filter.Enabled, filter.FilteredGas));
}
private void OnToggleStatusMessage(EntityUid uid, GasFilterComponent filter, GasFilterToggleStatusMessage args)

6
Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
View File

@@ -106,10 +106,10 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
private void OnMixerInteractHand(EntityUid uid, GasMixerComponent component, InteractHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if (EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
{
_userInterfaceSystem.TryOpen(uid, GasMixerUiKey.Key, actor.PlayerSession);
DirtyUI(uid, component);
@@ -128,7 +128,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
return;
_userInterfaceSystem.TrySetUiState(uid, GasMixerUiKey.Key,
new GasMixerBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(mixer.Owner).EntityName, mixer.TargetPressure, mixer.Enabled, mixer.InletOneConcentration));
new GasMixerBoundUserInterfaceState(EntityManager.GetComponent<MetaDataComponent>(mixer.Owner).EntityName, mixer.TargetPressure, mixer.Enabled, mixer.InletOneConcentration));
}
private void OnToggleStatusMessage(EntityUid uid, GasMixerComponent mixer, GasMixerToggleStatusMessage args)

2
Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
if (!nodeContainer.TryGetNode(injector.InletName, out PipeNode? inlet))
return;
var environment = _atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(injector.Owner).Coordinates, true);
var environment = _atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(injector.Owner).Coordinates, true);
if (environment == null)
return;

2
Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
private void OnPassiveVentUpdated(EntityUid uid, GasPassiveVentComponent vent, AtmosDeviceUpdateEvent args)
{
var environment = _atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(vent.Owner).Coordinates, true);
var environment = _atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(vent.Owner).Coordinates, true);
if (environment == null)
return;

2
Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent thermoMachine, AtmosDeviceUpdateEvent args)
{
var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(thermoMachine.Owner);
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(thermoMachine.Owner);
if (!thermoMachine.Enabled
|| !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)

6
Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
private void OnVentScrubberUpdated(EntityUid uid, GasVentScrubberComponent scrubber, AtmosDeviceUpdateEvent args)
{
var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(scrubber.Owner);
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(scrubber.Owner);
if (scrubber.Welded)
{
@@ -44,14 +44,14 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
return;
}
var environment = _atmosphereSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(scrubber.Owner).Coordinates, true);
var environment = _atmosphereSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(scrubber.Owner).Coordinates, true);
Scrub(_atmosphereSystem, scrubber, appearance, environment, outlet);
if (!scrubber.WideNet) return;
// Scrub adjacent tiles too.
foreach (var adjacent in _atmosphereSystem.GetAdjacentTileMixtures(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(scrubber.Owner).Coordinates, false, true))
foreach (var adjacent in _atmosphereSystem.GetAdjacentTileMixtures(EntityManager.GetComponent<TransformComponent>(scrubber.Owner).Coordinates, false, true))
{
Scrub(_atmosphereSystem, scrubber, null, adjacent, outlet);
}

10
Content.Server/BarSign/Systems/BarSignSystem.cs
View File

@@ -67,9 +67,9 @@ namespace Content.Server.BarSign.Systems
return;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out SpriteComponent? sprite))
if (EntityManager.TryGetComponent(component.Owner, out SpriteComponent? sprite))
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver) || !receiver.Powered)
if (!EntityManager.TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver) || !receiver.Powered)
{
sprite.LayerSetState(0, "empty");
sprite.LayerSetShader(0, "shaded");
@@ -83,15 +83,15 @@ namespace Content.Server.BarSign.Systems
if (!string.IsNullOrEmpty(prototype.Name))
{
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName = prototype.Name;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName = prototype.Name;
}
else
{
string val = Loc.GetString("barsign-component-name");
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName = val;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName = val;
}
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityDescription = prototype.Description;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityDescription = prototype.Description;
}
}
}

6
Content.Server/Buckle/Systems/BuckleSystem.cs
View File

@@ -79,7 +79,7 @@ namespace Content.Server.Buckle.Systems
return;
}
var strapPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(strap.Owner).Coordinates.Offset(buckle.BuckleOffset);
var strapPosition = EntityManager.GetComponent<TransformComponent>(strap.Owner).Coordinates.Offset(buckle.BuckleOffset);
if (ev.NewPosition.InRange(EntityManager, strapPosition, 0.2f))
{
@@ -95,7 +95,7 @@ namespace Content.Server.Buckle.Systems
// This fixes buckle offsets and draw depths.
foreach (var buckledEntity in strap.BuckledEntities)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(buckledEntity, out BuckleComponent? buckled))
if (!EntityManager.TryGetComponent(buckledEntity, out BuckleComponent? buckled))
{
continue;
}
@@ -112,7 +112,7 @@ namespace Content.Server.Buckle.Systems
{
foreach (var buckledEntity in strap.BuckledEntities)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(buckledEntity, out BuckleComponent? buckled))
if (!EntityManager.TryGetComponent(buckledEntity, out BuckleComponent? buckled))
{
continue;
}

8
Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
View File

@@ -39,12 +39,12 @@ namespace Content.Server.Chemistry.EntitySystems
owner.PopupMessageEveryone(Loc.GetString("rehydratable-component-expands-message", ("owner", owner)));
if (!string.IsNullOrEmpty(component.TargetPrototype))
{
var ent = IoCManager.Resolve<IEntityManager>().SpawnEntity(component.TargetPrototype,
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).Coordinates);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent).AttachToGridOrMap();
var ent = EntityManager.SpawnEntity(component.TargetPrototype,
EntityManager.GetComponent<TransformComponent>(owner).Coordinates);
EntityManager.GetComponent<TransformComponent>(ent).AttachToGridOrMap();
}
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity((EntityUid) owner);
EntityManager.QueueDeleteEntity((EntityUid) owner);
}
}
}

2
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
View File

@@ -292,7 +292,7 @@ namespace Content.Server.Chemistry.EntitySystems
{
var reagentQuantity = FixedPoint2.New(0);
if (EntityManager.EntityExists(owner)
&& IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out SolutionContainerManagerComponent? managerComponent))
&& EntityManager.TryGetComponent(owner, out SolutionContainerManagerComponent? managerComponent))
{
foreach (var solution in managerComponent.Solutions.Values)
{

2
Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Chemistry.EntitySystems
private void HandleInjection(EntityUid uid, SolutionInjectOnCollideComponent component, StartCollideEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<BloodstreamComponent?>(args.OtherFixture.Body.Owner, out var bloodstream) ||
if (!EntityManager.TryGetComponent<BloodstreamComponent?>(args.OtherFixture.Body.Owner, out var bloodstream) ||
!_solutionsSystem.TryGetInjectableSolution(component.Owner, out var solution)) return;
var solRemoved = solution.SplitSolution(component.TransferAmount);

2
Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Chemistry.EntitySystems
if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
// Custom transfer verb

12
Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
View File

@@ -50,14 +50,14 @@ namespace Content.Server.Chemistry.EntitySystems
var spriteSpec =
new SpriteSpecifier.Rsi(
new ResourcePath("Objects/Consumable/Drinks/" + proto.SpriteReplacementPath), "icon");
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out SpriteComponent? sprite))
if (EntityManager.TryGetComponent(owner, out SpriteComponent? sprite))
{
sprite?.LayerSetSprite(0, spriteSpec);
}
string val = proto.Name + " glass";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(owner).EntityName = val;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(owner).EntityDescription = proto.Description;
EntityManager.GetComponent<MetaDataComponent>(owner).EntityName = val;
EntityManager.GetComponent<MetaDataComponent>(owner).EntityDescription = proto.Description;
component.CurrentReagent = proto;
component.Transformed = true;
}
@@ -68,14 +68,14 @@ namespace Content.Server.Chemistry.EntitySystems
component.CurrentReagent = null;
component.Transformed = false;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out SpriteComponent? sprite) &&
if (EntityManager.TryGetComponent(component.Owner, out SpriteComponent? sprite) &&
component.InitialSprite != null)
{
sprite.LayerSetSprite(0, component.InitialSprite);
}
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName = component.InitialName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityDescription = component.InitialDescription;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName = component.InitialName;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityDescription = component.InitialDescription;
}
}
}

12
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.Chemistry.EntitySystems
vapor.Target = target;
vapor.AliveTime = aliveTime;
// Set Move
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(vapor.Owner, out PhysicsComponent? physics))
if (EntityManager.TryGetComponent(vapor.Owner, out PhysicsComponent? physics))
{
physics.BodyStatus = BodyStatus.InAir;
physics.ApplyLinearImpulse(dir * speed);
@@ -97,12 +97,12 @@ namespace Content.Server.Chemistry.EntitySystems
vapor.Timer += frameTime;
vapor.ReactTimer += frameTime;
if (vapor.ReactTimer >= ReactTime && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(vapor.Owner).GridID.IsValid())
if (vapor.ReactTimer >= ReactTime && EntityManager.GetComponent<TransformComponent>(vapor.Owner).GridID.IsValid())
{
vapor.ReactTimer = 0;
var mapGrid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).GridID);
var mapGrid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID);
var tile = mapGrid.GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.ToVector2i(EntityManager, _mapManager));
var tile = mapGrid.GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates.ToVector2i(EntityManager, _mapManager));
foreach (var reagentQuantity in contents.Contents.ToArray())
{
if (reagentQuantity.Quantity == FixedPoint2.Zero) continue;
@@ -114,7 +114,7 @@ namespace Content.Server.Chemistry.EntitySystems
// Check if we've reached our target.
if (!vapor.Reached &&
vapor.Target.TryDistance(EntityManager, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates, out var distance) &&
vapor.Target.TryDistance(EntityManager, EntityManager.GetComponent<TransformComponent>(entity).Coordinates, out var distance) &&
distance <= 0.5f)
{
vapor.Reached = true;
@@ -123,7 +123,7 @@ namespace Content.Server.Chemistry.EntitySystems
if (contents.CurrentVolume == 0 || vapor.Timer > vapor.AliveTime)
{
// Delete this
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(entity);
EntityManager.QueueDeleteEntity(entity);
}
}
}

2
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -41,7 +41,7 @@ namespace Content.Server.Climbing
return;
// Check that the user climb.
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ClimbingComponent? climbingComponent) ||
if (!EntityManager.TryGetComponent(args.User, out ClimbingComponent? climbingComponent) ||
climbingComponent.IsClimbing)
return;

8
Content.Server/Construction/ConstructionSystem.cs
View File

@@ -51,13 +51,13 @@ namespace Content.Server.Construction
{
if (GetCurrentGraph(uid, construction) is not {} graph)
{
_sawmill.Warning($"Prototype {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
_sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
return;
}
if (GetNodeFromGraph(graph, construction.Node) is not {} node)
{
_sawmill.Warning($"Prototype {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid node specified.");
_sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid node specified.");
return;
}
@@ -66,7 +66,7 @@ namespace Content.Server.Construction
{
if (GetEdgeFromNode(node, edgeIndex) is not {} currentEdge)
{
_sawmill.Warning($"Prototype {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
_sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
return;
}
@@ -77,7 +77,7 @@ namespace Content.Server.Construction
{
if (GetNodeFromGraph(graph, targetNodeId) is not { } targetNode)
{
_sawmill.Warning($"Prototype {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
_sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(construction.Owner).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
return;
}

16
Content.Server/Conveyor/ConveyorSystem.cs
View File

@@ -40,9 +40,9 @@ namespace Content.Server.Conveyor
private void UpdateAppearance(ConveyorComponent component)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<AppearanceComponent?>(component.Owner, out var appearance))
if (EntityManager.TryGetComponent<AppearanceComponent?>(component.Owner, out var appearance))
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ApcPowerReceiverComponent?>(component.Owner, out var receiver) && receiver.Powered)
if (EntityManager.TryGetComponent<ApcPowerReceiverComponent?>(component.Owner, out var receiver) && receiver.Powered)
{
appearance.SetData(ConveyorVisuals.State, component.State);
}
@@ -98,13 +98,13 @@ namespace Content.Server.Conveyor
return false;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver) &&
if (EntityManager.TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver) &&
!receiver.Powered)
{
return false;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(component.Owner))
if (EntityManager.HasComponent<ItemComponent>(component.Owner))
{
return false;
}
@@ -124,7 +124,7 @@ namespace Content.Server.Conveyor
var adjustment = component.State == ConveyorState.Reversed ? MathHelper.Pi/2 : -MathHelper.Pi/2;
var radians = MathHelper.DegreesToRadians(component.Angle);
return new Angle(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).LocalRotation.Theta + radians + adjustment);
return new Angle(EntityManager.GetComponent<TransformComponent>(component.Owner).LocalRotation.Theta + radians + adjustment);
}
public IEnumerable<(EntityUid, IPhysBody)> GetEntitiesToMove(ConveyorComponent comp)
@@ -132,7 +132,7 @@ namespace Content.Server.Conveyor
//todo uuuhhh cache this
foreach (var entity in _entityLookup.GetEntitiesIntersecting(comp.Owner, flags: LookupFlags.Approximate))
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted)
if ((!EntityManager.EntityExists(entity) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted)
{
continue;
}
@@ -142,13 +142,13 @@ namespace Content.Server.Conveyor
continue;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics) ||
if (!EntityManager.TryGetComponent(entity, out IPhysBody? physics) ||
physics.BodyType == BodyType.Static || physics.BodyStatus == BodyStatus.InAir || entity.IsWeightless())
{
continue;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity))
if (EntityManager.HasComponent<IMapGridComponent>(entity))
{
continue;
}

8
Content.Server/Cuffs/CuffableSystem.cs
View File

@@ -66,7 +66,7 @@ namespace Content.Server.Cuffs
if (args.User == args.Target)
{
// This UncuffAttemptEvent check should probably be In MobStateSystem, not here?
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<MobStateComponent?>(args.User, out var state))
if (EntityManager.TryGetComponent<MobStateComponent?>(args.User, out var state))
{
// Manually check this.
if (state.IsIncapacitated())
@@ -101,11 +101,11 @@ namespace Content.Server.Cuffs
{
var owner = message.Sender;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out CuffableComponent? cuffable) ||
if (!EntityManager.TryGetComponent(owner, out CuffableComponent? cuffable) ||
!cuffable.Initialized) return;
var dirty = false;
var handCount = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(owner)?.Count ?? 0;
var handCount = EntityManager.GetComponentOrNull<HandsComponent>(owner)?.Count ?? 0;
while (cuffable.CuffedHandCount > handCount && cuffable.CuffedHandCount > 0)
{
@@ -115,7 +115,7 @@ namespace Content.Server.Cuffs
var entity = container.ContainedEntities[^1];
container.Remove(entity);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).WorldPosition;
EntityManager.GetComponent<TransformComponent>(entity).WorldPosition = EntityManager.GetComponent<TransformComponent>(owner).WorldPosition;
}
if (dirty)

4
Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Damage.Systems
return;
if (component.WeldingDamage is {} weldingDamage
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<WelderComponent?>(args.Used, out var welder)
&& EntityManager.TryGetComponent<WelderComponent?>(args.Used, out var welder)
&& welder.Lit)
{
var dmg = _damageableSystem.TryChangeDamage(args.Target, weldingDamage);
@@ -40,7 +40,7 @@ namespace Content.Server.Damage.Systems
args.Handled = true;
}
else if (component.DefaultDamage is {} damage
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<ToolComponent?>(args.Used, out var tool)
&& EntityManager.TryGetComponent<ToolComponent?>(args.Used, out var tool)
&& tool.Qualities.ContainsAny(component.Tools))
{
var dmg = _damageableSystem.TryChangeDamage(args.Target, damage);

2
Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.DeviceNetwork.Systems
private void OnProviderConnected(EntityUid uid, ApcNetworkComponent component, ExtensionCableSystem.ProviderConnectedEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Provider.Owner, out NodeContainerComponent? nodeContainer)) return;
if (!EntityManager.TryGetComponent(args.Provider.Owner, out NodeContainerComponent? nodeContainer)) return;
if (nodeContainer.TryGetNode("power", out CableNode? node))
{

8
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Disposal.Tube
if (!args.CanAccess || !args.CanInteract)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
var player = actor.PlayerSession;
@@ -50,7 +50,7 @@ namespace Content.Server.Disposal.Tube
if (!args.CanAccess || !args.CanInteract)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
var player = actor.PlayerSession;
@@ -86,8 +86,8 @@ namespace Content.Server.Disposal.Tube
return null;
var oppositeDirection = nextDirection.GetOpposite();
var grid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(targetTube.Owner).GridID);
var position = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(targetTube.Owner).Coordinates;
var grid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(targetTube.Owner).GridID);
var position = EntityManager.GetComponent<TransformComponent>(targetTube.Owner).Coordinates;
foreach (var entity in grid.GetInDir(position, nextDirection))
{
if (!EntityManager.TryGetComponent(entity, out IDisposalTubeComponent? tube))

12
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -47,24 +47,24 @@ namespace Content.Server.Disposal.Unit.EntitySystems
foreach (var entity in holder.Container.ContainedEntities.ToArray())
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics))
if (EntityManager.TryGetComponent(entity, out IPhysBody? physics))
{
physics.CanCollide = true;
}
holder.Container.ForceRemove(entity);
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Parent == holderTransform)
if (EntityManager.GetComponent<TransformComponent>(entity).Parent == holderTransform)
{
if (duc != null)
{
// Insert into disposal unit
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates = new EntityCoordinates((duc).Owner, Vector2.Zero);
EntityManager.GetComponent<TransformComponent>(entity).Coordinates = new EntityCoordinates((duc).Owner, Vector2.Zero);
duc.Container.Insert(entity);
}
else
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).AttachParentToContainerOrGrid();
EntityManager.GetComponent<TransformComponent>(entity).AttachParentToContainerOrGrid();
}
}
}
@@ -161,11 +161,11 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (holder.TimeLeft > 0)
{
var progress = 1 - holder.TimeLeft / holder.StartingTime;
var origin = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(currentTube.Owner).Coordinates;
var origin = EntityManager.GetComponent<TransformComponent>(currentTube.Owner).Coordinates;
var destination = holder.CurrentDirection.ToVec();
var newPosition = destination * progress;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(holder.Owner).Coordinates = origin.Offset(newPosition);
EntityManager.GetComponent<TransformComponent>(holder.Owner).Coordinates = origin.Offset(newPosition);
continue;
}

30
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -172,7 +172,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
#region Eventbus Handlers
private void HandleActivate(EntityUid uid, DisposalUnitComponent component, ActivateInWorldEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
{
return;
}
@@ -187,7 +187,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private void HandleInteractHand(EntityUid uid, DisposalUnitComponent component, InteractHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor)) return;
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor)) return;
// Duplicated code here, not sure how else to get actor inside to make UserInterface happy.
@@ -198,7 +198,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private void HandleInteractUsing(EntityUid uid, DisposalUnitComponent component, InteractUsingEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out HandsComponent? hands))
if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands))
{
return;
}
@@ -238,7 +238,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
UpdateInterface(component, component.Powered);
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnchorableComponent>(component.Owner))
if (!EntityManager.HasComponent<AnchorableComponent>(component.Owner))
{
Logger.WarningS("VitalComponentMissing", $"Disposal unit {uid} is missing an {nameof(AnchorableComponent)}");
}
@@ -302,7 +302,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{
var currentTime = GameTiming.CurTime;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Entity, out HandsComponent? hands) ||
if (!EntityManager.TryGetComponent(args.Entity, out HandsComponent? hands) ||
hands.Count == 0 ||
currentTime < component.LastExitAttempt + ExitAttemptDelay)
{
@@ -351,7 +351,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (count > 0)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PhysicsComponent? disposalsBody))
if (!EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? disposalsBody))
{
component.RecentlyEjected.Clear();
}
@@ -395,7 +395,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
}
// This popup message doesn't appear on clicks, even when code was seperate. Unsure why.
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandsComponent>(eventArgs.User))
if (!EntityManager.HasComponent<HandsComponent>(eventArgs.User))
{
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("ui-disposal-unit-is-valid-interaction-no-hands"));
return false;
@@ -444,8 +444,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems
return false;
}
var grid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).GridID);
var coords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates;
var grid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(component.Owner).GridID);
var coords = EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates;
var entry = grid.GetLocal(coords)
.FirstOrDefault(entity => EntityManager.HasComponent<DisposalEntryComponent>(entity));
@@ -457,7 +457,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
var air = component.Air;
var entryComponent = EntityManager.GetComponent<DisposalEntryComponent>(entry);
if (_atmosSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates, true) is {Temperature: > 0} environment)
if (_atmosSystem.GetTileMixture(EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates, true) is {Temperature: > 0} environment)
{
var transferMoles = 0.1f * (0.05f * Atmospherics.OneAtmosphere * 1.01f - air.Pressure) * air.Volume / (environment.Temperature * Atmospherics.R);
@@ -483,7 +483,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public void UpdateInterface(DisposalUnitComponent component, bool powered)
{
var stateString = Loc.GetString($"{component.State}");
var state = new SharedDisposalUnitComponent.DisposalUnitBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName, stateString, EstimatedFullPressure(component), powered, component.Engaged);
var state = new SharedDisposalUnitComponent.DisposalUnitBoundUserInterfaceState(EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName, stateString, EstimatedFullPressure(component), powered, component.Engaged);
component.UserInterface?.SetState(state);
}
@@ -504,12 +504,12 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public void UpdateVisualState(DisposalUnitComponent component, bool flush)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out AppearanceComponent? appearance))
if (!EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearance))
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if (!EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
{
appearance.SetData(SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.UnAnchored);
appearance.SetData(SharedDisposalUnitComponent.Visuals.Handle, SharedDisposalUnitComponent.HandleState.Normal);
@@ -567,7 +567,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public bool CanFlush(DisposalUnitComponent component)
{
return component.State == SharedDisposalUnitComponent.PressureState.Ready && component.Powered && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored;
return component.State == SharedDisposalUnitComponent.PressureState.Ready && component.Powered && EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored;
}
public void Engage(DisposalUnitComponent component)
@@ -633,7 +633,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{
TryQueueEngage(component);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ActorComponent? actor))
if (EntityManager.TryGetComponent(entity, out ActorComponent? actor))
{
component.UserInterface?.Close(actor.PlayerSession);
}

2
Content.Server/Doors/Systems/AirlockSystem.cs
View File

@@ -88,7 +88,7 @@ namespace Content.Server.Doors.Systems
private void OnDoorClickShouldActivate(EntityUid uid, AirlockComponent component, DoorClickShouldActivateEvent args)
{
if (component.WiresComponent != null && component.WiresComponent.IsPanelOpen &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Args.User, out ActorComponent? actor))
EntityManager.TryGetComponent(args.Args.User, out ActorComponent? actor))
{
component.WiresComponent.OpenInterface(actor.PlayerSession);
args.Handled = true;

2
Content.Server/Doors/Systems/DoorSystem.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Server.Doors
private void HandleCollide(EntityUid uid, ServerDoorComponent component, StartCollideEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().HasComponent<DoorBumpOpenerComponent>(args.OtherFixture.Body.Owner))
if (!EntityManager.HasComponent<DoorBumpOpenerComponent>(args.OtherFixture.Body.Owner))
{
return;
}

6
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@@ -165,7 +165,7 @@ namespace Content.Server.Electrocution
foreach (var entity in transform.Coordinates.GetEntitiesInTile(
LookupFlags.Approximate | LookupFlags.IncludeAnchored, _entityLookup))
{
if (IoCManager.Resolve<IEntityManager>().HasComponent<WindowComponent>(entity))
if (EntityManager.HasComponent<WindowComponent>(entity))
return false;
}
}
@@ -285,10 +285,10 @@ namespace Content.Server.Electrocution
var electrocutionEntity = EntityManager.SpawnEntity(
$"VirtualElectrocutionLoad{node.NodeGroupID}", sourceTransform.Coordinates);
var electrocutionNode = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(electrocutionEntity)
var electrocutionNode = EntityManager.GetComponent<NodeContainerComponent>(electrocutionEntity)
.GetNode<ElectrocutionNode>("electrocution");
var electrocutionComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ElectrocutionComponent>(electrocutionEntity);
var electrocutionComponent = EntityManager.GetComponent<ElectrocutionComponent>(electrocutionEntity);
electrocutionNode.CableEntity = sourceUid;
electrocutionNode.NodeName = node.Name;

10
Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs
View File

@@ -41,18 +41,18 @@ namespace Content.Server.Engineering.EntitySystems
component.TokenSource.Cancel();
}
if (component.Deleted || (!IoCManager.Resolve<IEntityManager>().EntityExists(component.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted)
if (component.Deleted || (!EntityManager.EntityExists(component.Owner) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted)
return;
var entity = EntityManager.SpawnEntity(component.Prototype, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates);
var entity = EntityManager.SpawnEntity(component.Prototype, EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(args.User, out var hands)
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemComponent?>(entity, out var item))
if (EntityManager.TryGetComponent<HandsComponent?>(args.User, out var hands)
&& EntityManager.TryGetComponent<ItemComponent?>(entity, out var item))
{
hands.PutInHandOrDrop(item);
}
IoCManager.Resolve<IEntityManager>().DeleteEntity(component.Owner);
EntityManager.DeleteEntity(component.Owner);
return;
}

8
Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
View File

@@ -57,10 +57,10 @@ namespace Content.Server.Engineering.EntitySystems
return;
}
if (component.Deleted || (!IoCManager.Resolve<IEntityManager>().EntityExists(component.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted)
if (component.Deleted || (!EntityManager.EntityExists(component.Owner) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted)
return;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedStackComponent?>(component.Owner, out var stackComp)
if (EntityManager.TryGetComponent<SharedStackComponent?>(component.Owner, out var stackComp)
&& component.RemoveOnInteract && !_stackSystem.Use(uid, 1, stackComp))
{
return;
@@ -68,8 +68,8 @@ namespace Content.Server.Engineering.EntitySystems
EntityManager.SpawnEntity(component.Prototype, args.ClickLocation.SnapToGrid(grid));
if (component.RemoveOnInteract && stackComp == null && !((!IoCManager.Resolve<IEntityManager>().EntityExists(component.Owner) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted))
IoCManager.Resolve<IEntityManager>().DeleteEntity(component.Owner);
if (component.RemoveOnInteract && stackComp == null && !((!EntityManager.EntityExists(component.Owner) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted))
EntityManager.DeleteEntity(component.Owner);
}
}
}

2
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -149,7 +149,7 @@ namespace Content.Server.Explosion.EntitySystems
Timer.Spawn(delay, () =>
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(triggered) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(triggered).EntityLifeStage) >= EntityLifeStage.Deleted) return;
if (Deleted(triggered)) return;
Trigger(triggered, user);
});
}

8
Content.Server/Flash/FlashSystem.cs
View File

@@ -61,7 +61,7 @@ namespace Content.Server.Flash
return;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<FlashableComponent>(args.Entity))
if (EntityManager.HasComponent<FlashableComponent>(args.Entity))
{
args.CanInteract = true;
Flash(args.Entity, args.User, uid, comp.FlashDuration, comp.SlowTo);
@@ -75,7 +75,7 @@ namespace Content.Server.Flash
return;
}
foreach (var entity in _entityLookup.GetEntitiesInRange(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner).Coordinates, comp.Range))
foreach (var entity in _entityLookup.GetEntitiesInRange(EntityManager.GetComponent<TransformComponent>(comp.Owner).Coordinates, comp.Range))
{
Flash(entity, args.User, uid, comp.AoeFlashDuration, comp.SlowTo);
}
@@ -86,7 +86,7 @@ namespace Content.Server.Flash
if (comp.HasUses)
{
// TODO flash visualizer
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(comp.Owner, out var sprite))
if (!EntityManager.TryGetComponent<SpriteComponent?>(comp.Owner, out var sprite))
return false;
if (--comp.Uses == 0)
@@ -149,7 +149,7 @@ namespace Content.Server.Flash
foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
{
if (!IoCManager.Resolve<IEntityManager>().HasComponent<FlashableComponent>(entity) ||
if (!EntityManager.HasComponent<FlashableComponent>(entity) ||
!transform.InRangeUnobstructed(entity, range, CollisionGroup.Opaque)) continue;
Flash(entity, user, source, duration, slowTo, displayPopup);

2
Content.Server/Gravity/EntitySystems/GravityGeneratorSystem.cs
View File

@@ -184,7 +184,7 @@ namespace Content.Server.Gravity.EntitySystems
private void UpdateGravityActive(GravityGeneratorComponent grav, bool shake)
{
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(grav.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(grav.Owner).GridID;
if (gridId == GridId.Invalid)
return;

8
Content.Server/Gravity/EntitySystems/GravitySystem.cs
View File

@@ -17,12 +17,12 @@ namespace Content.Server.Gravity.EntitySystems
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
{
// Incase there's already a generator on the grid we'll just set it now.
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(component.Owner).GridID;
GravityChangedMessage message;
foreach (var generator in EntityManager.EntityQuery<GravityGeneratorComponent>())
{
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(generator.Owner).GridID == gridId && generator.GravityActive)
if (EntityManager.GetComponent<TransformComponent>(generator.Owner).GridID == gridId && generator.GravityActive)
{
component.Enabled = true;
message = new GravityChangedMessage(gridId, true);
@@ -41,7 +41,7 @@ namespace Content.Server.Gravity.EntitySystems
if (comp.Enabled) return;
comp.Enabled = true;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(comp.Owner).GridID;
var message = new GravityChangedMessage(gridId, true);
RaiseLocalEvent(message);
}
@@ -51,7 +51,7 @@ namespace Content.Server.Gravity.EntitySystems
if (!comp.Enabled) return;
comp.Enabled = false;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(comp.Owner).GridID;
var message = new GravityChangedMessage(gridId, false);
RaiseLocalEvent(message);
}

10
Content.Server/Labels/Label/HandLabelerSystem.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Server.Labels
LabelComponent label = target.EnsureComponent<LabelComponent>();
if (label.OriginalName != null)
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName = label.OriginalName;
EntityManager.GetComponent<MetaDataComponent>(target).EntityName = label.OriginalName;
label.OriginalName = null;
if (handLabeler.AssignedLabel == string.Empty)
@@ -63,16 +63,16 @@ namespace Content.Server.Labels
return;
}
label.OriginalName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName;
string val = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName + $" ({handLabeler.AssignedLabel})";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName = val;
label.OriginalName = EntityManager.GetComponent<MetaDataComponent>(target).EntityName;
string val = EntityManager.GetComponent<MetaDataComponent>(target).EntityName + $" ({handLabeler.AssignedLabel})";
EntityManager.GetComponent<MetaDataComponent>(target).EntityName = val;
label.CurrentLabel = handLabeler.AssignedLabel;
result = Loc.GetString("hand-labeler-successfully-applied");
}
private void OnUseInHand(EntityUid uid, HandLabelerComponent handLabeler, UseInHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
handLabeler.Owner.GetUIOrNull(HandLabelerUiKey.Key)?.Open(actor.PlayerSession);

4
Content.Server/Light/EntitySystems/LightReplacerSystem.cs
View File

@@ -105,7 +105,7 @@ namespace Content.Server.Light.EntitySystems
// try get first inserted bulb of the same type as targeted light fixtutre
var bulb = replacer.InsertedBulbs.ContainedEntities.FirstOrDefault(
(e) => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<LightBulbComponent>(e)?.Type == fixture.BulbType);
(e) => EntityManager.GetComponentOrNull<LightBulbComponent>(e)?.Type == fixture.BulbType);
// found bulb in inserted storage
if (bulb != null)
@@ -123,7 +123,7 @@ namespace Content.Server.Light.EntitySystems
// found right bulb, let's spawn it
if (bulbEnt != null)
{
bulb = EntityManager.SpawnEntity(bulbEnt.PrototypeName, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(replacer.Owner).Coordinates);
bulb = EntityManager.SpawnEntity(bulbEnt.PrototypeName, EntityManager.GetComponent<TransformComponent>(replacer.Owner).Coordinates);
bulbEnt.Amount--;
}
// not found any light bulbs

6
Content.Server/Light/EntitySystems/MatchstickSystem.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Light.EntitySystems
if (match.CurrentState != SmokableState.Lit)
continue;
_atmosphereSystem.HotspotExpose(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(match.Owner).Coordinates, 400, 50, true);
_atmosphereSystem.HotspotExpose(EntityManager.GetComponent<TransformComponent>(match.Owner).Coordinates, 400, 50, true);
}
}
@@ -84,7 +84,7 @@ namespace Content.Server.Light.EntitySystems
component.PointLightComponent.Enabled = component.CurrentState == SmokableState.Lit;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out ItemComponent? item))
if (EntityManager.TryGetComponent(component.Owner, out ItemComponent? item))
{
switch (component.CurrentState)
{
@@ -97,7 +97,7 @@ namespace Content.Server.Light.EntitySystems
}
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out AppearanceComponent? appearance))
if (EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearance))
{
appearance.SetData(SmokingVisuals.Smoking, component.CurrentState);
}

4
Content.Server/Light/EntitySystems/UnpoweredFlashlightSystem.cs
View File

@@ -37,13 +37,13 @@ namespace Content.Server.Light.EntitySystems
public void ToggleLight(UnpoweredFlashlightComponent flashlight)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(flashlight.Owner, out PointLightComponent? light))
if (!EntityManager.TryGetComponent(flashlight.Owner, out PointLightComponent? light))
return;
flashlight.LightOn = !flashlight.LightOn;
light.Enabled = flashlight.LightOn;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(flashlight.Owner, out AppearanceComponent? appearance))
if (EntityManager.TryGetComponent(flashlight.Owner, out AppearanceComponent? appearance))
appearance.SetData(UnpoweredFlashlightVisuals.LightOn, flashlight.LightOn);
SoundSystem.Play(Filter.Pvs(light.Owner), flashlight.ToggleSound.GetSound(), flashlight.Owner);

12
Content.Server/Lock/LockSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Lock
private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearance))
if (EntityManager.TryGetComponent(lockComp.Owner, out AppearanceComponent? appearance))
{
appearance.SetData(StorageVisuals.CanLock, true);
}
@@ -64,7 +64,7 @@ namespace Content.Server.Lock
args.PushText(Loc.GetString(lockComp.Locked
? "lock-comp-on-examined-is-locked"
: "lock-comp-on-examined-is-unlocked",
("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
("entityName", Name: EntityManager.GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
}
public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = null)
@@ -78,7 +78,7 @@ namespace Content.Server.Lock
if (!HasUserAccess(uid, user, quiet: false))
return false;
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: EntityManager.GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Locked = true;
if(lockComp.LockSound != null)
@@ -86,7 +86,7 @@ namespace Content.Server.Lock
SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.LockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
if (EntityManager.TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
{
appearanceComp.SetData(StorageVisuals.Locked, true);
}
@@ -107,7 +107,7 @@ namespace Content.Server.Lock
if (!HasUserAccess(uid, user, quiet: false))
return false;
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: EntityManager.GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Locked = false;
if(lockComp.UnlockSound != null)
@@ -115,7 +115,7 @@ namespace Content.Server.Lock
SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.UnlockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
if (EntityManager.TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
{
appearanceComp.SetData(StorageVisuals.Locked, false);
}

2
Content.Server/Medical/MedicalScannerSystem.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Server.Medical
Verb verb = new();
verb.Act = () => component.InsertBody(args.Using.Value);
verb.Category = VerbCategory.Insert;
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(args.Using.Value).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(args.Using.Value).EntityName;
args.Verbs.Add(verb);
}

2
Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Nutrition.EntitySystems
{
SoundSystem.Play(Filter.Pvs(creamPie.Owner), creamPie.Sound.GetSound(), creamPie.Owner, AudioHelpers.WithVariation(0.125f));
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<FoodComponent?>(creamPie.Owner, out var foodComp) && _solutionsSystem.TryGetSolution(creamPie.Owner, foodComp.SolutionName, out var solution))
if (EntityManager.TryGetComponent<FoodComponent?>(creamPie.Owner, out var foodComp) && _solutionsSystem.TryGetSolution(creamPie.Owner, foodComp.SolutionName, out var solution))
{
_spillableSystem.SpillAt(creamPie.Owner, solution, "PuddleSmear", false);
}

2
Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
View File

@@ -70,7 +70,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (_robustRandom.Prob(component.BreakChance))
{
SoundSystem.Play(Filter.Pvs(userUid), component.BreakSound.GetSound(), userUid, AudioParams.Default.WithVolume(-2f));
IoCManager.Resolve<IEntityManager>().DeleteEntity(component.Owner);
EntityManager.DeleteEntity(component.Owner);
}
}
}

2
Content.Server/PAI/PAISystem.cs
View File

@@ -74,7 +74,7 @@ namespace Content.Server.PAI
// Ownership tag
string val = Loc.GetString("pai-system-pai-name", ("owner", args.User));
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName = val;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName = val;
var ghostFinder = EntityManager.EnsureComponent<GhostTakeoverAvailableComponent>(uid);

12
Content.Server/PDA/PDASystem.cs
View File

@@ -73,7 +73,7 @@ namespace Content.Server.PDA
private void OnItemInserted(EntityUid uid, PDAComponent pda, EntInsertedIntoContainerMessage args)
{
if (args.Container.ID == pda.IdSlot.ID)
pda.ContainedID = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<IdCardComponent>(args.Entity);
pda.ContainedID = EntityManager.GetComponentOrNull<IdCardComponent>(args.Entity);
UpdatePDAAppearance(pda);
UpdatePDAUserInterface(pda);
@@ -112,7 +112,7 @@ namespace Content.Server.PDA
private bool OpenUI(PDAComponent pda, EntityUid user)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(user, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(user, out ActorComponent? actor))
return false;
var ui = pda.Owner.GetUIOrNull(PDAUiKey.Key);
@@ -123,7 +123,7 @@ namespace Content.Server.PDA
private void UpdatePDAAppearance(PDAComponent pda)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pda.Owner, out AppearanceComponent? appearance))
if (EntityManager.TryGetComponent(pda.Owner, out AppearanceComponent? appearance))
appearance.SetData(PDAVisuals.IDCardInserted, pda.ContainedID != null);
}
@@ -136,7 +136,7 @@ namespace Content.Server.PDA
JobTitle = pda.ContainedID?.JobTitle
};
var hasUplink = IoCManager.Resolve<IEntityManager>().HasComponent<UplinkComponent>(pda.Owner);
var hasUplink = EntityManager.HasComponent<UplinkComponent>(pda.Owner);
var ui = pda.Owner.GetUIOrNull(PDAUiKey.Key);
ui?.SetState(new PDAUpdateState(pda.FlashlightOn, pda.PenSlot.HasItem, ownerInfo, hasUplink));
@@ -155,7 +155,7 @@ namespace Content.Server.PDA
break;
case PDAToggleFlashlightMessage _:
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pda.Owner, out UnpoweredFlashlightComponent? flashlight))
if (EntityManager.TryGetComponent(pda.Owner, out UnpoweredFlashlightComponent? flashlight))
_unpoweredFlashlight.ToggleLight(flashlight);
break;
}
@@ -172,7 +172,7 @@ namespace Content.Server.PDA
}
case PDAShowUplinkMessage _:
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pda.Owner, out UplinkComponent? uplink))
if (EntityManager.TryGetComponent(pda.Owner, out UplinkComponent? uplink))
_uplinkSystem.ToggleUplinkUI(uplink, msg.Session);
break;
}

2
Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Server.ParticleAccelerator.EntitySystems
private static void RotateEvent(ref RotateEvent ev)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Sender, out ParticleAcceleratorPartComponent? part))
if (EntityManager.TryGetComponent(ev.Sender, out ParticleAcceleratorPartComponent? part))
{
part.Rotated();
}

2
Content.Server/Pinpointer/ServerPinpointerSystem.cs
View File

@@ -62,7 +62,7 @@ namespace Content.Server.Pinpointer
{
if (whitelist.IsValid(e))
{
var dist = (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(e).WorldPosition - transform.WorldPosition).LengthSquared;
var dist = (EntityManager.GetComponent<TransformComponent>(e).WorldPosition - transform.WorldPosition).LengthSquared;
l.TryAdd(dist, e);
}
}

4
Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
View File

@@ -78,7 +78,7 @@ namespace Content.Server.Pointing.EntitySystems
if (component.TurningDelay > 0)
{
var difference = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
var difference = EntityManager.GetComponent<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
var angle = difference.ToAngle();
var adjusted = angle.Degrees + 90;
var newAngle = Angle.FromDegrees(adjusted);
@@ -93,7 +93,7 @@ namespace Content.Server.Pointing.EntitySystems
UpdateAppearance(uid, component, transform);
var toChased = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
var toChased = EntityManager.GetComponent<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
transform.WorldPosition += toChased * frameTime * component.ChasingSpeed;

4
Content.Server/Power/EntitySystems/BaseChargerSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.Power.EntitySystems
return;
Verb verb = new();
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Container.ContainedEntity!.Value).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(component.Container.ContainedEntity!.Value).EntityName;
verb.Category = VerbCategory.Eject;
verb.Act = () => component.RemoveItem(args.User);
args.Verbs.Add(verb);
@@ -60,7 +60,7 @@ namespace Content.Server.Power.EntitySystems
return;
Verb verb = new();
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(@using).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(@using).EntityName;
verb.Category = VerbCategory.Insert;
verb.Act = () => component.TryInsertItem(@using);
args.Verbs.Add(verb);

2
Content.Server/Power/EntitySystems/CableMultitoolSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.Power.EntitySystems
if (args.IsInDetailsRange)
{
// Determine if they are holding a multitool.
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(args.Examiner, out var hands) && hands.TryGetActiveHand(out var hand))
if (EntityManager.TryGetComponent<HandsComponent?>(args.Examiner, out var hands) && hands.TryGetActiveHand(out var hand))
{
var held = hand.HeldEntity;
// Pulsing is hardcoded here because I don't think it needs to be more complex than that right now.

2
Content.Server/Power/EntitySystems/CableVisSystem.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Power.EntitySystems
if (reachable is not CableNode)
continue;
var otherTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(reachable.Owner);
var otherTransform = EntityManager.GetComponent<TransformComponent>(reachable.Owner);
if (otherTransform.GridID != grid.Index)
continue;

8
Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
View File

@@ -85,7 +85,7 @@ namespace Content.Server.Power.EntitySystems
if (EntityManager.TryGetComponent<ExtensionCableReceiverComponent>(entity, out var receiver) &&
receiver.Connectable &&
receiver.Provider == null &&
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.TryDistance(IoCManager.Resolve<IEntityManager>(), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).Coordinates, out var distance) &&
EntityManager.GetComponent<TransformComponent>(entity).Coordinates.TryDistance(EntityManager, EntityManager.GetComponent<TransformComponent>(owner).Coordinates, out var distance) &&
distance < Math.Min(range, receiver.ReceptionRange))
{
yield return receiver;
@@ -118,7 +118,7 @@ namespace Content.Server.Power.EntitySystems
private void OnReceiverStarted(EntityUid uid, ExtensionCableReceiverComponent receiver, ComponentStartup args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(receiver.Owner, out PhysicsComponent? physicsComponent))
if (EntityManager.TryGetComponent(receiver.Owner, out PhysicsComponent? physicsComponent))
{
receiver.Connectable = physicsComponent.BodyType == BodyType.Static;
}
@@ -179,11 +179,11 @@ namespace Content.Server.Power.EntitySystems
foreach (var entity in nearbyEntities)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ExtensionCableProviderComponent?>(entity, out var provider)) continue;
if (!EntityManager.TryGetComponent<ExtensionCableProviderComponent?>(entity, out var provider)) continue;
if (!provider.Connectable) continue;
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.TryDistance(IoCManager.Resolve<IEntityManager>(), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).Coordinates, out var distance)) continue;
if (!EntityManager.GetComponent<TransformComponent>(entity).Coordinates.TryDistance(EntityManager, EntityManager.GetComponent<TransformComponent>(owner).Coordinates, out var distance)) continue;
if (!(distance < Math.Min(range, provider.TransferRange))) continue;

6
Content.Server/Power/EntitySystems/PowerNetSystem.cs
View File

@@ -343,7 +343,7 @@ namespace Content.Server.Power.EntitySystems
foreach (var apc in net.Apcs)
{
var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(apc.Owner);
var netBattery = EntityManager.GetComponent<PowerNetworkBatteryComponent>(apc.Owner);
netNode.BatteriesDischarging.Add(netBattery.NetworkBattery.Id);
netBattery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
}
@@ -372,14 +372,14 @@ namespace Content.Server.Power.EntitySystems
foreach (var charger in net.Chargers)
{
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(charger.Owner);
var battery = EntityManager.GetComponent<PowerNetworkBatteryComponent>(charger.Owner);
netNode.BatteriesCharging.Add(battery.NetworkBattery.Id);
battery.NetworkBattery.LinkedNetworkCharging = netNode.Id;
}
foreach (var discharger in net.Dischargers)
{
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(discharger.Owner);
var battery = EntityManager.GetComponent<PowerNetworkBatteryComponent>(discharger.Owner);
netNode.BatteriesDischarging.Add(battery.NetworkBattery.Id);
battery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
}

4
Content.Server/PowerCell/PowerCellSystem.cs
View File

@@ -47,12 +47,12 @@ namespace Content.Server.PowerCell
!args.CanAccess ||
!args.CanInteract ||
component.HasCell ||
!IoCManager.Resolve<IEntityManager>().HasComponent<PowerCellComponent>(@using) ||
!EntityManager.HasComponent<PowerCellComponent>(@using) ||
!_actionBlockerSystem.CanDrop(args.User))
return;
Verb verb = new();
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(@using).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(@using).EntityName;
verb.Category = VerbCategory.Insert;
verb.Act = () => component.InsertCell(@using);
args.Verbs.Add(verb);

6
Content.Server/Projectiles/ProjectileSystem.cs
View File

@@ -35,11 +35,11 @@ namespace Content.Server.Projectiles
var otherEntity = args.OtherFixture.Body.Owner;
var coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.OtherFixture.Body.Owner).Coordinates;
var coordinates = EntityManager.GetComponent<TransformComponent>(args.OtherFixture.Body.Owner).Coordinates;
var playerFilter = Filter.Pvs(coordinates);
if (!EntityManager.GetComponent<MetaDataComponent>(otherEntity).EntityDeleted && component.SoundHitSpecies != null &&
IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(otherEntity))
EntityManager.HasComponent<SharedBodyComponent>(otherEntity))
{
SoundSystem.Play(playerFilter, component.SoundHitSpecies.GetSound(), coordinates);
}
@@ -83,7 +83,7 @@ namespace Content.Server.Projectiles
if (component.TimeLeft <= 0)
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(component.Owner);
EntityManager.DeleteEntity(component.Owner);
}
}
}

4
Content.Server/RCD/Systems/RCDSystem.cs
View File

@@ -128,11 +128,11 @@ namespace Content.Server.RCD.Systems
// thus we early return to avoid the tile set code.
case RcdMode.Walls:
var ent = EntityManager.SpawnEntity("WallSolid", mapGrid.GridTileToLocal(snapPos));
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent).LocalRotation = Angle.Zero; // Walls always need to point south.
EntityManager.GetComponent<TransformComponent>(ent).LocalRotation = Angle.Zero; // Walls always need to point south.
break;
case RcdMode.Airlock:
var airlock = EntityManager.SpawnEntity("Airlock", mapGrid.GridTileToLocal(snapPos));
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(airlock).LocalRotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(rcd.Owner).LocalRotation; //Now apply icon smoothing.
EntityManager.GetComponent<TransformComponent>(airlock).LocalRotation = EntityManager.GetComponent<TransformComponent>(rcd.Owner).LocalRotation; //Now apply icon smoothing.
break;
default:
args.Handled = true;

10
Content.Server/Recycling/RecyclerSystem.cs
View File

@@ -26,12 +26,12 @@ namespace Content.Server.Recycling
// TODO: Prevent collision with recycled items
// Can only recycle things that are recyclable... And also check the safety of the thing to recycle.
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out RecyclableComponent? recyclable) || !recyclable.Safe && component.Safe) return;
if (!EntityManager.TryGetComponent(entity, out RecyclableComponent? recyclable) || !recyclable.Safe && component.Safe) return;
// Mobs are a special case!
if (CanGib(component, entity))
{
IoCManager.Resolve<IEntityManager>().GetComponent<SharedBodyComponent>(entity).Gib(true);
EntityManager.GetComponent<SharedBodyComponent>(entity).Gib(true);
Bloodstain(component);
return;
}
@@ -42,13 +42,13 @@ namespace Content.Server.Recycling
private bool CanGib(RecyclerComponent component, EntityUid entity)
{
// We suppose this entity has a Recyclable component.
return IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity) && !component.Safe &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver) && receiver.Powered;
return EntityManager.HasComponent<SharedBodyComponent>(entity) && !component.Safe &&
EntityManager.TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver) && receiver.Powered;
}
public void Bloodstain(RecyclerComponent component)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out AppearanceComponent? appearance))
if (EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearance))
{
appearance.SetData(RecyclerVisuals.Bloody, true);
}

2
Content.Server/Repairable/RepairableSystem.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Repairable
public async void Repair(EntityUid uid, RepairableComponent component, InteractUsingEvent args)
{
// Only try repair the target if it is damaged
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
if (!EntityManager.TryGetComponent(component.Owner, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
return;
// Can the tool actually repair this, does it have enough fuel?

18
Content.Server/Rotatable/RotatableSystem.cs
View File

@@ -39,12 +39,12 @@ namespace Content.Server.Rotatable
// Check if the object is anchored, and whether we are still allowed to rotate it.
if (!component.RotateWhileAnchored &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out IPhysBody? physics) &&
EntityManager.TryGetComponent(component.Owner, out IPhysBody? physics) &&
physics.BodyType == BodyType.Static)
return;
Verb resetRotation = new();
resetRotation.Act = () => IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).LocalRotation = Angle.Zero;
resetRotation.Act = () => EntityManager.GetComponent<TransformComponent>(component.Owner).LocalRotation = Angle.Zero;
resetRotation.Category = VerbCategory.Rotate;
resetRotation.IconTexture = "/Textures/Interface/VerbIcons/refresh.svg.192dpi.png";
resetRotation.Text = "Reset";
@@ -54,7 +54,7 @@ namespace Content.Server.Rotatable
// rotate clockwise
Verb rotateCW = new();
rotateCW.Act = () => IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).LocalRotation += Angle.FromDegrees(-90);
rotateCW.Act = () => EntityManager.GetComponent<TransformComponent>(component.Owner).LocalRotation += Angle.FromDegrees(-90);
rotateCW.Category = VerbCategory.Rotate;
rotateCW.IconTexture = "/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png";
rotateCW.Priority = -1;
@@ -63,7 +63,7 @@ namespace Content.Server.Rotatable
// rotate counter-clockwise
Verb rotateCCW = new();
rotateCCW.Act = () => IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).LocalRotation += Angle.FromDegrees(90);
rotateCCW.Act = () => EntityManager.GetComponent<TransformComponent>(component.Owner).LocalRotation += Angle.FromDegrees(90);
rotateCCW.Category = VerbCategory.Rotate;
rotateCCW.IconTexture = "/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png";
rotateCCW.Priority = 0;
@@ -76,19 +76,19 @@ namespace Content.Server.Rotatable
/// </summary>
public static void TryFlip(FlippableComponent component, EntityUid user)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out IPhysBody? physics) &&
if (EntityManager.TryGetComponent(component.Owner, out IPhysBody? physics) &&
physics.BodyType == BodyType.Static)
{
component.Owner.PopupMessage(user, Loc.GetString("flippable-component-try-flip-is-stuck"));
return;
}
var oldTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner);
var entity = IoCManager.Resolve<IEntityManager>().SpawnEntity(component.MirrorEntity, oldTransform.Coordinates);
var newTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity);
var oldTransform = EntityManager.GetComponent<TransformComponent>(component.Owner);
var entity = EntityManager.SpawnEntity(component.MirrorEntity, oldTransform.Coordinates);
var newTransform = EntityManager.GetComponent<TransformComponent>(entity);
newTransform.LocalRotation = oldTransform.LocalRotation;
newTransform.Anchored = false;
IoCManager.Resolve<IEntityManager>().DeleteEntity(component.Owner);
EntityManager.DeleteEntity(component.Owner);
}
}
}

8
Content.Server/Security/Systems/DeployableBarrierSystem.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.Security.Systems
private void OnStartup(EntityUid uid, DeployableBarrierComponent component, ComponentStartup args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out LockComponent? lockComponent))
if (!EntityManager.TryGetComponent(component.Owner, out LockComponent? lockComponent))
return;
ToggleBarrierDeploy(component, lockComponent.Locked);
@@ -32,15 +32,15 @@ namespace Content.Server.Security.Systems
private void ToggleBarrierDeploy(DeployableBarrierComponent component, bool isDeployed)
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored = isDeployed;
EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored = isDeployed;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out AppearanceComponent? appearanceComponent))
if (!EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearanceComponent))
return;
var state = isDeployed ? DeployableBarrierState.Deployed : DeployableBarrierState.Idle;
appearanceComponent.SetData(DeployableBarrierVisuals.State, state);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PointLightComponent? light))
if (EntityManager.TryGetComponent(component.Owner, out PointLightComponent? light))
light.Enabled = isDeployed;
}
}

8
Content.Server/Shuttles/EntitySystems/ShuttleConsoleSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Content.Server.Shuttles.EntitySystems
public void AddPilot(EntityUid entity, ShuttleConsoleComponent component)
{
if (!_blocker.CanInteract(entity) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out PilotComponent? pilotComponent) ||
!EntityManager.TryGetComponent(entity, out PilotComponent? pilotComponent) ||
component.SubscribedPilots.Contains(pilotComponent))
{
return;
@@ -141,7 +141,7 @@ namespace Content.Server.Shuttles.EntitySystems
component.SubscribedPilots.Add(pilotComponent);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ServerAlertsComponent? alertsComponent))
if (EntityManager.TryGetComponent(entity, out ServerAlertsComponent? alertsComponent))
{
alertsComponent.ShowAlert(AlertType.PilotingShuttle);
}
@@ -163,7 +163,7 @@ namespace Content.Server.Shuttles.EntitySystems
if (!helmsman.SubscribedPilots.Remove(pilotComponent)) return;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pilotComponent.Owner, out ServerAlertsComponent? alertsComponent))
if (EntityManager.TryGetComponent(pilotComponent.Owner, out ServerAlertsComponent? alertsComponent))
{
alertsComponent.ClearAlert(AlertType.PilotingShuttle);
}
@@ -176,7 +176,7 @@ namespace Content.Server.Shuttles.EntitySystems
public void RemovePilot(EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out PilotComponent? pilotComponent)) return;
if (!EntityManager.TryGetComponent(entity, out PilotComponent? pilotComponent)) return;
RemovePilot(pilotComponent);
}

8
Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
View File

@@ -57,12 +57,12 @@ namespace Content.Server.Shuttles.EntitySystems
private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args)
{
if (!IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(component.Owner))
if (!EntityManager.HasComponent<IMapGridComponent>(component.Owner))
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent))
if (!EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent))
{
return;
}
@@ -75,7 +75,7 @@ namespace Content.Server.Shuttles.EntitySystems
public void Toggle(ShuttleComponent component)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent)) return;
if (!EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent)) return;
component.Enabled = !component.Enabled;
@@ -111,7 +111,7 @@ namespace Content.Server.Shuttles.EntitySystems
// None of the below is necessary for any cleanup if we're just deleting.
if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent))
if (!EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent))
{
return;
}

2
Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Server.Singularity.EntitySystems
private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, StartCollideEvent args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SingularityGeneratorComponent?>(args.OtherFixture.Body.Owner, out var singularityGeneratorComponent))
if (EntityManager.TryGetComponent<SingularityGeneratorComponent?>(args.OtherFixture.Body.Owner, out var singularityGeneratorComponent))
{
singularityGeneratorComponent.Power += component.State switch
{

14
Content.Server/Singularity/EntitySystems/EmitterSystem.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Singularity.EntitySystems
return;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PhysicsComponent? phys) && phys.BodyType == BodyType.Static)
if (EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? phys) && phys.BodyType == BodyType.Static)
{
if (!component.IsOn)
{
@@ -166,9 +166,9 @@ namespace Content.Server.Singularity.EntitySystems
private void Fire(EmitterComponent component)
{
var projectile = IoCManager.Resolve<IEntityManager>().SpawnEntity(component.BoltType, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates);
var projectile = EntityManager.SpawnEntity(component.BoltType, EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates);
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent?>(projectile, out var physicsComponent))
if (!EntityManager.TryGetComponent<PhysicsComponent?>(projectile, out var physicsComponent))
{
Logger.Error("Emitter tried firing a bolt, but it was spawned without a PhysicsComponent");
return;
@@ -176,7 +176,7 @@ namespace Content.Server.Singularity.EntitySystems
physicsComponent.BodyStatus = BodyStatus.InAir;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ProjectileComponent?>(projectile, out var projectileComponent))
if (!EntityManager.TryGetComponent<ProjectileComponent?>(projectile, out var projectileComponent))
{
Logger.Error("Emitter tried firing a bolt, but it was spawned without a ProjectileComponent");
return;
@@ -185,11 +185,11 @@ namespace Content.Server.Singularity.EntitySystems
projectileComponent.IgnoreEntity(component.Owner);
physicsComponent
.LinearVelocity = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).WorldRotation.ToWorldVec() * 20f;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(projectile).WorldRotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).WorldRotation;
.LinearVelocity = EntityManager.GetComponent<TransformComponent>(component.Owner).WorldRotation.ToWorldVec() * 20f;
EntityManager.GetComponent<TransformComponent>(projectile).WorldRotation = EntityManager.GetComponent<TransformComponent>(component.Owner).WorldRotation;
// TODO: Move to projectile's code.
Timer.Spawn(3000, () => IoCManager.Resolve<IEntityManager>().DeleteEntity(projectile));
Timer.Spawn(3000, () => EntityManager.DeleteEntity(projectile));
SoundSystem.Play(Filter.Pvs(component.Owner), component.FireSound.GetSound(), component.Owner,
AudioHelpers.WithVariation(EmitterComponent.Variation).WithVolume(EmitterComponent.Volume).WithMaxDistance(EmitterComponent.Distance));

32
Content.Server/Singularity/EntitySystems/SingularitySystem.cs
View File

@@ -82,7 +82,7 @@ namespace Content.Server.Singularity.EntitySystems
{
if (component.BeingDeletedByAnotherSingularity) return;
var worldPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).WorldPosition;
var worldPos = EntityManager.GetComponent<TransformComponent>(component.Owner).WorldPosition;
DestroyEntities(component, worldPos);
DestroyTiles(component, worldPos);
PullEntities(component, worldPos);
@@ -102,10 +102,10 @@ namespace Content.Server.Singularity.EntitySystems
private bool CanDestroy(SharedSingularityComponent component, EntityUid entity)
{
return entity == component.Owner ||
IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<ContainmentFieldComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<ContainmentFieldGeneratorComponent>(entity);
EntityManager.HasComponent<IMapGridComponent>(entity) ||
EntityManager.HasComponent<GhostComponent>(entity) ||
EntityManager.HasComponent<ContainmentFieldComponent>(entity) ||
EntityManager.HasComponent<ContainmentFieldGeneratorComponent>(entity);
}
private void HandleDestroy(ServerSingularityComponent component, EntityUid entity)
@@ -114,7 +114,7 @@ namespace Content.Server.Singularity.EntitySystems
if (CanDestroy(component, entity)) return;
// Singularity priority management / etc.
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ServerSingularityComponent?>(entity, out var otherSingulo))
if (EntityManager.TryGetComponent<ServerSingularityComponent?>(entity, out var otherSingulo))
{
// MERGE
if (!otherSingulo.BeingDeletedByAnotherSingularity)
@@ -125,9 +125,9 @@ namespace Content.Server.Singularity.EntitySystems
otherSingulo.BeingDeletedByAnotherSingularity = true;
}
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(entity);
EntityManager.QueueDeleteEntity(entity);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SinguloFoodComponent?>(entity, out var singuloFood))
if (EntityManager.TryGetComponent<SinguloFoodComponent?>(entity, out var singuloFood))
component.Energy += singuloFood.Energy;
else
component.Energy++;
@@ -141,7 +141,7 @@ namespace Content.Server.Singularity.EntitySystems
// The reason we don't /just/ use collision is because we'll be deleting stuff that may not necessarily have physics (e.g. carpets).
var destroyRange = DestroyTileRange(component);
foreach (var entity in _lookup.GetEntitiesInRange(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).MapID, worldPos, destroyRange))
foreach (var entity in _lookup.GetEntitiesInRange(EntityManager.GetComponent<TransformComponent>(component.Owner).MapID, worldPos, destroyRange))
{
HandleDestroy(component, entity);
}
@@ -149,9 +149,9 @@ namespace Content.Server.Singularity.EntitySystems
private bool CanPull(EntityUid entity)
{
return !(IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<MapComponent>(entity) ||
return !(EntityManager.HasComponent<GhostComponent>(entity) ||
EntityManager.HasComponent<IMapGridComponent>(entity) ||
EntityManager.HasComponent<MapComponent>(entity) ||
entity.IsInContainer());
}
@@ -162,16 +162,16 @@ namespace Content.Server.Singularity.EntitySystems
var pullRange = PullRange(component);
var destroyRange = DestroyTileRange(component);
foreach (var entity in _lookup.GetEntitiesInRange(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).MapID, worldPos, pullRange))
foreach (var entity in _lookup.GetEntitiesInRange(EntityManager.GetComponent<TransformComponent>(component.Owner).MapID, worldPos, pullRange))
{
// I tried having it so level 6 can de-anchor. BAD IDEA, MASSIVE LAG.
if (entity == component.Owner ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent?>(entity, out var collidableComponent) ||
!EntityManager.TryGetComponent<PhysicsComponent?>(entity, out var collidableComponent) ||
collidableComponent.BodyType == BodyType.Static) continue;
if (!CanPull(entity)) continue;
var vec = worldPos - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).WorldPosition;
var vec = worldPos - EntityManager.GetComponent<TransformComponent>(entity).WorldPosition;
if (vec.Length < destroyRange - 0.01f) continue;
@@ -192,7 +192,7 @@ namespace Content.Server.Singularity.EntitySystems
var circle = new Circle(worldPos, radius);
var box = new Box2(worldPos - radius, worldPos + radius);
foreach (var grid in _mapManager.FindGridsIntersecting(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).MapID, box))
foreach (var grid in _mapManager.FindGridsIntersecting(EntityManager.GetComponent<TransformComponent>(component.Owner).MapID, box))
{
foreach (var tile in grid.GetTilesIntersecting(circle))
{

6
Content.Server/Stack/StackSystem.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.Stack
// Get a prototype ID to spawn the new entity. Null is also valid, although it should rarely be picked...
var prototype = _prototypeManager.TryIndex<StackPrototype>(stack.StackTypeId, out var stackType)
? stackType.Spawn
: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(stack.Owner).EntityPrototype?.ID;
: EntityManager.GetComponent<MetaDataComponent>(stack.Owner).EntityPrototype?.ID;
// Try to remove the amount of things we want to split from the original stack...
if (!Use(uid, amount, stack))
@@ -86,7 +86,7 @@ namespace Content.Server.Stack
if (args.Handled)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<StackComponent?>(args.Used, out var otherStack))
if (!EntityManager.TryGetComponent<StackComponent?>(args.Used, out var otherStack))
return;
if (!otherStack.StackTypeId.Equals(stack.StackTypeId))
@@ -100,7 +100,7 @@ namespace Content.Server.Stack
if (!popupPos.IsValid(EntityManager))
{
popupPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).Coordinates;
popupPos = EntityManager.GetComponent<TransformComponent>(args.User).Coordinates;
}
var filter = Filter.Entities(args.User);

2
Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Server.Storage.EntitySystems
{
protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component)
if (!EntityManager.TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component)
|| component.StoredEntities == null)
{
return null;

2
Content.Server/Storage/EntitySystems/ItemMapperSystem.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Storage.EntitySystems
ItemMapperComponent itemMapper,
out IReadOnlyList<string> showLayers)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component))
if (EntityManager.TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component))
{
var containedLayers = component.StoredEntities ?? new List<EntityUid>();
var list = new List<string>();

16
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Server.Storage.EntitySystems
return;
// Get the session for the user
var session = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActorComponent>(args.User)?.PlayerSession;
var session = EntityManager.GetComponentOrNull<ActorComponent>(args.User)?.PlayerSession;
if (session == null)
return;
@@ -118,7 +118,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
if (EntityManager.TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeRemoved(message);
}
@@ -128,7 +128,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
if (EntityManager.TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeInserted(message);
}
@@ -144,19 +144,19 @@ namespace Content.Server.Storage.EntitySystems
if (_sessionCache.Count == 0)
return;
var storagePos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner).WorldPosition;
var storageMap = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner).MapID;
var storagePos = EntityManager.GetComponent<TransformComponent>(storageComp.Owner).WorldPosition;
var storageMap = EntityManager.GetComponent<TransformComponent>(storageComp.Owner).MapID;
foreach (var session in _sessionCache)
{
// The component manages the set of sessions, so this invalid session should be removed soon.
if (session.AttachedEntity is not {} attachedEntity || !IoCManager.Resolve<IEntityManager>().EntityExists(attachedEntity))
if (session.AttachedEntity is not {} attachedEntity || !EntityManager.EntityExists(attachedEntity))
continue;
if (storageMap != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity).MapID)
if (storageMap != EntityManager.GetComponent<TransformComponent>(attachedEntity).MapID)
continue;
var distanceSquared = (storagePos - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity).WorldPosition).LengthSquared;
var distanceSquared = (storagePos - EntityManager.GetComponent<TransformComponent>(attachedEntity).WorldPosition).LengthSquared;
if (distanceSquared > SharedInteractionSystem.InteractionRangeSquared)
{
storageComp.UnsubscribeSession(session);

2
Content.Server/Strip/StrippableSystem.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.Strip
if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
Verb verb = new();

4
Content.Server/Stunnable/StunSystem.cs
View File

@@ -48,8 +48,8 @@ namespace Content.Server.Stunnable
if (target != null)
{
// TODO: Use PopupSystem
source.PopupMessageOtherClients(Loc.GetString("stunned-component-disarm-success-others", ("source", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(source).EntityName), ("target", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName)));
source.PopupMessageCursor(Loc.GetString("stunned-component-disarm-success", ("target", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName)));
source.PopupMessageOtherClients(Loc.GetString("stunned-component-disarm-success-others", ("source", Name: EntityManager.GetComponent<MetaDataComponent>(source).EntityName), ("target", Name: EntityManager.GetComponent<MetaDataComponent>(target).EntityName)));
source.PopupMessageCursor(Loc.GetString("stunned-component-disarm-success", ("target", Name: EntityManager.GetComponent<MetaDataComponent>(target).EntityName)));
}
}

6
Content.Server/Stunnable/StunbatonSystem.cs
View File

@@ -175,12 +175,12 @@ namespace Content.Server.Stunnable
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(comp.Owner, out var sprite) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemComponent?>(comp.Owner, out var item))
if (!EntityManager.TryGetComponent<SpriteComponent?>(comp.Owner, out var sprite) ||
!EntityManager.TryGetComponent<ItemComponent?>(comp.Owner, out var item))
return;
var playerFilter = Filter.Pvs(comp.Owner);
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<PowerCellSlotComponent?>(comp.Owner, out var slot))
if (!EntityManager.TryGetComponent<PowerCellSlotComponent?>(comp.Owner, out var slot))
return;
if (slot.Cell == null)

6
Content.Server/Tabletop/TabletopSystem.Session.cs
View File

@@ -82,7 +82,7 @@ namespace Content.Server.Tabletop
if (session.Players.ContainsKey(player))
return;
if(IoCManager.Resolve<IEntityManager>().TryGetComponent<TabletopGamerComponent?>(attachedEntity, out var gamer))
if(EntityManager.TryGetComponent<TabletopGamerComponent?>(attachedEntity, out var gamer))
CloseSessionFor(player, gamer.Tabletop, false);
// Set the entity as an absolute GAMER.
@@ -111,13 +111,13 @@ namespace Content.Server.Tabletop
if (!session.Players.TryGetValue(player, out var data))
return;
if(removeGamerComponent && player.AttachedEntity is {} attachedEntity && IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity, out TabletopGamerComponent? gamer))
if(removeGamerComponent && player.AttachedEntity is {} attachedEntity && EntityManager.TryGetComponent(attachedEntity, out TabletopGamerComponent? gamer))
{
// We invalidate this to prevent an infinite feedback from removing the component.
gamer.Tabletop = EntityUid.Invalid;
// You stop being a gamer.......
IoCManager.Resolve<IEntityManager>().RemoveComponent<TabletopGamerComponent>(attachedEntity);
EntityManager.RemoveComponent<TabletopGamerComponent>(attachedEntity);
}
session.Players.Remove(player);

6
Content.Server/Tabletop/TabletopSystem.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Server.Tabletop
if (!args.CanAccess || !args.CanInteract)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
Verb verb = new();
@@ -97,9 +97,9 @@ namespace Content.Server.Tabletop
if (!EntityManager.EntityExists(gamer.Tabletop))
continue;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(gamer.Owner, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(gamer.Owner, out ActorComponent? actor))
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<TabletopGamerComponent>(gamer.Owner);
EntityManager.RemoveComponent<TabletopGamerComponent>(gamer.Owner);
return;
};

2
Content.Server/UserInterface/ActivatableUISystem.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.UserInterface
private bool InteractUI(EntityUid user, ActivatableUIComponent aui)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(user, out ActorComponent? actor)) return false;
if (!EntityManager.TryGetComponent(user, out ActorComponent? actor)) return false;
if (aui.AdminOnly && !_adminManager.IsAdmin(actor.PlayerSession)) return false;

22
Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
View File

@@ -77,8 +77,8 @@ namespace Content.Server.Weapon.Melee
if (curTime < comp.CooldownEnd || !args.Target.IsValid())
return;
var location = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).Coordinates;
var diff = args.ClickLocation.ToMapPos(IoCManager.Resolve<IEntityManager>()) - location.ToMapPos(IoCManager.Resolve<IEntityManager>());
var location = EntityManager.GetComponent<TransformComponent>(args.User).Coordinates;
var diff = args.ClickLocation.ToMapPos(EntityManager) - location.ToMapPos(EntityManager);
var angle = Angle.FromWorldVec(diff);
if (args.Target is {Valid: true} target)
@@ -132,12 +132,12 @@ namespace Content.Server.Weapon.Melee
return;
}
var location = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).Coordinates;
var diff = args.ClickLocation.ToMapPos(IoCManager.Resolve<IEntityManager>()) - location.ToMapPos(IoCManager.Resolve<IEntityManager>());
var location = EntityManager.GetComponent<TransformComponent>(args.User).Coordinates;
var diff = args.ClickLocation.ToMapPos(EntityManager) - location.ToMapPos(EntityManager);
var angle = Angle.FromWorldVec(diff);
// This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes.
var entities = ArcRayCast(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).WorldPosition, angle, comp.ArcWidth, comp.Range, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).MapID, args.User);
var entities = ArcRayCast(EntityManager.GetComponent<TransformComponent>(args.User).WorldPosition, angle, comp.ArcWidth, comp.Range, EntityManager.GetComponent<TransformComponent>(owner).MapID, args.User);
var hitEntities = new List<EntityUid>();
foreach (var entity in entities)
@@ -160,11 +160,11 @@ namespace Content.Server.Weapon.Melee
{
if (entities.Count != 0)
{
SoundSystem.Play(Filter.Pvs(owner), comp.HitSound.GetSound(), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entities.First()).Coordinates);
SoundSystem.Play(Filter.Pvs(owner), comp.HitSound.GetSound(), EntityManager.GetComponent<TransformComponent>(entities.First()).Coordinates);
}
else
{
SoundSystem.Play(Filter.Pvs(owner), comp.MissSound.GetSound(), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).Coordinates);
SoundSystem.Play(Filter.Pvs(owner), comp.MissSound.GetSound(), EntityManager.GetComponent<TransformComponent>(args.User).Coordinates);
}
foreach (var entity in hitEntities)
@@ -211,8 +211,8 @@ namespace Content.Server.Weapon.Melee
if (!args.Target.HasValue)
return;
var location = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).Coordinates;
var diff = args.ClickLocation.ToMapPos(IoCManager.Resolve<IEntityManager>()) - location.ToMapPos(IoCManager.Resolve<IEntityManager>());
var location = EntityManager.GetComponent<TransformComponent>(args.User).Coordinates;
var diff = args.ClickLocation.ToMapPos(EntityManager) - location.ToMapPos(EntityManager);
var angle = Angle.FromWorldVec(diff);
var hitEvent = new MeleeInteractEvent(args.Target.Value, args.User);
@@ -260,10 +260,10 @@ namespace Content.Server.Weapon.Melee
var hitBloodstreams = new List<BloodstreamComponent>();
foreach (var entity in args.HitEntities)
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted)
if ((!EntityManager.EntityExists(entity) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted)
continue;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<BloodstreamComponent?>(entity, out var bloodstream))
if (EntityManager.TryGetComponent<BloodstreamComponent?>(entity, out var bloodstream))
hitBloodstreams.Add(bloodstream);
}

10
Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Shared.Containers.ItemSlots
if (slot.HasItem || string.IsNullOrEmpty(slot.StartingItem))
continue;
var item = EntityManager.SpawnEntity(slot.StartingItem, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(itemSlots.Owner).Coordinates);
var item = EntityManager.SpawnEntity(slot.StartingItem, EntityManager.GetComponent<TransformComponent>(itemSlots.Owner).Coordinates);
slot.ContainerSlot.Insert(item);
}
}
@@ -82,7 +82,7 @@ namespace Content.Shared.Containers.ItemSlots
var itemSlots = EntityManager.EnsureComponent<ItemSlotsComponent>(uid);
slot.ContainerSlot = ContainerHelpers.EnsureContainer<ContainerSlot>(itemSlots.Owner, id);
if (itemSlots.Slots.ContainsKey(id))
Logger.Error($"Duplicate item slot key. Entity: {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(itemSlots.Owner).EntityName} ({uid}), key: {id}");
Logger.Error($"Duplicate item slot key. Entity: {EntityManager.GetComponent<MetaDataComponent>(itemSlots.Owner).EntityName} ({uid}), key: {id}");
itemSlots.Slots[id] = slot;
}
@@ -364,7 +364,7 @@ namespace Content.Shared.Containers.ItemSlots
var verbSubject = slot.Name != string.Empty
? Loc.GetString(slot.Name)
: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(slot.Item!.Value).EntityName ?? string.Empty;
: EntityManager.GetComponent<MetaDataComponent>(slot.Item!.Value).EntityName ?? string.Empty;
Verb verb = new();
verb.Act = () => TryEjectToHands(uid, slot, args.User);
@@ -399,7 +399,7 @@ namespace Content.Shared.Containers.ItemSlots
var verbSubject = slot.Name != string.Empty
? Loc.GetString(slot.Name)
: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(slot.Item!.Value).EntityName ?? string.Empty;
: EntityManager.GetComponent<MetaDataComponent>(slot.Item!.Value).EntityName ?? string.Empty;
Verb takeVerb = new();
takeVerb.Act = () => TryEjectToHands(uid, slot, args.User);
@@ -425,7 +425,7 @@ namespace Content.Shared.Containers.ItemSlots
var verbSubject = slot.Name != string.Empty
? Loc.GetString(slot.Name)
: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(args.Using.Value).EntityName ?? string.Empty;
: EntityManager.GetComponent<MetaDataComponent>(args.Using.Value).EntityName ?? string.Empty;
Verb insertVerb = new();
insertVerb.Act = () => Insert(uid, slot, args.Using.Value);

10
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@@ -49,21 +49,21 @@ namespace Content.Shared.Disposal
public virtual bool CanInsert(SharedDisposalUnitComponent component, EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
if (!EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)
return false;
// TODO: Probably just need a disposable tag.
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedItemComponent? storable) &&
!IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity))
if (!EntityManager.TryGetComponent(entity, out SharedItemComponent? storable) &&
!EntityManager.HasComponent<SharedBodyComponent>(entity))
{
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics) ||
if (!EntityManager.TryGetComponent(entity, out IPhysBody? physics) ||
!physics.CanCollide && storable == null)
{
if (!(IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out MobStateComponent? damageState) && damageState.IsDead()))
if (!(EntityManager.TryGetComponent(entity, out MobStateComponent? damageState) && damageState.IsDead()))
{
return false;
}

42
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -64,24 +64,24 @@ namespace Content.Shared.Examine
[Pure]
public bool CanExamine(EntityUid examiner, EntityUid examined)
{
return CanExamine(examiner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(examined).MapPosition,
return CanExamine(examiner, EntityManager.GetComponent<TransformComponent>(examined).MapPosition,
entity => entity == examiner || entity == examined);
}
[Pure]
public virtual bool CanExamine(EntityUid examiner, MapCoordinates target, Ignored? predicate = null)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(examiner, out ExaminerComponent? examinerComponent))
if (!EntityManager.TryGetComponent(examiner, out ExaminerComponent? examinerComponent))
return false;
if (!examinerComponent.DoRangeCheck)
return true;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(examiner).MapID != target.MapId)
if (EntityManager.GetComponent<TransformComponent>(examiner).MapID != target.MapId)
return false;
return InRangeUnOccluded(
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(examiner).MapPosition,
EntityManager.GetComponent<TransformComponent>(examiner).MapPosition,
target,
GetExaminerRange(examiner),
predicate: predicate,
@@ -128,12 +128,12 @@ namespace Content.Shared.Examine
foreach (var result in rayResults)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(result.HitEntity, out OccluderComponent? o))
if (!EntityManager.TryGetComponent(result.HitEntity, out OccluderComponent? o))
{
continue;
}
var bBox = o.BoundingBox.Translated(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(o.Owner).WorldPosition);
var bBox = o.BoundingBox.Translated(EntityManager.GetComponent<TransformComponent>(o.Owner).WorldPosition);
if (bBox.Contains(origin.Position) || bBox.Contains(other.Position))
{
@@ -148,54 +148,54 @@ namespace Content.Shared.Examine
public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var originPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(origin).MapPosition;
var otherPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(other).MapPosition;
var originPos = EntityManager.GetComponent<TransformComponent>(origin).MapPosition;
var otherPos = EntityManager.GetComponent<TransformComponent>(other).MapPosition;
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(EntityUid origin, IComponent other, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var originPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(origin).MapPosition;
var otherPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(other.Owner).MapPosition;
var originPos = EntityManager.GetComponent<TransformComponent>(origin).MapPosition;
var otherPos = EntityManager.GetComponent<TransformComponent>(other.Owner).MapPosition;
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var originPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(origin).MapPosition;
var otherPos = other.ToMap(IoCManager.Resolve<IEntityManager>());
var originPos = EntityManager.GetComponent<TransformComponent>(origin).MapPosition;
var otherPos = other.ToMap(EntityManager);
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var originPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(origin).MapPosition;
var originPos = EntityManager.GetComponent<TransformComponent>(origin).MapPosition;
return InRangeUnOccluded(originPos, other, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(ITargetedInteractEventArgs args, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var originPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).MapPosition;
var otherPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.Target).MapPosition;
var originPos = EntityManager.GetComponent<TransformComponent>(args.User).MapPosition;
var otherPos = EntityManager.GetComponent<TransformComponent>(args.Target).MapPosition;
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(DragDropEvent args, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var originPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).MapPosition;
var otherPos = args.DropLocation.ToMap(IoCManager.Resolve<IEntityManager>());
var originPos = EntityManager.GetComponent<TransformComponent>(args.User).MapPosition;
var otherPos = args.DropLocation.ToMap(EntityManager);
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(AfterInteractEventArgs args, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var entityManager = EntityManager;
var originPos = entityManager.GetComponent<TransformComponent>(args.User).MapPosition;
var target = args.Target;
var otherPos = (target != null ? entityManager.GetComponent<TransformComponent>(target.Value).MapPosition : args.ClickLocation.ToMap(entityManager));
@@ -215,9 +215,9 @@ namespace Content.Shared.Examine
var doNewline = false;
//Add an entity description if one is declared
if (!string.IsNullOrEmpty(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityDescription))
if (!string.IsNullOrEmpty(EntityManager.GetComponent<MetaDataComponent>(entity).EntityDescription))
{
message.AddText(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityDescription);
message.AddText(EntityManager.GetComponent<MetaDataComponent>(entity).EntityDescription);
doNewline = true;
}
@@ -229,7 +229,7 @@ namespace Content.Shared.Examine
RaiseLocalEvent(entity, examinedEvent);
//Add component statuses from components that report one
foreach (var examineComponent in IoCManager.Resolve<IEntityManager>().GetComponents<IExamine>(entity))
foreach (var examineComponent in EntityManager.GetComponents<IExamine>(entity))
{
var subMessage = new FormattedMessage();
examineComponent.Examine(subMessage, isInDetailsRange);

8
Content.Shared/Interaction/RotateToFaceSystem.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Shared.Interaction
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
public bool TryFaceCoordinates(EntityUid user, Vector2 coordinates)
{
var diff = coordinates - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(user).MapPosition.Position;
var diff = coordinates - EntityManager.GetComponent<TransformComponent>(user).MapPosition.Position;
if (diff.LengthSquared <= 0.01f)
return true;
var diffAngle = Angle.FromWorldVec(diff);
@@ -47,12 +47,12 @@ namespace Content.Shared.Interaction
{
if (_actionBlockerSystem.CanChangeDirection(user))
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(user).WorldRotation = diffAngle;
EntityManager.GetComponent<TransformComponent>(user).WorldRotation = diffAngle;
return true;
}
else
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(user, out SharedBuckleComponent? buckle) && buckle.Buckled)
if (EntityManager.TryGetComponent(user, out SharedBuckleComponent? buckle) && buckle.Buckled)
{
var suid = buckle.LastEntityBuckledTo;
if (suid != null)
@@ -64,7 +64,7 @@ namespace Content.Shared.Interaction
// (Since the user being buckled to it holds it down with their weight.)
// This is logically equivalent to RotateWhileAnchored.
// Barstools and office chairs have independent wheels, while regular chairs don't.
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(rotatable.Owner).WorldRotation = diffAngle;
EntityManager.GetComponent<TransformComponent>(rotatable.Owner).WorldRotation = diffAngle;
return true;
}
}

2
Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Shared.Movement.EntitySystems
if (otherBody.BodyType != BodyType.Dynamic || !otherFixture.Hard) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ourFixture.Body.Owner, out IMobMoverComponent? mobMover) || worldNormal == Vector2.Zero) return;
if (!EntityManager.TryGetComponent(ourFixture.Body.Owner, out IMobMoverComponent? mobMover) || worldNormal == Vector2.Zero) return;
otherBody.ApplyLinearImpulse(-worldNormal * mobMover.PushStrength * frameTime);
}

4
Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
View File

@@ -82,10 +82,10 @@ namespace Content.Shared.Movement.EntitySystems
var ent = session?.AttachedEntity;
if (ent == null || !IoCManager.Resolve<IEntityManager>().EntityExists(ent.Value))
if (ent == null || !EntityManager.EntityExists(ent.Value))
return false;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ent.Value, out T? comp))
if (!EntityManager.TryGetComponent(ent.Value, out T? comp))
return false;
component = comp;

2
Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
View File

@@ -62,7 +62,7 @@ namespace Content.Shared.Nutrition.EntitySystems
private void OnCreamPiedHitBy(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().EntityExists(args.Thrown) || !IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Thrown, out CreamPieComponent? creamPie)) return;
if (!EntityManager.EntityExists(args.Thrown) || !EntityManager.TryGetComponent(args.Thrown, out CreamPieComponent? creamPie)) return;
SetCreamPied(uid, creamPied, true);

10
Content.Shared/Placeable/PlaceableSurfaceSystem.cs
View File

@@ -52,19 +52,19 @@ namespace Content.Shared.Placeable
if (!surface.IsPlaceable)
return;
if(!IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedHandsComponent?>(args.User, out var handComponent))
if(!EntityManager.TryGetComponent<SharedHandsComponent?>(args.User, out var handComponent))
return;
if (!args.ClickLocation.IsValid(IoCManager.Resolve<IEntityManager>()))
if (!args.ClickLocation.IsValid(EntityManager))
return;
if(!handComponent.TryDropEntity(args.Used, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(surface.Owner).Coordinates))
if(!handComponent.TryDropEntity(args.Used, EntityManager.GetComponent<TransformComponent>(surface.Owner).Coordinates))
return;
if (surface.PlaceCentered)
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.Used).LocalPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.Target).LocalPosition + surface.PositionOffset;
EntityManager.GetComponent<TransformComponent>(args.Used).LocalPosition = EntityManager.GetComponent<TransformComponent>(args.Target).LocalPosition + surface.PositionOffset;
else
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.Used).Coordinates = args.ClickLocation;
EntityManager.GetComponent<TransformComponent>(args.Used).Coordinates = args.ClickLocation;
args.Handled = true;
}