Add support for printing reagents in lathes (space-wizards#30476)

* Add support for reagents in lathes

* missing locale

Content.Client/Lathe/UI/LatheMenu.xaml

@@ -100,11 +100,9 @@
                             Margin="5 0 0 0"
                             Text="{Loc 'lathe-menu-fabricating-message'}">
                         </Label>
-                        <EntityPrototypeView
-                            Name="FabricatingEntityProto"
-                            HorizontalAlignment="Left"
-                            Margin="100 0 0 0"
-                             />
+                        <BoxContainer Name="FabricatingDisplayContainer"
+                                      HorizontalAlignment="Left"
+                                      Margin="100 0 0 0"/>
                         <Label
                             Name="NameLabel"
                             RectClipContent="True"

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -1,18 +1,15 @@
-using System.Buffers;
 using System.Linq;
 using System.Text;
 using Content.Client.Materials;
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.ResourceManagement;
-using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lathe.UI;
@@ -92,7 +89,7 @@ public void PopulateRecipes()
 
             if (SearchBar.Text.Trim().Length != 0)
             {
-                if (proto.Name.ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
+                if (_lathe.GetRecipeName(recipe).ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
                     recipesToShow.Add(proto);
             }
             else
@@ -104,19 +101,15 @@ public void PopulateRecipes()
         if (!int.TryParse(AmountLineEdit.Text, out var quantity) || quantity <= 0)
             quantity = 1;
 
-        var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name);
+        var sortedRecipesToShow = recipesToShow.OrderBy(_lathe.GetRecipeName);
         RecipeList.Children.Clear();
         _entityManager.TryGetComponent(Entity, out LatheComponent? lathe);
 
         foreach (var prototype in sortedRecipesToShow)
         {
-            EntityPrototype? recipeProto = null;
-            if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto))
-                recipeProto = entityProto;
-
             var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe);
 
-            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, recipeProto);
+            var control = new RecipeControl(_lathe, prototype, () => GenerateTooltipText(prototype), canProduce, GetRecipeDisplayControl(prototype));
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -132,9 +125,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
         StringBuilder sb = new();
         var multiplier = _entityManager.GetComponent<LatheComponent>(Entity).MaterialUseMultiplier;
 
-        foreach (var (id, amount) in prototype.RequiredMaterials)
+        foreach (var (id, amount) in prototype.Materials)
         {
-            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+            if (!_prototypeManager.TryIndex(id, out var proto))
                 continue;
 
             var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier);
@@ -163,8 +156,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
             sb.AppendLine(tooltipText);
         }
 
-        if (!string.IsNullOrWhiteSpace(prototype.Description))
-            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+        var desc = _lathe.GetRecipeDescription(prototype);
+        if (!string.IsNullOrWhiteSpace(desc))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", desc)));
 
         // Remove last newline
         if (sb.Length > 0)
@@ -222,13 +216,10 @@ public void PopulateQueueList(List<LatheRecipePrototype> queue)
             var queuedRecipeBox = new BoxContainer();
             queuedRecipeBox.Orientation = BoxContainer.LayoutOrientation.Horizontal;
 
-            var queuedRecipeProto = new EntityPrototypeView();
-            queuedRecipeBox.AddChild(queuedRecipeProto);
-            if (_prototypeManager.TryIndex(recipe.Result, out EntityPrototype? entityProto) && entityProto != null)
-                queuedRecipeProto.SetPrototype(entityProto);
+            queuedRecipeBox.AddChild(GetRecipeDisplayControl(recipe));
 
             var queuedRecipeLabel = new Label();
-            queuedRecipeLabel.Text = $"{idx}. {recipe.Name}";
+            queuedRecipeLabel.Text = $"{idx}. {_lathe.GetRecipeName(recipe)}";
             queuedRecipeBox.AddChild(queuedRecipeLabel);
             QueueList.AddChild(queuedRecipeBox);
             idx++;
@@ -241,10 +232,29 @@ public void SetQueueInfo(LatheRecipePrototype? recipe)
         if (recipe == null)
             return;
 
-        if (_prototypeManager.TryIndex(recipe.Result, out EntityPrototype? entityProto) && entityProto != null)
-            FabricatingEntityProto.SetPrototype(entityProto);
+        FabricatingDisplayContainer.Children.Clear();
+        FabricatingDisplayContainer.AddChild(GetRecipeDisplayControl(recipe));
+
+        NameLabel.Text = _lathe.GetRecipeName(recipe);
+    }
+
+    public Control GetRecipeDisplayControl(LatheRecipePrototype recipe)
+    {
+        if (recipe.Icon != null)
+        {
+            var textRect = new TextureRect();
+            textRect.Texture = _spriteSystem.Frame0(recipe.Icon);
+            return textRect;
+        }
+
+        if (recipe.Result is { } result)
+        {
+            var entProtoView = new EntityPrototypeView();
+            entProtoView.SetPrototype(result);
+            return entProtoView;
+        }
 
-        NameLabel.Text = $"{recipe.Name}";
+        return new Control();
     }
 
     private void OnItemSelected(OptionButton.ItemSelectedEventArgs obj)

Content.Client/Lathe/UI/RecipeControl.xaml

@@ -5,8 +5,8 @@
         Margin="0"
         StyleClasses="ButtonSquare">
         <BoxContainer Orientation="Horizontal">
-            <EntityPrototypeView
-                Name="RecipePrototype"
+            <BoxContainer
+                Name="RecipeDisplayContainer"
                 Margin="0 0 4 0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"

Content.Client/Lathe/UI/RecipeControl.xaml.cs

@@ -1,10 +1,7 @@
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lathe.UI;
 
@@ -14,13 +11,12 @@ public sealed partial class RecipeControl : Control
     public Action<string>? OnButtonPressed;
     public Func<string> TooltipTextSupplier;
 
-    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, EntityPrototype? entityPrototype = null)
+    public RecipeControl(LatheSystem latheSystem, LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Control displayControl)
     {
         RobustXamlLoader.Load(this);
 
-        RecipeName.Text = recipe.Name;
-        if (entityPrototype != null)
-            RecipePrototype.SetPrototype(entityPrototype);
+        RecipeName.Text = latheSystem.GetRecipeName(recipe);
+        RecipeDisplayContainer.AddChild(displayControl);
         Button.Disabled = !canProduce;
         TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;

Content.IntegrationTests/Tests/MaterialArbitrageTest.cs

@@ -193,7 +193,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (spawnedMats.TryGetValue(matId, out var numSpawned))
@@ -273,7 +273,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (deconstructedMats.TryGetValue(matId, out var numSpawned))
@@ -328,7 +328,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (compositionComponent.MaterialComposition.TryGetValue(matId, out var numSpawned))

Content.Server/Cargo/Systems/PricingSystem.cs

@@ -16,6 +16,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Research.Prototypes;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -158,6 +159,26 @@ private double GetMaterialPrice(PhysicalCompositionComponent component)
         return price;
     }
 
+    public double GetLatheRecipePrice(LatheRecipePrototype recipe)
+    {
+        var price = 0.0;
+
+        if (recipe.Result is { } result)
+        {
+            price += GetEstimatedPrice(_prototypeManager.Index(result));
+        }
+
+        if (recipe.ResultReagents is { } resultReagents)
+        {
+            foreach (var (reagent, amount) in resultReagents)
+            {
+                price += (_prototypeManager.Index(reagent).PricePerUnit * amount).Double();
+            }
+        }
+
+        return price;
+    }
+
     /// <summary>
     /// Get a rough price for an entityprototype. Does not consider contained entities.
     /// </summary>

Content.Server/Lathe/LatheSystem.cs

@@ -1,23 +1,29 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Server.Lathe.Components;
 using Content.Server.Materials;
+using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.UserInterface;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
+using Content.Shared.Examine;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
 using Content.Shared.ReagentSpeed;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
+using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -34,9 +40,13 @@ public sealed class LatheSystem : SharedLatheSystem
         [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly ContainerSystem _container = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSys = default!;
         [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+        [Dependency] private readonly PopupSystem _popup = default!;
+        [Dependency] private readonly PuddleSystem _puddle = default!;
         [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
         [Dependency] private readonly StackSystem _stack = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
 
@@ -63,7 +73,6 @@ public override void Initialize()
             SubscribeLocalEvent<EmagLatheRecipesComponent, LatheGetRecipesEvent>(GetEmagLatheRecipes);
             SubscribeLocalEvent<LatheHeatProducingComponent, LatheStartPrintingEvent>(OnHeatStartPrinting);
         }
-
         public override void Update(float frameTime)
         {
             var query = EntityQueryEnumerator<LatheProducingComponent, LatheComponent>();
@@ -119,7 +128,7 @@ private void OnGetWhitelist(EntityUid uid, LatheComponent component, ref GetMate
             {
                 if (!_proto.TryIndex(id, out var proto))
                     continue;
-                foreach (var (mat, _) in proto.RequiredMaterials)
+                foreach (var (mat, _) in proto.Materials)
                 {
                     if (!materialWhitelist.Contains(mat))
                     {
@@ -165,7 +174,7 @@ public bool TryAddToQueue(EntityUid uid, LatheRecipePrototype recipe, LatheCompo
             if (!CanProduce(uid, recipe, 1, component))
                 return false;
 
-            foreach (var (mat, amount) in recipe.RequiredMaterials)
+            foreach (var (mat, amount) in recipe.Materials)
             {
                 var adjustedAmount = recipe.ApplyMaterialDiscount
                     ? (int) (-amount * component.MaterialUseMultiplier)
@@ -211,8 +220,31 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro
 
             if (comp.CurrentRecipe != null)
             {
-                var result = Spawn(comp.CurrentRecipe.Result, Transform(uid).Coordinates);
-                _stack.TryMergeToContacts(result);
+                if (comp.CurrentRecipe.Result is { } resultProto)
+                {
+                    var result = Spawn(resultProto, Transform(uid).Coordinates);
+                    _stack.TryMergeToContacts(result);
+                }
+
+                if (comp.CurrentRecipe.ResultReagents is { } resultReagents &&
+                    comp.ReagentOutputSlotId is { } slotId)
+                {
+                    var toAdd = new Solution(
+                        resultReagents.Select(p => new ReagentQuantity(p.Key.Id, p.Value, null)));
+
+                    // dispense it in the container if we have it and dump it if we don't
+                    if (_container.TryGetContainer(uid, slotId, out var container) &&
+                        container.ContainedEntities.Count == 1 &&
+                        _solution.TryGetFitsInDispenser(container.ContainedEntities.First(), out var solution, out _))
+                    {
+                        _solution.AddSolution(solution.Value, toAdd);
+                    }
+                    else
+                    {
+                        _popup.PopupEntity(Loc.GetString("lathe-reagent-dispense-no-container", ("name", uid)), uid);
+                        _puddle.TrySpillAt(uid, toAdd, out _);
+                    }
+                }
             }
 
             comp.CurrentRecipe = null;
@@ -327,6 +359,7 @@ protected override bool HasRecipe(EntityUid uid, LatheRecipePrototype recipe, La
         {
             return GetAvailableRecipes(uid, component).Contains(recipe.ID);
         }
+
         #region UI Messages
 
         private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component, LatheQueueRecipeMessage args)
@@ -343,8 +376,9 @@ private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component,
                 }
                 if (count > 0)
                 {
-                    _adminLogger.Add(LogType.Action, LogImpact.Low,
-                        $"{ToPrettyString(args.Actor):player} queued {count} {recipe.Name} at {ToPrettyString(uid):lathe}");
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Low,
+                        $"{ToPrettyString(args.Actor):player} queued {count} {GetRecipeName(recipe)} at {ToPrettyString(uid):lathe}");
                 }
             }
             TryStartProducing(uid, component);

Content.Server/UserInterface/StatValuesCommand.cs

@@ -7,7 +7,6 @@
 using Content.Server.Power.Components;
 using Content.Shared.Administration;
 using Content.Shared.Item;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.UserInterface;
 using Content.Shared.Weapons.Melee;
@@ -224,13 +223,13 @@ private StatValuesEuiMessage GetLatheMessage()
         {
             var cost = 0.0;
 
-            foreach (var (material, count) in proto.RequiredMaterials)
+            foreach (var (material, count) in proto.Materials)
             {
-                var materialPrice = _proto.Index<MaterialPrototype>(material).Price;
+                var materialPrice = _proto.Index(material).Price;
                 cost += materialPrice * count;
             }
 
-            var sell = priceSystem.GetEstimatedPrice(_proto.Index<EntityPrototype>(proto.Result));
+            var sell = priceSystem.GetLatheRecipePrice(proto);
 
             values.Add(new[]
             {