Resolves TabletopItemVisualizer is Obsolete (#13911)

Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs

@@ -1,35 +0,0 @@
-using Content.Shared.Tabletop;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-
-namespace Content.Client.Tabletop.Visualizers
-{
-    [UsedImplicitly]
-    public sealed class TabletopItemVisualizer : AppearanceVisualizer
-    {
-        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
-        public override void OnChangeData(AppearanceComponent appearance)
-        {
-            var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent<SpriteComponent>(appearance.Owner, out var sprite))
-            {
-                return;
-            }
-
-            // TODO: maybe this can work more nicely, by maybe only having to set the item to "being dragged", and have
-            //  the appearance handle the rest
-            if (appearance.TryGetData<Vector2>(TabletopItemVisuals.Scale, out var scale))
-            {
-                sprite.Scale = scale;
-            }
-
-            if (appearance.TryGetData<int>(TabletopItemVisuals.DrawDepth, out var drawDepth))
-            {
-                sprite.DrawDepth = drawDepth;
-            }
-        }
-    }
-}

Content.Client/Tabletop/Visualizers/TabletopItemVisualizerComponent.cs

@@ -0,0 +1,5 @@
+namespace Content.Client.Tabletop.Visualizers;
+
+[RegisterComponent]
+public sealed class TabletopItemVisualizerComponent : Component
+{}

Content.Client/Tabletop/Visualizers/TabletopItemVisualizerSystem.cs

@@ -0,0 +1,25 @@
+using Content.Shared.Tabletop;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Tabletop.Visualizers;
+
+public sealed class TabletopItemVisualizerSystem : VisualizerSystem<TabletopItemVisualizerComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, TabletopItemVisualizerComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+
+        // TODO: maybe this can work more nicely, by maybe only having to set the item to "being dragged", and have
+        //  the appearance handle the rest
+        if (AppearanceSystem.TryGetData<Vector2>(uid, TabletopItemVisuals.Scale, out var scale, args.Component))
+        {
+            args.Sprite.Scale = scale;
+        }
+
+        if (AppearanceSystem.TryGetData<int>(uid, TabletopItemVisuals.DrawDepth, out var drawDepth, args.Component))
+        {
+            args.Sprite.DrawDepth = drawDepth;
+        }
+    }
+}

Content.Server/Entry/IgnoredComponents.cs

@@ -20,6 +20,7 @@ namespace Content.Server.Entry
             "PuddleVisualizer",
             "UIFragment",
             "PDABorderColor",
+            "TabletopItemVisualizer",
         };
     }
 }

Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml

@@ -35,8 +35,7 @@
     netsync: false
     noRot: true
   - type: Appearance
-    visuals:
+  - type: TabletopItemVisualizer
-    - type: TabletopItemVisualizer
 
 # The pieces
 - type: entity

Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml

@@ -36,8 +36,7 @@
     netsync: false
     noRot: true
   - type: Appearance
-    visuals:
+  - type: TabletopItemVisualizer
-    - type: TabletopItemVisualizer
 
 # White pieces
 - type: entity

Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml

@@ -9,8 +9,7 @@
     noRot: true
     sprite: Objects/Fun/Tabletop/generic_pieces.rsi
   - type: Appearance
-    visuals:
+  - type: TabletopItemVisualizer
-      - type: TabletopItemVisualizer
 
 - type: entity
   id: RedTabletopPiece