get that crap outta here (completely rewrites inventorysystem) (#5807)

* some work * equip: done unequip: todo * unequipping done & refactored events * workin * movin * reee namespaces * stun * mobstate * fixes * some work on events * removes serverside itemcomp & misc fixes * work * smol merge fix * ports template to prototype & finishes ui * moves relay & adds containerenumerator * actions & cuffs * my god what is actioncode * more fixes * im loosing my grasp on reality * more fixes * more work * explosions * yes * more work * more fixes * merge master & misc fixed because i forgot to commit before merging master * more fixes * fixes * moar * more work * moar fixes * suffixmap * more work on client * motivation low * no. no containers * mirroring client to server * fixes * move serverinvcomp * serverinventorycomponent is dead * gaming * only strippable & ai left... * only ai and richtext left * fixes ai * fixes * fixes sprite layers * more fixes * resolves optional * yes * stable™️ * fixes * moar fixes * moar * fix some tests * lmao * no comment * good to merge™️ * fixes build but for real * adresses some reviews * adresses some more reviews * nullables, yo * fixes lobbyscreen * timid refactor to differentiate actor & target * adresses more reviews * more * my god what a mess * removed the rest of duplicates * removed duplicate slotflags and renamed shoes to feet * removes another unused one * yes * fixes lobby & makes tryunequip return unequipped item * fixes * some funny renames * fixes * misc improvements to attemptevents * fixes * merge fixes Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
parent 7a5adb47a1
commit 512d6a38c3
199 changed files with 2493 additions and 3300 deletions
--- a/Content.Server/Hands/Components/HandsComponent.cs
+++ b/Content.Server/Hands/Components/HandsComponent.cs
@@ -4,12 +4,12 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Act;
 using Content.Server.Interaction;
-using Content.Server.Items;
 using Content.Server.Popups;
 using Content.Server.Pulling;
 using Content.Shared.Audio;
 using Content.Shared.Body.Part;
 using Content.Shared.Hands.Components;
+using Content.Shared.Item;
 using Content.Shared.Popups;
 using Content.Shared.Pulling.Components;
 using Content.Shared.Sound;
@@ -39,7 +39,7 @@ namespace Content.Server.Hands.Components

        protected override void OnHeldEntityRemovedFromHand(EntityUid heldEntity, HandState handState)
        {
-            if (_entities.TryGetComponent(heldEntity, out ItemComponent? item))
+            if (_entities.TryGetComponent(heldEntity, out SharedItemComponent? item))
            {
                item.RemovedFromSlot();
                _entitySystemManager.GetEntitySystem<InteractionSystem>().UnequippedHandInteraction(Owner, heldEntity, handState);
@@ -153,19 +153,19 @@ namespace Content.Server.Hands.Components
        /// <summary>
        ///     Tries to get the ItemComponent on the entity held by a hand.
        /// </summary>
-        public ItemComponent? GetItem(string handName)
+        public SharedItemComponent? GetItem(string handName)
        {
            if (!TryGetHeldEntity(handName, out var heldEntity))
                return null;

-            _entities.TryGetComponent(heldEntity, out ItemComponent? item);
+            _entities.TryGetComponent(heldEntity, out SharedItemComponent? item);
            return item;
        }

        /// <summary>
        ///     Tries to get the ItemComponent on the entity held by a hand.
        /// </summary>
-        public bool TryGetItem(string handName, [NotNullWhen(true)] out ItemComponent? item)
+        public bool TryGetItem(string handName, [NotNullWhen(true)] out SharedItemComponent? item)
        {
            item = null;

@@ -178,23 +178,23 @@ namespace Content.Server.Hands.Components
        /// <summary>
        ///     Tries to get the ItemComponent off the entity in the active hand.
        /// </summary>
-        public ItemComponent? GetActiveHand
+        public SharedItemComponent? GetActiveHand
        {
            get
            {
                if (!TryGetActiveHeldEntity(out var heldEntity))
                    return null;

-                _entities.TryGetComponent(heldEntity, out ItemComponent? item);
+                _entities.TryGetComponent(heldEntity, out SharedItemComponent? item);
                return item;
            }
        }

-        public IEnumerable<ItemComponent> GetAllHeldItems()
+        public IEnumerable<SharedItemComponent> GetAllHeldItems()
        {
            foreach (var entity in GetAllHeldEntities())
            {
-                if (_entities.TryGetComponent(entity, out ItemComponent? item))
+                if (_entities.TryGetComponent(entity, out SharedItemComponent? item))
                    yield return item;
            }
        }
@@ -202,7 +202,7 @@ namespace Content.Server.Hands.Components
        /// <summary>
        ///     Checks if any hand can pick up an item.
        /// </summary>
-        public bool CanPutInHand(ItemComponent item, bool mobCheck = true)
+        public bool CanPutInHand(SharedItemComponent item, bool mobCheck = true)
        {
            var entity = item.Owner;