Update trivial components to use auto comp states (#20539)

This commit is contained in:
DrSmugleaf
2023-09-28 16:20:29 -07:00
committed by GitHub
parent 14cfe44ece
commit a44fa86b68
158 changed files with 806 additions and 2866 deletions

View File

@@ -3,8 +3,6 @@ using Content.Shared.Whitelist;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
namespace Content.Shared.Storage.Components;
@@ -12,7 +10,8 @@ namespace Content.Shared.Storage.Components;
/// This is used for things like paper bins, in which
/// you can only take off of the top of the bin.
/// </summary>
[RegisterComponent, NetworkedComponent, Access(typeof(BinSystem))]
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
[Access(typeof(BinSystem))]
public sealed partial class BinComponent : Component
{
/// <summary>
@@ -30,42 +29,25 @@ public sealed partial class BinComponent : Component
/// i can handle entities being deleted and removed
/// out of order by other systems
/// </remarks>
[DataField("items")]
[DataField, AutoNetworkedField]
public List<EntityUid> Items = new();
/// <summary>
/// The items that start in the bin. Sorted in order.
/// </summary>
[DataField("initialContents", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
public List<string> InitialContents = new();
[DataField]
public List<EntProtoId> InitialContents = new();
/// <summary>
/// A whitelist governing what items can be inserted into the bin.
/// </summary>
[DataField("whitelist")]
[DataField, AutoNetworkedField]
public EntityWhitelist? Whitelist;
/// <summary>
/// The maximum amount of items
/// that can be stored in the bin.
/// </summary>
[DataField("maxItems")]
[DataField, AutoNetworkedField]
public int MaxItems = 20;
}
[Serializable, NetSerializable]
public sealed class BinComponentState : ComponentState
{
public List<NetEntity> Items;
public EntityWhitelist? Whitelist;
public int MaxItems;
public BinComponentState(List<NetEntity> items, EntityWhitelist? whitelist, int maxItems)
{
Items = items;
Whitelist = whitelist;
MaxItems = maxItems;
}
}