Tweaked & Tidied code

init.lua

@@ -42,7 +42,8 @@ end
 
 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,20 +51,21 @@ 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)..","
+				formspec = formspec .. "button[" .. (i % 4 * 2)
-				..math.floor(i/4+3)..";1.5,.5;protector_member;"..member.."]"
+				.. "," .. math.floor(i / 4 + 3)
-				formspec = formspec .. "button["..(i%4*2+1.25)..","
+				.. ";1.5,.5;protector_member;" .. member .. "]"
-				..math.floor(i/4+3)..";.75,.5;protector_del_member_"..member..";X]"
+				.. "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
+		formspec = formspec .. "field[" .. (i % 4 * 2 + 1 / 3) .. ","
-		.."field["..(i%4*2+1/3)..","..(math.floor(i/4+3)+1/3)..";1.433,.5;protector_add_member;;]"
+		.. (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]"
@@ -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
 
@@ -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,
-					minetest.chat_send_player(digger,"Protection located at: "..minetest.pos_to_string(pos))
+					"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,
-			minetest.chat_send_player(digger,"Protection located at: "..minetest.pos_to_string(positions[1]))
+			"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,7 +143,8 @@ 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.")
 	end
@@ -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
+function minetest.is_protected(pos, digger)
-		return protector.old_is_protected(pos, digger)
+
-	else
+	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,15 +190,13 @@ 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"},
+	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 },
-	},
-	selection_box = { type="regular" },
 	paramtype = "light",
 	light_source = 2,
 
@@ -330,7 +342,8 @@ minetest.register_entity("protector:display", {
 	physical = false,
 	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"},
@@ -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,7 +423,10 @@ 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(),
@@ -417,7 +436,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,
 })
@@ -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,13 +558,17 @@ minetest.register_craft({
 
 minetest.register_node("protector:chest", {
 	description = "Protected Chest",
-	tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
+	tiles = {
-		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png^protector_logo.png"},
+		"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},
 	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")
@@ -542,6 +576,7 @@ minetest.register_node("protector:chest", {
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8 * 4)
 	end,
+
 	can_dig = function(pos,player)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -551,43 +586,36 @@ 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))
 	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))
 	end,
-	on_rightclick = function(pos, node, clicker)
-		local meta = minetest.get_meta(pos)
-		if not minetest.is_protected(pos, clicker:get_player_name()) then
 
+	on_rightclick = function(pos, node, clicker)
+		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..
+			default.gui_bg..default.gui_bg_img..default.gui_slots
-			"list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
+			.. "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"
-			"button[0,4.5;2,0.25;toup;To Chest]"..
+			.. "button[0,4.5;2,0.25;toup;To Chest]"
-			"field[2.3,4.8;4,0.25;chestname;;"..meta:get_string("name").."]"..
+			.. "field[2.3,4.8;4,0.25;chestname;;"
-			"button[6,4.5;2,0.25;todn;To Inventory]"..
+			.. meta:get_string("name") .. "]"
-			"list[current_player;main;0,5;8,1;]"..
+			.. "button[6,4.5;2,0.25;todn;To Inventory]"
-			"list[current_player;main;0,6.08;8,3;8]"..
+			.. "list[current_player;main;0,5;8,1;]"
-			default.get_hotbar_bg(0,5)
+			.. "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
+				formspec)
-			)
 		end
 	end,
 })
@@ -601,7 +629,6 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
 		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()
 
@@ -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