From 1497c74351b8e757148d14bf4f8c2e64204ee774 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 31 Mar 2020 16:41:40 +0200 Subject: [PATCH] Add many more listrings --- mods/anvil/init.lua | 12 +++++++++++- mods/bonfire/init.lua | 17 +++++++++++++++-- mods/decorations/init.lua | 9 ++++++--- mods/joiner_table/init.lua | 10 +++++++++- mods/money/shop.lua | 14 +++++++++++++- mods/oven/init.lua | 17 +++++++++++++++-- mods/prestibags/init.lua | 3 ++- mods/scribing_table/init.lua | 8 +++++++- mods/smelter/init.lua | 16 ++++++++++++++-- 9 files changed, 92 insertions(+), 14 deletions(-) diff --git a/mods/anvil/init.lua b/mods/anvil/init.lua index 361db1c..6a78a3d 100644 --- a/mods/anvil/init.lua +++ b/mods/anvil/init.lua @@ -250,7 +250,17 @@ for _, anvil in ipairs(anvils) do "list[current_name;hammer;1,1.5;1,1;]".. "list[current_name;output;3.5,1.5;1,1;]".. "list[current_name;flux;6,1.5;1,1;]".. - "list[current_player;main;0,3;8,4;]") + "list[current_player;main;0,3;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src1]".. + "listring[current_player;main]".. + "listring[current_name;src2]".. + "listring[current_player;main]".. + "listring[current_name;hammer]".. + "listring[current_player;main]".. + "listring[current_name;output]".. + "listring[current_player;main]".. + "listring[current_name;flux]") meta:set_string("infotext", anvil[2].." Anvil") local inv = meta:get_inventory() inv:set_size("src1", 1) diff --git a/mods/bonfire/init.lua b/mods/bonfire/init.lua index fe23746..562c6c0 100644 --- a/mods/bonfire/init.lua +++ b/mods/bonfire/init.lua @@ -6,7 +6,13 @@ bonfire.formspec = "list[current_name;fuel;2,3;1,1;]".. "list[current_name;src;2,1;1,1;]".. "list[current_name;dst;5,1;2,1;]".. - "list[current_player;main;0,5;8,4;]" + "list[current_player;main;0,5;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;dst]".. + "listring[current_player;main]".. + "listring[current_name;fuel]" realtest.bonfire_fuels = {} function realtest.add_bonfire_fuel(fuel) @@ -178,7 +184,14 @@ minetest.register_abm({ "list[current_name;fuel;2,3;1,1;]".. "list[current_name;src;2,1;1,1;]".. "list[current_name;dst;5,1;2,1;]".. - "list[current_player;main;0,5;8,4;]") + "list[current_player;main;0,5;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;dst]".. + "listring[current_player;main]".. + "listring[current_name;fuel]") + return end diff --git a/mods/decorations/init.lua b/mods/decorations/init.lua index e216601..81bd7e0 100644 --- a/mods/decorations/init.lua +++ b/mods/decorations/init.lua @@ -98,7 +98,8 @@ for _, mineral in ipairs(decor_minerals) do meta:set_string("formspec", "size[8,8]".. "list[current_name;main;1,0.5;6,3;]".. - "list[current_player;main;0,4;8,4;]") + "list[current_player;main;0,4;8,4;]".. + "listring[]") meta:set_string("infotext", mineral[2].." Casket") local inv = meta:get_inventory() inv:set_size("main", 8*4) @@ -122,7 +123,8 @@ for _, mineral in ipairs(decor_minerals) do 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[]") meta:set_string("infotext", mineral[2].." Chest") local inv = meta:get_inventory() inv:set_size("main", 8*4) @@ -219,7 +221,8 @@ for _, mineral in ipairs(decor_minerals) do "decorations:locked_chest", "size[8,9]".. "list[nodemeta:".. pos .. ";main;0,0;8,4;]".. - "list[current_player;main;0,5;8,4;]") + "list[current_player;main;0,5;8,4;]".. + "listring[]") end end, }) diff --git a/mods/joiner_table/init.lua b/mods/joiner_table/init.lua index 3d32950..db414f4 100644 --- a/mods/joiner_table/init.lua +++ b/mods/joiner_table/init.lua @@ -64,7 +64,15 @@ for _, tree in pairs(realtest.registered_trees) do "list[current_name;instruments;0.5,1.5;2,2;]".. "label[4.5,2.85;Output]".. "list[current_name;output;4.5,2;1,1;]".. - "list[current_player;main;0,4;8,4;]") + "list[current_player;main;0,4;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src1]".. + "listring[current_player;main]".. + "listring[current_name;src2]".. + "listring[current_player;main]".. + "listring[current_name;instruments]".. + "listring[current_player;main]".. + "listring[current_name;output]") meta:set_string("infotext", "Joiner Table") local inv = meta:get_inventory() inv:set_size("src1", 1) diff --git a/mods/money/shop.lua b/mods/money/shop.lua index 8fabc9f..afd8988 100644 --- a/mods/money/shop.lua +++ b/mods/money/shop.lua @@ -13,6 +13,10 @@ default.shop.formspec = { "label[5,2.5;Owner gives]".. "list["..list_name..";owner_gives;5,3;3,2;]".. "list[current_player;main;0,5.5;8,4;]".. + "listring[current_player;main]".. + "listring[current_player;customer_gives]".. + "listring[current_player;main]".. + "listring[current_player;customer_gets]".. "button[3,2;2,1;exchange;Exchange]" return formspec end, @@ -28,7 +32,15 @@ default.shop.formspec = { "label[8,0;You give:]".. "list["..list_name..";owner_gives;8,0.5;3,2;]".. "label[2.5,7;Use(E)+Place(RMB) for customer interface]".. - "list[current_player;main;1.5,8;8,4;]" + "list[current_player;main;1.5,8;8,4;]".. + "listring[current_player;main]".. + "listring["..list_name..";stock]".. + "listring[current_player;main]".. + "listring["..list_name..";customers_gave]".. + "listring[current_player;main]".. + "listring["..list_name..";owner_wants]".. + "listring[current_player;main]".. + "listring["..list_name..";owner_gives]" return formspec end, } diff --git a/mods/oven/init.lua b/mods/oven/init.lua index 873e954..e12aa5e 100644 --- a/mods/oven/init.lua +++ b/mods/oven/init.lua @@ -6,7 +6,14 @@ function default.get_oven_active_formspec(pos, percent) "list[current_name;fuel;3.5,1.5;1,1;]".. "list[current_name;src;2,0.5;1,1;]".. "list[current_name;dst;5,0.5;1,1;]".. - "list[current_player;main;0,3;8,4;]" + "list[current_player;main;0,3;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;fuel]".. + "listring[current_player;main]".. + "listring[current_name;dst]" + return formspec end @@ -16,7 +23,13 @@ default.oven_inactive_formspec = "list[current_name;fuel;3.5,1.5;1,1;]".. "list[current_name;src;2,0.5;1,1;]".. "list[current_name;dst;5,0.5;1,1;]".. - "list[current_player;main;0,3;8,4;]" + "list[current_player;main;0,3;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;fuel]".. + "listring[current_player;main]".. + "listring[current_name;dst]" minetest.register_node("oven:oven", { description = "Oven", diff --git a/mods/prestibags/init.lua b/mods/prestibags/init.lua index 9ffea88..0b76f52 100644 --- a/mods/prestibags/init.lua +++ b/mods/prestibags/init.lua @@ -231,7 +231,8 @@ minetest.register_entity( "image[2,"..yImg..";1,1;prestibags_bag_inv.png]".. "list[detached:prestibags:bags;"..self.id..";3,0;".. BAG_WIDTH..","..BAG_HEIGHT..";]".. - "list[current_player;main;0,"..yPlay..";8,4;]" + "list[current_player;main;0,"..yPlay..";8,4;]".. + "listring[]" minetest.show_formspec( player:get_player_name(), "prestibags:bag", formspec) diff --git a/mods/scribing_table/init.lua b/mods/scribing_table/init.lua index ff8e625..68c5d4e 100644 --- a/mods/scribing_table/init.lua +++ b/mods/scribing_table/init.lua @@ -204,7 +204,13 @@ for i, tree_name in ipairs(realtest.registered_trees_list) do "label[6.5,5.3;Output]".. "list[current_name;res;6.5,4.5;1,1;]".. "image[5.5,1.5;2,3.4;scribing_table_arrow.png]".. - "list[current_player;main;0,6;8,4;]" + "list[current_player;main;0,6;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;dye]".. + "listring[current_player;main]".. + "listring[current_name;res]".. + "listring[current_player;main]".. + "listring[current_name;paper]" ) meta:set_string("infotext", "Scribing Table") local inv = meta:get_inventory() diff --git a/mods/smelter/init.lua b/mods/smelter/init.lua index cc170e2..bf0fb1f 100644 --- a/mods/smelter/init.lua +++ b/mods/smelter/init.lua @@ -7,7 +7,13 @@ smelter.smelter_formspec = "list[current_name;fuel;3,1;1,1;]".. "list[current_name;src;0,0;2,2;]".. "list[current_name;dst;6,0;2,2;]".. - "list[current_player;main;0,3;8,4;]" + "list[current_player;main;0,3;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;fuel]".. + "listring[current_player;main]".. + "listring[current_name;dst]" minetest.register_node("smelter:smelter", { description = "Smelter", @@ -144,7 +150,13 @@ minetest.register_abm({ "list[current_name;fuel;3,1;1,1;]".. "list[current_name;src;0,0;2,2;]".. "list[current_name;dst;6,0;2,2;]".. - "list[current_player;main;0,3;8,4;]") + "list[current_player;main;0,3;8,4;]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;fuel]".. + "listring[current_player;main]".. + "listring[current_name;dst]") return end