From 704a410fa1391318766927c8baa8a93b0731e7d0 Mon Sep 17 00:00:00 2001
From: RealBadAngel <mk@realbadangel.pl>
Date: Sun, 27 Jan 2013 13:34:10 +0100
Subject: [PATCH] Cleaned all chests code

---
 technic/technic/gold_chest.lua |  327 +++++++++++-------------------------------------------
 1 files changed, 69 insertions(+), 258 deletions(-)

diff --git a/technic/technic/gold_chest.lua b/technic/technic/gold_chest.lua
index b93b66f..820ba86 100644
--- a/technic/technic/gold_chest.lua
+++ b/technic/technic/gold_chest.lua
@@ -51,75 +51,47 @@
 	stack_max = 99,
 })
 
+gold_chest_formspec	=	"invsize[12,9;]"..
+						"list[current_name;main;0,0;12,4;]"..
+						"list[current_player;main;0,5;8,4;]"
+
+gold_chest_inv_size = 12*4
+
 minetest.register_node("technic:gold_chest", {
 	description = "Gold Chest",
 	tiles = {"technic_gold_chest_top.png", "technic_gold_chest_top.png", "technic_gold_chest_side.png",
 		"technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_front.png"},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1},
-	tube={insert_object=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:add_item("main",stack)
-		end,
-		can_insert=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:room_for_item("main",stack)
-		end,
-		input_inventory="main"},
+	groups = chest_groups1,
+	tube = tubes_properties,
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
+
 	on_construct = function(pos)
 		local meta = minetest.env:get_meta(pos)
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 		meta:set_string("infotext", "Gold Chest")
 		local inv = meta:get_inventory()
-		inv:set_size("main", 12*4)
+		inv:set_size("main", gold_chest_inv_size)
 	end,
-	
-	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
-		local inv = meta:get_inventory()
-		return inv:is_empty("main")
-	end,
-	
+
+	can_dig = chest_can_dig,
+
 	on_punch = function (pos, node, puncher)
 	chest_punched (pos,node,puncher);
 	end,
-	
+
 	on_receive_fields = function(pos, formname, fields, sender)
-        local meta = minetest.env:get_meta(pos);
-      		fields.text = fields.text or ""
-		meta:set_string("text", fields.text)
-		meta:set_string("infotext", '"'..fields.text..'"')
-
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+	local meta = minetest.env:get_meta(pos);
+	fields.text = fields.text or ""
+	meta:set_string("text", fields.text)
+	meta:set_string("infotext", '"'..fields.text..'"')
+	meta:set_string("formspec",gold_chest_formspec)
 	end,
 
-    on_metadata_inventory_move = function(pos, from_list, from_index,
-			to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff in chest at "..minetest.pos_to_string(pos))
-		return minetest.node_metadata_inventory_move_allow_all(
-				pos, from_list, from_index, to_list, to_index, count, player)
-	end,
-    on_metadata_inventory_offer = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff to chest at "..minetest.pos_to_string(pos))
-		return minetest.node_metadata_inventory_offer_allow_all(
-				pos, listname, index, stack, player)
-	end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" takes stuff from chest at "..minetest.pos_to_string(pos))
-	end,
+	on_metadata_inventory_move = def_on_metadata_inventory_move,
+	on_metadata_inventory_put = def_on_metadata_inventory_put,
+	on_metadata_inventory_take = def_on_metadata_inventory_take 
 })
 
 for i, state in ipairs(chest_mark_colors) do
@@ -128,38 +100,21 @@
 	tiles = {"technic_gold_chest_top.png", "technic_gold_chest_top.png", "technic_gold_chest_side.png",
 		"technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_front"..state..".png"},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1,not_in_creative_inventory=1},
-	tube={insert_object=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:add_item("main",stack)
-		end,
-		can_insert=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:room_for_item("main",stack)
-		end,
-		input_inventory="main"},
+	groups = chest_groups2,
+	tube = tubes_properties,
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	drop = "technic:gold_chest",
 	on_construct = function(pos)
 		local meta = minetest.env:get_meta(pos)
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 		meta:set_string("infotext", "Gold Chest")
 		local inv = meta:get_inventory()
-		inv:set_size("main", 12*4)
+		inv:set_size("main", gold_chest_inv_size)
 	end,
-	
-	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
-		local inv = meta:get_inventory()
-		return inv:is_empty("main")
-	end,
-	
+
+	can_dig =chest_can_dig,
+
 	on_punch = function (pos, node, puncher)
 	chest_punched (pos,node,puncher);
 	end,
@@ -169,39 +124,13 @@
       		fields.text = fields.text or ""
 		meta:set_string("text", fields.text)
 		meta:set_string("infotext", '"'..fields.text..'"')
-
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 	end,
 
-    on_metadata_inventory_move = function(pos, from_list, from_index,
-			to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff in chest at "..minetest.pos_to_string(pos))
-		return minetest.node_metadata_inventory_move_allow_all(
-				pos, from_list, from_index, to_list, to_index, count, player)
-	end,
-    on_metadata_inventory_offer = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff to chest at "..minetest.pos_to_string(pos))
-		return minetest.node_metadata_inventory_offer_allow_all(
-				pos, listname, index, stack, player)
-	end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" takes stuff from chest at "..minetest.pos_to_string(pos))
-	end,
+	on_metadata_inventory_move = def_on_metadata_inventory_move,
+	on_metadata_inventory_put = def_on_metadata_inventory_put,
+	on_metadata_inventory_take = def_on_metadata_inventory_take 
 })
-end
-
-
-local function has_locked_chest_privilege(meta, player)
-	if player:get_player_name() ~= meta:get_string("owner") then
-		return false
-	end
-	return true
 end
 
 minetest.register_node("technic:gold_locked_chest", {
@@ -210,18 +139,8 @@
 		"technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_locked.png"},
 	paramtype2 = "facedir",
 	drop = "technic:gold_locked_chest",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1},
-	tube={insert_object=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:add_item("main",stack)
-		end,
-		can_insert=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:room_for_item("main",stack)
-		end,
-		input_inventory="main"},
+	groups = chest_groups1,
+	tube = tubes_properties,
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer)
@@ -232,85 +151,36 @@
 	end,
 	on_construct = function(pos)
 		local meta = minetest.env:get_meta(pos)
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 		meta:set_string("infotext", "Gold Locked Chest")
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
-		inv:set_size("main", 12*4)
+		inv:set_size("main", gold_chest_inv_size)
 	end,
-	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
-		local inv = meta:get_inventory()
-		return inv:is_empty("main")
-	end,
+
+	can_dig =chest_can_dig,
 
 	on_punch = function (pos, node, puncher)
-	        local meta = minetest.env:get_meta(pos);
+		local meta = minetest.env:get_meta(pos);
 		if (has_locked_chest_privilege(meta, puncher)) then
-		locked_chest_punched (pos,node,puncher);
+			locked_chest_punched (pos,node,puncher);
 		end
-       end,
+	end,
 	
 	on_receive_fields = function(pos, formname, fields, sender)
-        local meta = minetest.env:get_meta(pos);
-      		fields.text = fields.text or ""
+		local meta = minetest.env:get_meta(pos);
+		fields.text = fields.text or ""
 		meta:set_string("text", fields.text)
 		meta:set_string("infotext", '"'..fields.text..'"')
-
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 	end,
 
-	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		local meta = minetest.env:get_meta(pos)
-		if not has_locked_chest_privilege(meta, player) then
-			minetest.log("action", player:get_player_name()..
-					" tried to access a locked chest belonging to "..
-					meta:get_string("owner").." at "..
-					minetest.pos_to_string(pos))
-			return 0
-		end
-		return count
-	end,
-    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
-		if not has_locked_chest_privilege(meta, player) then
-			minetest.log("action", player:get_player_name()..
-					" tried to access a locked chest belonging to "..
-					meta:get_string("owner").." at "..
-					minetest.pos_to_string(pos))
-			return 0
-		end
-		return stack:get_count()
-	end,
-    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
-		if not has_locked_chest_privilege(meta, player) then
-			minetest.log("action", player:get_player_name()..
-					" tried to access a locked chest belonging to "..
-					meta:get_string("owner").." at "..
-					minetest.pos_to_string(pos))
-			return 0
-		end
-		return stack:get_count()
-	end,
-	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff in locked chest at "..minetest.pos_to_string(pos))
-	end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff to locked 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 locked chest at "..minetest.pos_to_string(pos))
-	end,
+	allow_metadata_inventory_move = def_allow_metadata_inventory_move,
+	allow_metadata_inventory_put = def_allow_metadata_inventory_put,
+	allow_metadata_inventory_take = def_allow_metadata_inventory_take,
+	on_metadata_inventory_move = def_on_metadata_inventory_move,
+	on_metadata_inventory_put = def_on_metadata_inventory_put,
+	on_metadata_inventory_take = def_on_metadata_inventory_take 
 })
 
 for i, state in ipairs(chest_mark_colors) do
@@ -320,18 +190,8 @@
 		"technic_gold_chest_side.png", "technic_gold_chest_side.png", "technic_gold_chest_locked"..state..".png"},
 	paramtype2 = "facedir",
 	drop = "technic:gold_locked_chest",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1,not_in_creative_inventory=1},
-	tube={insert_object=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:add_item("main",stack)
-		end,
-		can_insert=function(pos,node,stack,direction)
-			local meta=minetest.env:get_meta(pos)
-			local inv=meta:get_inventory()
-			return inv:room_for_item("main",stack)
-		end,
-		input_inventory="main"},
+	groups = chest_groups2,
+	tube = tubes_properties,
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer)
@@ -342,85 +202,36 @@
 	end,
 	on_construct = function(pos)
 		local meta = minetest.env:get_meta(pos)
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 		meta:set_string("infotext", "Gold Locked Chest")
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
-		inv:set_size("main", 12*4)
+		inv:set_size("main", gold_chest_inv_size)
 	end,
-	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
-		local inv = meta:get_inventory()
-		return inv:is_empty("main")
-	end,
+
+	can_dig = chest_can_dig,
 
 	on_punch = function (pos, node, puncher)
 	        local meta = minetest.env:get_meta(pos);
 		if (has_locked_chest_privilege(meta, puncher)) then
 		locked_chest_punched (pos,node,puncher);
 		end
-       end,
-	
+	end,
+
 	on_receive_fields = function(pos, formname, fields, sender)
-        local meta = minetest.env:get_meta(pos);
-      		fields.text = fields.text or ""
+		local meta = minetest.env:get_meta(pos);
+		fields.text = fields.text or ""
 		meta:set_string("text", fields.text)
 		meta:set_string("infotext", '"'..fields.text..'"')
-
-		meta:set_string("formspec",
-				"invsize[12,9;]"..
-				"list[current_name;main;0,0;12,4;]"..
-				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec",gold_chest_formspec)
 	end,
 
-	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		local meta = minetest.env:get_meta(pos)
-		if not has_locked_chest_privilege(meta, player) then
-			minetest.log("action", player:get_player_name()..
-					" tried to access a locked chest belonging to "..
-					meta:get_string("owner").." at "..
-					minetest.pos_to_string(pos))
-			return 0
-		end
-		return count
-	end,
-    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
-		if not has_locked_chest_privilege(meta, player) then
-			minetest.log("action", player:get_player_name()..
-					" tried to access a locked chest belonging to "..
-					meta:get_string("owner").." at "..
-					minetest.pos_to_string(pos))
-			return 0
-		end
-		return stack:get_count()
-	end,
-    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
-		if not has_locked_chest_privilege(meta, player) then
-			minetest.log("action", player:get_player_name()..
-					" tried to access a locked chest belonging to "..
-					meta:get_string("owner").." at "..
-					minetest.pos_to_string(pos))
-			return 0
-		end
-		return stack:get_count()
-	end,
-	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff in locked chest at "..minetest.pos_to_string(pos))
-	end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				" moves stuff to locked 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 locked chest at "..minetest.pos_to_string(pos))
-	end,
+	allow_metadata_inventory_move = def_allow_metadata_inventory_move,
+	allow_metadata_inventory_put = def_allow_metadata_inventory_put,
+	allow_metadata_inventory_take = def_allow_metadata_inventory_take,
+	on_metadata_inventory_move = def_on_metadata_inventory_move,
+	on_metadata_inventory_put = def_on_metadata_inventory_put,
+	on_metadata_inventory_take = def_on_metadata_inventory_take 
 })
 end
 

--
Gitblit v1.8.0