tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

18
Content.Server/Light/Components/ExpendableLightComponent.cs
View File

@@ -17,6 +17,8 @@ namespace Content.Server.Light.Components
[RegisterComponent]
public class ExpendableLightComponent : SharedExpendableLightComponent, IUse
{
[Dependency] private readonly IEntityManager _entMan = default!;
/// <summary>
/// Status of light, whether or not it is emitting light.
/// </summary>
@@ -36,14 +38,14 @@ namespace Content.Server.Light.Components
{
base.Initialize();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemComponent?>(Owner, out var item))
if (_entMan.TryGetComponent<ItemComponent?>(Owner, out var item))
{
item.EquippedPrefix = "unlit";
}
CurrentState = ExpendableLightState.BrandNew;
Owner.EnsureComponent<PointLightComponent>();
IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out _appearance);
_entMan.TryGetComponent(Owner, out _appearance);
}
/// <summary>
@@ -53,7 +55,7 @@ namespace Content.Server.Light.Components
{
if (!Activated && CurrentState == ExpendableLightState.BrandNew)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemComponent?>(Owner, out var item))
if (_entMan.TryGetComponent<ItemComponent?>(Owner, out var item))
{
item.EquippedPrefix = "lit";
}
@@ -92,7 +94,7 @@ namespace Content.Server.Light.Components
private void UpdateSpriteAndSounds(bool on)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out SpriteComponent? sprite))
if (_entMan.TryGetComponent(Owner, out SpriteComponent? sprite))
{
switch (CurrentState)
{
@@ -126,7 +128,7 @@ namespace Content.Server.Light.Components
}
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ClothingComponent? clothing))
if (_entMan.TryGetComponent(Owner, out ClothingComponent? clothing))
{
clothing.ClothingEquippedPrefix = on ? "Activated" : string.Empty;
}
@@ -155,13 +157,13 @@ namespace Content.Server.Light.Components
case ExpendableLightState.Fading:
CurrentState = ExpendableLightState.Dead;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityName = SpentName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityDescription = SpentDesc;
_entMan.GetComponent<MetaDataComponent>(Owner).EntityName = SpentName;
_entMan.GetComponent<MetaDataComponent>(Owner).EntityDescription = SpentDesc;
UpdateSpriteAndSounds(Activated);
UpdateVisualizer();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemComponent?>(Owner, out var item))
if (_entMan.TryGetComponent<ItemComponent?>(Owner, out var item))
{
item.EquippedPrefix = "unlit";
}