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/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -1,18 +1,19 @@
-using Content.Server.Inventory.Components;
-using Content.Server.Items;
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
-using Content.Shared.PDA;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.PDA;
+using Robust.Shared.IoC;

 namespace Content.Server.Access.Systems
 {
    public class IdCardSystem : SharedIdCardSystem
    {
+        [Dependency] private readonly InventorySystem _inventorySystem = default!;
+
        public override void Initialize()
        {
            base.Initialize();
@@ -101,7 +102,12 @@ namespace Content.Server.Access.Systems
                return true;

            // check inventory slot?
-            return TryGetIdCardSlot(uid, out idCard);
+            if (_inventorySystem.TryGetSlotEntity(uid, "id", out var idUid) && TryGetIdCard(idUid.Value, out idCard))
+            {
+                return true;
+            }
+
+            return false;
        }

        /// <summary>
@@ -121,17 +127,5 @@ namespace Content.Server.Access.Systems

            return false;
        }
-
-        /// <summary>
-        ///     Try get id card from mobs ID inventory slot
-        /// </summary>
-        public bool TryGetIdCardSlot(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
-        {
-            idCard = null;
-            return EntityManager.TryGetComponent(uid, out InventoryComponent? inventoryComponent) &&
-                   inventoryComponent.HasSlot(EquipmentSlotDefines.Slots.IDCARD) &&
-                   inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent? item) &&
-                   TryGetIdCard(item.Owner, out idCard);
-        }
    }
 }