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/Decals/ColorPalettePrototype.cs
View File

@@ -5,7 +5,7 @@ namespace Content.Shared.Decals;
[Prototype("palette")]
public sealed class ColorPalettePrototype : IPrototype
{
[DataField("id")] public string ID { get; } = null!;
[IdDataFieldAttribute] public string ID { get; } = null!;
[DataField("name")] public string Name { get; } = null!;
[DataField("colors")] public Dictionary<string, Color> Colors { get; } = null!;
}

12
Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
View File

@@ -3,7 +3,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.Manager.Result;
using Robust.Shared.Serialization.Markdown;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Validation;
@@ -20,12 +19,10 @@ namespace Content.Shared.Decals
return serializationManager.ValidateNode<Dictionary<Vector2i, Dictionary<uint, Decal>>>(node, context);
}
public DeserializationResult Read(ISerializationManager serializationManager, MappingDataNode node,
IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null)
public DecalGridComponent.DecalGridChunkCollection Read(ISerializationManager serializationManager, MappingDataNode node,
IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, DecalGridComponent.DecalGridChunkCollection? _ = null)
{
//todo this read method does not support pushing inheritance
var dictionary =
serializationManager.ReadValueOrThrow<Dictionary<Vector2i, Dictionary<uint, Decal>>>(node, context, skipHook);
var dictionary = serializationManager.Read<Dictionary<Vector2i, Dictionary<uint, Decal>>>(node, context, skipHook: skipHook);
var uids = new SortedSet<uint>();
var uidChunkMap = new Dictionary<uint, Vector2i>();
@@ -54,8 +51,7 @@ namespace Content.Shared.Decals
newDict[indices][newUid] = dictionary[indices][oldUid];
}
return new DeserializedValue<DecalGridComponent.DecalGridChunkCollection>(
new DecalGridComponent.DecalGridChunkCollection(newDict){NextUid = nextIndex});
return new DecalGridComponent.DecalGridChunkCollection(newDict){NextUid = nextIndex};
}
public DataNode Write(ISerializationManager serializationManager, DecalGridComponent.DecalGridChunkCollection value, bool alwaysWrite = false,

2
Content.Shared/Decals/DecalPrototype.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Shared.Decals
[Prototype("decal")]
public sealed class DecalPrototype : IPrototype
{
[DataField("id")] public string ID { get; } = null!;
[IdDataFieldAttribute] public string ID { get; } = null!;
[DataField("sprite")] public SpriteSpecifier Sprite { get; } = SpriteSpecifier.Invalid;
[DataField("tags")] public List<string> Tags = new();
}