Use SharedAppearanceSystem

Simple-Station · Nov 16, 2024 · e2f3a84 · e2f3a84
1 parent 93b2242
commit e2f3a84
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -16,6 +16,7 @@ public sealed class ExplosionOverlay : Overlay
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
@@ -41,7 +42,7 @@ protected override void Draw(in OverlayDrawArgs args)
             if (visuals.Epicenter.MapId != args.MapId)
                 continue;
 
-            if (!appearance.TryGetData(ExplosionAppearanceData.Progress, out int index))
+            if (!_appearanceSystem.TryGetData(appearance.Owner, ExplosionAppearanceData.Progress, out int index))
                 continue;
 
             index = Math.Min(index, visuals.Intensity.Count - 1);

diff --git a/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs b/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs
@@ -11,6 +11,7 @@ namespace Content.Client.Kitchen.Visualizers
 {
     public sealed class DeepFriedVisualizerSystem : VisualizerSystem<DeepFriedComponent>
     {
+        [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
         private readonly static string ShaderName = "Crispy";
 
         public override void Initialize()
@@ -26,7 +27,7 @@ protected override void OnAppearanceChange(EntityUid uid, DeepFriedComponent com
             if (args.Sprite == null)
                 return;
 
-            if (!args.Component.TryGetData(DeepFriedVisuals.Fried, out bool isFried))
+            if (!_appearanceSystem.TryGetData(uid, DeepFriedVisuals.Fried, out bool isFried))
                 return;
 
             for (var i = 0; i < args.Sprite.AllLayers.Count(); ++i)

diff --git a/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs b/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs
@@ -9,9 +9,11 @@ namespace Content.Client.Kitchen.Visualizers
 {
     public sealed class DeepFryerVisualizerSystem : VisualizerSystem<DeepFryerComponent>
     {
+        [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
+
         protected override void OnAppearanceChange(EntityUid uid, DeepFryerComponent component, ref AppearanceChangeEvent args)
         {
-            if (!args.Component.TryGetData(DeepFryerVisuals.Bubbling, out bool isBubbling) ||
+            if (!_appearanceSystem.TryGetData(uid, DeepFryerVisuals.Bubbling, out bool isBubbling) ||
                 !TryComp<SolutionContainerVisualsComponent>(uid, out var scvComponent))
             {
                 return;

diff --git a/Content.Client/Nyanotrasen/Mail/MailSystem.cs b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
@@ -28,13 +28,14 @@ public sealed class MailJobVisualizerSystem : VisualizerSystem<MailComponent>
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SpriteSystem _stateManager = default!;
     [Dependency] private readonly SpriteSystem _spriteSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
 
     protected override void OnAppearanceChange(EntityUid uid, MailComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        args.Component.TryGetData(MailVisuals.JobIcon, out string job);
+        _appearanceSystem.TryGetData(uid, MailVisuals.JobIcon, out string job);
 
         if (string.IsNullOrEmpty(job))
             job = "JobIconUnknown";