Revert 'Revert 'Solution Entities'' (space-wizards#23168)

Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs

@@ -4,9 +4,6 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Administration.UI.ManageSolutions

Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs

@@ -20,7 +20,7 @@ public sealed partial class EditSolutionsWindow : DefaultWindow
         private NetEntity _target = NetEntity.Invalid;
         private string? _selectedSolution;
         private AddReagentWindow? _addReagentWindow;
-        private Dictionary<string, Solution>? _solutions;
+        private Dictionary<string, EntityUid>? _solutions;
 
         public EditSolutionsWindow()
         {
@@ -60,9 +60,11 @@ public void UpdateReagents()
             if (_selectedSolution == null || _solutions == null)
                 return;
 
-            if (!_solutions.TryGetValue(_selectedSolution, out var solution))
+            if (!_solutions.TryGetValue(_selectedSolution, out var solutionId) ||
+                !_entityManager.TryGetComponent(solutionId, out SolutionComponent? solutionComp))
                 return;
 
+            var solution = solutionComp.Solution;
             UpdateVolumeBox(solution);
             UpdateThermalBox(solution);
 
@@ -198,10 +200,13 @@ private void AddReagentEntry(ReagentQuantity reagentQuantity)
         /// </summary>
         private void SetReagent(FloatSpinBox.FloatSpinBoxEventArgs args, string prototype)
         {
-            if (_solutions == null || _selectedSolution == null)
+            if (_solutions == null || _selectedSolution == null ||
+                !_solutions.TryGetValue(_selectedSolution, out var solutionId) ||
+                !_entityManager.TryGetComponent(solutionId, out SolutionComponent? solutionComp))
                 return;
 
-            var current = _solutions[_selectedSolution].GetTotalPrototypeQuantity(prototype);
+            var solution = solutionComp.Solution;
+            var current = solution.GetTotalPrototypeQuantity(prototype);
             var delta = args.Value - current.Float();
 
             if (MathF.Abs(delta) < 0.01)
@@ -275,22 +280,38 @@ private void SolutionSelected(OptionButton.ItemSelectedEventArgs args)
         /// <summary>
         ///     Update the solution options.
         /// </summary>
-        public void UpdateSolutions(Dictionary<string, Solution>? solutions)
+        public void UpdateSolutions(List<(string, NetEntity)>? solutions)
         {
             SolutionOption.Clear();
-            _solutions = solutions;
+
+            if (solutions is { Count: > 0 })
+            {
+                if (_solutions is { Count: > 0 })
+                    _solutions.Clear();
+                else
+                    _solutions = new(solutions.Count);
+
+                foreach (var (name, netSolution) in solutions)
+                {
+                    if (_entityManager.TryGetEntity(netSolution, out var solution))
+                        _solutions.Add(name, solution.Value);
+                }
+            }
+            else
+                _solutions = null;
 
             if (_solutions == null)
                 return;
 
             int i = 0;
-            foreach (var solution in _solutions.Keys)
+            int selectedIndex = 0; // Default to the first solution if none are found.
+            foreach (var (name, _) in _solutions)
             {
-                SolutionOption.AddItem(solution, i);
-                SolutionOption.SetItemMetadata(i, solution);
+                SolutionOption.AddItem(name, i);
+                SolutionOption.SetItemMetadata(i, name);
 
-                if (solution == _selectedSolution)
-                    SolutionOption.Select(i);
+                if (name == _selectedSolution)
+                    selectedIndex = i;
 
                 i++;
             }
@@ -300,14 +321,11 @@ public void UpdateSolutions(Dictionary<string, Solution>? solutions)
                 // No applicable solutions
                 Close();
                 Dispose();
+                return;
             }
 
-            if (_selectedSolution == null || !_solutions.ContainsKey(_selectedSolution))
-            {
-                // the previously selected solution is no longer valid.
-                SolutionOption.Select(0);
-                _selectedSolution = (string?) SolutionOption.SelectedMetadata;
-            }
+            SolutionOption.Select(selectedIndex);
+            _selectedSolution = (string?) SolutionOption.SelectedMetadata;
         }
     }
 }

Content.Client/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Client.Chemistry.Containers.EntitySystems;
+
+public sealed partial class SolutionContainerSystem : SharedSolutionContainerSystem
+{
+}

Content.Client/Kitchen/UI/GrinderMenu.xaml.cs

@@ -1,11 +1,9 @@
 using Content.Client.UserInterface.Controls;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Kitchen;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 
@@ -15,7 +13,7 @@ namespace Content.Client.Kitchen.UI
     public sealed partial class GrinderMenu : FancyWindow
     {
         private readonly IEntityManager _entityManager;
-        private readonly IPrototypeManager _prototypeManager ;
+        private readonly IPrototypeManager _prototypeManager;
         private readonly ReagentGrinderBoundUserInterface _owner;
 
         private readonly Dictionary<int, EntityUid> _chamberVisualContents = new();
@@ -122,8 +120,8 @@ private void RefreshContentsDisplay(IList<ReagentQuantity>? reagents, IReadOnlyL
             {
                 foreach (var (reagent, quantity) in reagents)
                 {
-                    var reagentName = _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto) 
-                        ? Loc.GetString($"{quantity} {proto.LocalizedName}") 
+                    var reagentName = _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto)
+                        ? Loc.GetString($"{quantity} {proto.LocalizedName}")
                         : "???";
                     BeakerContentBox.BoxContents.AddItem(reagentName);
                 }

Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs

@@ -1,11 +1,9 @@
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Kitchen.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Graphics;
 
 namespace Content.Client.Kitchen.UI
 {

Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs

@@ -1,5 +1,5 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
@@ -51,7 +51,7 @@ public async Task TryAddTwoNonReactiveReagent()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SolutionContainerSystem>();
         var testMap = await pair.CreateTestMap();
         var coordinates = testMap.GridCoords;
 
@@ -67,11 +67,11 @@ await server.WaitAssertion(() =>
 
             beaker = entityManager.SpawnEntity("SolutionTarget", coordinates);
             Assert.That(containerSystem
-                .TryGetSolution(beaker, "beaker", out var solution));
+                .TryGetSolution(beaker, "beaker", out var solutionEnt, out var solution));
 
             solution.AddSolution(originalWater, protoMan);
             Assert.That(containerSystem
-                .TryAddSolution(beaker, solution, oilAdded));
+                .TryAddSolution(solutionEnt.Value, oilAdded));
 
             var water = solution.GetTotalPrototypeQuantity("Water");
             var oil = solution.GetTotalPrototypeQuantity("Oil");
@@ -97,7 +97,7 @@ public async Task TryAddTooMuchNonReactiveReagent()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SolutionContainerSystem>();
         var coordinates = testMap.GridCoords;
 
         EntityUid beaker;
@@ -112,11 +112,11 @@ await server.WaitAssertion(() =>
 
             beaker = entityManager.SpawnEntity("SolutionTarget", coordinates);
             Assert.That(containerSystem
-                .TryGetSolution(beaker, "beaker", out var solution));
+                .TryGetSolution(beaker, "beaker", out var solutionEnt, out var solution));
 
             solution.AddSolution(originalWater, protoMan);
             Assert.That(containerSystem
-                .TryAddSolution(beaker, solution, oilAdded), Is.False);
+                .TryAddSolution(solutionEnt.Value, oilAdded), Is.False);
 
             var water = solution.GetTotalPrototypeQuantity("Water");
             var oil = solution.GetTotalPrototypeQuantity("Oil");
@@ -141,7 +141,7 @@ public async Task TryMixAndOverflowTooMuchReagent()
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
         var testMap = await pair.CreateTestMap();
-        var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SolutionContainerSystem>();
         var coordinates = testMap.GridCoords;
 
         EntityUid beaker;
@@ -158,11 +158,11 @@ await server.WaitAssertion(() =>
 
             beaker = entityManager.SpawnEntity("SolutionTarget", coordinates);
             Assert.That(containerSystem
-                .TryGetSolution(beaker, "beaker", out var solution));
+                .TryGetSolution(beaker, "beaker", out var solutionEnt, out var solution));
 
             solution.AddSolution(originalWater, protoMan);
             Assert.That(containerSystem
-                .TryMixAndOverflow(beaker, solution, oilAdded, threshold, out var overflowingSolution));
+                .TryMixAndOverflow(solutionEnt.Value, oilAdded, threshold, out var overflowingSolution));
 
             Assert.Multiple(() =>
             {
@@ -194,7 +194,7 @@ public async Task TryMixAndOverflowTooBigOverflow()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SolutionContainerSystem>();
         var testMap = await pair.CreateTestMap();
         var coordinates = testMap.GridCoords;
 
@@ -212,11 +212,11 @@ await server.WaitAssertion(() =>
 
             beaker = entityManager.SpawnEntity("SolutionTarget", coordinates);
             Assert.That(containerSystem
-                .TryGetSolution(beaker, "beaker", out var solution));
+                .TryGetSolution(beaker, "beaker", out var solutionEnt, out var solution));
 
             solution.AddSolution(originalWater, protoMan);
             Assert.That(containerSystem
-                .TryMixAndOverflow(beaker, solution, oilAdded, threshold, out _),
+                .TryMixAndOverflow(solutionEnt.Value, oilAdded, threshold, out _),
                 Is.False);
         });
 

Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs

@@ -1,11 +1,11 @@
-using System.Linq;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.IntegrationTests.Tests.Chemistry
 {
@@ -34,39 +34,39 @@ public async Task TryAllTest()
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
             var testMap = await pair.CreateTestMap();
             var coordinates = testMap.GridCoords;
-            var solutionSystem = server.ResolveDependency<IEntitySystemManager>()
-                .GetEntitySystem<SolutionContainerSystem>();
+            var solutionContainerSystem = entityManager.System<SolutionContainerSystem>();
 
             foreach (var reactionPrototype in prototypeManager.EnumeratePrototypes<ReactionPrototype>())
             {
                 //since i have no clue how to isolate each loop assert-wise im just gonna throw this one in for good measure
                 Console.WriteLine($"Testing {reactionPrototype.ID}");
 
                 EntityUid beaker = default;
-                Solution component = null;
+                Entity<SolutionComponent>? solutionEnt = default!;
+                Solution solution = null;
 
                 await server.WaitAssertion(() =>
                 {
                     beaker = entityManager.SpawnEntity("TestSolutionContainer", coordinates);
-                    Assert.That(solutionSystem
-                        .TryGetSolution(beaker, "beaker", out component));
+                    Assert.That(solutionContainerSystem
+                        .TryGetSolution(beaker, "beaker", out solutionEnt, out solution));
                     foreach (var (id, reactant) in reactionPrototype.Reactants)
                     {
 #pragma warning disable NUnit2045
-                        Assert.That(solutionSystem
-                            .TryAddReagent(beaker, component, id, reactant.Amount, out var quantity));
+                        Assert.That(solutionContainerSystem
+                            .TryAddReagent(solutionEnt.Value, id, reactant.Amount, out var quantity));
                         Assert.That(reactant.Amount, Is.EqualTo(quantity));
 #pragma warning restore NUnit2045
                     }
 
-                    solutionSystem.SetTemperature(beaker, component, reactionPrototype.MinimumTemperature);
+                    solutionContainerSystem.SetTemperature(solutionEnt.Value, reactionPrototype.MinimumTemperature);
 
                     if (reactionPrototype.MixingCategories != null)
                     {
                         var dummyEntity = entityManager.SpawnEntity(null, MapCoordinates.Nullspace);
                         var mixerComponent = entityManager.AddComponent<ReactionMixerComponent>(dummyEntity);
                         mixerComponent.ReactionTypes = reactionPrototype.MixingCategories;
-                        solutionSystem.UpdateChemicals(beaker, component, true, mixerComponent);
+                        solutionContainerSystem.UpdateChemicals(solutionEnt.Value, true, mixerComponent);
                     }
                 });
 
@@ -79,7 +79,7 @@ await server.WaitAssertion(() =>
                     var foundProductsMap = reactionPrototype.Products
                         .Concat(reactionPrototype.Reactants.Where(x => x.Value.Catalyst).ToDictionary(x => x.Key, x => x.Value.Amount))
                         .ToDictionary(x => x, _ => false);
-                    foreach (var (reagent, quantity) in component.Contents)
+                    foreach (var (reagent, quantity) in solution.Contents)
                     {
                         Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.Prototype && x.Key.Value == quantity, out var foundProduct));
                         foundProductsMap[foundProduct.Value.Key] = true;