tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings in SolutionContainerVisualsSystem (#37377)

Browse Source 
Cleanup warnings in SolutionContainerVisualsSystem
This commit is contained in:
Tayrtahn
2025-05-12 16:25:28 -04:00
committed by GitHub
parent a464c5dd99
commit 411ea3827a
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
View File

@@ -16,6 +16,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
{ {
[Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly ItemSystem _itemSystem = default!; [Dependency] private readonly ItemSystem _itemSystem = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -49,7 +50,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
if (args.Sprite == null) if (args.Sprite == null)
return; return;
if (!args.Sprite.LayerMapTryGet(component.Layer, out var fillLayer)) if (!_sprite.LayerMapTryGet((uid, args.Sprite), component.Layer, out var fillLayer, false))
return; return;
var maxFillLevels = component.MaxFillLevels; var maxFillLevels = component.MaxFillLevels;
@@ -67,9 +68,9 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
} }
if (component.Metamorphic) if (component.Metamorphic)
{ {
if (args.Sprite.LayerMapTryGet(component.BaseLayer, out var baseLayer)) if (_sprite.LayerMapTryGet((uid, args.Sprite), component.BaseLayer, out var baseLayer, false))
{ {
var hasOverlay = args.Sprite.LayerMapTryGet(component.OverlayLayer, out var overlayLayer); var hasOverlay = _sprite.LayerMapTryGet((uid, args.Sprite), component.OverlayLayer, out var overlayLayer, false);
if (AppearanceSystem.TryGetData<string>(uid, SolutionContainerVisuals.BaseOverride, if (AppearanceSystem.TryGetData<string>(uid, SolutionContainerVisuals.BaseOverride,
out var baseOverride, out var baseOverride,
@@ -79,35 +80,35 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
if (reagentProto?.MetamorphicSprite is { } sprite) if (reagentProto?.MetamorphicSprite is { } sprite)
{ {
args.Sprite.LayerSetSprite(baseLayer, sprite); _sprite.LayerSetSprite((uid, args.Sprite), baseLayer, sprite);
if (reagentProto.MetamorphicMaxFillLevels > 0) if (reagentProto.MetamorphicMaxFillLevels > 0)
{ {
args.Sprite.LayerSetVisible(fillLayer, true); _sprite.LayerSetVisible((uid, args.Sprite), fillLayer, true);
maxFillLevels = reagentProto.MetamorphicMaxFillLevels; maxFillLevels = reagentProto.MetamorphicMaxFillLevels;
fillBaseName = reagentProto.MetamorphicFillBaseName; fillBaseName = reagentProto.MetamorphicFillBaseName;
changeColor = reagentProto.MetamorphicChangeColor; changeColor = reagentProto.MetamorphicChangeColor;
fillSprite = sprite; fillSprite = sprite;
} }
else else
args.Sprite.LayerSetVisible(fillLayer, false); _sprite.LayerSetVisible((uid, args.Sprite), fillLayer, false);
if (hasOverlay) if (hasOverlay)
args.Sprite.LayerSetVisible(overlayLayer, false); _sprite.LayerSetVisible((uid, args.Sprite), overlayLayer, false);
} }
else else
{ {
args.Sprite.LayerSetVisible(fillLayer, true); _sprite.LayerSetVisible((uid, args.Sprite), fillLayer, true);
if (hasOverlay) if (hasOverlay)
args.Sprite.LayerSetVisible(overlayLayer, true); _sprite.LayerSetVisible((uid, args.Sprite), overlayLayer, true);
if (component.MetamorphicDefaultSprite != null) if (component.MetamorphicDefaultSprite != null)
args.Sprite.LayerSetSprite(baseLayer, component.MetamorphicDefaultSprite); _sprite.LayerSetSprite((uid, args.Sprite), baseLayer, component.MetamorphicDefaultSprite);
} }
} }
} }
} }
else else
{ {
args.Sprite.LayerSetVisible(fillLayer, true); _sprite.LayerSetVisible((uid, args.Sprite), fillLayer, true);
} }
var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, maxFillLevels + 1); var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, maxFillLevels + 1);
@@ -119,25 +120,25 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
var stateName = fillBaseName + closestFillSprite; var stateName = fillBaseName + closestFillSprite;
if (fillSprite != null) if (fillSprite != null)
args.Sprite.LayerSetSprite(fillLayer, fillSprite); _sprite.LayerSetSprite((uid, args.Sprite), fillLayer, fillSprite);
args.Sprite.LayerSetState(fillLayer, stateName); _sprite.LayerSetRsiState((uid, args.Sprite), fillLayer, stateName);
if (changeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, args.Component)) if (changeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, args.Component))
args.Sprite.LayerSetColor(fillLayer, color); _sprite.LayerSetColor((uid, args.Sprite), fillLayer, color);
else else
args.Sprite.LayerSetColor(fillLayer, Color.White); _sprite.LayerSetColor((uid, args.Sprite), fillLayer, Color.White);
} }
else else
{ {
if (component.EmptySpriteName == null) if (component.EmptySpriteName == null)
args.Sprite.LayerSetVisible(fillLayer, false); _sprite.LayerSetVisible((uid, args.Sprite), fillLayer, false);
else else
{ {
args.Sprite.LayerSetState(fillLayer, component.EmptySpriteName); _sprite.LayerSetRsiState((uid, args.Sprite), fillLayer, component.EmptySpriteName);
if (changeColor) if (changeColor)
args.Sprite.LayerSetColor(fillLayer, component.EmptySpriteColor); _sprite.LayerSetColor((uid, args.Sprite), fillLayer, component.EmptySpriteColor);
else else
args.Sprite.LayerSetColor(fillLayer, Color.White); _sprite.LayerSetColor((uid, args.Sprite), fillLayer, Color.White);
} }
} }