From ef43f10b3cf338972607d4228ae0135f9602cf61 Mon Sep 17 00:00:00 2001
From: "Dr. Njitram" <martijn.gobes@gmail.com>
Date: Wed, 20 Nov 2024 17:06:46 +0100
Subject: [PATCH] Fix Milk mess (#278)

Co-authored-by: Zachary Picco <zacharypicco@gmail.com>
---
 changelog.txt    |  7 ++++++-
 data-updates.lua | 47 ++++++-----------------------------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 94f6f652..e92ca756 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,10 @@
 ---------------------------------------------------------------------------------------------------
-Version: 3.0.25
+Version: 3.0.27
+Date: ????
+  Changes:
+    - Fixed milk barreling recipes did not work. https://github.com/pyanodon/pyalienlife/pull/278
+---------------------------------------------------------------------------------------------------
+Version: 3.0.26
 Date: 2024-11-20
   Changes:
     - Removed the server administrator requirement when selecting turd upgrades.
diff --git a/data-updates.lua b/data-updates.lua
index 3ce40491..499a1227 100644
--- a/data-updates.lua
+++ b/data-updates.lua
@@ -193,47 +193,12 @@ require "prototypes.module_restrictions"
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 
---remove steel barrel based milk
-data.raw.item["milk-barrel"] = nil
-RECIPE("milk-barrel"):remove_unlock("fluid-handling")
-data.raw.recipe["milk-barrel"] = nil
-
---RECIPES UPDATES
-
---Updating base milk barrel with icons. replacing base recipes with py copies to use the right barrel
-
-RECIPE {
-    type = "recipe",
-    name = "fill-milk-barrel",
-    category = "py-barreling",
-    enabled = false,
-    energy_required = 1,
-    ingredients = {
-        {type = "item",  name = "empty-barrel-milk", amount = 1},
-        {type = "fluid", name = "milk",              amount = 50},
-    },
-    results = {
-        {type = "item", name = "barrel-milk", amount = 1},
-    },
-}:remove_unlock("fluid-handling"):add_unlock("korlex")
-
-RECIPE {
-    type = "recipe",
-    name = "empty-milk-barrel",
-    category = "py-unbarreling",
-    enabled = false,
-    energy_required = 1,
-    ingredients = {
-        {type = "item", name = "barrel-milk", amount = 1},
-    },
-    results = {
-        {type = "item",  name = "empty-barrel-milk", amount = 1},
-        {type = "fluid", name = "milk",              amount = 50},
-    },
-    main_product = "milk",
-    icon = "__pyalienlifegraphics__/graphics/icons/empty-barrel-milk-recipe.png",
-    icon_size = 64,
-}:remove_unlock("fluid-handling"):add_unlock("korlex")
+--Fix up the milk barrel recipes with new ingredients and icons
+RECIPE("milk-barrel"):remove_unlock("fluid-handling"):add_unlock("korlex"):replace_ingredient("barrel", "empty-barrel-milk"):set_fields {results = {{type = "item", name = "barrel-milk", amount = 1}}}
+RECIPE("milk-barrel").icons = {{icon = "__pyalienlifegraphics__/graphics/icons/barrel-milk.png",icon_size = 64}}
+RECIPE("empty-milk-barrel"):remove_unlock("fluid-handling"):add_unlock("korlex"):replace_ingredient("milk-barrel", "barrel-milk"):set_fields {results = {{type = "item",  name = "empty-barrel-milk", amount = 1},{type = "fluid", name = "milk", amount = 50}}}
+RECIPE("empty-milk-barrel").icons = {{icon = "__pyalienlifegraphics__/graphics/icons/empty-barrel-milk-recipe.png",icon_size = 64}}
+
 
 --copy`s of combustion recipes with biomass
 for _, recipe in pairs(data.raw.recipe) do