Merge remote-tracking branch 'upstream/master'

compatibility.lua

@@ -15,13 +15,6 @@ minetest.override_item("default:apple", {
 		leafdecay = 3, leafdecay_drop = 1}
 })
 
-if minetest.registered_nodes["flowers:mushroom_brown"] then
-minetest.override_item("flowers:mushroom_brown", {
-	light_source = 1,
-	groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2}
-})
-end
-
 --= Aliases
 
 -- Banana

crops/barley.lua

@@ -28,11 +28,10 @@ minetest.register_craftitem("farming:barley", {
 
 -- flour
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:barley", "farming:barley", "farming:barley",
+		{"farming:barley", "farming:barley", "farming:barley"},
-		"farming:barley", "farming:mortar_pestle"
+		{"farming:barley", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })

crops/beans.lua

@@ -81,9 +81,7 @@ minetest.register_craftitem("farming:beans", {
 -- beans can be used for green dye
 minetest.register_craft({
 	output = "dye:green",
-	recipe = {
+	recipe = {{"farming:beans"}}
-		{"farming:beans"}
-	}
 })
 
 -- beanpole

crops/beetroot.lua

@@ -21,20 +21,17 @@ minetest.register_craftitem("farming:beetroot_soup", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:beetroot_soup",
 	recipe = {
-		"group:food_beetroot", "group:food_beetroot",
+		{"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"},
-		"group:food_beetroot", "group:food_beetroot",
+		{"group:food_beetroot", "group:food_bowl", "group:food_beetroot"}
-		"group:food_beetroot", "group:food_beetroot","group:food_bowl"
 	}
 })
 
 -- red dye
 minetest.register_craft({
-	type = "shapeless",
 	output = "dye:red",
-	recipe = {"group:food_beetroot"}
+	recipe = {{"group:food_beetroot"}}
 })
 
 local def = {

crops/blueberry.lua

@@ -36,10 +36,9 @@ minetest.register_craftitem("farming:blueberry_pie", {
 
 minetest.register_craft({
 	output = "farming:blueberry_pie",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_sugar",
+		{"group:food_flour", "group:food_sugar", "group:food_blueberries"},
-		"group:food_blueberries", "group:food_baking_tray"
+		{"group:food_baking_tray", "", ""}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
@@ -79,7 +78,7 @@ def.drop = {
 	items = {
 		{items = {"farming:blueberries 2"}, rarity = 1},
 		{items = {"farming:blueberries"}, rarity = 2},
-		{items = {"farming:blueberries"}, rarity = 3},
+		{items = {"farming:blueberries"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:blueberry_4", table.copy(def))

crops/carrot.lua

@@ -27,9 +27,10 @@ minetest.register_craftitem("farming:carrot_juice", {
 
 minetest.register_craft({
 	output = "farming:carrot_juice",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_carrot", "farming:juicer"
+		{"group:food_carrot"},
+		{"farming:juicer"},
+		{"vessels:drinking_glass"}
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}

crops/chili.lua

@@ -20,20 +20,17 @@ minetest.register_craftitem("farming:chili_bowl", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:chili_bowl",
 	recipe = {
-		"group:food_chili_pepper", "group:food_barley",
+		{"group:food_chili_pepper", "group:food_rice", "group:food_tomato"},
-		"group:food_tomato", "group:food_beans", "group:food_bowl"
+		{"group:food_beans", "group:food_bowl", ""}
 	}
 })
 
 -- chili can be used for red dye
 minetest.register_craft({
 	output = "dye:red",
-	recipe = {
+	recipe = {{"farming:chili_pepper"}}
-		{"farming:chili_pepper"}
-	}
 })
 
 -- chili definition

crops/cocoa.lua

@@ -75,9 +75,7 @@ minetest.register_craftitem("farming:cocoa_beans", {
 
 minetest.register_craft( {
 	output = "dye:brown 2",
-	recipe = {
+	recipe = {{"farming:cocoa_beans"}}
-		{ "farming:cocoa_beans" }
-	}
 })
 
 -- chocolate cookie
@@ -128,9 +126,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "farming:chocolate_dark 9",
-	recipe = {
+	recipe = {{"farming:chocolate_block"}}
-		{"farming:chocolate_block"}
-	}
 })
 
 -- cocoa definition
@@ -139,11 +135,6 @@ local def = {
 	tiles = {"farming_cocoa_1.png"},
 	paramtype = "light",
 	walkable = false,
-	drop = {
-		items = {
-			{items = {"farming:cocoa_beans 1"}, rarity = 2},
-		}
-	},
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}

crops/coffee.lua

@@ -34,10 +34,10 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
 
 minetest.register_craft( {
 	output = "farming:coffee_cup",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_coffee",
+		{"group:food_saucepan", "group:food_coffee", "group:water_bucket"},
-		"group:water_bucket", "group:food_saucepan"},
+		{"", "vessels:drinking_glass", ""}
+	},
 	replacements = {
 		{"group:water_bucket", "bucket:bucket_empty"},
 		{"group:food_saucepan", "farming:saucepan"}
@@ -47,10 +47,10 @@ minetest.register_craft( {
 if minetest.get_modpath("bucket_wooden") then
 	minetest.register_craft( {
 		output = "farming:coffee_cup",
-		type = "shapeless",
 		recipe = {
-			"vessels:drinking_glass", "group:food_coffee",
+			{"group:food_saucepan", "group:food_coffee", "group:water_bucket_wooden"},
-			"group:water_bucket_wooden", "group:food_saucepan"},
+			{"", "vessels:drinking_glass", ""}
+		},
 		replacements = {
 			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"},
 			{"group:food_saucepan", "farming:saucepan"}

crops/corn.lua

@@ -32,6 +32,25 @@ minetest.register_craft({
 	recipe = "group:food_corn"
 })
 
+-- popcorn
+minetest.register_craftitem("farming:popcorn", {
+	description = S("Popcorn"),
+	inventory_image = "farming_popcorn.png",
+	groups = {food_popcorn = 1, flammable = 2},
+	on_use = minetest.item_eat(4)
+})
+
+minetest.register_craft({
+	output = "farming:popcorn",
+	recipe = {
+		{"group:food_pot", "group:food_oil", "group:food_corn"}
+	},
+	replacements = {
+		{"group:food_pot", "farming:pot"},
+		{"group:food_oil", "vessels:glass_bottle"}
+	}
+})
+
 -- cornstarch
 minetest.register_craftitem("farming:cornstarch", {
 	description = S("Cornstarch"),
@@ -47,7 +66,7 @@ minetest.register_craft({
 	},
 	replacements = {
 		{"group:food_mortar_pestle", "farming:mortar_pestle"},
-		{"group:food_baking_tray", "farming:baking_tray"},
+		{"group:food_baking_tray", "farming:baking_tray"}
 	}
 })
 
@@ -72,9 +91,9 @@ minetest.register_node("farming:bottle_ethanol", {
 minetest.register_craft( {
 	output = "farming:bottle_ethanol",
 	recipe = {
-		{ "vessels:glass_bottle", "group:food_corn", "group:food_corn"},
+		{"group:food_corn", "group:food_corn", "group:food_corn"},
-		{ "group:food_corn", "group:food_corn", "group:food_corn"},
+		{"group:food_corn", "vessels:glass_bottle", "group:food_corn"},
-		{ "group:food_corn", "group:food_corn", "group:food_corn"}
+		{"group:food_corn", "group:food_corn", "group:food_corn"}
 	}
 })
 
@@ -82,7 +101,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:bottle_ethanol",
 	burntime = 80,
-	replacements = {{ "farming:bottle_ethanol", "vessels:glass_bottle"}}
+	replacements = {{"farming:bottle_ethanol", "vessels:glass_bottle"}}
 })
 
 -- corn definition

crops/grapes.lua

@@ -76,9 +76,7 @@ minetest.register_craftitem("farming:grapes", {
 -- grapes can be used for violet dye
 minetest.register_craft({
 	output = "dye:violet",
-	recipe = {
+	recipe = {{"farming:grapes"}}
-		{"farming:grapes"}
-	}
 })
 
 -- trellis

crops/hemp.lua

@@ -65,7 +65,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:hemp_oil",
 	burntime = 20,
-	replacements = {{ "farming:hemp_oil", "vessels:glass_bottle"}}
+	replacements = {{"farming:hemp_oil", "vessels:glass_bottle"}}
 })
 
 -- hemp fibre

crops/lettuce.lua

@@ -48,7 +48,7 @@ def.groups.growing = nil
 def.drop = {
 	items = {
 		{items = {'farming:lettuce 2'}, rarity = 1},
-		{items = {'farming:lettuce 1'}, rarity = 2},
+		{items = {'farming:lettuce 1'}, rarity = 2}
 	}
 }
 minetest.register_node("farming:lettuce_5", table.copy(def))

crops/melon.lua

@@ -21,9 +21,8 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:melon_slice 4",
-	recipe = {"farming:melon_8", "farming:cutting_board"},
+	recipe = {{"farming:cutting_board", "farming:melon_8"}},
 	replacements = {{"farming:cutting_board", "farming:cutting_board"}}
 })
 
@@ -72,17 +71,22 @@ def.tiles = {"farming_melon_7.png"}
 minetest.register_node("farming:melon_7", table.copy(def))
 
 -- stage 8 (final)
-def.drawtype = "nodebox"
+minetest.register_node("farming:melon_8", {
-def.description = S("Melon")
+	description = S("Melon"),
-def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"}
+	tiles = {
-def.selection_box = {-.5, -.5, -.5, .5, .5, .5}
+		"farming_melon_top.png",
-def.walkable = true
+		"farming_melon_bottom.png",
-def.groups = {
+		"farming_melon_side.png"
-	food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
+	},
-	flammable = 2, plant = 1
+	groups = {
-}
+		food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
-def.drop = "farming:melon_8"
+		flammable = 2, plant = 1
-minetest.register_node("farming:melon_8", table.copy(def))
+	},
+	drop = "farming:melon_8",
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
+})
 
 -- add to registered_plants
 farming.registered_plants["farming:melon"] = {

crops/mint.lua

@@ -29,11 +29,9 @@ minetest.register_craftitem("farming:mint_tea", {
 
 minetest.register_craft({
 	output = "farming:mint_tea",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_mint",
+		{"group:food_mint", "group:food_mint", "group:food_mint"},
-		"group:food_mint", "group:food_mint",
+		{"group:water_bucket", "farming:juicer", "vessels:drinking_glass"}
-		"farming:juicer", "group:water_bucket"
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"},
@@ -44,11 +42,9 @@ minetest.register_craft({
 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", "group:food_mint"},
-			"group:food_mint", "group:food_mint",
+			{"group:water_bucket_wooden", "farming:juicer", "vessels:drinking_glass"}
-			"farming:juicer", "group:water_bucket_wooden"
 		},
 		replacements = {
 			{"group:food_juicer", "farming:juicer"},
@@ -92,7 +88,7 @@ def.drop = {
 		{items = {"farming:mint_leaf 2"}, rarity = 1},
 		{items = {"farming:mint_leaf 2"}, rarity = 2},
 		{items = {"farming:seed_mint 1"}, rarity = 1},
-		{items = {"farming:seed_mint 2"}, rarity = 2},
+		{items = {"farming:seed_mint 2"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:mint_4", table.copy(def))

crops/onion.lua

@@ -27,12 +27,11 @@ minetest.register_craftitem("farming:onion_soup", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:onion_soup",
 	recipe = {
-		"group:food_onion", "group:food_onion", "group:food_pot",
+		{"group:food_onion", "group:food_onion", "group:food_onion"},
-		"group:food_onion", "group:food_onion",
+		{"group:food_onion", "group:food_pot", "group:food_onion"},
-		"group:food_onion", "group:food_onion", "group:food_bowl"
+		{"", "group:food_bowl", ""}
 	},
 	replacements = {{"farming:pot", "farming:pot"}}
 })
@@ -81,7 +80,7 @@ def.drop = {
 		{items = {"farming:onion"}, rarity = 1},
 		{items = {"farming:onion"}, rarity = 2},
 		{items = {"farming:onion"}, rarity = 2},
-		{items = {"farming:onion"}, rarity = 5},
+		{items = {"farming:onion"}, rarity = 5}
 	}
 }
 minetest.register_node("farming:onion_5", table.copy(def))

crops/peas.lua

@@ -21,9 +21,8 @@ minetest.register_craftitem("farming:peas", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:peas",
-	recipe = {"farming:pea_pod"}
+	recipe = {{"farming:pea_pod"}}
 })
 
 -- pea soup
@@ -35,9 +34,12 @@ minetest.register_craftitem("farming:pea_soup", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:pea_soup",
-	recipe = {"group:food_peas", "group:food_peas", "group:food_bowl"}
+	recipe = {
+		{"group:food_peas"},
+		{"group:food_peas"},
+		{"group:food_bowl"}
+	}
 })
 
 local def = {

crops/pepper.lua

@@ -30,7 +30,7 @@ minetest.register_craftitem("farming:pepper_yellow", {
 	description = S("Yellow Pepper"),
 	inventory_image = "crops_pepper_yellow.png",
 	on_use = minetest.item_eat(3),
-	groups = {food_pepper = 1, flammable = 3},
+	groups = {food_pepper = 1, flammable = 3}
 })
 
 -- red pepper
@@ -38,13 +38,12 @@ minetest.register_craftitem("farming:pepper_red", {
 	description = S("Red Pepper"),
 	inventory_image = "crops_pepper_red.png",
 	on_use = minetest.item_eat(4),
-	groups = {food_pepper = 1, flammable = 3},
+	groups = {food_pepper = 1, flammable = 3}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:peppercorn",
-	recipe = {"group:food_pepper"}
+	recipe = {{"group:food_pepper"}}
 })
 
 -- ground pepper
@@ -69,8 +68,11 @@ minetest.register_node("farming:pepper_ground", {
 
 minetest.register_craft( {
 	output = "farming:pepper_ground",
-	type = "shapeless",
+	recipe = {
-	recipe = {"group:food_peppercorn", "vessels:glass_bottle", "farming:mortar_pestle"},
+		{"group:food_peppercorn"},
+		{"farming:mortar_pestle"},
+		{"vessels:glass_bottle"}
+	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
@@ -124,9 +126,9 @@ minetest.register_node("farming:pepper_5", table.copy(def))
 def.tiles = {"crops_pepper_plant_6.png"}
 def.drop = {
 	max_items = 2, items = {
-		{items = {'farming:pepper_yellow 2'}, rarity = 1},
+		{items = {"farming:pepper_yellow 2"}, rarity = 1},
-		{items = {'farming:pepper_yellow'}, rarity = 2},
+		{items = {"farming:pepper_yellow"}, rarity = 2},
-		{items = {'farming:pepper_yellow'}, rarity = 3},
+		{items = {"farming:pepper_yellow"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:pepper_6", table.copy(def))
@@ -136,9 +138,9 @@ def.tiles = {"crops_pepper_plant_7.png"}
 def.groups.growing = nil
 def.drop = {
 	max_items = 2, items = {
-		{items = {'farming:pepper_red 2'}, rarity = 1},
+		{items = {"farming:pepper_red 2"}, rarity = 1},
-		{items = {'farming:pepper_red'}, rarity = 2},
+		{items = {"farming:pepper_red"}, rarity = 2},
-		{items = {'farming:pepper_red'}, rarity = 3},
+		{items = {"farming:pepper_red"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:pepper_7", table.copy(def))

crops/pineapple.lua

@@ -38,8 +38,7 @@ minetest.register_craftitem("farming:pineapple_ring", {
 
 minetest.register_craft( {
 	output = "farming:pineapple_ring 5",
-	type = "shapeless",
+	recipe = {{"group:food_pineapple"}},
-	recipe = {"group:food_pineapple"},
 	replacements = {{"farming:pineapple", "farming:pineapple_top"}}
 })
 
@@ -53,11 +52,12 @@ minetest.register_craftitem("farming:pineapple_juice", {
 
 minetest.register_craft({
 	output = "farming:pineapple_juice",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_pineapple_ring",
+		{"group:food_pineapple_ring", "group:food_pineapple_ring",
-		"group:food_pineapple_ring", "group:food_pineapple_ring",
+				"group:food_pineapple_ring"},
-		"farming:juicer"},
+		{"", "farming:juicer", ""},
+		{"", "vessels:drinking_glass", ""}
+	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}
 	}
@@ -65,10 +65,10 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "farming:pineapple_juice 2",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "vessels:drinking_glass",
+		{"group:food_pineapple", ""},
-		"group:food_pineapple", "farming:juicer"
+		{"farming:juicer", ""},
+		{"vessels:drinking_glass", "vessels:drinking_glass"}
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}

crops/pumpkin.lua

@@ -25,9 +25,8 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:pumpkin_slice 4",
-	recipe = {"farming:pumpkin", "farming:cutting_board"},
+	recipe = {{"farming:cutting_board", "farming:pumpkin"}},
 	replacements = {{"farming:cutting_board", "farming:cutting_board"}}
 })
 
@@ -122,8 +121,9 @@ minetest.register_craftitem("farming:pumpkin_dough", {
 
 minetest.register_craft({
 	output = "farming:pumpkin_dough",
-	type = "shapeless",
+	recipe = {
-	recipe = {"group:food_flour", "group:food_pumpkin_slice", "group:food_pumpkin_slice"}
+		{"group:food_pumpkin_slice", "group:food_flour", "group:food_pumpkin_slice"}
+	}
 })
 
 minetest.register_craft({
@@ -183,7 +183,7 @@ minetest.register_node("farming:pumpkin_8", {
 	description = S("Pumpkin"),
 	tiles = {
 		"farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_bottom.png",
 		"farming_pumpkin_side.png"
 	},
 	groups = {
@@ -191,7 +191,9 @@ minetest.register_node("farming:pumpkin_8", {
 		flammable = 2, plant = 1
 	},
 	drop = "farming:pumpkin_8",
-	sounds = default.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
 })
 
 minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")

crops/rhubarb.lua

@@ -45,7 +45,7 @@ local def = {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 	minlight = 10,
-	maxlight = 12,
+	maxlight = 12
 }
 
 -- stage 1

crops/ryeoatrice.lua

@@ -19,11 +19,10 @@ minetest.override_item("farming:rye", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:rye", "farming:rye", "farming:rye", "farming:rye",
+		{"farming:rye", "farming:rye", "farming:rye"},
-		"farming:mortar_pestle"
+		{"farming:rye", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
@@ -44,11 +43,10 @@ minetest.override_item("farming:oat", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:oat", "farming:oat", "farming:oat", "farming:oat",
+		{"farming:oat", "farming:oat", "farming:oat"},
-		"farming:mortar_pestle"
+		{"farming:oat", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
@@ -82,11 +80,10 @@ minetest.register_craftitem("farming:rice_flour", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:rice_flour",
 	recipe = {
-		"farming:rice", "farming:rice", "farming:rice", "farming:rice",
+		{"farming:rice", "farming:rice", "farming:rice"},
-		"farming:mortar_pestle"
+		{"farming:rice", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })

crops/soy.lua

@@ -19,9 +19,8 @@ minetest.register_craftitem("farming:soy_beans", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:soy_beans",
-	recipe = {"farming:soy_pod"}
+	recipe = {{"farming:soy_pod"}}
 })
 
 -- soy sauce
@@ -43,15 +42,26 @@ minetest.register_node("farming:soy_sauce", {
 	sounds = default.node_sound_glass_defaults()
 })
 
+-- river water availability check
+local bucket_water
+
+if minetest.get_mapgen_setting("mgname") == "valleys"
+or minetest.get_modpath("ethereal") then
+	bucket_water = "bucket:bucket_river_water"
+else
+	bucket_water = "bucket:bucket_water"
+end
+
+-- soy sauce recipe
 minetest.register_craft( {
-	type = "shapeless",
 	output = "farming:soy_sauce",
 	recipe = {
-		"group:food_soy", "group:food_soy", "group:food_juicer",
+		{"group:food_soy", "group:food_salt", "group:food_soy"},
-		"bucket:bucket_river_water", "vessels:glass_bottle", "group:food_salt"
+		{"", "group:food_juicer", ""},
+		{"", bucket_water, "vessels:glass_bottle"}
 	},
 	replacements = {
-		{"bucket:bucket_river_water", "bucket:bucket_empty"},
+		{bucket_water, "bucket:bucket_empty"},
 		{"group:food_juicer", "farming:juicer"}
 	}
 })
@@ -78,11 +88,10 @@ minetest.register_node("farming:soy_milk", {
 })
 
 minetest.register_craft( {
-	type = "shapeless",
 	output = "farming:soy_milk",
 	recipe = {
-		"group:food_soy", "group:food_soy", "group:food_soy",
+		{"group:food_soy", "group:food_soy", "group:food_soy"},
-		"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"
+		{"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"}
 	},
 	replacements = {
 		{"bucket:bucket_water", "bucket:bucket_empty"},
@@ -100,10 +109,9 @@ minetest.register_craftitem("farming:tofu", {
 
 minetest.register_craft({
 	output = "farming:tofu",
-	type = "shapeless",
 	recipe = {
-		"farming:baking_tray", "group:food_soy", "group:food_soy",
+		{"farming:baking_tray", "group:food_soy", "group:food_soy"},
-		"group:food_soy", "group:food_soy", "group:food_soy",
+		{"group:food_soy", "group:food_soy", "group:food_soy"}
 	},
 	replacements = {{"farming:baking_tray", "farming:baking_tray"}}
 })
@@ -163,7 +171,7 @@ minetest.register_node("farming:soy_4", table.copy(def))
 def.tiles = {"farming_soy_5.png"}
 def.drop = {
 	max_items = 1, items = {
-		{items = {'farming:soy_pod'}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 1},
 	}
 }
 minetest.register_node("farming:soy_5", table.copy(def))
@@ -172,9 +180,9 @@ minetest.register_node("farming:soy_5", table.copy(def))
 def.tiles = {"farming_soy_6.png"}
 def.drop = {
 	max_items = 3, items = {
-		{items = {'farming:soy_pod'}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 1},
-		{items = {'farming:soy_pod'}, rarity = 2},
+		{items = {"farming:soy_pod"}, rarity = 2},
-		{items = {'farming:soy_pod'}, rarity = 3},
+		{items = {"farming:soy_pod"}, rarity = 3},
 	}
 }
 minetest.register_node("farming:soy_6", table.copy(def))
@@ -184,11 +192,11 @@ def.tiles = {"farming_soy_7.png"}
 def.groups.growing = nil
 def.drop = {
 	max_items = 5, items = {
-		{items = {'farming:soy_pod'}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 1},
-		{items = {'farming:soy_pod'}, rarity = 2},
+		{items = {"farming:soy_pod"}, rarity = 2},
-		{items = {'farming:soy_pod'}, rarity = 3},
+		{items = {"farming:soy_pod"}, rarity = 3},
-		{items = {'farming:soy_pod'}, rarity = 4},
+		{items = {"farming:soy_pod"}, rarity = 4},
-		{items = {'farming:soy_pod'}, rarity = 5}
+		{items = {"farming:soy_pod"}, rarity = 5}
 	}
 }
 minetest.register_node("farming:soy_7", table.copy(def))

crops/tomato.lua

@@ -17,6 +17,23 @@ minetest.register_craftitem("farming:tomato", {
 	on_use = minetest.item_eat(4)
 })
 
+-- tomato soup
+minetest.register_craftitem("farming:tomato_soup", {
+	description = S("Tomato Soup"),
+	inventory_image = "farming_tomato_soup.png",
+	groups = {flammable = 2},
+	on_use = minetest.item_eat(8, "farming:bowl")
+})
+
+minetest.register_craft({
+	output = "farming:tomato_soup",
+	recipe = {
+		{"group:food_tomato"},
+		{"group:food_tomato"},
+		{"group:food_bowl"}
+	}
+})
+
 -- tomato definition
 local def = {
 	drawtype = "plantlike",

crops/vanilla.lua

@@ -8,7 +8,7 @@ minetest.register_craftitem("farming:vanilla", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:vanilla_1")
 	end,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- crop definition
@@ -49,8 +49,8 @@ minetest.register_node("farming:vanilla_extract", {
 minetest.register_craft( {
 	output = "farming:vanilla_extract",
 	recipe = {
-		{ "group:food_vanilla", "group:food_vanilla", "group:food_vanilla"},
+		{"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"},
-		{ "group:food_vanilla", "farming:bottle_ethanol", "bucket:bucket_water"},
+		{"group:food_vanilla", "farming:bottle_ethanol", "bucket:bucket_water"},
 	},
 	replacements = {
 		{"bucket:bucket_water", "bucket:bucket_empty"},
@@ -61,7 +61,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:vanilla_extract",
 	burntime = 25,
-	replacements = {{ "farming:vanilla_extract", "vessels:glass_bottle" }}
+	replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}}
 })
 
 -- stage 1
@@ -92,9 +92,9 @@ minetest.register_node("farming:vanilla_6", table.copy(def))
 def.tiles = {"farming_vanilla_7.png"}
 def.drop = {
 	items = {
-		{items = {'farming:vanilla'}, rarity = 1},
+		{items = {"farming:vanilla"}, rarity = 1},
-		{items = {'farming:vanilla'}, rarity = 2},
+		{items = {"farming:vanilla"}, rarity = 2},
-		{items = {'farming:vanilla'}, rarity = 3}
+		{items = {"farming:vanilla"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:vanilla_7", table.copy(def))
@@ -104,10 +104,10 @@ def.tiles = {"farming_vanilla_8.png"}
 def.groups.growing = nil
 def.drop = {
 	items = {
-		{items = {'farming:vanilla 2'}, rarity = 1},
+		{items = {"farming:vanilla 2"}, rarity = 1},
-		{items = {'farming:vanilla 2'}, rarity = 2},
+		{items = {"farming:vanilla 2"}, rarity = 2},
-		{items = {'farming:vanilla 2'}, rarity = 2},
+		{items = {"farming:vanilla 2"}, rarity = 2},
-		{items = {'farming:vanilla 2'}, rarity = 3}
+		{items = {"farming:vanilla 2"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:vanilla_8", table.copy(def))

crops/wheat.lua

@@ -46,9 +46,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "farming:wheat 3",
-	recipe = {
+	recipe = {{"farming:straw"}}
-		{"farming:straw"}
-	}
 })
 
 -- check and register stairs
@@ -80,11 +78,10 @@ minetest.register_craftitem("farming:flour", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:wheat", "farming:wheat", "farming:wheat",
+		{"farming:wheat", "farming:wheat", "farming:wheat"},
-		"farming:wheat", "farming:mortar_pestle"
+		{"farming:wheat", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
@@ -113,9 +110,8 @@ minetest.register_craftitem("farming:bread_slice", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:bread_slice 5",
-	recipe = {"farming:bread", "group:food_cutting_board"},
+	recipe = {{"group:food_cutting_board", "farming:bread"}},
 	replacements = {{"group:food_cutting_board", "farming:cutting_board"}}
 })
 

food.lua

@@ -117,9 +117,11 @@ minetest.register_node("farming:salt_crystal", {
 	},
 })
 minetest.register_craft({
-	type = "shapeless",
+--	type = "shapeless",
 	output = "farming:salt 9",
-	recipe = {"farming:salt_crystal", "farming:mortar_pestle"},
+	recipe = {
+		{"farming:salt_crystal", "farming:mortar_pestle"}
+	},
 	replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}
 })
 
@@ -211,9 +213,11 @@ minetest.register_craftitem("farming:garlic_bread", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
+--	type = "shapeless",
 	output = "farming:garlic_bread",
-	recipe = {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"}
+	recipe = {
+		{"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"}
+	}
 })
 
 --= Donuts (thanks to Bockwurst for making the donut images)
@@ -270,11 +274,11 @@ minetest.register_craftitem("farming:porridge", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
+--	type = "shapeless",
 	output = "farming:porridge",
 	recipe = {
-		"group:food_oats", "group:food_oats", "group:food_oats",
+		{"group:food_oats", "group:food_oats", "group:food_oats"},
-		"group:food_oats", "group:food_bowl", "group:food_milk_glass"
+		{"group:food_oats", "group:food_bowl", "group:food_milk_glass"}
 	},
 	replacements = {
 		{"mobs:glass_milk", "vessels:drinking_glass"},
@@ -291,12 +295,12 @@ minetest.register_craftitem("farming:jaffa_cake", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
+--	type = "shapeless",
 	output = "farming:jaffa_cake",
 	recipe = {
-		"farming:baking_tray", "group:food_egg", "group:food_sugar",
+		{"farming:baking_tray", "group:food_egg", "group:food_sugar"},
-		"group:food_flour", "group:food_cocoa", "group:food_orange",
+		{"group:food_flour", "group:food_cocoa", "group:food_orange"},
-		"group:food_milk"
+		{"group:food_milk", "", ""}
 	},
 	replacements = {
 		{"farming:baking_tray", "farming:baking_tray"},
@@ -314,10 +318,9 @@ minetest.register_craftitem("farming:apple_pie", {
 
 minetest.register_craft({
 	output = "farming:apple_pie",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_sugar",
+		{"group:food_flour", "group:food_sugar", "group:food_apple"},
-		"group:food_apple", "group:food_baking_tray"
+		{"", "group:food_baking_tray", ""}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
@@ -342,11 +345,11 @@ minetest.register_craftitem("farming:cactus_juice", {
 })
 
 minetest.register_craft({
-	output = "farming:cactus_juice 2",
+	output = "farming:cactus_juice",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "vessels:drinking_glass",
+		{"default:cactus"},
-		"default:cactus", "farming:juicer"
+		{"farming:juicer"},
+		{"vessels:drinking_glass"}
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}
@@ -363,20 +366,16 @@ minetest.register_craftitem("farming:pasta", {
 
 minetest.register_craft({
 	output = "farming:pasta",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_mixing_bowl",
+		{"group:food_flour", "group:food_butter", "group:food_mixing_bowl"}
-		"group:food_butter"
 	},
 	replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}}
 })
 
 minetest.register_craft({
 	output = "farming:pasta",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_mixing_bowl",
+		{"group:food_flour", "group:food_oil", "group:food_mixing_bowl"}
-		"group:food_oil"
 	},
 	replacements = {
 		{"group:food_mixing_bowl", "farming:mixing_bowl"},
@@ -394,10 +393,9 @@ minetest.register_craftitem("farming:spaghetti", {
 
 minetest.register_craft({
 	output = "farming:spaghetti",
-	type = "shapeless",
 	recipe = {
-		"group:food_pasta", "group:food_saucepan",
+		{"group:food_pasta", "group:food_saucepan", "group:food_tomato"},
-		"group:food_tomato", "group:food_garlic_clove", "group:food_garlic_clove"
+		{"group:food_garlic_clove", "group:food_garlic_clove", ""}
 	},
 	replacements = {{"group:food_saucepan", "farming:saucepan"}}
 })
@@ -412,11 +410,10 @@ minetest.register_craftitem("farming:bibimbap", {
 
 minetest.register_craft({
 	output = "farming:bibimbap",
-	type = "shapeless",
 	recipe = {
-		"group:food_skillet", "group:food_bowl", "group:food_egg", "group:food_rice",
+		{"group:food_skillet", "group:food_bowl", "group:food_egg"},
-		"group:food_chicken_raw", "group:food_cabbage", "group:food_carrot",
+		{"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"},
-		"group:food_chili_pepper"
+		{"group:food_carrot", "group:food_chili_pepper", ""}
 	},
 	replacements = {{"group:food_skillet", "farming:skillet"}}
 })
@@ -441,12 +438,11 @@ minetest.register_craftitem("farming:burger", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:burger",
 	recipe = {
-		"farming:bread", "group:food_meat", "group:food_cheese",
+		{"farming:bread", "group:food_meat", "group:food_cheese"},
-		"group:food_tomato", "group:food_cucumber", "group:food_onion",
+		{"group:food_tomato", "group:food_cucumber", "group:food_onion"},
-		"group:food_lettuce"
+		{"group:food_lettuce", "", ""}
 	}
 })
 
@@ -464,7 +460,7 @@ minetest.register_craft({
 	recipe = {
 		"group:food_bowl", "group:food_tomato", "group:food_cucumber",
 		"group:food_lettuce", "group:food_oil"
-	},
+	}
 })
 
 -- Triple Berry Smoothie
@@ -510,7 +506,7 @@ minetest.register_craft({
 minetest.register_craftitem("farming:potato_omelet", {
 	description = S("Potato omelet"),
 	inventory_image = "farming_potato_omelet.png",
-	on_use = minetest.item_eat(6, "farming:bowl"),
+	on_use = minetest.item_eat(6, "farming:bowl")
 })
 
 minetest.register_craft({
@@ -549,11 +545,10 @@ minetest.register_craftitem("farming:flan", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flan",
 	recipe = {
-		"group:food_sugar", "group:food_milk", "farming:caramel",
+		{"group:food_sugar", "group:food_milk", "farming:caramel"},
-		"group:food_egg", "group:food_egg", "farming:vanilla_extract"
+		{"group:food_egg", "group:food_egg", "farming:vanilla_extract"}
 	},
 	replacements = {
 		{"cucina_vegana:soy_milk", "vessels:drinking_glass"},
@@ -568,17 +563,16 @@ minetest.register_craftitem("farming:cheese_vegan", {
 	description = S("Vegan Cheese"),
 	inventory_image = "farming_cheese_vegan.png",
 	on_use = minetest.item_eat(2),
-	groups = {food_cheese = 1, flammable = 2},
+	groups = {food_cheese = 1, flammable = 2}
 })
 
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:cheese_vegan",
 	recipe = {
-		"farming:soy_milk", "farming:soy_milk", "farming:soy_milk",
+		{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"},
-		"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol",
+		{"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"},
-		"group:food_gelatin", "group:food_pot"
+		{"group:food_gelatin", "group:food_pot", ""}
 	},
 	replacements = {
 		{"farming:soy_milk", "vessels:drinking_glass 3"},
@@ -588,16 +582,15 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:cheese_vegan",
 	recipe = {
-		"farming:soy_milk", "farming:soy_milk", "farming:soy_milk",
+		{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"},
-		"group:food_salt", "group:food_peppercorn", "group:food_lemon",
+		{"group:food_salt", "group:food_peppercorn", "group:food_lemon"},
-		"group:food_gelatin", "group:food_pot"
+		{"group:food_gelatin", "group:food_pot", ""}
 	},
 	replacements = {
 		{"farming:soy_milk", "vessels:drinking_glass 3"},
-		{"farming:pot", "farming:pot"},
+		{"farming:pot", "farming:pot"}
 	}
 })
 
@@ -607,14 +600,14 @@ minetest.register_craftitem("farming:onigiri", {
 	description = S("Onirigi"),
 	inventory_image = "farming_onigiri.png",
 	on_use = minetest.item_eat(2),
-	groups = {flammable = 2},
+	groups = {flammable = 2}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:onigiri",
 	recipe = {
-		"group:food_rice", "group:food_rice", "group:food_seaweed", "group:food_salt"
+		{"group:food_rice", "group:food_salt", "group:food_rice"},
+		{"", "group:food_seaweed", ""}
 	}
 })
 
@@ -624,18 +617,40 @@ minetest.register_craftitem("farming:gyoza", {
 	description = S("Gyoza"),
 	inventory_image = "farming_gyoza.png",
 	on_use = minetest.item_eat(4),
-	groups = {flammable = 2},
+	groups = {flammable = 2}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:gyoza 4",
 	recipe = {
-		"group:food_cabbage", "group:food_garlic_clove", "group:food_onion",
+		{"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"},
-		"group:food_meat_raw", "group:food_salt", "group:food_skillet",
+		{"group:food_meat_raw", "group:food_salt", "group:food_flour"},
-		"group:food_flour"
+		{"", "group:food_skillet", ""}
+
 	},
 	replacements = {
 		{"group:food_skillet", "farming:skillet"}
 	}
 })
+
+-- Mochi
+
+minetest.register_craftitem("farming:mochi", {
+	description = S("Mochi"),
+	inventory_image = "farming_mochi.png",
+	on_use = minetest.item_eat(3),
+	groups = {flammable = 2}
+})
+
+minetest.register_craft({
+	output = "farming:mochi",
+	recipe = {
+		{"group:food_rice", "group:food_sugar", "group:food_rice"},
+		{"", "group:food_mortar_pestle", ""},
+		{"", "bucket:bucket_river_water", ""}
+	},
+	replacements = {
+		{"group:food_mortar_pestle", "farming:mortar_pestle"},
+		{"bucket:bucket_river_water", "bucket:bucket_empty"}
+	}
+})

hoes.lua

@@ -361,7 +361,7 @@ farming.add_to_scythe_not_drops = function(item)
 end
 
 minetest.register_tool("farming:scythe_mithril", {
-	description = S("Mithril Scythe (Right-click to harvest and replant crops)"),
+	description = S("Mithril Scythe (Use to harvest and replant crops)"),
 	inventory_image = "farming_scythe_mithril.png",
 	sound = {breaks = "default_tool_breaks"},
 

license.txt

@@ -63,6 +63,11 @@ Created by VanessaE (License: CC BY 3.0):
   farming_cotton_7.png
   farming_cotton_8.png
 
+Created by 7eventy7 (https://www.planetminecraft.com/member/7eventy7/)
+  farming_melon_top.png
+  farming_melon_side.png
+  farming_melon_bottom.png
+
 Created by Doc (License: CC BY 3.0):
   farming_cucumber.png
   farming_cucumber_1.png
@@ -164,3 +169,10 @@ Created by Felfa (CC0)
 
 Created by gorlock (CC0)
   farming_salt_crystal.png
+
+Created by sirrobzeroone (CC0)
+  farming_gyoza.png
+  farming_pineapple_ring.png
+
+Created by TechM8 (https://www.deviantart.com/techm8)
+  farming_popcorn.png

utensils.lua

@@ -20,7 +20,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:bowl",
-	burntime = 10,
+	burntime = 10
 })
 
 -- saucepan
@@ -155,9 +155,6 @@ minetest.register_craft({
 })
 
 minetest.register_craft( {
-	type = "shapeless",
 	output = "vessels:glass_fragments",
-	recipe = {
+	recipe = {{"farming:mixing_bowl"}}
-		"farming:mixing_bowl"
-	}
 })