Redid protected doors with built-in door functions taken from old WTFPL doors mod

README.md

@@ -34,6 +34,8 @@ Released under WTFPL
 1.6 - Added protector_drop (true or false) and protector_hurt (hurt by this num)
       variables to minetest.conf settings to stop players breaking protected
       areas by dropping tools and hurting player.
+1.7 - Included an edited version of WTFPL doors mod since protected doors didn't
+      work with the doors mod in the latest daily build... Now it's fine :)
 
 Usage: (requires server privelage)
 

doors_chest.lua

@@ -1,48 +1,326 @@
 
--- Register Protected Doors
+-- Since the doors mod has changed in the latest daily builds I have taken the
+-- WTFPL licenced code from the old doors mod and included an edited version
+-- of it within this mod.
 
-local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
+-- Registers a door
+function register_door(name, def)
+	def.groups.not_in_creative_inventory = 1
 
-	pos.y = pos.y + dir
+	local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5+1.5/16}}
 
-	if not minetest.get_node(pos).name == check_name then
-		return
+	if not def.node_box_bottom then
+		def.node_box_bottom = box
+	end
+	if not def.node_box_top then
+		def.node_box_top = box
+	end
+	if not def.selection_box_bottom then
+		def.selection_box_bottom= box
+	end
+	if not def.selection_box_top then
+		def.selection_box_top = box
 	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"
+	if not def.sound_close_door then
+		def.sound_close_door = "doors_door_close"
+	end
+	if not def.sound_open_door then
+		def.sound_open_door = "doors_door_open"
 	end
 
-	if minetest.get_meta(pos):get_int("right") ~= 0 then
+	minetest.register_craftitem(name, {
+		description = def.description,
+		inventory_image = def.inventory_image,
 
-		minetest.sound_play(snd_1, {
-			pos = pos, gain = 0.3, max_hear_distance = 10})
-	else
+		on_place = function(itemstack, placer, pointed_thing)
+			if not pointed_thing.type == "node" then
+				return itemstack
+			end
 
-		minetest.sound_play(snd_2, {
-			pos = pos, gain = 0.3, max_hear_distance = 10})
+			local ptu = pointed_thing.under
+			local nu = minetest.get_node(ptu)
+			if minetest.registered_nodes[nu.name]
+			and minetest.registered_nodes[nu.name].on_rightclick then
+				return minetest.registered_nodes[nu.name].on_rightclick(ptu, nu, placer, itemstack)
+			end
+
+			local pt = pointed_thing.above
+			local pt2 = {x=pt.x, y=pt.y, z=pt.z}
+			pt2.y = pt2.y+1
+			if
+				not minetest.registered_nodes[minetest.get_node(pt).name].buildable_to or
+				not minetest.registered_nodes[minetest.get_node(pt2).name].buildable_to or
+				not placer or
+				not placer:is_player()
+			then
+				return itemstack
+			end
+
+			if minetest.is_protected(pt, placer:get_player_name()) or
+					minetest.is_protected(pt2, placer:get_player_name()) then
+				minetest.record_protection_violation(pt, placer:get_player_name())
+				return itemstack
+			end
+
+			local p2 = minetest.dir_to_facedir(placer:get_look_dir())
+			local pt3 = {x=pt.x, y=pt.y, z=pt.z}
+			if p2 == 0 then
+				pt3.x = pt3.x-1
+			elseif p2 == 1 then
+				pt3.z = pt3.z+1
+			elseif p2 == 2 then
+				pt3.x = pt3.x+1
+			elseif p2 == 3 then
+				pt3.z = pt3.z-1
+			end
+			if minetest.get_item_group(minetest.get_node(pt3).name, "door") == 0 then
+				minetest.set_node(pt, {name=name.."_b_1", param2=p2})
+				minetest.set_node(pt2, {name=name.."_t_1", param2=p2})
+			else
+				minetest.set_node(pt, {name=name.."_b_2", param2=p2})
+				minetest.set_node(pt2, {name=name.."_t_2", param2=p2})
+				minetest.get_meta(pt):set_int("right", 1)
+				minetest.get_meta(pt2):set_int("right", 1)
+			end
+
+			if not minetest.setting_getbool("creative_mode") then
+				itemstack:take_item()
+			end
+			return itemstack
+		end,
+	})
+
+	local tt = def.tiles_top
+	local tb = def.tiles_bottom
+
+	local function after_dig_node(pos, name, digger)
+		local node = minetest.get_node(pos)
+		if node.name == name then
+			minetest.node_dig(pos, node, digger)
+		end
 	end
+
+	local function check_and_blast(pos, name)
+		local node = minetest.get_node(pos)
+		if node.name == name then
+			minetest.remove_node(pos)
+		end
+	end
+
+	local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
+		pos.y = pos.y+dir
+		if 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 = def.sound_close_door
+		local snd_2 = def.sound_open_door
+		if params[1] == 3 then
+			snd_1 = def.sound_open_door
+			snd_2 = def.sound_close_door
+		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
+
+	local function on_rotate(pos, node, dir, user, check_name, mode, new_param2)
+		if not check_player_priv(pos, user) then
+			return false
+		end
+		if mode ~= screwdriver.ROTATE_FACE then
+			return false
+		end
+
+		pos.y = pos.y + dir
+		if not minetest.get_node(pos).name == check_name then
+			return false
+		end
+		if minetest.is_protected(pos, user:get_player_name()) then
+			minetest.record_protection_violation(pos, user:get_player_name())
+			return false
+		end
+
+		local node2 = minetest.get_node(pos)
+		node2.param2 = (node2.param2 + 1) % 4
+		minetest.swap_node(pos, node2)
+
+		pos.y = pos.y - dir
+		node.param2 = (node.param2 + 1) % 4
+		minetest.swap_node(pos, node)
+		return true
+	end
+
+	minetest.register_node(name.."_b_1", {
+		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		drop = name,
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = def.node_box_bottom
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selection_box_bottom
+		},
+		groups = def.groups,
+
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			pos.y = pos.y+1
+			after_dig_node(pos, name.."_t_1", digger)
+		end,
+
+		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,
+
+		on_rotate = function(pos, node, user, mode, new_param2)
+			return on_rotate(pos, node, 1, user, name.."_t_1", mode)
+		end,
+
+		can_dig = check_player_priv,
+		sounds = def.sounds,
+		sunlight_propagates = def.sunlight,
+		on_blast = function() end,
+	})
+
+	minetest.register_node(name.."_t_1", {
+		tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1].."^[transformfx"},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		drop = "",
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = def.node_box_top
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selection_box_top
+		},
+		groups = def.groups,
+
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			pos.y = pos.y-1
+			after_dig_node(pos, name.."_b_1", digger)
+		end,
+
+		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,
+
+		on_rotate = function(pos, node, user, mode, new_param2)
+			return on_rotate(pos, node, -1, user, name.."_b_1", mode)
+		end,
+
+		can_dig = check_player_priv,
+		sounds = def.sounds,
+		sunlight_propagates = def.sunlight,
+		on_blast = function() end,
+	})
+
+	minetest.register_node(name.."_b_2", {
+		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		drop = name,
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = def.node_box_bottom
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selection_box_bottom
+		},
+		groups = def.groups,
+
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			pos.y = pos.y+1
+			after_dig_node(pos, name.."_t_2", digger)
+		end,
+
+		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,
+
+		on_rotate = function(pos, node, user, mode, new_param2)
+			return on_rotate(pos, node, 1, user, name.."_t_2", mode)
+		end,
+
+		can_dig = check_player_priv,
+		sounds = def.sounds,
+		sunlight_propagates = def.sunlight,
+		on_blast = function() end,
+	})
+
+	minetest.register_node(name.."_t_2", {
+		tiles = {tt[2], tt[2], tt[2], tt[2], tt[1].."^[transformfx", tt[1]},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		drop = "",
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = def.node_box_top
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selection_box_top
+		},
+		groups = def.groups,
+
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			pos.y = pos.y-1
+			after_dig_node(pos, name.."_b_2", digger)
+		end,
+
+		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,
+
+		on_rotate = function(pos, node, user, mode, new_param2)
+			return on_rotate(pos, node, -1, user, name.."_b_2", mode)
+		end,
+
+		can_dig = check_player_priv,
+		sounds = def.sounds,
+		sunlight_propagates = def.sunlight,
+		on_blast = function() end,
+	})
+
 end
 
 -- Protected Wooden Door
 
 local name = "protector:door_wood"
 
-doors.register_door(name, {
+register_door(name, {
 	description = "Protected Wooden Door",
 	inventory_image = "doors_wood.png^protector_logo.png",
 	groups = {
@@ -55,50 +333,6 @@ doors.register_door(name, {
 	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 = {
@@ -119,7 +353,7 @@ minetest.register_craft({
 
 local name = "protector:door_steel"
 
-doors.register_door(name, {
+register_door(name, {
 	description = "Protected Steel Door",
 	inventory_image = "doors_steel.png^protector_logo.png",
 	groups = {
@@ -132,50 +366,6 @@ doors.register_door(name, {
 	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 = {
@@ -192,6 +382,132 @@ minetest.register_craft({
 	}
 })
 
+----trapdoor----
+
+function register_trapdoor(name, def)
+	local name_closed = name
+	local name_opened = name.."_open"
+
+	def.on_rightclick = function (pos, node, clicker, itemstack, pointed_thing)
+		if minetest.is_protected(pos, clicker:get_player_name()) then
+			return
+		end
+		local newname = node.name == name_closed and name_opened or name_closed
+		local sound = false
+		if node.name == name_closed then sound = def.sound_open end
+		if node.name == name_opened then sound = def.sound_close end
+		if sound then
+			minetest.sound_play(sound, {pos = pos, gain = 0.3, max_hear_distance = 10})
+		end
+		minetest.swap_node(pos, {name = newname, param1 = node.param1, param2 = node.param2})
+	end
+
+	-- Common trapdoor configuration
+	def.drawtype = "nodebox"
+	def.paramtype = "light"
+	def.paramtype2 = "facedir"
+	def.is_ground_content = false
+	def.can_dig = check_player_priv
+
+	local def_opened = table.copy(def)
+	local def_closed = table.copy(def)
+
+	def_closed.node_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
+	}
+	def_closed.selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
+	}
+	def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side,
+		def.tile_side, def.tile_side }
+
+	def_opened.node_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
+	}
+	def_opened.selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
+	}
+	def_opened.tiles = { def.tile_side, def.tile_side,
+			def.tile_side .. '^[transform3',
+			def.tile_side .. '^[transform1',
+			def.tile_front, def.tile_front }
+
+	def_opened.drop = name_closed
+	def_opened.groups.not_in_creative_inventory = 1
+
+	minetest.register_node(name_opened, def_opened)
+	minetest.register_node(name_closed, def_closed)
+end
+
+-- Protected Wooden Trapdoor
+
+register_trapdoor("protector:trapdoor", {
+	description = "Protected Trapdoor",
+	inventory_image = "doors_trapdoor.png^protector_logo.png",
+	wield_image = "doors_trapdoor.png^protector_logo.png",
+	tile_front = "doors_trapdoor.png^protector_logo.png",
+	tile_side = "doors_trapdoor_side.png",
+	groups = {
+		snappy = 1, choppy = 2, oddly_breakable_by_hand = 2,
+		door = 1, unbreakable = 1
+	},
+	sounds = default.node_sound_wood_defaults(),
+	sound_open = "doors_door_open",
+	sound_close = "doors_door_close"
+})
+
+minetest.register_craft({
+	output = 'protector:trapdoor 2',
+	recipe = {
+		{'group:wood', 'default:copper_ingot', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'', '', ''},
+	}
+})
+
+minetest.register_craft({
+	output = "protector:trapdoor",
+	recipe = {
+		{"doors:trapdoor", "default:copper_ingot"}
+	}
+})
+
+-- Protected Steel Trapdoor
+
+register_trapdoor("protector:trapdoor_steel", {
+	description = "Protected Steel Trapdoor",
+	inventory_image = "doors_trapdoor_steel.png^protector_logo.png",
+	wield_image = "doors_trapdoor_steel.png^protector_logo.png",
+	tile_front = "doors_trapdoor_steel.png^protector_logo.png",
+	tile_side = "doors_trapdoor_steel_side.png",
+	groups = {
+		snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2,
+		door = 1, unbreakable = 1
+	},
+	sounds = default.node_sound_wood_defaults(),
+	sound_open = "doors_door_open",
+	sound_close = "doors_door_close"
+})
+
+minetest.register_craft({
+	output = 'protector:trapdoor_steel',
+	recipe = {
+		{'default:copper_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = "protector:trapdoor_steel",
+	recipe = {
+		{"doors:trapdoor_steel", "default:copper_ingot"}
+	}
+})
+
 -- Protected Chest
 
 minetest.register_node("protector:chest", {
@@ -360,94 +676,3 @@ minetest.register_craft({
 		{'default:chest', 'default:copper_ingot', ''},
 	}
 })
-
--- Protected Trapdoor
-
-function register_trapdoor(name, def)
-	local name_closed = name
-	local name_opened = name.."_open"
-
-	def.on_rightclick = function (pos, node, clicker)
-
-		if minetest.is_protected(pos, clicker:get_player_name()) then
-			return
-		end
-
-		local newname = node.name == name_closed and name_opened or name_closed
-		local sound = false
-		if node.name == name_closed then sound = def.sound_open end
-		if node.name == name_opened then sound = def.sound_close end
-		if sound then
-			minetest.sound_play(sound, {pos = pos, gain = 0.3, max_hear_distance = 10})
-		end
-		minetest.swap_node(pos, {name = newname, param1 = node.param1, param2 = node.param2})
-	end
-
-	def.on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple
-
-	-- Common trapdoor configuration
-	def.drawtype = "nodebox"
-	def.paramtype = "light"
-	def.paramtype2 = "facedir"
-	def.is_ground_content = false
-
-	local def_opened = table.copy(def)
-	local def_closed = table.copy(def)
-
-	def_closed.node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
-	}
-	def_closed.selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
-	}
-	def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side,
-		def.tile_side, def.tile_side }
-
-	def_opened.node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5}
-	}
-	def_opened.selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5}
-	}
-	def_opened.tiles = { def.tile_side, def.tile_side, def.tile_side, def.tile_side,
-		def.tile_front, def.tile_front }
-	def_opened.drop = name_closed
-	def_opened.groups.not_in_creative_inventory = 1
-
-	minetest.register_node(name_opened, def_opened)
-	minetest.register_node(name_closed, def_closed)
-end
-
-
-
-register_trapdoor("protector:trapdoor", {
-	description = "Protected Trapdoor",
-	inventory_image = "doors_trapdoor.png^protector_logo.png",
-	wield_image = "doors_trapdoor.png^protector_logo.png",
-	tile_front = "doors_trapdoor.png^protector_logo.png",
-	tile_side = "doors_trapdoor_side.png",
-	groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2, door=1, unbreakable=1},
-	sounds = default.node_sound_wood_defaults(),
-	sound_open = "doors_door_open",
-	sound_close = "doors_door_close"
-})
-
-minetest.register_craft({
-	output = 'protector:trapdoor 2',
-	recipe = {
-		{'group:wood', 'default:copper_ingot', 'group:wood'},
-		{'group:wood', 'group:wood', 'group:wood'},
-		{'', '', ''},
-	}
-})
-
-minetest.register_craft({
-	output = "protector:trapdoor",
-	recipe = {
-		{"doors:trapdoor", "default:copper_ingot"}
-	}
-})