Predict general interactions. (#6856)

Content.Shared/Item/SharedItemComponent.cs

@@ -20,7 +20,7 @@ namespace Content.Shared.Item
     ///    Players can pick up, drop, and put items in bags, and they can be seen in player's hands.
     /// </summary>
     [NetworkedComponent()]
-    public abstract class SharedItemComponent : Component, IInteractHand
+    public abstract class SharedItemComponent : Component
     {
         [Dependency] private readonly IEntityManager _entMan = default!;
 
@@ -97,22 +97,6 @@ namespace Content.Shared.Item
         [DataField("sprite")]
         public readonly string? RsiPath;
 
-        bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
-        {
-            var user = eventArgs.User;
-
-            if (!_entMan.TryGetComponent(user, out SharedHandsComponent hands))
-                return false;
-
-            var activeHand = hands.ActiveHand;
-
-            if (activeHand == null)
-                return false;
-
-            // hands checks action blockers
-            return hands.TryPickupEntityToActiveHand(Owner, animateUser: true);
-        }
-
         public void RemovedFromSlot()
         {
             if (_entMan.TryGetComponent(Owner, out SharedSpriteComponent component))

Content.Shared/Item/SharedItemSystem.cs

@@ -1,3 +1,5 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
@@ -17,11 +19,26 @@ namespace Content.Shared.Item
 
             SubscribeLocalEvent<SharedSpriteComponent, GotEquippedEvent>(OnEquipped);
             SubscribeLocalEvent<SharedSpriteComponent, GotUnequippedEvent>(OnUnequipped);
+            SubscribeLocalEvent<SharedItemComponent, InteractHandEvent>(OnHandInteract);
 
             SubscribeLocalEvent<SharedItemComponent, ComponentGetState>(OnGetState);
             SubscribeLocalEvent<SharedItemComponent, ComponentHandleState>(OnHandleState);
         }
 
+        private void OnHandInteract(EntityUid uid, SharedItemComponent component, InteractHandEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (!TryComp(args.User, out SharedHandsComponent? hands))
+                return;
+
+            if (hands.ActiveHand == null)
+                return;
+
+            args.Handled = hands.TryPickupEntity(hands.ActiveHand, uid, false, animateUser: false);
+        }
+
         private void OnHandleState(EntityUid uid, SharedItemComponent component, ref ComponentHandleState args)
         {
             if (args.Current is not ItemComponentState state)