Merge remote-tracking branch 'upstream/master'
| @@ -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:mortar_pestle" | ||||
| 		{"farming:barley", "farming:barley", "farming:barley"}, | ||||
| 		{"farming:barley", "farming:mortar_pestle", ""} | ||||
| 	}, | ||||
| 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} | ||||
| }) | ||||
|   | ||||
| @@ -81,9 +81,7 @@ minetest.register_craftitem("farming:beans", { | ||||
| -- beans can be used for green dye | ||||
| minetest.register_craft({ | ||||
| 	output = "dye:green", | ||||
| 	recipe = { | ||||
| 		{"farming:beans"} | ||||
| 	} | ||||
| 	recipe = {{"farming:beans"}} | ||||
| }) | ||||
|  | ||||
| -- beanpole | ||||
|   | ||||
| @@ -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_bowl" | ||||
| 		{"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"}, | ||||
| 		{"group:food_beetroot", "group:food_bowl", "group:food_beetroot"} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| -- red dye | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "dye:red", | ||||
| 	recipe = {"group:food_beetroot"} | ||||
| 	recipe = {{"group:food_beetroot"}} | ||||
| }) | ||||
|  | ||||
| local def = { | ||||
|   | ||||
| @@ -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_blueberries", "group:food_baking_tray" | ||||
| 		{"group:food_flour", "group:food_sugar", "group:food_blueberries"}, | ||||
| 		{"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)) | ||||
|   | ||||
| @@ -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"} | ||||
|   | ||||
| @@ -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_tomato", "group:food_beans", "group:food_bowl" | ||||
| 		{"group:food_chili_pepper", "group:food_rice", "group:food_tomato"}, | ||||
| 		{"group:food_beans", "group:food_bowl", ""} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| -- chili can be used for red dye | ||||
| minetest.register_craft({ | ||||
| 	output = "dye:red", | ||||
| 	recipe = { | ||||
| 		{"farming:chili_pepper"} | ||||
| 	} | ||||
| 	recipe = {{"farming:chili_pepper"}} | ||||
| }) | ||||
|  | ||||
| -- chili definition | ||||
|   | ||||
| @@ -75,9 +75,7 @@ minetest.register_craftitem("farming:cocoa_beans", { | ||||
|  | ||||
| minetest.register_craft( { | ||||
| 	output = "dye:brown 2", | ||||
| 	recipe = { | ||||
| 		{ "farming:cocoa_beans" } | ||||
| 	} | ||||
| 	recipe = {{"farming:cocoa_beans"}} | ||||
| }) | ||||
|  | ||||
| -- chocolate cookie | ||||
| @@ -128,9 +126,7 @@ minetest.register_craft({ | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:chocolate_dark 9", | ||||
| 	recipe = { | ||||
| 		{"farming:chocolate_block"} | ||||
| 	} | ||||
| 	recipe = {{"farming:chocolate_block"}} | ||||
| }) | ||||
|  | ||||
| -- cocoa definition | ||||
|   | ||||
| @@ -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:water_bucket", "group:food_saucepan"}, | ||||
| 		{"group:food_saucepan", "group:food_coffee", "group:water_bucket"}, | ||||
| 		{"", "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:water_bucket_wooden", "group:food_saucepan"}, | ||||
| 			{"group:food_saucepan", "group:food_coffee", "group:water_bucket_wooden"}, | ||||
| 			{"", "vessels:drinking_glass", ""} | ||||
| 		}, | ||||
| 		replacements = { | ||||
| 			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}, | ||||
| 			{"group:food_saucepan", "farming:saucepan"} | ||||
|   | ||||
| @@ -47,7 +47,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 +72,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", "group:food_corn", "group:food_corn"}, | ||||
| 		{"group:food_corn", "vessels:glass_bottle", "group:food_corn"}, | ||||
| 		{"group:food_corn", "group:food_corn", "group:food_corn"} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| @@ -82,7 +82,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 | ||||
|   | ||||
| @@ -76,9 +76,7 @@ minetest.register_craftitem("farming:grapes", { | ||||
| -- grapes can be used for violet dye | ||||
| minetest.register_craft({ | ||||
| 	output = "dye:violet", | ||||
| 	recipe = { | ||||
| 		{"farming:grapes"} | ||||
| 	} | ||||
| 	recipe = {{"farming:grapes"}} | ||||
| }) | ||||
|  | ||||
| -- trellis | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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)) | ||||
|   | ||||
| @@ -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"}} | ||||
| }) | ||||
|  | ||||
| @@ -74,14 +73,19 @@ minetest.register_node("farming:melon_7", table.copy(def)) | ||||
| -- stage 8 (final) | ||||
| def.drawtype = "nodebox" | ||||
| def.description = S("Melon") | ||||
| def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"} | ||||
| def.tiles = { | ||||
| 	"farming_melon_top.png", "farming_melon_bottom.png", "farming_melon_side.png" | ||||
| } | ||||
| def.selection_box = {-.5, -.5, -.5, .5, .5, .5} | ||||
| def.walkable = true | ||||
| def.buildable_to = false | ||||
| def.paramtype2 = "facedir" | ||||
| def.groups = { | ||||
| 	food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, | ||||
| 	flammable = 2, plant = 1 | ||||
| } | ||||
| def.drop = "farming:melon_8" | ||||
| def.on_place = minetest.rotate_node | ||||
| minetest.register_node("farming:melon_8", table.copy(def)) | ||||
|  | ||||
| -- add to registered_plants | ||||
|   | ||||
| @@ -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", | ||||
| 		"farming:juicer", "group:water_bucket" | ||||
| 		{"group:food_mint", "group:food_mint", "group:food_mint"}, | ||||
| 		{"group:water_bucket", "farming:juicer", "vessels:drinking_glass"} | ||||
| 	}, | ||||
| 	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", | ||||
| 			"farming:juicer", "group:water_bucket_wooden" | ||||
| 			{"group:food_mint", "group:food_mint", "group:food_mint"}, | ||||
| 			{"group:water_bucket_wooden", "farming:juicer", "vessels:drinking_glass"} | ||||
| 		}, | ||||
| 		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)) | ||||
|   | ||||
| @@ -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_bowl" | ||||
| 		{"group:food_onion", "group:food_onion", "group:food_onion"}, | ||||
| 		{"group:food_onion", "group:food_pot", "group:food_onion"}, | ||||
| 		{"", "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)) | ||||
|   | ||||
| @@ -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 = { | ||||
|   | ||||
| @@ -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 = {"group:food_peppercorn", "vessels:glass_bottle", "farming:mortar_pestle"}, | ||||
| 	recipe = { | ||||
| 		{"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'}, rarity = 2}, | ||||
| 		{items = {'farming:pepper_yellow'}, rarity = 3}, | ||||
| 		{items = {"farming:pepper_yellow 2"}, rarity = 1}, | ||||
| 		{items = {"farming:pepper_yellow"}, rarity = 2}, | ||||
| 		{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'}, rarity = 2}, | ||||
| 		{items = {'farming:pepper_red'}, rarity = 3}, | ||||
| 		{items = {"farming:pepper_red 2"}, rarity = 1}, | ||||
| 		{items = {"farming:pepper_red"}, rarity = 2}, | ||||
| 		{items = {"farming:pepper_red"}, rarity = 3} | ||||
| 	} | ||||
| } | ||||
| minetest.register_node("farming:pepper_7", table.copy(def)) | ||||
|   | ||||
| @@ -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", | ||||
| 		"farming:juicer"}, | ||||
| 		{"group:food_pineapple_ring", "group:food_pineapple_ring", | ||||
| 				"group:food_pineapple_ring"}, | ||||
| 		{"", "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", "farming:juicer" | ||||
| 		{"group:food_pineapple", ""}, | ||||
| 		{"farming:juicer", ""}, | ||||
| 		{"vessels:drinking_glass", "vessels:drinking_glass"} | ||||
| 	}, | ||||
| 	replacements = { | ||||
| 		{"group:food_juicer", "farming:juicer"} | ||||
|   | ||||
| @@ -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 = {"group:food_flour", "group:food_pumpkin_slice", "group:food_pumpkin_slice"} | ||||
| 	recipe = { | ||||
| 		{"group:food_pumpkin_slice", "group:food_flour", "group:food_pumpkin_slice"} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
|   | ||||
| @@ -45,7 +45,7 @@ local def = { | ||||
| 	}, | ||||
| 	sounds = default.node_sound_leaves_defaults(), | ||||
| 	minlight = 10, | ||||
| 	maxlight = 12, | ||||
| 	maxlight = 12 | ||||
| } | ||||
|  | ||||
| -- stage 1 | ||||
|   | ||||
| @@ -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:mortar_pestle" | ||||
| 		{"farming:rye", "farming:rye", "farming:rye"}, | ||||
| 		{"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:mortar_pestle" | ||||
| 		{"farming:oat", "farming:oat", "farming:oat"}, | ||||
| 		{"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:mortar_pestle" | ||||
| 		{"farming:rice", "farming:rice", "farming:rice"}, | ||||
| 		{"farming:rice", "farming:mortar_pestle", ""} | ||||
| 	}, | ||||
| 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} | ||||
| }) | ||||
|   | ||||
| @@ -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 | ||||
| @@ -44,11 +43,11 @@ minetest.register_node("farming:soy_sauce", { | ||||
| }) | ||||
|  | ||||
| minetest.register_craft( { | ||||
| 	type = "shapeless", | ||||
| 	output = "farming:soy_sauce", | ||||
| 	recipe = { | ||||
| 		"group:food_soy", "group:food_soy", "group:food_juicer", | ||||
| 		"bucket:bucket_river_water", "vessels:glass_bottle", "group:food_salt" | ||||
| 		{"group:food_soy", "group:food_salt", "group:food_soy"}, | ||||
| 		{"", "group:food_juicer", ""}, | ||||
| 		{"", "bucket:bucket_river_water", "vessels:glass_bottle"} | ||||
| 	}, | ||||
| 	replacements = { | ||||
| 		{"bucket:bucket_river_water", "bucket:bucket_empty"}, | ||||
| @@ -78,11 +77,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", | ||||
| 		"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass" | ||||
| 		{"group:food_soy", "group:food_soy", "group:food_soy"}, | ||||
| 		{"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"} | ||||
| 	}, | ||||
| 	replacements = { | ||||
| 		{"bucket:bucket_water", "bucket:bucket_empty"}, | ||||
| @@ -100,10 +98,9 @@ minetest.register_craftitem("farming:tofu", { | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:tofu", | ||||
| 	type = "shapeless", | ||||
| 	recipe = { | ||||
| 		"farming:baking_tray", "group:food_soy", "group:food_soy", | ||||
| 		"group:food_soy", "group:food_soy", "group:food_soy", | ||||
| 		{"farming:baking_tray", "group:food_soy", "group:food_soy"}, | ||||
| 		{"group:food_soy", "group:food_soy", "group:food_soy"} | ||||
| 	}, | ||||
| 	replacements = {{"farming:baking_tray", "farming:baking_tray"}} | ||||
| }) | ||||
| @@ -163,7 +160,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 +169,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 = 2}, | ||||
| 		{items = {'farming:soy_pod'}, rarity = 3}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 1}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 2}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 3}, | ||||
| 	} | ||||
| } | ||||
| minetest.register_node("farming:soy_6", table.copy(def)) | ||||
| @@ -184,11 +181,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 = 2}, | ||||
| 		{items = {'farming:soy_pod'}, rarity = 3}, | ||||
| 		{items = {'farming:soy_pod'}, rarity = 4}, | ||||
| 		{items = {'farming:soy_pod'}, rarity = 5} | ||||
| 		{items = {"farming:soy_pod"}, rarity = 1}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 2}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 3}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 4}, | ||||
| 		{items = {"farming:soy_pod"}, rarity = 5} | ||||
| 	} | ||||
| } | ||||
| minetest.register_node("farming:soy_7", table.copy(def)) | ||||
|   | ||||
| @@ -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", | ||||
|   | ||||
| @@ -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", "farming:bottle_ethanol", "bucket:bucket_water"}, | ||||
| 		{"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"}, | ||||
| 		{"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 = 2}, | ||||
| 		{items = {'farming:vanilla'}, rarity = 3} | ||||
| 		{items = {"farming:vanilla"}, rarity = 1}, | ||||
| 		{items = {"farming:vanilla"}, rarity = 2}, | ||||
| 		{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 = 2}, | ||||
| 		{items = {'farming:vanilla 2'}, rarity = 2}, | ||||
| 		{items = {'farming:vanilla 2'}, rarity = 3} | ||||
| 		{items = {"farming:vanilla 2"}, rarity = 1}, | ||||
| 		{items = {"farming:vanilla 2"}, rarity = 2}, | ||||
| 		{items = {"farming:vanilla 2"}, rarity = 2}, | ||||
| 		{items = {"farming:vanilla 2"}, rarity = 3} | ||||
| 	} | ||||
| } | ||||
| minetest.register_node("farming:vanilla_8", table.copy(def)) | ||||
|   | ||||
| @@ -46,9 +46,7 @@ minetest.register_craft({ | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:wheat 3", | ||||
| 	recipe = { | ||||
| 		{"farming:straw"} | ||||
| 	} | ||||
| 	recipe = {{"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:mortar_pestle" | ||||
| 		{"farming:wheat", "farming:wheat", "farming:wheat"}, | ||||
| 		{"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"}} | ||||
| }) | ||||
|  | ||||
|   | ||||
							
								
								
									
										38
									
								
								food.lua
									
									
									
									
									
								
							
							
						
						| @@ -318,7 +318,6 @@ minetest.register_craftitem("farming:apple_pie", { | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:apple_pie", | ||||
| --	type = "shapeless", | ||||
| 	recipe = { | ||||
| 		{"group:food_flour", "group:food_sugar", "group:food_apple"}, | ||||
| 		{"", "group:food_baking_tray", ""} | ||||
| @@ -347,9 +346,10 @@ minetest.register_craftitem("farming:cactus_juice", { | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:cactus_juice", | ||||
| --	type = "shapeless", | ||||
| 	recipe = { | ||||
| 		{"default:cactus", "farming:juicer", "vessels:drinking_glass"} | ||||
| 		{"default:cactus"}, | ||||
| 		{"farming:juicer"}, | ||||
| 		{"vessels:drinking_glass"} | ||||
| 	}, | ||||
| 	replacements = { | ||||
| 		{"group:food_juicer", "farming:juicer"} | ||||
| @@ -366,7 +366,6 @@ minetest.register_craftitem("farming:pasta", { | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:pasta", | ||||
| --	type = "shapeless", | ||||
| 	recipe = { | ||||
| 		{"group:food_flour", "group:food_butter", "group:food_mixing_bowl"} | ||||
| 	}, | ||||
| @@ -375,7 +374,6 @@ minetest.register_craft({ | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:pasta", | ||||
| --	type = "shapeless", | ||||
| 	recipe = { | ||||
| 		{"group:food_flour", "group:food_oil", "group:food_mixing_bowl"} | ||||
| 	}, | ||||
| @@ -395,7 +393,6 @@ minetest.register_craftitem("farming:spaghetti", { | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "farming:spaghetti", | ||||
| --	type = "shapeless", | ||||
| 	recipe = { | ||||
| 		{"group:food_pasta", "group:food_saucepan", "group:food_tomato"}, | ||||
| 		{"group:food_garlic_clove", "group:food_garlic_clove", ""} | ||||
| @@ -413,7 +410,6 @@ 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_chicken_raw", "group:food_cabbage"}, | ||||
| @@ -442,7 +438,6 @@ minetest.register_craftitem("farming:burger", { | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| --	type = "shapeless", | ||||
| 	output = "farming:burger", | ||||
| 	recipe = { | ||||
| 		{"farming:bread", "group:food_meat", "group:food_cheese"}, | ||||
| @@ -550,7 +545,6 @@ minetest.register_craftitem("farming:flan", { | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| --	type = "shapeless", | ||||
| 	output = "farming:flan", | ||||
| 	recipe = { | ||||
| 		{"group:food_sugar", "group:food_milk", "farming:caramel"}, | ||||
| @@ -574,7 +568,6 @@ minetest.register_craftitem("farming:cheese_vegan", { | ||||
|  | ||||
|  | ||||
| minetest.register_craft({ | ||||
| --	type = "shapeless", | ||||
| 	output = "farming:cheese_vegan", | ||||
| 	recipe = { | ||||
| 		{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, | ||||
| @@ -589,7 +582,6 @@ minetest.register_craft({ | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| --	type = "shapeless", | ||||
| 	output = "farming:cheese_vegan", | ||||
| 	recipe = { | ||||
| 		{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, | ||||
| @@ -608,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", ""} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| @@ -625,16 +617,16 @@ 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_meat_raw", "group:food_salt", "group:food_skillet", | ||||
| 		"group:food_flour" | ||||
| 		{"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"}, | ||||
| 		{"group:food_meat_raw", "group:food_salt", "group:food_flour"}, | ||||
| 		{"", "group:food_skillet", ""} | ||||
|  | ||||
| 	}, | ||||
| 	replacements = { | ||||
| 		{"group:food_skillet", "farming:skillet"} | ||||
| @@ -647,15 +639,15 @@ minetest.register_craftitem("farming:mochi", { | ||||
| 	description = S("Mochi"), | ||||
| 	inventory_image = "farming_mochi.png", | ||||
| 	on_use = minetest.item_eat(3), | ||||
| 	groups = {flammable = 2}, | ||||
| 	groups = {flammable = 2} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "farming:mochi", | ||||
| 	recipe = { | ||||
| 		"group:food_mortar_pestle", "group:food_rice", "group:food_rice", | ||||
| 		"group:food_sugar",	"bucket:bucket_river_water" | ||||
| 		{"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"}, | ||||
|   | ||||
| @@ -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,7 @@ Created by Felfa (CC0) | ||||
|  | ||||
| Created by gorlock (CC0) | ||||
|   farming_salt_crystal.png | ||||
|  | ||||
| Created by sirrobzeroone (CC0) | ||||
|   farming_gyoza.png | ||||
|   farming_pineapple_ring.png | ||||
|   | ||||
| Before Width: | Height: | Size: 603 B After Width: | Height: | Size: 266 B | 
							
								
								
									
										
											BIN
										
									
								
								textures/farming_melon_bottom.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 172 B | 
| Before Width: | Height: | Size: 270 B After Width: | Height: | Size: 179 B | 
| Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 193 B | 
| Before Width: | Height: | Size: 114 B After Width: | Height: | Size: 155 B | 
| Before Width: | Height: | Size: 122 B After Width: | Height: | Size: 172 B | 
| Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 191 B | 
| Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 233 B | 
| Before Width: | Height: | Size: 158 B After Width: | Height: | Size: 253 B | 
| Before Width: | Height: | Size: 166 B After Width: | Height: | Size: 289 B | 
| Before Width: | Height: | Size: 164 B After Width: | Height: | Size: 449 B | 
							
								
								
									
										
											BIN
										
									
								
								textures/farming_tomato_soup.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 161 B | 
| @@ -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 = { | ||||
| 		"farming:mixing_bowl" | ||||
| 	} | ||||
| 	recipe = {{"farming:mixing_bowl"}} | ||||
| }) | ||||
|   | ||||