Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Gets rid of all ComponentManager usages. (#4707)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-09-28 13:35:29 +02:00
committed by GitHub
parent 7953e5b962
commit 0be5ff829b
158 changed files with 321 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Power/Components/CablePlacerComponent.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Power.Components
return true;
foreach (var anchored in grid.GetAnchoredEntities(snapPos))
{
if (Owner.EntityManager.ComponentManager.TryGetComponent<CableComponent>(anchored, out var wire) && wire.CableType == _blockingCableType)
if (Owner.EntityManager.TryGetComponent<CableComponent>(anchored, out var wire) && wire.CableType == _blockingCableType)
{
return true;
}

4
Content.Server/Power/DrainAllBatteriesCommand.cs
View File

@@ -22,8 +22,8 @@ namespace Content.Server.Power
return;
}
var comp = IoCManager.Resolve<IComponentManager>();
foreach (var batteryComp in comp.EntityQuery<BatteryComponent>())
var entMan = IoCManager.Resolve<IEntityManager>();
foreach (var batteryComp in entMan.EntityQuery<BatteryComponent>())
{
batteryComp.CurrentCharge = 0;
}

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

@@ -9,7 +9,7 @@ namespace Content.Server.Power.EntitySystems
{
public override void Update(float frameTime)
{
foreach (var comp in ComponentManager.EntityQuery<BaseCharger>(true))
foreach (var comp in EntityManager.EntityQuery<BaseCharger>(true))
{
comp.OnUpdate(frameTime);
}

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

@@ -17,7 +17,7 @@ namespace Content.Server.Power.EntitySystems
private void PreSync(NetworkBatteryPreSync ev)
{
foreach (var (bat, netBat) in ComponentManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
foreach (var (bat, netBat) in EntityManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
{
netBat.NetworkBattery.Capacity = bat.MaxCharge;
netBat.NetworkBattery.CurrentStorage = bat.CurrentCharge;
@@ -26,7 +26,7 @@ namespace Content.Server.Power.EntitySystems
private void PostSync(NetworkBatteryPostSync ev)
{
foreach (var (bat, netBat) in ComponentManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
foreach (var (bat, netBat) in EntityManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
{
bat.CurrentCharge = netBat.NetworkBattery.CurrentStorage;
}
@@ -34,7 +34,7 @@ namespace Content.Server.Power.EntitySystems
public override void Update(float frameTime)
{
foreach (var comp in ComponentManager.EntityQuery<BatteryComponent>())
foreach (var comp in EntityManager.EntityQuery<BatteryComponent>())
{
comp.OnUpdate(frameTime);
}

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

@@ -37,9 +37,9 @@ namespace Content.Server.Power.EntitySystems
foreach (var uid in _toUpdate)
{
if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
|| !ComponentManager.TryGetComponent(uid, out CableVisComponent? cableVis)
|| !ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance))
if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
|| !EntityManager.TryGetComponent(uid, out CableVisComponent? cableVis)
|| !EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
{
continue;
}
@@ -49,7 +49,7 @@ namespace Content.Server.Power.EntitySystems
var mask = WireVisDirFlags.None;
var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
var transform = EntityManager.GetComponent<ITransformComponent>(uid);
var grid = _mapManager.GetGrid(transform.GridID);
var tile = grid.TileIndicesFor(transform.Coordinates);
var node = nodeContainer.GetNode<CableNode>(cableVis.Node);

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

@@ -16,7 +16,7 @@ namespace Content.Server.Power.EntitySystems
public override void Update(float frameTime)
{
foreach (var apc in ComponentManager.EntityQuery<ApcComponent>())
foreach (var apc in EntityManager.EntityQuery<ApcComponent>())
{
apc.Update();
}

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

@@ -184,7 +184,7 @@ namespace Content.Server.Power.EntitySystems
// Send events where necessary.
{
foreach (var apcReceiver in ComponentManager.EntityQuery<ApcPowerReceiverComponent>())
foreach (var apcReceiver in EntityManager.EntityQuery<ApcPowerReceiverComponent>())
{
var recv = apcReceiver.NetworkLoad.ReceivingPower;
ref var last = ref apcReceiver.LastPowerReceived;
@@ -196,7 +196,7 @@ namespace Content.Server.Power.EntitySystems
}
}
foreach (var consumer in ComponentManager.EntityQuery<PowerConsumerComponent>())
foreach (var consumer in EntityManager.EntityQuery<PowerConsumerComponent>())
{
var newRecv = consumer.NetworkLoad.ReceivingPower;
ref var lastRecv = ref consumer.LastReceived;

4
Content.Server/Power/Nodes/CableDeviceNode.cs
View File

@@ -15,11 +15,11 @@ namespace Content.Server.Power.Nodes
{
public override IEnumerable<Node> GetReachableNodes()
{
var compMgr = IoCManager.Resolve<IComponentManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var grid = IoCManager.Resolve<IMapManager>().GetGrid(Owner.Transform.GridID);
var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates);
foreach (var node in NodeHelpers.GetNodesInTile(compMgr, grid, gridIndex))
foreach (var node in NodeHelpers.GetNodesInTile(entMan, grid, gridIndex))
{
if (node is CableNode)
yield return node;

4
Content.Server/Power/Nodes/CableNode.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Power.Nodes
if (!Anchored)
yield break;
var compMgr = IoCManager.Resolve<IComponentManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var grid = IoCManager.Resolve<IMapManager>().GetGrid(Owner.Transform.GridID);
var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates);
@@ -26,7 +26,7 @@ namespace Content.Server.Power.Nodes
var terminalDirs = 0;
List<(Direction, Node)> nodeDirs = new();
foreach (var (dir, node) in NodeHelpers.GetCardinalNeighborNodes(compMgr, grid, gridIndex))
foreach (var (dir, node) in NodeHelpers.GetCardinalNeighborNodes(entMan, grid, gridIndex))
{
if (node is CableNode && node != this)
{

4
Content.Server/Power/Nodes/CableTerminalNode.cs
View File

@@ -12,14 +12,14 @@ namespace Content.Server.Power.Nodes
{
public override IEnumerable<Node> GetReachableNodes()
{
var compMgr = IoCManager.Resolve<IComponentManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var grid = IoCManager.Resolve<IMapManager>().GetGrid(Owner.Transform.GridID);
var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates);
var dir = Owner.Transform.LocalRotation.GetDir();
var targetIdx = gridIndex + NodeHelpers.TileOffsetForDir(dir);
foreach (var node in NodeHelpers.GetNodesInTile(compMgr, grid, targetIdx))
foreach (var node in NodeHelpers.GetNodesInTile(entMan, grid, targetIdx))
{
if (node is CableTerminalPortNode)
yield return node;

4
Content.Server/Power/Nodes/CableTerminalPortNode.cs
View File

@@ -12,11 +12,11 @@ namespace Content.Server.Power.Nodes
{
public override IEnumerable<Node> GetReachableNodes()
{
var compMgr = IoCManager.Resolve<IComponentManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var grid = IoCManager.Resolve<IMapManager>().GetGrid(Owner.Transform.GridID);
var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates);
var nodes = NodeHelpers.GetCardinalNeighborNodes(compMgr, grid, gridIndex, includeSameTile: false);
var nodes = NodeHelpers.GetCardinalNeighborNodes(entMan, grid, gridIndex, includeSameTile: false);
foreach (var (_, node) in nodes)
{
if (node is CableTerminalNode)

2
Content.Server/Power/SMES/PowerSmesSystem.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Server.Power.SMES
{
public override void Update(float frameTime)
{
foreach (var comp in ComponentManager.EntityQuery<SmesComponent>(true))
foreach (var comp in EntityManager.EntityQuery<SmesComponent>(true))
{
comp.OnUpdate();
}