From 1c315ba033d03bab518469389379bfb83a1e5541 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 12 Jan 2025 07:22:29 +1100 Subject: [PATCH] Remove Entity data-fields (#34083) --- .../Components/ReagentProducerAnomalyComponent.cs | 2 +- .../Piping/Unary/Components/GasCondenserComponent.cs | 2 +- .../Body/Components/BloodstreamComponent.cs | 12 ++++++------ Content.Server/Body/Components/LungComponent.cs | 2 +- Content.Server/Body/Components/StomachComponent.cs | 4 ++-- .../Botany/Components/PlantHolderComponent.cs | 2 +- .../Components/SolutionRegenerationComponent.cs | 2 +- .../ChemicalFuelGeneratorAdapterComponent.cs | 2 +- Content.Shared/Animals/UdderComponent.cs | 2 +- Content.Shared/Animals/WoolyComponent.cs | 2 +- .../Chemistry/Components/SmokeComponent.cs | 2 +- .../Components/SolutionContainerMixerComponent.cs | 2 +- Content.Shared/Fluids/Components/DrainComponent.cs | 2 +- Content.Shared/Fluids/Components/PuddleComponent.cs | 2 +- Content.Shared/Mind/MindComponent.cs | 6 +++--- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs b/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs index 49c62aec81..3f63a0518c 100644 --- a/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs +++ b/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs @@ -97,6 +97,6 @@ public sealed partial class ReagentProducerAnomalyComponent : Component /// /// Solution where the substance is generated /// - [DataField("solutionRef")] + [ViewVariables] public Entity? Solution = null; } diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs index c25c010708..e89bba1fd7 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs @@ -25,7 +25,7 @@ public sealed partial class GasCondenserComponent : Component /// /// The solution that gases are condensed into. /// - [DataField] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index a6c8ad90df..35e76403bb 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -157,22 +157,22 @@ namespace Content.Server.Body.Components /// /// Internal solution for blood storage /// - [DataField] - public Entity? BloodSolution = null; + [ViewVariables] + public Entity? BloodSolution; /// /// Internal solution for reagent storage /// - [DataField] - public Entity? ChemicalSolution = null; + [ViewVariables] + public Entity? ChemicalSolution; /// /// Temporary blood solution. /// 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. /// - [DataField] - public Entity? TemporarySolution = null; + [ViewVariables] + public Entity? TemporarySolution; /// /// Variable that stores the amount of status time added by having a low blood level. diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs index 72af4d9e63..4fb769d670 100644 --- a/Content.Server/Body/Components/LungComponent.cs +++ b/Content.Server/Body/Components/LungComponent.cs @@ -26,7 +26,7 @@ public sealed partial class LungComponent : Component /// /// The solution on this entity that these lungs act on. /// - [DataField] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs index d541ca4d7c..06f03482e7 100644 --- a/Content.Server/Body/Components/StomachComponent.cs +++ b/Content.Server/Body/Components/StomachComponent.cs @@ -25,8 +25,8 @@ namespace Content.Server.Body.Components /// /// The solution inside of this stomach this transfers reagents to the body. /// - [DataField] - public Entity? Solution = null; + [ViewVariables] + public Entity? Solution; /// /// What solution should this stomach push reagents into, on the body? diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index f0661e4a30..235cd3050b 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -96,6 +96,6 @@ public sealed partial class PlantHolderComponent : Component [DataField] public string SoilSolutionName = "soil"; - [DataField] + [ViewVariables] public Entity? SoilSolution = null; } diff --git a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs b/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs index 03c0ffe0c1..9266c460f1 100644 --- a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs @@ -20,7 +20,7 @@ public sealed partial class SolutionRegenerationComponent : Component /// /// The solution to add reagents to. /// - [DataField] + [ViewVariables] public Entity? SolutionRef = null; /// diff --git a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs index 58e0e8b012..d36828eb83 100644 --- a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs +++ b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs @@ -29,7 +29,7 @@ public sealed partial class ChemicalFuelGeneratorAdapterComponent : Component /// /// The solution on the to use. /// - [DataField("solutionRef")] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Shared/Animals/UdderComponent.cs b/Content.Shared/Animals/UdderComponent.cs index d2767b0896..12db8efefd 100644 --- a/Content.Shared/Animals/UdderComponent.cs +++ b/Content.Shared/Animals/UdderComponent.cs @@ -28,7 +28,7 @@ public sealed partial class UdderComponent : Component /// /// The solution to add reagent to. /// - [DataField, ViewVariables(VVAccess.ReadOnly)] + [ViewVariables(VVAccess.ReadOnly)] public Entity? Solution = null; /// diff --git a/Content.Shared/Animals/WoolyComponent.cs b/Content.Shared/Animals/WoolyComponent.cs index 1dfe523001..6e6e6745e1 100644 --- a/Content.Shared/Animals/WoolyComponent.cs +++ b/Content.Shared/Animals/WoolyComponent.cs @@ -28,7 +28,7 @@ public sealed partial class WoolyComponent : Component /// /// The solution to add reagent to. /// - [DataField, ViewVariables(VVAccess.ReadOnly)] + [ViewVariables(VVAccess.ReadOnly)] public Entity? Solution; /// diff --git a/Content.Shared/Chemistry/Components/SmokeComponent.cs b/Content.Shared/Chemistry/Components/SmokeComponent.cs index f07a77c1ac..db4ad37c7a 100644 --- a/Content.Shared/Chemistry/Components/SmokeComponent.cs +++ b/Content.Shared/Chemistry/Components/SmokeComponent.cs @@ -16,7 +16,7 @@ public sealed partial class SmokeComponent : Component /// /// The solution on the entity with touch and ingestion reactions. /// - [DataField] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs index 8e4b6f52d8..58aba43627 100644 --- a/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs @@ -33,7 +33,7 @@ public sealed partial class SolutionContainerMixerComponent : Component [DataField, AutoNetworkedField] public SoundSpecifier? MixingSound; - [DataField] + [ViewVariables] public Entity? MixingSoundEntity; } diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs index ef0277d214..305ed00b14 100644 --- a/Content.Shared/Fluids/Components/DrainComponent.cs +++ b/Content.Shared/Fluids/Components/DrainComponent.cs @@ -20,7 +20,7 @@ public sealed partial class DrainComponent : Component [ValidatePrototypeId] public const string PlungerTag = "Plunger"; - [DataField] + [ViewVariables] public Entity? Solution = null; [DataField] diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index b8a6fe0cb8..5434479fb7 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -19,7 +19,7 @@ namespace Content.Shared.Fluids.Components [DataField("solution")] public string SolutionName = "puddle"; - [DataField("solutionRef")] + [ViewVariables] public Entity? Solution; } } diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs index a0812be8f7..07571103ad 100644 --- a/Content.Shared/Mind/MindComponent.cs +++ b/Content.Shared/Mind/MindComponent.cs @@ -45,9 +45,9 @@ public sealed partial class MindComponent : Component /// The first entity that this mind controlled. Used for round end information. /// Might be relevant if the player has ghosted since. /// - [DataField, AutoNetworkedField] - public NetEntity? OriginalOwnedEntity; - // This is a net entity, because this field currently ddoes not get set to null when this entity is deleted. + [AutoNetworkedField] + public NetEntity? OriginalOwnedEntity; // TODO WeakEntityReference make this a Datafield again + // 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. // TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that. -- 2.51.2