From ebc114df71cc20868afbd3c6dea4039dc14c1a0e Mon Sep 17 00:00:00 2001 From: Carter Kolwey <fhrfuyduduf@gmail.com> Date: Sat, 11 Jan 2014 18:30:10 +0100 Subject: [PATCH] Fixed music player --- technic/tools/sonic_screwdriver.lua | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua index 7582c8c..3951b8b 100644 --- a/technic/tools/sonic_screwdriver.lua +++ b/technic/tools/sonic_screwdriver.lua @@ -1,25 +1,32 @@ local sonic_screwdriver_max_charge = 15000 + +local S = technic.getter + technic.register_power_tool("technic:sonic_screwdriver", sonic_screwdriver_max_charge) minetest.register_tool("technic:sonic_screwdriver", { - description = "Sonic Screwdriver", + description = S("Sonic Screwdriver"), inventory_image = "technic_sonic_screwdriver.png", on_use = function(itemstack, user, pointed_thing) -- Must be pointing to facedir applicable node if pointed_thing.type ~= "node" then return end - local pos = minetest.get_pointed_thing_position(pointed_thing, above) + local pos = pointed_thing.under + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, user:get_player_name()) + return + end local node = minetest.get_node(pos) local node_name = node.name if minetest.registered_nodes[node_name].paramtype2 ~= "facedir" and minetest.registered_nodes[node_name].paramtype2 ~= "wallmounted" then - return itemstack + return end if node.param2 == nil then return end - local meta1 = get_item_meta(itemstack:get_metadata()) + local meta1 = minetest.deserialize(itemstack:get_metadata()) if not meta1 or not meta1.charge then return end @@ -38,17 +45,16 @@ p = 0 end end - -- hacky_swap_node, unforunatly. - local meta = minetest.get_meta(pos) - local meta0 = meta:to_table() - node.param2 = p - minetest.set_node(pos, node) - meta = minetest.get_meta(pos) - meta:from_table(meta0) + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, user:get_player_name()) + else + node.param2 = p + minetest.swap_node(pos, node) - meta1.charge = meta1.charge - 100 - itemstack:set_metadata(set_item_meta(meta1)) - technic.set_RE_wear(itemstack, meta1.charge, sonic_screwdriver_max_charge) + meta1.charge = meta1.charge - 100 + itemstack:set_metadata(minetest.serialize(meta1)) + technic.set_RE_wear(itemstack, meta1.charge, sonic_screwdriver_max_charge) + end end return itemstack end, @@ -60,5 +66,6 @@ {"default:diamond"}, {"technic:battery"}, {"technic:stainless_steel_ingot"} - } + } }) + -- Gitblit v1.8.0