Random spontaneous cleanup PR (#25131)
* Use new Subs.CVar helper Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe. This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown. * Fix a bunch of warnings * More warning fixes * Use new DateTime serializer to get rid of ISerializationHooks in changelog code. * Get rid of some more ISerializationHooks for enums * And a little more * Apply suggestions from code review Co-authored-by: 0x6273 <0x40@keemail.me> --------- Co-authored-by: 0x6273 <0x40@keemail.me>
This commit is contained in:
committed by
GitHub
parent
d0c174388c
commit
68ce53ae17
@@ -1,11 +1,10 @@
|
||||
using Robust.Shared.Reflection;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations;
|
||||
|
||||
namespace Content.Server.RandomAppearance;
|
||||
|
||||
[RegisterComponent]
|
||||
[Access(typeof(RandomAppearanceSystem))]
|
||||
public sealed partial class RandomAppearanceComponent : Component, ISerializationHooks
|
||||
public sealed partial class RandomAppearanceComponent : Component
|
||||
{
|
||||
[DataField("spriteStates")]
|
||||
public string[] SpriteStates = { "0", "1", "2", "3", "4" };
|
||||
@@ -13,23 +12,6 @@ public sealed partial class RandomAppearanceComponent : Component, ISerializatio
|
||||
/// <summary>
|
||||
/// What appearance enum key should be set to the random sprite state?
|
||||
/// </summary>
|
||||
[DataField("key", required: true)]
|
||||
public string EnumKeyRaw = default!;
|
||||
|
||||
/// <summary>
|
||||
/// The actual enum after reflection.
|
||||
/// </summary>
|
||||
[DataField(required: true, customTypeSerializer: typeof(EnumSerializer))]
|
||||
public Enum? EnumKey;
|
||||
|
||||
void ISerializationHooks.AfterDeserialization()
|
||||
{
|
||||
if (IoCManager.Resolve<IReflectionManager>().TryParseEnumReference(EnumKeyRaw, out var @enum))
|
||||
{
|
||||
EnumKey = @enum;
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.Error($"RandomAppearance enum key {EnumKeyRaw} could not be parsed!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user