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

Bunch more resolves removed.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 17:17:12 +01:00
parent ba736f70df
commit 684cb76173
38 changed files with 267 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Medical/Components/HealingComponent.cs
View File

@@ -19,6 +19,8 @@ namespace Content.Server.Medical.Components
[RegisterComponent]
public class HealingComponent : Component, IAfterInteract
{
[Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "Healing";
[DataField("damage", required: true)]
@@ -40,7 +42,7 @@ namespace Content.Server.Medical.Components
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target.Value, out DamageableComponent? targetDamage))
if (!_entMan.TryGetComponent(eventArgs.Target.Value, out DamageableComponent? targetDamage))
{
return true;
}
@@ -60,7 +62,7 @@ namespace Content.Server.Medical.Components
return true;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedStackComponent?>(Owner, out var stack) && !EntitySystem.Get<StackSystem>().Use(Owner, 1, stack))
if (_entMan.TryGetComponent<SharedStackComponent?>(Owner, out var stack) && !EntitySystem.Get<StackSystem>().Use(Owner, 1, stack))
{
return true;
}

17
Content.Server/Medical/Components/MedicalScannerComponent.cs
View File

@@ -28,6 +28,7 @@ namespace Content.Server.Medical.Components
[ComponentReference(typeof(SharedMedicalScannerComponent))]
public class MedicalScannerComponent : SharedMedicalScannerComponent, IActivate, IDestroyAct
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IServerPreferencesManager _prefsManager = null!;
public static readonly TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5);
@@ -36,7 +37,7 @@ namespace Content.Server.Medical.Components
private ContainerSlot _bodyContainer = default!;
[ViewVariables]
private bool Powered => !IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
private bool Powered => !_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
[ViewVariables]
private BoundUserInterface? UserInterface => Owner.GetUIOrNull(MedicalScannerUiKey.Key);
@@ -71,7 +72,7 @@ namespace Content.Server.Medical.Components
var body = _bodyContainer.ContainedEntity;
if (body == null)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance?.SetData(MedicalScannerVisuals.Status, MedicalScannerStatus.Open);
}
@@ -79,7 +80,7 @@ namespace Content.Server.Medical.Components
return EmptyUIState;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(body.Value, out DamageableComponent? damageable))
if (!_entMan.TryGetComponent(body.Value, out DamageableComponent? damageable))
{
return EmptyUIState;
}
@@ -90,7 +91,7 @@ namespace Content.Server.Medical.Components
}
var cloningSystem = EntitySystem.Get<CloningSystem>();
var scanned = IoCManager.Resolve<IEntityManager>().TryGetComponent(_bodyContainer.ContainedEntity.Value, out MindComponent? mindComponent) &&
var scanned = _entMan.TryGetComponent(_bodyContainer.ContainedEntity.Value, out MindComponent? mindComponent) &&
mindComponent.Mind != null &&
cloningSystem.HasDnaScan(mindComponent.Mind);
@@ -136,7 +137,7 @@ namespace Content.Server.Medical.Components
if (body == null)
return MedicalScannerStatus.Open;
var state = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(body.Value);
var state = _entMan.GetComponentOrNull<MobStateComponent>(body.Value);
return state == null ? MedicalScannerStatus.Open : GetStatusFromDamageState(state);
}
@@ -146,7 +147,7 @@ namespace Content.Server.Medical.Components
private void UpdateAppearance()
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(MedicalScannerVisuals.Status, GetStatus());
}
@@ -154,7 +155,7 @@ namespace Content.Server.Medical.Components
void IActivate.Activate(ActivateEventArgs args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
if (!_entMan.TryGetComponent(args.User, out ActorComponent? actor))
{
return;
}
@@ -198,7 +199,7 @@ namespace Content.Server.Medical.Components
{
var cloningSystem = EntitySystem.Get<CloningSystem>();
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(_bodyContainer.ContainedEntity.Value, out MindComponent? mindComp) || mindComp.Mind == null)
if (!_entMan.TryGetComponent(_bodyContainer.ContainedEntity.Value, out MindComponent? mindComp) || mindComp.Mind == null)
{
obj.Session.AttachedEntity.Value.PopupMessageCursor(Loc.GetString("medical-scanner-component-msg-no-soul"));
break;