Tweaked & Tidied code

1 files changed, 161 insertions, 133 deletions

diff --git a/init.lua b/init.lua
index 9fecbf6..4cd23f2 100644
--- a/init.lua
+++ b/init.lua
@@ -23,11 +23,11 @@ end
 protector.add_member = function(meta, name)
 	if protector.is_member(meta, name) then return end
 	local list = protector.get_member_list(meta)
-	table.insert(list,name)
+	table.insert(list, name)
 	protector.set_member_list(meta,list)
 end
 
-protector.del_member = function(meta,name)
+protector.del_member = function(meta, name)
 	local list = protector.get_member_list(meta)
 	for i, n in ipairs(list) do
 		if n == name then
@@ -35,14 +35,15 @@ protector.del_member = function(meta,name)
 			break
 		end
 	end
-	protector.set_member_list(meta,list)
+	protector.set_member_list(meta, list)
 end
 
 -- Protector Interface
 
 protector.generate_formspec = function(meta)
 
-	local formspec = "size[8,7]"..default.gui_bg..default.gui_bg_img..default.gui_slots
+	local formspec = "size[8,7]"
+		..default.gui_bg..default.gui_bg_img..default.gui_slots
 		.."label[2.5,0;-- Protector interface --]"
 		.."label[0,1;PUNCH node to show protected area or USE for area check]"
 		.."label[0,2;Members: (type player name then press Enter to add)]"
@@ -50,23 +51,24 @@ protector.generate_formspec = function(meta)
 	local members = protector.get_member_list(meta)
 	local npp = 12
 	local i = 0
-
 	for _, member in ipairs(members) do
 			if i < npp then
-				formspec = formspec .. "button["..(i%4*2)..","
-				..math.floor(i/4+3)..";1.5,.5;protector_member;"..member.."]"
-				formspec = formspec .. "button["..(i%4*2+1.25)..","
-				..math.floor(i/4+3)..";.75,.5;protector_del_member_"..member..";X]"
+				formspec = formspec .. "button[" .. (i % 4 * 2)
+				.. "," .. math.floor(i / 4 + 3)
+				.. ";1.5,.5;protector_member;" .. member .. "]"
+				.. "button[" .. (i % 4 * 2 + 1.25) .. ","
+				.. math.floor(i / 4 + 3)
+				.. ";.75,.5;protector_del_member_" .. member .. ";X]"
 			end
 			i = i + 1
 	end
 	
 	if i < npp then
-		formspec = formspec
-		.."field["..(i%4*2+1/3)..","..(math.floor(i/4+3)+1/3)..";1.433,.5;protector_add_member;;]"
+		formspec = formspec .. "field[" .. (i % 4 * 2 + 1 / 3) .. ","
+		.. (math.floor(i / 4 + 3) + 1 / 3) .. ";1.433,.5;protector_add_member;;]"
 	end
 
-	formspec = formspec.."button_exit[2.5,6.2;3,0.5;close_me;Close]"
+	formspec = formspec .. "button_exit[2.5,6.2;3,0.5;close_me;Close]"
 
 	return formspec
 end
@@ -79,7 +81,7 @@ end
 -- 2 for "This area is owned by <owner>.
 -- 3 for checking protector overlaps
 
-protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
+protector.can_dig = function(r, pos, digger, onlyowner, infolevel)
 
 	if not digger then
 		return false
@@ -87,7 +89,8 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
 
 	-- Delprotect privileged users can override protections
 
-	if minetest.check_player_privs(digger, {delprotect=true}) and infolevel == 1 then
+	if minetest.check_player_privs(digger, {delprotect = true})
+	and infolevel == 1 then
 		return true
 	end
 
@@ -96,8 +99,8 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
 	-- Find the protector nodes
 
 	local positions = minetest.find_nodes_in_area(
-		{x=pos.x-r, y=pos.y-r, z=pos.z-r},
-		{x=pos.x+r, y=pos.y+r, z=pos.z+r},
+		{x = pos.x - r, y = pos.y - r, z = pos.z - r},
+		{x = pos.x + r, y = pos.y + r, z = pos.z + r},
 		{"protector:protect", "protector:protect2"})
 
 	local meta, owner, members
@@ -109,12 +112,16 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
 		if owner ~= digger then 
 			if onlyowner or not protector.is_member(meta, digger) then
 				if infolevel == 1 then
-					minetest.chat_send_player(digger,"This area is owned by "..owner.." !")
+					minetest.chat_send_player(digger,
+					"This area is owned by " .. owner .. " !")
 				elseif infolevel == 2 then
-					minetest.chat_send_player(digger,"This area is owned by "..owner..".")
-					minetest.chat_send_player(digger,"Protection located at: "..minetest.pos_to_string(pos))
+					minetest.chat_send_player(digger,
+					"This area is owned by " .. owner .. ".")
+					minetest.chat_send_player(digger,
+					"Protection located at: " .. minetest.pos_to_string(pos))
 					if members ~= "" then
-						minetest.chat_send_player(digger,"Members: "..members..".")
+						minetest.chat_send_player(digger,
+						"Members: " .. members .. ".")
 					end
 				end
 				return false
@@ -122,10 +129,13 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
 		end
 
 		if infolevel == 2 then
-			minetest.chat_send_player(digger,"This area is owned by "..owner..".")
-			minetest.chat_send_player(digger,"Protection located at: "..minetest.pos_to_string(positions[1]))
+			minetest.chat_send_player(digger,
+			"This area is owned by " .. owner .. ".")
+			minetest.chat_send_player(digger,
+			"Protection located at: " .. minetest.pos_to_string(positions[1]))
 			if members ~= "" then
-				minetest.chat_send_player(digger,"Members: "..members..".")
+				minetest.chat_send_player(digger,
+				"Members: " .. members .. ".")
 			end
 		end
 
@@ -133,9 +143,10 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
 
 	if infolevel == 2 then
 		if #positions < 1 then
-			minetest.chat_send_player(digger,"This area is not protected.")
+			minetest.chat_send_player(digger,
+			"This area is not protected.")
 		end
-		minetest.chat_send_player(digger,"You can build here.")
+		minetest.chat_send_player(digger, "You can build here.")
 	end
 
 	return true
@@ -144,25 +155,28 @@ end
 -- Can node be added or removed, if so return node else true (for protected)
 
 protector.old_is_protected = minetest.is_protected
-minetest.is_protected = function(pos, digger)
 
-	if protector.can_dig(protector.radius, pos, digger, false, 1) then
-		return protector.old_is_protected(pos, digger)
-	else
+function minetest.is_protected(pos, digger)
+
+	if not protector.can_dig(protector.radius, pos, digger, false, 1) then
 		return true
 	end
+	return protector.old_is_protected(pos, digger)
+
 end
 
 -- Make sure protection block doesn't overlap another protector's area
 
 protector.old_node_place = minetest.item_place
+
 function minetest.item_place(itemstack, placer, pointed_thing)
 
 	if itemstack:get_name() == "protector:protect"
 	or itemstack:get_name() == "protector:protect2" then
 		local user = placer:get_player_name()
 		if not protector.can_dig(protector.radius * 2, pointed_thing.above, user, true, 3) then
-			minetest.chat_send_player(user, "Overlaps into another protected area")
+			minetest.chat_send_player(user,
+			"Overlaps into another protected area")
 			return protector.old_node_place(itemstack, placer, pointed_thing.above)
 		end
 	end
@@ -176,56 +190,54 @@ end
 
 minetest.register_node("protector:protect", {
 	description = "Protection Block",
-	tiles = {"moreblocks_circle_stone_bricks.png","moreblocks_circle_stone_bricks.png","moreblocks_circle_stone_bricks.png^protector_logo.png"},
-	sounds = default.node_sound_stone_defaults(),
-	groups = {dig_immediate=2,unbreakable=1},
-	drawtype = "nodebox",
-	node_box = {
-		type="fixed",
-		fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 },
+	tiles = {
+		"moreblocks_circle_stone_bricks.png",
+		"moreblocks_circle_stone_bricks.png",
+		"moreblocks_circle_stone_bricks.png^protector_logo.png"
 	},
-	selection_box = { type="regular" },
+	sounds = default.node_sound_stone_defaults(),
+	groups = {dig_immediate = 2, unbreakable = 1},
 	paramtype = "light",
 	light_source = 2,
 
 	after_place_node = function(pos, placer)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name() or "")
-		meta:set_string("infotext", "Protection (owned by "..meta:get_string("owner")..")")
+		meta:set_string("infotext", "Protection (owned by " .. meta:get_string("owner") .. ")")
 		meta:set_string("members", "")
 	end,
 
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type ~= "node" then return end
-		protector.can_dig(protector.radius,pointed_thing.under,user:get_player_name(),false,2)
+		protector.can_dig(protector.radius, pointed_thing.under, user:get_player_name(), false, 2)
 	end,
 
 	on_rightclick = function(pos, node, clicker, itemstack)
 		local meta = minetest.get_meta(pos)
-		if protector.can_dig(1,pos,clicker:get_player_name(),true,1) then
+		if protector.can_dig(1, pos,clicker:get_player_name(), true, 1) then
 			minetest.show_formspec(clicker:get_player_name(), 
-			"protector:node_"..minetest.pos_to_string(pos), protector.generate_formspec(meta))
+			"protector:node_" .. minetest.pos_to_string(pos), protector.generate_formspec(meta))
 		end
 	end,
 
 	on_punch = function(pos, node, puncher)
-		if not protector.can_dig(1,pos,puncher:get_player_name(),true,1) then
+		if not protector.can_dig(1, pos, puncher:get_player_name(), true, 1) then
 			return
 		end
 		minetest.add_entity(pos, "protector:display")
 	end,
 
 	can_dig = function(pos, player)
-		return protector.can_dig(1,pos,player:get_player_name(),true,1)
+		return protector.can_dig(1, pos, player:get_player_name(), true, 1)
 	end,
 })
 
 minetest.register_craft({
 	output = "protector:protect 4",
 	recipe = {
-		{"default:stone","default:stone","default:stone"},
-		{"default:stone","default:steel_ingot","default:stone"},
-		{"default:stone","default:stone","default:stone"},
+		{"default:stone", "default:stone", "default:stone"},
+		{"default:stone", "default:steel_ingot", "default:stone"},
+		{"default:stone", "default:stone", "default:stone"},
 	}
 })
 
@@ -237,7 +249,7 @@ minetest.register_node("protector:protect2", {
 	wield_image = "protector_logo.png",
 	inventory_image = "protector_logo.png",
 	sounds = default.node_sound_stone_defaults(),
-	groups = {dig_immediate=2,unbreakable=1},
+	groups = {dig_immediate = 2, unbreakable = 1},
 	paramtype = 'light',
 	paramtype2 = "wallmounted",
 	light_source = 2,
@@ -255,66 +267,66 @@ minetest.register_node("protector:protect2", {
 	after_place_node = function(pos, placer)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name() or "")
-		meta:set_string("infotext", "Protection (owned by "..meta:get_string("owner")..")")
+		meta:set_string("infotext", "Protection (owned by " .. meta:get_string("owner") .. ")")
 		meta:set_string("members", "")
 	end,
 
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type ~= "node" then return end
-		protector.can_dig(protector.radius,pointed_thing.under,user:get_player_name(),false,2)
+		protector.can_dig(protector.radius, pointed_thing.under, user:get_player_name(), false, 2)
 	end,
 
 	on_rightclick = function(pos, node, clicker, itemstack)
 		local meta = minetest.get_meta(pos)
-		if protector.can_dig(1,pos,clicker:get_player_name(),true,1) then
+		if protector.can_dig(1, pos, clicker:get_player_name(), true, 1) then
 			minetest.show_formspec(clicker:get_player_name(), 
-			"protector:node_"..minetest.pos_to_string(pos), protector.generate_formspec(meta))
+			"protector:node_" .. minetest.pos_to_string(pos), protector.generate_formspec(meta))
 		end
 	end,
 
 	on_punch = function(pos, node, puncher)
-		if not protector.can_dig(1,pos,puncher:get_player_name(),true,1) then
+		if not protector.can_dig(1, pos, puncher:get_player_name(), true, 1) then
 			return
 		end
 		minetest.add_entity(pos, "protector:display")
 	end,
 
 	can_dig = function(pos, player)
-		return protector.can_dig(1,pos,player:get_player_name(),true,1)
+		return protector.can_dig(1, pos, player:get_player_name(), true, 1)
 	end,
 })
 
 minetest.register_craft({
 	output = "protector:protect2 4",
 	recipe = {
-		{"default:stone","default:stone","default:stone"},
-		{"default:stone","default:copper_ingot","default:stone"},
-		{"default:stone","default:stone","default:stone"},
+		{"default:stone", "default:stone", "default:stone"},
+		{"default:stone", "default:copper_ingot", "default:stone"},
+		{"default:stone", "default:stone", "default:stone"},
 	}
 })
 
 -- If name entered or button press
 minetest.register_on_player_receive_fields(function(player,formname,fields)
 
-	if string.sub(formname,0,string.len("protector:node_")) == "protector:node_" then
+	if string.sub(formname, 0, string.len("protector:node_")) == "protector:node_" then
 
-		local pos_s = string.sub(formname,string.len("protector:node_")+1)
+		local pos_s = string.sub(formname, string.len("protector:node_") + 1)
 		local pos = minetest.string_to_pos(pos_s)
 		local meta = minetest.get_meta(pos)
 
-		if not protector.can_dig(1,pos,player:get_player_name(),true,1) then
+		if not protector.can_dig(1, pos, player:get_player_name(), true, 1) then
 			return
 		end
 
 		if fields.protector_add_member then
 			for _, i in ipairs(fields.protector_add_member:split(" ")) do
-				protector.add_member(meta,i)
+				protector.add_member(meta, i)
 			end
 		end
 
 		for field, value in pairs(fields) do
-			if string.sub(field,0,string.len("protector_del_member_"))=="protector_del_member_" then
-				protector.del_member(meta, string.sub(field,string.len("protector_del_member_")+1))
+			if string.sub(field, 0, string.len("protector_del_member_")) == "protector_del_member_" then
+				protector.del_member(meta, string.sub(field,string.len("protector_del_member_") + 1))
 			end
 		end
 		
@@ -328,9 +340,10 @@ end)
 
 minetest.register_entity("protector:display", {
 	physical = false,
-	collisionbox = {0,0,0,0,0,0},
+	collisionbox = {0, 0, 0, 0, 0, 0},
 	visual = "wielditem",
-	visual_size = {x=1.0/1.5,y=1.0/1.5}, -- wielditem seems to be scaled to 1.5 times original node size
+	-- wielditem seems to be scaled to 1.5 times original node size
+	visual_size = {x = 1.0 / 1.5, y = 1.0 / 1.5},
 	textures = {"protector:display_node"},
 	on_step = function(self, dtime)
 		self.timer = (self.timer or 0) + dtime
@@ -340,7 +353,8 @@ minetest.register_entity("protector:display", {
 	end,
 })
 
--- Display-zone node, Do NOT place the display as a node, it is made to be used as an entity (see above)
+-- Display-zone node, Do NOT place the display as a node,
+-- it is made to be used as an entity (see above)
 local x = protector.radius
 minetest.register_node("protector:display_node", {
 	tiles = {"protector_display.png"},
@@ -367,7 +381,7 @@ minetest.register_node("protector:display_node", {
 		type = "regular",
 	},
 	paramtype = "light",
-	groups = {dig_immediate=3,not_in_creative_inventory=1},
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "",
 })
 
@@ -379,12 +393,12 @@ local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
 		return
 	end
 	local p2 = minetest.get_node(pos).param2
-	p2 = params[p2+1]
+	p2 = params[p2 + 1]
 		
-	minetest.swap_node(pos, {name=replace_dir, param2=p2})
+	minetest.swap_node(pos, {name = replace_dir, param2 = p2})
 		
 	pos.y = pos.y-dir
-	minetest.swap_node(pos, {name=replace, param2=p2})
+	minetest.swap_node(pos, {name = replace, param2 = p2})
 
 	local snd_1 = "doors_door_close"
 	local snd_2 = "doors_door_open" 
@@ -394,9 +408,11 @@ local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
 	end
 
 	if minetest.get_meta(pos):get_int("right") ~= 0 then
-		minetest.sound_play(snd_1, {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.sound_play(snd_1, {
+			pos = pos, gain = 0.3, max_hear_distance = 10})
 	else
-		minetest.sound_play(snd_2, {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.sound_play(snd_2, {
+			pos = pos, gain = 0.3, max_hear_distance = 10})
 	end
 end
 
@@ -407,17 +423,21 @@ local name = "protector:door_wood"
 doors.register_door(name, {
 	description = "Protected Wooden Door",
 	inventory_image = "doors_wood.png^protector_logo.png",
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
+	groups = {
+		snappy = 1, choppy = 2, oddly_breakable_by_hand = 2,
+		door = 1, unbreakable = 1
+	},
 	tiles_bottom = {"doors_wood_b.png^protector_logo.png", "doors_brown.png"},
 	tiles_top = {"doors_wood_a.png", "doors_brown.png"},
 	sounds = default.node_sound_wood_defaults(),
 	sunlight = false,
 })
 
-minetest.override_item(name.."_b_1", {
+minetest.override_item(name .. "_b_1", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
+			on_rightclick(pos, 1,
+			name .. "_t_1", name .. "_b_2", name .. "_t_2", {1, 2, 3, 0})
 		end
 	end,
 })
@@ -425,7 +445,8 @@ minetest.override_item(name.."_b_1", {
 minetest.override_item(name.."_t_1", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0})
+			on_rightclick(pos, -1,
+			name .. "_b_1", name .. "_t_2", name .. "_b_2", {1, 2, 3, 0})
 		end
 	end,
 })
@@ -433,7 +454,8 @@ minetest.override_item(name.."_t_1", {
 minetest.override_item(name.."_b_2", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
+			on_rightclick(pos, 1,
+			name .. "_t_2", name .. "_b_1", name .. "_t_1", {3, 0, 1, 2})
 		end
 	end,
 })
@@ -441,7 +463,8 @@ minetest.override_item(name.."_b_2", {
 minetest.override_item(name.."_t_2", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2})
+			on_rightclick(pos, -1,
+			name .. "_b_2", name .. "_t_1", name .. "_b_1", {3, 0, 1, 2})
 		end
 	end,
 })
@@ -469,7 +492,10 @@ local name = "protector:door_steel"
 doors.register_door(name, {
 	description = "Protected Steel Door",
 	inventory_image = "doors_steel.png^protector_logo.png",
-	groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
+	groups = {
+		snappy = 1, bendy = 2, cracky = 1,
+		level = 2, door = 1, unbreakable = 1
+	},
 	tiles_bottom = {"doors_steel_b.png^protector_logo.png", "doors_grey.png"},
 	tiles_top = {"doors_steel_a.png", "doors_grey.png"},
 	sounds = default.node_sound_wood_defaults(),
@@ -479,7 +505,8 @@ doors.register_door(name, {
 minetest.override_item(name.."_b_1", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
+			on_rightclick(pos, 1,
+			name .. "_t_1", name .. "_b_2", name .. "_t_2", {1, 2, 3, 0})
 		end
 	end,
 })
@@ -487,7 +514,8 @@ minetest.override_item(name.."_b_1", {
 minetest.override_item(name.."_t_1", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0})
+			on_rightclick(pos, -1,
+			name .. "_b_1", name .. "_t_2", name .. "_b_2", {1, 2, 3, 0})
 		end
 	end,
 })
@@ -495,7 +523,8 @@ minetest.override_item(name.."_t_1", {
 minetest.override_item(name.."_b_2", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
+			on_rightclick(pos, 1,
+			name .. "_t_2", name .. "_b_1", name .. "_t_1", {3, 0, 1, 2})
 		end
 	end,
 })
@@ -503,7 +532,8 @@ minetest.override_item(name.."_b_2", {
 minetest.override_item(name.."_t_2", {
 	on_rightclick = function(pos, node, clicker)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-			on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2})
+			on_rightclick(pos, -1,
+			name .. "_b_2", name .. "_t_1", name .. "_b_1", {3, 0, 1, 2})
 		end
 	end,
 })
@@ -528,20 +558,25 @@ minetest.register_craft({
 
 minetest.register_node("protector:chest", {
 	description = "Protected Chest",
-	tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
-		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png^protector_logo.png"},
+	tiles = {
+		"default_chest_top.png", "default_chest_top.png",
+		"default_chest_side.png", "default_chest_side.png",
+		"default_chest_side.png", "default_chest_front.png^protector_logo.png"
+	},
 	paramtype2 = "facedir",
-	groups = {choppy=2,oddly_breakable_by_hand=2,unbreakable=1},
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, unbreakable = 1},
 	legacy_facedir_simple = true,
 	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
+
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("infotext", "Protected Chest")
 		meta:set_string("name", "")
 		local inv = meta:get_inventory()
-		inv:set_size("main", 8*4)
+		inv:set_size("main", 8 * 4)
 	end,
+
 	can_dig = function(pos,player)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -551,69 +586,61 @@ minetest.register_node("protector:chest", {
 			end
 		end
 	end,
-	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		return count
-	end,
-    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		return stack:get_count()
-	end,
-    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		return stack:get_count()
-	end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff to protected chest at "..minetest.pos_to_string(pos))
+
+	on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+		" moves stuff to protected chest at " .. minetest.pos_to_string(pos))
 	end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" takes stuff from protected chest at "..minetest.pos_to_string(pos))
+
+	on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+		" takes stuff from protected chest at " .. minetest.pos_to_string(pos))
 	end,
+
 	on_rightclick = function(pos, node, clicker)
-		local meta = minetest.get_meta(pos)
 		if not minetest.is_protected(pos, clicker:get_player_name()) then
-
+		local meta = minetest.get_meta(pos)
 		local spos = pos.x .. "," .. pos.y .. "," ..pos.z
 		local formspec = "size[8,9]"..
-			default.gui_bg..default.gui_bg_img..default.gui_slots..
-			"list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
-			"button[0,4.5;2,0.25;toup;To Chest]"..
-			"field[2.3,4.8;4,0.25;chestname;;"..meta:get_string("name").."]"..
-			"button[6,4.5;2,0.25;todn;To Inventory]"..
-			"list[current_player;main;0,5;8,1;]"..
-			"list[current_player;main;0,6.08;8,3;8]"..
-			default.get_hotbar_bg(0,5)
+			default.gui_bg..default.gui_bg_img..default.gui_slots
+			.. "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"
+			.. "button[0,4.5;2,0.25;toup;To Chest]"
+			.. "field[2.3,4.8;4,0.25;chestname;;"
+			.. meta:get_string("name") .. "]"
+			.. "button[6,4.5;2,0.25;todn;To Inventory]"
+			.. "list[current_player;main;0,5;8,1;]"
+			.. "list[current_player;main;0,6.08;8,3;8]"
+			.. default.get_hotbar_bg(0,5)
 
 			minetest.show_formspec(
 				clicker:get_player_name(),
-				"protector:chest_"..minetest.pos_to_string(pos),
-				formspec
-			)
+				"protector:chest_" .. minetest.pos_to_string(pos),
+				formspec)
 		end
 	end,
 })
 
 -- Protected Chest formspec buttons
 
-minetest.register_on_player_receive_fields(function(player,formname,fields)
+minetest.register_on_player_receive_fields(function(player, formname, fields)
 
-	if string.sub(formname,0,string.len("protector:chest_")) == "protector:chest_" then
+	if string.sub(formname, 0, string.len("protector:chest_")) == "protector:chest_" then
 
-		local pos_s = string.sub(formname,string.len("protector:chest_")+1)
+		local pos_s = string.sub(formname,string.len("protector:chest_") + 1)
 		local pos = minetest.string_to_pos(pos_s)
 		local meta = minetest.get_meta(pos)
-
 		local chest_inv = meta:get_inventory()
 		local player_inv = player:get_inventory()
 
 		if fields.toup then
 
 			-- copy contents of players inventory to chest
-			for i,v in ipairs( player_inv:get_list( "main" ) or {}) do
-				if( chest_inv and chest_inv:room_for_item('main', v)) then
-					local leftover = chest_inv:add_item( 'main', v )
-					player_inv:remove_item( "main", v )
-					if( leftover and not( leftover:is_empty() )) then
-						player_inv:add_item( "main", v )
+			for i, v in ipairs (player_inv:get_list("main") or {}) do
+				if (chest_inv and chest_inv:room_for_item('main', v)) then
+					local leftover = chest_inv:add_item('main', v)
+					player_inv:remove_item("main", v)
+					if (leftover and not(leftover:is_empty())) then
+						player_inv:add_item("main", v)
 					end
 				end
 			end
@@ -621,12 +648,12 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
 		elseif fields.todn then
 
 			-- copy contents of chest to players inventory
-			for i,v in ipairs( chest_inv:get_list( 'main' ) or {}) do
-				if( player_inv:room_for_item( "main", v)) then
-					local leftover = player_inv:add_item( "main", v )
-					chest_inv:remove_item( 'main', v )
-					if( leftover and not( leftover:is_empty() )) then
-						chest_inv:add_item( 'main', v )
+			for i, v in ipairs (chest_inv:get_list('main') or {}) do
+				if (player_inv:room_for_item("main", v)) then
+					local leftover = player_inv:add_item("main", v)
+					chest_inv:remove_item('main', v)
+					if( leftover and not(leftover:is_empty())) then
+						chest_inv:add_item('main', v)
 					end
 				end
 			end
@@ -636,7 +663,8 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
 			-- change chest infotext to display name
 			if fields.chestname ~= "" then
 				meta:set_string("name", fields.chestname)
-				meta:set_string("infotext", "Protected Chest ("..fields.chestname..")")
+				meta:set_string("infotext",
+				"Protected Chest (" .. fields.chestname .. ")")
 			else
 				meta:set_string("infotext", "Protected Chest")
 			end
@@ -662,4 +690,4 @@ minetest.register_craft({
 	recipe = {
 		{'default:chest', 'default:copper_ingot', ''},
 	}
-})
+})
\ No newline at end of file