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

hands ECS (#7081)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-17 20:13:31 +13:00
committed by GitHub
parent 7b84362901
commit bfd95c493b
94 changed files with 1454 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/AME/Components/AMEControllerComponent.cs
View File

@@ -7,6 +7,7 @@ using Content.Server.Power.Components;
using Content.Server.UserInterface;
using Content.Shared.ActionBlocker;
using Content.Shared.AME;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Popups;
@@ -23,6 +24,7 @@ namespace Content.Server.AME.Components
public sealed class AMEControllerComponent : SharedAMEControllerComponent, IInteractUsing
{
[Dependency] private readonly IEntityManager _entities = default!;
[Dependency] private readonly IEntitySystemManager _sysMan = default!;
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(AMEControllerUiKey.Key);
private bool _injecting;
@@ -210,10 +212,7 @@ namespace Content.Server.AME.Components
_jarSlot.Remove(jar);
UpdateUserInterface();
if (!_entities.TryGetComponent<HandsComponent?>(user, out var hands) || !_entities.TryGetComponent<SharedItemComponent?>(jar, out var item))
return;
if (hands.CanPutInHand(item))
hands.PutInHand(item);
_sysMan.GetEntitySystem<SharedHandsSystem>().PickupOrDrop(user, jar);
}
private void ToggleInjection()
@@ -306,13 +305,13 @@ namespace Content.Server.AME.Components
return true;
}
if (hands.GetActiveHandItem == null)
if (hands.ActiveHandEntity == null)
{
Owner.PopupMessage(args.User, Loc.GetString("ame-controller-component-interact-using-nothing-in-hands-text"));
return false;
}
var activeHandEntity = hands.GetActiveHandItem.Owner;
var activeHandEntity = hands.ActiveHandEntity;
if (_entities.HasComponent<AMEFuelContainerComponent?>(activeHandEntity))
{
if (HasJar)
@@ -322,7 +321,7 @@ namespace Content.Server.AME.Components
else
{
_jarSlot.Insert(activeHandEntity);
_jarSlot.Insert(activeHandEntity.Value);
Owner.PopupMessage(args.User, Loc.GetString("ame-controller-component-interact-using-success"));
UpdateUserInterface();
}