8 files changed, 177 insertions, 3 deletions
diff --git a/farming/crops/barley.lua b/farming/crops/barley.lua
index 6f3cb97..cc5ca0f 100644
--- a/farming/crops/barley.lua
+++ b/farming/crops/barley.lua
@@ -110,5 +110,13 @@ farming.registered_plants["farming:barley"] = {
 	seed = "farming:seed_barley",
 	minlight = 13,
 	maxlight = 15,
-	steps = 8
+	steps = 7
 }
+
+-- Fuel
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:barley",
+	burntime = 1,
+})
diff --git a/farming/crops/beans.lua b/farming/crops/beans.lua
index a75030a..bd3b8ee 100644
--- a/farming/crops/beans.lua
+++ b/farming/crops/beans.lua
@@ -191,7 +191,7 @@ local crop_def = {
 	selection_box = farming.select,
 	groups = {
 		snappy = 3, flammable = 3, not_in_creative_inventory = 1,
-		attached_node = 1, growing = 1
+		attached_node = 1, growing = 1, plant = 1
 	},
 	sounds = default.node_sound_leaves_defaults()
 }
diff --git a/farming/crops/blueberry.lua b/farming/crops/blueberry.lua
index 64aee3e..6752e35 100644
--- a/farming/crops/blueberry.lua
+++ b/farming/crops/blueberry.lua
@@ -42,6 +42,7 @@ minetest.register_craft({
 		"group:food_flour", "group:food_sugar",
 		"group:food_blueberries", "group:food_baking_tray"
 	},
+	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
 
 -- blueberry definition
diff --git a/farming/crops/carrot.lua b/farming/crops/carrot.lua
index b4baa8d..6ec1994 100644
--- a/farming/crops/carrot.lua
+++ b/farming/crops/carrot.lua
@@ -22,6 +22,7 @@ minetest.register_craftitem("farming:carrot_juice", {
 	description = S("Carrot Juice"),
 	inventory_image = "farming_carrot_juice.png",
 	on_use = minetest.item_eat(4, "vessels:drinking_glass"),
+	groups = {vessel = 1},
 })
 
 minetest.register_craft({
diff --git a/farming/crops/grapes.lua b/farming/crops/grapes.lua
index c341075..2b33427 100644
--- a/farming/crops/grapes.lua
+++ b/farming/crops/grapes.lua
@@ -186,7 +186,7 @@ local crop_def = {
 	selection_box = farming.select,
 	groups = {
 		snappy = 3, flammable = 3, not_in_creative_inventory = 1,
-		attached_node = 1, growing = 1
+		attached_node = 1, growing = 1, plant = 1
 	},
 	sounds = default.node_sound_leaves_defaults()
 }
diff --git a/farming/crops/pineapple.lua b/farming/crops/pineapple.lua
index 8a60310..f62042e 100644
--- a/farming/crops/pineapple.lua
+++ b/farming/crops/pineapple.lua
@@ -47,6 +47,7 @@ minetest.register_craftitem("farming:pineapple_juice", {
 	description = S("Pineapple Juice"),
 	inventory_image = "farming_pineapple_juice.png",
 	on_use = minetest.item_eat(4, "vessels:drinking_glass"),
+	groups = {vessel = 1},
 })
 
 minetest.register_craft({
diff --git a/farming/crops/raspberry.lua b/farming/crops/raspberry.lua
index 4938658..979bdfb 100644
--- a/farming/crops/raspberry.lua
+++ b/farming/crops/raspberry.lua
@@ -17,6 +17,7 @@ minetest.register_craftitem("farming:smoothie_raspberry", {
 	description = S("Raspberry Smoothie"),
 	inventory_image = "farming_raspberry_smoothie.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
+	groups = {vessel = 1},
 })
 
 minetest.register_craft({
diff --git a/farming/crops/ryeoatrice.lua b/farming/crops/ryeoatrice.lua
new file mode 100644
index 0000000..d064626
--- /dev/null
+++ b/farming/crops/ryeoatrice.lua
@@ -0,0 +1,162 @@
+
+local S = farming.intllib
+
+--= A nice addition from Ademant's grain mod :)
+
+-- Rye
+
+farming.register_plant("farming:rye", {
+	description = "Rye seed",
+	paramtype2 = "meshoptions",
+	inventory_image = "farming_rye_seed.png",
+	steps = 8,
+	place_param2 = 3,
+})
+
+minetest.override_item("farming:rye", {
+	groups = {food_rye = 1, flammable = 4}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:flour",
+	recipe = {
+		"farming:rye", "farming:rye", "farming:rye", "farming:rye",
+		"farming:mortar_pestle"
+	},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+-- Oats
+
+farming.register_plant("farming:oat", {
+	description = "Oat seed",
+	paramtype2 = "meshoptions",
+	inventory_image = "farming_oat_seed.png",
+	steps = 8,
+	place_param2 = 3,
+})
+
+minetest.override_item("farming:oat", {
+	groups = {food_oats = 1, flammable = 4}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:flour",
+	recipe = {
+		"farming:oat", "farming:oat", "farming:oat", "farming:oat",
+		"farming:mortar_pestle"
+	},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+-- Rice
+
+farming.register_plant("farming:rice", {
+	description = "Rice grains",
+	paramtype2 = "meshoptions",
+	inventory_image = "farming_rice_seed.png",
+	steps = 8,
+	place_param2 = 3,
+})
+
+minetest.override_item("farming:rice", {
+	groups = {food_rice = 1, flammable = 4}
+})
+
+minetest.register_craftitem("farming:rice_bread", {
+	description = "Rice Bread",
+	inventory_image = "farming_rice_bread.png",
+	on_use = minetest.item_eat(5),
+	groups = {food_rice_bread = 1, flammable = 2},
+})
+
+minetest.register_craftitem("farming:rice_flour", {
+	description = "Rice Flour",
+	inventory_image = "farming_rice_flour.png",
+	groups = {food_rice_flour = 1, flammable = 1},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:rice_flour",
+	recipe = {
+		"farming:rice", "farming:rice", "farming:rice", "farming:rice",
+		"farming:mortar_pestle"
+	},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 15,
+	output = "farming:rice_bread",
+	recipe = "farming:rice_flour"
+})
+
+-- Multigrain flour
+
+minetest.register_craftitem("farming:flour_multigrain", {
+	description = S("Multigrain Flour"),
+	inventory_image = "farming_flour_multigrain.png",
+	groups = {food_flour = 1, flammable = 1},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:flour_multigrain",
+	recipe = {
+		"farming:wheat", "farming:barley", "farming:oat",
+		"farming:rye", "farming:mortar_pestle"
+	},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+-- Multigrain bread
+
+minetest.register_craftitem("farming:bread_multigrain", {
+	description = S("Multigrain Bread"),
+	inventory_image = "farming_bread_multigrain.png",
+	on_use = minetest.item_eat(7),
+	groups = {food_bread = 1, flammable = 2},
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 15,
+	output = "farming:bread_multigrain",
+	recipe = "farming:flour_multigrain"
+})
+
+-- Fuels
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:rice_bread",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:bread_multigrain",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:rye",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:oat",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:rice",
+	burntime = 1,
+})