tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make more uids nullable (#5794)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-26 15:32:45 +13:00
committed by GitHub
parent 83114de0e4
commit afc3ae6335
42 changed files with 161 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ namespace Content.Client.ContextMenu.UI
/// <summary>
/// The entity that can be accessed by interacting with this element.
/// </summary>
public EntityUid Entity;
public EntityUid? Entity;
/// <summary>
/// How many entities are accessible through this element's sub-menus.
@@ -28,7 +28,7 @@ namespace Content.Client.ContextMenu.UI
public readonly Label CountLabel;
public readonly SpriteView EntityIcon = new() { OverrideDirection = Direction.South};
public EntityMenuElement(EntityUid entity = default)
public EntityMenuElement(EntityUid? entity = null)
{
IoCManager.InjectDependencies(this);
@@ -40,7 +40,7 @@ namespace Content.Client.ContextMenu.UI
LayoutContainer.SetGrowVertical(CountLabel, LayoutContainer.GrowDirection.Begin);
Entity = entity;
if (Entity != default)
if (Entity != null)
{
Count = 1;
CountLabel.Visible = false;
@@ -51,7 +51,7 @@ namespace Content.Client.ContextMenu.UI
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
Entity = default;
Entity = null;
Count = 0;
}
@@ -59,23 +59,25 @@ namespace Content.Client.ContextMenu.UI
/// Update the icon and text of this element based on the given entity or this element's own entity if none
/// is provided.
/// </summary>
public void UpdateEntity(EntityUid entity = default)
public void UpdateEntity(EntityUid? entity = null)
{
if (Entity != default && _entityManager.EntityExists(Entity) && !entity.Valid)
entity = Entity;
entity ??= Entity;
if (entity == default)
// check whether entity is null, invalid, or has been deleted.
// _entityManager.Deleted() implicitly checks all of these.
if (_entityManager.Deleted(entity))
{
Text = string.Empty;
EntityIcon.Sprite = null;
return;
}
EntityIcon.Sprite = _entityManager.GetComponentOrNull<ISpriteComponent>(entity);
if (UserInterfaceManager.DebugMonitors.Visible)
Text = $"{_entityManager.GetComponent<MetaDataComponent>(entity!).EntityName} ({entity})";
Text = _entityManager.ToPrettyString(entity.Value);
else
Text = _entityManager.GetComponent<MetaDataComponent>(entity!).EntityName;
Text = _entityManager.GetComponent<MetaDataComponent>(entity.Value).EntityName;
}
}
}

26
Content.Client/ContextMenu/UI/EntityMenuPresenter.cs
View File

@@ -101,18 +101,16 @@ namespace Content.Client.ContextMenu.UI
// get an entity associated with this element
var entity = entityElement.Entity;
if (!entity.Valid)
{
entity = GetFirstEntityOrNull(element.SubMenu);
}
entity ??= GetFirstEntityOrNull(element.SubMenu);
if (!entity.Valid)
// Deleted() automatically checks for null & existence.
if (_entityManager.Deleted(entity))
return;
// open verb menu?
if (args.Function == ContentKeyFunctions.OpenContextMenu)
{
_verbSystem.VerbMenu.OpenVerbMenu(entity);
_verbSystem.VerbMenu.OpenVerbMenu(entity.Value);
args.Handle();
return;
}
@@ -120,7 +118,7 @@ namespace Content.Client.ContextMenu.UI
// do examination?
if (args.Function == ContentKeyFunctions.ExamineEntity)
{
_systemManager.GetEntitySystem<ExamineSystem>().DoExamine(entity);
_systemManager.GetEntitySystem<ExamineSystem>().DoExamine(entity.Value);
args.Handle();
return;
}
@@ -139,7 +137,7 @@ namespace Content.Client.ContextMenu.UI
var funcId = _inputManager.NetworkBindMap.KeyFunctionID(func);
var message = new FullInputCmdMessage(_gameTiming.CurTick, _gameTiming.TickFraction, funcId,
BoundKeyState.Down, _entityManager.GetComponent<TransformComponent>(entity).Coordinates, args.PointerLocation, entity);
BoundKeyState.Down, _entityManager.GetComponent<TransformComponent>(entity.Value).Coordinates, args.PointerLocation, entity.Value);
var session = _playerManager.LocalPlayer?.Session;
if (session != null)
@@ -314,7 +312,7 @@ namespace Content.Client.ContextMenu.UI
element.SubMenu.Dispose();
element.SubMenu = null;
element.CountLabel.Visible = false;
Elements[entity] = element;
Elements[entity.Value] = element;
}
// update the parent element, so that it's count and entity icon gets updated.
@@ -326,17 +324,17 @@ namespace Content.Client.ContextMenu.UI
/// <summary>
/// Recursively look through a sub-menu and return the first entity.
/// </summary>
private EntityUid GetFirstEntityOrNull(ContextMenuPopup? menu)
private EntityUid? GetFirstEntityOrNull(ContextMenuPopup? menu)
{
if (menu == null)
return default;
return null;
foreach (var element in menu.MenuBody.Children)
{
if (element is not EntityMenuElement entityElement)
continue;
if (entityElement.Entity != default)
if (entityElement.Entity != null)
{
if (!_entityManager.Deleted(entityElement.Entity))
return entityElement.Entity;
@@ -345,11 +343,11 @@ namespace Content.Client.ContextMenu.UI
// if the element has no entity, its a group of entities with another attached sub-menu.
var entity = GetFirstEntityOrNull(entityElement.SubMenu);
if (entity != default)
if (entity != null)
return entity;
}
return default;
return null;
}
public override void OpenSubMenu(ContextMenuElement element)