From a23701b5e654139158ba934155ecd99c8f4b8fd7 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 8 Oct 2022 19:49:28 +0200 Subject: [PATCH] DevTest: Move detached inv tests to chest mod --- games/devtest/mods/chest/chest.lua | 45 ++++++++++++++ games/devtest/mods/chest/detached.lua | 58 ++++++++++++++++++ games/devtest/mods/chest/init.lua | 42 +------------ games/devtest/mods/chest/mod.conf | 2 +- .../chest/textures/chest_detached_chest.png | Bin 0 -> 240 bytes games/devtest/mods/experimental/commands.lua | 21 ------- games/devtest/mods/experimental/detached.lua | 29 --------- games/devtest/mods/experimental/init.lua | 9 --- games/devtest/mods/testtools/privatizer.lua | 2 +- 9 files changed, 107 insertions(+), 101 deletions(-) create mode 100644 games/devtest/mods/chest/chest.lua create mode 100644 games/devtest/mods/chest/detached.lua create mode 100644 games/devtest/mods/chest/textures/chest_detached_chest.png delete mode 100644 games/devtest/mods/experimental/detached.lua diff --git a/games/devtest/mods/chest/chest.lua b/games/devtest/mods/chest/chest.lua new file mode 100644 index 000000000..c07d4f1a5 --- /dev/null +++ b/games/devtest/mods/chest/chest.lua @@ -0,0 +1,45 @@ +local function print_to_everything(msg) + minetest.log("action", "[chest] " .. msg) + minetest.chat_send_all(msg) +end + +minetest.register_node("chest:chest", { + description = "Chest" .. "\n" .. + "32 inventory slots", + tiles ={"chest_chest.png^[sheet:2x2:0,0", "chest_chest.png^[sheet:2x2:0,0", + "chest_chest.png^[sheet:2x2:1,0", "chest_chest.png^[sheet:2x2:1,0", + "chest_chest.png^[sheet:2x2:1,0", "chest_chest.png^[sheet:2x2:0,1"}, + paramtype2 = "facedir", + groups = {dig_immediate=2,choppy=3,meta_is_privatizable=1}, + is_ground_content = false, + 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;]" .. + "listring[]") + meta:set_string("infotext", "Chest") + local inv = meta:get_inventory() + inv:set_size("main", 8*4) + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow put' event for " .. stack:to_string()) + return stack:get_count() + end, + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow take' event for " .. stack:to_string()) + return stack:get_count() + end, + on_metadata_inventory_put = function(pos, listname, index, stack, player) + print_to_everything("Chest: ".. player:get_player_name() .. " put " .. stack:to_string()) + end, + on_metadata_inventory_take = function(pos, listname, index, stack, player) + print_to_everything("Chest: ".. player:get_player_name() .. " took " .. stack:to_string()) + end, +}) diff --git a/games/devtest/mods/chest/detached.lua b/games/devtest/mods/chest/detached.lua new file mode 100644 index 000000000..37401566b --- /dev/null +++ b/games/devtest/mods/chest/detached.lua @@ -0,0 +1,58 @@ +local ALLOW_PUT_MAX = 1 +local ALLOW_TAKE_MAX = 4 + +local function print_to_everything(msg) + minetest.log("action", "[chest] " .. msg) + minetest.chat_send_all(msg) +end + +-- Create a detached inventory +local inv = minetest.create_detached_inventory("detached_inventory", { + allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) + print_to_everything("Detached inventory: "..player:get_player_name().." triggered allow_move") + return count -- Allow all + end, + allow_put = function(inv, listname, index, stack, player) + print_to_everything("Detached inventory: "..player:get_player_name().." triggered allow_put for "..stack:to_string().." (max. allowed: "..ALLOW_PUT_MAX..")") + return ALLOW_PUT_MAX -- Allow to put a limited amount of items + end, + allow_take = function(inv, listname, index, stack, player) + print_to_everything("Detached inventory: "..player:get_player_name().." triggered allow_take for "..stack:to_string().." (max. allowed: "..ALLOW_TAKE_MAX..")") + return ALLOW_TAKE_MAX -- Allow to take a limited amount of items + end, + on_move = function(inv, from_list, from_index, to_list, to_index, count, player) + print_to_everything("Detached inventory: " .. player:get_player_name().." moved item(s)") + end, + on_put = function(inv, listname, index, stack, player) + print_to_everything("Detached inventory: " .. player:get_player_name().." put "..stack:to_string()) + end, + on_take = function(inv, listname, index, stack, player) + print_to_everything("Detached inventory: " .. player:get_player_name().." took "..stack:to_string()) + end, +}) +inv:set_size("main", 8*3) + + +-- Add a special chest to grant access to this inventory +minetest.register_node("chest:detached_chest", { + description = "Detached Chest" .. "\n" .. + "Grants access to a shared detached inventory" .."\n" .. + "Max. item put count: "..ALLOW_PUT_MAX .."\n".. + "Max. item take count: "..ALLOW_TAKE_MAX, + tiles = {"chest_detached_chest.png^[sheet:2x2:0,0", "chest_detached_chest.png^[sheet:2x2:0,0", + "chest_detached_chest.png^[sheet:2x2:1,0", "chest_detached_chest.png^[sheet:2x2:1,0", + "chest_detached_chest.png^[sheet:2x2:1,0", "chest_detached_chest.png^[sheet:2x2:0,1"}, + paramtype2 = "facedir", + groups = {dig_immediate=2,choppy=3,meta_is_privatizable=1}, + is_ground_content = false, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[8,9]".. + "list[detached:detached_inventory;main;0,0;8,3;0]".. + "list[current_player;main;0,5;8,4;]".. + "listring[]") + meta:set_string("infotext", "Detached Chest") + end, +}) + diff --git a/games/devtest/mods/chest/init.lua b/games/devtest/mods/chest/init.lua index 5798c13e7..cb2974c64 100644 --- a/games/devtest/mods/chest/init.lua +++ b/games/devtest/mods/chest/init.lua @@ -1,40 +1,2 @@ -minetest.register_node("chest:chest", { - description = "Chest" .. "\n" .. - "32 inventory slots", - tiles ={"chest_chest.png^[sheet:2x2:0,0", "chest_chest.png^[sheet:2x2:0,0", - "chest_chest.png^[sheet:2x2:1,0", "chest_chest.png^[sheet:2x2:1,0", - "chest_chest.png^[sheet:2x2:1,0", "chest_chest.png^[sheet:2x2:0,1"}, - paramtype2 = "facedir", - groups = {dig_immediate=2,choppy=3}, - is_ground_content = false, - 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;]" .. - "listring[]") - meta:set_string("infotext", "Chest") - local inv = meta:get_inventory() - inv:set_size("main", 8*4) - end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.chat_send_player(player:get_player_name(), "Allow put: " .. stack:to_string()) - return stack:get_count() - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.chat_send_player(player:get_player_name(), "Allow take: " .. stack:to_string()) - return stack:get_count() - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.chat_send_player(player:get_player_name(), "On put: " .. stack:to_string()) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.chat_send_player(player:get_player_name(), "On take: " .. stack:to_string()) - end, -}) +dofile(minetest.get_modpath("chest").."/chest.lua") +dofile(minetest.get_modpath("chest").."/detached.lua") diff --git a/games/devtest/mods/chest/mod.conf b/games/devtest/mods/chest/mod.conf index 0d7500164..76612976d 100644 --- a/games/devtest/mods/chest/mod.conf +++ b/games/devtest/mods/chest/mod.conf @@ -1,2 +1,2 @@ name = chest -description = A simple chest to store items +description = A simple chest to store items. Also adds a detached inventory test diff --git a/games/devtest/mods/chest/textures/chest_detached_chest.png b/games/devtest/mods/chest/textures/chest_detached_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..8e5dafed16487affc31b90202b13bd5507b54ef6 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0EkFkTlt$+TPf0NWd;CJwU&E0{FzcgC!9Xq3FBa5?qj9NRbMO$@QzWyUjP6}lo7 zO`H_2@@BPdPmdKI;Vst0LTqdiU0rr literal 0 HcmV?d00001 diff --git a/games/devtest/mods/experimental/commands.lua b/games/devtest/mods/experimental/commands.lua index 5badff7e3..3b00bd9e3 100644 --- a/games/devtest/mods/experimental/commands.lua +++ b/games/devtest/mods/experimental/commands.lua @@ -1,24 +1,3 @@ -minetest.register_chatcommand("test_inv", { - params = "", - description = "Test: Modify player's inventory formspec", - func = function(name, param) - local player = minetest.get_player_by_name(name) - if not player then - return false, "No player." - end - player:set_inventory_formspec( - "size[13,7.5]".. - "image[6,0.6;1,2;player.png]".. - "list[current_player;main;5,3.5;8,4;]".. - "list[current_player;craft;8,0;3,3;]".. - "list[current_player;craftpreview;12,1;1,1;]".. - "list[detached:test_inventory;main;0,0;4,6;0]".. - "button[0.5,7;2,1;button1;Button 1]".. - "button_exit[2.5,7;2,1;button2;Exit Button]") - return true, "Done." - end, -}) - minetest.register_chatcommand("test_bulk_set_node", { params = "", description = "Test: Bulk-set 9×9×9 stone nodes", diff --git a/games/devtest/mods/experimental/detached.lua b/games/devtest/mods/experimental/detached.lua deleted file mode 100644 index 673adfdd4..000000000 --- a/games/devtest/mods/experimental/detached.lua +++ /dev/null @@ -1,29 +0,0 @@ --- Create a detached inventory -local inv = minetest.create_detached_inventory("test_inventory", { - allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) - experimental.print_to_everything("allow move asked") - return count -- Allow all - end, - allow_put = function(inv, listname, index, stack, player) - experimental.print_to_everything("allow put asked") - return 1 -- Allow only 1 - end, - allow_take = function(inv, listname, index, stack, player) - experimental.print_to_everything("allow take asked") - return 4 -- Allow 4 at max - end, - on_move = function(inv, from_list, from_index, to_list, to_index, count, player) - experimental.print_to_everything(player:get_player_name().." moved items") - end, - on_put = function(inv, listname, index, stack, player) - experimental.print_to_everything(player:get_player_name().." put items") - end, - on_take = function(inv, listname, index, stack, player) - experimental.print_to_everything(player:get_player_name().." took items") - end, -}) -inv:set_size("main", 4*6) -inv:add_item("main", "experimental:callback_node") -inv:add_item("main", "experimental:particle_spawner") - - diff --git a/games/devtest/mods/experimental/init.lua b/games/devtest/mods/experimental/init.lua index e37d85dbf..b321fea8e 100644 --- a/games/devtest/mods/experimental/init.lua +++ b/games/devtest/mods/experimental/init.lua @@ -2,14 +2,5 @@ -- Experimental things -- -experimental = {} - -dofile(minetest.get_modpath("experimental").."/detached.lua") dofile(minetest.get_modpath("experimental").."/commands.lua") -function experimental.print_to_everything(msg) - minetest.log("action", msg) - minetest.chat_send_all(msg) -end - - diff --git a/games/devtest/mods/testtools/privatizer.lua b/games/devtest/mods/testtools/privatizer.lua index bd6e2377a..33196dfc4 100644 --- a/games/devtest/mods/testtools/privatizer.lua +++ b/games/devtest/mods/testtools/privatizer.lua @@ -6,7 +6,7 @@ minetest.register_tool("testtools:privatizer", { on_use = function(itemstack, user, pointed_thing) if pointed_thing.type == "node" then local node = minetest.get_node(pointed_thing.under) - if node.name == "chest:chest" then + if minetest.get_item_group(node.name, "meta_is_privatizable") == 1 then local p = pointed_thing.under minetest.log("action", "[testtools] Privatizer used at "..minetest.pos_to_string(p)) minetest.get_meta(p):mark_as_private({"infotext", "formspec"})