Predict GetVerbsEvent in PowerSwitchableSystem (#39589)

* Prediction

* Update

Content.Server/Power/Generator/GeneratorSystem.cs

@@ -198,6 +198,7 @@ public sealed class GeneratorSystem : SharedGeneratorSystem
 
         generator.On = on;
         UpdateState(uid, generator);
+        Dirty(uid, generator);
     }
 
     public override void Update(float frameTime)

Content.Server/Power/Generator/PortableGeneratorSystem.cs

@@ -42,8 +42,6 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem
         SubscribeLocalEvent<PortableGeneratorComponent, PortableGeneratorStartMessage>(GeneratorStartMessage);
         SubscribeLocalEvent<PortableGeneratorComponent, PortableGeneratorStopMessage>(GeneratorStopMessage);
         SubscribeLocalEvent<PortableGeneratorComponent, PortableGeneratorSwitchOutputMessage>(GeneratorSwitchOutputMessage);
-
-        SubscribeLocalEvent<FuelGeneratorComponent, SwitchPowerCheckEvent>(OnSwitchPowerCheck);
     }
 
     private void GeneratorSwitchOutputMessage(EntityUid uid, PortableGeneratorComponent component, PortableGeneratorSwitchOutputMessage args)
@@ -195,12 +193,6 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem
         }
     }
 
-    private void OnSwitchPowerCheck(EntityUid uid, FuelGeneratorComponent comp, ref SwitchPowerCheckEvent args)
-    {
-        if (comp.On)
-            args.DisableMessage = Loc.GetString("fuel-generator-verb-disable-on");
-    }
-
     public override void Update(float frameTime)
     {
         var query = EntityQueryEnumerator<PortableGeneratorComponent, FuelGeneratorComponent, PowerSupplierComponent>();

Content.Server/Power/Generator/PowerSwitchableSystem.cs

@@ -1,5 +1,4 @@
-using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.EntitySystems;
-using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.Nodes;
@@ -7,9 +6,7 @@ using Content.Shared.NodeContainer;
 using Content.Shared.Power;
 using Content.Shared.Power.Generator;
 using Content.Shared.Timing;
-using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Power.Generator;
 
@@ -26,47 +23,9 @@ public sealed class PowerSwitchableSystem : SharedPowerSwitchableSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
-    public override void Initialize()
+    // TODO: Prediction
-    {
+    /// <inheritdoc/>
-        base.Initialize();
+    public override void Cycle(EntityUid uid, EntityUid user, PowerSwitchableComponent? comp = null)
-
-        SubscribeLocalEvent<PowerSwitchableComponent, GetVerbsEvent<InteractionVerb>>(GetVerbs);
-    }
-
-    private void GetVerbs(EntityUid uid, PowerSwitchableComponent comp, GetVerbsEvent<InteractionVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        var voltage = VoltageColor(GetNextVoltage(uid, comp));
-        var msg = Loc.GetString("power-switchable-switch-voltage", ("voltage", voltage));
-
-        InteractionVerb verb = new()
-        {
-            Act = () =>
-            {
-                // don't need to check it again since if its disabled server wont let the verb act
-                Cycle(uid, args.User, comp);
-            },
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/zap.svg.192dpi.png")),
-            Text = msg
-        };
-
-        var ev = new SwitchPowerCheckEvent();
-        RaiseLocalEvent(uid, ref ev);
-        if (ev.DisableMessage != null)
-        {
-            verb.Message = ev.DisableMessage;
-            verb.Disabled = true;
-        }
-
-        args.Verbs.Add(verb);
-    }
-
-    /// <summary>
-    /// Cycles voltage then updates nodes and optionally power supplier to match it.
-    /// </summary>
-    public void Cycle(EntityUid uid, EntityUid user, PowerSwitchableComponent? comp = null)
     {
         if (!Resolve(uid, ref comp))
             return;
@@ -115,10 +74,3 @@ public sealed class PowerSwitchableSystem : SharedPowerSwitchableSystem
         _useDelay.TryResetDelay((uid, useDelay));
     }
 }
-
-/// <summary>
-/// Raised on a <see cref="PowerSwitchableComponent"/> to see if its verb should work.
-/// If <see cref="DisableMessage"/> is non-null, the verb is disabled with that as the message.
-/// </summary>
-[ByRefEvent]
-public record struct SwitchPowerCheckEvent(string? DisableMessage = null);

Content.Shared/Power/Generator/SharedPortableGeneratorSystem.cs

@@ -9,6 +9,18 @@ namespace Content.Shared.Power.Generator;
 /// <seealso cref="PortableGeneratorComponent"/>
 public abstract class SharedPortableGeneratorSystem : EntitySystem
 {
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FuelGeneratorComponent, SwitchPowerCheckEvent>(OnSwitchPowerCheck);
+    }
+
+    private void OnSwitchPowerCheck(EntityUid uid, FuelGeneratorComponent comp, ref SwitchPowerCheckEvent args)
+    {
+        if (comp.On)
+            args.DisableMessage = Loc.GetString("fuel-generator-verb-disable-on");
+    }
 }
 
 /// <summary>

Content.Shared/Power/Generator/SharedPowerSwitchableSystem.cs

@@ -1,4 +1,6 @@
 using Content.Shared.Examine;
+using Content.Shared.Verbs;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Power.Generator;
 
@@ -11,6 +13,7 @@ public abstract class SharedPowerSwitchableSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<PowerSwitchableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<PowerSwitchableComponent, GetVerbsEvent<InteractionVerb>>(GetVerbs);
     }
 
     private void OnExamined(EntityUid uid, PowerSwitchableComponent comp, ExaminedEvent args)
@@ -20,6 +23,41 @@ public abstract class SharedPowerSwitchableSystem : EntitySystem
         args.PushMarkup(Loc.GetString(comp.ExamineText, ("voltage", voltage)));
     }
 
+    private void GetVerbs(EntityUid uid, PowerSwitchableComponent comp, GetVerbsEvent<InteractionVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        var voltage = VoltageColor(GetNextVoltage(uid, comp));
+        var msg = Loc.GetString("power-switchable-switch-voltage", ("voltage", voltage));
+
+        InteractionVerb verb = new()
+        {
+            Act = () =>
+            {
+                // don't need to check it again since if its disabled server wont let the verb act
+                Cycle(uid, args.User, comp);
+            },
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/zap.svg.192dpi.png")),
+            Text = msg
+        };
+
+        var ev = new SwitchPowerCheckEvent();
+        RaiseLocalEvent(uid, ref ev);
+        if (ev.DisableMessage != null)
+        {
+            verb.Message = ev.DisableMessage;
+            verb.Disabled = true;
+        }
+
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    /// Cycles voltage then updates nodes and optionally power supplier to match it.
+    /// </summary>
+    public virtual void Cycle(EntityUid uid, EntityUid user, PowerSwitchableComponent? comp = null) { }
+
     /// <summary>
     /// Helper to get the colored markup string for a voltage type.
     /// </summary>
@@ -70,3 +108,10 @@ public abstract class SharedPowerSwitchableSystem : EntitySystem
         return comp.Cables[NextIndex(uid, comp)].Voltage;
     }
 }
+
+/// <summary>
+/// Raised on a <see cref="PowerSwitchableComponent"/> to see if its verb should work.
+/// If <see cref="DisableMessage"/> is non-null, the verb is disabled with that as the message.
+/// </summary>
+[ByRefEvent]
+public record struct SwitchPowerCheckEvent(string? DisableMessage = null);