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.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
+++ b/Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Hands.Components;
-using Content.Server.Inventory.Components;
-using Content.Server.Items;
 using Content.Server.PDA;
 using Content.Shared.Access.Components;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
 using Content.Shared.PDA;
 using NUnit.Framework;
 using Robust.Server.Player;
@@ -58,6 +58,8 @@ namespace Content.IntegrationTests.Tests.PDA
            var sPlayerManager = server.ResolveDependency<IPlayerManager>();
            var sEntityManager = server.ResolveDependency<IEntityManager>();

+            var invSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<InventorySystem>();
+
            await server.WaitAssertion(() =>
            {
                var player = sPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault();
@@ -71,7 +73,7 @@ namespace Content.IntegrationTests.Tests.PDA

                // Put PDA in hand
                var dummyPda = sEntityManager.SpawnEntity(PdaDummy, sEntityManager.GetComponent<TransformComponent>(player).MapPosition);
-                var pdaItemComponent = sEntityManager.GetComponent<ItemComponent>(dummyPda);
+                var pdaItemComponent = sEntityManager.GetComponent<SharedItemComponent>(dummyPda);
                sEntityManager.GetComponent<HandsComponent>(player).PutInHand(pdaItemComponent);

                var pdaComponent = sEntityManager.GetComponent<PDAComponent>(dummyPda);
@@ -91,7 +93,7 @@ namespace Content.IntegrationTests.Tests.PDA

                // Put ID card in hand
                var idDummy = sEntityManager.SpawnEntity(IdCardDummy, sEntityManager.GetComponent<TransformComponent>(player).MapPosition);
-                var idItemComponent = sEntityManager.GetComponent<ItemComponent>(idDummy);
+                var idItemComponent = sEntityManager.GetComponent<SharedItemComponent>(idDummy);
                sEntityManager.GetComponent<HandsComponent>(player).PutInHand(idItemComponent);

                var idCardComponent = sEntityManager.GetComponent<IdCardComponent>(idDummy);
@@ -103,20 +105,16 @@ namespace Content.IntegrationTests.Tests.PDA
                Assert.That(id, Is.EqualTo(idCardComponent));

                // Remove all IDs and PDAs
-                var inventory = sEntityManager.GetComponent<InventoryComponent>(player);
+                Assert.That(invSystem.TryGetSlots(player, out var slots));

-                foreach (var slot in inventory.Slots)
+                foreach (var slot in slots)
                {
-                    var item = inventory.GetSlotItem(slot);
-
-                    if (item == null)
-                    {
+                    if(!invSystem.TryGetSlotEntity(player, slot.Name, out var item))
                        continue;
-                    }

-                    if (sEntityManager.HasComponent<PDAComponent>(item.Owner))
+                    if (sEntityManager.HasComponent<PDAComponent>(item))
                    {
-                        inventory.ForceUnequip(slot);
+                        invSystem.TryUnequip(player, slot.Name, force: true);
                    }
                }