Merge branch 'master' into fork-master

mods/default/chests.lua

@@ -163,12 +163,12 @@ function default.chest.register_chest(prefixed_name, d)
 			local itemstack = player:get_wielded_item()
 			local key_meta = itemstack:get_meta()
 
-			if itemstack:get_metadata() == "" then
+			if itemstack:get_meta():get_string("") == "" then
 				return
 			end
 
 			if key_meta:get_string("secret") == "" then
-				key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret)
+				key_meta:set_string("secret", minetest.parse_json(itemstack:get_meta():get_string("")).secret)
 				itemstack:set_metadata("")
 			end
 

mods/default/craftitems.lua

@@ -57,7 +57,7 @@ local function book_on_use(itemstack, user)
 	local page, page_max, lines, string = 1, 1, {}, ""
 
 	-- Backwards compatibility
-	local old_data = minetest.deserialize(itemstack:get_metadata())
+	local old_data = minetest.deserialize(itemstack:get_meta():get_string(""))
 	if old_data then
 		meta:from_table({ fields = old_data })
 	end

mods/default/functions.lua

@@ -834,7 +834,7 @@ function default.can_interact_with_node(player, pos)
 		local key_meta = item:get_meta()
 
 		if key_meta:get_string("secret") == "" then
-			local key_oldmeta = item:get_metadata()
+			local key_oldmeta = item:get_meta():get_string("")
 			if key_oldmeta == "" or not minetest.parse_json(key_oldmeta) then
 				return false
 			end

mods/default/furnace.lua

@@ -135,6 +135,7 @@ local function furnace_node_timer(pos, elapsed)
 
 	local update = true
 	local items_smelt = 0
+	local items_smelt = 0
 	while elapsed > 0 and update do
 		update = false
 
@@ -173,6 +174,7 @@ local function furnace_node_timer(pos, elapsed)
 						dst_full = true
 					end
 					items_smelt = items_smelt + 1
+					items_smelt = items_smelt + 1
 				else
 					-- Item could not be cooked: probably missing fuel
 					update = true
@@ -338,6 +340,12 @@ local function apply_logger(def)
 	return def
 end
 
+minetest.register_node("default:furnace", apply_logger({
+local function apply_logger(def)
+	default.set_inventory_action_loggers(def, "furnace")
+	return def
+end
+
 minetest.register_node("default:furnace", apply_logger({
 	description = S("Furnace"),
 	tiles = {
@@ -389,7 +397,9 @@ minetest.register_node("default:furnace", apply_logger({
 	allow_metadata_inventory_move = allow_metadata_inventory_move,
 	allow_metadata_inventory_take = allow_metadata_inventory_take,
 }))
+}))
 
+minetest.register_node("default:furnace_active", apply_logger({
 minetest.register_node("default:furnace_active", apply_logger({
 	description = S("Furnace"),
 	tiles = {
@@ -425,6 +435,7 @@ minetest.register_node("default:furnace_active", apply_logger({
 	allow_metadata_inventory_move = allow_metadata_inventory_move,
 	allow_metadata_inventory_take = allow_metadata_inventory_take,
 }))
+}))
 
 minetest.register_craft({
 	output = "default:furnace",