diff --git a/cobble.lua b/cobble.lua index 45f8c21..97b2b88 100644 --- a/cobble.lua +++ b/cobble.lua @@ -29,27 +29,29 @@ 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.get_meta(pos) + local meta = minetest.env:get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") end, on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = minetest.env: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;]") + "list[current_player;main;0,5;8,4;]".. + "listring[current_name;main]".. + "listring[current_player;main]") meta:set_string("owner", "") local inv = meta:get_inventory() inv:set_size("main", 8*4) end, can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = minetest.env: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.get_meta(pos) + 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 ".. @@ -60,7 +62,7 @@ minetest.register_node("more_chests:cobble", { return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + 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 ".. @@ -71,7 +73,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.get_meta(pos) + 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 ".. diff --git a/dropbox.lua b/dropbox.lua index d0d3b61..1714f85 100644 --- a/dropbox.lua +++ b/dropbox.lua @@ -7,8 +7,8 @@ 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"}, + 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 @@ -39,7 +39,9 @@ minetest.register_node("more_chests:dropbox", { meta:set_string("formspec", "size[8,9]".. "list[current_name;main;0,0;8,4;]".. - "list[current_player;main;0,5;8,4;]") + "list[current_player;main;0,5;8,4;]".. + "listring[current_name;main]" .. + "listring[current_player;main]") meta:set_string("infotext", "Chest") local inv = meta:get_inventory() inv:set_size("main", 8*4) diff --git a/secret.lua b/secret.lua index e84b91b..ae133bb 100644 --- a/secret.lua +++ b/secret.lua @@ -8,14 +8,16 @@ end local open = "size[8,10]".. "list[current_name;main;0,0;8,4;]".. "list[current_player;main;0,5;8,4;]".. + "listring[current_name;main]" .. + "listring[current_player;main]" .. "button[3,9;2,1;open;close]" 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"}, + 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,13 +38,13 @@ 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.get_meta(pos) + local meta = minetest.env:get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") meta:set_string("infotext", "Secret Chest (owned by ".. meta:get_string("owner")..")") end, on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = minetest.env:get_meta(pos) meta:set_string("formspec", open) meta:set_string("infotext", "Secret Chest") meta:set_string("owner", "") @@ -50,12 +52,12 @@ minetest.register_node("more_chests:secret", { inv:set_size("main", 8*4) end, can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = minetest.env: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.get_meta(pos) + 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 secret chest belonging to ".. @@ -66,7 +68,7 @@ minetest.register_node("more_chests:secret", { return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + 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 secret chest belonging to ".. @@ -77,7 +79,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.get_meta(pos) + 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 secret chest belonging to ".. @@ -100,7 +102,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.get_meta(pos) + local meta = minetest.env:get_meta(pos) if has_locked_chest_privilege(meta, sender) then if fields.open == "open" then meta:set_string("formspec", open) diff --git a/shared.lua b/shared.lua index 8758124..32bb591 100644 --- a/shared.lua +++ b/shared.lua @@ -16,13 +16,15 @@ local function get_formspec(string) "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]" + "button[6,9;2,1;submit;submit]" .. + "listring[current_name;main]" .. + "listring[current_player;main]" 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"}, + 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,13 +45,13 @@ 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.get_meta(pos) + local meta = minetest.env:get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") meta:set_string("infotext", "Shared Chest (owned by ".. meta:get_string("owner")..")") end, on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = minetest.env:get_meta(pos) meta:set_string("formspec", get_formspec("")) meta:set_string("infotext", "Shared Chest") meta:set_string("owner", "") @@ -57,12 +59,12 @@ minetest.register_node("more_chests:shared", { inv:set_size("main", 8*4) end, can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = minetest.env: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.get_meta(pos) + 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 shared chest belonging to ".. @@ -73,7 +75,7 @@ minetest.register_node("more_chests:shared", { return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + 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 shared chest belonging to ".. @@ -84,7 +86,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.get_meta(pos) + 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 shared chest belonging to ".. @@ -107,8 +109,8 @@ 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.get_meta(pos); - if fields.shared then + local meta = minetest.env:get_meta(pos); + 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)) diff --git a/textures/cobblechest_front.png b/textures/cobblechest_front.png index 08b2cbb..d6155da 100644 Binary files a/textures/cobblechest_front.png and b/textures/cobblechest_front.png differ diff --git a/textures/dropbox_front.png b/textures/dropbox_front.png index 69342c7..678a11d 100644 Binary files a/textures/dropbox_front.png and b/textures/dropbox_front.png differ diff --git a/textures/dropbox_right.png b/textures/dropbox_right.png deleted file mode 100644 index a326b61..0000000 Binary files a/textures/dropbox_right.png and /dev/null differ diff --git a/textures/dropbox_side.png b/textures/dropbox_side.png new file mode 100644 index 0000000..e2125b7 Binary files /dev/null and b/textures/dropbox_side.png differ diff --git a/textures/dropbox_top.png b/textures/dropbox_top.png new file mode 100644 index 0000000..20422bd Binary files /dev/null and b/textures/dropbox_top.png differ diff --git a/textures/secret_front.png b/textures/secret_front.png index 9b193d5..d427bae 100644 Binary files a/textures/secret_front.png and b/textures/secret_front.png differ diff --git a/textures/secret_side.png b/textures/secret_side.png new file mode 100644 index 0000000..b038c76 Binary files /dev/null and b/textures/secret_side.png differ diff --git a/textures/secret_top.png b/textures/secret_top.png new file mode 100644 index 0000000..97482ca Binary files /dev/null and b/textures/secret_top.png differ diff --git a/textures/shared_front.png b/textures/shared_front.png index 12cd547..2792b7e 100644 Binary files a/textures/shared_front.png and b/textures/shared_front.png differ diff --git a/textures/shared_side.png b/textures/shared_side.png new file mode 100644 index 0000000..487578a Binary files /dev/null and b/textures/shared_side.png differ diff --git a/textures/shared_top.png b/textures/shared_top.png new file mode 100644 index 0000000..6af1de9 Binary files /dev/null and b/textures/shared_top.png differ diff --git a/textures/wifi_front.png b/textures/wifi_front.png new file mode 100644 index 0000000..eb07ab2 Binary files /dev/null and b/textures/wifi_front.png differ diff --git a/textures/wifi_front_animated.png b/textures/wifi_front_animated.png deleted file mode 100644 index b0610a2..0000000 Binary files a/textures/wifi_front_animated.png and /dev/null differ diff --git a/textures/wifi_side.png b/textures/wifi_side.png index d3b0ebc..f48a466 100644 Binary files a/textures/wifi_side.png and b/textures/wifi_side.png differ diff --git a/textures/wifi_top.png b/textures/wifi_top.png index 55775aa..2e107d7 100644 Binary files a/textures/wifi_top.png and b/textures/wifi_top.png differ diff --git a/wifi.lua b/wifi.lua index 1f46e51..c9dbbae 100644 --- a/wifi.lua +++ b/wifi.lua @@ -1,19 +1,19 @@ minetest.register_node("more_chests:wifi", { description = "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}} -}, + "wifi_side.png", "wifi_side.png", "wifi_front.png"}, paramtype2 = "facedir", groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,}, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = minetest.env: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;]") + "list[current_player;main;0,5;8,4;]" .. + "listring[current_player;more_chests:wifi]" .. + "listring[current_player;main]") meta:set_string("infotext", "Wifi Chest") end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)