Updated moretrees, plantlife, and added biome_lib

- Solves #204
 - Updated world.mt
 - Updated news.txt

mods/moretrees/README.md

@@ -8,4 +8,4 @@ jungle trees mod, and big contributions by RealBadAngel.
 Brought together into one mod and made L-systems compatible by Vanessa
 Ezekowitz.
 
-Dependencies: <a href="https://github.com/VanessaE/plantlife">plants_lib</a> and default
+Dependencies: <a href="https://forum.minetest.net/viewtopic.php?f=11&t=12999">biome_lib</a> and default

mods/moretrees/biome_defs.lua

@@ -91,7 +91,7 @@ moretrees.willow_biome = {
 }
 
 moretrees.acacia_biome = {
-	surface = { "default:dirt_with_grass", "default:desert_sand" },
+	surface = { "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:desert_sand" },
 	avoid_nodes = moretrees.avoidnodes,
 	avoid_radius = 15,
 	seed_diff = 1,

mods/moretrees/crafts.lua

@@ -3,6 +3,7 @@ local S = moretrees.intllib
 for i in ipairs(moretrees.treelist) do
 	local treename = moretrees.treelist[i][1]
 
+	-- MODIFICATION MADE FOR MFF //MFF(Mg|08/12/15)
 	if minetest.registered_items["moretrees:" .. treename .. "_trunk_sideways"] then
 		minetest.register_craft({
 			output = "moretrees:"..treename.."_trunk 2",

mods/moretrees/default_settings.txt

@@ -18,13 +18,15 @@ moretrees.enable_beech			= true
 
 -- set this to true to make moretrees spawn saplings at mapgen time instead
 -- of fully-grown trees, which will grow into full trees very quickly.  With
--- older versions of plants_lib, doing this will reduce mapgen lag.
+-- older versions of biome_lib, doing this will reduce mapgen lag.
 
 moretrees.spawn_saplings		= true
 
--- Set this to true to allow usage of the stairsplus mod in moreblocks
+-- Set this to true to allow defining stairs/slabs/etc.  If Moreblocks is
+-- installed, this will use that mod's Stairs Plus component.  Otherwise, it 
+-- will use the default stairs mod in minetest_game, if present
 
-moretrees.enable_stairsplus		= true
+moretrees.enable_stairs			= true
 
 -- Set this to true if you want the plantlike drawtype for leaves, which 
 -- improves some peoples' framerates without resorting to making leaf nodes opaque.

mods/moretrees/depends.txt

@@ -1,5 +1,6 @@
 default
-plants_lib
+biome_lib
+stairs?
 moreblocks?
 intllib?
 

mods/moretrees/init.lua

@@ -52,6 +52,17 @@ else
 end
 moretrees.intllib = S
 
+-- clone node
+
+function moretrees.clone_node(name)
+	local node2 = {}
+	local node = minetest.registered_nodes[name]
+	for k,v in pairs(node) do
+		node2[k]=v
+	end
+	return node2
+end
+
 -- infinite stacks checking
 
 if minetest.get_modpath("unified_inventory") or not minetest.setting_getbool("creative_mode") then
@@ -118,57 +129,57 @@ end
 
 
 if moretrees.enable_beech then
-	plantslib:register_generate_plant(moretrees.beech_biome, moretrees.spawn_beech_object)
+	biome_lib:register_generate_plant(moretrees.beech_biome, moretrees.spawn_beech_object)
 end
 
 if moretrees.enable_apple_tree then
-	plantslib:register_generate_plant(moretrees.apple_tree_biome, moretrees.spawn_apple_tree_object)
+	biome_lib:register_generate_plant(moretrees.apple_tree_biome, moretrees.spawn_apple_tree_object)
 end
 
 if moretrees.enable_oak then
-	plantslib:register_generate_plant(moretrees.oak_biome, moretrees.spawn_oak_object)
+	biome_lib:register_generate_plant(moretrees.oak_biome, moretrees.spawn_oak_object)
 end
 
 if moretrees.enable_sequoia then
-	plantslib:register_generate_plant(moretrees.sequoia_biome, moretrees.spawn_sequoia_object)
+	biome_lib:register_generate_plant(moretrees.sequoia_biome, moretrees.spawn_sequoia_object)
 end
 
 if moretrees.enable_palm then
-	plantslib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object)
+	biome_lib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object)
 end
 
 if moretrees.enable_pine then
-	plantslib:register_generate_plant(moretrees.pine_biome, moretrees.spawn_pine_object)
+	biome_lib:register_generate_plant(moretrees.pine_biome, moretrees.spawn_pine_object)
 end
 
 if moretrees.enable_rubber_tree then
-	plantslib:register_generate_plant(moretrees.rubber_tree_biome, moretrees.spawn_rubber_tree_object)
+	biome_lib:register_generate_plant(moretrees.rubber_tree_biome, moretrees.spawn_rubber_tree_object)
 end
 
 if moretrees.enable_willow then
-	plantslib:register_generate_plant(moretrees.willow_biome, moretrees.spawn_willow_object)
+	biome_lib:register_generate_plant(moretrees.willow_biome, moretrees.spawn_willow_object)
 end
 
 if moretrees.enable_acacia then
-	plantslib:register_generate_plant(moretrees.acacia_biome, moretrees.spawn_acacia_object)
+	biome_lib:register_generate_plant(moretrees.acacia_biome, moretrees.spawn_acacia_object)
 end
 
 if moretrees.enable_birch then
-	plantslib:register_generate_plant(moretrees.birch_biome, moretrees.spawn_birch_object)
+	biome_lib:register_generate_plant(moretrees.birch_biome, moretrees.spawn_birch_object)
 end
 
 if moretrees.enable_spruce then
-	plantslib:register_generate_plant(moretrees.spruce_biome, moretrees.spawn_spruce_object)
+	biome_lib:register_generate_plant(moretrees.spruce_biome, moretrees.spawn_spruce_object)
 end
 
 if moretrees.enable_jungle_tree then
-	plantslib:register_generate_plant(moretrees.jungletree_biome, moretrees.spawn_jungletree_object)
+	biome_lib:register_generate_plant(moretrees.jungletree_biome, moretrees.spawn_jungletree_object)
 end
 
 if moretrees.enable_fir then
-	plantslib:register_generate_plant(moretrees.fir_biome, moretrees.spawn_fir_object)
+	biome_lib:register_generate_plant(moretrees.fir_biome, moretrees.spawn_fir_object)
 	if minetest.get_modpath("snow") then
-		plantslib:register_generate_plant(moretrees.fir_biome_snow, moretrees.spawn_fir_snow_object)
+		biome_lib:register_generate_plant(moretrees.fir_biome_snow, moretrees.spawn_fir_snow_object)
 	end
 end
 

mods/moretrees/node_defs.lua

@@ -76,7 +76,9 @@ for i in ipairs(moretrees.treelist) do
 	local selbox = moretrees.treelist[i][5]
 	local vscale = moretrees.treelist[i][6]
 
-	if treename ~= "jungletree" then -- the default game provides jungle tree trunk/planks nodes.
+	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 ~= "pine" then
 
 		minetest.register_node("moretrees:"..treename.."_trunk", {
 			description = S(treedesc.." Trunk"),
@@ -173,37 +175,63 @@ for i in ipairs(moretrees.treelist) do
 			},
 		})
 
-		if minetest.get_modpath("moreblocks") and moretrees.enable_stairsplus then
+		if moretrees.enable_stairs then
+			if minetest.get_modpath("moreblocks") then
 
---			stairsplus:register_all(modname, subname, recipeitem, {fields})
+	--			stairsplus:register_all(modname, subname, recipeitem, {fields})
 
-			stairsplus:register_all(
-				"moretrees",
-				treename.."_trunk",
-				"moretrees:"..treename.."_trunk",
-				{
-					groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 },
-					tiles =	{
-						"moretrees_"..treename.."_trunk_top.png",
+				stairsplus:register_all(
+					"moretrees",
+					treename.."_trunk",
+					"moretrees:"..treename.."_trunk", 
+					{
+						groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 },
+						tiles =	{
+							"moretrees_"..treename.."_trunk_top.png",
+							"moretrees_"..treename.."_trunk_top.png",
+							"moretrees_"..treename.."_trunk.png"
+						},
+						description = S(treedesc.." Trunk"),
+						drop = treename.."_trunk",
+					}
+				)
+
+				stairsplus:register_all(
+					"moretrees",
+					treename.."_planks",
+					"moretrees:"..treename.."_planks",
+					{
+						groups = { snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3, not_in_creative_inventory=1 },
+						tiles = { "moretrees_"..treename.."_wood.png" },
+						description = S(treedesc.." Planks"),
+						drop = treename.."_planks",
+					}
+				)
+			elseif minetest.get_modpath("stairs") then
+				stairs.register_stair_and_slab(
+					"moretrees_"..treename.."_trunk",
+					"moretrees:"..treename.."_trunk",
+					{ snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2 },
+					{	"moretrees_"..treename.."_trunk_top.png",
 						"moretrees_"..treename.."_trunk_top.png",
 						"moretrees_"..treename.."_trunk.png"
 					},
-					description = S(treedesc.." Trunk"),
-					drop = treename.."_trunk",
-				}
-			)
+					S(treedesc.." Trunk Stair"),
+					S(treedesc.." Trunk Slab"),
+					default.node_sound_wood_defaults()
+				)
 
-			stairsplus:register_all(
-				"moretrees",
-				treename.."_planks",
-				"moretrees:"..treename.."_planks",
-				{
- 					groups = { snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3, not_in_creative_inventory=1 },
-					tiles = { "moretrees_"..treename.."_wood.png" },
-					description = S(treedesc.." Planks"),
-					drop = treename.."_planks",
-				}
-			)
+				stairs.register_stair_and_slab(
+					"moretrees_"..treename.."_planks",
+					"moretrees:"..treename.."_planks",
+					{ snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3 },
+					{ "moretrees_"..treename.."_wood.png" },
+					S(treedesc.." Planks Stair"),
+					S(treedesc.." Planks Slab"),
+					default.node_sound_wood_defaults()
+				)
+
+			end
 		end
 	end
 
@@ -346,9 +374,9 @@ minetest.register_node("moretrees:fir_leaves_bright", {
 })
 
 if moretrees.enable_redefine_apple then
-	minetest.override_item("default:apple",
-		{groups = { fleshy=3, dig_immediate=3, flammable=2, leafdecay=3, leafdecay_drop=1, attached_node = 1}
-	})
+	local appledef = moretrees.clone_node("default:apple")
+	appledef.groups.attached_node = 1
+	minetest.register_node(":default:apple", appledef)
 end
 
 table.insert(moretrees.avoidnodes, "default:jungletree")
@@ -425,5 +453,10 @@ 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")
+
 -- Overriding moretrees' palm leaves:
 minetest.override_item("moretrees:palm_leaves",{walkable = false})

mods/moretrees/saplings.lua

@@ -7,8 +7,8 @@ for i in ipairs(moretrees.treelist) do
 
 	if treename ~= "birch" and treename ~= "spruce" and treename ~= "fir" and treename ~= "jungletree" then
 
-		plantslib:dbg(dump(moretrees[tree_biome].surface))
-		plantslib:grow_plants({
+		biome_lib:dbg(dump(moretrees[tree_biome].surface))
+		biome_lib:grow_plants({
 			grow_delay = moretrees.sapling_interval,
 			grow_chance = moretrees.sapling_chance,
 			grow_plant = "moretrees:"..treename.."_sapling",
@@ -16,7 +16,7 @@ for i in ipairs(moretrees.treelist) do
 			grow_function = moretrees[tree_model],
 		})
 
-		plantslib:grow_plants({
+		biome_lib:grow_plants({
 			grow_delay = 2,
 			grow_chance = 30,
 			grow_plant = "moretrees:"..treename.."_sapling_ongen",
@@ -27,7 +27,7 @@ for i in ipairs(moretrees.treelist) do
 	end
 end
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = moretrees.sapling_interval,
 	grow_chance = moretrees.sapling_chance,
 	grow_plant = "moretrees:birch_sapling",
@@ -35,7 +35,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_birch"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = 2,
 	grow_chance = 30,
 	grow_plant = "moretrees:birch_sapling_ongen",
@@ -43,7 +43,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_birch"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = moretrees.sapling_interval,
 	grow_chance = moretrees.sapling_chance,
 	grow_plant = "moretrees:spruce_sapling",
@@ -51,7 +51,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_spruce"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = 2,
 	grow_chance = 30,
 	grow_plant = "moretrees:spruce_sapling_ongen",
@@ -59,7 +59,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_spruce"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = moretrees.sapling_interval,
 	grow_chance = moretrees.sapling_chance,
 	grow_plant = "moretrees:fir_sapling",
@@ -67,7 +67,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_fir"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = 2,
 	grow_chance = 30,
 	grow_plant = "moretrees:fir_sapling_ongen",
@@ -75,7 +75,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_fir"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = moretrees.sapling_interval,
 	grow_chance = moretrees.sapling_chance,
 	grow_plant = "moretrees:jungletree_sapling",
@@ -83,7 +83,7 @@ plantslib:grow_plants({
 	grow_function = "moretrees:grow_jungletree"
 })
 
-plantslib:grow_plants({
+biome_lib:grow_plants({
 	grow_delay = 2,
 	grow_chance = 30,
 	grow_plant = "moretrees:jungletree_sapling_ongen",