Openable refactor (#19750)

Content.Server/Nutrition/Components/FoodComponent.cs

@@ -6,87 +6,67 @@ using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Nutrition.Components
+namespace Content.Server.Nutrition.Components;
+
+[RegisterComponent, Access(typeof(FoodSystem))]
+public sealed partial class FoodComponent : Component
 {
-    [RegisterComponent, Access(typeof(FoodSystem))]
-    public sealed partial class FoodComponent : Component
-    {
-        [DataField("solution")]
-        public string SolutionName { get; set; } = "food";
+    [DataField]
+    public string Solution = "food";
 
-        [DataField("useSound")]
-        public SoundSpecifier UseSound { get; set; } = new SoundPathSpecifier("/Audio/Items/eatfood.ogg");
+    [DataField]
+    public SoundSpecifier UseSound = new SoundPathSpecifier("/Audio/Items/eatfood.ogg");
 
-        [DataField("trash", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? TrashPrototype { get; set; }
+    [DataField]
+    public EntProtoId? TrashPrototype;
 
-        [DataField("transferAmount")]
-        public FixedPoint2? TransferAmount { get; set; } = FixedPoint2.New(5);
+    [DataField]
+    public FixedPoint2? TransferAmount = FixedPoint2.New(5);
 
-        /// <summary>
-        /// Acceptable utensil to use
-        /// </summary>
-        [DataField("utensil")]
-        public UtensilType Utensil = UtensilType.Fork; //There are more "solid" than "liquid" food
+    /// <summary>
+    /// Acceptable utensil to use
+    /// </summary>
+    [DataField]
+    public UtensilType Utensil = UtensilType.Fork; //There are more "solid" than "liquid" food
 
-        /// <summary>
-        /// Is utensil required to eat this food
-        /// </summary>
-        [DataField("utensilRequired")]
-        public bool UtensilRequired = false;
+    /// <summary>
+    /// Is utensil required to eat this food
+    /// </summary>
+    [DataField]
+    public bool UtensilRequired;
 
-        /// <summary>
-        ///     If this is set to true, food can only be eaten if you have a stomach with a
-        ///     <see cref="StomachComponent.SpecialDigestible"/> that includes this entity in its whitelist,
-        ///     rather than just being digestible by anything that can eat food.
-        ///     Whitelist the food component to allow eating of normal food.
-        /// </summary>
-        [DataField("requiresSpecialDigestion")]
-        public bool RequiresSpecialDigestion = false;
+    /// <summary>
+    ///     If this is set to true, food can only be eaten if you have a stomach with a
+    ///     <see cref="StomachComponent.SpecialDigestible"/> that includes this entity in its whitelist,
+    ///     rather than just being digestible by anything that can eat food.
+    ///     Whitelist the food component to allow eating of normal food.
+    /// </summary>
+    [DataField]
+    public bool RequiresSpecialDigestion;
 
-        /// <summary>
-        ///     Stomachs required to digest this entity.
-        ///     Used to simulate 'ruminant' digestive systems (which can digest grass)
-        /// </summary>
-        [DataField("requiredStomachs")]
-        public int RequiredStomachs = 1;
+    /// <summary>
+    ///     Stomachs required to digest this entity.
+    ///     Used to simulate 'ruminant' digestive systems (which can digest grass)
+    /// </summary>
+    [DataField]
+    public int RequiredStomachs = 1;
 
-        /// <summary>
-        /// The localization identifier for the eat message. Needs a "food" entity argument passed to it.
-        /// </summary>
-        [DataField("eatMessage")]
-        public string EatMessage = "food-nom";
+    /// <summary>
+    /// The localization identifier for the eat message. Needs a "food" entity argument passed to it.
+    /// </summary>
+    [DataField]
+    public string EatMessage = "food-nom";
 
-        /// <summary>
-        /// How long it takes to eat the food personally.
-        /// </summary>
-        [DataField("delay")]
-        public float Delay = 1;
+    /// <summary>
+    /// How long it takes to eat the food personally.
+    /// </summary>
+    [DataField]
+    public float Delay = 1;
 
-        /// <summary>
-        ///     This is how many seconds it takes to force feed someone this food.
-        ///     Should probably be smaller for small items like pills.
-        /// </summary>
-        [DataField("forceFeedDelay")]
-        public float ForceFeedDelay = 3;
-
-        [ViewVariables]
-        public int UsesRemaining
-        {
-            get
-            {
-                if (!EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner, SolutionName, out var solution))
-                {
-                    return 0;
-                }
-
-                if (TransferAmount == null)
-                    return solution.Volume == 0 ? 0 : 1;
-
-                return solution.Volume == 0
-                    ? 0
-                    : Math.Max(1, (int) Math.Ceiling((solution.Volume / (FixedPoint2)TransferAmount).Float()));
-            }
-        }
-    }
+    /// <summary>
+    ///     This is how many seconds it takes to force feed someone this food.
+    ///     Should probably be smaller for small items like pills.
+    /// </summary>
+    [DataField]
+    public float ForceFeedDelay = 3;
 }