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

Remove IHandsComponent and ISharedHandsComponent (#5218)

Browse Source 
* Remove IHandsComponent and ISharedHandsComponent

* Copy the documentation from the interfaces

* Revert "Copy the documentation from the interfaces"

This reverts commit 7638a2d4817743d487c7b255ba3e56add77dca86.

* Perform a minute amount of cleanup
This commit is contained in:
Javier Guardia Fernández
2021-11-08 15:08:24 +01:00
committed by GitHub
parent 162cde1b32
commit ec9e65951c
25 changed files with 42 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Hands/Components/ISharedHandsComponent.cs
View File

@@ -1,8 +0,0 @@
using Robust.Shared.GameObjects;
namespace Content.Shared.Hands.Components
{
public interface ISharedHandsComponent : IComponent
{
}
}

16
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@@ -19,8 +19,8 @@ using Robust.Shared.ViewVariables;
namespace Content.Shared.Hands.Components
{
[NetworkedComponent()]
public abstract class SharedHandsComponent : Component, ISharedHandsComponent
[NetworkedComponent]
public abstract class SharedHandsComponent : Component
{
public sealed override string Name => "Hands";
@@ -124,13 +124,12 @@ namespace Content.Shared.Hands.Components
if (HasHand(handName))
return;
var container = ContainerHelpers.CreateContainer<ContainerSlot>(Owner, handName);
var container = Owner.CreateContainer<ContainerSlot>(handName);
container.OccludesLight = false;
Hands.Add(new Hand(handName, handLocation, container));
if (ActiveHand == null)
ActiveHand = handName;
ActiveHand ??= handName;
HandCountChanged();
@@ -353,7 +352,7 @@ namespace Content.Shared.Hands.Components
}
/// <summary>
/// Attempts to move a held item from a hand into a container that is not another hand, without dropping it on the floor inbetween.
/// Attempts to move a held item from a hand into a container that is not another hand, without dropping it on the floor in-between.
/// </summary>
public bool Drop(IEntity entity, BaseContainer targetContainer, bool checkActionBlocker = true)
{
@@ -391,8 +390,9 @@ namespace Content.Shared.Hands.Components
/// <summary>
/// Tries to remove the item in the active hand, without dropping it.
/// For transfering the held item to anothe rlocation, like an inventory slot,
/// which souldn't trigger the drop interaction
/// For transferring the held item to another location, like an inventory slot,
/// which shouldn't trigger the drop interaction
/// </summary>
public bool TryDropNoInteraction()
{
if (!TryGetActiveHand(out var hand))