Serializer improvement and cleanup (space-wizards#6674)

Co-authored-by: deltanedas <@deltanedas:goida.zip>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

Author: deltanedas

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
     <!-- This file automatically reset by Tools/version.py -->
-    <PropertyGroup><Version>283.1.0</Version></PropertyGroup>
+    <PropertyGroup><Version>283.1.0</Version></PropertyGroup>
 </Project>

Robust.Server/GameObjects/EntitySystems/PointLightSystem.cs

@@ -120,7 +120,7 @@ private bool IsContainerOrParentOccluder(BaseContainer container)
     {
         if (container.OccludesLight)
             return true;
-        
+
         if (!_container.TryGetContainingContainer(container.Owner, out var nextContainer))
             return false;
 

Robust.Shared.IntegrationTests/Serialization/SerializationTests/ManagerTests.Resources.cs

@@ -20,12 +20,15 @@ internal sealed partial class ManagerTests : ISerializationContext
     private static ValueDataNode SerializerRanDataNode => new ("SerializerRan");
     private static ValueDataNode SerializerRanCustomDataNode => new ("SerializerRanCustom");
 
-    public SerializationManager.SerializerProvider SerializerProvider { get; } = new();
+    public SerializationManager.SerializerProvider SerializerProvider { get; private set; }
     public bool WritingReadingPrototypes { get; }
 
     [OneTimeSetUp]
     public void SetupSerializerProvider()
     {
+        var ser = IoCManager.Resolve<ISerializationManager>();
+        SerializerProvider = new(ser);
+
         SerializerProvider.RegisterSerializer<CustomTypeSerializerStruct>();
         SerializerProvider.RegisterSerializer<CustomTypeSerializerClass>();
     }

Robust.Shared/Audio/SoundSpecifier.cs

@@ -24,7 +24,7 @@ public sealed partial class SoundPathSpecifier : SoundSpecifier
 {
     public const string Node = "path";
 
-    [DataField(Node, customTypeSerializer: typeof(ResPathSerializer), required: true)]
+    [DataField(Node, required: true)]
     public ResPath Path { get; private set; }
 
     override public string ToString() =>
@@ -52,8 +52,8 @@ public sealed partial class SoundCollectionSpecifier : SoundSpecifier
 {
     public const string Node = "collection";
 
-    [DataField(Node, customTypeSerializer: typeof(PrototypeIdSerializer<SoundCollectionPrototype>), required: true)]
-    public string? Collection { get; private set; }
+    [DataField(Node, required: true)]
+    public ProtoId<SoundCollectionPrototype>? Collection { get; private set; }
 
     override public string ToString() =>
         $"SoundCollectionSpecifier({Collection})";

Robust.Shared/EntitySerialization/EntityDeserializer.cs

@@ -42,7 +42,7 @@ public sealed partial class EntityDeserializer :
 
     public const int NewestSupportedVersion = EntitySerializer.MapFormatVersion;
 
-    public SerializationManager.SerializerProvider SerializerProvider { get; } = new();
+    public SerializationManager.SerializerProvider SerializerProvider { get; }
 
     [Dependency] public EntityManager EntMan = default!;
     [Dependency] public IGameTiming Timing = default!;
@@ -126,6 +126,7 @@ public EntityDeserializer(
         deps.InjectDependencies(this);
         _log = _logMan.GetSawmill("entity_deserializer");
         _log.Level = LogLevel.Info;
+        SerializerProvider = new(_seriMan);
         SerializerProvider.RegisterSerializer(this);
         Data = data;
         Options = options;

Robust.Shared/EntitySerialization/EntitySerializer.cs

@@ -48,7 +48,7 @@ public sealed partial class EntitySerializer : ISerializationContext,
     // v3->v4: PR #3913 - Grouped entities by prototype
     // v2->v3: PR #3468
 
-    public SerializationManager.SerializerProvider SerializerProvider { get; } = new();
+    public SerializationManager.SerializerProvider SerializerProvider { get; }
 
     [Dependency] public EntityManager EntMan = default!;
     [Dependency] public IGameTiming Timing = default!;
@@ -167,6 +167,7 @@ public EntitySerializer(IDependencyCollection dependency, SerializationOptions o
         dependency.InjectDependencies(this);
 
         _log = _logMan.GetSawmill("entity_serializer");
+        SerializerProvider = new(_serialization);
         SerializerProvider.RegisterSerializer(this);
 
         _metaName = _factory.GetComponentName<MetaDataComponent>();

Robust.Shared/GameObjects/EntityManager.cs

@@ -78,7 +78,7 @@ public abstract partial class EntityManager : IEntityManager
         private Histogram.Child? _queuedDeletionHistogram;
         private Histogram.Child? _componentCullHistogram;
 
-        private EntityDiffContext _context = new();
+        private EntityDiffContext _context;
 
         /// <summary>
         ///     All entities currently stored in the manager.
@@ -139,6 +139,7 @@ public abstract partial class EntityManager : IEntityManager
         /// </summary>
         public EntityManager()
         {
+            _context = new(_serManager);
         }
 
         public virtual void Initialize()

Robust.Shared/Prototypes/IPrototypeManager.cs

@@ -434,7 +434,8 @@ Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResPath path,
     /// This will validate all known to <see cref="IReflectionManager"/>
     /// </summary>
     /// <remarks>
-    /// This will validate any field that has either a <see cref="ValidatePrototypeIdAttribute{T}"/> attribute, or a
+    /// This will validate any field that uses <see cref="ProtoId"/> or <see cref="EntProtoId"/>.
+    /// It also looks for these obsolete attributes: either a <see cref="ValidatePrototypeIdAttribute{T}"/> attribute, or a
     /// <see cref="DataFieldAttribute"/> with a <see cref="PrototypeIdSerializer{TPrototype}"/> serializer.
     /// </remarks>
     /// <param name="prototypes">A collection prototypes to use for validation. Any prototype not in this collection

Robust.Shared/Prototypes/PrototypeManager.YamlValidate.cs

@@ -84,7 +84,7 @@ public Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResPath path,
             }
         }
 
-        var ctx = new YamlValidationContext();
+        var ctx = new YamlValidationContext(_serializationManager);
         var errors = new List<ErrorNode>();
         foreach (var (type, instances) in prototypes)
         {

Robust.Shared/Prototypes/YamlValidationContext.cs

@@ -17,11 +17,12 @@ internal sealed class YamlValidationContext :
     ITypeSerializer<NetEntity, ValueDataNode>,
     ITypeSerializer<MapId, ValueDataNode>
 {
-    public SerializationManager.SerializerProvider SerializerProvider { get; } = new();
+    public SerializationManager.SerializerProvider SerializerProvider { get; }
     public bool WritingReadingPrototypes => true;
 
-    public YamlValidationContext()
+    public YamlValidationContext(ISerializationManager ser)
     {
+        SerializerProvider = new(ser);
         SerializerProvider.RegisterSerializer(this);
     }