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

Fix warnings and code cleanup/fixes (#13570)

Browse Source
This commit is contained in:
Visne
2023-01-19 03:56:45 +01:00
committed by GitHub
parent 3ca5a0224b
commit c6d3e4f3bd
265 changed files with 499 additions and 666 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
{
[IdDataFieldAttribute] public string ID { get; } = null!;
[IdDataField] public string ID { get; } = null!;
[DataField("name")] public string Name { get; } = null!;
[DataField("colors")] public Dictionary<string, Color> Colors { get; } = null!;
}

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

@@ -9,7 +9,7 @@ using static Content.Shared.Decals.DecalGridComponent;
namespace Content.Shared.Decals
{
[TypeSerializer]
public sealed class DecalGridChunkCollectionTypeSerializer : ITypeSerializer<DecalGridComponent.DecalGridChunkCollection, MappingDataNode>
public sealed class DecalGridChunkCollectionTypeSerializer : ITypeSerializer<DecalGridChunkCollection, MappingDataNode>
{
public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node,
IDependencyCollection dependencies, ISerializationContext? context = null)
@@ -17,10 +17,10 @@ namespace Content.Shared.Decals
return serializationManager.ValidateNode<Dictionary<Vector2i, Dictionary<uint, Decal>>>(node, context);
}
public DecalGridComponent.DecalGridChunkCollection Read(ISerializationManager serializationManager,
public DecalGridChunkCollection Read(ISerializationManager serializationManager,
MappingDataNode node,
IDependencyCollection dependencies, SerializationHookContext hookCtx, ISerializationContext? context = null,
ISerializationManager.InstantiationDelegate<DecalGridComponent.DecalGridChunkCollection>? _ = default)
ISerializationManager.InstantiationDelegate<DecalGridChunkCollection>? _ = default)
{
var dictionary = serializationManager.Read<Dictionary<Vector2i, DecalChunk>>(node, hookCtx, context, notNullableOverride: true);
@@ -51,11 +51,11 @@ namespace Content.Shared.Decals
newDict[indices].Decals[newUid] = dictionary[indices].Decals[oldUid];
}
return new DecalGridComponent.DecalGridChunkCollection(newDict){NextDecalId = nextIndex};
return new DecalGridChunkCollection(newDict) { NextDecalId = nextIndex };
}
public DataNode Write(ISerializationManager serializationManager,
DecalGridComponent.DecalGridChunkCollection value, IDependencyCollection dependencies,
DecalGridChunkCollection value, IDependencyCollection dependencies,
bool alwaysWrite = false,
ISerializationContext? context = null)
{

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

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