Add Cherry Blossom Trees and Growth

mods/ITEMS/mcl_cherry_blossom/crafting.lua

@@ -0,0 +1,23 @@
+-- Crafting
+minetest.register_craft({
+	output = "mcl_cherry_blossom:cherrytree_bark 3",
+	recipe = {
+		{ "mcl_cherry_blossom:cherrytree", "mcl_cherry_blossom:cherrytree" },
+		{ "mcl_cherry_blossom:cherrytree", "mcl_cherry_blossom:cherrytree" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_cherry_blossom:stripped_cherrytree_bark 3",
+	recipe = {
+		{ "mcl_cherry_blossom:stripped_cherrytree", "mcl_cherry_blossom:stripped_cherrytree" },
+		{ "mcl_cherry_blossom:stripped_cherrytree", "mcl_cherry_blossom:stripped_cherrytree" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_cherry_blossom:cherrywood 4",
+	recipe = {
+		{"mcl_cherry_blossom:cherrytree"},
+	}
+})

mods/ITEMS/mcl_cherry_blossom/growth.lua

@@ -0,0 +1,28 @@
+-- Tree Growth
+-- TODO: Use better spawning behavior and wood api when wood api is finished.
+function mcl_cherry_blossom.generate_cherry_tree(pos)
+	local pr = PseudoRandom(pos.x+pos.y+pos.z)
+	local r = pr:next(1,3)
+	local modpath = minetest.get_modpath("mcl_cherry_blossom")
+	local path = modpath.."/schematics/mcl_cherry_blossom_tree_"..tostring(r)..".mts"
+	if mcl_core.check_growth_width(pos,7,8) then
+		minetest.set_node(pos, {name = "air"})
+		if r == 1 then
+			minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, path, "random", nil, false)
+		elseif r == 2 then
+			minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, path, nil, nil, false)
+		elseif r == 3 then
+			minetest.place_schematic({x = pos.x-3, y = pos.y, z = pos.z-3}, path, nil, nil, false)
+		end
+	end
+end
+
+minetest.register_abm({
+	label = "Cherry Tree Growth",
+	nodenames = "mcl_cherry_blossom:cherrysapling",
+	interval = 30,
+	chance = 5,
+	action = function(pos,node)
+		mcl_cherry_blossom.generate_cherry_tree(pos)
+	end,
+})

mods/ITEMS/mcl_cherry_blossom/init.lua

@@ -1,210 +1,6 @@
-local S = minetest.get_translator(minetest.get_current_modname())
+mcl_cherry_blossom = {}
+local modpath = minetest.get_modpath("mcl_cherry_blossom")
 
--- Logs
-minetest.register_node("mcl_cherry_blossom:cherrytree", {
-	description = S("Cherry Log"),
-	_doc_items_longdesc = S("The trunk of an cherry blossom tree."),
-	_doc_items_hidden = false,
-	tiles = {"mcl_cherry_blossom_log_top.png", "mcl_cherry_blossom_log_top.png", "mcl_cherry_blossom_log.png"},
-	paramtype2 = "facedir",
-	on_place = mcl_util.rotate_axis,
-	after_destruct = mcl_core.update_leaves,
-	stack_max = 64,
-	groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
-	sounds = mcl_sounds.node_sound_wood_defaults(),
-	on_rotate = on_rotate,
-	_mcl_blast_resistance = 2,
-	_mcl_hardness = 2,
-	_mcl_stripped_variant = "mcl_cherry_blossom:stripped_cherrytree",
-})
-
-minetest.register_node("mcl_cherry_blossom:stripped_cherrytree", {
-	description = S("Stripped Cherry Log"),
-	_doc_items_longdesc = S("The stripped trunk of an cherry blossom tree."),
-	_doc_items_hidden = false,
-	tiles = {"mcl_cherry_blossom_log_top_stripped.png", "mcl_cherry_blossom_log_top_stripped.png", "mcl_cherry_blossom_log_stripped.png"},
-	paramtype2 = "facedir",
-	on_place = mcl_util.rotate_axis,
-	stack_max = 64,
-	groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
-	sounds = mcl_sounds.node_sound_wood_defaults(),
-	on_rotate = on_rotate,
-	_mcl_blast_resistance = 2,
-	_mcl_hardness = 2,
-})
-
--- Bark
-minetest.register_node("mcl_cherry_blossom:cherrytree_bark", {
-	description = S("Cherry Bark"),
-	_doc_items_longdesc = S("This is a decorative block surrounded by the bark of a tree trunk."),
-	tiles = {"mcl_cherry_blossom_log.png"},
-	paramtype2 = "facedir",
-	on_place = mcl_util.rotate_axis,
-	stack_max = 64,
-	groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
-	sounds = mcl_sounds.node_sound_wood_defaults(),
-	is_ground_content = false,
-	on_rotate = on_rotate,
-	_mcl_blast_resistance = 2,
-	_mcl_hardness = 2,
-	_mcl_stripped_variant = "mcl_cherry_blossom:stripped_cherrytree_bark",
-})
-
-minetest.register_node("mcl_cherry_blossom:stripped_cherrytree_bark", {
-	description = S("Stripped Cherry Wood"),
-	_doc_items_longdesc = S("The stripped wood of an cherry blossom tree."),
-	tiles = {"mcl_cherry_blossom_log_stripped.png"},
-	paramtype2 = "facedir",
-	on_place = mcl_util.rotate_axis,
-	stack_max = 64,
-	groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
-	sounds = mcl_sounds.node_sound_wood_defaults(),
-	is_ground_content = false,
-	on_rotate = on_rotate,
-	_mcl_blast_resistance = 2,
-	_mcl_hardness = 2,
-})
-
---Planks
-minetest.register_node("mcl_cherry_blossom:cherrywood", {
-	description = S("Cherry Wood Planks"),
-	_doc_items_longdesc = doc.sub.items.temp.build,
-	_doc_items_hidden = false,
-	tiles = {"mcl_cherry_blossom_planks.png"},
-	stack_max = 64,
-	is_ground_content = false,
-	groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20},
-	sounds = mcl_sounds.node_sound_wood_defaults(),
-	_mcl_blast_resistance = 3,
-	_mcl_hardness = 2,
-})
-
--- Leaves
-local stick_chances = {50, 45, 30, 35, 10}
-local sapling_chances = {20, 16, 12, 10}
-
-local function get_drops(fortune_level)
-	local drop = {
-		max_items = 1,
-		items = {
-			{
-				items = {"mcl_cherry_blossom:cherrysapling"},
-				rarity = sapling_chances[fortune_level + 1] or sapling_chances[fortune_level]
-			},
-			{
-				items = {"mcl_core:stick 1"},
-				rarity = stick_chances[fortune_level + 1]
-			},
-			{
-				items = {"mcl_core:stick 2"},
-				rarity = stick_chances[fortune_level + 1]
-			},
-		}
-	}
-	return drop
-end
-
-local l_def = {
-	description = S("Cherry Leaves"),
-	_doc_items_longdesc = S("Cherry blossom leaves are grown from cherry blossom trees."),
-	_doc_items_hidden = false,
-	drawtype = "allfaces_optional",
-	waving = 2,
-	tiles = {"mcl_cherry_blossom_leaves.png"},
-	color = color,
-	paramtype = "light",
-	stack_max = 64,
-	groups = {
-		handy = 1, hoey = 1, shearsy = 1, swordy = 1, dig_by_piston = 1,
-		flammable = 2, fire_encouragement = 30, fire_flammability = 60,
-		leaves = 1, deco_block = 1, compostability = 30
-	},
-	drop = get_drops(0),
-	_mcl_shears_drop = true,
-	sounds = mcl_sounds.node_sound_leaves_defaults(),
-	_mcl_blast_resistance = 0.2,
-	_mcl_hardness = 0.2,
-	_mcl_silk_touch_drop = true,
-	_mcl_fortune_drop = { get_drops(1), get_drops(2), get_drops(3), get_drops(4) },
-	after_place_node = function(pos)
-		mcl_core.make_player_leaves(pos) -- Leaves placed by the player should always be player leaves.
-	end,
-	}
-
-minetest.register_node("mcl_cherry_blossom:cherryleaves", l_def)
-
-local o_def = table.copy(l_def)
-o_def._doc_items_create_entry = false
-o_def.groups.not_in_creative_inventory = 1
-o_def.groups.orphan_leaves = 1
-o_def._mcl_shears_drop = {"mcl_cherry_blossom:cherryleaves"}
-o_def._mcl_silk_touch_drop = {"mcl_cherry_blossom:cherryleaves"}
-
-minetest.register_node("mcl_cherry_blossom:cherryleaves" .. "_orphan", o_def)
-
--- Sapling
-minetest.register_node("mcl_cherry_blossom:cherrysapling", {
-	description = S("Cherry Sapling"),
-	_tt_help = tt_help,
-	_doc_items_longdesc = S("Cherry blossom sapling can be planted to grow cherry trees"),
-	_doc_items_hidden = false,
-	drawtype = "plantlike",
-	waving = 1,
-	visual_scale = 1.0,
-	tiles = {"mcl_cherry_blossom_sapling.png"},
-	inventory_image = "mcl_cherry_blossom_sapling.png",
-	wield_image = "mcl_cherry_blossom_sapling.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-4/16, -0.5, -4/16, 4/16, 0.25, 4/16}
-	},
-	stack_max = 64,
-	groups = {
-		plant = 1, sapling = 1, attached_node = 1,
-		deco_block = 1, dig_immediate = 3, dig_by_water = 1, dig_by_piston = 1,
-		destroy_by_lava_flow = 1, compostability = 30
-	},
-	sounds = mcl_sounds.node_sound_leaves_defaults(),
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		meta:set_int("stage", 0)
-	end,
-	on_place = mcl_util.generate_on_place_plant_function(function(pos, node)
-		local node_below = minetest.get_node_or_nil({x=pos.x,y=pos.y-1,z=pos.z})
-		if not node_below then return false end
-		local nn = node_below.name
-		return minetest.get_item_group(nn, "grass_block") == 1 or
-				nn == "mcl_core:podzol" or nn == "mcl_core:podzol_snow" or
-				nn == "mcl_core:dirt" or nn == "mcl_core:mycelium" or nn == "mcl_core:coarse_dirt"
-	end),
-	node_placement_prediction = "",
-	_mcl_blast_resistance = 0,
-	_mcl_hardness = 0,
-})
-
--- Crafting
-minetest.register_craft({
-	output = "mcl_cherry_blossom:cherrytree_bark 3",
-	recipe = {
-		{ "mcl_cherry_blossom:cherrytree", "mcl_cherry_blossom:cherrytree" },
-		{ "mcl_cherry_blossom:cherrytree", "mcl_cherry_blossom:cherrytree" },
-	}
-})
-
-minetest.register_craft({
-	output = "mcl_cherry_blossom:stripped_cherrytree_bark 3",
-	recipe = {
-		{ "mcl_cherry_blossom:stripped_cherrytree", "mcl_cherry_blossom:stripped_cherrytree" },
-		{ "mcl_cherry_blossom:stripped_cherrytree", "mcl_cherry_blossom:stripped_cherrytree" },
-	}
-})
-
-minetest.register_craft({
-	output = "mcl_cherry_blossom:cherrywood 4",
-	recipe = {
-		{"mcl_cherry_blossom:cherrytree"},
-	}
-})
+dofile(modpath.."/nodes.lua") -- Load Nodes
+dofile(modpath.."/crafting.lua") -- Load Crafting Recipes
+dofile(modpath.."/growth.lua") -- Load Cherry Blossom Tree Growth

mods/ITEMS/mcl_cherry_blossom/nodes.lua

@@ -0,0 +1,187 @@
+local S = minetest.get_translator(minetest.get_current_modname())
+
+-- Logs
+minetest.register_node("mcl_cherry_blossom:cherrytree", {
+	description = S("Cherry Log"),
+	_doc_items_longdesc = S("The trunk of an cherry blossom tree."),
+	_doc_items_hidden = false,
+	tiles = {"mcl_cherry_blossom_log_top.png", "mcl_cherry_blossom_log_top.png", "mcl_cherry_blossom_log.png"},
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	after_destruct = mcl_core.update_leaves,
+	stack_max = 64,
+	groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	on_rotate = on_rotate,
+	_mcl_blast_resistance = 2,
+	_mcl_hardness = 2,
+	_mcl_stripped_variant = "mcl_cherry_blossom:stripped_cherrytree",
+})
+
+minetest.register_node("mcl_cherry_blossom:stripped_cherrytree", {
+	description = S("Stripped Cherry Log"),
+	_doc_items_longdesc = S("The stripped trunk of an cherry blossom tree."),
+	_doc_items_hidden = false,
+	tiles = {"mcl_cherry_blossom_log_top_stripped.png", "mcl_cherry_blossom_log_top_stripped.png", "mcl_cherry_blossom_log_stripped.png"},
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	stack_max = 64,
+	groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	on_rotate = on_rotate,
+	_mcl_blast_resistance = 2,
+	_mcl_hardness = 2,
+})
+
+-- Bark
+minetest.register_node("mcl_cherry_blossom:cherrytree_bark", {
+	description = S("Cherry Bark"),
+	_doc_items_longdesc = S("This is a decorative block surrounded by the bark of a tree trunk."),
+	tiles = {"mcl_cherry_blossom_log.png"},
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	stack_max = 64,
+	groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	is_ground_content = false,
+	on_rotate = on_rotate,
+	_mcl_blast_resistance = 2,
+	_mcl_hardness = 2,
+	_mcl_stripped_variant = "mcl_cherry_blossom:stripped_cherrytree_bark",
+})
+
+minetest.register_node("mcl_cherry_blossom:stripped_cherrytree_bark", {
+	description = S("Stripped Cherry Wood"),
+	_doc_items_longdesc = S("The stripped wood of an cherry blossom tree."),
+	tiles = {"mcl_cherry_blossom_log_stripped.png"},
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	stack_max = 64,
+	groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	is_ground_content = false,
+	on_rotate = on_rotate,
+	_mcl_blast_resistance = 2,
+	_mcl_hardness = 2,
+})
+
+--Planks
+minetest.register_node("mcl_cherry_blossom:cherrywood", {
+	description = S("Cherry Wood Planks"),
+	_doc_items_longdesc = doc.sub.items.temp.build,
+	_doc_items_hidden = false,
+	tiles = {"mcl_cherry_blossom_planks.png"},
+	stack_max = 64,
+	is_ground_content = false,
+	groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 3,
+	_mcl_hardness = 2,
+})
+
+-- Leaves
+local stick_chances = {50, 45, 30, 35, 10}
+local sapling_chances = {20, 16, 12, 10}
+
+local function get_drops(fortune_level)
+	local drop = {
+		max_items = 1,
+		items = {
+			{
+				items = {"mcl_cherry_blossom:cherrysapling"},
+				rarity = sapling_chances[fortune_level + 1] or sapling_chances[fortune_level]
+			},
+			{
+				items = {"mcl_core:stick 1"},
+				rarity = stick_chances[fortune_level + 1]
+			},
+			{
+				items = {"mcl_core:stick 2"},
+				rarity = stick_chances[fortune_level + 1]
+			},
+		}
+	}
+	return drop
+end
+
+local l_def = {
+	description = S("Cherry Leaves"),
+	_doc_items_longdesc = S("Cherry blossom leaves are grown from cherry blossom trees."),
+	_doc_items_hidden = false,
+	drawtype = "allfaces_optional",
+	waving = 2,
+	tiles = {"mcl_cherry_blossom_leaves.png"},
+	color = color,
+	paramtype = "light",
+	stack_max = 64,
+	groups = {
+		handy = 1, hoey = 1, shearsy = 1, swordy = 1, dig_by_piston = 1,
+		flammable = 2, fire_encouragement = 30, fire_flammability = 60,
+		leaves = 1, deco_block = 1, compostability = 30
+	},
+	drop = get_drops(0),
+	_mcl_shears_drop = true,
+	sounds = mcl_sounds.node_sound_leaves_defaults(),
+	_mcl_blast_resistance = 0.2,
+	_mcl_hardness = 0.2,
+	_mcl_silk_touch_drop = true,
+	_mcl_fortune_drop = { get_drops(1), get_drops(2), get_drops(3), get_drops(4) },
+	after_place_node = function(pos)
+		mcl_core.make_player_leaves(pos) -- Leaves placed by the player should always be player leaves.
+	end,
+	}
+
+minetest.register_node("mcl_cherry_blossom:cherryleaves", l_def)
+
+local o_def = table.copy(l_def)
+o_def._doc_items_create_entry = false
+o_def.groups.not_in_creative_inventory = 1
+o_def.groups.orphan_leaves = 1
+o_def._mcl_shears_drop = {"mcl_cherry_blossom:cherryleaves"}
+o_def._mcl_silk_touch_drop = {"mcl_cherry_blossom:cherryleaves"}
+
+minetest.register_node("mcl_cherry_blossom:cherryleaves" .. "_orphan", o_def)
+
+-- Sapling
+minetest.register_node("mcl_cherry_blossom:cherrysapling", {
+	description = S("Cherry Sapling"),
+	_tt_help = tt_help,
+	_doc_items_longdesc = S("Cherry blossom sapling can be planted to grow cherry trees"),
+	_doc_items_hidden = false,
+	drawtype = "plantlike",
+	waving = 1,
+	visual_scale = 1.0,
+	tiles = {"mcl_cherry_blossom_sapling.png"},
+	inventory_image = "mcl_cherry_blossom_sapling.png",
+	wield_image = "mcl_cherry_blossom_sapling.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-4/16, -0.5, -4/16, 4/16, 0.25, 4/16}
+	},
+	stack_max = 64,
+	groups = {
+		plant = 1, sapling = 1, attached_node = 1,
+		deco_block = 1, dig_immediate = 3, dig_by_water = 1, dig_by_piston = 1,
+		destroy_by_lava_flow = 1, compostability = 30
+	},
+	sounds = mcl_sounds.node_sound_leaves_defaults(),
+	on_construct = function(pos)
+		--local meta = minetest.get_meta(pos)
+		--meta:set_int("stage", 0)
+		-- TODO Uncomment above when wood api is implemented with the current mcl_core tree growth code.
+	end,
+	on_place = mcl_util.generate_on_place_plant_function(function(pos, node)
+		local node_below = minetest.get_node_or_nil({x=pos.x,y=pos.y-1,z=pos.z})
+		if not node_below then return false end
+		local nn = node_below.name
+		return minetest.get_item_group(nn, "grass_block") == 1 or
+				nn == "mcl_core:podzol" or nn == "mcl_core:podzol_snow" or
+				nn == "mcl_core:dirt" or nn == "mcl_core:mycelium" or nn == "mcl_core:coarse_dirt"
+	end),
+	node_placement_prediction = "",
+	_mcl_blast_resistance = 0,
+	_mcl_hardness = 0,
+})