Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

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

@@ -24,6 +24,7 @@ namespace Content.Server.Power.Components
[ComponentReference(typeof(IActivate))]
public class ApcComponent : BaseApcNetComponent, IActivate
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
public override string Name => "Apc";
@@ -56,7 +57,7 @@ namespace Content.Server.Power.Components
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ApcUiKey.Key);
public BatteryComponent? Battery => IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out BatteryComponent? batteryComponent) ? batteryComponent : null;
public BatteryComponent? Battery => _entMan.TryGetComponent(Owner, out BatteryComponent? batteryComponent) ? batteryComponent : null;
[ComponentDependency] private AccessReader? _accessReader = null;
@@ -94,7 +95,7 @@ namespace Content.Server.Power.Components
if (_accessReader == null || accessSystem.IsAllowed(_accessReader, attached))
{
MainBreakerEnabled = !MainBreakerEnabled;
IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner).CanDischarge = MainBreakerEnabled;
_entMan.GetComponent<PowerNetworkBatteryComponent>(Owner).CanDischarge = MainBreakerEnabled;
_uiDirty = true;
SoundSystem.Play(Filter.Pvs(Owner), _onReceiveMessageSound.GetSound(), Owner, AudioParams.Default.WithVolume(-2f));
@@ -113,12 +114,12 @@ namespace Content.Server.Power.Components
_lastChargeState = newState;
_lastChargeStateChange = _gameTiming.CurTime;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(ApcVisuals.ChargeState, newState);
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out SharedPointLightComponent? light))
if (_entMan.TryGetComponent(Owner, out SharedPointLightComponent? light))
{
light.Color = newState switch
{
@@ -131,7 +132,7 @@ namespace Content.Server.Power.Components
}
}
IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out BatteryComponent? battery);
_entMan.TryGetComponent(Owner, out BatteryComponent? battery);
var newCharge = battery?.CurrentCharge;
if (newCharge != null && newCharge != _lastCharge && _lastChargeChange + TimeSpan.FromSeconds(VisualsChangeDelay) < _gameTiming.CurTime)
@@ -158,7 +159,7 @@ namespace Content.Server.Power.Components
private ApcChargeState CalcChargeState()
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out BatteryComponent? battery))
if (!_entMan.TryGetComponent(Owner, out BatteryComponent? battery))
{
return ApcChargeState.Lack;
}
@@ -170,7 +171,7 @@ namespace Content.Server.Power.Components
return ApcChargeState.Full;
}
var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner);
var netBattery = _entMan.GetComponent<PowerNetworkBatteryComponent>(Owner);
var delta = netBattery.CurrentSupply - netBattery.CurrentReceiving;
return delta < 0 ? ApcChargeState.Charging : ApcChargeState.Lack;
@@ -182,7 +183,7 @@ namespace Content.Server.Power.Components
if (bat == null)
return ApcExternalPowerState.None;
var netBat = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner);
var netBat = _entMan.GetComponent<PowerNetworkBatteryComponent>(Owner);
if (netBat.CurrentReceiving == 0 && netBat.LoadingNetworkDemand != 0)
{
return ApcExternalPowerState.None;
@@ -199,7 +200,7 @@ namespace Content.Server.Power.Components
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
if (!_entMan.TryGetComponent(eventArgs.User, out ActorComponent? actor))
{
return;
}

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

@@ -24,6 +24,8 @@ namespace Content.Server.Power.Components
public class ApcPowerReceiverComponent : Component, IExamine
#pragma warning restore 618
{
[Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "ApcPowerReceiver";
[ViewVariables]
@@ -85,9 +87,9 @@ namespace Content.Server.Power.Components
#pragma warning disable 618
SendMessage(new PowerChangedMessage(Powered));
#pragma warning restore 618
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(Owner, new PowerChangedEvent(Powered, NetworkLoad.ReceivingPower));
_entMan.EventBus.RaiseLocalEvent(Owner, new PowerChangedEvent(Powered, NetworkLoad.ReceivingPower));
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<AppearanceComponent?>(Owner, out var appearance))
if (_entMan.TryGetComponent<AppearanceComponent?>(Owner, out var appearance))
{
appearance.SetData(PowerDeviceVisuals.Powered, Powered);
}

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

@@ -19,6 +19,8 @@ namespace Content.Server.Power.Components
[ComponentReference(typeof(IInteractUsing))]
public abstract class BaseCharger : Component, IActivate, IInteractUsing
{
[Dependency] private readonly IEntityManager _entMan = default!;
[ViewVariables]
private BatteryComponent? _heldBattery;
@@ -97,12 +99,12 @@ namespace Content.Server.Power.Components
Container.Remove(heldItem);
_heldBattery = null;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(user, out HandsComponent? handsComponent))
if (_entMan.TryGetComponent(user, out HandsComponent? handsComponent))
{
handsComponent.PutInHandOrDrop(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(heldItem));
handsComponent.PutInHandOrDrop(_entMan.GetComponent<ItemComponent>(heldItem));
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(heldItem, out ServerBatteryBarrelComponent? batteryBarrelComponent))
if (_entMan.TryGetComponent(heldItem, out ServerBatteryBarrelComponent? batteryBarrelComponent))
{
batteryBarrelComponent.UpdateAppearance();
}
@@ -117,7 +119,7 @@ namespace Content.Server.Power.Components
private CellChargerStatus GetStatus()
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) &&
if (_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) &&
!receiver.Powered)
{
return CellChargerStatus.Off;
@@ -160,13 +162,13 @@ namespace Content.Server.Power.Components
// Not called UpdateAppearance just because it messes with the load
var status = GetStatus();
if (_status == status ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver))
!_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver))
{
return;
}
_status = status;
IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance);
_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance);
switch (_status)
{
@@ -205,7 +207,7 @@ namespace Content.Server.Power.Components
private void TransferPower(float frameTime)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) &&
if (_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) &&
!receiver.Powered)
{
return;

4
Content.Server/Power/Components/BaseNetConnectorComponent.cs
View File

@@ -18,6 +18,8 @@ namespace Content.Server.Power.Components
public abstract class BaseNetConnectorComponent<TNetType> : Component, IBaseNetConnectorComponent<TNetType>
{
[Dependency] private readonly IEntityManager _entMan = default!;
[ViewVariables(VVAccess.ReadWrite)]
public Voltage Voltage { get => _voltage; set => SetVoltage(value); }
[DataField("voltage")]
@@ -68,7 +70,7 @@ namespace Content.Server.Power.Components
private bool TryFindNet([NotNullWhen(true)] out TNetType? foundNet)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<NodeContainerComponent?>(Owner, out var container))
if (_entMan.TryGetComponent<NodeContainerComponent?>(Owner, out var container))
{
var compatibleNet = container.Nodes.Values
.Where(node => (NodeId == null || NodeId == node.Name) && node.NodeGroupID == (NodeGroupID) Voltage)

8
Content.Server/Power/Components/CableComponent.cs
View File

@@ -18,6 +18,8 @@ namespace Content.Server.Power.Components
[RegisterComponent]
public class CableComponent : Component, IInteractUsing
{
[Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "Cable";
[ViewVariables]
@@ -45,11 +47,11 @@ namespace Content.Server.Power.Components
if (EntitySystem.Get<ElectrocutionSystem>().TryDoElectrifiedAct(Owner, eventArgs.User)) return false;
IoCManager.Resolve<IEntityManager>().DeleteEntity(Owner);
var droppedEnt = IoCManager.Resolve<IEntityManager>().SpawnEntity(_cableDroppedOnCutPrototype, eventArgs.ClickLocation);
_entMan.DeleteEntity(Owner);
var droppedEnt = _entMan.SpawnEntity(_cableDroppedOnCutPrototype, eventArgs.ClickLocation);
// TODO: Literally just use a prototype that has a single thing in the stack, it's not that complicated...
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<StackComponent?>(droppedEnt, out var stack))
if (_entMan.TryGetComponent<StackComponent?>(droppedEnt, out var stack))
EntitySystem.Get<StackSystem>().SetCount(droppedEnt, 1, stack);
return true;

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

@@ -15,6 +15,7 @@ namespace Content.Server.Power.Components
[RegisterComponent]
internal class CablePlacerComponent : Component, IAfterInteract
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
/// <inheritdoc />
@@ -40,7 +41,7 @@ namespace Content.Server.Power.Components
if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
return false;
if(!_mapManager.TryGetGrid(eventArgs.ClickLocation.GetGridId(IoCManager.Resolve<IEntityManager>()), out var grid))
if(!_mapManager.TryGetGrid(eventArgs.ClickLocation.GetGridId(_entMan), out var grid))
return false;
var snapPos = grid.TileIndicesFor(eventArgs.ClickLocation);
@@ -51,17 +52,17 @@ namespace Content.Server.Power.Components
foreach (var anchored in grid.GetAnchoredEntities(snapPos))
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<CableComponent>(anchored, out var wire) && wire.CableType == _blockingCableType)
if (_entMan.TryGetComponent<CableComponent>(anchored, out var wire) && wire.CableType == _blockingCableType)
{
return false;
}
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<StackComponent?>(Owner, out var stack)
if (_entMan.TryGetComponent<StackComponent?>(Owner, out var stack)
&& !EntitySystem.Get<StackSystem>().Use(Owner, 1, stack))
return false;
IoCManager.Resolve<IEntityManager>().SpawnEntity(_cablePrototypeID, grid.GridTileToLocal(snapPos));
_entMan.SpawnEntity(_cablePrototypeID, grid.GridTileToLocal(snapPos));
return true;
}
}