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/Clothing/Components/MagbootsComponent.cs
+++ b/Content.Server/Clothing/Components/MagbootsComponent.cs
@@ -1,7 +1,5 @@
 using Content.Server.Alert;
 using Content.Server.Atmos.Components;
-using Content.Server.Inventory.Components;
-using Content.Server.Items;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Behaviors.Item;
 using Content.Shared.Actions.Components;
@@ -9,6 +7,7 @@ using Content.Shared.Alert;
 using Content.Shared.Clothing;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
+using Content.Shared.Item;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -16,15 +15,14 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.Inventory.EquipmentSlotDefines;

 namespace Content.Server.Clothing.Components
 {
    [RegisterComponent]
    [ComponentReference(typeof(IActivate))]
-    public sealed class MagbootsComponent : SharedMagbootsComponent, IUnequipped, IEquipped, IUse, IActivate
+    public sealed class MagbootsComponent : SharedMagbootsComponent, IUse, IActivate
    {
-        [ComponentDependency] private ItemComponent? _item = null;
+        [ComponentDependency] private SharedItemComponent? _item = null;
        [ComponentDependency] private ItemActionsComponent? _itemActions = null;
        [ComponentDependency] private SpriteComponent? _sprite = null;

@@ -40,7 +38,12 @@ namespace Content.Server.Clothing.Components
            {
                _on = value;

-                UpdateContainer();
+                if (Owner.TryGetContainer(out var container) && EntitySystem.Get<InventorySystem>()
+                        .TryGetSlotEntity(container.Owner, "shoes", out var entityUid) && entityUid == Owner)
+                {
+                    EntitySystem.Get<MagbootsSystem>().UpdateMagbootEffects(container.Owner, Owner, true, this);
+                }
+
                _itemActions?.Toggle(ItemActionType.ToggleMagboots, On);
                if (_item != null)
                    _item.EquippedPrefix = On ? "on" : null;
@@ -55,54 +58,6 @@ namespace Content.Server.Clothing.Components
            On = !On;
        }

-        void IUnequipped.Unequipped(UnequippedEventArgs eventArgs)
-        {
-            if (On && eventArgs.Slot == Slots.SHOES)
-            {
-                if (_entMan.TryGetComponent(eventArgs.User, out MovedByPressureComponent? movedByPressure))
-                {
-                    movedByPressure.Enabled = true;
-                }
-
-                if (_entMan.TryGetComponent(eventArgs.User, out ServerAlertsComponent? alerts))
-                {
-                    alerts.ClearAlert(AlertType.Magboots);
-                }
-            }
-        }
-
-        void IEquipped.Equipped(EquippedEventArgs eventArgs)
-        {
-            UpdateContainer();
-        }
-
-        private void UpdateContainer()
-        {
-            if (!Owner.TryGetContainer(out var container))
-                return;
-
-            if (_entMan.TryGetComponent(container.Owner, out InventoryComponent? inventoryComponent)
-                && inventoryComponent.GetSlotItem(Slots.SHOES)?.Owner == Owner)
-            {
-                if (_entMan.TryGetComponent(container.Owner, out MovedByPressureComponent? movedByPressure))
-                {
-                    movedByPressure.Enabled = false;
-                }
-
-                if (_entMan.TryGetComponent(container.Owner, out ServerAlertsComponent? alerts))
-                {
-                    if (On)
-                    {
-                        alerts.ShowAlert(AlertType.Magboots);
-                    }
-                    else
-                    {
-                        alerts.ClearAlert(AlertType.Magboots);
-                    }
-                }
-            }
-        }
-
        bool IUse.UseEntity(UseEntityEventArgs eventArgs)
        {
            Toggle(eventArgs.User);