Cooking: code cleaning and add more ingredients

cooking.lua

@@ -1,10 +1,13 @@
+local cauldron = {}
+
 -- Add more ingredients here that make a soup.
 local ingredients_list = {
 	"apple", "mushroom", "honey", "pumpkin", "egg", "bread", "meat",
-	"chicken", "carrot", "potato"
+	"chicken", "carrot", "potato", "melon", "rhubarb", "cucumber",
+	"corn", "beans", "berries", "grapes", "tomato", "wheat"
 }
 
-local cauldron_cbox = {
+cauldron.cbox = {
 	{0,  0, 0,  16, 16, 0},
 	{0,  0, 16, 16, 16, 0},
 	{0,  0, 0,  0,  16, 16},
@@ -12,45 +15,32 @@ local cauldron_cbox = {
 	{0,  0, 0,  16, 8,  16}
 }
 
-local function fill_water_bucket(pos, node, clicker, itemstack)
+function cauldron.idle_construct(pos)
-	local wield_item = clicker:get_wielded_item():get_name()
+	local timer = minetest.get_node_timer(pos)
-	if wield_item == "bucket:bucket_empty" then
+	timer:start(10.0)
-		minetest.set_node(pos, {name="xdecor:cauldron_empty", param2=node.param2})
-		itemstack:replace("bucket:bucket_water")
-	end
 end
 
+function cauldron.boiling_construct(pos)
+	local meta = minetest.get_meta(pos)
+	local timer = minetest.get_node_timer(pos)
+	meta:set_string("infotext", "Cauldron (active) - Drop some foods inside to make a soup")
+	timer:start(5.0)
+end
 
-xdecor.register("cauldron_empty", {
+function cauldron.filling(pos, node, clicker, itemstack)
-	description = "Cauldron",
-	groups = {cracky=2, oddly_breakable_by_hand=1},
-	on_rotate = screwdriver.rotate_simple,
-	tiles = {"xdecor_cauldron_top_empty.png", "xdecor_cauldron_sides.png"},
-	infotext = "Cauldron (empty)",
-	on_rightclick = function(pos, node, clicker, itemstack)
 	local wield_item = clicker:get_wielded_item():get_name()
-		if wield_item == "bucket:bucket_water" or
+	if wield_item:sub(1,7) == "bucket:" then
-				wield_item == "bucket:bucket_river_water" then
+		if wield_item:sub(-6) == "_empty" then
+			minetest.set_node(pos, {name="xdecor:cauldron_empty", param2=node.param2})
+			itemstack:replace("bucket:bucket_water")
+		elseif wield_item:sub(-6) == "_water" then
 			minetest.set_node(pos, {name="xdecor:cauldron_idle", param2=node.param2})
 			itemstack:replace("bucket:bucket_empty")
 		end
-	end,
+	end	
-	collision_box = xdecor.pixelbox(16, cauldron_cbox)
+end
-})
 
-xdecor.register("cauldron_idle", {
+function cauldron.idle_timer(pos)
-	groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	on_rotate = screwdriver.rotate_simple,
-	tiles = {"xdecor_cauldron_top_idle.png", "xdecor_cauldron_sides.png"},
-	drop = "xdecor:cauldron_empty",
-	infotext = "Cauldron (idle)",
-	collision_box = xdecor.pixelbox(16, cauldron_cbox),
-	on_rightclick = fill_water_bucket,
-	on_construct = function(pos)
-		local timer = minetest.get_node_timer(pos)
-		timer:start(10.0)
-	end,
-	on_timer = function(pos)
 	local below_node = {x=pos.x, y=pos.y-1, z=pos.z}
 	if not minetest.get_node(below_node).name:find("fire") then
 		return true
@@ -59,8 +49,7 @@ xdecor.register("cauldron_idle", {
 	local node = minetest.get_node(pos)
 	minetest.set_node(pos, {name="xdecor:cauldron_boiling_water", param2=node.param2})
 	return true
-	end
+end
-})
 
 -- Ugly hack to determine if an item has `minetest.item_eat` in its definition.
 local function eatable(itemstring)
@@ -70,26 +59,8 @@ local function eatable(itemstring)
 	return string.format("%q", string.dump(on_use_def)):find("item_eat")
 end
 
-xdecor.register("cauldron_boiling_water", {
+function cauldron.boiling_timer(pos)
-	groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+	local node = minetest.get_node(pos)
-	on_rotate = screwdriver.rotate_simple,
-	drop = "xdecor:cauldron_empty",
-	infotext = "Cauldron (active) - Drop foods inside to make a soup",
-	damage_per_second = 2,
-	tiles = {
-		{ name = "xdecor_cauldron_top_anim_boiling_water.png",
-			animation = {type="vertical_frames", length=3.0} },
-		"xdecor_cauldron_sides.png"
-	},
-	collision_box = xdecor.pixelbox(16, cauldron_cbox),
-	on_rightclick = fill_water_bucket,
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		local timer = minetest.get_node_timer(pos)
-		meta:set_string("infotext", "Cauldron (active) - Drop some foods inside to make a soup")
-		timer:start(5.0)
-	end,
-	on_timer = function(pos)
 	local objs = minetest.get_objects_inside_radius(pos, 0.5)
 	if objs == {} then return true end
 
@@ -97,28 +68,18 @@ xdecor.register("cauldron_boiling_water", {
 	for _, obj in pairs(objs) do
 		if obj and not obj:is_player() and obj:get_luaentity().itemstring then
 			local itemstring = obj:get_luaentity().itemstring
-				local name = itemstring:match(":([%w_]+)")
+			local food = itemstring:match(":([%w_]+)")
 
-				if ingredients == {} then
+			for _, ingredient in pairs(ingredients_list) do
-					for _, rep in pairs(ingredients) do
+				if food and (eatable(itemstring) or food:find(ingredient)) then
-						if name == rep then return end
+					ingredients[#ingredients+1] = food break
-					end
-				end
-
-				for _, ing in pairs(ingredients_list) do
-					if name and (eatable(itemstring) or name:find(ing)) then
-						ingredients[#ingredients+1] = name
-						break
 				end
 			end
 		end
 	end
 
-		local node = minetest.get_node(pos)
 	if #ingredients >= 2 then
-			for _, obj in pairs(objs) do
+		for _, obj in pairs(objs) do obj:remove() end
-				obj:remove()
-			end
 		minetest.set_node(pos, {name="xdecor:cauldron_soup", param2=node.param2})
 	end
 
@@ -127,22 +88,9 @@ xdecor.register("cauldron_boiling_water", {
 		minetest.set_node(pos, {name="xdecor:cauldron_idle", param2=node.param2})
 	end
 	return true
-	end	
+end
-})
 
-xdecor.register("cauldron_soup", {
+function cauldron.take_soup(pos, node, clicker, itemstack)
-	groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	on_rotate = screwdriver.rotate_simple,
-	drop = "xdecor:cauldron_empty",
-	infotext = "Cauldron (active) - Use a bowl to eat the soup",
-	damage_per_second = 2,
-	tiles = {
-		{ name = "xdecor_cauldron_top_anim_soup.png",
-			animation = {type="vertical_frames", length=3.0} },
-		"xdecor_cauldron_sides.png"
-	},
-	collision_box = xdecor.pixelbox(16, cauldron_cbox),
-	on_rightclick = function(pos, node, clicker, itemstack)
 	local inv = clicker:get_inventory()
 	local wield_item = clicker:get_wielded_item()
 
@@ -163,6 +111,55 @@ xdecor.register("cauldron_soup", {
 		minetest.set_node(pos, {name="xdecor:cauldron_empty", param2=node.param2})
 		return itemstack
 	end
-	end
+end
+
+xdecor.register("cauldron_empty", {
+	description = "Cauldron",
+	groups = {cracky=2, oddly_breakable_by_hand=1},
+	on_rotate = screwdriver.rotate_simple,
+	tiles = {"xdecor_cauldron_top_empty.png", "xdecor_cauldron_sides.png"},
+	infotext = "Cauldron (empty)",
+	on_rightclick = cauldron.filling,
+	collision_box = xdecor.pixelbox(16, cauldron.cbox)
+})
+
+xdecor.register("cauldron_idle", {
+	groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+	on_rotate = screwdriver.rotate_simple,
+	tiles = {"xdecor_cauldron_top_idle.png", "xdecor_cauldron_sides.png"},
+	drop = "xdecor:cauldron_empty",
+	infotext = "Cauldron (idle)",
+	collision_box = xdecor.pixelbox(16, cauldron.cbox),
+	on_rightclick = cauldron.filling,
+	on_construct = cauldron.idle_construct,
+	on_timer = cauldron.idle_timer
+})
+
+xdecor.register("cauldron_boiling_water", {
+	groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+	on_rotate = screwdriver.rotate_simple,
+	drop = "xdecor:cauldron_empty",
+	infotext = "Cauldron (active) - Drop foods inside to make a soup",
+	damage_per_second = 2,
+	tiles = {{name="xdecor_cauldron_top_anim_boiling_water.png",
+			animation={type="vertical_frames", length=3.0}},
+		"xdecor_cauldron_sides.png"},
+	collision_box = xdecor.pixelbox(16, cauldron.cbox),
+	on_rightclick = cauldron.filling,
+	on_construct = cauldron.boiling_construct,
+	on_timer = cauldron.boiling_timer
+})
+
+xdecor.register("cauldron_soup", {
+	groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+	on_rotate = screwdriver.rotate_simple,
+	drop = "xdecor:cauldron_empty",
+	infotext = "Cauldron (active) - Use a bowl to eat the soup",
+	damage_per_second = 2,
+	tiles = {{name="xdecor_cauldron_top_anim_soup.png",
+			animation={type="vertical_frames", length=3.0}},
+		"xdecor_cauldron_sides.png"},
+	collision_box = xdecor.pixelbox(16, cauldron.cbox),
+	on_rightclick = cauldron.take_soup
 })