make the wifi chest pipeworkable (#16)

* Make the wifi chest pipeworkable

* fix mod crashing without pipeworks

.gitignore

@@ -0,0 +1,4 @@
+## Generic ignorable patterns and files
+*~
+.*.swp
+debug.txt

README.md

@@ -5,6 +5,8 @@ More Chests
 
 This mod is a fork of 0gb.us's chests_0gb_us https://forum.minetest.net/viewtopic.php?f=11&t=4366
 
+Megaf's more_chests fixes several bugs, uses new textures and adds compatibility with [VanessaE's Pipeworks] (https://github.com/VanessaE/pipeworks) mod.
+
 The following text was writen by 0gb.us
 ```
 Cobble Chest:
@@ -42,5 +44,4 @@ Wifi Chest
 {'default:wood','default:wood','default:wood'}
 
 A wacky chest that doesn't store it's items in the usual way, but instead, stores them remotely. For that reason, all wifi chests appear to have the same inventory. Due to not actually having an inventory, wifi chests can also be mined, even when they appear to have stuff in them. Lastly, as everyone gets their own wifi account, the items you see in the wifi chest are not the same items anyone else sees. This chest's properties make it nice for keeping secrets, as well as essentially almost doubling your inventory space, if you choose to carry one with you.
-
-'''
+```

cobble.lua

@@ -1,3 +1,6 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 local function has_locked_chest_privilege(meta, player)
 	if player:get_player_name() ~= meta:get_string("owner") then
 		return false
@@ -6,28 +9,46 @@ local function has_locked_chest_privilege(meta, player)
 end
 
 minetest.register_node("more_chests:cobble", {
-	description = "Cobble Chest",
+	description = S("Cobble Chest"),
 	tiles = {"default_cobble.png", "default_cobble.png", "default_cobble.png",
 		"default_cobble.png", "default_cobble.png", "cobblechest_front.png"},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice = 1, tubedevice_receiver = 1},
+-- First attempt to add a way to connect to pipeworks.	
+	tube = {
+	insert_object = function(pos, node, stack, direction)
+		local meta = minetest.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.get_meta(pos)
+		local inv = meta:get_inventory()
+		return inv:room_for_item("main", stack)
+	end,
+	input_inventory = "main",
+	connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
+		},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	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", "Locked Chest (owned by "..
-				meta:get_string("owner")..")")]]
+
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec",
 				"size[8,9]"..
-				"list[current_name;main;0,0;8,4;]"..
-				"list[current_player;main;0,5;8,4;]"..
+				default.gui_bg ..
+				default.gui_bg_img ..
+				default.gui_slots ..
+				"list[current_name;main;0,0.3;8,4;]"..
+				"list[current_player;main;0,4.85;8,1;]" ..
+				"list[current_player;main;0,6.08;8,3;8]" ..
 				"listring[current_name;main]"..
-				"listring[current_player;main]")
---		meta:set_string("infotext", "Locked Chest")
+				"listring[current_player;main]" ..
+				default.get_hotbar_bg(0,4.85))
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
@@ -92,4 +113,3 @@ minetest.register_craft({
 		{'default:wood','default:cobble','default:wood'}
 	}
 })
-

depends.txt

@@ -1 +0,0 @@
-default

dropbox.lua

@@ -1,3 +1,7 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+local DS = minetest.get_translator("default")
+
 local function has_locked_chest_privilege(meta, player)
 	if player:get_player_name() ~= meta:get_string("owner") then
 		return false
@@ -6,28 +10,49 @@ local function has_locked_chest_privilege(meta, player)
 end
 
 minetest.register_node("more_chests:dropbox", {
-	description = "Dropbox",
-	tiles = {"default_chest_top.png", "default_chest_top.png", "dropbox_right.png",
-		"default_chest_side.png", "default_chest_side.png", "dropbox_front.png"},
+	description = S("Dropbox"),
+	tiles = {"dropbox_top.png", "dropbox_top.png", "dropbox_side.png",
+		"dropbox_side.png", "dropbox_side.png", "dropbox_front.png"},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice = 1, tubedevice_receiver = 1},
+-- Pipeworks
+	tube = {
+		insert_object = function(pos, node, stack, direction)
+			local meta = minetest.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.get_meta(pos)
+			local inv = meta:get_inventory()
+			return inv:room_for_item("main", stack)
+		end,
+		input_inventory = "main",
+		connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
+	},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	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", "Dropbox (owned by "..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("@1 (owned by @2)",
+				S("Dropbox"),
+				meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec",
 				"size[8,9]"..
-				"list[current_name;main;0,0;8,4;]"..
-				"list[current_player;main;0,5;8,4;]"..
+				default.gui_bg ..
+				default.gui_bg_img ..
+				default.gui_slots ..
+				"list[current_name;main;0,0.3;8,4;]"..
+				"list[current_player;main;0,4.85;8,1;]" ..
+				"list[current_player;main;0,6.08;8,3;8]" ..
 				"listring[current_name;main]" ..
-				"listring[current_player;main]")
-		meta:set_string("infotext", "Chest")
+				"listring[current_player;main]" ..
+				default.get_hotbar_bg(0,4.85))
+		meta:set_string("infotext", DS("Chest"))
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
 	end,
@@ -36,7 +61,7 @@ minetest.register_node("more_chests:dropbox", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
-    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
@@ -47,15 +72,32 @@ minetest.register_node("more_chests:dropbox", {
 		end
 		return stack:get_count()
 	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		local meta = minetest.get_meta(pos)
+		if has_locked_chest_privilege(meta, player) then
+			return stack:get_count()
+		end
+		local target = meta:get_inventory():get_list(listname)[index]
+		local target_name = target:get_name()
+		local stack_count = stack:get_count()
+		if target_name == stack:get_name()
+		and target:get_count() < stack_count then
+			return stack_count
+		end
+		if target_name ~= "" then
+			return 0
+		end
+		return stack_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 dropbox at "..minetest.pos_to_string(pos))
 	end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+	on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name()..
 				" moves stuff to dropbox at "..minetest.pos_to_string(pos))
 	end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+	on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name()..
 				" takes stuff from dropbox at "..minetest.pos_to_string(pos))
 	end,
@@ -69,4 +111,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-

locale/more_chests.fr.tr

@@ -0,0 +1,11 @@
+# textdomain: more_chests
+Cobble Chest=Coffre en pierre taillée
+Dropbox=Boîte de dépôt
+Secret Chest=Coffre secret
+Shared Chest=Coffre partagé
+Wifi Chest=Coffre wifi
+
+
+@1 (owned by @2)=@1 (appartient à @2)
+Shared with (separate names with spaces)=Partagé avec (séparez les noms avec des espaces)
+submit=valider

locale/more_chests.hu.tr

@@ -0,0 +1,12 @@
+# textdomain: more_chests
+
+# Translation by An0n3m0us
+
+Secret Chest=Titkos Láda
+Wifi Chest=Wifi Láda
+Cobble Chest=Zúzottkő Láda
+Shared Chest=Közös Láda
+
+@1 (owned by @2)=@1 (@2 tulajdonában van)
+Shared with (separate names with spaces)=Megosztva (válassza el a neveket szóközökkel)
+submit=előterjeszt

locale/template.txt

@@ -0,0 +1,6 @@
+# textdomain: more_chests
+Secret Chest=
+Wifi Chest=
+Cobble Chest=
+Shared Chest=
+Dropbox=

mod.conf

@@ -0,0 +1,4 @@
+name = more_chests
+description = Adds several chests that behave differently, and can be used to donate items, share items, hide chests, make secret chests, and more.
+depends = default
+optional_depends = pipeworks

secret.lua

@@ -1,3 +1,6 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 local function has_locked_chest_privilege(meta, player)
 	if player:get_player_name() ~= meta:get_string("owner") then
 		return false
@@ -6,32 +9,53 @@ local function has_locked_chest_privilege(meta, player)
 end
 
 local open =  "size[8,10]"..
-	"list[current_name;main;0,0;8,4;]"..
-	"list[current_player;main;0,5;8,4;]"..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
+	"list[current_name;main;0,0.3;8,4;]"..
+	"list[current_player;main;0,4.85;8,1;]" ..
+	"list[current_player;main;0,6.08;8,3;8]" ..
 	"listring[current_name;main]" ..
-	"listring[current_player;main]"..
-	"button[3,9;2,1;open;close]"
+	"listring[current_player;main]" ..
+	"button[3,9;2,1;open;close]" ..
+	default.get_hotbar_bg(0,4.85)
 local closed = "size[2,1]"..
 	"button[0,0;2,1;open;open]"
 
 minetest.register_node("more_chests:secret", {
-	description = "Secret Chest",
-	tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
-		"default_chest_side.png", "default_chest_side.png", "secret_front.png"},
+	description = S("Secret Chest"),
+	tiles = {"secret_top.png", "secret_top.png", "secret_side.png",
+		"secret_side.png", "secret_side.png", "secret_front.png"},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice = 1, tubedevice_receiver = 1},
+-- Pipeworks
+	tube = {
+		insert_object = function(pos, node, stack, direction)
+			local meta = minetest.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.get_meta(pos)
+			local inv = meta:get_inventory()
+			return inv:room_for_item("main", stack)
+		end,
+		input_inventory = "main",
+		connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
+	},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	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", "Secret Chest (owned by "..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("@1 (owned by @2)",
+				S("Secret Chest"),
+				meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", open)
-		meta:set_string("infotext", "Secret Chest")
+		meta:set_string("infotext", S("Secret Chest"))
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
@@ -106,4 +130,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-

shared.lua

@@ -1,3 +1,6 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 local function has_locked_chest_privilege(meta, player)
 	local name = player:get_player_name()
 	local shared = " "..meta:get_string("shared").." "
@@ -13,32 +16,53 @@ end
 
 local function get_formspec(string)
 	return "size[8,10]"..
-		"list[current_name;main;0,0;8,4;]"..
-		"list[current_player;main;0,5;8,4;]"..
+		default.gui_bg ..
+		default.gui_bg_img ..
+		default.gui_slots ..	
+		"list[current_name;main;0,0.3;8,4;]"..
+		"list[current_player;main;0,4.85;8,1;]" ..
+		"list[current_player;main;0,6;8,3;8]" ..
+		"field[.25,9.5;8,1;shared;"..S("Shared with (separate names with spaces)")..":;"..string.."]"..
+		"button[6,9.2;2,1;submit;"..S("submit").."]" ..
 		"listring[current_name;main]" ..
-		"listring[current_player;main]"..
-		"field[.25,9.5;6,1;shared;Shared with (separate names with spaces):;"..string.."]"..
-		"button[6,9;2,1;submit;submit]"
+		"listring[current_player;main]" ..
+		default.get_hotbar_bg(0,4.85)
 end
 
 minetest.register_node("more_chests:shared", {
-	description = "Shared Chest",
-	tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
-		"default_chest_side.png", "default_chest_side.png", "shared_front.png"},
+	description = S("Shared Chest"),
+	tiles = {"shared_top.png", "shared_top.png", "shared_side.png",
+		"shared_side.png", "shared_side.png", "shared_front.png"},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice = 1, tubedevice_receiver = 1},
+-- Pipeworks
+	tube = {
+		insert_object = function(pos, node, stack, direction)
+			local meta = minetest.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.get_meta(pos)
+			local inv = meta:get_inventory()
+			return inv:room_for_item("main", stack)
+		end,
+		input_inventory = "main",
+		connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
+	},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	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", "Shared Chest (owned by "..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("@1 (owned by @2)",
+				S("Shared Chest"),
+				meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", get_formspec(""))
-		meta:set_string("infotext", "Shared Chest")
+		meta:set_string("infotext", S("Shared Chest"))
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
@@ -95,7 +119,7 @@ minetest.register_node("more_chests:shared", {
 	end,
 	on_receive_fields = function(pos, formspec, fields, sender)
 		local meta = minetest.get_meta(pos);
-		if fields.shared then
+		if fields.shared then 
 			if meta:get_string("owner") == sender:get_player_name() then
 				meta:set_string("shared", fields.shared);
 				meta:set_string("formspec", get_formspec(fields.shared))
@@ -107,9 +131,8 @@ minetest.register_node("more_chests:shared", {
 minetest.register_craft({
 	output = 'more_chests:shared',
 	recipe = {
-		{'group:wood','group:leaves','group:wood'},
-		{'group:wood','group:ingot','group:wood'},
-		{'group:wood','group:wood','group:wood'}
+		{'default:wood','default:leaves','default:wood'},
+		{'default:wood','default:steel_ingot','default:wood'},
+		{'default:wood','default:wood','default:wood'}
 	}
 })
-

wifi.lua

@@ -1,22 +1,72 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
+local pipeworks_enabled = minetest.global_exists("pipeworks")
+
 minetest.register_node("more_chests:wifi", {
-	description = "Wifi Chest",
+	description = S("Wifi Chest"),
 	tiles = {"wifi_top.png", "wifi_top.png", "wifi_side.png",
 		"wifi_side.png", "wifi_side.png",
-{name="wifi_front_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}}
-},
+		{name="wifi_front_animated.png", animation={type="vertical_frames",
+			aspect_w=16, aspect_h=16, length=2.0}}},
 	paramtype2 = "facedir",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice = 1, tubedevice_receiver = 1},
+	-- Pipeworks
+	tube = pipeworks_enabled and {
+		insert_object = function(pos, node, stack, direction, owner)
+			if not owner then
+				return stack
+			end
+			local player = minetest.get_player_by_name(owner)
+			if not player then
+				return stack
+			end
+			local inv = player:get_inventory()
+			return inv:add_item("more_chests:wifi", stack)
+		end,
+		can_insert = function(pos, node, stack, direction, owner)
+			if not owner then
+				return false
+			end
+			local player = minetest.get_player_by_name(owner)
+			if not player then
+				return false
+			end
+			local inv = player:get_inventory()
+			return inv:room_for_item("more_chests:wifi", stack)
+		end,
+		input_inventory = "more_chests:wifi",
+		return_input_invref = function(pos, node, direction, player_name)
+			if not player_name then
+				return false
+			end
+			local player = minetest.get_player_by_name(player_name)
+			if not player then
+				return false
+			end
+			return player:get_inventory()
+		end,
+		connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
+	} or nil,
+	after_place_node = pipeworks_enabled and pipeworks.after_place or nil,
+	after_dig_node = pipeworks_enabled and pipeworks.after_dig or nil,
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec",
 				"size[8,9]"..
-				"list[current_player;more_chests:wifi;0,0;8,4;]"..
-				"list[current_player;main;0,5;8,4;]"..
+				default.gui_bg ..
+				default.gui_bg_img ..
+				default.gui_slots ..
+				"list[current_player;more_chests:wifi;0,0.3;8,4;]"..
+				"list[current_player;main;0,4.85;8,1;]" ..
+				"list[current_player;main;0,6.08;8,3;8]" ..
 				"listring[current_player;more_chests:wifi]" ..
-				"listring[current_player;main]")
-		meta:set_string("infotext", "Wifi Chest")
+				"listring[current_player;main]" ..
+				default.get_hotbar_bg(0,4.85))
+
+		meta:set_string("infotext", S("Wifi Chest"))
 	end,
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		minetest.log("action", player:get_player_name()..
@@ -45,4 +95,3 @@ minetest.register_on_joinplayer(function(player)
 	local inv = player:get_inventory()
 	inv:set_size("more_chests:wifi", 8*4)
 end)
-