Interaction Entity System (#26)

* Interaction Entity System

* ye

* Update submodule

* Requires engine update to function, but doesn't use shitcode

* Fix conflicts

* Fix conflicts but for real

* Update submodule

Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs

@@ -1,41 +1,40 @@
-using Content.Server.Interfaces.GameObjects;
+using System;
+using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;
 using SS14.Server.GameObjects;
 using SS14.Shared.GameObjects;
+using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.GameObjects.Components;
 using SS14.Shared.Log;
 using SS14.Shared.Maths;
+using SS14.Shared.IoC;
+using Content.Server.GameObjects.EntitySystems;
 
 namespace Content.Server.GameObjects
 {
-    public class ServerDoorComponent : SharedDoorComponent
+    public class ServerDoorComponent : SharedDoorComponent, IAttackHand
     {
         public bool Opened { get; private set; }
 
         private float OpenTimeCounter;
-
-        private IInteractableComponent interactableComponent;
+        
         private CollidableComponent collidableComponent;
 
         public override void Initialize()
         {
             base.Initialize();
 
-            interactableComponent = Owner.GetComponent<IInteractableComponent>();
-            interactableComponent.OnAttackHand += OnAttackHand;
             collidableComponent = Owner.GetComponent<CollidableComponent>();
             collidableComponent.OnBump += OnBump;
         }
 
         public override void OnRemove()
         {
-            interactableComponent.OnAttackHand -= OnAttackHand;
-            interactableComponent = null;
             collidableComponent.OnBump -= OnBump;
             collidableComponent = null;
         }
 
-        private void OnAttackHand(object sender, AttackHandEventArgs args)
+        public bool Attackhand(IEntity user)
         {
             if (Opened)
             {
@@ -45,6 +44,7 @@ namespace Content.Server.GameObjects
             {
                 Open();
             }
+            return true;
         }
 
         private void OnBump(object sender, BumpEventArgs args)

Content.Server/GameObjects/Components/Interactable/InteractableComponent.cs

@@ -1,80 +0,0 @@
-using Content.Server.Interfaces.GameObjects;
-using SS14.Server.Interfaces.GameObjects;
-using SS14.Shared.GameObjects;
-using SS14.Shared.Interfaces.GameObjects.Components;
-using SS14.Shared.Log;
-using System;
-
-namespace Content.Server.GameObjects
-{
-    public class InteractableComponent : Component, IInteractableComponent
-    {
-        public override string Name => "Interactable";
-
-        /// <inheritdoc />
-        public event EventHandler<AttackHandEventArgs> OnAttackHand;
-
-        /// <inheritdoc />
-        public event EventHandler<AttackByEventArgs> OnAttackBy;
-
-        private IClickableComponent clickableComponent;
-        private IServerTransformComponent transform;
-        private const float INTERACTION_RANGE = 2;
-        private const float INTERACTION_RANGE_SQUARED = INTERACTION_RANGE * INTERACTION_RANGE;
-
-        public override void Initialize()
-        {
-            transform = Owner.GetComponent<IServerTransformComponent>();
-            if (Owner.TryGetComponent<IClickableComponent>(out var component))
-            {
-                clickableComponent = component;
-                clickableComponent.OnClick += ClickableComponent_OnClick;
-            }
-            else
-            {
-                Logger.Error($"Interactable component must also have a clickable component to function! Prototype: {Owner.Prototype.ID}");
-            }
-            base.Initialize();
-        }
-
-        public override void Shutdown()
-        {
-            if (clickableComponent != null)
-            {
-                clickableComponent.OnClick -= ClickableComponent_OnClick;
-                clickableComponent = null;
-            }
-            transform = null;
-            base.Shutdown();
-        }
-
-        private void ClickableComponent_OnClick(object sender, ClickEventArgs e)
-        {
-            if (!e.User.TryGetComponent<IServerTransformComponent>(out var userTransform))
-            {
-                return;
-            }
-
-            var distance = (userTransform.WorldPosition - transform.WorldPosition).LengthSquared;
-            if (distance > INTERACTION_RANGE_SQUARED)
-            {
-                return;
-            }
-
-            if (!e.User.TryGetComponent<IHandsComponent>(out var hands))
-            {
-                return;
-            }
-
-            var item = hands.GetHand(hands.ActiveIndex);
-            if (item != null)
-            {
-                OnAttackBy?.Invoke(this, new AttackByEventArgs(Owner, e.User, item, hands.ActiveIndex));
-            }
-            else
-            {
-                OnAttackHand?.Invoke(this, new AttackHandEventArgs(Owner, e.User, hands.ActiveIndex));
-            }
-        }
-    }
-}

Content.Server/GameObjects/Components/Items/ItemComponent.cs

@@ -1,19 +1,17 @@
 using Content.Server.Interfaces.GameObjects;
 using SS14.Server.Interfaces.GameObjects;
 using SS14.Shared.GameObjects;
-using SS14.Shared.Interfaces.GameObjects.Components;
-using SS14.Shared.Log;
 using System;
+using SS14.Shared.Interfaces.GameObjects;
 
 namespace Content.Server.GameObjects
 {
-    public class ItemComponent : Component, IItemComponent
+    public class ItemComponent : Component, IItemComponent, EntitySystems.IAttackHand
     {
         public override string Name => "Item";
 
         /// <inheritdoc />
         public IInventorySlot ContainingSlot { get; private set; }
-        private IInteractableComponent interactableComponent;
 
         public void RemovedFromSlot()
         {
@@ -45,38 +43,15 @@ namespace Content.Server.GameObjects
             }
         }
 
-        public override void Initialize()
-        {
-            if (Owner.TryGetComponent<IInteractableComponent>(out var interactable))
-            {
-                interactableComponent = interactable;
-                interactableComponent.OnAttackHand += InteractableComponent_OnAttackHand;
-            }
-            else
-            {
-                Logger.Error($"Item component must have an interactable component to function! Prototype: {Owner.Prototype.ID}");
-            }
-            base.Initialize();
-        }
-
-        private void InteractableComponent_OnAttackHand(object sender, AttackHandEventArgs e)
+        public bool Attackhand(IEntity user)
         {
             if (ContainingSlot != null)
             {
-                return;
+                return false;
             }
-            var hands = e.User.GetComponent<IHandsComponent>();
-            hands.PutInHand(this, e.HandIndex, fallback: false);
-        }
-
-        public override void Shutdown()
-        {
-            if (interactableComponent != null)
-            {
-                interactableComponent.OnAttackHand -= InteractableComponent_OnAttackHand;
-                interactableComponent = null;
-            }
-            base.Shutdown();
+            var hands = user.GetComponent<IHandsComponent>();
+            hands.PutInHand(this, hands.ActiveIndex, fallback: false);
+            return true;
         }
     }
 }

Content.Server/GameObjects/Components/Items/ServerHandsComponent.cs

@@ -2,13 +2,11 @@
 using Content.Shared.GameObjects;
 using SS14.Server.GameObjects.Events;
 using SS14.Server.Interfaces.GameObjects;
-using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.Utility;
 using System;
 using System.Collections.Generic;
 using YamlDotNet.RepresentationModel;
-using Lidgren.Network;
 using SS14.Shared.Enums;
 
 namespace Content.Server.GameObjects