Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master

Reviewed-on: MineClone2/MineClone2#1515

mods/ITEMS/mcl_core/crafting.lua

@@ -46,6 +46,56 @@ minetest.register_craft({
 	}
 })
 
+-- Stripped Bark
+minetest.register_craft({
+	output = "mcl_core:stripped_oak_bark 3",
+	recipe = {
+		{ "mcl_core:stripped_oak", "mcl_core:stripped_oak" },
+		{ "mcl_core:stripped_oak", "mcl_core:stripped_oak" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_core:stripped_acacia_bark 3",
+	recipe = {
+		{ "mcl_core:stripped_acacia", "mcl_core:stripped_acacia" },
+		{ "mcl_core:stripped_acacia", "mcl_core:stripped_acacia" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_core:stripped_dark_oak_bark 3",
+	recipe = {
+		{ "mcl_core:stripped_dark_oak", "mcl_core:stripped_dark_oak" },
+		{ "mcl_core:stripped_dark_oak", "mcl_core:stripped_dark_oak" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_core:stripped_birch_bark 3",
+	recipe = {
+		{ "mcl_core:stripped_birch", "mcl_core:stripped_birch" },
+		{ "mcl_core:stripped_birch", "mcl_core:stripped_birch" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_core:stripped_spruce_bark 3",
+	recipe = {
+		{ "mcl_core:stripped_spruce", "mcl_core:stripped_spruce" },
+		{ "mcl_core:stripped_spruce", "mcl_core:stripped_spruce" },
+	}
+})
+
+minetest.register_craft({
+	output = "mcl_core:stripped_jungle_bark 3",
+	recipe = {
+		{ "mcl_core:stripped_jungle", "mcl_core:stripped_jungle" },
+		{ "mcl_core:stripped_jungle", "mcl_core:stripped_jungle" },
+	}
+})
+
+
 minetest.register_craft({
 	type = 'shapeless',
 	output = 'mcl_core:mossycobble',

mods/ITEMS/mcl_core/nodes_trees.lua

@@ -1,4 +1,4 @@
--- Tree nodes: Wood, Wooden Planks, Sapling, Leaves
+-- Tree nodes: Wood, Wooden Planks, Sapling, Leaves, Stripped Wood
 local S = minetest.get_translator("mcl_core")
 
 local mod_screwdriver = minetest.get_modpath("screwdriver") ~= nil
@@ -48,6 +48,166 @@ local register_tree_trunk = function(subname, description_trunk, description_bar
 	})
 end
 
+-- Register stripped trunk 
+minetest.register_node("mcl_core:stripped_oak", {
+	description = "Stripped Oak Log",
+	_doc_items_longdesc = "Stripped Oak Log is a log that has been stripped of it's bark.",
+	tiles = {"mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_acacia", {
+	description = "Stripped Acacia Log",
+	_doc_items_longdesc = "Stripped Acacia Log is a log that has been stripped of it's bark.",
+	tiles = {"mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_dark_oak", {
+	description = "Stripped Dark Oak Log",
+	_doc_items_longdesc = "Stripped Dark Oak Log is a log that has been stripped of it's bark.",
+	tiles = {"mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_birch", {
+	description = "Stripped Birch Log",
+	_doc_items_longdesc = "Stripped Birch Log is a log that has been stripped of it's bark.",
+	tiles = {"mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_spruce", {
+	description = "Stripped Spruce Log",
+	_doc_items_longdesc = "Stripped Spruce Log is a log that has been stripped of it's bark.",
+	tiles = {"mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_jungle", {
+	description = "Stripped Jungle Log",
+	_doc_items_longdesc = "Stripped Jungle Log is a log that has been stripped of it's bark.",
+	tiles = {"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+
+-- Register stripped bark
+minetest.register_node("mcl_core:stripped_oak_bark", {
+	description = "Stripped Oak Bark",
+	_doc_items_longdesc = "Stripped Oak Bark is a bark that has been stripped.",
+	tiles = {"mcl_core_stripped_oak_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_acacia_bark", {
+	description = "Stripped Acacia Bark",
+	_doc_items_longdesc = "Stripped Acacia Bark is a bark that has been stripped.",
+	tiles = {"mcl_core_stripped_acacia_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_dark_oak_bark", {
+	description = "Stripped Dark Oak Bark",
+	_doc_items_longdesc = "Stripped Dark Oak Bark is a bark that has been stripped.",
+	tiles = {"mcl_core_stripped_dark_oak_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_birch_bark", {
+	description = "Stripped Birch Bark",
+	_doc_items_longdesc = "Stripped Birch Bark is a bark that has been stripped.",
+	tiles = {"mcl_core_stripped_birch_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_spruce_bark", {
+	description = "Stripped Spruce Bark",
+	_doc_items_longdesc = "Stripped Spruce Bark is a bark that has been stripped.",
+	tiles = {"mcl_core_stripped_spruce_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+minetest.register_node("mcl_core:stripped_jungle_bark", {
+	description = "Stripped Jungle Bark",
+	_doc_items_longdesc = "Stripped Jungles Bark is a bark that has been stripped.",
+	tiles = {"mcl_core_stripped_jungle_side.png"},
+	is_ground_content = false,
+	paramtype2 = "facedir",
+	on_place = mcl_util.rotate_axis,
+	groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 10,
+	_mcl_hardness = 2,
+})
+
+
 local register_wooden_planks = function(subname, description, tiles)
 	minetest.register_node("mcl_core:"..subname, {
 		description = description,
@@ -226,4 +386,4 @@ register_leaves("birchleaves", S("Birch Leaves"), S("Birch leaves are grown from
 -- Node aliases
 
 minetest.register_alias("default:acacia_tree", "mcl_core:acaciatree")
-minetest.register_alias("default:acacia_leaves", "mcl_core:acacialeaves")
+minetest.register_alias("default:acacia_leaves", "mcl_core:acacialeaves")

mods/ITEMS/mcl_tools/init.lua

@@ -352,6 +352,56 @@ minetest.register_tool("mcl_tools:shovel_diamond", {
 })
 
 -- Axes
+
+local make_stripped_trunk = function(itemstack, placer, pointed_thing)
+	if pointed_thing.type == "node" then
+		local pos = minetest.get_pointed_thing_position(pointed_thing)
+		local node = minetest.get_node(pos)
+		local node_name = node.name
+		if placer and not placer:get_player_control().sneak then
+			if minetest.registered_nodes[node_name] and minetest.registered_nodes[node_name].on_rightclick then
+				return minetest.registered_nodes[node_name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
+			end
+		end
+		if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then
+			minetest.record_protection_violation(pointed_thing.under, placer:get_player_name())
+			return itemstack
+		end
+		if not minetest.is_creative_enabled(placer:get_player_name()) then
+			-- Add wear (as if digging a axey node)
+			local toolname = itemstack:get_name()
+			local wear = mcl_autogroup.get_wear(toolname, "axey")
+			itemstack:add_wear(wear)
+		end
+		if node_name == "mcl_core:tree" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_oak"})
+		elseif node_name == "mcl_core:darktree" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_dark_oak"})
+		elseif node_name == "mcl_core:acaciatree" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_acacia"})
+		elseif node_name == "mcl_core:birchtree" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_birch"})
+		elseif node_name == "mcl_core:sprucetree" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_spruce"})
+		elseif node_name == "mcl_core:jungletree" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_jungle"})
+		elseif node_name == "mcl_core:tree_bark" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_oak_bark"})
+		elseif node_name == "mcl_core:darktree_bark" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_dark_oak_bark"})
+		elseif node_name == "mcl_core:acaciatree_bark" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_acacia_bark"})
+		elseif node_name == "mcl_core:birchtree_bark" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_birch_bark"})
+		elseif node_name == "mcl_core:sprucetree_bark" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_spruce_bark"})
+		elseif node_name == "mcl_core:jungletree_bark" then
+			minetest.swap_node(pointed_thing.under, {name="mcl_core:stripped_jungle_bark"})
+		end
+	end
+	return itemstack
+end
+
 minetest.register_tool("mcl_tools:axe_wood", {
 	description = S("Wooden Axe"),
 	_doc_items_longdesc = axe_longdesc,
@@ -365,6 +415,7 @@ minetest.register_tool("mcl_tools:axe_wood", {
 		damage_groups = {fleshy=7},
 		punch_attack_uses = 30,
 	},
+	on_place = make_stripped_trunk,
 	sound = { breaks = "default_tool_breaks" },
 	_repair_material = "group:wood",
 	_mcl_toollike_wield = true,
@@ -384,6 +435,7 @@ minetest.register_tool("mcl_tools:axe_stone", {
 		damage_groups = {fleshy=9},
 		punch_attack_uses = 66,
 	},
+	on_place = make_stripped_trunk,
 	sound = { breaks = "default_tool_breaks" },
 	_repair_material = "mcl_core:cobble",
 	_mcl_toollike_wield = true,
@@ -404,6 +456,7 @@ minetest.register_tool("mcl_tools:axe_iron", {
 		damage_groups = {fleshy=9},
 		punch_attack_uses = 126,
 	},
+	on_place = make_stripped_trunk,
 	sound = { breaks = "default_tool_breaks" },
 	_repair_material = "mcl_core:iron_ingot",
 	_mcl_toollike_wield = true,
@@ -423,6 +476,7 @@ minetest.register_tool("mcl_tools:axe_gold", {
 		damage_groups = {fleshy=7},
 		punch_attack_uses = 17,
 	},
+	on_place = make_stripped_trunk,
 	sound = { breaks = "default_tool_breaks" },
 	_repair_material = "mcl_core:gold_ingot",
 	_mcl_toollike_wield = true,
@@ -442,6 +496,7 @@ minetest.register_tool("mcl_tools:axe_diamond", {
 		damage_groups = {fleshy=9},
 		punch_attack_uses = 781,
 	},
+	on_place = make_stripped_trunk,
 	sound = { breaks = "default_tool_breaks" },
 	_repair_material = "mcl_core:diamond",
 	_mcl_toollike_wield = true,