Cleanup warnings in TypingIndicatorVisualizerSystem (#37427)

Cleanup warnings in TypingIndicatorVisualizerSystem
This commit is contained in:
Tayrtahn
2025-05-13 18:19:05 -04:00
committed by GitHub
parent 7ee0db0508
commit 75cbbbb5b7

View File

@@ -1,6 +1,5 @@
using Content.Shared.Chat.TypingIndicator; using Content.Shared.Chat.TypingIndicator;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Content.Shared.Inventory; using Content.Shared.Inventory;
@@ -10,7 +9,7 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
{ {
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args) protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args)
{ {
@@ -35,24 +34,24 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
return; return;
} }
var layerExists = args.Sprite.LayerMapTryGet(TypingIndicatorLayers.Base, out var layer); var layerExists = _sprite.LayerMapTryGet((uid, args.Sprite), TypingIndicatorLayers.Base, out var layer, false);
if (!layerExists) if (!layerExists)
layer = args.Sprite.LayerMapReserveBlank(TypingIndicatorLayers.Base); layer = _sprite.LayerMapReserve((uid, args.Sprite), TypingIndicatorLayers.Base);
args.Sprite.LayerSetRSI(layer, proto.SpritePath); _sprite.LayerSetRsi((uid, args.Sprite), layer, proto.SpritePath);
args.Sprite.LayerSetState(layer, proto.TypingState); _sprite.LayerSetRsiState((uid, args.Sprite), layer, proto.TypingState);
args.Sprite.LayerSetShader(layer, proto.Shader); args.Sprite.LayerSetShader(layer, proto.Shader);
args.Sprite.LayerSetOffset(layer, proto.Offset); _sprite.LayerSetOffset((uid, args.Sprite), layer, proto.Offset);
AppearanceSystem.TryGetData<TypingIndicatorState>(uid, TypingIndicatorVisuals.State, out var state); AppearanceSystem.TryGetData<TypingIndicatorState>(uid, TypingIndicatorVisuals.State, out var state);
args.Sprite.LayerSetVisible(layer, state != TypingIndicatorState.None); _sprite.LayerSetVisible((uid, args.Sprite), layer, state != TypingIndicatorState.None);
switch (state) switch (state)
{ {
case TypingIndicatorState.Idle: case TypingIndicatorState.Idle:
args.Sprite.LayerSetState(layer, proto.IdleState); _sprite.LayerSetRsiState((uid, args.Sprite), layer, proto.IdleState);
break; break;
case TypingIndicatorState.Typing: case TypingIndicatorState.Typing:
args.Sprite.LayerSetState(layer, proto.TypingState); _sprite.LayerSetRsiState((uid, args.Sprite), layer, proto.TypingState);
break; break;
} }
} }