From ea0c2e9568dcb9d63f777ac62307af65c9a47603 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 6 Mar 2019 06:35:24 +0100 Subject: [PATCH] Utilize formspec prepend --- mods/CORE/mcl_formspec_prepend/init.lua | 6 ++++++ mods/CORE/mcl_formspec_prepend/mod.conf | 2 ++ mods/CORE/mcl_init/init.lua | 7 ------- mods/ENTITIES/mobs_mc/villager.lua | 1 - mods/HELP/mcl_craftguide/init.lua | 2 -- mods/HUD/mcl_inventory/creative.lua | 1 - mods/HUD/mcl_inventory/init.lua | 1 - mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt | 1 - mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 1 - mods/ITEMS/REDSTONE/mcl_droppers/depends.txt | 1 - mods/ITEMS/REDSTONE/mcl_droppers/init.lua | 1 - mods/ITEMS/mcl_anvils/depends.txt | 1 - mods/ITEMS/mcl_anvils/init.lua | 1 - mods/ITEMS/mcl_beds/functions.lua | 2 +- mods/ITEMS/mcl_chests/depends.txt | 1 - mods/ITEMS/mcl_chests/init.lua | 5 ----- mods/ITEMS/mcl_crafting_table/depends.txt | 1 - mods/ITEMS/mcl_crafting_table/init.lua | 1 - mods/ITEMS/mcl_furnaces/depends.txt | 1 - mods/ITEMS/mcl_furnaces/init.lua | 2 -- mods/ITEMS/mcl_hoppers/init.lua | 1 - 21 files changed, 9 insertions(+), 31 deletions(-) create mode 100644 mods/CORE/mcl_formspec_prepend/init.lua create mode 100644 mods/CORE/mcl_formspec_prepend/mod.conf diff --git a/mods/CORE/mcl_formspec_prepend/init.lua b/mods/CORE/mcl_formspec_prepend/init.lua new file mode 100644 index 0000000000..8babbd7287 --- /dev/null +++ b/mods/CORE/mcl_formspec_prepend/init.lua @@ -0,0 +1,6 @@ +minetest.register_on_joinplayer(function(player) + local bg = ""--"bgcolor[#080808BB;true]" + local slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]" + local prepend = bg .. slots +-- player:set_formspec_prepend(prepend) +end) diff --git a/mods/CORE/mcl_formspec_prepend/mod.conf b/mods/CORE/mcl_formspec_prepend/mod.conf new file mode 100644 index 0000000000..b724158a46 --- /dev/null +++ b/mods/CORE/mcl_formspec_prepend/mod.conf @@ -0,0 +1,2 @@ +name = mcl_formspec_prepend +description = Set formspec prepend string for all players diff --git a/mods/CORE/mcl_init/init.lua b/mods/CORE/mcl_init/init.lua index de50bf00af..fda683e0a8 100644 --- a/mods/CORE/mcl_init/init.lua +++ b/mods/CORE/mcl_init/init.lua @@ -1,13 +1,6 @@ -- Some global variables (don't overwrite them!) mcl_vars = {} ---- GUI / inventory menu colors -mcl_vars.gui_slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]" -mcl_vars.gui_bg = "bgcolor[#080808BB;true]" -mcl_vars.gui_bg_img = "" - -mcl_vars.inventory_header = mcl_vars.gui_slots .. mcl_vars.gui_bg - -- Mapgen variables local mg_name = minetest.get_mapgen_setting("mg_name") local minecraft_height_limit = 256 diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index e2d91310dc..d96dfd1694 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -491,7 +491,6 @@ local function show_trade_formspec(playername, trader, tradenum) "size[9,8.75]" .."background[-0.19,-0.25;9.41,9.49;mobs_mc_trading_formspec_bg.png]" ..disabled_img - ..mcl_vars.inventory_header .."label[4,0;"..minetest.formspec_escape(profession).."]" .."list[current_player;main;0,4.5;9,3;9]" .."list[current_player;main;0,7.74;9,1;]" diff --git a/mods/HELP/mcl_craftguide/init.lua b/mods/HELP/mcl_craftguide/init.lua index 6b3d413283..a8c75cbf6e 100644 --- a/mods/HELP/mcl_craftguide/init.lua +++ b/mods/HELP/mcl_craftguide/init.lua @@ -315,8 +315,6 @@ function craftguide:get_formspec(player_name, is_fuel) data.pagemax = max(1, ceil(#data.items / ipp)) local formspec = "size["..data.iX..","..(iY+3)..".6;]".. - mcl_vars.gui_slots .. - mcl_vars.gui_bg .. [=[background[1,1;1,1;craftguide_bg.png;true] button[2.4,0.21;0.8,0.5;search;?] button[3.05,0.21;0.8,0.5;clear;X] diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index fcc8efddb4..9bcf52bd82 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -378,7 +378,6 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz end formspec = "size[10,9.3]".. - mcl_vars.inventory_header.. "background[-0.19,-0.25;10.5,9.87;"..inv_bg.."]".. "label[-5,-5;"..name.."]".. tab(name, "blocks") .. diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index bed3c48502..cea5ffd010 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -86,7 +86,6 @@ local function set_inventory(player, armor_change_only) local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png]".. - mcl_vars.inventory_header.. player_preview.. --armor "list[detached:"..player_name.."_armor;armor;0,0;1,1;1]".. diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt index c17d2db096..a6648be24f 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt @@ -1,4 +1,3 @@ -mcl_init mesecons mcl_sounds mcl_tnt diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua index 2c3c6b7892..98b297a426 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua @@ -13,7 +13,6 @@ local setup_dispenser = function(pos) -- Set formspec and inventory local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_inventory_9_slots.png]".. - mcl_vars.inventory_header.. "image[3,-0.2;5,0.75;mcl_dispensers_fnt_dispenser.png]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/depends.txt b/mods/ITEMS/REDSTONE/mcl_droppers/depends.txt index d8d7ca50fb..3abc2f2499 100644 --- a/mods/ITEMS/REDSTONE/mcl_droppers/depends.txt +++ b/mods/ITEMS/REDSTONE/mcl_droppers/depends.txt @@ -1,4 +1,3 @@ -mcl_init mesecons mcl_util doc? diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua index be42e79a4f..baa453e762 100644 --- a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua @@ -13,7 +13,6 @@ local setup_dropper = function(pos) -- Set formspec and inventory local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_inventory_9_slots.png]".. - mcl_vars.inventory_header.. "image[3,-0.2;5,0.75;mcl_droppers_fnt_dropper.png]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. diff --git a/mods/ITEMS/mcl_anvils/depends.txt b/mods/ITEMS/mcl_anvils/depends.txt index 021df7cb09..a2749e992d 100644 --- a/mods/ITEMS/mcl_anvils/depends.txt +++ b/mods/ITEMS/mcl_anvils/depends.txt @@ -1,4 +1,3 @@ -mcl_init mcl_sounds mcl_core? screwdriver? diff --git a/mods/ITEMS/mcl_anvils/init.lua b/mods/ITEMS/mcl_anvils/init.lua index 8b3717a348..790541cbe7 100644 --- a/mods/ITEMS/mcl_anvils/init.lua +++ b/mods/ITEMS/mcl_anvils/init.lua @@ -15,7 +15,6 @@ local function get_anvil_formspec(set_name) end return "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;mcl_anvils_inventory.png]".. - mcl_vars.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[context;input;1,2.5;1,1;]".. diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua index 0f57160982..e91094812c 100644 --- a/mods/ITEMS/mcl_beds/functions.lua +++ b/mods/ITEMS/mcl_beds/functions.lua @@ -196,7 +196,7 @@ end local function update_formspecs(finished) local ges = #minetest.get_connected_players() - local form_n = "size[8,15;true]" + local form_n = "size[8,15;true]no_prepend[]" local all_in_bed = ges == player_in_bed local night_skip = is_night_skip_enabled() local button_leave = "button_exit[2,12;4,0.75;leave;Leave bed]" diff --git a/mods/ITEMS/mcl_chests/depends.txt b/mods/ITEMS/mcl_chests/depends.txt index cd00aa229c..1140241306 100644 --- a/mods/ITEMS/mcl_chests/depends.txt +++ b/mods/ITEMS/mcl_chests/depends.txt @@ -1,4 +1,3 @@ -mcl_init mcl_core mcl_sounds mcl_end diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua index 57c991ce3f..770e05baeb 100644 --- a/mods/ITEMS/mcl_chests/init.lua +++ b/mods/ITEMS/mcl_chests/init.lua @@ -170,7 +170,6 @@ minetest.register_node("mcl_chests:"..basename, { minetest.show_formspec(clicker:get_player_name(), "mcl_chests:"..formspec_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, "size[9,8.75]".. - mcl_vars.inventory_header.. "background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]".. "image[0,-0.2;5,0.75;mcl_chests_fnt_chest.png]".. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. @@ -293,7 +292,6 @@ minetest.register_node("mcl_chests:"..basename.."_left", { "mcl_chests:"..formspec_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, "size[9,11.5]".. "background[-0.19,-0.25;9.41,12.5;mcl_chests_inventory_chest_large.png]".. - mcl_vars.inventory_header.. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. "list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,3.5;9,3;]".. "list[current_player;main;0,7.5;9,3;9]".. @@ -415,7 +413,6 @@ minetest.register_node("mcl_chests:"..basename.."_right", { "size[9,11.5]".. "background[-0.19,-0.25;9.41,12.5;mcl_chests_inventory_chest_large.png]".. - mcl_vars.inventory_header.. "list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,0.5;9,3;]".. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3.5;9,3;]".. "list[current_player;main;0,7.5;9,3;9]".. @@ -618,7 +615,6 @@ minetest.register_node("mcl_chests:ender_chest", { local meta = minetest.get_meta(pos) meta:set_string("formspec", "size[9,8.75]".. - mcl_vars.inventory_header.. "background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]".. "image[0,-0.2;5,0.75;mcl_chests_fnt_ender_chest.png]".. "list[current_player;enderchest;0,0.5;9,3;]".. @@ -713,7 +709,6 @@ for color, desc in pairs(boxtypes) do local meta = minetest.get_meta(pos) meta:set_string("formspec", "size[9,8.75]".. - mcl_vars.inventory_header.. "background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]".. "image[0,-0.2;5,0.75;mcl_chests_fnt_shulker_box.png]".. "list[current_name;main;0,0.5;9,3;]".. diff --git a/mods/ITEMS/mcl_crafting_table/depends.txt b/mods/ITEMS/mcl_crafting_table/depends.txt index e3b8528c2d..3d96266de1 100644 --- a/mods/ITEMS/mcl_crafting_table/depends.txt +++ b/mods/ITEMS/mcl_crafting_table/depends.txt @@ -1,2 +1 @@ -mcl_init mcl_sounds diff --git a/mods/ITEMS/mcl_crafting_table/init.lua b/mods/ITEMS/mcl_crafting_table/init.lua index 37dc74a291..72ea0a8cda 100644 --- a/mods/ITEMS/mcl_crafting_table/init.lua +++ b/mods/ITEMS/mcl_crafting_table/init.lua @@ -14,7 +14,6 @@ minetest.register_node("mcl_crafting_table:crafting_table", { local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_workbench.png]".. - mcl_vars.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_player;craft;1.75,0.5;3,3;]".. diff --git a/mods/ITEMS/mcl_furnaces/depends.txt b/mods/ITEMS/mcl_furnaces/depends.txt index 441fdfde68..017e4fb6c6 100644 --- a/mods/ITEMS/mcl_furnaces/depends.txt +++ b/mods/ITEMS/mcl_furnaces/depends.txt @@ -1,4 +1,3 @@ -mcl_init mcl_core mcl_sounds mcl_craftguide diff --git a/mods/ITEMS/mcl_furnaces/init.lua b/mods/ITEMS/mcl_furnaces/init.lua index 9a8804fde1..a81a86b362 100644 --- a/mods/ITEMS/mcl_furnaces/init.lua +++ b/mods/ITEMS/mcl_furnaces/init.lua @@ -6,7 +6,6 @@ local function active_formspec(fuel_percent, item_percent) return "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_inventory_furnace.png]".. - mcl_vars.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_name;src;2.75,0.5;1,1;]".. @@ -29,7 +28,6 @@ end local inactive_formspec = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_inventory_furnace.png]".. - mcl_vars.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_name;src;2.75,0.5;1,1;]".. diff --git a/mods/ITEMS/mcl_hoppers/init.lua b/mods/ITEMS/mcl_hoppers/init.lua index c7f7b0b9a9..cced02c6a9 100644 --- a/mods/ITEMS/mcl_hoppers/init.lua +++ b/mods/ITEMS/mcl_hoppers/init.lua @@ -6,7 +6,6 @@ local chest = minetest.get_content_id("mcl_chests:chest") local mcl_hoppers_formspec = "size[9,7]".. "background[-0.19,-0.25;9.41,10.48;mcl_hoppers_inventory.png]".. - mcl_vars.inventory_header.. "list[current_name;main;2,0.5;5,1;]".. "list[current_player;main;0,2.5;9,3;9]".. "list[current_player;main;0,5.74;9,1;]"..