Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Serv3 rework content changes (#7145)

Browse Source
This commit is contained in:
Paul Ritter
2022-04-03 02:01:22 +02:00
committed by GitHub
parent 6b01ab17a6
commit 2ff40d5a1f
133 changed files with 476 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Shared.Construction.Prototypes
private readonly Dictionary<string, Dictionary<ConstructionGraphNode, ConstructionGraphNode?>> _pathfinding = new();
[ViewVariables]
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
[ViewVariables]

2
Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Shared.Construction.Prototypes
[DataField("objectType")] public ConstructionType Type { get; private set; } = ConstructionType.Structure;
[ViewVariables]
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
[DataField("placementMode")]

7
Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
View File

@@ -2,7 +2,6 @@
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.Manager.Result;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Validation;
using Robust.Shared.Serialization.TypeSerializers.Interfaces;
@@ -47,17 +46,17 @@ namespace Content.Shared.Construction.Steps
return null;
}
public DeserializationResult Read(ISerializationManager serializationManager,
public ConstructionGraphStep Read(ISerializationManager serializationManager,
MappingDataNode node,
IDependencyCollection dependencies,
bool skipHook,
ISerializationContext? context = null)
ISerializationContext? context = null, ConstructionGraphStep? _ = null)
{
var type = GetType(node) ??
throw new ArgumentException(
"Tried to convert invalid YAML node mapping to ConstructionGraphStep!");
return serializationManager.Read(type, node, context, skipHook);
return (ConstructionGraphStep)serializationManager.Read(type, node, context, skipHook)!;
}
public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node,