Merge branch 'master' into beta

mods/HUD/mcl_bossbars/init.lua

@@ -65,7 +65,7 @@ function mcl_bossbars.add_bar(player, def, dynamic, priority)
 end
 
 function mcl_bossbars.remove_bar(id)
-	mcl_bossbars.static[id].bar.id = nil
+	mcl_bossbars.static[id].id = nil
 	mcl_bossbars.static[id] = nil
 end
 

mods/ITEMS/mcl_armor/armor.lua

@@ -368,6 +368,7 @@ mcl_player.player_register_model("mcl_armor_character.b3d", {
 		run_walk_mine	= {x=461, y=480},
 		sit_mount	= {x=484, y=484},
 		die	= {x=498, y=498},
+		fly = {x=502, y=581},
 	},
 })
 
@@ -396,6 +397,8 @@ mcl_player.player_register_model("mcl_armor_character_female.b3d", {
 		run_walk	= {x=440, y=459},
 		run_walk_mine	= {x=461, y=480},
 		sit_mount	= {x=484, y=484},
+		die	= {x=498, y=498},
+		fly = {x=502, y=581},
 	},
 })
 

mods/ITEMS/mcl_armor/init.lua

@@ -8,6 +8,20 @@ dofile(minetest.get_modpath(minetest.get_current_modname()).."/alias.lua")
 local longdesc = S("This is a piece of equippable armor which reduces the amount of damage you receive.")
 local usage = S("To equip it, put it on the corresponding armor slot in your inventory menu.")
 
+minetest.register_tool("mcl_armor:elytra", {
+	description = S("Elytra"),
+	_doc_items_longdesc = longdesc,
+	_doc_items_usagehelp = usage,
+	inventory_image = "mcl_armor_inv_elytra.png",
+	groups = {armor_torso=1, mcl_armor_points=0, mcl_armor_uses=10, enchantability=0},
+	sounds = {
+		_mcl_armor_equip = "mcl_armor_equip_leather",
+		_mcl_armor_unequip = "mcl_armor_unequip_leather",
+	},
+	on_place = armor.on_armor_use,
+	on_secondary_use = armor.on_armor_use,
+})
+
 minetest.register_tool("mcl_armor:helmet_leather", {
 	description = S("Leather Cap"),
 	_doc_items_longdesc = longdesc,
@@ -322,7 +336,7 @@ local craft_ingreds = {
 	gold = { "mcl_core:gold_ingot", "mcl_core:gold_nugget" },
 	diamond = { "mcl_core:diamond" },
 	chain = { nil, "mcl_core:iron_nugget"} ,
-}		
+}
 
 for k, v in pairs(craft_ingreds) do
 	-- material
@@ -389,4 +403,3 @@ for k, v in pairs(craft_ingreds) do
 		})
 	end
 end
-

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/init.lua

@@ -14,6 +14,7 @@ mcl_autogroup.register_diggroup("shearsy_wool")
 mcl_autogroup.register_diggroup("shearsy_cobweb")
 mcl_autogroup.register_diggroup("swordy")
 mcl_autogroup.register_diggroup("swordy_cobweb")
+mcl_autogroup.register_diggroup("hoey")
 
 -- Load files
 local modpath = minetest.get_modpath("mcl_core")

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,
@@ -108,7 +268,19 @@ local register_leaves = function(subname, description, longdesc, tiles, sapling,
 		tiles = tiles,
 		paramtype = "light",
 		stack_max = 64,
-		groups = {handy=1,shearsy=1,swordy=1, leafdecay=leafdecay_distance, flammable=2, leaves=1, deco_block=1, dig_by_piston=1, fire_encouragement=30, fire_flammability=60},
+		groups = {
+			handy=1,
+			hoey=1,
+			shearsy=1,
+			swordy=1,
+			leafdecay=leafdecay_distance,
+			flammable=2,
+			leaves=1,
+			deco_block=1,
+			dig_by_piston=1,
+			fire_encouragement=30,
+			fire_flammability=60
+		},
 		drop = get_drops(0),
 		_mcl_shears_drop = true,
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
@@ -214,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_farming/hoes.lua

@@ -78,6 +78,9 @@ minetest.register_tool("mcl_farming:hoe_wood", {
 	},
 	_repair_material = "group:wood",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 2, level = 1, uses = 60 }
+	},
 })
 
 minetest.register_craft({
@@ -118,6 +121,9 @@ minetest.register_tool("mcl_farming:hoe_stone", {
 	},
 	_repair_material = "mcl_core:cobble",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 4, level = 3, uses = 132 }
+	},
 })
 
 minetest.register_craft({
@@ -154,6 +160,9 @@ minetest.register_tool("mcl_farming:hoe_iron", {
 	},
 	_repair_material = "mcl_core:iron_ingot",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 6, level = 4, uses = 251 }
+	},
 })
 
 minetest.register_craft({
@@ -196,6 +205,9 @@ minetest.register_tool("mcl_farming:hoe_gold", {
 	},
 	_repair_material = "mcl_core:gold_ingot",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 12, level = 2, uses = 33 }
+	},
 })
 
 minetest.register_craft({
@@ -240,6 +252,9 @@ minetest.register_tool("mcl_farming:hoe_diamond", {
 	},
 	_repair_material = "mcl_core:diamond",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 8, level = 5, uses = 1562 }
+	},
 })
 
 minetest.register_craft({

mods/ITEMS/mcl_farming/wheat.lua

@@ -146,7 +146,7 @@ minetest.register_node("mcl_farming:hay_block", {
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	on_place = mcl_util.rotate_axis,
-	groups = {handy=1, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80},
+	groups = {handy=1, hoey=1, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80},
 	sounds = mcl_sounds.node_sound_leaves_defaults(),
 	on_rotate = on_rotate,
 	_mcl_blast_resistance = 0.5,

mods/ITEMS/mcl_nether/init.lua

@@ -176,7 +176,7 @@ minetest.register_node("mcl_nether:nether_wart_block", {
 	stack_max = 64,
 	tiles = {"mcl_nether_nether_wart_block.png"},
 	is_ground_content = false,
-	groups = {handy=1, building_block=1},
+	groups = {handy=1, hoey=1, building_block=1},
 	sounds = mcl_sounds.node_sound_leaves_defaults(
 		{
 			footstep={name="default_dirt_footstep", gain=0.7},

mods/ITEMS/mcl_ocean/kelp.lua

@@ -779,7 +779,7 @@ minetest.register_node("mcl_ocean:dried_kelp_block", {
 	description = S("Dried Kelp Block"),
 	_doc_items_longdesc = S("A decorative block that serves as a great furnace fuel."),
 	tiles = { "mcl_ocean_dried_kelp_top.png", "mcl_ocean_dried_kelp_bottom.png", "mcl_ocean_dried_kelp_side.png" },
-	groups = { handy = 1, building_block = 1, flammable = 2, fire_encouragement = 30, fire_flammability = 60 },
+	groups = { handy = 1, hoey = 1, building_block = 1, flammable = 2, fire_encouragement = 30, fire_flammability = 60 },
 	sounds = mcl_sounds.node_sound_leaves_defaults(),
 	paramtype2 = "facedir",
 	on_place = mcl_util.rotate_axis,

mods/ITEMS/mcl_sponges/init.lua

@@ -48,7 +48,7 @@ minetest.register_node("mcl_sponges:sponge", {
 	buildable_to = false,
 	stack_max = 64,
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
-	groups = {handy=1, building_block=1},
+	groups = {handy=1, hoey=1, building_block=1},
 	on_place = function(itemstack, placer, pointed_thing)
 		local pn = placer:get_player_name()
 		if pointed_thing.type ~= "node" then
@@ -136,7 +136,7 @@ minetest.register_node("mcl_sponges:sponge_wet", {
 	buildable_to = false,
 	stack_max = 64,
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
-	groups = {handy=1, building_block=1},
+	groups = {handy=1, hoey=1, building_block=1},
 	on_place = place_wet_sponge,
 	_mcl_blast_resistance = 0.6,
 	_mcl_hardness = 0.6,

mods/ITEMS/mcl_tools/init.lua

@@ -51,6 +51,7 @@ minetest.register_tool(":", {
 		handy = { speed = 1, level = 1, uses = 0 },
 		axey = { speed = 1, level = 1, uses = 0 },
 		shovely = { speed = 1, level = 1, uses = 0 },
+		hoey = { speed = 1, level = 1, uses = 0 },
 		pickaxey = { speed = 1, level = 0, uses = 0 },
 		swordy = { speed = 1, level = 0, uses = 0 },
 		swordy_cobweb = { speed = 1, level = 0, uses = 0 },
@@ -351,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,
@@ -364,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,
@@ -383,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,
@@ -403,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,
@@ -422,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,
@@ -441,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,

mods/PLAYER/mcl_playerplus/init.lua

@@ -1,5 +1,8 @@
 local S = minetest.get_translator("mcl_playerplus")
 
+local elytra = {}
+
+local node_stand_return = ":air"
 local get_connected_players = minetest.get_connected_players
 local dir_to_yaw = minetest.dir_to_yaw
 local get_item_group = minetest.get_item_group
@@ -190,6 +193,37 @@ minetest.register_globalstep(function(dtime)
 		player_vel_yaw = limit_vel_yaw(player_vel_yaw, yaw)
 		player_vel_yaws[name] = player_vel_yaw
 
+		if minetest.get_node_or_nil({x=player:get_pos().x, y=player:get_pos().y - 0.5, z=player:get_pos().z}) then
+			node_stand_return = minetest.get_node_or_nil({x=player:get_pos().x, y=player:get_pos().y - 0.5, z=player:get_pos().z}).name
+		else
+			minetest.log("action", "somehow player got of loaded areas")
+		end
+
+		if player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra" and player_velocity.y < -6 and elytra[player] ~= true and is_sprinting(name) then
+			elytra[player] = true
+		elseif elytra[player] == true and node_stand_return ~= "air" or elytra[player] == true and player:get_inventory():get_stack("armor", 3):get_name() ~= "mcl_armor:elytra" or player:get_attach() ~= nil then
+			elytra[player] = false
+		end
+
+		if elytra[player] == true then
+			mcl_player.player_set_animation(player, "fly")
+			playerphysics.add_physics_factor(player, "gravity", "mcl_playerplus:elytra", 0.1)
+			if player_velocity.y < -1.5 then
+				player:add_velocity({x=0, y=0.17, z=0})
+			end
+			if math.abs(player_velocity.x) + math.abs(player_velocity.z) < 20 then
+				local dir = minetest.yaw_to_dir(player:get_look_horizontal())
+				player:add_velocity({x=dir.x, y=0, z=dir.z})
+			end
+			if controls.sneak then
+				if player_velocity.y > -5 then
+					player:add_velocity({x=0, y=-2, z=0})
+				end
+			end
+		else
+			playerphysics.remove_physics_factor(player, "gravity", "mcl_playerplus:elytra")
+		end
+
 		-- controls right and left arms pitch when shooting a bow
 		if string.find(wielded:get_name(), "mcl_bows:bow") and controls.RMB and not controls.LMB and not controls.up and not controls.down and not controls.left and not controls.right then
 			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(pitch+90,-30,pitch * -1 * .35))
@@ -208,7 +242,14 @@ minetest.register_globalstep(function(dtime)
 			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(0,0,0))
 		end
 
-		if parent then
+		if elytra[player] == true then
+			-- set head pitch and yaw when swimming
+			player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90-degrees(dir_to_pitch(player_velocity)),player_vel_yaw - yaw,0))
+			-- sets eye height, and nametag color accordingly
+			player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,0.8,0.35}, eye_height = 0.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
+			-- control body bone when swimming
+			player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(degrees(dir_to_pitch(player_velocity)) - 90,-player_vel_yaw + yaw + 180,0))
+		elseif parent then
 			local parent_yaw = degrees(parent:get_yaw())
 			player:set_properties({collisionbox = {-0.312,0,-0.312,0.312,1.8,0.312}, eye_height = 1.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
 			player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch, -limit_vel_yaw(yaw, parent_yaw) + parent_yaw, 0))