Version 1.2, Wifi Chests now work with Pipeworks too! (#26 )

* change wifi tiles back (#15) * make the wifi chest pipeworkable (#16) * Make the wifi chest pipeworkable * fix mod crashing without pipeworks Co-authored-by: DS <vorunbekannt75@web.de>
change wifi tiles back (#15 ) (#25 )
2020-10-25 11:26:45 +00:00 · 2020-10-24 19:55:32 +01:00 · 2020-10-22 21:47:59 +01:00 · 2020-10-22 21:47:46 +01:00 · 2020-10-08 10:20:47 +01:00 · 2020-10-08 10:17:51 +01:00
19 changed files with 187 additions and 64 deletions
--- a/cobble.lua
+++ b/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,7 +9,7 @@ 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",
@ -29,27 +32,34 @@ minetest.register_node("more_chests:cobble", {
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name() or "")

 	end,
 	on_construct = function(pos)
-		local meta = minetest.env:get_meta(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]" ..
+				default.get_hotbar_bg(0,4.85))
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
 	end,
 	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
+		local meta = minetest.get_meta(pos);
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.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 "..
@ -60,7 +70,7 @@ minetest.register_node("more_chests:cobble", {
 		return count
 	end,
    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.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 "..
@ -71,7 +81,7 @@ minetest.register_node("more_chests:cobble", {
 		return stack:get_count()
 	end,
    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.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 "..
@ -103,4 +113,3 @@ minetest.register_craft({
 		{'default:wood','default:cobble','default:wood'}
 	}
 })
-
--- a/depends.txt
+++ b/depends.txt
@ -1 +0,0 @@
-default
--- a/dropbox.lua
+++ b/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,9 +10,9 @@ 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, tubedevice = 1, tubedevice_receiver = 1},
 -- Pipeworks
@ -31,16 +35,24 @@ minetest.register_node("more_chests:dropbox", {
 	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;]")
-		meta:set_string("infotext", "Chest")
+				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]" ..
+				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,
@ -99,4 +111,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-
--- a/locale/more_chests.fr.tr
+++ b/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
--- a/locale/more_chests.hu.tr
+++ b/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
--- a/locale/template.txt
+++ b/locale/template.txt
@ -0,0 +1,6 @@
+# textdomain: more_chests
+Secret Chest=
+Wifi Chest=
+Cobble Chest=
+Shared Chest=
+Dropbox=
--- a/mod.conf
+++ b/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
--- a/secret.lua
+++ b/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,16 +9,23 @@ 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;]"..
-	"button[3,9;2,1;open;close]"
+	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]" ..
+	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, tubedevice = 1, tubedevice_receiver = 1},
 -- Pipeworks
@ -36,26 +46,27 @@ minetest.register_node("more_chests:secret", {
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer)
-		local meta = minetest.env:get_meta(pos)
+		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.env:get_meta(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)
 	end,
 	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
+		local meta = minetest.get_meta(pos);
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a secret chest belonging to "..
@ -66,7 +77,7 @@ minetest.register_node("more_chests:secret", {
 		return count
 	end,
    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a secret chest belonging to "..
@ -77,7 +88,7 @@ minetest.register_node("more_chests:secret", {
 		return stack:get_count()
 	end,
    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a secret chest belonging to "..
@ -100,7 +111,7 @@ minetest.register_node("more_chests:secret", {
 				" takes stuff from secret chest at "..minetest.pos_to_string(pos))
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if has_locked_chest_privilege(meta, sender) then
 			if fields.open == "open" then
 				meta:set_string("formspec", open)
@ -119,4 +130,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-
--- a/shared.lua
+++ b/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,16 +16,23 @@ 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;]"..
-		"field[.25,9.5;6,1;shared;Shared with (separate names with spaces):;"..string.."]"..
-		"button[6,9;2,1;submit;submit]"
+		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]" ..
+		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, tubedevice = 1, tubedevice_receiver = 1},
 -- Pipeworks
@ -43,26 +53,27 @@ minetest.register_node("more_chests:shared", {
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer)
-		local meta = minetest.env:get_meta(pos)
+		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.env:get_meta(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)
 	end,
 	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
+		local meta = minetest.get_meta(pos);
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a shared chest belonging to "..
@ -73,7 +84,7 @@ minetest.register_node("more_chests:shared", {
 		return count
 	end,
    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a shared chest belonging to "..
@ -84,7 +95,7 @@ minetest.register_node("more_chests:shared", {
 		return stack:get_count()
 	end,
    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a shared chest belonging to "..
@ -107,7 +118,7 @@ minetest.register_node("more_chests:shared", {
 				" takes stuff from shared chest at "..minetest.pos_to_string(pos))
 	end,
 	on_receive_fields = function(pos, formspec, fields, sender)
-		local meta = minetest.env:get_meta(pos);
+		local meta = minetest.get_meta(pos);
 		if fields.shared then 
 			if meta:get_string("owner") == sender:get_player_name() then
 				meta:set_string("shared", fields.shared);
@ -125,4 +136,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-
--- a/textures/dropbox_front.png
+++ b/textures/dropbox_front.png
--- a/textures/dropbox_side.png
+++ b/textures/dropbox_side.png
--- a/textures/dropbox_top.png
+++ b/textures/dropbox_top.png
--- a/textures/secret_front.png
+++ b/textures/secret_front.png
--- a/textures/secret_side.png
+++ b/textures/secret_side.png
--- a/textures/secret_top.png
+++ b/textures/secret_top.png
--- a/textures/shared_front.png
+++ b/textures/shared_front.png
--- a/textures/shared_side.png
+++ b/textures/shared_side.png
--- a/textures/shared_top.png
+++ b/textures/shared_top.png
--- a/wifi.lua
+++ b/wifi.lua
@ -1,20 +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.env:get_meta(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;]")
-		meta:set_string("infotext", "Wifi Chest")
+				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]" ..
+				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()..
@ -43,4 +95,3 @@ minetest.register_on_joinplayer(function(player)
 	local inv = player:get_inventory()
 	inv:set_size("more_chests:wifi", 8*4)
 end)
-
Author	SHA1	Message	Date
Megaf	79726b009b	Version 1.2, Wifi Chests now work with Pipeworks too! (#26 ) * change wifi tiles back (#15) * make the wifi chest pipeworkable (#16) * Make the wifi chest pipeworkable * fix mod crashing without pipeworks Co-authored-by: DS <vorunbekannt75@web.de>	2020-10-25 11:26:45 +00:00
Megaf	3043046993	change wifi tiles back (#15 ) (#25 ) Co-authored-by: DS <vorunbekannt75@web.de>	2020-10-24 19:55:32 +01:00
Megaf	058b3a0d4b	Revert "Mod rewrite and new models (#21 )" This reverts commit `74b3c5a25d`.	2020-10-22 21:47:59 +01:00
Megaf	426a13089c	Revert "Removed lost HTML tag" This reverts commit `1d59b74c89`.	2020-10-22 21:47:46 +01:00
Megaf	1d59b74c89	Removed lost HTML tag	2020-10-08 10:20:47 +01:00
nxet	74b3c5a25d	Mod rewrite and new models (#21 ) * Aliases moved to utils folder * Method to generate two different formspec layouts, big and small * Log Actions moved to separate module * Added method to generate a chest definition * Rewritten models * Add Fridge model * Add Toolbox models * "Mod loaded" message; Updated localization template * Add Italian localization * Fridge now has both normal and big (2 blocks) models * Fixed mixed indentation * Rewritten README; improved IT and FR (thanks to @louisroyer) localizations.	2020-10-08 10:17:51 +01:00
An0n3m0us	939c7ea73d	Add Hungarian translation (#20 )	2020-02-17 19:03:57 +01:00
Louis	9666707470	Add french translation	2020-02-14 20:49:35 +01:00
Louis	1d7edabfc3	Update mod.conf	2020-02-14 20:49:35 +01:00
xisd	c597779aca	Update formspecs to lookmore like default chest	2017-03-14 22:01:37 -07:00
Juraj Vajda	0ca4ace7d1	New textures	2016-04-01 21:42:12 -07:00
Juraj Vajda	2faa757730	Shift-click support.	2016-04-01 21:22:19 -07:00
HybridDog	a8183cfbd3	Remove .env: old API usage. Original title: 🐈	2016-04-01 21:22:03 -07:00
Auke Kok	4890dc8c7e	Add description.txt	2016-04-01 15:21:42 -07:00
Auke Kok	fca278aab2	Add mod.conf	2016-04-01 15:18:04 -07:00