From e2d3583c70714f8233e3b8e6a85e2344b53ba404 Mon Sep 17 00:00:00 2001
From: runs <runs@runs-PC.runs.es>
Date: Tue, 22 Oct 2019 00:25:54 +0200
Subject: [PATCH] fixes

---
 bamboo/init.lua            | 30 ++++++++++++++++++++++++++++--
 bamboo/locale/bamboo.es.tr |  2 ++
 birch/init.lua             |  6 +++---
 cherrytree/init.lua        |  2 +-
 ebony/init.lua             |  2 +-
 jacaranda/init.lua         |  2 +-
 mahogany/init.lua          |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/bamboo/init.lua b/bamboo/init.lua
index 95445c4..d3608e0 100644
--- a/bamboo/init.lua
+++ b/bamboo/init.lua
@@ -101,7 +101,7 @@ bamboo.bambootree = {
 }
 
 
-local function grow_new_bamboo(pos)
+local function grow_new_bambootree_tree(pos)
 	if not default.can_grow(pos) then
 		-- try a bit later again
 		minetest.get_node_timer(pos):start(math.random(240, 600))
@@ -218,6 +218,10 @@ minetest.register_node("bamboo:sprout", {
 	},
 	on_use = minetest.item_eat(2),
 	grown_height = 11,
+	on_timer = grow_new_bambootree_tree,
+	on_construct = function(pos)
+		minetest.get_node_timer(pos):start(math.random(2400,4800))
+	end,
 })
 
 -- crafts
@@ -232,12 +236,34 @@ default.register_leafdecay({
 	radius = 3,
 })
 
+minetest.register_lbm({
+	name = "bamboo:convert_bambootree_sprouts_to_node_timer",
+	nodenames = {"bamboo:sprout"},
+	action = function(pos)
+		minetest.get_node_timer(pos):start(math.random(1200, 2400))
+	end
+})
+
 if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
-		{"bamboo:sprout", grow_new_bamboo, "soil"},
+		{"bamboo:sprout", grow_new_bambootree_tree, "soil"},
 	})
 end
 
+--Stairs
+
+if minetest.get_modpath("stairs") ~= nil then	
+	stairs.register_stair_and_slab(
+		"bamboo_trunk",
+		"bamboo:trunk",
+		{choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+		{"bamboo_floor.png"},
+		S("Bamboo Stair"),
+		S("Bamboo Slab"),
+		default.node_sound_wood_defaults()
+	)
+end
+
 -- stairsplus/moreblocks
 if minetest.get_modpath("moreblocks") then
 	stairsplus:register_all("bamboo", "wood", "bamboo:wood", {
diff --git a/bamboo/locale/bamboo.es.tr b/bamboo/locale/bamboo.es.tr
index ac14625..42a950e 100644
--- a/bamboo/locale/bamboo.es.tr
+++ b/bamboo/locale/bamboo.es.tr
@@ -3,3 +3,5 @@ Bamboo=Bambú
 Bamboo Leaves=Hojas de bambú
 Bamboo Sprout=Brote de bambú
 Bamboo Wood=Tablas de bambú
+Bamboo Stair=Escaleras de bambú
+Bamboo Slab=Losa de bambú
diff --git a/birch/init.lua b/birch/init.lua
index a58d868..795eda5 100644
--- a/birch/init.lua
+++ b/birch/init.lua
@@ -161,9 +161,9 @@ minetest.register_node("birch:trunk", {
 	paramtype2 = "facedir",
 	on_place = minetest.rotate_node,
 	is_ground_content = false,
-	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		minetest.item_place_node(itemstack, player, pointed_thing, nil)
-	end
+	--on_rightclick = function(pos, node, player, itemstack, pointed_thing)
+		--minetest.item_place_node(itemstack, player, pointed_thing, nil)
+	--end
 })
 
 -- birch wood
diff --git a/cherrytree/init.lua b/cherrytree/init.lua
index ea08aa6..d425454 100644
--- a/cherrytree/init.lua
+++ b/cherrytree/init.lua
@@ -126,7 +126,7 @@ minetest.register_node("cherrytree:trunk", {
 	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		minetest.item_place_node(itemstack, player, pointed_thing, nil)
+		--minetest.item_place_node(itemstack, player, pointed_thing, nil)
 	end
 })
 
diff --git a/ebony/init.lua b/ebony/init.lua
index 20d71a6..490f471 100644
--- a/ebony/init.lua
+++ b/ebony/init.lua
@@ -102,7 +102,7 @@ minetest.register_node("ebony:trunk", {
 	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		minetest.item_place_node(itemstack, player, pointed_thing, nil)
+		--minetest.item_place_node(itemstack, player, pointed_thing, nil)
 	end
 })
 
diff --git a/jacaranda/init.lua b/jacaranda/init.lua
index 75ff543..2fc3a2e 100644
--- a/jacaranda/init.lua
+++ b/jacaranda/init.lua
@@ -100,7 +100,7 @@ minetest.register_node("jacaranda:trunk", {
 	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		minetest.item_place_node(itemstack, player, pointed_thing, nil)
+		--minetest.item_place_node(itemstack, player, pointed_thing, nil)
 	end
 })
 
diff --git a/mahogany/init.lua b/mahogany/init.lua
index 2002904..1ee0c7d 100644
--- a/mahogany/init.lua
+++ b/mahogany/init.lua
@@ -103,7 +103,7 @@ minetest.register_node("mahogany:trunk", {
 	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		minetest.item_place_node(itemstack, player, pointed_thing, nil)
+		--minetest.item_place_node(itemstack, player, pointed_thing, nil)
 	end
 })