tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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 JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Atmos.Visualizers namespace Content.Client.Atmos.Visualizers
@@ -16,14 +17,14 @@ namespace Content.Client.Atmos.Visualizers
{ {
base.InitializeEntity(entity); base.InitializeEntity(entity);
entity.GetComponentOrNull<SpriteComponent>()?.LayerMapReserveBlank(Layer); IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity.Uid);
} }
public override void OnChangeData(AppearanceComponent component) public override void OnChangeData(AppearanceComponent component)
{ {
base.OnChangeData(component); base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out SpriteComponent? sprite)) if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.OwnerUid, out SpriteComponent? sprite))
{ {
return; return;
} }

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

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

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

@@ -58,15 +58,21 @@ namespace Content.Client.ContextMenu.UI
/// </summary> /// </summary>
public void UpdateEntity(IEntity? entity = null) 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; 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) if (UserInterfaceManager.DebugMonitors.Visible)
Text = $"{entity?.Name} ({entity?.Uid})"; Text = $"{entity!.Name} ({entity.Uid})";
else 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 JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Mining namespace Content.Client.Mining
@@ -16,14 +17,14 @@ namespace Content.Client.Mining
{ {
base.InitializeEntity(entity); base.InitializeEntity(entity);
entity.GetComponentOrNull<SpriteComponent>()?.LayerMapReserveBlank(Layer); IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity.Uid)?.LayerMapReserveBlank(Layer);
} }
public override void OnChangeData(AppearanceComponent component) public override void OnChangeData(AppearanceComponent component)
{ {
base.OnChangeData(component); base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out SpriteComponent? sprite)) if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.OwnerUid, out SpriteComponent? sprite))
{ {
return; return;
} }

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

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

6
Content.Server/Access/Components/IdCardConsoleComponent.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Server.Access.Systems; using Content.Server.Access.Systems;
@@ -135,6 +136,9 @@ namespace Content.Server.Access.Components
{ {
var targetIdComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(targetIdEntity.Uid); var targetIdComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(targetIdEntity.Uid);
var targetAccessComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(targetIdEntity.Uid); var targetAccessComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(targetIdEntity.Uid);
var name = string.Empty;
if(PrivilegedIdSlot.Item != null)
name = PrivilegedIdSlot.Item.Name;
newState = new IdCardConsoleBoundUserInterfaceState( newState = new IdCardConsoleBoundUserInterfaceState(
PrivilegedIdSlot.HasItem, PrivilegedIdSlot.HasItem,
PrivilegedIdIsAuthorized(), PrivilegedIdIsAuthorized(),
@@ -142,7 +146,7 @@ namespace Content.Server.Access.Components
targetIdComponent.FullName, targetIdComponent.FullName,
targetIdComponent.JobTitle, targetIdComponent.JobTitle,
targetAccessComponent.Tags.ToArray(), targetAccessComponent.Tags.ToArray(),
PrivilegedIdSlot.Item?.Name ?? string.Empty, name,
targetIdEntity.Name); targetIdEntity.Name);
} }
UserInterface?.SetState(newState); UserInterface?.SetState(newState);

6
Content.Server/Administration/AdminSystem.cs
View File

@@ -123,7 +123,11 @@ namespace Content.Server.Administration
private PlayerInfo GetPlayerInfo(IPlayerSession session) private PlayerInfo GetPlayerInfo(IPlayerSession session)
{ {
var name = session.Name; var name = session.Name;
var username = session.AttachedEntity?.Name ?? string.Empty; var username = string.Empty;
if(session.AttachedEntity != null)
username = session.AttachedEntity.Name;
var antag = session.ContentData()?.Mind?.AllRoles.Any(r => r.Antagonist) ?? false; var antag = session.ContentData()?.Mind?.AllRoles.Any(r => r.Antagonist) ?? false;
var uid = session.AttachedEntity?.Uid ?? EntityUid.Invalid; var uid = session.AttachedEntity?.Uid ?? EntityUid.Invalid;

4
Content.Server/Administration/AdminVerbSystem.cs
View File

@@ -180,7 +180,7 @@ namespace Content.Server.Administration
// Make ghost role verb // Make ghost role verb
if (_groupController.CanCommand(player, "makeghostrole") && if (_groupController.CanCommand(player, "makeghostrole") &&
!(args.Target.GetComponentOrNull<MindComponent>()?.HasMind ?? false)) !(IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MindComponent>(args.TargetUid)?.HasMind ?? false))
{ {
Verb verb = new(); Verb verb = new();
verb.Text = Loc.GetString("make-ghost-role-verb-get-data-text"); verb.Text = Loc.GetString("make-ghost-role-verb-get-data-text");
@@ -194,7 +194,7 @@ namespace Content.Server.Administration
// Configuration verb. Is this even used for anything!? // Configuration verb. Is this even used for anything!?
if (_groupController.CanAdminMenu(player) && if (_groupController.CanAdminMenu(player) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<ConfigurationComponent?>(args.Target.Uid, out var config)) IoCManager.Resolve<IEntityManager>().TryGetComponent<ConfigurationComponent?>(args.TargetUid, out var config))
{ {
Verb verb = new(); Verb verb = new();
verb.Text = Loc.GetString("configure-verb-get-data-text"); verb.Text = Loc.GetString("configure-verb-get-data-text");

8
Content.Server/Administration/Commands/RejuvenateCommand.cs
View File

@@ -53,9 +53,11 @@ namespace Content.Server.Administration.Commands
public static void PerformRejuvenate(IEntity target) public static void PerformRejuvenate(IEntity target)
{ {
target.GetComponentOrNull<MobStateComponent>()?.UpdateState(0); var targetUid = target.Uid;
target.GetComponentOrNull<HungerComponent>()?.ResetFood(); var entMan = IoCManager.Resolve<IEntityManager>();
target.GetComponentOrNull<ThirstComponent>()?.ResetThirst(); entMan.GetComponentOrNull<MobStateComponent>(targetUid)?.UpdateState(0);
entMan.GetComponentOrNull<HungerComponent>(targetUid)?.ResetFood();
entMan.GetComponentOrNull<ThirstComponent>(targetUid)?.ResetThirst();
EntitySystem.Get<StatusEffectsSystem>().TryRemoveAllStatusEffects(target.Uid); EntitySystem.Get<StatusEffectsSystem>().TryRemoveAllStatusEffects(target.Uid);

8
Content.Server/Alert/Click/StopPulling.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Pulling;
using Content.Shared.Pulling.Components; using Content.Shared.Pulling.Components;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Alert.Click namespace Content.Server.Alert.Click
@@ -17,11 +18,10 @@ namespace Content.Server.Alert.Click
public void AlertClicked(ClickAlertEventArgs args) public void AlertClicked(ClickAlertEventArgs args)
{ {
var ps = EntitySystem.Get<SharedPullingSystem>(); var ps = EntitySystem.Get<SharedPullingSystem>();
var playerTargetPullable = ps.GetPulled(args.Player)? var playerTarget = ps.GetPulled(args.Player);
.GetComponentOrNull<SharedPullableComponent>(); if (playerTarget != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(playerTarget.Uid, out SharedPullableComponent playerPullable))
if (playerTargetPullable != null)
{ {
ps.TryStopPull(playerTargetPullable); ps.TryStopPull(playerPullable);
} }
} }
} }