Merge remote-tracking branch 'upstream/master'

README.md

@@ -30,5 +30,9 @@ Changelog:
 - 0.8 - Added support for farming redo's new garlic, pepper and onion crops
 - 0.9 - Added support for farming redo's pea and beetroot crops, checks for place_param
 - 1.0 - add_deco() now adds to existing item list while set_deco() replaces item list (thanks h-v-smacker)
+- 1.1 - Added {can_bonemeal=1} group for special nodes
+- 1.2 - Added support for minetest 5.0 cactus seedling, blueberry bush sapling and emergent jungle tree saplings, additional flowers and pine bush sapling.
+- 1.3 - Ability to craft dye from mulch, bonemeal and fertiliser (thanks orbea)
+- 1.4 - Add support for fern saplings from plantlife mod (thanks nixnoxus)
 
 Lucky Blocks: 6

api.txt

@@ -15,7 +15,7 @@ Adding Crops
 ------------
 
 bonemeal:add_crop({
-	{ nodename_start, growing_steps, seed_name }
+	{ nodename_start, growing_steps, seed_name, ignore_light }
 })
 
 This command is used to add new crops for bonemeal to work on.
@@ -25,6 +25,7 @@ e.g.
 bonemeal:add_crop({
 	{"farming:cotton_", 8, "farming:seed_cotton"},
 	{"farming:wheat_", 8, "farming:seed_wheat"},
+	{"mymod:dark_wheat_", 8, "mymod:dark_wheat_seed", true}, -- can grow in darkness
 })
 
 
@@ -32,7 +33,7 @@ Adding Saplings
 ---------------
 
 bonemeal:add_sapling({
-	{ sapling_node, function, soil_type[sand, dirt, nodename] }
+	{ sapling_node, function, soil_type["sand", "dirt", nodename, "group:"], ignore_light }
 })
 
 This command will add new saplings for bonemeal to grow on sand, soil or a
@@ -41,6 +42,7 @@ specified node type.
 bonemeal:add_sapling({
 	{"ethereal:palm_sapling", ethereal.grow_palm_tree, "soil"},
 	{"ethereal:palm_sapling", ethereal.grow_palm_tree, "sand"},
+	{"mymod:dark_tree", mymod.dark_tree, "group:soil", true}, -- can grow in darkness
 })
 
 

depends.txt

@@ -5,3 +5,10 @@ ethereal?
 moretrees?
 technic_worldgen?
 lucky_block?
+flowers?
+dye?
+ferns?
+dryplants?
+df_trees?
+df_farming?
+df_primordial_items?

locale/bonemeal.de.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal geladen
+Bone=Knochen
+Bone Meal=Knochenmehl
+Fertiliser=Dünger
+Gelatin Powder=Gelatinepulver
+Mulch=Mulch

locale/bonemeal.en.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+#[MOD] bonemeal loaded=
+#Bone=
+#Bone Meal=
+#Fertiliser=
+#Gelatin Powder=
+#Mulch=

locale/bonemeal.es.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal cargado
+Bone=Hueso
+Bone Meal=Comida de hueso
+Fertiliser=Fertilizante
+#Gelatin Powder=
+Mulch=Mantillo

locale/bonemeal.fr.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal chargé
+Bone=Os
+Bone Meal=Poudre d'os
+Fertiliser=Engrais
+Gelatin Powder=Poudre de gélatine
+Mulch=Paillis

locale/bonemeal.it.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal caricata
+Bone=Ossa
+Bone Meal=Pasto osseo
+Fertiliser=Fertilizzante
+#Gelatin Powder=
+Mulch=Pacciame

locale/bonemeal.ru.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] костная мука загружена
+Bone=Кость
+Bone Meal=Костная Мука
+Fertiliser=Удобрение
+#Gelatin Powder=
+Mulch=Мульча

locale/es.txt

@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Mantillo
+Bone Meal = Comida de hueso
+Fertiliser = Fertilizante
+Bone = Hueso
+[MOD] bonemeal loaded = [MOD] bonemeal cargado

locale/it.txt

@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Pacciame
+Bone Meal = Pasto osseo
+Fertiliser = Fertilizzante
+Bone = Ossa
+[MOD] bonemeal loaded = [MOD] bonemeal caricata

locale/ru.txt

@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Мульча
+Bone Meal = Костная Мука
+Fertiliser = Удобрение
+Bone = Кость
+[MOD] bonemeal loaded = [MOD] костная мука загружена

locale/template.txt

@@ -1,7 +1,7 @@
 # init.lua
 
-Mulch = 
-Bone Meal = 
-Fertiliser = 
-Bone = 
-[bonemeal] loaded = 
+Mulch =
+Bone Meal =
+Fertiliser =
+Bone =
+[MOD] bonemeal loaded =

lucky_block.lua

@@ -22,8 +22,7 @@ if minetest.get_modpath("lucky_block") then
 		{"nod", "default:chest", 0, {
 			{name = "bonemeal:mulch", max = 20},
 			{name = "bonemeal:bonemeal", max = 15},
-			{name = "bonemeal:fertiliser", max = 10},
-		}},
+			{name = "bonemeal:fertiliser", max = 10}
+		}}
 	})
-
 end

mod.conf

@@ -1 +1,4 @@
-name = bonemeal
+name = bonemeal
+depends = default
+optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants, df_trees, df_farming, df_primordial_items
+description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings.

mods.lua

@@ -3,9 +3,8 @@
 if minetest.get_modpath("animalmaterials") then
 
 	minetest.register_craft({
-		type = "shapeless",
 		output = "bonemeal:bonemeal 2",
-		recipe = {"animalmaterials:bone"},
+		recipe = {{"animalmaterials:bone"}}
 	})
 end
 
@@ -32,10 +31,22 @@ if farming and farming.mod and farming.mod == "redo" then
 		{"farming:chili_", 8},
 		{"farming:garlic_", 5},
 		{"farming:onion_", 5},
-		{"farming:pepper_", 5},
+		{"farming:pepper_", 7},
 		{"farming:pineapple_", 8},
 		{"farming:pea_", 5},
 		{"farming:beetroot_", 5},
+		{"farming:rye_", 8},
+		{"farming:oat_", 8},
+		{"farming:rice_", 8},
+		{"farming:mint_", 4},
+		{"farming:cabbage_", 6},
+		{"farming:lettuce_", 5},
+		{"farming:blackberry_", 4},
+		{"farming:vanilla_", 8},
+		{"farming:soy_", 7},
+		{"farming:artichoke_", 5},
+		{"farming:parsley_", 3},
+		{"farming:sunflower_", 8}
 	})
 end
 
@@ -44,7 +55,7 @@ if minetest.get_modpath("ethereal") then
 
 	bonemeal:add_crop({
 		{"ethereal:strawberry_", 8},
-		{"ethereal:onion_", 5},
+		{"ethereal:onion_", 5}
 	})
 
 	bonemeal:add_sapling({
@@ -57,9 +68,13 @@ if minetest.get_modpath("ethereal") then
 		{"ethereal:mushroom_sapling", ethereal.grow_mushroom_tree, "soil"},
 		{"ethereal:willow_sapling", ethereal.grow_willow_tree, "soil"},
 		{"ethereal:redwood_sapling", ethereal.grow_redwood_tree, "soil"},
+		{"ethereal:giant_redwood_sapling", ethereal.grow_giant_redwood_tree, "soil"},
 		{"ethereal:orange_tree_sapling", ethereal.grow_orange_tree, "soil"},
 		{"ethereal:bamboo_sprout", ethereal.grow_bamboo_tree, "soil"},
 		{"ethereal:birch_sapling", ethereal.grow_birch_tree, "soil"},
+		{"ethereal:sakura_sapling", ethereal.grow_sakura_tree, "soil"},
+		{"ethereal:lemon_tree_sapling", ethereal.grow_lemon_tree, "soil"},
+		{"ethereal:olive_tree_sapling", ethereal.grow_olive_tree, "soil"}
 	})
 
 	local grass = {"default:grass_3", "default:grass_4", "default:grass_5", ""}
@@ -75,7 +90,7 @@ if minetest.get_modpath("ethereal") then
 		{"ethereal:mushroom_dirt", {}, {"flowers:mushroom_red", "flowers:mushroom_brown", "", "", ""}},
 		{"ethereal:jungle_dirt", grass, {"default:junglegrass", "", "", ""}},
 		{"ethereal:grove_dirt", grass, {"ethereal:fern", "", "", ""}},
-		{"ethereal:bamboo_dirt", grass, {}},
+		{"ethereal:bamboo_dirt", grass, {}}
 	})
 end
 
@@ -99,24 +114,191 @@ if minetest.get_modpath("moretrees") then
 		{"moretrees:apple_tree_sapling", moretrees.spawn_apple_tree_object, "soil"},
 		{"moretrees:oak_sapling", moretrees.spawn_oak_object, "soil"},
 		{"moretrees:sequoia_sapling", moretrees.spawn_sequoia_object, "soil"},
-		--{"moretrees:birch_sapling", moretrees.spawn_birch_object, "soil"},
 		{"moretrees:birch_sapling", moretrees.grow_birch, "soil"},
 		{"moretrees:palm_sapling", moretrees.spawn_palm_object, "soil"},
 		{"moretrees:palm_sapling", moretrees.spawn_palm_object, "sand"},
 		{"moretrees:date_palm_sapling", moretrees.spawn_date_palm_object, "soil"},
 		{"moretrees:date_palm_sapling", moretrees.spawn_date_palm_object, "sand"},
-		--{"moretrees:spruce_sapling", moretrees.spawn_spruce_object, "soil"},
 		{"moretrees:spruce_sapling", moretrees.grow_spruce, "soil"},
 		{"moretrees:cedar_sapling", moretrees.spawn_cedar_object, "soil"},
 		{"moretrees:poplar_sapling", moretrees.spawn_poplar_object, "soil"},
 		{"moretrees:willow_sapling", moretrees.spawn_willow_object, "soil"},
 		{"moretrees:rubber_tree_sapling", moretrees.spawn_rubber_tree_object, "soil"},
-		{"moretrees:fir_sapling", fir_grow, "soil"},
+		{"moretrees:fir_sapling", fir_grow, "soil"}
 	})
 
 elseif minetest.get_modpath("technic_worldgen") then
 
 	bonemeal:add_sapling({
-		{"moretrees:rubber_tree_sapling", technic.rubber_tree_model, "soil"},
+		{"moretrees:rubber_tree_sapling", technic.rubber_tree_model, "soil"}
+	})
+end
+
+
+if minetest.get_modpath("caverealms") then
+
+	local fil = minetest.get_modpath("caverealms") .. "/schematics/shroom.mts"
+	local add_shroom = function(pos)
+
+		minetest.swap_node(pos, {name = "air"})
+
+		minetest.place_schematic(
+			{x = pos.x - 5, y = pos.y, z = pos.z - 5}, fil, 0, nil, false)
+	end
+
+	bonemeal:add_sapling({
+		{"caverealms:mushroom_sapling", add_shroom, "soil"}
+	})
+end
+
+
+local function y_func(grow_func)
+	return function(pos)
+		grow_func({x = pos.x, y = pos.y - 1, z = pos.z})
+	end
+end
+
+if minetest.get_modpath("ferns") then
+
+	bonemeal:add_sapling({
+		{"ferns:sapling_giant_tree_fern", y_func(abstract_ferns.grow_giant_tree_fern), "soil"},
+		{"ferns:sapling_giant_tree_fern", y_func(abstract_ferns.grow_giant_tree_fern), "sand"},
+		{"ferns:sapling_tree_fern", y_func(abstract_ferns.grow_tree_fern), "soil"}
+	})
+end
+
+if minetest.get_modpath("dryplants") then
+
+	bonemeal:add_sapling({
+		{"dryplants:reedmace_sapling", y_func(abstract_dryplants.grow_reedmace), "soil"}
+	})
+end
+
+
+if minetest.get_modpath("dye") then
+
+	local bonemeal_dyes = {
+			bonemeal = "white", fertiliser = "green", mulch = "brown"}
+
+	for mat, dye in pairs(bonemeal_dyes) do
+
+		minetest.register_craft({
+			output = "dye:" .. dye .. " 4",
+			recipe = {
+				{"bonemeal:" .. mat}
+			},
+		})
+	end
+end
+
+
+if minetest.get_modpath("df_trees") then
+
+	local function spore_tree_fix(pos)
+		minetest.set_node(pos, {name = "air"})
+		df_trees.spawn_spore_tree(pos)
+	end
+
+	local function fungiwood_fix(pos)
+		minetest.set_node(pos, {name = "air"})
+		df_trees.spawn_fungiwood(pos)
+	end
+
+	local function tunnel_fix(pos)
+		minetest.set_node(pos, {name = "air"})
+		df_trees.spawn_tunnel_tube(pos)
+	end
+
+	bonemeal:add_sapling({
+		{"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil", true},
+		{"df_trees:fungiwood_sapling", fungiwood_fix, "soil", true},
+		{"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil", true},
+		{"df_trees:spore_tree_sapling", spore_tree_fix, "soil", true},
+		{"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil", true},
+		{"df_trees:tunnel_tube_sapling", tunnel_fix, "soil", true},
+		{"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:nether_cap", true},
+		{"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:cools_lava", true}
+	})
+end
+
+
+if minetest.get_modpath("df_farming") then
+
+	bonemeal:add_crop({
+		{"df_farming:cave_wheat_", 8, "df_farming:cave_wheat_seed", true},
+		{"df_farming:dimple_cup_", 4, "df_farming:dimple_cup_seed", true},
+		{"df_farming:pig_tail_", 8, "df_farming:pig_tail_seed", true},
+		{"df_farming:plump_helmet_", 4, "df_farming:plump_helmet_spawn", true},
+		{"df_farming:quarry_bush_", 5, "df_farming:quarry_bush_seed", true},
+		{"df_farming:sweet_pod_", 6, "df_farming:sweet_pod_seed", true}
+	})
+end
+
+
+if minetest.get_modpath("df_primordial_items") then
+
+	local function mush_fix(pos)
+		minetest.set_node(pos, {name = "air"})
+		mapgen_helper.place_schematic(pos,
+			df_primordial_items.get_primordial_mushroom(), (math.random(1,4)-1)*90)
+	end
+
+	local function fern_fix(pos)
+		minetest.set_node(pos, {name = "air"})
+		local rotations = {0, 90, 180, 270}
+		mapgen_helper.place_schematic(pos,
+			df_primordial_items.get_fern_schematic(), rotations[math.random(1,#rotations)])
+	end
+
+	local function blood_fix(pos)
+		df_trees.grow_blood_thorn(pos, minetest.get_node(pos))
+	end
+
+	bonemeal:add_sapling({
+		{"df_primordial_items:jungle_mushroom_sapling",
+			df_primordial_items.spawn_jungle_mushroom, "soil", true},
+		{"df_primordial_items:jungletree_sapling",
+			df_primordial_items.spawn_jungle_tree, "soil", true},
+		{"df_primordial_items:mush_sapling", mush_fix, "soil", true},
+		{"df_primordial_items:fern_sapling", fern_fix, "soil", true},
+		{"df_trees:blood_thorn", blood_fix, "sand", true}
+	})
+
+	local jgrass = {
+		"df_primordial_items:jungle_grass_1",
+		"df_primordial_items:jungle_grass_2",
+		"df_primordial_items:jungle_grass_3",
+		"df_primordial_items:fern_1",
+		"df_primordial_items:fern_2",
+		"", "", "", ""
+	}
+
+	local jdeco = {
+		"df_primordial_items:jungle_mushroom_1",
+		"df_primordial_items:jungle_mushroom_2",
+		"df_primordial_items:glow_plant_1",
+		"df_primordial_items:glow_plant_2",
+		"df_primordial_items:glow_plant_3",
+		"", "", ""
+	}
+
+	bonemeal:add_deco({
+		{"df_primordial_items:dirt_with_jungle_grass", jgrass, jdeco}
+	})
+
+	local fgrass = {
+		"df_primordial_items:fungal_grass_1",
+		"df_primordial_items:fungal_grass_2",
+		"", "", "", ""
+	}
+
+	local fdeco = {
+		"df_primordial_items:glow_orb_stalks",
+		"df_primordial_items:glow_pods",
+		"", "", ""
+	}
+
+	bonemeal:add_deco({
+		{"df_primordial_items:dirt_with_mycelium", fgrass, fdeco}
 	})
 end