Piping sprites cleanup (#3022)

* Moves piping visualizers to own folder

* Pump visualizer update

* Siphon and vent visualiser only set enabled visibility

* PipeVisualizer cleanup

* Replaces off vent/scrubber sprites

* Gas filter sprite update

* Revert "Gas filter sprite update"

This reverts commit 676e5d55e1157a229b1445eeea53a5c8032dbbb5.

* Rotates gas filter sprites to match T-junction pipe directions

* Removes pipes from scruber and vent state

* Makes sprite components use layers

* disabled sprite netsync on piping entities

* piping meta.json cleanup

Co-authored-by: py01 <pyronetics01@gmail.com>

Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs

@@ -5,7 +5,6 @@ using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs

@@ -10,6 +10,7 @@ using Robust.Shared.GameObjects.Components.Renderable;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
@@ -18,14 +19,18 @@ namespace Content.Client.GameObjects.Components.Atmos
     [UsedImplicitly]
     public class PipeVisualizer : AppearanceVisualizer
     {
+        private string _rsiString;
+
         private RSI _pipeRSI;
 
         public override void LoadData(YamlMappingNode node)
         {
             base.LoadData(node);
 
-            var rsiString = node.GetNode("pipeRSI").ToString();
-            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _rsiString, "rsiString", "Constructible/Atmos/pipe.rsi");
+
+            var rsiPath = SharedSpriteComponent.TextureRoot / _rsiString;
             try
             {
                 var resourceCache = IoCManager.Resolve<IResourceCache>();

Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs

@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Atmos;
+using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Utility;
+using Robust.Shared.Serialization;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos
@@ -16,7 +16,9 @@ namespace Content.Client.GameObjects.Components.Atmos
         public override void LoadData(YamlMappingNode node)
         {
             base.LoadData(node);
-            _pumpEnabledState = node.GetNode("pumpEnabledState").ToString();
+
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _pumpEnabledState, "pumpEnabledState", "pumpPressureOn");
         }
 
         public override void InitializeEntity(IEntity entity)

Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs

@@ -0,0 +1,51 @@
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Content.Shared.GameObjects.Components.Atmos;
+using YamlDotNet.RepresentationModel;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Client.GameObjects.Components.Atmos
+{
+    [UsedImplicitly]
+    public class SiphonVisualizer : AppearanceVisualizer
+    {
+        private string _siphonOnState;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _siphonOnState, "siphonOnState", "scrubOn");
+        }
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+
+            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
+
+            sprite.LayerMapReserveBlank(Layer.SiphonEnabled);
+            var layer = sprite.LayerMapGet(Layer.SiphonEnabled);
+            sprite.LayerSetState(layer, _siphonOnState);
+        }
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
+            if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return;
+
+            var layer = sprite.LayerMapGet(Layer.SiphonEnabled);
+            sprite.LayerSetVisible(layer, siphonVisualState.SiphonEnabled);
+        }
+
+        private enum Layer : byte
+        {
+            SiphonEnabled,
+        }
+    }
+}

Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs

@@ -0,0 +1,51 @@
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Content.Shared.GameObjects.Components.Atmos;
+using YamlDotNet.RepresentationModel;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Client.GameObjects.Components.Atmos
+{
+    [UsedImplicitly]
+    public class VentVisualizer : AppearanceVisualizer
+    {
+        private string _ventOnstate;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _ventOnstate, "ventOnState", "ventOn");
+        }
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+
+            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
+
+            sprite.LayerMapReserveBlank(Layer.VentEnabled);
+            var layer = sprite.LayerMapGet(Layer.VentEnabled);
+            sprite.LayerSetState(layer, _ventOnstate);
+        }
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
+            if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return;
+
+            var layer = sprite.LayerMapGet(Layer.VentEnabled);
+            sprite.LayerSetVisible(layer, ventVisualState.VentEnabled);
+        }
+
+        private enum Layer : byte
+        {
+            VentEnabled,
+        }
+    }
+}

Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs

@@ -1,72 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.GameObjects.Components.Renderable;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Utility;
-using System;
-using Content.Shared.GameObjects.Components.Atmos;
-using YamlDotNet.RepresentationModel;
-using Robust.Shared.Interfaces.GameObjects;
-
-namespace Content.Client.GameObjects.Components.Atmos
-{
-    [UsedImplicitly]
-    public class SiphonVisualizer : AppearanceVisualizer
-    {
-        private RSI _siphonRSI;
-
-        public override void LoadData(YamlMappingNode node)
-        {
-            base.LoadData(node);
-
-            var rsiString = node.GetNode("siphonRSI").ToString();
-            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
-            try
-            {
-                var resourceCache = IoCManager.Resolve<IResourceCache>();
-                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
-                _siphonRSI = resource.RSI;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorS("go.siphonvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
-            }
-        }
-
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
-            sprite.LayerMapReserveBlank(Layer.SiphonBase);
-            var pipeBaseLayer = sprite.LayerMapGet(Layer.SiphonBase);
-            sprite.LayerSetRSI(pipeBaseLayer, _siphonRSI);
-            sprite.LayerSetVisible(pipeBaseLayer, true);
-        }
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
-            if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return;
-
-            var siphonBaseState = "scrub";
-            siphonBaseState += siphonVisualState.SiphonEnabled ? "On" : "Off";
-
-            var baseSiphonLayer = sprite.LayerMapGet(Layer.SiphonBase);
-            sprite.LayerSetRSI(baseSiphonLayer, _siphonRSI);
-            sprite.LayerSetState(baseSiphonLayer, siphonBaseState);
-            sprite.LayerSetVisible(baseSiphonLayer, true);
-        }
-
-        private enum Layer : byte
-        {
-            SiphonBase,
-        }
-    }
-}

Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs

@@ -1,72 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.GameObjects.Components.Renderable;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Utility;
-using System;
-using Content.Shared.GameObjects.Components.Atmos;
-using YamlDotNet.RepresentationModel;
-using Robust.Shared.Interfaces.GameObjects;
-
-namespace Content.Client.GameObjects.Components.Atmos
-{
-    [UsedImplicitly]
-    public class VentVisualizer : AppearanceVisualizer
-    {
-        private RSI _ventRSI;
-
-        public override void LoadData(YamlMappingNode node)
-        {
-            base.LoadData(node);
-
-            var rsiString = node.GetNode("ventRSI").ToString();
-            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
-            try
-            {
-                var resourceCache = IoCManager.Resolve<IResourceCache>();
-                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
-                _ventRSI = resource.RSI;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorS("go.ventvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
-            }
-        }
-
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
-            sprite.LayerMapReserveBlank(Layer.VentBase);
-            var pipeBaseLayer = sprite.LayerMapGet(Layer.VentBase);
-            sprite.LayerSetRSI(pipeBaseLayer, _ventRSI);
-            sprite.LayerSetVisible(pipeBaseLayer, true);
-        }
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
-            if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return;
-
-            var ventBaseState = "vent";
-            ventBaseState += ventVisualState.VentEnabled ? "On" : "Off";
-
-            var baseVentLayer = sprite.LayerMapGet(Layer.VentBase);
-            sprite.LayerSetRSI(baseVentLayer, _ventRSI);
-            sprite.LayerSetState(baseVentLayer, ventBaseState);
-            sprite.LayerSetVisible(baseVentLayer, true);
-        }
-
-        private enum Layer : byte
-        {
-            VentBase,
-        }
-    }
-}