Solution refactor (#4407)

* Rename SolutionContainerCaps -> Capability * Move IExamine event to Chemistry System. * ECS the ISolutionChange into SolutionChangeEvent * Unify SolutionContainer into a single shared component * Replace ISolutionInteraction with SolutionContainerComponent * Move all methods from SolutionContainer to ChemistrySystem * Refactor EntitySystem calls to Dependencies * Refactor SolutionContainer to SolutionManager * Fix yamls * Fix test fails * Fix post merge issues * Fix various issues with SolutionManager * More fixes * Fix more components * Fix events not being directed * Fixes for Hypospray * Separate removal and iteration on Metabolism * Fix creampie problems * Address some of sloth's issues * Refactors for Systems * Refactored solution location * Fix tests * Address more sloth issues * Fix dependency * Fix merge conflicts * Add xmldocs for Capabilities components * Remove HasSolution/TryGetDefaultSolution and Add/Remove Drainable/Refillable * Replace Grindable/Juiceable with Extractable * Refactor field names * Fix Drainable * Fix some issues with spillable and injector * Fix issues with Grinder * Fix Beaker having duplicate solutions * Fix foaming * Address some MGS issues * Fix Uid issues * Fix errors in solution Tranfer * Fixed some extra values constant values * Cola is drinkable now
2021-09-06 15:49:44 +02:00
parent b8911d58ac
commit c209e3f29b
166 changed files with 4268 additions and 3278 deletions
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -0,0 +1,47 @@
+using Content.Server.Nutrition.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+
+namespace Content.Server.Nutrition.EntitySystems
+{
+    [UsedImplicitly]
+    public class DrinkSystem : EntitySystem
+    {
+        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<DrinkComponent, SolutionChangedEvent>(OnSolutionChange);
+            SubscribeLocalEvent<DrinkComponent, ComponentInit>(OnDrinkInit);
+        }
+
+        private void OnDrinkInit(EntityUid uid, DrinkComponent component, ComponentInit args)
+        {
+            component.Opened = component.DefaultToOpened;
+
+            var owner = EntityManager.GetEntity(uid);
+            if (owner.TryGetComponent(out DrainableSolutionComponent? existingDrainable))
+            {
+                // Beakers have Drink component but they should use the existing Drainable
+                component.SolutionName = existingDrainable.Solution;
+            }
+            else
+            {
+                _solutionContainerSystem.EnsureSolution(owner, component.SolutionName);
+            }
+
+            component.UpdateAppearance();
+        }
+
+
+        private void OnSolutionChange(EntityUid uid, DrinkComponent component, SolutionChangedEvent args)
+        {
+            component.UpdateAppearance();
+        }
+    }
+}