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/Sandbox/SandboxManager.cs
+++ b/Content.Server/Sandbox/SandboxManager.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using Content.Server.GameTicking;
 using Content.Server.Hands.Components;
-using Content.Server.Inventory.Components;
-using Content.Server.Items;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
 using Content.Shared.PDA;
 using Content.Shared.Sandbox;
 using Robust.Server.Console;
@@ -19,7 +19,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.Inventory.EquipmentSlotDefines;

 namespace Content.Server.Sandbox
 {
@@ -124,14 +123,15 @@ namespace Content.Server.Sandbox
                .EnumeratePrototypes<AccessLevelPrototype>()
                .Select(p => p.ID).ToArray();

-            if (_entityManager.TryGetComponent(attached, out InventoryComponent? inv)
-                && inv.TryGetSlotItem(Slots.IDCARD, out ItemComponent? wornItem))
+            var invSystem = EntitySystem.Get<InventorySystem>();
+
+            if (invSystem.TryGetSlotEntity(attached, "id", out var slotEntity))
            {
-                if (_entityManager.HasComponent<AccessComponent>(wornItem.Owner))
+                if (_entityManager.HasComponent<AccessComponent>(slotEntity))
                {
-                    UpgradeId(wornItem.Owner);
+                    UpgradeId(slotEntity.Value);
                }
-                else if (_entityManager.TryGetComponent(wornItem.Owner, out PDAComponent? pda))
+                else if (_entityManager.TryGetComponent(slotEntity, out PDAComponent? pda))
                {
                    if (pda.ContainedID == null)
                    {
@@ -139,7 +139,7 @@ namespace Content.Server.Sandbox
                        if (_entityManager.TryGetComponent(pda.Owner, out ItemSlotsComponent? itemSlots))
                        {
                            _entityManager.EntitySysManager.GetEntitySystem<ItemSlotsSystem>().
-                                TryInsert(wornItem.Owner, pda.IdSlot, newID, null);
+                                TryInsert(slotEntity.Value, pda.IdSlot, newID, null);
                        }
                    }
                    else
@@ -151,9 +151,9 @@ namespace Content.Server.Sandbox
            else if (_entityManager.TryGetComponent<HandsComponent?>(attached, out var hands))
            {
                var card = CreateFreshId();
-                if (!_entityManager.TryGetComponent(attached, out inv) || !inv.Equip(Slots.IDCARD, card))
+                if (!invSystem.TryEquip(attached, card, "id", true, true))
                {
-                    hands.PutInHandOrDrop(_entityManager.GetComponent<ItemComponent>(card));
+                    hands.PutInHandOrDrop(_entityManager.GetComponent<SharedItemComponent>(card));
                }
            }