SoundSpecifiers can now specify paths/collections as a value too. (#4627)
This commit is contained in:
committed by
GitHub
parent
08cfc3bb46
commit
6bf1fb6bac
@@ -1,16 +1,26 @@
|
||||
using System;
|
||||
using Content.Shared.Audio;
|
||||
using Robust.Shared.ContentPack;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Serialization;
|
||||
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.Markdown.Value;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Interfaces;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Shared.Sound
|
||||
{
|
||||
[TypeSerializer]
|
||||
public class SoundSpecifierTypeSerializer : ITypeReader<SoundSpecifier, MappingDataNode>
|
||||
public class SoundSpecifierTypeSerializer :
|
||||
ITypeReader<SoundSpecifier, MappingDataNode>,
|
||||
ITypeReader<SoundSpecifier, ValueDataNode>
|
||||
{
|
||||
private Type GetType(MappingDataNode node)
|
||||
{
|
||||
@@ -33,6 +43,19 @@ namespace Content.Shared.Sound
|
||||
return serializationManager.Read(type, node, context, skipHook);
|
||||
}
|
||||
|
||||
public DeserializationResult Read(ISerializationManager serializationManager, ValueDataNode node,
|
||||
IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null)
|
||||
{
|
||||
var value = node.Value;
|
||||
if (dependencies.Resolve<IPrototypeManager>().HasIndex<SoundCollectionPrototype>(value))
|
||||
return new DeserializedValue<SoundSpecifier>(new SoundCollectionSpecifier(value));
|
||||
|
||||
if (dependencies.Resolve<IResourceManager>().ContentFileExists(value))
|
||||
return new DeserializedValue<SoundSpecifier>(new SoundPathSpecifier(value));
|
||||
|
||||
throw new InvalidMappingException("SoundSpecifier is neither a resource path or sound collection identifier");
|
||||
}
|
||||
|
||||
public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node,
|
||||
IDependencyCollection dependencies, ISerializationContext? context = null)
|
||||
{
|
||||
@@ -44,5 +67,15 @@ namespace Content.Shared.Sound
|
||||
|
||||
return serializationManager.ValidateNode(GetType(node), node, context);
|
||||
}
|
||||
|
||||
public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node,
|
||||
IDependencyCollection dependencies, ISerializationContext? context = null)
|
||||
{
|
||||
if (serializationManager.ValidateNode<ResourcePath>(node, context) is not ErrorNode
|
||||
|| serializationManager.ValidateNodeWith<string, PrototypeIdSerializer<SoundCollectionPrototype>, ValueDataNode>(node, context) is not ErrorNode)
|
||||
return new ValidatedValueNode(node);
|
||||
|
||||
return new ErrorNode(node, "SoundSpecifier value is neither a valid resource path nor an existing sound collection identifier!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user