Merge branch 'master' into newstuff

1 files changed, 42 insertions, 18 deletions

diff --git a/node_defs.lua b/node_defs.lua
index 8f235cb..2fe779d 100644
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -195,24 +195,6 @@ for color = 1, 3 do
 	})
 end
 
--- sideways jungle tree trunk:
-
-minetest.register_node("moretrees:jungletree_trunk_sideways", {
-	description = "Sideways Jungle Tree Trunk",
-	tiles = {
-		"default_jungletree.png^[transformR90",
-		"default_jungletree.png^[transformR90",
-		"default_jungletree_top.png",
-		"default_jungletree_top.png",
-		"default_jungletree.png^[transformR90",
-		"default_jungletree.png^[transformR90"
-	},
-	is_ground_content = true,
-	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
-	sounds = default.node_sound_wood_defaults(),
-	paramtype2 = "facedir",
-})
-
 -- Extra needles for firs
 
 minetest.register_node("moretrees:fir_leaves_bright", {
@@ -257,13 +239,55 @@ table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk")
 table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
 table.insert(moretrees.avoidnodes, "default:tree")
 
+-- "empty" (tapped) rubber tree nodes
+
+minetest.register_node("moretrees:rubber_tree_trunk_empty", {
+	description = "Rubber Tree Trunk (Empty)",
+	tiles = {
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_empty.png"
+	},
+	is_ground_content = true,
+	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("moretrees:rubber_tree_trunk_empty_sideways", {
+	description = "Sideways Rubber Tree Trunk (Empty)",
+	tiles = {
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90",
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90",
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90",
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90"
+	},
+	is_ground_content = true,
+	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+})
+
+
 -- For compatibility with old nodes and recently-changed nodes.
 
+minetest.register_alias("technic:rubber_tree_full",      "moretrees:rubber_tree_trunk")
+minetest.register_alias("farming_plus:rubber_tree_full", "moretrees:rubber_tree_trunk")
+
+minetest.register_alias("technic:rubber_leaves",      "moretrees:rubber_tree_leaves")
+minetest.register_alias("farming_plus:rubber_leaves", "moretrees:rubber_tree_leaves")
+
+minetest.register_alias("farming_plus:rubber_sapling", "moretrees:rubber_tree_sapling")
+minetest.register_alias("technic:rubber_tree_sapling", "moretrees:rubber_tree_sapling")
+
 minetest.register_alias("moretrees:jungletree_trunk", "default:jungletree")
 minetest.register_alias("moretrees:jungletree_planks", "default:junglewood")
 minetest.register_alias("moretrees:jungletree_sapling", "default:junglesapling")
 minetest.register_alias("jungletree:sapling", "default:junglesapling")
 
+minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horizontal_jungle_tree")
+
 minetest.register_alias("jungletree:leaves_green", "moretrees:jungletree_leaves_green")
 minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red")
 minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow")