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

Remove Entity<T> data-fields (#34083)

Browse Source
This commit is contained in:
Leon Friedrich
2025-01-12 07:22:29 +11:00
committed by GitHub
parent 6be4fba792
commit 1c315ba033
15 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs
View File

@@ -97,6 +97,6 @@ public sealed partial class ReagentProducerAnomalyComponent : Component
/// <summary> /// <summary>
/// Solution where the substance is generated /// Solution where the substance is generated
/// </summary> /// </summary>
[DataField("solutionRef")] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
} }

2
Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs
View File

@@ -25,7 +25,7 @@ public sealed partial class GasCondenserComponent : Component
/// <summary> /// <summary>
/// The solution that gases are condensed into. /// The solution that gases are condensed into.
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
/// <summary> /// <summary>

12
Content.Server/Body/Components/BloodstreamComponent.cs
View File

@@ -157,22 +157,22 @@ namespace Content.Server.Body.Components
/// <summary> /// <summary>
/// Internal solution for blood storage /// Internal solution for blood storage
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? BloodSolution = null; public Entity<SolutionComponent>? BloodSolution;
/// <summary> /// <summary>
/// Internal solution for reagent storage /// Internal solution for reagent storage
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? ChemicalSolution = null; public Entity<SolutionComponent>? ChemicalSolution;
/// <summary> /// <summary>
/// Temporary blood solution. /// Temporary blood solution.
/// When blood is lost, it goes to this solution, and when this /// When blood is lost, it goes to this solution, and when this
/// solution hits a certain cap, the blood is actually spilled as a puddle. /// solution hits a certain cap, the blood is actually spilled as a puddle.
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? TemporarySolution = null; public Entity<SolutionComponent>? TemporarySolution;
/// <summary> /// <summary>
/// Variable that stores the amount of status time added by having a low blood level. /// Variable that stores the amount of status time added by having a low blood level.

2
Content.Server/Body/Components/LungComponent.cs
View File

@@ -26,7 +26,7 @@ public sealed partial class LungComponent : Component
/// <summary> /// <summary>
/// The solution on this entity that these lungs act on. /// The solution on this entity that these lungs act on.
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
/// <summary> /// <summary>

4
Content.Server/Body/Components/StomachComponent.cs
View File

@@ -25,8 +25,8 @@ namespace Content.Server.Body.Components
/// <summary> /// <summary>
/// The solution inside of this stomach this transfers reagents to the body. /// The solution inside of this stomach this transfers reagents to the body.
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution;
/// <summary> /// <summary>
/// What solution should this stomach push reagents into, on the body? /// What solution should this stomach push reagents into, on the body?

2
Content.Server/Botany/Components/PlantHolderComponent.cs
View File

@@ -96,6 +96,6 @@ public sealed partial class PlantHolderComponent : Component
[DataField] [DataField]
public string SoilSolutionName = "soil"; public string SoilSolutionName = "soil";
[DataField] [ViewVariables]
public Entity<SolutionComponent>? SoilSolution = null; public Entity<SolutionComponent>? SoilSolution = null;
} }

2
Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
View File

@@ -20,7 +20,7 @@ public sealed partial class SolutionRegenerationComponent : Component
/// <summary> /// <summary>
/// The solution to add reagents to. /// The solution to add reagents to.
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? SolutionRef = null; public Entity<SolutionComponent>? SolutionRef = null;
/// <summary> /// <summary>

2
Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs
View File

@@ -29,7 +29,7 @@ public sealed partial class ChemicalFuelGeneratorAdapterComponent : Component
/// <summary> /// <summary>
/// The solution on the <see cref="SolutionContainerManagerComponent"/> to use. /// The solution on the <see cref="SolutionContainerManagerComponent"/> to use.
/// </summary> /// </summary>
[DataField("solutionRef")] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
/// <summary> /// <summary>

2
Content.Shared/Animals/UdderComponent.cs
View File

@@ -28,7 +28,7 @@ public sealed partial class UdderComponent : Component
/// <summary> /// <summary>
/// The solution to add reagent to. /// The solution to add reagent to.
/// </summary> /// </summary>
[DataField, ViewVariables(VVAccess.ReadOnly)] [ViewVariables(VVAccess.ReadOnly)]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
/// <summary> /// <summary>

2
Content.Shared/Animals/WoolyComponent.cs
View File

@@ -28,7 +28,7 @@ public sealed partial class WoolyComponent : Component
/// <summary> /// <summary>
/// The solution to add reagent to. /// The solution to add reagent to.
/// </summary> /// </summary>
[DataField, ViewVariables(VVAccess.ReadOnly)] [ViewVariables(VVAccess.ReadOnly)]
public Entity<SolutionComponent>? Solution; public Entity<SolutionComponent>? Solution;
/// <summary> /// <summary>

2
Content.Shared/Chemistry/Components/SmokeComponent.cs
View File

@@ -16,7 +16,7 @@ public sealed partial class SmokeComponent : Component
/// <summary> /// <summary>
/// The solution on the entity with touch and ingestion reactions. /// The solution on the entity with touch and ingestion reactions.
/// </summary> /// </summary>
[DataField] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
/// <summary> /// <summary>

2
Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs
View File

@@ -33,7 +33,7 @@ public sealed partial class SolutionContainerMixerComponent : Component
[DataField, AutoNetworkedField] [DataField, AutoNetworkedField]
public SoundSpecifier? MixingSound; public SoundSpecifier? MixingSound;
[DataField] [ViewVariables]
public Entity<AudioComponent>? MixingSoundEntity; public Entity<AudioComponent>? MixingSoundEntity;
} }

2
Content.Shared/Fluids/Components/DrainComponent.cs
View File

@@ -20,7 +20,7 @@ public sealed partial class DrainComponent : Component
[ValidatePrototypeId<TagPrototype>] [ValidatePrototypeId<TagPrototype>]
public const string PlungerTag = "Plunger"; public const string PlungerTag = "Plunger";
[DataField] [ViewVariables]
public Entity<SolutionComponent>? Solution = null; public Entity<SolutionComponent>? Solution = null;
[DataField] [DataField]

2
Content.Shared/Fluids/Components/PuddleComponent.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Shared.Fluids.Components
[DataField("solution")] public string SolutionName = "puddle"; [DataField("solution")] public string SolutionName = "puddle";
[DataField("solutionRef")] [ViewVariables]
public Entity<SolutionComponent>? Solution; public Entity<SolutionComponent>? Solution;
} }
} }

6
Content.Shared/Mind/MindComponent.cs
View File

@@ -45,9 +45,9 @@ public sealed partial class MindComponent : Component
/// The first entity that this mind controlled. Used for round end information. /// The first entity that this mind controlled. Used for round end information.
/// Might be relevant if the player has ghosted since. /// Might be relevant if the player has ghosted since.
/// </summary> /// </summary>
[DataField, AutoNetworkedField] [AutoNetworkedField]
public NetEntity? OriginalOwnedEntity; public NetEntity? OriginalOwnedEntity; // TODO WeakEntityReference make this a Datafield again
// This is a net entity, because this field currently ddoes not get set to null when this entity is deleted. // This is a net entity, because this field currently does not get set to null when this entity is deleted.
// This is a lazy way to ensure that people check that the entity still exists. // This is a lazy way to ensure that people check that the entity still exists.
// TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that. // TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that.