Remove tools from default, replace as mod

mods/ITEMS/tools/crafting.lua

@@ -0,0 +1,252 @@
+-- Tool Repair
+minetest.register_craft({
+	type = "toolrepair",
+	additional_wear = -0.02,
+})
+
+minetest.register_craft({
+	output = 'tools:pick_wood',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:pick_stone',
+	recipe = {
+		{'group:stone', 'group:stone', 'group:stone'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:pick_steel',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:pick_bronze',
+	recipe = {
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:pick_diamond',
+	recipe = {
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:shovel_wood',
+	recipe = {
+		{'group:wood'},
+		{'group:stick'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:shovel_stone',
+	recipe = {
+		{'group:stone'},
+		{'group:stick'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:shovel_steel',
+	recipe = {
+		{'default:steel_ingot'},
+		{'group:stick'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:shovel_bronze',
+	recipe = {
+		{'default:bronze_ingot'},
+		{'group:stick'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:shovel_diamond',
+	recipe = {
+		{'default:diamond'},
+		{'group:stick'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_wood',
+	recipe = {
+		{'group:wood', 'group:wood'},
+		{'group:wood', 'group:stick'},
+		{'', 'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_stone',
+	recipe = {
+		{'group:stone', 'group:stone'},
+		{'group:stone', 'group:stick'},
+		{'', 'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_steel',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'group:stick'},
+		{'', 'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_bronze',
+	recipe = {
+		{'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'group:stick'},
+		{'', 'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_diamond',
+	recipe = {
+		{'default:diamond', 'default:diamond'},
+		{'default:diamond', 'group:stick'},
+		{'', 'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_wood',
+	recipe = {
+		{'group:wood', 'group:wood'},
+		{'group:stick', 'group:wood'},
+		{'group:stick',''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_stone',
+	recipe = {
+		{'group:stone', 'group:stone'},
+		{'group:stick', 'group:stone'},
+		{'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_steel',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot'},
+		{'group:stick', 'default:steel_ingot'},
+		{'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_bronze',
+	recipe = {
+		{'default:bronze_ingot', 'default:bronze_ingot'},
+		{'group:stick', 'default:bronze_ingot'},
+		{'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:axe_diamond',
+	recipe = {
+		{'default:diamond', 'default:diamond'},
+		{'group:stick', 'default:diamond'},
+		{'group:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:sword_wood',
+	recipe = {
+		{'group:wood'},
+		{'group:wood'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:sword_stone',
+	recipe = {
+		{'group:stone'},
+		{'group:stone'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:sword_steel',
+	recipe = {
+		{'default:steel_ingot'},
+		{'default:steel_ingot'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:sword_bronze',
+	recipe = {
+		{'default:bronze_ingot'},
+		{'default:bronze_ingot'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:sword_diamond',
+	recipe = {
+		{'default:diamond'},
+		{'default:diamond'},
+		{'group:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'tools:skeleton_key',
+	recipe = {
+		{'default:gold_ingot'},
+	}
+})
+
+minetest.register_craft({
+	type = 'cooking',
+	output = 'default:gold_ingot',
+	recipe = 'tools:key',
+	cooktime = 5,
+})
+
+minetest.register_craft({
+	type = 'cooking',
+	output = 'default:gold_ingot',
+	recipe = 'tools:skeleton_key',
+	cooktime = 5,
+})
+

mods/ITEMS/tools/depends.txt

@@ -0,0 +1 @@
+default

mods/ITEMS/tools/init.lua

@@ -1,4 +1,6 @@
--- mods/default/tools.lua
+--[[
+	Tools
+--]]
 
 -- The hand
 minetest.register_item(":", {
@@ -21,9 +23,9 @@ minetest.register_item(":", {
 -- Picks
 --
 
-minetest.register_tool("default:pick_wood", {
+minetest.register_tool("tools:pick_wood", {
 	description = "Wooden Pickaxe",
-	inventory_image = "default_tool_woodpick.png",
+	inventory_image = "tools_woodpick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.2,
 		max_drop_level=0,
@@ -36,9 +38,9 @@ minetest.register_tool("default:pick_wood", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:pick_stone", {
+minetest.register_tool("tools:pick_stone", {
 	description = "Stone Pickaxe",
-	inventory_image = "default_tool_stonepick.png",
+	inventory_image = "tools_stonepick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.3,
 		max_drop_level=0,
@@ -50,9 +52,9 @@ minetest.register_tool("default:pick_stone", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:pick_steel", {
+minetest.register_tool("tools:pick_steel", {
 	description = "Steel Pickaxe",
-	inventory_image = "default_tool_steelpick.png",
+	inventory_image = "tools_steelpick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -64,9 +66,9 @@ minetest.register_tool("default:pick_steel", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:pick_bronze", {
+minetest.register_tool("tools:pick_bronze", {
 	description = "Bronze Pickaxe",
-	inventory_image = "default_tool_bronzepick.png",
+	inventory_image = "tools_bronzepick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -78,23 +80,9 @@ minetest.register_tool("default:pick_bronze", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:pick_mese", {
-	description = "Mese Pickaxe",
-	inventory_image = "default_tool_mesepick.png",
-	tool_capabilities = {
-		full_punch_interval = 0.9,
-		max_drop_level=3,
-		groupcaps={
-			cracky = {times={[1]=2.4, [2]=1.2, [3]=0.60}, uses=20, maxlevel=3},
-		},
-		damage_groups = {fleshy=5},
-	},
-	sound = {breaks = "default_tool_breaks"},
-})
-
-minetest.register_tool("default:pick_diamond", {
+minetest.register_tool("tools:pick_diamond", {
 	description = "Diamond Pickaxe",
-	inventory_image = "default_tool_diamondpick.png",
+	inventory_image = "tools_diamondpick.png",
 	tool_capabilities = {
 		full_punch_interval = 0.9,
 		max_drop_level=3,
@@ -110,10 +98,10 @@ minetest.register_tool("default:pick_diamond", {
 -- Shovels
 --
 
-minetest.register_tool("default:shovel_wood", {
+minetest.register_tool("tools:shovel_wood", {
 	description = "Wooden Shovel",
-	inventory_image = "default_tool_woodshovel.png",
-	wield_image = "default_tool_woodshovel.png^[transformR90",
+	inventory_image = "tools_woodshovel.png",
+	wield_image = "tools_woodshovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.2,
 		max_drop_level=0,
@@ -126,10 +114,10 @@ minetest.register_tool("default:shovel_wood", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:shovel_stone", {
+minetest.register_tool("tools:shovel_stone", {
 	description = "Stone Shovel",
-	inventory_image = "default_tool_stoneshovel.png",
-	wield_image = "default_tool_stoneshovel.png^[transformR90",
+	inventory_image = "tools_stoneshovel.png",
+	wield_image = "tools_stoneshovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.4,
 		max_drop_level=0,
@@ -141,10 +129,10 @@ minetest.register_tool("default:shovel_stone", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:shovel_steel", {
+minetest.register_tool("tools:shovel_steel", {
 	description = "Steel Shovel",
-	inventory_image = "default_tool_steelshovel.png",
-	wield_image = "default_tool_steelshovel.png^[transformR90",
+	inventory_image = "tools_steelshovel.png",
+	wield_image = "tools_steelshovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.1,
 		max_drop_level=1,
@@ -156,10 +144,10 @@ minetest.register_tool("default:shovel_steel", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:shovel_bronze", {
+minetest.register_tool("tools:shovel_bronze", {
 	description = "Bronze Shovel",
-	inventory_image = "default_tool_bronzeshovel.png",
-	wield_image = "default_tool_bronzeshovel.png^[transformR90",
+	inventory_image = "tools_bronzeshovel.png",
+	wield_image = "tools_bronzeshovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.1,
 		max_drop_level=1,
@@ -171,25 +159,10 @@ minetest.register_tool("default:shovel_bronze", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:shovel_mese", {
-	description = "Mese Shovel",
-	inventory_image = "default_tool_meseshovel.png",
-	wield_image = "default_tool_meseshovel.png^[transformR90",
-	tool_capabilities = {
-		full_punch_interval = 1.0,
-		max_drop_level=3,
-		groupcaps={
-			crumbly = {times={[1]=1.20, [2]=0.60, [3]=0.30}, uses=20, maxlevel=3},
-		},
-		damage_groups = {fleshy=4},
-	},
-	sound = {breaks = "default_tool_breaks"},
-})
-
-minetest.register_tool("default:shovel_diamond", {
+minetest.register_tool("tools:shovel_diamond", {
 	description = "Diamond Shovel",
-	inventory_image = "default_tool_diamondshovel.png",
-	wield_image = "default_tool_diamondshovel.png^[transformR90",
+	inventory_image = "tools_diamondshovel.png",
+	wield_image = "tools_diamondshovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -205,9 +178,9 @@ minetest.register_tool("default:shovel_diamond", {
 -- Axes
 --
 
-minetest.register_tool("default:axe_wood", {
+minetest.register_tool("tools:axe_wood", {
 	description = "Wooden Axe",
-	inventory_image = "default_tool_woodaxe.png",
+	inventory_image = "tools_woodaxe.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=0,
@@ -220,9 +193,9 @@ minetest.register_tool("default:axe_wood", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:axe_stone", {
+minetest.register_tool("tools:axe_stone", {
 	description = "Stone Axe",
-	inventory_image = "default_tool_stoneaxe.png",
+	inventory_image = "tools_stoneaxe.png",
 	tool_capabilities = {
 		full_punch_interval = 1.2,
 		max_drop_level=0,
@@ -234,9 +207,9 @@ minetest.register_tool("default:axe_stone", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:axe_steel", {
+minetest.register_tool("tools:axe_steel", {
 	description = "Steel Axe",
-	inventory_image = "default_tool_steelaxe.png",
+	inventory_image = "tools_steelaxe.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -248,9 +221,9 @@ minetest.register_tool("default:axe_steel", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:axe_bronze", {
+minetest.register_tool("tools:axe_bronze", {
 	description = "Bronze Axe",
-	inventory_image = "default_tool_bronzeaxe.png",
+	inventory_image = "tools_bronzeaxe.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -262,23 +235,9 @@ minetest.register_tool("default:axe_bronze", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:axe_mese", {
-	description = "Mese Axe",
-	inventory_image = "default_tool_meseaxe.png",
-	tool_capabilities = {
-		full_punch_interval = 0.9,
-		max_drop_level=1,
-		groupcaps={
-			choppy={times={[1]=2.20, [2]=1.00, [3]=0.60}, uses=20, maxlevel=3},
-		},
-		damage_groups = {fleshy=6},
-	},
-	sound = {breaks = "default_tool_breaks"},
-})
-
-minetest.register_tool("default:axe_diamond", {
+minetest.register_tool("tools:axe_diamond", {
 	description = "Diamond Axe",
-	inventory_image = "default_tool_diamondaxe.png",
+	inventory_image = "tools_diamondaxe.png",
 	tool_capabilities = {
 		full_punch_interval = 0.9,
 		max_drop_level=1,
@@ -294,9 +253,9 @@ minetest.register_tool("default:axe_diamond", {
 -- Swords
 --
 
-minetest.register_tool("default:sword_wood", {
+minetest.register_tool("tools:sword_wood", {
 	description = "Wooden Sword",
-	inventory_image = "default_tool_woodsword.png",
+	inventory_image = "tools_woodsword.png",
 	tool_capabilities = {
 		full_punch_interval = 1,
 		max_drop_level=0,
@@ -309,9 +268,9 @@ minetest.register_tool("default:sword_wood", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:sword_stone", {
+minetest.register_tool("tools:sword_stone", {
 	description = "Stone Sword",
-	inventory_image = "default_tool_stonesword.png",
+	inventory_image = "tools_stonesword.png",
 	tool_capabilities = {
 		full_punch_interval = 1.2,
 		max_drop_level=0,
@@ -323,9 +282,9 @@ minetest.register_tool("default:sword_stone", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:sword_steel", {
+minetest.register_tool("tools:sword_steel", {
 	description = "Steel Sword",
-	inventory_image = "default_tool_steelsword.png",
+	inventory_image = "tools_steelsword.png",
 	tool_capabilities = {
 		full_punch_interval = 0.8,
 		max_drop_level=1,
@@ -337,9 +296,9 @@ minetest.register_tool("default:sword_steel", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:sword_bronze", {
+minetest.register_tool("tools:sword_bronze", {
 	description = "Bronze Sword",
-	inventory_image = "default_tool_bronzesword.png",
+	inventory_image = "tools_bronzesword.png",
 	tool_capabilities = {
 		full_punch_interval = 0.8,
 		max_drop_level=1,
@@ -351,23 +310,9 @@ minetest.register_tool("default:sword_bronze", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:sword_mese", {
-	description = "Mese Sword",
-	inventory_image = "default_tool_mesesword.png",
-	tool_capabilities = {
-		full_punch_interval = 0.7,
-		max_drop_level=1,
-		groupcaps={
-			snappy={times={[1]=2.0, [2]=1.00, [3]=0.35}, uses=30, maxlevel=3},
-		},
-		damage_groups = {fleshy=7},
-	},
-	sound = {breaks = "default_tool_breaks"},
-})
-
-minetest.register_tool("default:sword_diamond", {
+minetest.register_tool("tools:sword_diamond", {
 	description = "Diamond Sword",
-	inventory_image = "default_tool_diamondsword.png",
+	inventory_image = "tools_diamondsword.png",
 	tool_capabilities = {
 		full_punch_interval = 0.7,
 		max_drop_level=1,
@@ -379,59 +324,26 @@ minetest.register_tool("default:sword_diamond", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:skeleton_key", {
-	description = "Skeleton Key",
-	inventory_image = "default_key_skeleton.png",
-	groups = {key = 1},
-	on_place = function(itemstack, placer, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return itemstack
-		end
-
-		local pos = pointed_thing.under
-		local node = minetest.get_node(pos)
-
-		if not node then
-			return itemstack
-		end
-
-		local on_skeleton_key_use = minetest.registered_nodes[node.name].on_skeleton_key_use
-		if on_skeleton_key_use then
-			-- make a new key secret in case the node callback needs it
-			local random = math.random
-			local newsecret = string.format(
-				"%04x%04x%04x%04x",
-				random(2^16) - 1, random(2^16) - 1,
-				random(2^16) - 1, random(2^16) - 1)
-
-			local secret, _, _ = on_skeleton_key_use(pos, placer, newsecret)
-
-			if secret then
-				-- finish and return the new key
-				itemstack:take_item()
-				itemstack:add_item("default:key")
-				itemstack:set_metadata(minetest.write_json({
-					secret = secret
-				}))
-				return itemstack
-			end
-		end
-		return nil
-	end
-})
-
-minetest.register_tool("default:key", {
+minetest.register_tool("tools:key", {
 	description = "Key",
-	inventory_image = "default_key.png",
+	inventory_image = "tools_key.png",
 	groups = {key = 1, not_in_creative_inventory = 1},
 	stack_max = 1,
 	on_place = function(itemstack, placer, pointed_thing)
+		local under = pointed_thing.under
+		local node = minetest.get_node(under)
+		local def = minetest.registered_nodes[node.name]
+		if def and def.on_rightclick and
+				not (placer and placer:get_player_control().sneak) then
+			return def.on_rightclick(under, node, placer, itemstack,
+				pointed_thing) or itemstack
+		end
 		if pointed_thing.type ~= "node" then
 			return itemstack
 		end
 
 		local pos = pointed_thing.under
-		local node = minetest.get_node(pos)
+		node = minetest.get_node(pos)
 
 		if not node or node.name == "ignore" then
 			return itemstack
@@ -450,3 +362,62 @@ minetest.register_tool("default:key", {
 		return nil
 	end
 })
+
+minetest.register_craftitem("tools:skeleton_key", {
+	description = "Skeleton Key",
+	inventory_image = "tools_key_skeleton.png",
+	groups = {key = 1},
+	on_use = function(itemstack, user, pointed_thing)
+		if pointed_thing.type ~= "node" then
+			return itemstack
+		end
+
+		local pos = pointed_thing.under
+		local node = minetest.get_node(pos)
+
+		if not node then
+			return itemstack
+		end
+
+		local on_skeleton_key_use = minetest.registered_nodes[node.name].on_skeleton_key_use
+		if not on_skeleton_key_use then
+			return itemstack
+		end
+
+		-- make a new key secret in case the node callback needs it
+		local random = math.random
+		local newsecret = string.format(
+			"%04x%04x%04x%04x",
+			random(2^16) - 1, random(2^16) - 1,
+			random(2^16) - 1, random(2^16) - 1)
+
+		local secret, _, _ = on_skeleton_key_use(pos, user, newsecret)
+
+		if secret then
+			local inv = minetest.get_inventory({type="player", name=user:get_player_name()})
+
+			-- update original itemstack
+			itemstack:take_item()
+
+			-- finish and return the new key
+			local new_stack = ItemStack("tools:key")
+			local meta = new_stack:get_meta()
+			meta:set_string("secret", secret)
+			meta:set_string("description", "Key to "..user:get_player_name().."'s "
+				..minetest.registered_nodes[node.name].description)
+
+			if itemstack:get_count() == 0 then
+				itemstack = new_stack
+			else
+				if inv:add_item("main", new_stack):get_count() > 0 then
+					minetest.add_item(user:getpos(), new_stack)
+				end -- else: added to inventory successfully
+			end
+
+			return itemstack
+		end
+	end
+})
+
+dofile(minetest.get_modpath("tools").."/crafting.lua")
+

mods/ITEMS/tools/mod.conf

@@ -0,0 +1 @@
+name = tools

mods/default/aliases.lua

@@ -45,7 +45,6 @@ minetest.register_alias("apple", "default:apple")
 minetest.register_alias("WPick", "default:pick_wood")
 minetest.register_alias("STPick", "default:pick_stone")
 minetest.register_alias("SteelPick", "default:pick_steel")
-minetest.register_alias("MesePick", "default:pick_mese")
 minetest.register_alias("WShovel", "default:shovel_wood")
 minetest.register_alias("STShovel", "default:shovel_stone")
 minetest.register_alias("SteelShovel", "default:shovel_steel")

mods/default/crafting.lua

@@ -74,283 +74,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'default:pick_wood',
-	recipe = {
-		{'group:wood', 'group:wood', 'group:wood'},
-		{'', 'group:stick', ''},
-		{'', 'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:pick_stone',
-	recipe = {
-		{'group:stone', 'group:stone', 'group:stone'},
-		{'', 'group:stick', ''},
-		{'', 'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:pick_steel',
-	recipe = {
-		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-		{'', 'group:stick', ''},
-		{'', 'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:pick_bronze',
-	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
-		{'', 'group:stick', ''},
-		{'', 'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:pick_mese',
-	recipe = {
-		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
-		{'', 'group:stick', ''},
-		{'', 'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:pick_diamond',
-	recipe = {
-		{'default:diamond', 'default:diamond', 'default:diamond'},
-		{'', 'group:stick', ''},
-		{'', 'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:shovel_wood',
-	recipe = {
-		{'group:wood'},
-		{'group:stick'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:shovel_stone',
-	recipe = {
-		{'group:stone'},
-		{'group:stick'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:shovel_steel',
-	recipe = {
-		{'default:steel_ingot'},
-		{'group:stick'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:shovel_bronze',
-	recipe = {
-		{'default:bronze_ingot'},
-		{'group:stick'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:shovel_mese',
-	recipe = {
-		{'default:mese_crystal'},
-		{'group:stick'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:shovel_diamond',
-	recipe = {
-		{'default:diamond'},
-		{'group:stick'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_wood',
-	recipe = {
-		{'group:wood', 'group:wood'},
-		{'group:wood', 'group:stick'},
-		{'', 'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_stone',
-	recipe = {
-		{'group:stone', 'group:stone'},
-		{'group:stone', 'group:stick'},
-		{'', 'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_steel',
-	recipe = {
-		{'default:steel_ingot', 'default:steel_ingot'},
-		{'default:steel_ingot', 'group:stick'},
-		{'', 'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_bronze',
-	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot'},
-		{'default:bronze_ingot', 'group:stick'},
-		{'', 'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_mese',
-	recipe = {
-		{'default:mese_crystal', 'default:mese_crystal'},
-		{'default:mese_crystal', 'group:stick'},
-		{'', 'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_diamond',
-	recipe = {
-		{'default:diamond', 'default:diamond'},
-		{'default:diamond', 'group:stick'},
-		{'', 'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_wood',
-	recipe = {
-		{'group:wood', 'group:wood'},
-		{'group:stick', 'group:wood'},
-		{'group:stick',''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_stone',
-	recipe = {
-		{'group:stone', 'group:stone'},
-		{'group:stick', 'group:stone'},
-		{'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_steel',
-	recipe = {
-		{'default:steel_ingot', 'default:steel_ingot'},
-		{'group:stick', 'default:steel_ingot'},
-		{'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_bronze',
-	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot'},
-		{'group:stick', 'default:bronze_ingot'},
-		{'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_mese',
-	recipe = {
-		{'default:mese_crystal', 'default:mese_crystal'},
-		{'group:stick', 'default:mese_crystal'},
-		{'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:axe_diamond',
-	recipe = {
-		{'default:diamond', 'default:diamond'},
-		{'group:stick', 'default:diamond'},
-		{'group:stick', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:sword_wood',
-	recipe = {
-		{'group:wood'},
-		{'group:wood'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:sword_stone',
-	recipe = {
-		{'group:stone'},
-		{'group:stone'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:sword_steel',
-	recipe = {
-		{'default:steel_ingot'},
-		{'default:steel_ingot'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:sword_bronze',
-	recipe = {
-		{'default:bronze_ingot'},
-		{'default:bronze_ingot'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:sword_mese',
-	recipe = {
-		{'default:mese_crystal'},
-		{'default:mese_crystal'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:sword_diamond',
-	recipe = {
-		{'default:diamond'},
-		{'default:diamond'},
-		{'group:stick'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:skeleton_key',
-	recipe = {
-		{'default:gold_ingot'},
-	}
-})
-
 minetest.register_craft({
 	output = 'default:chest',
 	recipe = {
@@ -696,14 +419,6 @@ minetest.register_craft({
 	}
 })
 
---
--- Crafting (tool repair)
---
-minetest.register_craft({
-	type = "toolrepair",
-	additional_wear = -0.02,
-})
-
 --
 -- Cooking recipes
 --
@@ -762,20 +477,6 @@ minetest.register_craft({
 	recipe = "default:clay_lump",
 })
 
-minetest.register_craft({
-	type = 'cooking',
-	output = 'default:gold_ingot',
-	recipe = 'default:skeleton_key',
-	cooktime = 5,
-})
-
-minetest.register_craft({
-	type = 'cooking',
-	output = 'default:gold_ingot',
-	recipe = 'default:key',
-	cooktime = 5,
-})
-
 --
 -- Fuels
 --

mods/default/init.lua

@@ -40,7 +40,6 @@ local default_path = minetest.get_modpath("default")
 dofile(default_path.."/functions.lua")
 dofile(default_path.."/trees.lua")
 dofile(default_path.."/nodes.lua")
-dofile(default_path.."/tools.lua")
 dofile(default_path.."/item_entity.lua")
 dofile(default_path.."/craftitems.lua")
 dofile(default_path.."/crafting.lua")

mods/default/nodes.lua

@@ -1627,7 +1627,7 @@ local function has_locked_chest_privilege(meta, player)
 
 	-- is player wielding the right key?
 	local item = player:get_wielded_item()
-	if item:get_name() == "default:key" then
+	if item:get_name() == "tools:key" then
 		local key_meta = minetest.parse_json(item:get_metadata())
 		local secret = meta:get_string("key_lock_secret")
 		if secret ~= key_meta.secret then