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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Actions/ActionsSystem.cs
View File

@@ -85,7 +85,7 @@ namespace Content.Client.Actions
{
var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
if (playerEntity == null ||
!playerEntity.TryGetComponent<ClientActionsComponent>(out var actionsComponent)) return false;
!IoCManager.Resolve<IEntityManager>().TryGetComponent<ClientActionsComponent?>(playerEntity.Uid, out var actionsComponent)) return false;
actionsComponent.HandleHotbarKeybind(slot, args);
return true;
@@ -99,7 +99,7 @@ namespace Content.Client.Actions
{
var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
if (playerEntity == null ||
!playerEntity.TryGetComponent<ClientActionsComponent>( out var actionsComponent)) return false;
!IoCManager.Resolve<IEntityManager>().TryGetComponent<ClientActionsComponent?>(playerEntity.Uid, out var actionsComponent)) return false;
actionsComponent.HandleChangeHotbarKeybind(hotbar, args);
return true;
@@ -111,7 +111,7 @@ namespace Content.Client.Actions
{
var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
if (playerEntity == null ||
!playerEntity.TryGetComponent<ClientActionsComponent>( out var actionsComponent)) return false;
!IoCManager.Resolve<IEntityManager>().TryGetComponent<ClientActionsComponent?>(playerEntity.Uid, out var actionsComponent)) return false;
return actionsComponent.TargetingOnUse(args);
}
@@ -120,7 +120,7 @@ namespace Content.Client.Actions
{
var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
if (playerEntity == null ||
!playerEntity.TryGetComponent<ClientActionsComponent>( out var actionsComponent)) return;
!IoCManager.Resolve<IEntityManager>().TryGetComponent<ClientActionsComponent?>(playerEntity.Uid, out var actionsComponent)) return;
actionsComponent.ToggleActionsMenu();
}

4
Content.Client/Actions/UI/ActionSlot.cs
View File

@@ -231,7 +231,7 @@ namespace Content.Client.Actions.UI
{
ActionPrototype actionPrototype => new ActionAttempt(actionPrototype),
ItemActionPrototype itemActionPrototype =>
(Item != null && Item.TryGetComponent<ItemActionsComponent>(out var itemActions)) ?
(Item != null && IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemActionsComponent?>(Item.Uid, out var itemActions)) ?
new ItemActionAttempt(itemActionPrototype, Item, itemActions) : null,
_ => null
};
@@ -504,7 +504,7 @@ namespace Content.Client.Actions.UI
if (Item != null)
{
SetItemIcon(Item.TryGetComponent<ISpriteComponent>(out var spriteComponent) ? spriteComponent : null);
SetItemIcon(IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(Item.Uid, out var spriteComponent) ? spriteComponent : null);
}
else
{