From 6194cf7610bbdc63ec635522ed81f0b1d798785e Mon Sep 17 00:00:00 2001
From: Cristiano Magro <cristiano.magro@vola.it>
Date: Fri, 03 Sep 2021 15:27:47 +0200
Subject: [PATCH] Merge branch 'master' into xno_tree_trap

---
 technic_worldgen/rubber.lua |   39 ++++++++++++++-------------------------
 1 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/technic_worldgen/rubber.lua b/technic_worldgen/rubber.lua
index 8e47849..11da9ca 100644
--- a/technic_worldgen/rubber.lua
+++ b/technic_worldgen/rubber.lua
@@ -1,14 +1,16 @@
 -- Code of rubber tree by PilzAdam
 
+local S = technic.worldgen.gettext
+
 minetest.register_node(":moretrees:rubber_tree_sapling", {
-	description = "Rubber Tree Sapling",
+	description = S("Rubber Tree Sapling"),
 	drawtype = "plantlike",
 	tiles = {"technic_rubber_sapling.png"},
 	inventory_image = "technic_rubber_sapling.png",
 	wield_image = "technic_rubber_sapling.png",
 	paramtype = "light",
 	walkable = false,
-	groups = {dig_immediate=3, flammable=2},
+	groups = {dig_immediate=3, flammable=2, sapling=1},
 	sounds = default.node_sound_defaults(),
 })
 
@@ -19,52 +21,39 @@
 })
 
 minetest.register_node(":moretrees:rubber_tree_trunk", {
-	description = "Rubber Tree",
+	description = S("Rubber Tree"),
 	tiles = {"default_tree_top.png", "default_tree_top.png",
 		"technic_rubber_tree_full.png"},
 	groups = {tree=1, snappy=1, choppy=2, oddly_breakable_by_hand=1,
 		flammable=2},
-	drop = "moretrees:rubber_tree_trunk_empty",
 	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node(":moretrees:rubber_tree_trunk_empty", {
-	description = "Rubber Tree",
+	description = S("Rubber Tree"),
 	tiles = {"default_tree_top.png", "default_tree_top.png",
 		"technic_rubber_tree_empty.png"},
 	groups = {tree=1, snappy=1, choppy=2, oddly_breakable_by_hand=1,
 			flammable=2, not_in_creative_inventory=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_place_node = function(pos, placer, itemstack)
-		local meta = minetest.get_meta(pos)
-		meta:set_int("placed", 1)
-	end,
-})
-
-minetest.register_abm({
-	nodenames = {"moretrees:rubber_tree_trunk_empty"},
-	interval = 60,
-	chance = 15,
-	action = function(pos, node)
-		local meta = minetest.get_meta(pos)
-		if meta:get_int("placed") ~= 0 then
-			return
-		end
-		minetest.set_node(pos, {name="moretrees:rubber_tree_trunk"})
-	end
 })
 
 minetest.register_node(":moretrees:rubber_tree_leaves", {
 	drawtype = "allfaces_optional",
+	description = S("Rubber Tree Leaves"),
 	tiles = {"technic_rubber_leaves.png"},
 	paramtype = "light",
-	groups = {snappy=3, leafdecay=3, flammable=2, not_in_creative_inventory=1},
+	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
 	drop = {
 		max_items = 1,
 		items = {{
 			items = {"moretrees:rubber_tree_sapling"},
 			rarity = 20,
-		}}
+		},
+		{
+			items = {"moretrees:rubber_tree_leaves"},
+		}
+		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
 })
@@ -84,6 +73,7 @@
 
 minetest.register_abm({
 	nodenames = {"moretrees:rubber_tree_sapling"},
+	label = "Worldgen: grow rubber tree sapling",
 	interval = 60,
 	chance = 20,
 	action = function(pos, node)
@@ -108,4 +98,3 @@
 		end
 	end)
 end
-

--
Gitblit v1.8.0