Revert "Actions Rework" (#6888)

Content.Server/Atmos/Components/GasTankComponent.cs

@@ -1,21 +1,30 @@
+using System;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Audio;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Sound;
+using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Player;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos.Components
 {
@@ -81,9 +90,6 @@ namespace Content.Server.Atmos.Components
         [DataField("tankFragmentScale")]
         public float TankFragmentScale { get; set; }    = 10 * Atmospherics.OneAtmosphere;
 
-        [DataField("toggleAction", required: true)]
-        public InstantAction ToggleAction = default!;
-
         protected override void Initialize()
         {
             base.Initialize();
@@ -159,7 +165,6 @@ namespace Content.Server.Atmos.Components
             var internals = GetInternalsComponent();
             if (internals == null) return;
             IsConnected = internals.TryConnectTank(Owner);
-            EntitySystem.Get<SharedActionsSystem>().SetToggled(ToggleAction, IsConnected);
             UpdateUserInterface();
         }
 
@@ -167,7 +172,6 @@ namespace Content.Server.Atmos.Components
         {
             if (!IsConnected) return;
             IsConnected = false;
-            EntitySystem.Get<SharedActionsSystem>().SetToggled(ToggleAction, false);
             GetInternalsComponent(owner)?.DisconnectTank();
             UpdateUserInterface();
         }
@@ -183,6 +187,9 @@ namespace Content.Server.Atmos.Components
                     InternalsConnected = IsConnected,
                     CanConnectInternals = IsFunctional && internals != null
                 });
+
+            if (internals == null || !_entityManager.TryGetComponent<ItemActionsComponent>(Owner, out var itemActions)) return;
+            itemActions.GrantOrUpdate(ItemActionType.ToggleInternals, IsFunctional, IsConnected);
         }
 
         private void UserInterfaceOnOnReceiveMessage(ServerBoundUserInterfaceMessage message)
@@ -302,4 +309,22 @@ namespace Content.Server.Atmos.Components
             DisconnectFromInternals(eventArgs.User);
         }
     }
+
+    [UsedImplicitly]
+    [DataDefinition]
+    public sealed class ToggleInternalsAction : IToggleItemAction
+    {
+        public bool DoToggleAction(ToggleItemActionEventArgs args)
+        {
+            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(args.Performer, args.Item))
+                return false;
+
+            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<GasTankComponent?>(args.Item, out var gasTankComponent)) return false;
+            // no change
+            if (gasTankComponent.IsConnected == args.ToggledOn) return false;
+            gasTankComponent.ToggleInternals();
+            // did we successfully toggle to the desired status?
+            return gasTankComponent.IsConnected == args.ToggledOn;
+        }
+    }
 }