From f7524e144960c80239964685a5d4db3d370a5a58 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Fri, 4 Sep 2020 15:05:09 +0100
Subject: [PATCH] update recipes to use water/river-water buckets, also support
 for wooden bucket mod

---
 crops/coffee.lua | 20 +++++++++++++++---
 crops/hemp.lua   | 24 +++++++++++----------
 crops/mint.lua   | 20 ++++++++++++++++--
 food.lua         | 55 ++++++++++++++++++++++++++++++++++--------------
 4 files changed, 87 insertions(+), 32 deletions(-)

diff --git a/crops/coffee.lua b/crops/coffee.lua
index 3fc49a2..f234573 100644
--- a/crops/coffee.lua
+++ b/crops/coffee.lua
@@ -11,7 +11,7 @@ minetest.register_craftitem("farming:coffee_beans", {
 	end
 })
 
--- cold cup of coffee
+-- cup of coffee
 minetest.register_node("farming:coffee_cup", {
 	description = S("Cup of Coffee"),
 	drawtype = "torchlike",
@@ -37,13 +37,27 @@ minetest.register_craft( {
 	type = "shapeless",
 	recipe = {
 		"vessels:drinking_glass", "group:food_coffee",
-		"bucket:bucket_water", "group:food_saucepan"},
+		"group:water_bucket", "group:food_saucepan"},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:water_bucket", "bucket:bucket_empty"},
 		{"group:food_saucepan", "farming:saucepan"}
 	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft( {
+		output = "farming:coffee_cup",
+		type = "shapeless",
+		recipe = {
+			"vessels:drinking_glass", "group:food_coffee",
+			"group:water_bucket_wooden", "group:food_saucepan"},
+		replacements = {
+			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"},
+			{"group:food_saucepan", "farming:saucepan"}
+		}
+	})
+end
+
 -- coffee definition
 local def = {
 	drawtype = "plantlike",
diff --git a/crops/hemp.lua b/crops/hemp.lua
index 08b54cd..03ed4d2 100644
--- a/crops/hemp.lua
+++ b/crops/hemp.lua
@@ -78,21 +78,23 @@ minetest.register_craft( {
 	output = "farming:hemp_fibre 8",
 	recipe = {
 		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "bucket:bucket_water", "farming:hemp_leaf"},
+		{"farming:hemp_leaf", "group:water_bucket", "farming:hemp_leaf"},
 		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
 	},
-	replacements = {{ "bucket:bucket_water", "bucket:bucket_empty"}}
+	replacements = {{"group:water_bucket", "bucket:bucket_empty"}}
 })
 
-minetest.register_craft( {
-	output = "farming:hemp_fibre 8",
-	recipe = {
-		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "bucket:bucket_river_water", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
-	},
-	replacements = {{ "bucket:bucket_river_water", "bucket:bucket_empty"}}
-})
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft( {
+		output = "farming:hemp_fibre 8",
+		recipe = {
+			{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
+			{"farming:hemp_leaf", "group:water_bucket_wooden", "farming:hemp_leaf"},
+			{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
+		},
+		replacements = {{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}}
+	})
+end
 
 -- hemp block
 minetest.register_node("farming:hemp_block", {
diff --git a/crops/mint.lua b/crops/mint.lua
index 05af5de..ae0e670 100644
--- a/crops/mint.lua
+++ b/crops/mint.lua
@@ -33,14 +33,30 @@ minetest.register_craft({
 	recipe = {
 		"vessels:drinking_glass", "group:food_mint",
 		"group:food_mint", "group:food_mint",
-		"farming:juicer", "bucket:bucket_water"
+		"farming:juicer", "group:water_bucket"
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"},
-		{"bucket:bucket_water", "bucket:bucket_empty"}
+		{"group:water_bucket", "bucket:bucket_empty"}
 	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft({
+		output = "farming:mint_tea",
+		type = "shapeless",
+		recipe = {
+			"vessels:drinking_glass", "group:food_mint",
+			"group:food_mint", "group:food_mint",
+			"farming:juicer", "group:water_bucket_wooden"
+		},
+		replacements = {
+			{"group:food_juicer", "farming:juicer"},
+			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}
+		}
+	})
+end
+
 -- mint definition
 local def = {
 	drawtype = "plantlike",
diff --git a/food.lua b/food.lua
index d15a8db..edf8045 100644
--- a/food.lua
+++ b/food.lua
@@ -68,14 +68,29 @@ minetest.register_craft({
 	recipe = {
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
-		{"bucket:bucket_water", "group:food_pot", "vessels:glass_bottle"}
+		{"group:water_bucket", "group:food_pot", "vessels:glass_bottle"}
 	},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:water_bucket", "bucket:bucket_empty"},
 		{"group:food_pot", "farming:pot"}
 	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft({
+		output = "farming:rose_water",
+		recipe = {
+			{"flowers:rose", "flowers:rose", "flowers:rose"},
+			{"flowers:rose", "flowers:rose", "flowers:rose"},
+			{"group:water_bucket_wooden", "group:food_pot", "vessels:glass_bottle"}
+		},
+		replacements = {
+			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"},
+			{"group:food_pot", "farming:pot"}
+		}
+	})
+end
+
 --= Turkish Delight
 
 minetest.register_craftitem("farming:turkish_delight", {
@@ -168,24 +183,29 @@ minetest.register_craftitem("farming:porridge", {
 
 minetest.after(0, function()
 
-	local fluid = "bucket:bucket_water"
-	local fluid_return = "bucket:bucket_water"
+	local fluid = "group:water_bucket"
+	local fluid_return = {
+		{"group:water_bucket", "bucket:bucket_empty"},
+		{"group:water_bucket_wooden", "bucket:bucket_empty"}
+	}
 
 	if minetest.get_modpath("mobs") and mobs and mobs.mod == "redo" then
 		fluid = "group:food_milk"
-		fluid_return = "mobs:bucket_milk"
+		fluid_return = {
+			{"mobs:bucket_milk", "bucket:bucket_empty"}
+		}
+	else
+		minetest.register_craft({
+			type = "shapeless",
+			output = "farming:porridge",
+			recipe = {
+				"group:food_oats", "group:food_oats", "group:food_oats",
+				"group:food_oats", "group:food_bowl", "group:water_bucket_wooden"
+			},
+			replacements = fluid_return
+		})
 	end
 
-	minetest.register_craft({
-		type = "shapeless",
-		output = "farming:porridge",
-		recipe = {
-			"group:food_barley", "group:food_barley", "group:food_wheat",
-			"group:food_wheat", "group:food_bowl", fluid
-		},
-		replacements = {{fluid_return, "bucket:bucket_empty"}}
-	})
-
 	minetest.register_craft({
 		type = "shapeless",
 		output = "farming:porridge",
@@ -193,8 +213,11 @@ minetest.after(0, function()
 			"group:food_oats", "group:food_oats", "group:food_oats",
 			"group:food_oats", "group:food_bowl", fluid
 		},
-		replacements = {{fluid_return, "bucket:bucket_empty"}}
+		replacements = fluid_return
 	})
+
+	if minetest.get_modpath("bucket_wooden") then
+	end
 end)
 
 --= Jaffa Cake