tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cloneData parameter from AutoNetworkedField (#20596)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-29 22:14:16 -07:00
committed by GitHub
parent 379de4b22a
commit 2f11a749f6
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Access/Components/AccessComponent.cs
View File

@@ -22,14 +22,14 @@ namespace Content.Shared.Access.Components
[DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))] [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
[Access(typeof(SharedAccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends [Access(typeof(SharedAccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
[AutoNetworkedField(true)] [AutoNetworkedField]
public HashSet<string> Tags = new(); public HashSet<string> Tags = new();
/// <summary> /// <summary>
/// Access Groups. These are added to the tags during map init. After map init this will have no effect. /// Access Groups. These are added to the tags during map init. After map init this will have no effect.
/// </summary> /// </summary>
[DataField("groups", readOnly: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))] [DataField("groups", readOnly: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))]
[AutoNetworkedField(true)] [AutoNetworkedField]
public HashSet<string> Groups = new(); public HashSet<string> Groups = new();
} }

2
Content.Shared/Access/Components/AccessOverriderComponent.cs
View File

@@ -33,7 +33,7 @@ public sealed partial class AccessOverriderComponent : Component
} }
} }
[DataField, AutoNetworkedField(true)] [DataField, AutoNetworkedField]
public List<ProtoId<AccessLevelPrototype>> AccessLevels = new(); public List<ProtoId<AccessLevelPrototype>> AccessLevels = new();
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]

4
Content.Shared/Body/Part/BodyPartComponent.cs
View File

@@ -34,13 +34,13 @@ public sealed partial class BodyPartComponent : Component
/// <summary> /// <summary>
/// Child body parts attached to this body part. /// Child body parts attached to this body part.
/// </summary> /// </summary>
[DataField, AutoNetworkedField(CloneData = true)] [DataField, AutoNetworkedField]
public Dictionary<string, BodyPartSlot> Children = new(); public Dictionary<string, BodyPartSlot> Children = new();
/// <summary> /// <summary>
/// Organs attached to this body part. /// Organs attached to this body part.
/// </summary> /// </summary>
[DataField, AutoNetworkedField(CloneData = true)] [DataField, AutoNetworkedField]
public Dictionary<string, OrganSlot> Organs = new(); public Dictionary<string, OrganSlot> Organs = new();
/// <summary> /// <summary>

2
Content.Shared/Buckle/Components/StrapComponent.cs
View File

@@ -15,7 +15,7 @@ public sealed partial class StrapComponent : Component
/// <summary> /// <summary>
/// The entities that are currently buckled /// The entities that are currently buckled
/// </summary> /// </summary>
[AutoNetworkedField(true)] [AutoNetworkedField]
[ViewVariables] // TODO serialization [ViewVariables] // TODO serialization
public HashSet<EntityUid> BuckledEntities = new(); public HashSet<EntityUid> BuckledEntities = new();

6
Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
View File

@@ -19,7 +19,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
[DataField] [DataField]
public Dictionary<HumanoidVisualLayers, HumanoidSpeciesSpriteLayer> BaseLayers = new(); public Dictionary<HumanoidVisualLayers, HumanoidSpeciesSpriteLayer> BaseLayers = new();
[DataField, AutoNetworkedField(true)] [DataField, AutoNetworkedField]
public HashSet<HumanoidVisualLayers> PermanentlyHidden = new(); public HashSet<HumanoidVisualLayers> PermanentlyHidden = new();
// Couldn't these be somewhere else? // Couldn't these be somewhere else?
@@ -36,7 +36,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
/// Stored on the server, this is merged in the client into /// Stored on the server, this is merged in the client into
/// all layer settings. /// all layer settings.
/// </summary> /// </summary>
[DataField, AutoNetworkedField(true)] [DataField, AutoNetworkedField]
public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new(); public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new();
/// <summary> /// <summary>
@@ -62,7 +62,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
/// Visual layers currently hidden. This will affect the base sprite /// Visual layers currently hidden. This will affect the base sprite
/// on this humanoid layer, and any markings that sit above it. /// on this humanoid layer, and any markings that sit above it.
/// </summary> /// </summary>
[DataField, AutoNetworkedField(true)] [DataField, AutoNetworkedField]
public HashSet<HumanoidVisualLayers> HiddenLayers = new(); public HashSet<HumanoidVisualLayers> HiddenLayers = new();
[DataField, AutoNetworkedField] [DataField, AutoNetworkedField]

6
Content.Shared/Nutrition/Components/HungerComponent.cs
View File

@@ -52,7 +52,7 @@ public sealed partial class HungerComponent : Component
/// A dictionary relating HungerThreshold to the amount of <see cref="CurrentHunger"/> needed for each one /// A dictionary relating HungerThreshold to the amount of <see cref="CurrentHunger"/> needed for each one
/// </summary> /// </summary>
[DataField("thresholds", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, float>))] [DataField("thresholds", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, float>))]
[AutoNetworkedField(cloneData: true)] [AutoNetworkedField]
public Dictionary<HungerThreshold, float> Thresholds = new() public Dictionary<HungerThreshold, float> Thresholds = new()
{ {
{ HungerThreshold.Overfed, 200.0f }, { HungerThreshold.Overfed, 200.0f },
@@ -66,7 +66,7 @@ public sealed partial class HungerComponent : Component
/// A dictionary relating hunger thresholds to corresponding alerts. /// A dictionary relating hunger thresholds to corresponding alerts.
/// </summary> /// </summary>
[DataField("hungerThresholdAlerts", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, AlertType>))] [DataField("hungerThresholdAlerts", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, AlertType>))]
[AutoNetworkedField(cloneData: true)] [AutoNetworkedField]
public Dictionary<HungerThreshold, AlertType> HungerThresholdAlerts = new() public Dictionary<HungerThreshold, AlertType> HungerThresholdAlerts = new()
{ {
{ HungerThreshold.Peckish, AlertType.Peckish }, { HungerThreshold.Peckish, AlertType.Peckish },
@@ -78,7 +78,7 @@ public sealed partial class HungerComponent : Component
/// A dictionary relating HungerThreshold to how much they modify <see cref="BaseDecayRate"/>. /// A dictionary relating HungerThreshold to how much they modify <see cref="BaseDecayRate"/>.
/// </summary> /// </summary>
[DataField("hungerThresholdDecayModifiers", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, float>))] [DataField("hungerThresholdDecayModifiers", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, float>))]
[AutoNetworkedField(cloneData: true)] [AutoNetworkedField]
public Dictionary<HungerThreshold, float> HungerThresholdDecayModifiers = new() public Dictionary<HungerThreshold, float> HungerThresholdDecayModifiers = new()
{ {
{ HungerThreshold.Overfed, 1.2f }, { HungerThreshold.Overfed, 1.2f },

2
Content.Shared/Nutrition/Components/ThirstComponent.cs
View File

@@ -45,7 +45,7 @@ public sealed partial class ThirstComponent : Component
public TimeSpan UpdateRate = TimeSpan.FromSeconds(1); public TimeSpan UpdateRate = TimeSpan.FromSeconds(1);
[DataField("thresholds")] [DataField("thresholds")]
[AutoNetworkedField(cloneData: true)] [AutoNetworkedField]
public Dictionary<ThirstThreshold, float> ThirstThresholds = new() public Dictionary<ThirstThreshold, float> ThirstThresholds = new()
{ {
{ThirstThreshold.OverHydrated, 600.0f}, {ThirstThreshold.OverHydrated, 600.0f},

2
Content.Shared/Points/PointManagerComponent.cs
View File

@@ -15,7 +15,7 @@ public sealed partial class PointManagerComponent : Component
/// <summary> /// <summary>
/// A dictionary of a player's netuserID to the amount of points they have. /// A dictionary of a player's netuserID to the amount of points they have.
/// </summary> /// </summary>
[DataField, AutoNetworkedField(true)] [DataField, AutoNetworkedField]
public Dictionary<NetUserId, FixedPoint2> Points = new(); public Dictionary<NetUserId, FixedPoint2> Points = new();
/// <summary> /// <summary>

8
Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
View File

@@ -17,21 +17,21 @@ public sealed partial class TechnologyDatabaseComponent : Component
[DataField("mainDiscipline", customTypeSerializer: typeof(PrototypeIdSerializer<TechDisciplinePrototype>))] [DataField("mainDiscipline", customTypeSerializer: typeof(PrototypeIdSerializer<TechDisciplinePrototype>))]
public string? MainDiscipline; public string? MainDiscipline;
[AutoNetworkedField(true)] [AutoNetworkedField]
[DataField("currentTechnologyCards")] [DataField("currentTechnologyCards")]
public List<string> CurrentTechnologyCards = new(); public List<string> CurrentTechnologyCards = new();
/// <summary> /// <summary>
/// Which research disciplines are able to be unlocked /// Which research disciplines are able to be unlocked
/// </summary> /// </summary>
[AutoNetworkedField(true)] [AutoNetworkedField]
[DataField("supportedDisciplines", customTypeSerializer: typeof(PrototypeIdListSerializer<TechDisciplinePrototype>))] [DataField("supportedDisciplines", customTypeSerializer: typeof(PrototypeIdListSerializer<TechDisciplinePrototype>))]
public List<string> SupportedDisciplines = new(); public List<string> SupportedDisciplines = new();
/// <summary> /// <summary>
/// The ids of all the technologies which have been unlocked. /// The ids of all the technologies which have been unlocked.
/// </summary> /// </summary>
[AutoNetworkedField(true)] [AutoNetworkedField]
[DataField("unlockedTechnologies", customTypeSerializer: typeof(PrototypeIdListSerializer<TechnologyPrototype>))] [DataField("unlockedTechnologies", customTypeSerializer: typeof(PrototypeIdListSerializer<TechnologyPrototype>))]
public List<string> UnlockedTechnologies = new(); public List<string> UnlockedTechnologies = new();
@@ -40,7 +40,7 @@ public sealed partial class TechnologyDatabaseComponent : Component
/// This is maintained alongside the TechnologyIds /// This is maintained alongside the TechnologyIds
/// </summary> /// </summary>
/// todo: if you unlock all the recipes in a tech, it doesn't count as unlocking the tech. sadge /// todo: if you unlock all the recipes in a tech, it doesn't count as unlocking the tech. sadge
[AutoNetworkedField(true)] [AutoNetworkedField]
[DataField("unlockedRecipes", customTypeSerializer: typeof(PrototypeIdListSerializer<LatheRecipePrototype>))] [DataField("unlockedRecipes", customTypeSerializer: typeof(PrototypeIdListSerializer<LatheRecipePrototype>))]
public List<string> UnlockedRecipes = new(); public List<string> UnlockedRecipes = new();
} }

2
Content.Shared/Standing/StandingStateComponent.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Shared.Standing
/// List of fixtures that had their collision mask changed when the entity was downed. /// List of fixtures that had their collision mask changed when the entity was downed.
/// Required for re-adding the collision mask. /// Required for re-adding the collision mask.
/// </summary> /// </summary>
[DataField, AutoNetworkedField(true)] [DataField, AutoNetworkedField]
public List<string> ChangedFixtures = new(); public List<string> ChangedFixtures = new();
} }
} }

4
Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
View File

@@ -11,14 +11,14 @@ public sealed partial class StepTriggerComponent : Component
/// <summary> /// <summary>
/// List of entities that are currently colliding with the entity. /// List of entities that are currently colliding with the entity.
/// </summary> /// </summary>
[ViewVariables, AutoNetworkedField(true)] [ViewVariables, AutoNetworkedField]
public HashSet<EntityUid> Colliding = new(); public HashSet<EntityUid> Colliding = new();
/// <summary> /// <summary>
/// The list of entities that are standing on this entity, /// The list of entities that are standing on this entity,
/// which shouldn't be able to trigger it again until stepping off. /// which shouldn't be able to trigger it again until stepping off.
/// </summary> /// </summary>
[ViewVariables, AutoNetworkedField(true)] [ViewVariables, AutoNetworkedField]
public HashSet<EntityUid> CurrentlySteppedOn = new(); public HashSet<EntityUid> CurrentlySteppedOn = new();
/// <summary> /// <summary>