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

Inline TryGetComponent completely

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:05:23 +01:00
parent f3edecf994
commit 2ff4ec65d5
34 changed files with 98 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ namespace Content.Client.Body.UI
BodyPartLabel.Text = $"{Loc.GetString(slotName)}: {Loc.GetString(part.Owner.Name)}";
// TODO BODY Part damage
if (part.Owner.TryGetComponent(out DamageableComponent? damageable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(part.Owner.Uid, out DamageableComponent? damageable))
{
BodyPartHealth.Text = Loc.GetString("body-scanner-display-body-part-damage-text",("damage", damageable.TotalDamage));
}

6
Content.Client/Fluids/PuddleVisualizer.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Client.Fluids
{
base.InitializeEntity(entity);
if (!entity.TryGetComponent(out SpriteComponent? spriteComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SpriteComponent? spriteComponent))
{
Logger.Warning($"Missing SpriteComponent for PuddleVisualizer on entityUid = {entity.Uid}");
return;
@@ -69,5 +69,5 @@ namespace Content.Client.Fluids
spriteComponent.Color = newColor;
}
}
}
}

6
Content.Client/Storage/ClientStorageComponent.cs
View File

@@ -181,8 +181,8 @@ namespace Content.Client.Storage
if (!IoCManager.Resolve<IEntityManager>().TryGetEntity(entityUid, out var entity))
return;
entity.TryGetComponent(out ISpriteComponent? sprite);
entity.TryGetComponent(out ItemComponent? item);
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ISpriteComponent? sprite);
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ItemComponent? item);
button.AddChild(new BoxContainer
{
@@ -252,7 +252,7 @@ namespace Content.Client.Storage
{
var controlledEntity = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
if (controlledEntity != null && controlledEntity.TryGetComponent(out HandsComponent? hands))
if (controlledEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(controlledEntity.Uid, out HandsComponent? hands))
{
#pragma warning disable 618
StorageEntity.SendNetworkMessage(new InsertEntityMessage());

3
Content.Client/Storage/Visualizers/MappedItemVisualizer.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Storage.Components;
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;
@@ -19,7 +20,7 @@ namespace Content.Client.Storage.Visualizers
{
base.InitializeEntity(entity);
if (entity.TryGetComponent<ISpriteComponent>(out var spriteComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(entity.Uid, out var spriteComponent))
{
_rsiPath ??= spriteComponent.BaseRSI!.Path!;
}

3
Content.Client/Storage/Visualizers/StorageVisualizer.cs
View File

@@ -2,6 +2,7 @@ using Content.Shared.Storage;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Storage.Visualizers
@@ -18,7 +19,7 @@ namespace Content.Client.Storage.Visualizers
public override void InitializeEntity(IEntity entity)
{
if (!entity.TryGetComponent(out ISpriteComponent? sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ISpriteComponent? sprite))
{
return;
}