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/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
+++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Content.Server.Inventory.Components;
 using Content.Server.Mind.Components;
 using Content.Server.Traitor.Uplink.Account;
 using Content.Server.Traitor.Uplink.Components;
@@ -9,6 +8,7 @@ using Content.Shared.Popups;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using InventoryComponent = Content.Shared.Inventory.InventoryComponent;

 namespace Content.Server.TraitorDeathMatch.Components
 {
@@ -22,13 +22,6 @@ namespace Content.Server.TraitorDeathMatch.Components

        async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
        {
-            if (!_entMan.TryGetComponent<InventoryComponent?>(eventArgs.User, out var userInv))
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("traitor-death-match-redemption-component-interact-using-main-message",
-                                                                 ("secondMessage", Loc.GetString("traitor-death-match-redemption-component-interact-using-no-inventory-message"))));
-                return false;
-            }
-
            if (!_entMan.TryGetComponent<MindComponent?>(eventArgs.User, out var userMindComponent))
            {
                Owner.PopupMessage(eventArgs.User, Loc.GetString("traitor-death-match-redemption-component-interact-using-main-message",
@@ -66,10 +59,13 @@ namespace Content.Server.TraitorDeathMatch.Components
            }

            UplinkComponent? userUplink = null;
+            var invSystem = EntitySystem.Get<InventorySystem>();

-            if (userInv.GetSlotItem(EquipmentSlotDefines.Slots.IDCARD)?.Owner is {Valid: true} userPDAEntity)
-                if (_entMan.TryGetComponent<UplinkComponent?>(userPDAEntity, out var userUplinkComponent))
-                    userUplink = userUplinkComponent;
+            if (invSystem.TryGetSlotEntity(eventArgs.User, "id", out var pdaUid) &&
+                _entMan.TryGetComponent<UplinkComponent>(pdaUid, out var userUplinkComponent))
+            {
+                userUplink = userUplinkComponent;
+            }

            if (userUplink == null)
            {