add fuel costs back to finishing welding (#27030)

* add fuel costs back to welding

* ack

* meh

* eek!

Content.Client/Tools/Components/WelderComponent.cs

@@ -1,18 +0,0 @@
-using Content.Client.Tools.UI;
-using Content.Shared.Tools.Components;
-
-namespace Content.Client.Tools.Components
-{
-    [RegisterComponent, Access(typeof(ToolSystem), typeof(WelderStatusControl))]
-    public sealed partial class WelderComponent : SharedWelderComponent
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool UiUpdateNeeded { get; set; }
-
-        [ViewVariables]
-        public float FuelCapacity { get; set; }
-
-        [ViewVariables]
-        public float Fuel { get; set; }
-    }
-}

Content.Client/Tools/ToolSystem.cs

@@ -1,10 +1,8 @@
 using Content.Client.Items;
 using Content.Client.Tools.Components;
 using Content.Client.Tools.UI;
-using Content.Shared.Item;
 using Content.Shared.Tools.Components;
 using Robust.Client.GameObjects;
-using Robust.Shared.GameStates;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
 namespace Content.Client.Tools
@@ -15,7 +13,6 @@ namespace Content.Client.Tools
         {
             base.Initialize();
 
-            SubscribeLocalEvent<WelderComponent, ComponentHandleState>(OnWelderHandleState);
             Subs.ItemStatus<WelderComponent>(ent => new WelderStatusControl(ent));
             Subs.ItemStatus<MultipleToolComponent>(ent => new MultipleToolStatusControl(ent));
         }
@@ -42,20 +39,5 @@ namespace Content.Client.Tools
                     sprite.LayerSetSprite(0, current.Sprite);
             }
         }
-
-        private void OnWelderHandleState(EntityUid uid, WelderComponent welder, ref ComponentHandleState args)
-        {
-            if (args.Current is not WelderComponentState state)
-                return;
-
-            welder.FuelCapacity = state.FuelCapacity;
-            welder.Fuel = state.Fuel;
-            welder.UiUpdateNeeded = true;
-        }
-
-        protected override bool IsWelder(EntityUid uid)
-        {
-            return HasComp<WelderComponent>(uid);
-        }
     }
 }

Content.Client/Tools/UI/WelderStatusControl.cs

@@ -1,28 +1,29 @@
 using Content.Client.Message;
 using Content.Client.Stylesheets;
-using Content.Client.Tools.Components;
-using Content.Shared.Item;
+using Content.Shared.Tools.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
-using ItemToggleComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleComponent;
 
 namespace Content.Client.Tools.UI;
 
 public sealed class WelderStatusControl : Control
 {
-    [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
 
-    private readonly WelderComponent _parent;
-    private readonly ItemToggleComponent? _toggleComponent;
+    private readonly ToolSystem _tool;
+
+    private readonly Entity<WelderComponent> _parent;
     private readonly RichTextLabel _label;
 
     public WelderStatusControl(Entity<WelderComponent> parent)
     {
+        IoCManager.InjectDependencies(this);
+
         _parent = parent;
-        _entMan = IoCManager.Resolve<IEntityManager>();
-        if (_entMan.TryGetComponent<ItemToggleComponent>(parent, out var itemToggle))
-            _toggleComponent = itemToggle;
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        _tool = entMan.System<ToolSystem>();
+
         _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);
 
@@ -34,28 +35,20 @@ public sealed class WelderStatusControl : Control
     {
         base.FrameUpdate(args);
 
-        if (!_parent.UiUpdateNeeded)
-        {
-            return;
-        }
         Update();
     }
 
     public void Update()
     {
-        _parent.UiUpdateNeeded = false;
+        if (!_gameTiming.IsFirstTimePredicted)
+            return;
 
-        var fuelCap = _parent.FuelCapacity;
-        var fuel = _parent.Fuel;
-        var lit = false;
-        if (_toggleComponent != null)
-        {
-            lit = _toggleComponent.Activated;
-        }
+        var (fuel, fuelCap) = _tool.GetWelderFuelAndCapacity(_parent, _parent);
+        var lit = _parent.Comp.Enabled;
 
         _label.SetMarkup(Loc.GetString("welder-component-on-examine-detailed-message",
             ("colorName", fuel < fuelCap / 4f ? "darkorange" : "orange"),
-            ("fuelLeft", Math.Round(fuel, 1)),
+            ("fuelLeft", Math.Round(fuel.Float(), 1)),
             ("fuelCapacity", fuelCap),
             ("status", Loc.GetString(lit ? "welder-component-on-examine-welder-lit-message" : "welder-component-on-examine-welder-not-lit-message"))));
     }