Merge branch 'master' into jumpdrive-support

API.md

@@ -68,7 +68,12 @@ Used by `wrench.register_node`.
 	-- If true, only the owner of the node can pickup the node.
 
 	timer = true,
-	-- If true, the node timer is saved, and restarted upon placement
+	-- If true, the node timer is saved, and restarted upon placement.
+
+	can_pickup = function(pos, player)
+	-- Function called before a node is picked up.
+	-- Return true to skip owner and protection checks.
+	-- Return false to disallow pickup. Can also return an optional error message.
 
 	before_pickup = function(pos, meta, node, player)
 	-- Function called before a node is picked up, but after metadata has been stored.

functions.lua

@@ -117,14 +117,29 @@ function wrench.pickup_node(pos, player)
 	if not def then
 		return
 	end
+	local pickup_override = false
+	if def.can_pickup then
+		local can_pickup, err_msg = def.can_pickup(pos, player)
+		if can_pickup == false then
+			return false, err_msg
+		elseif can_pickup == true then
+			pickup_override = true
+		end
+	end
 	local meta = minetest.get_meta(pos)
-	local inv = meta:get_inventory()
-	if def.owned and not minetest.check_player_privs(player, "protection_bypass") then
-		local owner = meta:get_string("owner")
-		if owner ~= "" and owner ~= player:get_player_name() then
-			return false, errors.owned(owner)
+	if not pickup_override then
+		local name = player:get_player_name()
+		if minetest.is_protected(pos, name) then
+			return
+		end
+		if def.owned and not minetest.check_player_privs(player, "protection_bypass") then
+			local owner = meta:get_string("owner")
+			if owner ~= "" and owner ~= player:get_player_name() then
+				return false, errors.owned(owner)
+			end
 		end
 	end
+	local inv = meta:get_inventory()
 	if not safe_to_pickup(def, meta, inv) then
 		return false, errors.unknown
 	end

locale/wrench.de.tr

@@ -1,20 +1,16 @@
 # textdomain: wrench
 
-# technic_wrench german translation
-# technic_wrench deutsche übersetzung
-# by Xanthin and others
+Wrench=Schraubenschlüssel
 
-Wrench=Schraubenschluessel
+Not enough room in inventory to pickup node.=Nicht genug Platz im Inventar, um diesen Block zu nehmen.
+Cannot pickup node containing @1.=Block mit @1 kann nicht aufgenommen werden.
+Cannot pickup node. Owned by @1.=Block kann nicht aufgenommen werden. Er gehört @1.
+Cannot pickup node. Nesting inventories is not allowed.=Block kann nicht aufgenommen werden. Behälter zu verschachteln ist nicht erlaubt.
+Cannot pickup node. Node contains too much metadata.=Block kann nicht aufgenommen werden. Er enthält zu viele Metadaten.
+Cannot pickup node. Node is missing inventory.=Block kann nicht aufgenommen werden. Block ist kein Behälter.
+Cannot pickup node. Node contains unknown metadata.=Block kann nicht aufgenommen werden. Block enthält unbekannte Metadaten.
 
-Not enough room in inventory to pickup node.=Nicht genug Platz im Inventar um diesen Block zu nehmen.
-Cannot pickup node containing @1.=Block mit @1 kann nicht genommen werden.
-Cannot pickup node. Owned by @1.=Block kann nicht genommen werden. Dieser gehört @1.
-Cannot pickup node. Nesting inventories is not allowed.=Block kann nicht genommen werden. Verschalteltes Inventar ist nicht erlaubt.
-Cannot pickup node. Node contains too much metadata.=Block kann nicht genommen werden. Der Block enthält zu viele Metadaten.
-Cannot pickup node. Node is missing inventory.=
-Cannot pickup node. Node contains unknown metadata.=
-
-@1 with items=@1 mit Gegenstaenden
+@1 with items=@1 mit Gegenständen
 @1 with text "@2"=@1 mit Text "@2"
 @1 with channel "@2"=@1 mit Kanal "@2"
 @1 with configuration=@1 mit Konfiguration
@@ -23,4 +19,4 @@ Cannot pickup node. Node contains unknown metadata.=
 @1 with code=@1 mit Code
 @1 with game "@2" vs. "@3"=@1 mit Spiel "@2" gegen "@3"
 @1 with item "@2"=@1 mit Gegenstand "@2"
-@1 (light level @2) with channel "@3"=@1 (Lichtlevel @2) mit Kanal "@3"
+@1 (light level @2) with channel "@3"=@1 (Lichtstärke @2) mit Kanal "@3"

locale/wrench.fr.tr

@@ -6,21 +6,21 @@
 
 Wrench=Clé
 
-Not enough room in inventory to pickup node.=
-Cannot pickup node containing @1.=
-Cannot pickup node. Owned by @1.=
-Cannot pickup node. Nesting inventories is not allowed.=
-Cannot pickup node. Node contains too much metadata.=
-Cannot pickup node. Node is missing inventory.=
-Cannot pickup node. Node contains unknown metadata.=
+Not enough room in inventory to pickup node.=Pas assez de place dans l’inventaire pour stocker cet objet.
+Cannot pickup node containing @1.=Impossible de récupérer l'objet contenant @1.
+Cannot pickup node. Owned by @1.=Impossible de récupérer l'objet car il appartient à @1
+Cannot pickup node. Nesting inventories is not allowed.=Impossible de récupérer l'objet. Les inventaires imbriqués ne sont pas autorisés.
+Cannot pickup node. Node contains too much metadata.=Impossible de récupérer l'objet car il contient trop de métadonnées.
+Cannot pickup node. Node is missing inventory.=Impossible de récupérer l'objet car l'inventaire est manquant
+Cannot pickup node. Node contains unknown metadata.=Impossible de récupérer l'objet car il contient des métadonnées inconnues.
 
 @1 with items=@1 avec des objets
-@1 with text "@2"=
-@1 with channel "@2"=
-@1 with configuration=
+@1 with text "@2"=@1 avec le texte "@2"
+@1 with channel "@2"=@1 avec le canal "@2"
+@1 with configuration=@1 avec la configuration
 
-@1 with armor=
-@1 with code=
-@1 with game "@2" vs. "@3"=
-@1 with item "@2"=
-@1 (light level @2) with channel "@3"=
+@1 with armor=@1 avec armure
+@1 with code=@1 avec code
+@1 with game "@2" vs. "@3"=@1 avec le jeu "@2" vs. "@3"
+@1 with item "@2"=@1 avec l'objet "@2"
+@1 (light level @2) with channel "@3"=@1 (niveau lumineux @2) avec canal "@3"

locale/wrench.id.tr

@@ -0,0 +1,26 @@
+# textdomain: wrench
+
+# technic_wrench Indonesian translation
+# terjemahan bahasa Indonesia technic_wrench
+# by srifqi
+
+Wrench=Kunci Pas
+
+Not enough room in inventory to pickup node.=Tidak cukup ruang dalam inventaris untuk mengambil nodus.
+Cannot pickup node containing @1.=Tidak dapat mengambil nodus yang berisi @1.
+Cannot pickup node. Owned by @1.=Tidak dapat mengambil nodus. Dimiliki oleh @1.
+Cannot pickup node. Nesting inventories is not allowed.=Tidak dapat mengambil nodus. Inventaris bersusun tidak dibolehkan.
+Cannot pickup node. Node contains too much metadata.=Tidak dapat mengambil nodus. Nodus berisi terlalu banyak metadata.
+Cannot pickup node. Node is missing inventory.=Tidak dapat mengambil nodus. Nodus kehilangan inventaris.
+Cannot pickup node. Node contains unknown metadata.=Tidak dapat mengambil nodus. Nodus mengandung metadata yang tidak diketahui.
+
+@1 with items=@1 berisi barang
+@1 with text "@2"=@1 berisi teks "@2"
+@1 with channel "@2"=@1 dengan saluran "@2"
+@1 with configuration=@1 dengan konfigurasi
+
+@1 with armor=@1 dengan zirah
+@1 with code=@1 dengan kode
+@1 with game "@2" vs. "@3"=@1 dengan permainan "@2" vs. "@3"
+@1 with item "@2"=@1 dengan barang "@2"
+@1 (light level @2) with channel "@3"=@1 (tingkat cahaya @2) dengan saluran "@3"

nodes/bones.lua

@@ -1,16 +1,33 @@
 
 -- Register wrench support for bones
 
+local S = wrench.translator
+
 if bones.redo then
+	local function can_pickup_bones(pos, player)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("infotext") == "" then
+			return false
+		end
+		if meta:get_int("time") >= bones.share_time then
+			return true
+		end
+		local name = player:get_player_name()
+		local owner = meta:get_string("owner")
+		if owner == "" or owner == name or minetest.check_player_privs(name, "protection_bypass") then
+			return true
+		end
+		return false, S("Cannot pickup node. Owned by @1.", owner)
+	end
 	wrench.register_node("bones:bones", {
 		lists = {"main"},
 		metas = {
 			owner = wrench.META_TYPE_STRING,
 			infotext = wrench.META_TYPE_STRING,
 			time = wrench.META_TYPE_INT,
 		},
-		owned = true,
 		timer = true,
+		can_pickup = can_pickup_bones,
 	})
 else
 	wrench.register_node("bones:bones", {

nodes/default.lua

@@ -1,8 +1,8 @@
 
 -- Register nodes from default / minetest_game
 
-local splitstacks = wrench.has_pipeworks and wrench.META_TYPE_INT
-local formspec = wrench.has_pipeworks and wrench.META_TYPE_STRING
+local splitstacks = wrench.has_pipeworks and wrench.META_TYPE_INT or wrench.META_TYPE_IGNORE
+local formspec = wrench.has_pipeworks and wrench.META_TYPE_STRING or wrench.META_TYPE_IGNORE
 
 wrench.register_node("default:chest", {
 	lists = {"main"},
@@ -37,6 +37,7 @@ for _,name in pairs({"default:furnace", "default:furnace_active"}) do
 			splitstacks = splitstacks,
 			formspec = formspec,
 		},
+		timer = true,
 	})
 end
 
@@ -55,3 +56,17 @@ wrench.register_node("default:sign_wall_steel", {
 		formspec = wrench.META_TYPE_IGNORE,
 	},
 })
+
+local function bookshelf_desc(pos, meta)
+	return meta:get_string("infotext")
+end
+
+wrench.register_node("default:bookshelf", {
+	lists = {"books"},
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		text = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_IGNORE,
+	},
+	description = bookshelf_desc,
+})

tool.lua

@@ -7,17 +7,13 @@ minetest.register_tool("wrench:wrench", {
 	description = S("Wrench"),
 	inventory_image = "wrench_tool.png",
 	on_use = function(stack, player, pointed)
-		if not player or not pointed then
+		if not player or not pointed or not pointed.under then
 			return
 		end
-		local name = player:get_player_name()
-		local pos = pointed.under
-		if not pos or minetest.is_protected(pos, name) then
-			return
-		end
-		local picked_up, err_msg = wrench.pickup_node(pos, player)
+		local picked_up, err_msg = wrench.pickup_node(pointed.under, player)
 		if not picked_up then
 			if err_msg then
+				local name = player:get_player_name()
 				minetest.chat_send_player(name, err_msg)
 			end
 			return