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

Some manual GetComponentOrNull inlines

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:09:45 +01:00
parent a5b57c8e10
commit 61be228ad0
10 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Atmos/Visualizers/AtmosPlaqueVisualizer.cs
View File

@@ -2,6 +2,7 @@
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Atmos.Visualizers
@@ -16,14 +17,14 @@ namespace Content.Client.Atmos.Visualizers
{
base.InitializeEntity(entity);
entity.GetComponentOrNull<SpriteComponent>()?.LayerMapReserveBlank(Layer);
IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity.Uid);
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out SpriteComponent? sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.OwnerUid, out SpriteComponent? sprite))
{
return;
}

12
Content.Client/Body/UI/BodyScannerDisplay.cs
View File

@@ -17,8 +17,6 @@ namespace Content.Client.Body.UI
private IEntity? _currentEntity;
private SharedBodyPartComponent? _currentBodyPart;
private SharedBodyComponent? CurrentBody => _currentEntity?.GetComponentOrNull<SharedBodyComponent>();
public BodyScannerDisplay(BodyScannerBoundUserInterface owner)
{
IoCManager.InjectDependencies(this);
@@ -107,10 +105,13 @@ namespace Content.Client.Body.UI
public void UpdateDisplay(IEntity entity)
{
if(entity == null)
return;
_currentEntity = entity;
BodyPartList.Clear();
var body = CurrentBody;
var body = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedBodyComponent>(_currentEntity.Uid);
if (body == null)
{
@@ -125,7 +126,10 @@ namespace Content.Client.Body.UI
public void BodyPartOnItemSelected(ItemListSelectedEventArgs args)
{
var body = CurrentBody;
if (_currentEntity == null)
return;
var body = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedBodyComponent>(_currentEntity.Uid);
if (body == null)
{

14
Content.Client/ContextMenu/UI/EntityMenuElement.cs
View File

@@ -58,15 +58,21 @@ namespace Content.Client.ContextMenu.UI
/// </summary>
public void UpdateEntity(IEntity? entity = null)
{
if (Entity != null && !((!IoCManager.Resolve<IEntityManager>().EntityExists(Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted))
if (Entity != null && IoCManager.Resolve<IEntityManager>().EntityExists(Entity.Uid))
entity ??= Entity;
EntityIcon.Sprite = entity?.GetComponentOrNull<ISpriteComponent>();
if (entity == null)
{
Text = string.Empty;
return;
}
EntityIcon.Sprite = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ISpriteComponent>(entity.Uid);
if (UserInterfaceManager.DebugMonitors.Visible)
Text = $"{entity?.Name} ({entity?.Uid})";
Text = $"{entity!.Name} ({entity.Uid})";
else
Text = entity?.Name ?? string.Empty;
Text = entity!.Name;
}
}
}

5
Content.Client/Mining/AsteroidRockVisualizer.cs
View File

@@ -2,6 +2,7 @@
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Mining
@@ -16,14 +17,14 @@ namespace Content.Client.Mining
{
base.InitializeEntity(entity);
entity.GetComponentOrNull<SpriteComponent>()?.LayerMapReserveBlank(Layer);
IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity.Uid)?.LayerMapReserveBlank(Layer);
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out SpriteComponent? sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.OwnerUid, out SpriteComponent? sprite))
{
return;
}

5
Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
View File

@@ -2,6 +2,7 @@
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -17,14 +18,14 @@ namespace Content.Client.Singularity.Visualizers
{
base.InitializeEntity(entity);
entity.GetComponentOrNull<SpriteComponent>()?.LayerMapReserveBlank(Layer);
IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity.Uid)?.LayerMapReserveBlank(Layer);
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out SpriteComponent? sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.OwnerUid, out SpriteComponent? sprite))
{
return;
}