Serialization v3 content PR (#3491)
* serv3 in shared pt 1 * beginning of deepclone api * progress in implementing ideepclone & serv3 in content * adds target * its cant hurt you it cant hurt you * more changes to content.server * adds dataclasses * almost there * renamed & edited entry * finishes refactoring content to use serv3 * gasmixture runtimes, next: reagentunit * fucin hell that was an annoying one * adds flags * fixes some yaml errors * removes comment * fixes generic components for now * removes todo actually clones values my god paul fixes bug involving resolving custom data classes from other proj renames dataclass fixes spritecomp adds WithFormat.Constants support * adds deepclone to ResistanceSet * adds a bunch of deepclone implementations adds a deepclone analyzer (TODO) adds a deep clone fallback for classes & structs * fixes a bunch of runtimes * adds deepclone to entityuid * adds generator to sln * gets rid of warnings * fixes * argh * componentdata refactors * more deepclone impl * heck me i reworked all of content deepclone * renames custom dataclasstarget * misc * reworks prototypes * deepclone nuke * renamed customdataclass attribute * fixes everything * misc fixed * the killcommit * getting there * changed yamlfieldattribute namespace * adds back iselfserialize * renames everything to data(field/definition) * ouch * Fix most errors on content * Fix more errors in content * Fix some components * work on tests * fixes some customdataclasses * fuggin shit * yes * yeas * Remove data classes * Data field naming fixes * arg * Git resetti RobustToolbox * Merge fixes * General fixes * Fix startup serialization errors * Fix DamageContainerPrototype when supported classes or types are null * Implement construction graph step type serializer * Fix up construction serialization * Fix up construction serialization part 2 * Fix null list in technology database component * Fix body serialization * Fix entity storage serialization * Fix actions serialization * Fix AI serialization * Fix reaction serialization * Fix body serialization * Fix grid atmosphere serialization * Rename IServ3Manager to ISerializationManager * Convert every non generic serializer to the new format, general fixes * Serialization and body system fix * pushinheritance fix * Update all prototypes to have a parent and have consistent id/parent properties * Merge fixes * smh my head * cuddling slaps * Content commit for engine PR * stuff * more fixes * argh * yes even you are fixed * changelog fixes * fixes seeds * argh * Test fixes * Add writing for alert order prototype * Fix alert order writing * FIX * its been alot ok * Fix the rest of the visualizers * Fix server alerts component tests * Fix alert prototype tests not using the read value * Fix alert prototype tests initializing serialization multiple times * THIS IS AN AMERICAN CODEBASE GOD BLESS THE USA * Add ImplicitDataDefinitionForInheritors to IMechanismBehavior Fixes the behaviors not being found * Fix NRE in strap component Good night to the 1 buckle optimization * Fix clothing component slot flags serialization tag * Fix body component in all components test * Merge fixes * ffs * Make construction graph prototype use serialization hooks * human yaml linted * a * Do the thing for construction * stuff * a * monke see yaml linter * LINT HARDER * Remove redundant todo * yes * Add skip hook argument to readers and copiers * we gamin * test/datafield fixes * adds more verbose validation * moves linter to action * Improve construction graph step type serializer error message * Fix ammo box component NRE * gamin * some updates to the linter * yes * removes that test * misc fixes * array fix priority fix misc fixes * adds proper info the validation * adds alwaysrelevant usa * Make yaml linter take half as long to run (~50% less) * Make yaml linter 5 times faster (~80% less execution time) * based vera being based * fixes mapsaving * warning cleanup & moves surpressor * removes old msbuild targets * Revert "Make yaml linter 5 times faster (~80% less execution time)" This reverts commit 3e6091359a26252c3e98828199553de668031c63. * Add -nowarn to yaml linter run configuration * Improve yaml linter message feedback * Make dependencies an argument instead of a property on the serialization manager * yamllinting slaps * Clean up type serializers * Move yaml linter code to its own method * Fix yaml errors * Change yaml linter action name and remove -nowarn * yaml linter please shut * Git resetti robust toolbox Co-authored-by: Paul <ritter.paul1+git@googlemail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Paul Ritter
@@ -1,23 +1,26 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Shared.Interfaces;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Utility;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.ViewVariables;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
|
||||
namespace Content.Shared.Construction
|
||||
{
|
||||
[Serializable]
|
||||
public class ConstructionGraphEdge : IExposeData
|
||||
[DataDefinition]
|
||||
public class ConstructionGraphEdge
|
||||
{
|
||||
[DataField("steps")]
|
||||
private List<ConstructionGraphStep> _steps = new();
|
||||
|
||||
[DataField("conditions", serverOnly: true)]
|
||||
private List<IEdgeCondition> _conditions = new();
|
||||
|
||||
[DataField("completed", serverOnly: true)]
|
||||
private List<IGraphAction> _completed = new();
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("to")]
|
||||
public string Target { get; private set; } = string.Empty;
|
||||
|
||||
[ViewVariables]
|
||||
@@ -28,91 +31,5 @@ namespace Content.Shared.Construction
|
||||
|
||||
[ViewVariables]
|
||||
public IReadOnlyList<ConstructionGraphStep> Steps => _steps;
|
||||
|
||||
void IExposeData.ExposeData(ObjectSerializer serializer)
|
||||
{
|
||||
InternalExposeData(serializer);
|
||||
}
|
||||
|
||||
private void InternalExposeData(ObjectSerializer serializer)
|
||||
{
|
||||
var moduleManager = IoCManager.Resolve<IModuleManager>();
|
||||
|
||||
serializer.DataField(this, x => x.Target, "to", string.Empty);
|
||||
if (!moduleManager.IsServerModule) return;
|
||||
serializer.DataField(ref _conditions, "conditions", new List<IEdgeCondition>());
|
||||
serializer.DataField(ref _completed, "completed", new List<IGraphAction>());
|
||||
}
|
||||
|
||||
public void LoadFrom(YamlMappingNode mapping)
|
||||
{
|
||||
var serializer = YamlObjectSerializer.NewReader(mapping);
|
||||
InternalExposeData(serializer);
|
||||
|
||||
if (!mapping.TryGetNode("steps", out YamlSequenceNode? stepsMapping)) return;
|
||||
|
||||
foreach (var yamlNode in stepsMapping)
|
||||
{
|
||||
var stepMapping = (YamlMappingNode) yamlNode;
|
||||
_steps.Add(LoadStep(stepMapping));
|
||||
}
|
||||
}
|
||||
|
||||
public static ConstructionGraphStep LoadStep(YamlMappingNode mapping)
|
||||
{
|
||||
var stepSerializer = YamlObjectSerializer.NewReader(mapping);
|
||||
|
||||
if (mapping.TryGetNode("material", out _))
|
||||
{
|
||||
var material = new MaterialConstructionGraphStep();
|
||||
material.ExposeData(stepSerializer);
|
||||
return material;
|
||||
}
|
||||
|
||||
if (mapping.TryGetNode("tool", out _))
|
||||
{
|
||||
var tool = new ToolConstructionGraphStep();
|
||||
tool.ExposeData(stepSerializer);
|
||||
return tool;
|
||||
}
|
||||
|
||||
if (mapping.TryGetNode("prototype", out _))
|
||||
{
|
||||
var prototype = new PrototypeConstructionGraphStep();
|
||||
prototype.ExposeData(stepSerializer);
|
||||
return prototype;
|
||||
}
|
||||
|
||||
if (mapping.TryGetNode("component", out _))
|
||||
{
|
||||
var component = new ComponentConstructionGraphStep();
|
||||
component.ExposeData(stepSerializer);
|
||||
return component;
|
||||
}
|
||||
|
||||
if (mapping.TryGetNode("tag", out _))
|
||||
{
|
||||
var tags = new TagConstructionGraphStep();
|
||||
tags.ExposeData(stepSerializer);
|
||||
return tags;
|
||||
}
|
||||
|
||||
if (mapping.TryGetNode("allTags", out _) || mapping.TryGetNode("anyTags", out _))
|
||||
{
|
||||
var tags = new MultipleTagsConstructionGraphStep();
|
||||
tags.ExposeData(stepSerializer);
|
||||
return tags;
|
||||
}
|
||||
|
||||
if(mapping.TryGetNode("steps", out _))
|
||||
{
|
||||
var nested = new NestedConstructionGraphStep();
|
||||
nested.ExposeData(stepSerializer);
|
||||
nested.LoadFrom(mapping);
|
||||
return nested;
|
||||
}
|
||||
|
||||
throw new ArgumentException("Tried to convert invalid YAML node mapping to ConstructionGraphStep!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user