Updated moretrees, plantlife, and MinetestForFunGame

- Solves #220
 - Merge mapgen into MinetestForFun Game
 - Merge acacia support in moretrees
 - Add 3dmushrooms mod (world.mt updated)

mods/moretrees/biome_defs.lua

@@ -118,18 +118,24 @@ moretrees.rubber_tree_biome = {
 }
 
 moretrees.jungletree_biome = {
-	surface = "default:dirt_with_grass",
-	avoid_nodes = moretrees.avoidnodes,
-	avoid_radius = 5,
+	surface = {
+		"default:dirt",
+		"default:dirt_with_grass",
+		"woodsoils:dirt_with_leaves_1",
+		"woodsoils:grass_with_leaves_1",
+		"woodsoils:grass_with_leaves_2"
+	},
+	avoid_nodes = {"moretrees:jungletree_trunk"},
+	max_count = 12,
+	avoid_radius = 3,
+	rarity = 85,
 	seed_diff = 329,
-	min_elevation = -5,
-	max_elevation = 10,
-	temp_min = 0.25,
-	near_nodes = {"default:water_source"},
-	near_nodes_size = 20,
-	near_nodes_count = 7,
-	rarity = 10,
-	max_count = 10,
+	min_elevation = 1,
+	near_nodes = {"default:jungletree"},
+	near_nodes_size = 6,
+	near_nodes_vertical = 2,
+	near_nodes_count = 1,
+	plantlife_limit = -0.9,
 }
 
 moretrees.spruce_biome = {
@@ -180,4 +186,3 @@ moretrees.fir_biome_snow = {
 	delete_above = true,
 	spawn_replace_node = true
 }
-

mods/moretrees/default_settings.txt

@@ -38,18 +38,6 @@ moretrees.plantlike_leaves		= false
 
 moretrees.enable_leafdecay		= true
 
--- Enable this one if you want this mod's leafdecay code to affect the old
--- default trees too; this setting is independent of the one above.  You'll
--- want to manually disable the default leafdecay code in minetest_game if
--- you enable this, otherwise you'll have two sets of leaf decay code running
--- at the same time, which will just waste CPU for no benefit.
-
-moretrees.enable_default_leafdecay	= true
-
--- Enable this one for default *jungle* leaves
-
-moretrees.enable_default_jungle_leafdecay	= true
-
 -- Enable this if you want moretrees to redefine default apples so that they
 -- fall when leaves decay/are dug.
 
@@ -61,10 +49,6 @@ moretrees.leafdecay_delay		= 2
 moretrees.leafdecay_chance		= 100
 moretrees.leafdecay_radius		= 5
 
-moretrees.default_jungle_leafdecay_delay = 2
-moretrees.default_jungle_leafdecay_chance = 100
-moretrees.default_jungle_leafdecay_radius = 5
-
 moretrees.palm_leafdecay_radius		= 15
 
 moretrees.default_leafdecay_delay	= 3

mods/moretrees/init.lua

@@ -13,8 +13,7 @@
 -- by RealBadAngel.
 --
 -- License: WTFPL for all parts (code and textures, including those copied
--- from the jungletree and conifers mods) except the default jungle tree trunk
--- texture, which is CC-By-SA.
+-- from the the old jungletree and conifers mods).
 
 moretrees = {}
 
@@ -120,14 +119,13 @@ else
 	moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model
 	moretrees.spawn_willow_object = moretrees.willow_model
 	moretrees.spawn_acacia_object = moretrees.acacia_model
-	moretrees.spawn_birch_object = "moretrees:grow_birch"
-	moretrees.spawn_spruce_object = "moretrees:grow_spruce"
-	moretrees.spawn_jungletree_object = "moretrees:grow_jungletree"
-	moretrees.spawn_fir_object = "moretrees:grow_fir"
-	moretrees.spawn_fir_snow_object = "moretrees:grow_fir_snow"
+	moretrees.spawn_birch_object = "moretrees.grow_birch"
+	moretrees.spawn_spruce_object = "moretrees.grow_spruce"
+	moretrees.spawn_jungletree_object = "moretrees.grow_jungletree"
+	moretrees.spawn_fir_object = "moretrees.grow_fir"
+	moretrees.spawn_fir_snow_object = "moretrees.grow_fir_snow"
 end
 
-
 if moretrees.enable_beech then
 	biome_lib:register_generate_plant(moretrees.beech_biome, moretrees.spawn_beech_object)
 end
@@ -185,7 +183,7 @@ end
 
 -- Code to spawn a birch tree
 
-function moretrees:grow_birch(pos)
+function moretrees.grow_birch(pos)
 	minetest.remove_node(pos)
 	if math.random(1,2) == 1 then
 		minetest.spawn_tree(pos, moretrees.birch_model1)
@@ -196,7 +194,7 @@ end
 
 -- Code to spawn a spruce tree
 
-function moretrees:grow_spruce(pos)
+function moretrees.grow_spruce(pos)
 	minetest.remove_node(pos)
 	if math.random(1,2) == 1 then
 		minetest.spawn_tree(pos, moretrees.spruce_model1)
@@ -221,7 +219,7 @@ moretrees.ct_rules_b1 = "[-FBf][+FBf]"
 moretrees.ct_rules_a2 = "FF[FF][&&-FBF][&&+FBF][&&---FBF][&&+++FBF]F/A"
 moretrees.ct_rules_b2 = "[-fB][+fB]"
 
-function moretrees:grow_jungletree(pos)
+function moretrees.grow_jungletree(pos)
 	local r1 = math.random(2)
 	local r2 = math.random(3)
 	if r1 == 1 then
@@ -261,7 +259,7 @@ end
 
 -- code to spawn fir trees
 
-function moretrees:grow_fir(pos)
+function moretrees.grow_fir(pos)
 	if math.random(2) == 1 then
 		moretrees.fir_model.leaves="moretrees:fir_leaves"
 	else
@@ -288,7 +286,7 @@ end
 
 -- same thing, but a smaller version that grows only in snow biomes
 
-function moretrees:grow_fir_snow(pos)
+function moretrees.grow_fir_snow(pos)
 	if math.random(2) == 1 then
 		moretrees.fir_model.leaves="moretrees:fir_leaves"
 	else

mods/moretrees/leafdecay.lua

@@ -19,7 +19,7 @@ end
 if moretrees.enable_leafdecay then
 	for i in ipairs(moretrees.treelist) do
 		local treename = moretrees.treelist[i][1]
-		if treename ~= "jungletree" and treename ~= "fir" and treename ~= "palm" then
+		if treename ~= "jungletree" and treename ~= "pine" and treename ~= "acacia" and treename ~= "fir" and treename ~= "palm" then
 			minetest.register_abm({
 				nodenames = "moretrees:"..treename.."_leaves",
 				interval = moretrees.leafdecay_delay,
@@ -35,11 +35,11 @@ if moretrees.enable_leafdecay then
 	end
 
 	minetest.register_abm({
-		nodenames = {"moretrees:jungletree_leaves_red","moretrees:jungletree_leaves_green","moretrees:jungletree_leaves_yellow"},
+		nodenames = {"default:jungleleaves", "moretrees:jungletree_leaves_red", "moretrees:jungletree_leaves_yellow"},
 		interval = moretrees.leafdecay_delay,
 		chance = moretrees.leafdecay_chance,
 		action = function(pos, node, active_object_count, active_object_count_wider)
-			if minetest.find_node_near(pos, moretrees.leafdecay_radius, {"ignore", "default:jungletree", "moretrees:jungletree_trunk"}) then return end
+			if minetest.find_node_near(pos, moretrees.leafdecay_radius, {"ignore", "default:jungletree"}) then return end
 			process_drops(pos, node.name)
 			minetest.remove_node(pos)
 			nodeupdate(pos)
@@ -71,21 +71,6 @@ if moretrees.enable_leafdecay then
 	})
 end
 
-if moretrees.enable_default_leafdecay then
-
-	minetest.register_abm({
-		nodenames = "default:leaves",
-		interval = moretrees.default_leafdecay_delay,
-		chance = moretrees.default_leafdecay_chance,
-		action = function(pos, node, active_object_count, active_object_count_wider)
-			if minetest.find_node_near(pos, moretrees.default_leafdecay_radius, { "ignore", "default:tree" }) then return end
-			process_drops(pos, node.name)
-			minetest.remove_node(pos)
-			nodeupdate(pos)
-		end
-	})
-end
-
 -- Decay apple tree blossoms from nature_classic mod
 if minetest.get_modpath("nature_classic") then
 	minetest.register_abm({
@@ -100,18 +85,3 @@ if minetest.get_modpath("nature_classic") then
 		end
 	})
 end
-
-if moretrees.enable_default_jungle_leafdecay then
-	minetest.register_abm({
-		nodenames = "default:jungleleaves",
-		interval = moretrees.default_jungle_leafdecay_delay,
-		chance = moretrees.default_jungle_leafdecay_chance,
-		action = function(pos, node, active_object_count, active_object_count_wider)
-			if minetest.find_node_near(pos, moretrees.default_jungle_leafdecay_radius, { "ignore", "default:jungletree" }) then return end
-			process_drops(pos, node.name)
-			minetest.remove_node(pos)
-			nodeupdate(pos)
-		end
-	})
-end
-

mods/moretrees/locale/de.txt

@@ -65,7 +65,6 @@ Spruce Cone = Fichtenzapfen
 Pine Cone = Kiefernzapfen
 Fir Cone = Tannenzapfen
 Jungle Sapling = Tropenbaumsetzling
-Jungle Tree Leaves (Green) = Tropenbaumlaub (gruen)
 Jungle Tree Leaves (Yellow) = Tropenbaumlaub (gelb)
 Jungle Tree Leaves (Red) = Tropenbaumlaub (rot)
 Douglas Fir Leaves (Bright) = Douglasiennadeln (breit)

mods/moretrees/locale/template.txt

@@ -65,7 +65,6 @@ Spruce Cone =
 Pine Cone = 
 Fir Cone = 
 Jungle Sapling = 
-Jungle Tree Leaves (Green) = 
 Jungle Tree Leaves (Yellow) = 
 Jungle Tree Leaves (Red) = 
 Douglas Fir Leaves (Bright) = 

mods/moretrees/node_defs.lua

@@ -5,17 +5,18 @@ moretrees.avoidnodes = {}
 moretrees.treelist = {
 	{"beech",		"Beech Tree"},
 	{"apple_tree",	"Apple Tree"},
-	{"oak",			"Oak Tree",			"acorn",		"Acorn",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"oak",			"Oak Tree",			"acorn",		"Acorn",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
 	{"sequoia",		"Giant Sequoia"},
 	{"birch",		"Birch Tree"},
-	{"palm",		"Palm Tree",		"coconut",		"Coconut",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
-	{"spruce",		"Spruce Tree",		"spruce_cone",	"Spruce Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
-	{"pine",		"Pine Tree",		"pine_cone",	"Pine Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"palm",		"Palm Tree",		"coconut",		"Coconut",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	1.0 },
+	{"spruce",		"Spruce Tree",		"spruce_cone",	"Spruce Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
 	{"willow",		"Willow Tree"},
-	{"acacia",		"Acacia Tree"},
 	{"rubber_tree",	"Rubber Tree"},
-	{"jungletree",	"Jungle Tree"},
-	{"fir",			"Douglas Fir",		"fir_cone",		"Fir Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"fir",			"Douglas Fir",		"fir_cone",		"Fir Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
+
+	{"jungletree",	"Jungle Tree",		nil,			nil,			nil,								nil, "default_junglesapling.png"  },
+	{"pine",		"Pine Tree",		"pine_cone",	"Pine Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8, "default_pine_sapling.png"   },
+	{"acacia",		"Acacia Tree",		nil,			nil,			nil,								nil, "default_acacia_sapling.png" },
 }
 
 local dirs1 = { 21, 20, 23, 22, 21 }
@@ -75,9 +76,10 @@ for i in ipairs(moretrees.treelist) do
 	local fruitdesc = moretrees.treelist[i][4]
 	local selbox = moretrees.treelist[i][5]
 	local vscale = moretrees.treelist[i][6]
+	local saptext = moretrees.treelist[i][7] or "moretrees_"..treename.."_sapling.png"
 
 	if treename ~= "jungletree"  -- the default game provides jungle tree, acacia, and pine trunk/planks nodes.
---		and treename ~= "acacia" UNCOMMENT WHEN ACACIA IS MERGED FROM MT_GAME
+		and treename ~= "acacia"
 		and treename ~= "pine" then
 
 		minetest.register_node("moretrees:"..treename.."_trunk", {
@@ -105,8 +107,8 @@ for i in ipairs(moretrees.treelist) do
 		minetest.register_node("moretrees:"..treename.."_sapling", {
 			description = S(treedesc.." Sapling"),
 			drawtype = "plantlike",
-			tiles = {"moretrees_"..treename.."_sapling.png"},
-			inventory_image = "moretrees_"..treename.."_sapling.png",
+			tiles = {saptext},
+			inventory_image = saptext,
 			paramtype = "light",
 			paramtype2 = "waving",
 			walkable = false,
@@ -118,28 +120,10 @@ for i in ipairs(moretrees.treelist) do
 			sounds = default.node_sound_defaults(),
 		})
 
-		minetest.register_node("moretrees:"..treename.."_sapling_ongen", {
-			description = S(treedesc.." Sapling"),
-			drawtype = "plantlike",
-			tiles = {"moretrees_"..treename.."_sapling.png"},
-			inventory_image = "moretrees_"..treename.."_sapling.png",
-			paramtype = "light",
-			paramtype2 = "waving",
-			walkable = false,
-			selection_box = {
-				type = "fixed",
-				fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
-			},
-			groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,not_in_creative_inventory=1,sapling=1},
-			sounds = default.node_sound_defaults(),
-			drop = "moretrees:"..treename.."_sapling"
-		})
-
 		-- player will get a sapling with 1/100 chance
 		-- player will get leaves only if he/she gets no saplings,
 		-- this is because max_items is 1
 
-
 		local droprarity = 100
 
 		if treename == "palm" then
@@ -183,7 +167,7 @@ for i in ipairs(moretrees.treelist) do
 				stairsplus:register_all(
 					"moretrees",
 					treename.."_trunk",
-					"moretrees:"..treename.."_trunk", 
+					"moretrees:"..treename.."_trunk",
 					{
 						groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 },
 						tiles =	{
@@ -235,6 +219,23 @@ for i in ipairs(moretrees.treelist) do
 		end
 	end
 
+	minetest.register_node("moretrees:"..treename.."_sapling_ongen", {
+		description = S(treedesc.." Sapling"),
+		drawtype = "plantlike",
+		tiles = {saptext},
+		inventory_image = saptext,
+		paramtype = "light",
+		paramtype2 = "waving",
+		walkable = false,
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
+		},
+		groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,not_in_creative_inventory=1,sapling=1},
+		sounds = default.node_sound_defaults(),
+		drop = "moretrees:"..treename.."_sapling"
+	})
+
 	if fruit then
 		minetest.register_node("moretrees:"..fruit, {
 			description = S(fruitdesc),
@@ -276,46 +277,9 @@ end
 
 -- Extra nodes for jungle trees:
 
-minetest.register_node("moretrees:jungletree_sapling", {
-        description = S("Jungle Sapling"),
-        drawtype = "plantlike",
-        visual_scale = 1.0,
-        tiles = {"default_junglesapling.png"},
-        inventory_image = "default_junglesapling.png",
-        wield_image = "default_junglesapling.png",
-        paramtype = "light",
-		paramtype2 = "waving",
-        walkable = false,
-        selection_box = {
-                type = "fixed",
-                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
-        },
-        groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
-        sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node("moretrees:jungletree_sapling_ongen", {
-        description = S("Jungle Sapling"),
-        drawtype = "plantlike",
-        visual_scale = 1.0,
-        tiles = {"default_junglesapling.png"},
-        inventory_image = "default_junglesapling.png",
-        wield_image = "default_junglesapling.png",
-        paramtype = "light",
-		paramtype2 = "waving",
-        walkable = false,
-        selection_box = {
-                type = "fixed",
-                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
-        },
-        groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,not_in_creative_inventory=1,sapling=1},
-        sounds = default.node_sound_leaves_defaults(),
-	drop = "moretrees:jungletree_sapling"
-})
-
-local jungleleaves = {"green","yellow","red"}
-local jungleleavesnames = {"Green", "Yellow", "Red"}
-for color = 1, 3 do
+local jungleleaves = {"yellow","red"}
+local jungleleavesnames = {"Yellow", "Red"}
+for color = 1, #jungleleaves do
 	local leave_name = "moretrees:jungletree_leaves_"..jungleleaves[color]
 
 	local moretrees_leaves_inventory_image = nil
@@ -338,7 +302,7 @@ for color = 1, 3 do
 		drop = {
 			max_items = 1,
 			items = {
-				{items = {'moretrees:jungletree_sapling'}, rarity = 100 },
+				{items = {"default:junglesapling"}, rarity = 100 },
 				{items = {"moretrees:jungletree_leaves_"..jungleleaves[color]} }
 			}
 		},
@@ -380,15 +344,16 @@ if moretrees.enable_redefine_apple then
 end
 
 table.insert(moretrees.avoidnodes, "default:jungletree")
-table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk")
+table.insert(moretrees.avoidnodes, "default:pine_tree")
+table.insert(moretrees.avoidnodes, "default:acacia_tree")
 table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
 table.insert(moretrees.avoidnodes, "default:tree")
 
 if moretrees.spawn_saplings then
 		table.insert(moretrees.avoidnodes, "snow:sapling_pine")
 		table.insert(moretrees.avoidnodes, "default:junglesapling")
-		table.insert(moretrees.avoidnodes, "moretrees:jungle_tree_sapling")
-		table.insert(moretrees.avoidnodes, "moretrees:jungle_tree_sapling_ongen")
+		table.insert(moretrees.avoidnodes, "default:pine_sapling")
+		table.insert(moretrees.avoidnodes, "default:acacia_sapling")
 end
 
 -- "empty" (tapped) rubber tree nodes
@@ -418,45 +383,56 @@ minetest.register_abm({
 	end,
 })
 
--- For compatibility with old nodes and recently-changed nodes.
+-- To get Moretrees to generate its own jungle trees among the default mapgen
+-- we need our own copy of that node, which moretrees will match against.
 
-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("farming:rubber_tree_full", "moretrees:rubber_tree_trunk")
+local jungle_tree = moretrees.clone_node("default:jungletree")
+minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
 
-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:rubber_leaves", "moretrees:rubber_tree_leaves")
+-- For compatibility with old nodes, recently-changed nodes, and default nodes
 
-minetest.register_alias("technic:rubber_tree_sapling", "moretrees:rubber_tree_sapling")
-minetest.register_alias("farming_plus:rubber_sapling", "moretrees:rubber_tree_sapling")
-minetest.register_alias("farming:rubber_sapling", "moretrees:rubber_tree_sapling")
+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("farming:rubber_tree_full",				"moretrees:rubber_tree_trunk")
 
-minetest.register_alias("default:junglesapling","moretrees:jungletree_sapling")
-minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horizontal_jungle_tree")
-minetest.register_alias("moretrees:jungletree_trunk", "default:jungletree")
-minetest.register_alias("moretrees:jungletree_planks", "default:junglewood")
+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:rubber_leaves",				"moretrees:rubber_tree_leaves")
 
-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")
+minetest.register_alias("technic:rubber_tree_sapling",			"moretrees:rubber_tree_sapling")
+minetest.register_alias("farming_plus:rubber_sapling",			"moretrees:rubber_tree_sapling")
+minetest.register_alias("farming:rubber_sapling",				"moretrees:rubber_tree_sapling")
 
-minetest.register_alias("moretrees:conifer_trunk", "moretrees:fir_trunk")
-minetest.register_alias("moretrees:conifer_trunk_sideways", "moretrees:fir_trunk_sideways")
-minetest.register_alias("moretrees:conifer_leaves", "moretrees:fir_leaves")
-minetest.register_alias("moretrees:conifer_leaves_bright", "moretrees:fir_leaves_bright")
-minetest.register_alias("moretrees:conifer_sapling", "moretrees:fir_sapling")
+minetest.register_alias("moretrees:conifer_trunk",				"moretrees:fir_trunk")
+minetest.register_alias("moretrees:conifer_trunk_sideways",		"moretrees:fir_trunk_sideways")
+minetest.register_alias("moretrees:conifer_leaves",				"moretrees:fir_leaves")
+minetest.register_alias("moretrees:conifer_leaves_bright",		"moretrees:fir_leaves_bright")
+minetest.register_alias("moretrees:conifer_sapling",			"moretrees:fir_sapling")
 
-minetest.register_alias("conifers:trunk", "moretrees:fir_trunk")
-minetest.register_alias("conifers:trunk_reversed", "moretrees:fir_trunk_sideways")
-minetest.register_alias("conifers:leaves", "moretrees:fir_leaves")
-minetest.register_alias("conifers:leaves_special", "moretrees:fir_leaves_bright")
-minetest.register_alias("conifers:sapling", "moretrees:fir_sapling")
+minetest.register_alias("conifers:trunk",						"moretrees:fir_trunk")
+minetest.register_alias("conifers:trunk_reversed",				"moretrees:fir_trunk_sideways")
+minetest.register_alias("conifers:leaves",						"moretrees:fir_leaves")
+minetest.register_alias("conifers:leaves_special",				"moretrees:fir_leaves_bright")
+minetest.register_alias("conifers:sapling",						"moretrees:fir_sapling")
 
-minetest.register_alias("moretrees:pine_trunk", "default:pinetree")
-minetest.register_alias("moretrees:pine_planks", "default:pinewood")
-minetest.register_alias("moretrees:pine_sapling", "default:pine_sapling")
-minetest.register_alias("moretrees:pine_leaves", "default:pine_needles")
+minetest.register_alias("moretrees:jungletree_sapling",			"default:junglesapling")
+minetest.register_alias("moretrees:jungletree_trunk_sideways",	"moreblocks:horizontal_jungle_tree")
+minetest.register_alias("moretrees:jungletree_planks",			"default:junglewood")
+minetest.register_alias("moretrees:jungletree_leaves_green",	"default:jungletree_leaves")
+
+minetest.register_alias("jungletree:leaves_green",				"default:jungleleaves")
+minetest.register_alias("jungletree:leaves_red",				"moretrees:jungletree_leaves_red")
+minetest.register_alias("jungletree:leaves_yellow",				"moretrees:jungletree_leaves_yellow")
+
+minetest.register_alias("moretrees:acacia_trunk",				"default:acacia_tree")
+minetest.register_alias("moretrees:acacia_planks",				"default:acacia_wood")
+minetest.register_alias("moretrees:acacia_sapling",				"default:acacia_sapling")
+minetest.register_alias("moretrees:acacia_leaves",				"default:acacia_leaves")
+
+minetest.register_alias("moretrees:pine_trunk",					"default:pinetree")
+minetest.register_alias("moretrees:pine_planks",				"default:pinewood")
+minetest.register_alias("moretrees:pine_sapling",				"default:pine_sapling")
+minetest.register_alias("moretrees:pine_leaves",				"default:pine_needles")
 
 -- Overriding moretrees' palm leaves:
 minetest.override_item("moretrees:palm_leaves",{walkable = false})

mods/moretrees/saplings.lua

@@ -78,7 +78,7 @@ biome_lib:grow_plants({
 biome_lib:grow_plants({
 	grow_delay = moretrees.sapling_interval,
 	grow_chance = moretrees.sapling_chance,
-	grow_plant = "moretrees:jungletree_sapling",
+	grow_plant = "default:junglesapling",
 	grow_nodes = moretrees.jungletree_biome.surface,
 	grow_function = "moretrees:grow_jungletree"
 })

mods/moretrees/tree_models.lua

@@ -144,8 +144,8 @@ moretrees.pine_model={
 	rules_b="[&&&TTT[++^Fdd][--&Fdd]//dd[+^d][--&Fd]]",
 	rules_c="/",
 	rules_d="F",
-	trunk="moretrees:pine_trunk",
-	leaves="moretrees:pine_leaves",
+	trunk="default:pine_tree",
+	leaves="default:pine_needles",
 	angle=30,
 	iterations=2,
 	random_level=0,
@@ -191,8 +191,8 @@ moretrees.acacia_model={
 			.."GGfffff--G--"
 			.."ffffGGG",
 	rules_c = "/",
-	trunk="moretrees:acacia_trunk",
-	leaves="moretrees:acacia_leaves",
+	trunk="default:acacia_tree",
+	leaves="default:acacia_leaves",
 	angle=45,
 	iterations=3,
 	random_level=0,
@@ -217,8 +217,8 @@ moretrees.jungletree_model={
 	axiom=nil,
 	rules_a=nil,
 	rules_b=nil,
-	trunk="default:jungletree",
-	leaves="moretrees:jungletree_leaves_green",
+	trunk="moretrees:jungletree_trunk",
+	leaves="default:jungleleaves",
 	leaves2=nil,
 	leaves2_chance=nil,
 	angle=45,