Change all of body system to use entities and components (#2074)

* Early commit

* Early commit 2

* merging master broke my git

* does anyone even read these

* life is fleeting

* it just works

* this time passing integration tests

* Remove hashset yaml serialization for now

* You got a license for those nullables?

* No examine, no context menu, part and mechanism parenting and visibility

* Fix wrong brain sprite state

* Removing layers was a mistake

* just tear body system a new one and see if it still breathes

* Remove redundant code

* Add that comment back

* Separate damage and body, component states, stomach rework

* Add containers for body parts

* Bring layers back pls

* Fix parts magically changing color

* Reimplement sprite layer visibility

* Fix tests

* Add leg test

* Active legs is gone

Crab rave

* Merge fixes, rename DamageState to CurrentState

* Remove IShowContextMenu and ICanExamine

Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs

@@ -1,9 +1,11 @@
-using Content.Server.GameObjects.Components.Body.Digestive;
+using System.Linq;
+using Content.Server.GameObjects.Components.Body.Behavior;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.Fluids;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry;
+using Content.Shared.GameObjects.Components.Body.Mechanism;
 using Content.Shared.GameObjects.Components.Nutrition;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Interfaces;
@@ -149,42 +151,43 @@ namespace Content.Server.GameObjects.Components.Nutrition
                 return false;
             }
 
-            if (!target.TryGetComponent(out StomachComponent stomachComponent))
+            if (!target.TryGetMechanismBehaviors<StomachBehaviorComponent>(out var stomachs))
             {
                 return false;
             }
 
             var transferAmount = ReagentUnit.Min(TransferAmount, _contents.CurrentVolume);
             var split = _contents.SplitSolution(transferAmount);
+            var firstStomach = stomachs.FirstOrDefault(stomach => stomach.CanTransferSolution(split));
 
-            if (stomachComponent.CanTransferSolution(split))
+
+            // All stomach are full or can't handle whatever solution we have.
+            if (firstStomach == null)
             {
-                if (_useSound == null)
-                {
-                    return false;
-                }
-
-                EntitySystem.Get<AudioSystem>().PlayFromEntity(_useSound, target, AudioParams.Default.WithVolume(-2f));
-                target.PopupMessage(Loc.GetString("Slurp"));
-                UpdateAppearance();
-
-                // TODO: Account for partial transfer.
-
-                foreach (var (reagentId, quantity) in split.Contents)
-                {
-                    if (!_prototypeManager.TryIndex(reagentId, out ReagentPrototype reagent)) continue;
-                    split.RemoveReagent(reagentId, reagent.ReactionEntity(target, ReactionMethod.Ingestion, quantity));
-                }
-
-                stomachComponent.TryTransferSolution(split);
-
-                return true;
+                _contents.TryAddSolution(split);
+                target.PopupMessage(Loc.GetString("You've had enough {0:theName}!", Owner));
+                return false;
             }
 
-            // Stomach was full or can't handle whatever solution we have.
-            _contents.TryAddSolution(split);
-            target.PopupMessage(Loc.GetString("You've had enough {0:theName}!", Owner));
-            return false;
+            if (_useSound != null)
+            {
+                EntitySystem.Get<AudioSystem>().PlayFromEntity(_useSound, target, AudioParams.Default.WithVolume(-2f));
+            }
+
+            target.PopupMessage(Loc.GetString("Slurp"));
+            UpdateAppearance();
+
+            // TODO: Account for partial transfer.
+
+            foreach (var (reagentId, quantity) in split.Contents)
+            {
+                if (!_prototypeManager.TryIndex(reagentId, out ReagentPrototype reagent)) continue;
+                split.RemoveReagent(reagentId, reagent.ReactionEntity(target, ReactionMethod.Ingestion, quantity));
+            }
+
+            firstStomach.TryTransferSolution(split);
+
+            return true;
         }
 
         void ILand.Land(LandEventArgs eventArgs)

Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs

@@ -1,12 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Body.Digestive;
+using System.Linq;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Utensil;
 using Content.Shared.Chemistry;
+using Content.Shared.GameObjects.Components.Body.Behavior;
+using Content.Shared.GameObjects.Components.Body.Mechanism;
 using Content.Shared.GameObjects.Components.Utensil;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
@@ -129,7 +131,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
 
             var trueTarget = target ?? user;
 
-            if (!trueTarget.TryGetComponent(out StomachComponent? stomach))
+            if (!trueTarget.TryGetMechanismBehaviors<SharedStomachBehaviorComponent>(out var stomachs))
             {
                 return false;
             }
@@ -171,7 +173,9 @@ namespace Content.Server.GameObjects.Components.Nutrition
 
             var transferAmount = ReagentUnit.Min(_transferAmount, solution.CurrentVolume);
             var split = solution.SplitSolution(transferAmount);
-            if (!stomach.CanTransferSolution(split))
+            var firstStomach = stomachs.FirstOrDefault(stomach => stomach.CanTransferSolution(split));
+
+            if (firstStomach == null)
             {
                 trueTarget.PopupMessage(user, Loc.GetString("You can't eat any more!"));
                 return false;
@@ -185,7 +189,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
                 split.RemoveReagent(reagentId, reagent.ReactionEntity(target, ReactionMethod.Ingestion, quantity));
             }
 
-            stomach.TryTransferSolution(split);
+            firstStomach.TryTransferSolution(split);
 
             _entitySystem.GetEntitySystem<AudioSystem>()
                 .PlayFromEntity(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f));

Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs

@@ -189,7 +189,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
             {
                 if (Owner.TryGetComponent(out IDamageableComponent damageable))
                 {
-                    if (damageable.CurrentDamageState != DamageState.Dead)
+                    if (damageable.CurrentState != DamageState.Dead)
                     {
                         damageable.ChangeDamage(DamageType.Blunt, 2, true, null);
                     }

Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs

@@ -186,7 +186,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
             {
                 if (Owner.TryGetComponent(out IDamageableComponent damageable))
                 {
-                    if (damageable.CurrentDamageState != DamageState.Dead)
+                    if (damageable.CurrentState != DamageState.Dead)
                     {
                         damageable.ChangeDamage(DamageType.Blunt, 2, true, null);
                     }