Fix #306 Wrong temperature handling in fluid products (#490)

shpaass · web-flow · commit 344729ca1881 · 2025-06-05T10:54:32.000+02:00
This closes #306, by both fixing the fluid temperature when data.raw doesn't specify it, and by changing the recipe selection to only show recipes for the selected ingredient variant. There's also some refactoring that happened while I was trying to make OpenProductDropdown__dropDownContent less messy.
diff --git a/Yafc.Model.Tests/Model/ProductionTableContentTests.cs b/Yafc.Model.Tests/Model/ProductionTableContentTests.cs
@@ -139,7 +139,7 @@ public async Task AllCombinationsWithVariousFixedCounts_DisplayedProductsMatchSc
 
                         foreach (var (display, solver) in row.Ingredients.Zip(((IRecipeRow)row).IngredientsForSolver)) {
                             var (solverGoods, solverAmount, _, _) = solver;
-                            var (displayGoods, displayAmount, _, _) = display;
+                            var (displayGoods, displayAmount, _) = display;
 
                             try {
                                 // If this fails, something weird went wrong
@@ -211,7 +211,7 @@ private static void RunTest(RecipeRow row, Action<RecipeRow, ProductionTable, Ac
 
         // Ensure that the fuel consumption remains constant, except when the entity and fuel change simultaneously.
         row.fixedFuel = true;
-        ((Goods oldFuel, _), float fuelAmount, _, _) = row.FuelInformation;
+        ((Goods oldFuel, _), float fuelAmount, _) = row.FuelInformation;
         testCombinations(row, table, testFuel(row, table));
         row.fixedFuel = false;
 
@@ -243,7 +243,7 @@ Action testFuel(RecipeRow row, ProductionTable table) => () => {
                 row.fixedBuildings = 1;
                 row.fixedFuel = true;
                 table.Solve((ProjectPage)table.owner).Wait();
-                ((oldFuel, _), fuelAmount, _, _) = row.FuelInformation;
+                ((oldFuel, _), fuelAmount, _) = row.FuelInformation;
                 assertCalls++;
             }
         };
diff --git a/Yafc.Model.Tests/Model/SelectableVariantsTests.cs b/Yafc.Model.Tests/Model/SelectableVariantsTests.cs
@@ -19,7 +19,7 @@ public async Task CanSelectVariantFuel_VariantFuelChanges() {
         await table.Solve((ProjectPage)table.owner);
         Assert.Equal("steam@165", row.FuelInformation.Goods.target.name);
 
-        row.fuel = row.FuelInformation.Variants[1].With(Quality.Normal);
+        row.fuel = row.FuelInformation.Goods.target.fluid.variants[1].With(Quality.Normal);
         await table.Solve((ProjectPage)table.owner);
         Assert.Equal("steam@500", row.FuelInformation.Goods.target.name);
     }
@@ -38,7 +38,7 @@ public async Task CanSelectVariantFuelWithFavorites_VariantFuelChanges() {
         await table.Solve((ProjectPage)table.owner);
         Assert.Equal("steam@500", row.FuelInformation.Goods.target.name);
 
-        row.fuel = row.FuelInformation.Variants[0].With(Quality.Normal);
+        row.fuel = row.FuelInformation.Goods.target.fluid.variants[0].With(Quality.Normal);
         await table.Solve((ProjectPage)table.owner);
         Assert.Equal("steam@165", row.FuelInformation.Goods.target.name);
     }
@@ -56,7 +56,7 @@ public async Task CanSelectVariantIngredient_VariantIngredientChanges() {
         await table.Solve((ProjectPage)table.owner);
         Assert.Equal("steam@165", row.Ingredients.Single().Goods.target.name);
 
-        row.ChangeVariant(row.Ingredients.Single().Goods.target, row.Ingredients.Single().Variants[1]);
+        row.ChangeVariant(row.Ingredients.Single().Goods.target, row.Ingredients.Single().Goods.target.fluid.variants[1]);
         await table.Solve((ProjectPage)table.owner);
         Assert.Equal("steam@500", row.Ingredients.Single().Goods.target.name);
     }
diff --git a/Yafc.Model/Model/ProductionTable.cs b/Yafc.Model/Model/ProductionTable.cs
@@ -18,8 +18,10 @@ public struct ProductionTableFlow(IObjectWithQuality<Goods> goods, float amount,
     public IProductionLink? link = link;
 }
 
+[DeserializeWithNonPublicConstructor]
 public sealed partial class ProductionTable : ProjectPageContents, IComparer<ProductionTableFlow>, IElementGroup<RecipeRow> {
     private static readonly ILogger logger = Logging.GetLogger<ProductionTable>();
+    private readonly ProductionTable rootTable;
     [SkipSerialization] public Dictionary<IObjectWithQuality<Goods>, IProductionLink> linkMap { get; } = [];
     List<RecipeRow> IElementGroup<RecipeRow>.elements => recipes;
     [NoUndo]
@@ -43,12 +45,26 @@ public sealed partial class ProductionTable : ProjectPageContents, IComparer<Pro
     public ModuleFillerParameters? modules { get; } // If you add a setter for this, ensure it calls RecipeRow.ModuleFillerParametersChanging().
     public bool containsDesiredProducts { get; private set; }
 
-    public ProductionTable(ModelObject owner) : base(owner) {
-        if (owner is ProjectPage) {
+    // For deserialization
+    private ProductionTable(ModelObject owner) : base(owner) {
+        if (owner is RecipeRow row) {
+            rootTable = row.owner.rootTable;
+        }
+        else {
             modules = new ModuleFillerParameters(this);
+            rootTable = this;
         }
     }
 
+    // For the ProjectPage constructor
+    public ProductionTable(ProjectPage owner) : base(owner) {
+        modules = new ModuleFillerParameters(this);
+        rootTable = this;
+    }
+
+    // For creating nested tables
+    public ProductionTable(RecipeRow owner) : base(owner) => rootTable = owner.owner.rootTable;
+
     protected internal override void ThisChanged(bool visualOnly) {
         RebuildLinkMap();
         if (owner is ProjectPage page) {
@@ -775,5 +791,45 @@ public int Compare(ProductionTableFlow x, ProductionTableFlow y) {
 
         return amt1.CompareTo(amt2);
     }
-}
 
+    /// <summary>
+    /// Returns <see langword="true"/> if this table (including its parent recipe, if applicable) contains the specified recipe at the specified quality.
+    /// </summary>
+    public bool Contains(IObjectWithQuality<RecipeOrTechnology> obj) {
+        if (owner is RecipeRow { recipe: IObjectWithQuality<RecipeOrTechnology> recipe } && recipe == obj) {
+            return true;
+        }
+        return recipes.Any(r => r.recipe == obj);
+    }
+
+    /// <summary>
+    /// Returns <see langword="true"/> if this table (including its parent recipe, if applicable) contains the specified recipe at any quality.
+    /// </summary>
+    /// <remarks>This is most commonly used for deciding whether to draw a green checkmark.</remarks>
+    public bool Contains(RecipeOrTechnology obj) {
+        if (owner is RecipeRow { recipe.target: RecipeOrTechnology recipe } && recipe == obj) {
+            return true;
+        }
+        return recipes.Any(r => r.recipe.target == obj);
+    }
+
+    /// <summary>
+    /// Returns <see langword="true"/> if the specified recipe appears at the specified quality anywhere on this table's <see cref="ProjectPage"/>.
+    /// </summary>
+    public bool ContainsAnywhere(IObjectWithQuality<RecipeOrTechnology> obj) => rootTable.GetAllRecipes().Any(r => r.recipe == obj);
+
+    /// <summary>
+    /// Returns <see langword="true"/> if the specified recipe appears at any quality anywhere on this table's <see cref="ProjectPage"/>.
+    /// </summary>
+    /// <remarks>This is most commonly used for deciding whether to draw a yellow checkmark.</remarks>
+    public bool ContainsAnywhere(RecipeOrTechnology obj) => rootTable.GetAllRecipes().Any(r => r.recipe.target == obj);
+
+    public bool CreateLink(IObjectWithQuality<Goods> goods) {
+        if (linkMap.GetValueOrDefault(goods) is ProductionLink || !goods.target.isLinkable) {
+            return false;
+        }
+
+        this.RecordUndo().links.Add(new(this, goods.target.With(goods.quality)));
+        return true;
+    }
+}
diff --git a/Yafc.Model/Model/ProductionTableContent.cs b/Yafc.Model/Model/ProductionTableContent.cs
@@ -481,14 +481,14 @@ public ModuleTemplate? modules {
     public HashSet<FactorioObject> variants { get; } = [];
     [SkipSerialization] public ProductionTable linkRoot => subgroup ?? owner;
 
-    public RecipeRowIngredient FuelInformation => new(fuel, fuelUsagePerSecond, links.fuel, (fuel?.target as Fluid)?.variants?.ToArray());
+    public RecipeRowIngredient FuelInformation => new(fuel, fuelUsagePerSecond, links.fuel);
     public IEnumerable<RecipeRowIngredient> Ingredients {
         get {
             if (hierarchyEnabled) {
                 return BuildIngredients(false).Select(RecipeRowIngredient.FromSolver);
             }
             else {
-                return Enumerable.Repeat(new RecipeRowIngredient(null, 0, null, null), recipe.target.ingredients.Length);
+                return Enumerable.Repeat(new RecipeRowIngredient(null, 0, null), recipe.target.ingredients.Length);
             }
         }
     }
@@ -909,18 +909,26 @@ public IEnumerable<string> LinkWarnings {
             }
         }
     }
+
+    public bool Destroy() {
+        if (owner.links.Contains(this)) {
+            _ = owner.RecordUndo().links.Remove(this);
+            return true;
+        }
+        return false;
+    }
 }
 
 /// <summary>
 /// An ingredient for a recipe row, as reported to the UI.
 /// </summary>
-public record RecipeRowIngredient(IObjectWithQuality<Goods>? Goods, float Amount, ProductionLink? Link, Goods[]? Variants) {
+public record RecipeRowIngredient(IObjectWithQuality<Goods>? Goods, float Amount, ProductionLink? Link) {
     /// <summary>
     /// Convert from a <see cref="SolverIngredient"/> (the form initially generated when reporting ingredients) to a
     /// <see cref="RecipeRowIngredient"/>.
     /// </summary>
     internal static RecipeRowIngredient FromSolver(SolverIngredient value)
-        => new(value.Goods, value.Amount, value.Link as ProductionLink, value.Goods.target.fluid?.variants?.ToArray());
+        => new(value.Goods, value.Amount, value.Link as ProductionLink);
 }
 
 /// <summary>
diff --git a/Yafc.Parser/Data/FactorioDataDeserializer.cs b/Yafc.Parser/Data/FactorioDataDeserializer.cs
@@ -127,10 +127,11 @@ public Project LoadData(string projectPath, LuaTable data, LuaTable prototypes,
         }
 
         allModules.AddRange(allObjects.OfType<Module>());
-        progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingTiles));
-        DeserializePrototypes(raw, "tile", DeserializeTile, progress, errorCollector);
         progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingFluids));
         DeserializePrototypes(raw, "fluid", DeserializeFluid, progress, errorCollector);
+        progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingTiles));
+        // pumpable tiles depend on fluids, so they can read the default fluid temperature
+        DeserializePrototypes(raw, "tile", DeserializeTile, progress, errorCollector);
         progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingRecipes));
         DeserializePrototypes(raw, "recipe", DeserializeRecipe, progress, errorCollector);
         progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingLocations));
@@ -627,7 +628,9 @@ private void DeserializeTile(LuaTable table, ErrorCollector _) {
         var tile = DeserializeCommon<Tile>(table, "tile");
 
         if (table.Get("fluid", out string? fluid)) {
-            Fluid pumpingFluid = GetObject<Fluid>(fluid);
+            Fluid baseFluid = GetObject<Fluid>(fluid);
+            // Explicitly produce this fluid at the default temperature, to ensure the temperature split is created.
+            Fluid pumpingFluid = GetFluidFixedTemp(fluid, baseFluid.temperatureRange.min);
             tile.Fluid = pumpingFluid;
 
             string recipeCategory = SpecialNames.PumpingRecipe + "tile";
@@ -667,9 +670,16 @@ private void DeserializeFluid(LuaTable table, ErrorCollector _) {
                     return GetObject<Item>(table);
                 }
                 else if (type == "fluid") {
-                    if (useTemperature && table.Get("temperature", out int temperature)) {
-                        return GetFluidFixedTemp(name, temperature);
+                    if (useTemperature) {
+                        if (table.Get("temperature", out int temperature)) {
+                            return GetFluidFixedTemp(name, temperature);
+                        }
+                        else {
+                            // If the temperature isn't specified, produce the default (minimum) temperature
+                            return GetFluidFixedTemp(name, GetObject<Fluid>(table).temperatureRange.min);
+                        }
                     }
+
                     return GetObject<Fluid>(table);
                 }
             }
diff --git a/Yafc/Workspace/ProductionTable/ProductionTableView.cs b/Yafc/Workspace/ProductionTable/ProductionTableView.cs
diff --git a/changelog.txt b/changelog.txt

Original file line number	Diff line number	Diff line change
`@@ -481,14 +481,14 @@ public ModuleTemplate? modules {`
`481`	`481`	`public HashSet<FactorioObject> variants { get; } = [];`
`482`	`482`	`[SkipSerialization] public ProductionTable linkRoot => subgroup ?? owner;`
`483`	`483`
`484`		`- public RecipeRowIngredient FuelInformation => new(fuel, fuelUsagePerSecond, links.fuel, (fuel?.target as Fluid)?.variants?.ToArray());`
	`484`	`+ public RecipeRowIngredient FuelInformation => new(fuel, fuelUsagePerSecond, links.fuel);`
`485`	`485`	`public IEnumerable<RecipeRowIngredient> Ingredients {`
`486`	`486`	`get {`
`487`	`487`	`if (hierarchyEnabled) {`
`488`	`488`	`return BuildIngredients(false).Select(RecipeRowIngredient.FromSolver);`
`489`	`489`	`}`
`490`	`490`	`else {`
`491`		`- return Enumerable.Repeat(new RecipeRowIngredient(null, 0, null, null), recipe.target.ingredients.Length);`
	`491`	`+ return Enumerable.Repeat(new RecipeRowIngredient(null, 0, null), recipe.target.ingredients.Length);`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`	`}`
`@@ -909,18 +909,26 @@ public IEnumerable<string> LinkWarnings {`
`909`	`909`	`}`
`910`	`910`	`}`
`911`	`911`	`}`
	`912`	`+`
	`913`	`+ public bool Destroy() {`
	`914`	`+ if (owner.links.Contains(this)) {`
	`915`	`+ _ = owner.RecordUndo().links.Remove(this);`
	`916`	`+ return true;`
	`917`	`+ }`
	`918`	`+ return false;`
	`919`	`+ }`
`912`	`920`	`}`
`913`	`921`
`914`	`922`	`/// <summary>`
`915`	`923`	`/// An ingredient for a recipe row, as reported to the UI.`
`916`	`924`	`/// </summary>`
`917`		`-public record RecipeRowIngredient(IObjectWithQuality<Goods>? Goods, float Amount, ProductionLink? Link, Goods[]? Variants) {`
	`925`	`+public record RecipeRowIngredient(IObjectWithQuality<Goods>? Goods, float Amount, ProductionLink? Link) {`
`918`	`926`	`/// <summary>`
`919`	`927`	`/// Convert from a <see cref="SolverIngredient"/> (the form initially generated when reporting ingredients) to a`
`920`	`928`	`/// <see cref="RecipeRowIngredient"/>.`
`921`	`929`	`/// </summary>`
`922`	`930`	`internal static RecipeRowIngredient FromSolver(SolverIngredient value)`
`923`		`- => new(value.Goods, value.Amount, value.Link as ProductionLink, value.Goods.target.fluid?.variants?.ToArray());`
	`931`	`+ => new(value.Goods, value.Amount, value.Link as ProductionLink);`
`924`	`932`	`}`
`925`	`933`
`926`	`934`	`/// <summary>`