Convert ItemCabinet to use a VisualizerSystem (#6571)

Content.Client/Cabinet/ItemCabinetSystem.cs

@@ -0,0 +1,25 @@
+using Content.Shared.Cabinet;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Cabinet;
+
+public sealed class ItemCabinetSystem : VisualizerSystem<ItemCabinetVisualsComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, ItemCabinetVisualsComponent component, ref AppearanceChangeEvent args)
+    {
+        if (TryComp(uid, out SpriteComponent? sprite)
+            && args.Component.TryGetData(ItemCabinetVisuals.IsOpen, out bool isOpen)
+            && args.Component.TryGetData(ItemCabinetVisuals.ContainsItem, out bool contains))
+        {
+            var state = isOpen ? component.OpenState : component.ClosedState;
+            sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
+            sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, contains);
+        }
+    }
+}
+
+public enum ItemCabinetVisualLayers
+{
+    Door,
+    ContainsItem
+}

Content.Client/Cabinet/ItemCabinetVisualizer.cs

@@ -1,41 +0,0 @@
-using Content.Shared.Cabinet;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Client.Cabinet
-{
-    [UsedImplicitly]
-    public class ItemCabinetVisualizer : AppearanceVisualizer
-    {
-        [DataField("openState", required: true)]
-        private string _openState = default!;
-
-        [DataField("closedState", required: true)]
-        private string _closedState = default!;
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            var entities = IoCManager.Resolve<IEntityManager>();
-            if (entities.TryGetComponent(component.Owner, out SpriteComponent sprite)
-                && component.TryGetData(ItemCabinetVisuals.IsOpen, out bool isOpen)
-                && component.TryGetData(ItemCabinetVisuals.ContainsItem, out bool contains))
-            {
-                var state = isOpen ? _openState : _closedState;
-                sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
-                sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, contains);
-            }
-        }
-    }
-
-    public enum ItemCabinetVisualLayers : byte
-    {
-        Door,
-        ContainsItem
-        //Welded
-    }
-}

Content.Client/Cabinet/ItemCabinetVisualsComponent.cs

@@ -0,0 +1,11 @@
+namespace Content.Client.Cabinet;
+
+[RegisterComponent]
+public sealed class ItemCabinetVisualsComponent : Component
+{
+    [DataField("openState", required: true)]
+    public string OpenState = default!;
+
+    [DataField("closedState", required: true)]
+    public string ClosedState = default!;
+}

Content.Client/Explosion/TriggerSystem.Proximity.cs

@@ -62,7 +62,7 @@ public sealed partial class TriggerSystem
         EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
     }
 
-    private void OnProxAppChange(EntityUid uid, TriggerOnProximityComponent component, AppearanceChangeEvent args)
+    private void OnProxAppChange(EntityUid uid, TriggerOnProximityComponent component, ref AppearanceChangeEvent args)
     {
         OnChangeData(uid, component, args.Component);
     }

Content.Server/Cabinet/ItemCabinetComponent.cs

@@ -1,8 +1,5 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Sound;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Cabinet
 {
@@ -10,7 +7,7 @@ namespace Content.Server.Cabinet
     ///     Used for entities that can be opened, closed, and can hold one item. E.g., fire extinguisher cabinets.
     /// </summary>
     [RegisterComponent]
-    public class ItemCabinetComponent : Component
+    public sealed class ItemCabinetComponent : Component
     {
         /// <summary>
         ///     Sound to be played when the cabinet door is opened.

Content.Server/Entry/IgnoredComponents.cs

@@ -15,7 +15,8 @@ namespace Content.Server.Entry
             "Clickable",
             "Icon",
             "ClientEntitySpawner",
-            "CharacterInfo"
+            "CharacterInfo",
+            "ItemCabinetVisuals"
         };
     }
 }

Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml

@@ -26,8 +26,7 @@
       doorSound:
         path: /Audio/Machines/machine_switch.ogg
     - type: Appearance
-      visuals:
+    - type: ItemCabinetVisuals
-        - type: ItemCabinetVisualizer
       openState: open
       closedState: closed
   placement:

Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml

@@ -24,10 +24,9 @@
       doorSound:
         path: /Audio/Machines/machine_switch.ogg
     - type: Appearance
-      visuals:
+    - type: ItemCabinetVisuals
-        - type: ItemCabinetVisualizer
-          closedState: glass
       openState: glass-up
+      closedState: glass
   placement:
     mode: SnapgridCenter