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

Inline GetComponent

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:55:25 +01:00
parent c2e6da1e54
commit b835bea086
131 changed files with 363 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Power/Components/ApcComponent.cs
View File

@@ -96,7 +96,7 @@ namespace Content.Server.Power.Components
if (_accessReader == null || accessSystem.IsAllowed(_accessReader, user.Uid))
{
MainBreakerEnabled = !MainBreakerEnabled;
Owner.GetComponent<PowerNetworkBatteryComponent>().CanDischarge = MainBreakerEnabled;
IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner.Uid).CanDischarge = MainBreakerEnabled;
_uiDirty = true;
SoundSystem.Play(Filter.Pvs(Owner), _onReceiveMessageSound.GetSound(), Owner, AudioParams.Default.WithVolume(-2f));
@@ -174,7 +174,7 @@ namespace Content.Server.Power.Components
return ApcChargeState.Full;
}
var netBattery = Owner.GetComponent<PowerNetworkBatteryComponent>();
var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner.Uid);
var delta = netBattery.CurrentSupply - netBattery.CurrentReceiving;
return delta < 0 ? ApcChargeState.Charging : ApcChargeState.Lack;
@@ -186,7 +186,7 @@ namespace Content.Server.Power.Components
if (bat == null)
return ApcExternalPowerState.None;
var netBat = Owner.GetComponent<PowerNetworkBatteryComponent>();
var netBat = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner.Uid);
if (netBat.CurrentReceiving == 0 && netBat.LoadingNetworkDemand != 0)
{
return ApcExternalPowerState.None;

3
Content.Server/Power/Components/BaseCharger.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Popups;
using Content.Shared.Power;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -99,7 +100,7 @@ namespace Content.Server.Power.Components
_heldBattery = null;
if (user.TryGetComponent(out HandsComponent? handsComponent))
{
handsComponent.PutInHandOrDrop(heldItem.GetComponent<ItemComponent>());
handsComponent.PutInHandOrDrop(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(heldItem.Uid));
}
if (heldItem.TryGetComponent(out ServerBatteryBarrelComponent? batteryBarrelComponent))

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

@@ -6,6 +6,7 @@ using Content.Server.Power.NodeGroups;
using Content.Server.Power.Pow3r;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace Content.Server.Power.EntitySystems
@@ -342,7 +343,7 @@ namespace Content.Server.Power.EntitySystems
foreach (var apc in net.Apcs)
{
var netBattery = apc.Owner.GetComponent<PowerNetworkBatteryComponent>();
var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(apc.Owner.Uid);
netNode.BatteriesDischarging.Add(netBattery.NetworkBattery.Id);
netBattery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
}
@@ -371,14 +372,14 @@ namespace Content.Server.Power.EntitySystems
foreach (var charger in net.Chargers)
{
var battery = charger.Owner.GetComponent<PowerNetworkBatteryComponent>();
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(charger.Owner.Uid);
netNode.BatteriesCharging.Add(battery.NetworkBattery.Id);
battery.NetworkBattery.LinkedNetworkCharging = netNode.Id;
}
foreach (var discharger in net.Dischargers)
{
var battery = discharger.Owner.GetComponent<PowerNetworkBatteryComponent>();
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(discharger.Owner.Uid);
netNode.BatteriesDischarging.Add(battery.NetworkBattery.Id);
battery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
}

5
Content.Server/Power/NodeGroups/PowerNet.cs
View File

@@ -7,6 +7,7 @@ using Content.Server.Power.EntitySystems;
using Content.Server.Power.Pow3r;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
@@ -90,7 +91,7 @@ namespace Content.Server.Power.NodeGroups
public void AddDischarger(BatteryDischargerComponent discharger)
{
var battery = discharger.Owner.GetComponent<PowerNetworkBatteryComponent>();
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(discharger.Owner.Uid);
battery.NetworkBattery.LinkedNetworkCharging = default;
Dischargers.Add(discharger);
_powerNetSystem.QueueReconnectPowerNet(this);
@@ -108,7 +109,7 @@ namespace Content.Server.Power.NodeGroups
public void AddCharger(BatteryChargerComponent charger)
{
var battery = charger.Owner.GetComponent<PowerNetworkBatteryComponent>();
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(charger.Owner.Uid);
battery.NetworkBattery.LinkedNetworkCharging = default;
Chargers.Add(charger);
_powerNetSystem.QueueReconnectPowerNet(this);

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

@@ -78,7 +78,7 @@ namespace Content.Server.Power.SMES
private ChargeState GetNewChargeState()
{
var battery = Owner.GetComponent<PowerNetworkBatteryComponent>();
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner.Uid);
return (battery.CurrentSupply - battery.CurrentReceiving) switch
{
> 0 => ChargeState.Discharging,