Changed recipe to give 1 protector, added + button to formspec, tweaked and tidied code

4 files changed, 515 insertions, 378 deletions

diff --git a/README.md b/README.md
index 035b359..b14b886 100644
--- a/README.md
+++ b/README.md
@@ -26,4 +26,6 @@ Released under WTFPL
 1.2 - Shift and click support added with Minetest 0.4.13 to quickly copy stacks
       to and from protected chest
 1.3 - Moved protector on_place into node itself, protector zone display changed
-      from 10 to 5 seconds, general code tidy
\ No newline at end of file
+      from 10 to 5 seconds, general code tidy
+1.4 - Changed protector recipes to give single item instead of 4, added + button
+      to interface, tweaked and tidied code
\ No newline at end of file
diff --git a/doors_chest.lua b/doors_chest.lua
new file mode 100644
index 0000000..85e1a88
--- /dev/null
+++ b/doors_chest.lua
@@ -0,0 +1,360 @@
+
+-- Register Protected Doors
+
+local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
+
+	pos.y = pos.y+dir
+
+	if not minetest.get_node(pos).name == check_name then
+		return
+	end
+
+	local p2 = minetest.get_node(pos).param2
+
+	p2 = params[p2 + 1]
+
+	minetest.swap_node(pos, {name = replace_dir, param2 = p2})
+
+	pos.y = pos.y - dir
+
+	minetest.swap_node(pos, {name = replace, param2 = p2})
+
+	local snd_1 = "doors_door_close"
+	local snd_2 = "doors_door_open" 
+
+	if params[1] == 3 then
+		snd_1 = "doors_door_open"
+		snd_2 = "doors_door_close"
+	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})
+	else
+
+		minetest.sound_play(snd_2, {
+			pos = pos, gain = 0.3, max_hear_distance = 10})
+	end
+end
+
+-- Protected Wooden Door
+
+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,
+		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", {
+
+	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})
+		end
+	end,
+})
+
+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})
+		end
+	end,
+})
+
+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})
+		end
+	end,
+})
+
+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})
+		end
+	end,
+})
+
+minetest.register_craft({
+	output = name,
+	recipe = {
+		{"group:wood", "group:wood"},
+		{"group:wood", "default:copper_ingot"},
+		{"group:wood", "group:wood"}
+	}
+})
+
+minetest.register_craft({
+	output = name,
+	recipe = {
+		{"doors:door_wood", "default:copper_ingot"}
+	}
+})
+
+-- Protected Steel Door
+
+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,
+		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(),
+	sunlight = false,
+})
+
+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})
+		end
+	end,
+})
+
+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})
+		end
+	end,
+})
+
+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})
+		end
+	end,
+})
+
+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})
+		end
+	end,
+})
+
+minetest.register_craft({
+	output = name,
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot"},
+		{"default:steel_ingot", "default:copper_ingot"},
+		{"default:steel_ingot", "default:steel_ingot"}
+	}
+})
+
+minetest.register_craft({
+	output = name,
+	recipe = {
+		{"doors:door_steel", "default:copper_ingot"}
+	}
+})
+
+-- Protected Chest
+
+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"
+	},
+	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)
+		local inv = meta:get_inventory()
+
+		meta:set_string("infotext", "Protected Chest")
+		meta:set_string("name", "")
+		inv:set_size("main", 8 * 4)
+	end,
+
+	can_dig = function(pos,player)
+
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+
+		if inv:is_empty("main") then
+
+			if not minetest.is_protected(pos, player:get_player_name()) then
+				return true
+			end
+		end
+	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)
+
+		if minetest.is_protected(pos, clicker:get_player_name()) then
+			return
+		end
+
+		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]"
+			.. "listring[nodemeta:" .. spos .. ";main]"
+			.. "listring[current_player;main]"
+			.. default.get_hotbar_bg(0,5)
+
+			minetest.show_formspec(
+				clicker:get_player_name(),
+				"protector:chest_" .. minetest.pos_to_string(pos),
+				formspec)
+	end,
+})
+
+-- Protected Chest formspec buttons
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+
+	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 = minetest.string_to_pos(pos_s)
+		local meta = minetest.get_meta(pos)
+		local chest_inv = meta:get_inventory()
+		local player_inv = player:get_inventory()
+		local leftover
+
+		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
+
+					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
+	
+		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
+
+					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
+
+		elseif fields.chestname then
+
+			-- change chest infotext to display name
+			if fields.chestname ~= "" then
+
+				meta:set_string("name", fields.chestname)
+				meta:set_string("infotext",
+				"Protected Chest (" .. fields.chestname .. ")")
+			else
+				meta:set_string("infotext", "Protected Chest")
+			end
+
+		end
+	end
+
+end)
+
+-- Protected Chest recipes
+
+minetest.register_craft({
+	output = 'protector:chest',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', 'default:copper_ingot', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
+	}
+})
+
+minetest.register_craft({
+	output = 'protector:chest',
+	recipe = {
+		{'default:chest', 'default:copper_ingot', ''},
+	}
+})
diff --git a/init.lua b/init.lua
index fa4b595..5426ab0 100644
--- a/init.lua
+++ b/init.lua
@@ -1,46 +1,56 @@
 minetest.register_privilege("delprotect","Ignore player protection")
 
--- get static spawn position
-local statspawn = (minetest.setting_get_pos("static_spawnpoint") or {x = 0, y = 2, z = 0})
-
 protector = {}
 protector.mod = "redo"
 protector.radius = (tonumber(minetest.setting_get("protector_radius")) or 5)
-protector.pvp = minetest.setting_getbool("protector_pvp")
-protector.spawn = (tonumber(minetest.setting_get("protector_pvp_spawn")) or 0)
 
 protector.get_member_list = function(meta)
+
 	return meta:get_string("members"):split(" ")
 end
 
 protector.set_member_list = function(meta, list)
+
 	meta:set_string("members", table.concat(list, " "))
 end
 
 protector.is_member = function (meta, name)
+
 	for _, n in ipairs(protector.get_member_list(meta)) do
+
 		if n == name then
 			return true
 		end
 	end
+
 	return false
 end
 
 protector.add_member = function(meta, name)
-	if protector.is_member(meta, name) then return end
+
+	if protector.is_member(meta, name) then
+		return
+	end
+
 	local list = protector.get_member_list(meta)
+
 	table.insert(list, name)
-	protector.set_member_list(meta,list)
+
+	protector.set_member_list(meta, list)
 end
 
 protector.del_member = function(meta, name)
+
 	local list = protector.get_member_list(meta)
+
 	for i, n in ipairs(list) do
+
 		if n == name then
 			table.remove(list, i)
 			break
 		end
 	end
+
 	protector.set_member_list(meta, list)
 end
 
@@ -53,34 +63,46 @@ protector.generate_formspec = function(meta)
 		.."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)]"
+		.. "button_exit[2.5,6.2;3,0.5;close_me;Close]"
 
 	local members = protector.get_member_list(meta)
-	local npp = 12
+	local npp = 12 -- max users added onto protector list
 	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 .. "]"
-				.. "button[" .. (i % 4 * 2 + 1.25) .. ","
-				.. math.floor(i / 4 + 3)
-				.. ";.75,.5;protector_del_member_" .. member .. ";X]"
-			end
-			i = i + 1
+
+		if i < npp then
+
+			-- show username
+			formspec = formspec .. "button[" .. (i % 4 * 2)
+			.. "," .. math.floor(i / 4 + 3)
+			.. ";1.5,.5;protector_member;" .. member .. "]"
+
+			-- username remove button
+			.. "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
+
+		-- user name entry field
 		formspec = formspec .. "field[" .. (i % 4 * 2 + 1 / 3) .. ","
-		.. (math.floor(i / 4 + 3) + 1 / 3) .. ";1.433,.5;protector_add_member;;]"
-	end
+		.. (math.floor(i / 4 + 3) + 1 / 3)
+		.. ";1.433,.5;protector_add_member;;]"
+
+		-- username add button
+		.."button[" .. (i % 4 * 2 + 1.25) .. ","
+		.. math.floor(i / 4 + 3) .. ";.75,.5;protector_submit;+]"
 
-	formspec = formspec .. "button_exit[2.5,6.2;3,0.5;close_me;Close]"
+	end
 
 	return formspec
 end
 
--- ACTUAL PROTECTION SECTION
-
 -- Infolevel:
 -- 0 for no info
 -- 1 for "This area is owned by <owner> !" if you can't dig
@@ -111,23 +133,33 @@ protector.can_dig = function(r, pos, digger, onlyowner, infolevel)
 		{"protector:protect", "protector:protect2"})
 
 	local meta, owner, members
+
 	for _, pos in ipairs(positions) do
+
 		meta = minetest.get_meta(pos)
 		owner = meta:get_string("owner")
 		members = meta:get_string("members")
 
 		if owner ~= digger then 
-			if onlyowner or not protector.is_member(meta, 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 .. " !")
+
 				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))
+
 					if members ~= "" then
+
 						minetest.chat_send_player(digger,
 						"Members: " .. members .. ".")
 					end
@@ -138,11 +170,15 @@ 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(pos))
+
 			if members ~= "" then
+
 				minetest.chat_send_player(digger,
 				"Members: " .. members .. ".")
 			end
@@ -153,10 +189,13 @@ protector.can_dig = function(r, pos, digger, onlyowner, infolevel)
 	end
 
 	if infolevel == 2 then
+
 		if #positions < 1 then
+
 			minetest.chat_send_player(digger,
 			"This area is not protected.")
 		end
+
 		minetest.chat_send_player(digger, "You can build here.")
 	end
 
@@ -194,8 +233,10 @@ function protector.check_overlap(itemstack, placer, pointed_thing)
 	placer:get_player_name(), true, 3)
 	or not protector.can_dig(protector.radius * 2, pointed_thing.above,
 	placer:get_player_name(), true, 3) then
+
 		minetest.chat_send_player(placer:get_player_name(),
 			"Overlaps into above players protected area")
+
 		return
 	end
 
@@ -229,19 +270,27 @@ minetest.register_node("protector:protect", {
 	on_place = protector.check_overlap,
 
 	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("members", "")
 	end,
 
 	on_use = function(itemstack, user, pointed_thing)
-		if pointed_thing.type ~= "node" then return end
+
+		if pointed_thing.type ~= "node" then
+			return
+		end
+
 		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
 			minetest.show_formspec(clicker:get_player_name(), 
 			"protector:node_" .. minetest.pos_to_string(pos), protector.generate_formspec(meta))
@@ -249,19 +298,22 @@ minetest.register_node("protector:protect", {
 	end,
 
 	on_punch = function(pos, node, puncher)
+
 		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)
 	end,
 })
 
 minetest.register_craft({
-	output = "protector:protect 4",
+	output = "protector:protect",
 	recipe = {
 		{"default:stone", "default:stone", "default:stone"},
 		{"default:stone", "default:steel_ingot", "default:stone"},
@@ -295,39 +347,51 @@ minetest.register_node("protector:protect2", {
 	on_place = protector.check_overlap,
 
 	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("members", "")
 	end,
 
 	on_use = function(itemstack, user, pointed_thing)
-		if pointed_thing.type ~= "node" then return end
+
+		if pointed_thing.type ~= "node" then
+			return
+		end
+
 		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
+
 			minetest.show_formspec(clicker:get_player_name(), 
 			"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
 			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)
 	end,
 })
 
 minetest.register_craft({
-	output = "protector:protect2 4",
+	output = "protector:protect2",
 	recipe = {
 		{"default:stone", "default:stone", "default:stone"},
 		{"default:stone", "default:copper_ingot", "default:stone"},
@@ -350,12 +414,14 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 
 		if fields.protector_add_member then
+
 			for _, i in ipairs(fields.protector_add_member:split(" ")) do
 				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))
 			end
@@ -379,13 +445,19 @@ minetest.register_entity("protector:display", {
 	visual_size = {x = 1.0 / 1.5, y = 1.0 / 1.5},
 	textures = {"protector:display_node"},
 	timer = 0,
+
 	on_activate = function(self, staticdata)
+
+		-- Xanadu server only
 		if mobs and mobs.entity and mobs.entity == false then
 			self.object:remove()
 		end
 	end,
+
 	on_step = function(self, dtime)
+
 		self.timer = self.timer + dtime
+
 		if self.timer > 5 then
 			self.object:remove()
 		end
@@ -425,355 +497,7 @@ minetest.register_node("protector:display_node", {
 	drop = "",
 })
 
--- Register Protected Doors
-
-local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
-	pos.y = pos.y+dir
-	if not minetest.get_node(pos).name == check_name then
-		return
-	end
-	local p2 = minetest.get_node(pos).param2
-	p2 = params[p2 + 1]
-
-	minetest.swap_node(pos, {name = replace_dir, param2 = p2})
-
-	pos.y = pos.y-dir
-	minetest.swap_node(pos, {name = replace, param2 = p2})
-
-	local snd_1 = "doors_door_close"
-	local snd_2 = "doors_door_open" 
-	if params[1] == 3 then
-		snd_1 = "doors_door_open"
-		snd_2 = "doors_door_close"
-	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})
-	else
-		minetest.sound_play(snd_2, {
-			pos = pos, gain = 0.3, max_hear_distance = 10})
-	end
-end
-
--- Protected Wooden Door
-
-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,
-		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", {
-	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})
-		end
-	end,
-})
-
-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})
-		end
-	end,
-})
-
-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})
-		end
-	end,
-})
-
-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})
-		end
-	end,
-})
-
-minetest.register_craft({
-	output = name,
-	recipe = {
-		{"group:wood", "group:wood"},
-		{"group:wood", "default:copper_ingot"},
-		{"group:wood", "group:wood"}
-	}
-})
-
-minetest.register_craft({
-	output = name,
-	recipe = {
-		{"doors:door_wood", "default:copper_ingot"}
-	}
-})
-
--- Protected Steel Door
-
-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,
-		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(),
-	sunlight = false,
-})
-
-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})
-		end
-	end,
-})
-
-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})
-		end
-	end,
-})
-
-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})
-		end
-	end,
-})
-
-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})
-		end
-	end,
-})
-
-minetest.register_craft({
-	output = name,
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "default:copper_ingot"},
-		{"default:steel_ingot", "default:steel_ingot"}
-	}
-})
-
-minetest.register_craft({
-	output = name,
-	recipe = {
-		{"doors:door_steel", "default:copper_ingot"}
-	}
-})
-
--- Protected Chest
-
-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"
-	},
-	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")
-		meta:set_string("name", "")
-		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()
-		if inv:is_empty("main") then
-			if not minetest.is_protected(pos, player:get_player_name()) then
-				return true
-			end
-		end
-	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)
-		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]"
-			.. "listring[nodemeta:" .. spos .. ";main]"
-			.. "listring[current_player;main]"
-			.. default.get_hotbar_bg(0,5)
-
-			minetest.show_formspec(
-				clicker:get_player_name(),
-				"protector:chest_" .. minetest.pos_to_string(pos),
-				formspec)
-		end
-	end,
-})
-
--- Protected Chest formspec buttons
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-
-	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 = 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)
-					end
-				end
-			end
-	
-		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)
-					end
-				end
-			end
-
-		elseif fields.chestname then
-
-			-- change chest infotext to display name
-			if fields.chestname ~= "" then
-				meta:set_string("name", fields.chestname)
-				meta:set_string("infotext",
-				"Protected Chest (" .. fields.chestname .. ")")
-			else
-				meta:set_string("infotext", "Protected Chest")
-			end
-
-		end
-	end
-
-end)
-
--- Protected Chest recipe
-
-minetest.register_craft({
-	output = 'protector:chest',
-	recipe = {
-		{'group:wood', 'group:wood', 'group:wood'},
-		{'group:wood', 'default:copper_ingot', 'group:wood'},
-		{'group:wood', 'group:wood', 'group:wood'},
-	}
-})
-
-minetest.register_craft({
-	output = 'protector:chest',
-	recipe = {
-		{'default:chest', 'default:copper_ingot', ''},
-	}
-})
-
--- Disable PVP in your own protected areas
-if minetest.setting_getbool("enable_pvp") and protector.pvp then
-
-	if minetest.register_on_punchplayer then
-
-		minetest.register_on_punchplayer(
-		function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
-
-			if not player or not hitter then
-				print("[Protector] on_punchplayer called with nil objects")
-			end
-
-			if not hitter:is_player() then
-				return false
-			end
-
-			-- no pvp at spawn area
-			local pos = player:getpos()
-			if pos.x < statspawn.x + protector.spawn
-			and pos.x > statspawn.x - protector.spawn
-			and pos.y < statspawn.y + protector.spawn
-			and pos.y > statspawn.y - protector.spawn
-			and pos.z < statspawn.z + protector.spawn
-			and pos.z > statspawn.z - protector.spawn then
-				return true
-			end
-
-			if minetest.is_protected(pos, hitter:get_player_name()) then
-				return true
-			else
-				return false
-			end
-
-		end)
-	else
-		print("[Protector] pvp_protect not active, update your version of Minetest")
-
-	end
-else
-	print("[Protector] pvp_protect is disabled")
-end
+dofile(minetest.get_modpath("protector") .. "/doors_chest.lua")
+dofile(minetest.get_modpath("protector") .. "/pvp.lua")
 
 print ("[MOD] Protector Redo loaded")
\ No newline at end of file
diff --git a/pvp.lua b/pvp.lua
new file mode 100644
index 0000000..0122576
--- /dev/null
+++ b/pvp.lua
@@ -0,0 +1,51 @@
+
+-- get static spawn position
+local statspawn = (minetest.setting_get_pos("static_spawnpoint") or {x = 0, y = 2, z = 0})
+
+-- is pvp protection enabled and spawn protected
+protector.pvp = minetest.setting_getbool("protector_pvp")
+protector.spawn = (tonumber(minetest.setting_get("protector_pvp_spawn")) or 0)
+
+-- Disable PVP in your own protected areas
+if minetest.setting_getbool("enable_pvp") and protector.pvp then
+
+	if minetest.register_on_punchplayer then
+
+		minetest.register_on_punchplayer(
+		function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
+
+			if not player
+			or not hitter then
+				print("[Protector] on_punchplayer called with nil objects")
+			end
+
+			if not hitter:is_player() then
+				return false
+			end
+
+			-- no pvp at spawn area
+			local pos = player:getpos()
+
+			if pos.x < statspawn.x + protector.spawn
+			and pos.x > statspawn.x - protector.spawn
+			and pos.y < statspawn.y + protector.spawn
+			and pos.y > statspawn.y - protector.spawn
+			and pos.z < statspawn.z + protector.spawn
+			and pos.z > statspawn.z - protector.spawn then
+				return true
+			end
+
+			if minetest.is_protected(pos, hitter:get_player_name()) then
+				return true
+			else
+				return false
+			end
+
+		end)
+	else
+		print("[Protector] pvp_protect not active, update your version of Minetest")
+
+	end
+else
+	print("[Protector] pvp_protect is disabled")
+end