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

Even more resolve removals.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 17:32:32 +01:00
parent 684cb76173
commit cdc8336695
61 changed files with 364 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Power/SMES/SmesComponent.cs
View File

@@ -18,6 +18,7 @@ namespace Content.Server.Power.SMES
[RegisterComponent]
public class SmesComponent : Component
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
public override string Name => "Smes";
@@ -47,7 +48,7 @@ namespace Content.Server.Power.SMES
_lastChargeLevel = newLevel;
_lastChargeLevelChange = _gameTiming.CurTime;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(SmesVisuals.LastChargeLevel, newLevel);
}
@@ -59,7 +60,7 @@ namespace Content.Server.Power.SMES
_lastChargeState = newChargeState;
_lastChargeStateChange = _gameTiming.CurTime;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(SmesVisuals.LastChargeState, newChargeState);
}
@@ -68,7 +69,7 @@ namespace Content.Server.Power.SMES
private int GetNewChargeLevel()
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out BatteryComponent? battery))
if (!_entMan.TryGetComponent(Owner, out BatteryComponent? battery))
{
return 0;
}
@@ -78,7 +79,7 @@ namespace Content.Server.Power.SMES
private ChargeState GetNewChargeState()
{
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner);
var battery = _entMan.GetComponent<PowerNetworkBatteryComponent>(Owner);
return (battery.CurrentSupply - battery.CurrentReceiving) switch
{
> 0 => ChargeState.Discharging,