From ca6a625ca283e767e403e43778806f58df605942 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Mon, 12 May 2025 20:12:57 -0400 Subject: [PATCH] Cleanup warnings in `SmesSystem` (#37399) * Cleanup warnings in SmesSystem * Access modifier for SmesVisualLayers --- Content.Client/Power/SMES/SmesSystem.cs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Content.Client/Power/SMES/SmesSystem.cs b/Content.Client/Power/SMES/SmesSystem.cs index a555bedcac..ac4b51547e 100644 --- a/Content.Client/Power/SMES/SmesSystem.cs +++ b/Content.Client/Power/SMES/SmesSystem.cs @@ -6,6 +6,8 @@ namespace Content.Client.Power.SMES; public sealed class SmesVisualizerSystem : VisualizerSystem { + [Dependency] private readonly SpriteSystem _sprite = default!; + protected override void OnAppearanceChange(EntityUid uid, SmesComponent comp, ref AppearanceChangeEvent args) { if (args.Sprite == null) @@ -13,12 +15,12 @@ public sealed class SmesVisualizerSystem : VisualizerSystem if (!AppearanceSystem.TryGetData(uid, SmesVisuals.LastChargeLevel, out var level, args.Component) || level == 0) { - args.Sprite.LayerSetVisible(SmesVisualLayers.Charge, false); + _sprite.LayerSetVisible((uid, args.Sprite), SmesVisualLayers.Charge, false); } else { - args.Sprite.LayerSetVisible(SmesVisualLayers.Charge, true); - args.Sprite.LayerSetState(SmesVisualLayers.Charge, $"{comp.ChargeOverlayPrefix}{level}"); + _sprite.LayerSetVisible((uid, args.Sprite), SmesVisualLayers.Charge, true); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Charge, $"{comp.ChargeOverlayPrefix}{level}"); } if (!AppearanceSystem.TryGetData(uid, SmesVisuals.LastChargeState, out var state, args.Component)) @@ -27,22 +29,22 @@ public sealed class SmesVisualizerSystem : VisualizerSystem switch (state) { case ChargeState.Still: - args.Sprite.LayerSetState(SmesVisualLayers.Input, $"{comp.InputOverlayPrefix}0"); - args.Sprite.LayerSetState(SmesVisualLayers.Output, $"{comp.OutputOverlayPrefix}1"); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Input, $"{comp.InputOverlayPrefix}0"); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Output, $"{comp.OutputOverlayPrefix}1"); break; case ChargeState.Charging: - args.Sprite.LayerSetState(SmesVisualLayers.Input, $"{comp.InputOverlayPrefix}1"); - args.Sprite.LayerSetState(SmesVisualLayers.Output, $"{comp.OutputOverlayPrefix}1"); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Input, $"{comp.InputOverlayPrefix}1"); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Output, $"{comp.OutputOverlayPrefix}1"); break; case ChargeState.Discharging: - args.Sprite.LayerSetState(SmesVisualLayers.Input, $"{comp.InputOverlayPrefix}0"); - args.Sprite.LayerSetState(SmesVisualLayers.Output, $"{comp.OutputOverlayPrefix}2"); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Input, $"{comp.InputOverlayPrefix}0"); + _sprite.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Output, $"{comp.OutputOverlayPrefix}2"); break; } } } -enum SmesVisualLayers : byte +public enum SmesVisualLayers : byte { Input, Charge, -- 2.51.2