Remove all obsolete BatteryComponent method calls (#25871)

Removed all obsolete, non-ECS method calls to BatteryComponent

diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index 0b60787dfb6cce4f404eae95ba916e20a1853ce4..3fa5237948cd80b04679a0bc28b3713543437bf5 100644 (file)
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -151,7 +151,7 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem
         }
         else
         {
-            battery.CurrentCharge += component.ChargingWattage * frameTime * component.ChargingEfficiency;
+            _battery.SetCharge(uid, battery.CurrentCharge + component.ChargingWattage * frameTime * component.ChargingEfficiency, battery);
             if (battery.IsFullyCharged)
             {
                 if (TryComp<ApcPowerReceiverComponent>(uid, out var receiver))

diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index 70ce3c748809e55d9713ae93a5bbabc67587e0d1..90b9a812c7008ba3906952e1ee0e0c2e0472385d 100644 (file)
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Actions;
 using Content.Server.Popups;
+using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Shared.Actions;
 using Content.Shared.Examine;
@@ -25,6 +26,7 @@ namespace Content.Server.Light.EntitySystems
         [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PowerCellSystem _powerCell = default!;
+        [Dependency] private readonly BatterySystem _battery = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedPointLightSystem _lights = default!;
@@ -268,7 +270,7 @@ namespace Content.Server.Light.EntitySystems
                 _appearance.SetData(uid, HandheldLightVisuals.Power, HandheldLightPowerStates.Dying, appearanceComponent);
             }
 
-            if (component.Activated && !battery.TryUseCharge(component.Wattage * frameTime))
+            if (component.Activated && !_battery.TryUseCharge(uid, component.Wattage * frameTime, battery))
                 TurnOff(uid, false);
 
             UpdateLevel(uid);

diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs
index 0fbee9aa3463e7c59d20fcbb3fa8c2940a26a4b3..113106ed185730d5b6c999297f37fe110c9a640d 100644 (file)
--- a/Content.Server/Power/Components/BatteryComponent.cs
+++ b/Content.Server/Power/Components/BatteryComponent.cs
@@ -7,56 +7,34 @@ namespace Content.Server.Power.Components
     /// </summary>
     [RegisterComponent]
     [Virtual]
+    [Access(typeof(BatterySystem))]
     public partial class BatteryComponent : Component
     {
-        [Dependency] private readonly IEntityManager _entMan = default!;
         public string SolutionName = "battery";
 
         /// <summary>
         /// Maximum charge of the battery in joules (ie. watt seconds)
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float MaxCharge
-        {
-            get => _maxCharge;
-            [Obsolete("Use system method")]
-            set => _entMan.System<BatterySystem>().SetMaxCharge(Owner, value, this);
-        }
-
-        [DataField("maxCharge")]
-        [Access(typeof(BatterySystem))]
-        public float _maxCharge;
+        [DataField]
+        public float MaxCharge;
 
         /// <summary>
         /// Current charge of the battery in joules (ie. watt seconds)
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float CurrentCharge
-        {
-            get => Charge;
-            [Obsolete("Use system method")]
-            set => _entMan.System<BatterySystem>().SetCharge(Owner, value, this);
-        }
-
         [DataField("startingCharge")]
-        [Access(typeof(BatterySystem))]
-        public float Charge;
+        public float CurrentCharge;
 
         /// <summary>
         /// True if the battery is fully charged.
         /// </summary>
-        [ViewVariables] public bool IsFullyCharged => MathHelper.CloseToPercent(CurrentCharge, MaxCharge);
+        [ViewVariables]
+        public bool IsFullyCharged => MathHelper.CloseToPercent(CurrentCharge, MaxCharge);
 
         /// <summary>
         /// The price per one joule. Default is 1 credit for 10kJ.
         /// </summary>
-        [DataField("pricePerJoule")]
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float PricePerJoule = 0.0001f;
-
-        [Obsolete("Use system method")]
-        public bool TryUseCharge(float value)
-            => _entMan.System<BatterySystem>().TryUseCharge(Owner, value, this);
     }
 
     /// <summary>

diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index c844988b065e3f9cdd3b72a66299def665e87e1d..0a0f2068b58e82c70b77c888bf973c4a561dac9c 100644 (file)
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -62,9 +62,9 @@ namespace Content.Server.Power.EntitySystems
             var enumerator = AllEntityQuery<PowerNetworkBatteryComponent, BatteryComponent>();
             while (enumerator.MoveNext(out var netBat, out var bat))
             {
-                DebugTools.Assert(bat.Charge <= bat.MaxCharge && bat.Charge >= 0);
+                DebugTools.Assert(bat.CurrentCharge <= bat.MaxCharge && bat.CurrentCharge >= 0);
                 netBat.NetworkBattery.Capacity = bat.MaxCharge;
-                netBat.NetworkBattery.CurrentStorage = bat.Charge;
+                netBat.NetworkBattery.CurrentStorage = bat.CurrentCharge;
             }
         }
 
@@ -108,10 +108,10 @@ namespace Content.Server.Power.EntitySystems
             if (value <= 0 ||  !Resolve(uid, ref battery) || battery.CurrentCharge == 0)
                 return 0;
 
-            var newValue = Math.Clamp(0, battery.CurrentCharge - value, battery._maxCharge);
-            var delta = newValue - battery.Charge;
-            battery.Charge = newValue;
-            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery._maxCharge);
+            var newValue = Math.Clamp(0, battery.CurrentCharge - value, battery.MaxCharge);
+            var delta = newValue - battery.CurrentCharge;
+            battery.CurrentCharge = newValue;
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
             return delta;
         }
@@ -121,13 +121,13 @@ namespace Content.Server.Power.EntitySystems
             if (!Resolve(uid, ref battery))
                 return;
 
-            var old = battery._maxCharge;
-            battery._maxCharge = Math.Max(value, 0);
-            battery.Charge = Math.Min(battery.Charge, battery._maxCharge);
-            if (MathHelper.CloseTo(battery._maxCharge, old))
+            var old = battery.MaxCharge;
+            battery.MaxCharge = Math.Max(value, 0);
+            battery.CurrentCharge = Math.Min(battery.CurrentCharge, battery.MaxCharge);
+            if (MathHelper.CloseTo(battery.MaxCharge, old))
                 return;
 
-            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery._maxCharge);
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
         }
 
@@ -136,12 +136,12 @@ namespace Content.Server.Power.EntitySystems
             if (!Resolve(uid, ref battery))
                 return;
 
-            var old = battery.Charge;
-            battery.Charge = MathHelper.Clamp(value, 0, battery._maxCharge);
-            if (MathHelper.CloseTo(battery.Charge, old))
+            var old = battery.CurrentCharge;
+            battery.CurrentCharge = MathHelper.Clamp(value, 0, battery.MaxCharge);
+            if (MathHelper.CloseTo(battery.CurrentCharge, old))
                 return;
 
-            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery._maxCharge);
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
         }
 
@@ -150,7 +150,7 @@ namespace Content.Server.Power.EntitySystems
         /// </summary>
         public bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery = null)
         {
-            if (!Resolve(uid, ref battery, false) || value > battery.Charge)
+            if (!Resolve(uid, ref battery, false) || value > battery.CurrentCharge)
                 return false;
 
             UseCharge(uid, value, battery);

diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 6feba0d52a1bd94a3a1fb65da0745f3ebc2772e6..b6b718455d8f101d9545a76827a69666ce8c8e97 100644 (file)
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -17,6 +17,7 @@ internal sealed class ChargerSystem : EntitySystem
 {
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
@@ -201,11 +202,11 @@ internal sealed class ChargerSystem : EntitySystem
         if (!SearchForBattery(targetEntity, out var heldBattery))
             return;
 
-        heldBattery.CurrentCharge += component.ChargeRate * frameTime;
+        _battery.SetCharge(targetEntity, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
         // Just so the sprite won't be set to 99.99999% visibility
         if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01)
         {
-            heldBattery.CurrentCharge = heldBattery.MaxCharge;
+            _battery.SetCharge(targetEntity, heldBattery.MaxCharge, heldBattery);
         }
 
         UpdateStatus(uid, component);

diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs
index 775ca412d3e98448f9e6ad641ef57f897a99f65d..b73cf630690da084498dbcb1708d56acb8f7b484 100644 (file)
--- a/Content.Server/Power/SetBatteryPercentCommand.cs
+++ b/Content.Server/Power/SetBatteryPercentCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration;
 using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
@@ -39,7 +40,8 @@ namespace Content.Server.Power
                 shell.WriteLine($"No battery found with id {id}.");
                 return;
             }
-            battery.CurrentCharge = (battery.MaxCharge * percent) / 100;
+            var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<BatterySystem>();
+            system.SetCharge(id.Value, battery.MaxCharge * percent / 100, battery);
             // Don't acknowledge b/c people WILL forall this
         }
     }

diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs
index d501a1bda36d2a51fee0c870b56a24de9f19d293..d4c1faa4c9d190df5a2925f1a50459bb7ca36ea1 100644 (file)
--- a/Content.Server/PowerCell/PowerCellSystem.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.cs
@@ -179,7 +179,7 @@ public sealed partial class PowerCellSystem : SharedPowerCellSystem
             return false;
         }
 
-        _sharedAppearanceSystem.SetData(uid, PowerCellSlotVisuals.Enabled, battery.Charge > 0);
+        _sharedAppearanceSystem.SetData(uid, PowerCellSlotVisuals.Enabled, battery.CurrentCharge > 0);
         return true;
     }
 

diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index dddfd33967f8a8c6c3bdbef5cf794880f8c782e0..298e35db469cdd425412a8c2a5903ef5f79ea7c5 100644 (file)
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -7,6 +7,7 @@ using Content.Server.Station.Systems;
 using Robust.Shared.Timing;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Content.Server.Power.EntitySystems;
 
 namespace Content.Server.PowerSink
 {
@@ -31,6 +32,7 @@ namespace Content.Server.PowerSink
         [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StationSystem _station = default!;
+        [Dependency] private readonly BatterySystem _battery = default!;
 
         public override void Initialize()
         {
@@ -64,7 +66,7 @@ namespace Content.Server.PowerSink
                 if (!transform.Anchored)
                     continue;
 
-                battery.CurrentCharge += networkLoad.NetworkLoad.ReceivingPower / 1000;
+                _battery.SetCharge(entity, battery.CurrentCharge + networkLoad.NetworkLoad.ReceivingPower / 1000, battery);
 
                 var currentBatteryThreshold = battery.CurrentCharge / battery.MaxCharge;
 

diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index b5a0c645d3de8c9204cedc5e7f9499c03e07c470..e6a8701f2020190d125fd1895b8d148f635975f3 100644 (file)
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Popups;
+using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Server.Radio.Components;
 using Content.Shared.Examine;
@@ -10,6 +11,7 @@ namespace Content.Server.Radio.EntitySystems;
 public sealed class JammerSystem : EntitySystem
 {
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
@@ -29,7 +31,7 @@ public sealed class JammerSystem : EntitySystem
         while (query.MoveNext(out var uid, out var _, out var jam))
         {
             if (_powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
-                !battery.TryUseCharge(jam.Wattage * frameTime))
+                !_battery.TryUseCharge(uid, jam.Wattage * frameTime, battery))
             {
                 RemComp<ActiveRadioJammerComponent>(uid);
             }
@@ -38,7 +40,7 @@ public sealed class JammerSystem : EntitySystem
 
     private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorldEvent args)
     {
-        var activated = !HasComp<ActiveRadioJammerComponent>(uid) && 
+        var activated = !HasComp<ActiveRadioJammerComponent>(uid) &&
             _powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
             battery.CurrentCharge > comp.Wattage;
         if (activated)

diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
index eb2ab21075ce72451408e2fed7c7cb3760a0adc4..501b094c892455f85639733a837ed6bca852fb2f 100644 (file)
--- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs
+++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
@@ -31,7 +31,7 @@ public sealed class BatterySensorSystem : EntitySystem
                 {
                     [DeviceNetworkConstants.Command] = DeviceNetworkCommandSyncData,
                     [DeviceNetworkCommandSyncData] = new BatterySensorData(
-                        battery.Charge,
+                        battery.CurrentCharge,
                         battery.MaxCharge,
                         netBattery.CurrentReceiving,
                         netBattery.MaxChargeRate,

diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs b/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
index 8af682114c83feed1d7bf3f168078f35e42a3187..3dcdd78affaf85ea22c1e63b666696ea8e7a76dd 100644 (file)
--- a/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
@@ -107,7 +107,7 @@ public sealed partial class BorgSystem
         if (_powerCell.TryGetBatteryFromSlot(uid, out var battery))
         {
             hasBattery = true;
-            chargePercent = battery.Charge / battery.MaxCharge;
+            chargePercent = battery.CurrentCharge / battery.MaxCharge;
         }
 
         var state = new BorgBuiState(chargePercent, hasBattery);

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
index f4deffd113371c4518794236a1fdc1795409d782..25010b22333a32b8c8878ee385ac968c2384748c 100644 (file)
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
@@ -41,7 +41,7 @@ public sealed partial class GunSystem
         if (!TryComp<BatteryComponent>(uid, out var battery))
             return;
 
-        UpdateShots(uid, component, battery.Charge, battery.MaxCharge);
+        UpdateShots(uid, component, battery.CurrentCharge, battery.MaxCharge);
     }
 
     private void UpdateShots(EntityUid uid, BatteryAmmoProviderComponent component, float charge, float maxCharge)