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
GitHub
@@ -2,6 +2,7 @@
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.Utility;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
|
||||
@@ -10,9 +11,13 @@ namespace Content.Client.GameObjects.Components.Atmos
|
||||
[UsedImplicitly]
|
||||
public class FireVisualizer : AppearanceVisualizer
|
||||
{
|
||||
[DataField("fireStackAlternateState")]
|
||||
private int _fireStackAlternateState = 3;
|
||||
[DataField("normalState")]
|
||||
private string _normalState;
|
||||
[DataField("alternateState")]
|
||||
private string _alternateState;
|
||||
[DataField("sprite")]
|
||||
private string _sprite;
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
@@ -25,31 +30,6 @@ namespace Content.Client.GameObjects.Components.Atmos
|
||||
sprite.LayerSetVisible(FireVisualLayers.Fire, false);
|
||||
}
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
{
|
||||
base.LoadData(node);
|
||||
|
||||
if (node.TryGetNode("sprite", out var sprite))
|
||||
{
|
||||
_sprite = sprite.AsString();
|
||||
}
|
||||
|
||||
if (node.TryGetNode("fireStackAlternateState", out var fireStack))
|
||||
{
|
||||
_fireStackAlternateState = fireStack.AsInt();
|
||||
}
|
||||
|
||||
if (node.TryGetNode("normalState", out var normalState))
|
||||
{
|
||||
_normalState = normalState.AsString();
|
||||
}
|
||||
|
||||
if (node.TryGetNode("alternateState", out var alternateState))
|
||||
{
|
||||
_alternateState = alternateState.AsString();
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnChangeData(AppearanceComponent component)
|
||||
{
|
||||
base.OnChangeData(component);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.Utility;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
|
||||
@@ -9,17 +10,11 @@ namespace Content.Client.GameObjects.Components.Atmos
|
||||
[UsedImplicitly]
|
||||
public class GasAnalyzerVisualizer : AppearanceVisualizer
|
||||
{
|
||||
[DataField("state_off")]
|
||||
private string _stateOff;
|
||||
[DataField("state_working")]
|
||||
private string _stateWorking;
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
{
|
||||
base.LoadData(node);
|
||||
|
||||
_stateOff = node.GetNode("state_off").AsString();
|
||||
_stateWorking = node.GetNode("state_working").AsString();
|
||||
}
|
||||
|
||||
public override void OnChangeData(AppearanceComponent component)
|
||||
{
|
||||
base.OnChangeData(component);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.Utility;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
|
||||
@@ -8,18 +9,11 @@ namespace Content.Client.GameObjects.Components.Atmos
|
||||
{
|
||||
public class GasCanisterVisualizer : AppearanceVisualizer
|
||||
{
|
||||
[DataField("stateConnected")]
|
||||
private string _stateConnected;
|
||||
[DataField("pressureStates")]
|
||||
private string[] _statePressure = new string[] {"", "", "", ""};
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
{
|
||||
base.LoadData(node);
|
||||
|
||||
_stateConnected = node.GetNode("stateConnected").AsString();
|
||||
for (int i = 0; i < _statePressure.Length; i++)
|
||||
_statePressure[i] = node.GetNode("stateO" + i).AsString();
|
||||
}
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
{
|
||||
base.InitializeEntity(entity);
|
||||
|
||||
@@ -3,22 +3,15 @@ using Content.Shared.GameObjects.Components.Atmos;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Serialization;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
namespace Content.Client.GameObjects.Components.Atmos.Piping
|
||||
{
|
||||
[UsedImplicitly]
|
||||
[DataDefinition]
|
||||
public class GasFilterVisualizer : AppearanceVisualizer
|
||||
{
|
||||
private string _filterEnabledState = default!;
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
{
|
||||
base.LoadData(node);
|
||||
var serializer = YamlObjectSerializer.NewReader(node);
|
||||
serializer.DataField(ref _filterEnabledState, "filterEnabledState", "gasFilterOn");
|
||||
}
|
||||
[DataField("filterEnabledState")] private string _filterEnabledState = "gasFilterOn";
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
{
|
||||
|
||||
@@ -9,26 +9,27 @@ using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Log;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
namespace Content.Client.GameObjects.Components.Atmos.Piping
|
||||
{
|
||||
[UsedImplicitly]
|
||||
public class PipeConnectorVisualizer : AppearanceVisualizer
|
||||
public class PipeConnectorVisualizer : AppearanceVisualizer, ISerializationHooks
|
||||
{
|
||||
private string _baseState = string.Empty;
|
||||
[DataField("rsi")]
|
||||
private string _rsi = "Constructible/Atmos/pipe.rsi";
|
||||
|
||||
[DataField("baseState")]
|
||||
private string _baseState = "pipeConnector";
|
||||
|
||||
private RSI? _connectorRsi;
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
void ISerializationHooks.AfterDeserialization()
|
||||
{
|
||||
base.LoadData(node);
|
||||
var serializer = YamlObjectSerializer.NewReader(node);
|
||||
|
||||
serializer.DataField(ref _baseState, "baseState", "pipeConnector");
|
||||
|
||||
var rsiString = SharedSpriteComponent.TextureRoot / serializer.ReadDataField("rsi", "Constructible/Atmos/pipe.rsi");
|
||||
var rsiString = SharedSpriteComponent.TextureRoot / _rsi;
|
||||
var resourceCache = IoCManager.Resolve<IResourceCache>();
|
||||
|
||||
if (resourceCache.TryGetResource(rsiString, out RSIResource? rsi))
|
||||
_connectorRsi = rsi.RSI;
|
||||
else
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
@@ -8,29 +9,29 @@ using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Log;
|
||||
using Robust.Shared.Serialization;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
namespace Content.Client.GameObjects.Components.Atmos.Piping
|
||||
{
|
||||
/// <summary>
|
||||
/// Sets the state of the sprite based on what shape of pipe it is.
|
||||
/// </summary>
|
||||
[UsedImplicitly]
|
||||
public class PipeVisualizer : AppearanceVisualizer
|
||||
[DataDefinition]
|
||||
public class PipeVisualizer : AppearanceVisualizer, ISerializationHooks
|
||||
{
|
||||
[DataField("rsi")] private string _rsiString = "Constructible/Atmos/pipe.rsi";
|
||||
private RSI? _pipeRSI;
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
void ISerializationHooks.AfterDeserialization()
|
||||
{
|
||||
base.LoadData(node);
|
||||
var serializer = YamlObjectSerializer.NewReader(node);
|
||||
|
||||
var rsiString = SharedSpriteComponent.TextureRoot / serializer.ReadDataField("rsi", "Constructible/Atmos/pipe.rsi");
|
||||
var rsiPath = SharedSpriteComponent.TextureRoot / _rsiString;
|
||||
var resourceCache = IoCManager.Resolve<IResourceCache>();
|
||||
if (resourceCache.TryGetResource(rsiString, out RSIResource? rsi))
|
||||
|
||||
if (resourceCache.TryGetResource(rsiPath, out RSIResource? rsi))
|
||||
{
|
||||
_pipeRSI = rsi.RSI;
|
||||
else
|
||||
Logger.Error($"{nameof(PipeVisualizer)} could not load to load RSI {rsiString}.");
|
||||
}
|
||||
}
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
|
||||
@@ -2,23 +2,15 @@ using Content.Shared.GameObjects.Components.Atmos;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Serialization;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
namespace Content.Client.GameObjects.Components.Atmos.Piping
|
||||
{
|
||||
[UsedImplicitly]
|
||||
[DataDefinition]
|
||||
public class PumpVisualizer : AppearanceVisualizer
|
||||
{
|
||||
private string _pumpEnabledState;
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
{
|
||||
base.LoadData(node);
|
||||
|
||||
var serializer = YamlObjectSerializer.NewReader(node);
|
||||
serializer.DataField(ref _pumpEnabledState, "pumpEnabledState", "pumpPressureOn");
|
||||
}
|
||||
[DataField("pumpEnabledState")] private string _pumpEnabledState = "pumpPressureOn";
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
{
|
||||
|
||||
@@ -1,24 +1,16 @@
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using Robust.Shared.GameObjects;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
namespace Content.Client.GameObjects.Components.Atmos.Piping
|
||||
{
|
||||
[UsedImplicitly]
|
||||
[DataDefinition]
|
||||
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");
|
||||
}
|
||||
[DataField("siphonOnState")] private string _siphonOnState = "scrubOn";
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
{
|
||||
|
||||
@@ -1,24 +1,16 @@
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Content.Shared.GameObjects.Components.Atmos;
|
||||
using Robust.Shared.GameObjects;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
namespace Content.Client.GameObjects.Components.Atmos.Piping
|
||||
{
|
||||
[UsedImplicitly]
|
||||
[DataDefinition]
|
||||
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");
|
||||
}
|
||||
[DataField("ventOnState")] private string _ventOnState = "ventOn";
|
||||
|
||||
public override void InitializeEntity(IEntity entity)
|
||||
{
|
||||
@@ -28,7 +20,7 @@ namespace Content.Client.GameObjects.Components.Atmos
|
||||
|
||||
sprite.LayerMapReserveBlank(Layer.VentEnabled);
|
||||
var layer = sprite.LayerMapGet(Layer.VentEnabled);
|
||||
sprite.LayerSetState(layer, _ventOnstate);
|
||||
sprite.LayerSetState(layer, _ventOnState);
|
||||
}
|
||||
|
||||
public override void OnChangeData(AppearanceComponent component)
|
||||
|
||||
@@ -4,40 +4,32 @@ using JetBrains.Annotations;
|
||||
using Robust.Client.Animations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Utility;
|
||||
using YamlDotNet.RepresentationModel;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Atmos
|
||||
{
|
||||
[UsedImplicitly]
|
||||
public class VaporVisualizer : AppearanceVisualizer
|
||||
public class VaporVisualizer : AppearanceVisualizer, ISerializationHooks
|
||||
{
|
||||
private const string AnimationKey = "flick_animation";
|
||||
|
||||
[DataField("animation_time")]
|
||||
private float _delay = 0.25f;
|
||||
|
||||
[DataField("animation_state")]
|
||||
private string _state = "chempuff";
|
||||
|
||||
private Animation VaporFlick;
|
||||
|
||||
public override void LoadData(YamlMappingNode node)
|
||||
void ISerializationHooks.AfterDeserialization()
|
||||
{
|
||||
base.LoadData(node);
|
||||
|
||||
var delay = 0.25f;
|
||||
var state = "chempuff";
|
||||
|
||||
if (node.TryGetNode("animation_time", out var delayNode))
|
||||
{
|
||||
delay = delayNode.AsFloat();
|
||||
}
|
||||
|
||||
if (node.TryGetNode("animation_state", out var stateNode))
|
||||
{
|
||||
state = stateNode.AsString();
|
||||
}
|
||||
|
||||
VaporFlick = new Animation {Length = TimeSpan.FromSeconds(delay)};
|
||||
VaporFlick = new Animation {Length = TimeSpan.FromSeconds(_delay)};
|
||||
{
|
||||
var flick = new AnimationTrackSpriteFlick();
|
||||
VaporFlick.AnimationTracks.Add(flick);
|
||||
flick.LayerKey = VaporVisualLayers.Base;
|
||||
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(state, 0f));
|
||||
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(_state, 0f));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user