From dde8ca5955e4caec66c979db6d7f6e3d9a5999fa Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 24 May 2014 17:28:07 -0400
Subject: [PATCH] Better compatibility with farming_plus strawberries

Specifically, override the unattractive ones from that mod with the ones
from this, instead of having two kinds of strawberries, ugly and not
ugly.
---
 bushes_classic/cooking.lua | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/bushes_classic/cooking.lua b/bushes_classic/cooking.lua
index 328e3ac..5b23d82 100644
--- a/bushes_classic/cooking.lua
+++ b/bushes_classic/cooking.lua
@@ -44,12 +44,26 @@ for i, berry in ipairs(bushes_classic.bushes) do
 	})
 
 	if berry ~= "mixed_berry" then
-		minetest.register_craftitem(":bushes:"..berry, {
-			description = S(desc),
-			inventory_image = "bushes_"..berry..".png",
-			groups = {berry = 1, [berry] = 1},
-			on_use = minetest.item_eat(1),
-		})
+
+		if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then
+			-- Special case for strawberries, when farming_plus is in use. Use
+			-- the item from that mod, but redefine it so it has the right
+			-- groups and does't look so ugly!
+			minetest.register_craftitem(":farming_plus:strawberry_item", {
+				description = S("Strawberry"),
+				inventory_image = "bushes_"..berry..".png",
+				on_use = minetest.item_eat(2),
+				groups = {berry=1, strawberry=1}
+			})
+			minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item")
+		else
+			minetest.register_craftitem(":bushes:"..berry, {
+				description = desc,
+				inventory_image = "bushes_"..berry..".png",
+				groups = {berry = 1, [berry] = 1},
+				on_use = minetest.item_eat(1),
+			})
+		end
 
 		if minetest.registered_nodes["farming:soil"] then
 			minetest.register_craft({
@@ -111,15 +125,6 @@ for i, berry in ipairs(bushes_classic.bushes) do
 	})
 end
 
-if minetest.registered_nodes["farming_plus:strawberry"] then
-	minetest.register_craftitem(":farming_plus:strawberry_item", {
-		description = S("Strawberry"),
-		inventory_image = "farming_strawberry.png",
-		on_use = minetest.item_eat(2),
-		groups = {berry=1, strawberry=1}
-	})
-end
-
 if minetest.registered_nodes["farming:soil"] then
 	minetest.register_craft({
 		output = "bushes:mixed_berry_pie_raw 2",