food items now crafted using food_ groups

14 files changed, 42 insertions, 33 deletions

diff --git a/blueberry.lua b/blueberry.lua
index 9936c9b..f2f0147 100644
--- a/blueberry.lua
+++ b/blueberry.lua
@@ -23,7 +23,7 @@ minetest.register_craftitem("farming:muffin_blueberry", {
 minetest.register_craft({
 	output = "farming:muffin_blueberry 2",
 	recipe = {
-		{"farming:blueberries", "farming:bread", "farming:blueberries"},
+		{"group:food_blueberries", "group:food_bread", "group:food_blueberries"},
 	}
 })
 
diff --git a/carrot.lua b/carrot.lua
index 1cfedaa..0aefcfd 100644
--- a/carrot.lua
+++ b/carrot.lua
@@ -28,7 +28,7 @@ minetest.register_craft({
 	output = "farming:carrot_gold",
 	recipe = {
 		{"", "default:gold_lump", ""},
-		{"default:gold_lump", "farming:carrot", "default:gold_lump"},
+		{"default:gold_lump", "group:food_carrot", "default:gold_lump"},
 		{"", "default:gold_lump", ""},
 	}
 })
diff --git a/chili.lua b/chili.lua
index f60eee6..edf7a59 100644
--- a/chili.lua
+++ b/chili.lua
@@ -22,7 +22,10 @@ minetest.register_craftitem("farming:chili_bowl", {
 minetest.register_craft({
 	type = "shapeless",
 	output = "farming:chili_bowl",
-	recipe = {"farming:chili_pepper", "farming:barley", "farming:tomato", "farming:beans"}
+	recipe = {
+		"group:food_chili_pepper", "group:food_barley",
+		"group:food_tomato", "group:food_beans"
+	}
 })
 
 -- chili can be used for red dye
diff --git a/cocoa.lua b/cocoa.lua
index 254e435..2bbbb50 100644
--- a/cocoa.lua
+++ b/cocoa.lua
@@ -82,7 +82,7 @@ minetest.register_craftitem("farming:cookie", {
 minetest.register_craft( {
 	output = "farming:cookie 8",
 	recipe = {
-		{ "farming:wheat", "farming:cocoa_beans", "farming:wheat" },
+		{"group:food_wheat", "group:food_cocoa", "group:food_wheat" },
 	}
 })
 
@@ -96,7 +96,7 @@ minetest.register_craftitem("farming:chocolate_dark", {
 minetest.register_craft( {
 	output = "farming:chocolate_dark",
 	recipe = {
-		{ "farming:cocoa_beans", "farming:cocoa_beans", "farming:cocoa_beans" },
+		{"group:food_cocoa", "group:food_cocoa", "group:food_cocoa"},
 	}
 })
 
diff --git a/coffee.lua b/coffee.lua
index dc4acb3..ab93d06 100644
--- a/coffee.lua
+++ b/coffee.lua
@@ -58,7 +58,7 @@ minetest.register_node("farming:coffee_cup", {
 minetest.register_craft( {
 	output = "farming:coffee_cup",
 	recipe = {
-		{"farming:drinking_cup", "farming:coffee_beans","bucket:bucket_water"},
+		{"farming:drinking_cup", "group:food_coffee","bucket:bucket_water"},
 	},
 	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
 })
diff --git a/corn.lua b/corn.lua
index 5a6ce75..8afa16a 100644
--- a/corn.lua
+++ b/corn.lua
@@ -28,7 +28,7 @@ minetest.register_craft({
 	type = "cooking",
 	cooktime = 10,
 	output = "farming:corn_cob",
-	recipe = "farming:corn"
+	recipe = "group:food_corn"
 })
 
 -- ethanol (thanks to JKMurray for this idea)
@@ -52,8 +52,8 @@ minetest.register_node("farming:bottle_ethanol", {
 minetest.register_craft( {
 	output = "farming:bottle_ethanol",
 	recipe = {
-		{ "vessels:glass_bottle", "farming:corn", "farming:corn"},
-		{ "farming:corn", "farming:corn", "farming:corn"},
+		{ "vessels:glass_bottle", "group:food_corn", "group:food_corn"},
+		{ "group:food_corn", "group:food_corn", "group:food_corn"},
 	}
 })
 
diff --git a/donut.lua b/donut.lua
index be2e9b8..8c66da5 100644
--- a/donut.lua
+++ b/donut.lua
@@ -11,9 +11,9 @@ minetest.register_craftitem("farming:donut", {
 minetest.register_craft({
 	output = "farming:donut 3",
 	recipe = {
-		{'', 'farming:wheat', ''},
-		{'farming:wheat', 'farming:sugar', 'farming:wheat'},
-		{'', 'farming:wheat', ''},
+		{'', 'group:food_wheat', ''},
+		{'group:food_wheat', 'group:food_sugar', 'group:food_wheat'},
+		{'', 'group:food_wheat', ''},
 	}
 })
 
@@ -27,7 +27,7 @@ minetest.register_craftitem("farming:donut_chocolate", {
 minetest.register_craft({
 	output = "farming:donut_chocolate",
 	recipe = {
-		{'farming:cocoa_beans'},
+		{'group:food_cocoa'},
 		{'farming:donut'},
 	}
 })
@@ -62,8 +62,8 @@ minetest.after(0, function()
 		output = "farming:porridge",
 		type = "shapeless",
 		recipe = {
-			"farming:barley", "farming:barley", "farming:wheat",
-			"farming:wheat", "mobs:bucket_milk"
+			"group:food_barley", "group:food_barley", "group:food_wheat",
+			"group:food_wheat", "group:food_milk"
 		},
 		replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}}
 	})
@@ -72,8 +72,8 @@ else
 		output = "farming:porridge",
 		type = "shapeless",
 		recipe = {
-			"farming:barley", "farming:barley", "farming:wheat",
-			"farming:wheat", "bucket:bucket_water"
+			"group:food_barley", "group:food_barley", "group:food_wheat",
+			"group:food_wheat", "bucket:bucket_water"
 		},
 		replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
 	})
diff --git a/hemp.lua b/hemp.lua
index aa2691d..34dd56d 100644
--- a/hemp.lua
+++ b/hemp.lua
@@ -39,7 +39,7 @@ minetest.register_node("farming:hemp_oil", {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
-	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
+	groups = {food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
diff --git a/pepper.lua b/pepper.lua
index a471015..3dbdd6c 100644
--- a/pepper.lua
+++ b/pepper.lua
@@ -27,7 +27,7 @@ minetest.register_craftitem("farming:pepper", {
 
 minetest.register_craft({
 	type = "shapeless",
-	output = "farming:peppercorn",
+	output = "group:food_peppercorn",
 	recipe = { "farming:pepper" }
 })
 
@@ -53,7 +53,7 @@ minetest.register_node("farming:pepper_ground", {
 minetest.register_craft( {
 	output = "farming:pepper_ground",
 	type = "shapeless",
-	recipe = {"farming:peppercorn", "vessels:glass_bottle"}
+	recipe = {"group:food_peppercorn", "vessels:glass_bottle"}
 })
 
 -- crop definition
diff --git a/pineapple.lua b/pineapple.lua
index 77047be..73cef29 100644
--- a/pineapple.lua
+++ b/pineapple.lua
@@ -38,7 +38,7 @@ minetest.register_craftitem("farming:pineapple_ring", {
 minetest.register_craft( {
 	output = "farming:pineapple_ring 5",
 	type = "shapeless",
-	recipe = {"farming:pineapple"},
+	recipe = {"group:food_pineapple"},
 	replacements = {{"farming:pineapple", "farming:pineapple_top"}}
 })
 
@@ -52,8 +52,14 @@ minetest.register_craftitem("farming:pineapple_juice", {
 minetest.register_craft({
 	output = "farming:pineapple_juice",
 	type = "shapeless",
-	recipe = {"vessels:drinking_glass", "farming:pineapple_ring",
-			"farming:pineapple_ring", "farming:pineapple_ring"},
+	recipe = {"vessels:drinking_glass", "group:food_pineapple_ring",
+			"group:food_pineapple_ring", "group:food_pineapple_ring"},
+})
+
+minetest.register_craft({
+	output = "farming:pineapple_juice 2",
+	type = "shapeless",
+	recipe = {"vessels:drinking_glass", "group:food_pineapple"},
 })
 
 -- crop definition
diff --git a/potato.lua b/potato.lua
index 5e7d431..a922b11 100644
--- a/potato.lua
+++ b/potato.lua
@@ -28,7 +28,7 @@ minetest.register_craft({
 	type = "cooking",
 	cooktime = 10,
 	output = "farming:baked_potato",
-	recipe = "farming:potato"
+	recipe = "group:food_potato"
 })
 
 -- potato definition
diff --git a/pumpkin.lua b/pumpkin.lua
index 488767f..cb96cf5 100644
--- a/pumpkin.lua
+++ b/pumpkin.lua
@@ -98,9 +98,8 @@ minetest.register_node("farming:jackolantern_on", {
 minetest.register_craft({
 	output = "farming:jackolantern",
 	recipe = {
-		{"", "", ""},
-		{"", "default:torch", ""},
-		{"", "farming:pumpkin", ""},
+		{"default:torch"},
+		{"group:food_pumpkin"},
 	}
 })
 
@@ -108,7 +107,8 @@ minetest.register_craft({
 minetest.register_craftitem("farming:pumpkin_bread", {
 	description = S("Pumpkin Bread"),
 	inventory_image = "farming_pumpkin_bread.png",
-	on_use = minetest.item_eat(8)
+	on_use = minetest.item_eat(8),
+	groups = {food_bread = 1, flammable = 2},
 })
 
 minetest.register_craftitem("farming:pumpkin_dough", {
@@ -119,7 +119,7 @@ minetest.register_craftitem("farming:pumpkin_dough", {
 minetest.register_craft({
 	output = "farming:pumpkin_dough",
 	type = "shapeless",
-	recipe = {"farming:flour", "farming:pumpkin_slice", "farming:pumpkin_slice"}
+	recipe = {"group:food_flour", "group:food_pumpkin_slice", "group:food_pumpkin_slice"}
 })
 
 minetest.register_craft({
diff --git a/raspberry.lua b/raspberry.lua
index 969d1e2..931d2ae 100644
--- a/raspberry.lua
+++ b/raspberry.lua
@@ -23,7 +23,7 @@ minetest.register_craft({
 	output = "farming:smoothie_raspberry",
 	recipe = {
 		{"default:snow"},
-		{"farming:raspberries"},
+		{"group:food_raspberries"},
 		{"vessels:drinking_glass"},
 	}
 })
diff --git a/rhubarb.lua b/rhubarb.lua
index 9f9fe58..014ccf9 100644
--- a/rhubarb.lua
+++ b/rhubarb.lua
@@ -22,9 +22,9 @@ minetest.register_craftitem("farming:rhubarb_pie", {
 minetest.register_craft({
 	output = "farming:rhubarb_pie",
 	recipe = {
-		{"", "farming:sugar", ""},
-		{"farming:rhubarb", "farming:rhubarb", "farming:rhubarb"},
-		{"farming:wheat", "farming:wheat", "farming:wheat"},
+		{"", "group:food_sugar", ""},
+		{"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"},
+		{"group:food_wheat", "group:food_wheat", "group:food_wheat"},
 	}
 })