From 8238d0d9bfff3d76ad172e626195f6828fa961a9 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sat, 2 Nov 2013 16:57:32 -0400
Subject: [PATCH] Make bushes mod use any of the junglegrasses provided by
 plantlife's junglegrass mod. Make junglegrass mod define its own copy of
 default:junglegrass if it isn't already defined.  Add 'junglegrass=1' to the
 node's groups in either case.

---
 bushes_classic/cooking.lua |  6 +++---
 bushes_classic/depends.txt |  1 -
 junglegrass/depends.txt    |  1 +
 junglegrass/init.lua       | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/bushes_classic/cooking.lua b/bushes_classic/cooking.lua
index 51c02ba..d017d64 100644
--- a/bushes_classic/cooking.lua
+++ b/bushes_classic/cooking.lua
@@ -43,7 +43,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 		minetest.register_craft({
 			output = "bushes:"..berry.."_pie_raw 1",
 			recipe = {
-			{ "bushes:sugar", "default:junglegrass", "bushes:sugar" },
+			{ "bushes:sugar", "group:junglegrass", "bushes:sugar" },
 			{ "bushes:"..berry, "bushes:"..berry, "bushes:"..berry },
 			},
 		})
@@ -93,7 +93,7 @@ end
 minetest.register_craft({
 	output = "bushes:strawberry_pie_raw 1",
 	recipe = {
-	{ "bushes:sugar", "default:junglegrass", "bushes:sugar" },
+	{ "bushes:sugar", "group:junglegrass", "bushes:sugar" },
 	{ "farming_plus:strawberry_item", "farming_plus:strawberry_item", "farming_plus:strawberry_item" },
 	},
 })
@@ -101,7 +101,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "bushes:mixed_berry_pie_raw 2",
 	recipe = {
-	{ "bushes:sugar", "default:junglegrass", "bushes:sugar" },
+	{ "bushes:sugar", "group:junglegrass", "bushes:sugar" },
 	{ "group:berry", "group:berry", "group:berry" },
 	{ "group:berry", "group:berry", "group:berry" },
 	},
diff --git a/bushes_classic/depends.txt b/bushes_classic/depends.txt
index d1473e1..c8f7251 100644
--- a/bushes_classic/depends.txt
+++ b/bushes_classic/depends.txt
@@ -1,2 +1 @@
-default
 plants_lib
diff --git a/junglegrass/depends.txt b/junglegrass/depends.txt
index c8f7251..d1473e1 100644
--- a/junglegrass/depends.txt
+++ b/junglegrass/depends.txt
@@ -1 +1,2 @@
+default
 plants_lib
diff --git a/junglegrass/init.lua b/junglegrass/init.lua
index c079d7d..267d158 100644
--- a/junglegrass/init.lua
+++ b/junglegrass/init.lua
@@ -14,6 +14,40 @@ local grasses_list = {
         {"default:junglegrass" , nil}
 }
 
+function clone_node(name)
+	node2={}
+	node=minetest.registered_nodes[name]
+	for k,v in pairs(node) do
+		node2[k]=v
+	end
+	return node2
+end
+
+if not minetest.registered_nodes["default:junglegrass"] then 
+	minetest.register_node(":default:junglegrass", {
+		description = "Jungle Grass",
+		drawtype = "plantlike",
+		visual_scale = 1.3,
+		tiles = {"default_junglegrass.png"},
+		inventory_image = "default_junglegrass.png",
+		wield_image = "default_junglegrass.png",
+		paramtype = "light",
+		walkable = false,
+		buildable_to = true,
+		is_ground_content = true,
+		groups = {snappy=3,flammable=2,flora=1,attached_node=1, junglegrass=1},
+		sounds = default.node_sound_leaves_defaults(),
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+		},
+	})
+else
+	new_junglegrass=clone_node("default:junglegrass")
+	new_junglegrass.groups = {snappy=3,flammable=2,flora=1,attached_node=1, junglegrass=1}
+	minetest.register_node(":default:junglegrass", new_junglegrass)
+end
+
 minetest.register_node('junglegrass:medium', {
 	description = "Jungle Grass (medium height)",
 	drawtype = 'plantlike',