From a5d3c12edfadd0cb76237f6f990490294c2594f7 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 5 Jan 2017 06:12:50 +0100 Subject: [PATCH] Some style unification --- mods/default/init.lua | 2 ++ mods/default/nodes.lua | 18 ++++++++++++++++-- mods/inventory/api.lua | 12 +++++++++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/mods/default/init.lua b/mods/default/init.lua index c23f2be1..640422a0 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -8,6 +8,8 @@ LAVA_VISC = 7 -- Definitions made by this mod that other mods can use too default = {} +default.gui_slots = "listcolors[#808080FF;#CFCFCFFF;#00000000;#000000FF;#FFFFFFFF]" +default.inventory_header = default.gui_slots minetest.nodedef_default.stack_max = 64 minetest.craftitemdef_default.stack_max = 64 diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index d6dc2ef9..7ca40591 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1332,11 +1332,18 @@ minetest.register_node("default:chest_right", { default.furnace_inactive_formspec = "size[9,9]".. + default.inventory_header.. "image[2,2;1,1;default_furnace_fire_bg.png]".. "list[current_name;fuel;2,3;1,1;]".. "list[current_name;src;2,1;1,1;]".. "list[current_name;dst;5,1;2,2;]".. - "list[current_player;main;0,5;9,4;]" + "list[current_player;main;0,5;9,4;]".. + "listring[current_name;dst]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;fuel]".. + "listring[current_player;main]" minetest.register_node("default:furnace", { description = "Furnace", @@ -1547,12 +1554,19 @@ minetest.register_abm({ hacky_swap_node(pos,"default:furnace_active") meta:set_string("formspec", "size[9,9]".. + default.inventory_header.. "image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:".. (100-percent)..":default_furnace_fire_fg.png]".. "list[current_name;fuel;2,3;1,1;]".. "list[current_name;src;2,1;1,1;]".. "list[current_name;dst;5,1;2,2;]".. - "list[current_player;main;0,5;9,4;]") + "list[current_player;main;0,5;9,4;]".. + "listring[current_name;dst]".. + "listring[current_player;main]".. + "listring[current_name;src]".. + "listring[current_player;main]".. + "listring[current_name;fuel]".. + "listring[current_player;main]") return end diff --git a/mods/inventory/api.lua b/mods/inventory/api.lua index 90b46522..345f14ef 100644 --- a/mods/inventory/api.lua +++ b/mods/inventory/api.lua @@ -4,7 +4,9 @@ SURVIVAL_FORMSPEC = ""; function inventory.creative_inv(player) local name = player:get_player_name() -CREATIVE_FORMSPEC = "invsize[11,9.75;]".. +CREATIVE_FORMSPEC = + "invsize[11,9.75;]".. + default.inventory_header.. --"background[-0.25,1;10.5,8;inventory_creative_inventory_bg.png]".. "button[9.5,0;1.5,1.5;creative_search;Search]".. "list[detached:"..name.."_armor;armor_head;0.25,1.25;1,1;]".. @@ -25,7 +27,9 @@ end function inventory.survival_inv(player) local name = player:get_player_name() - SURVIVAL_FORMSPEC = "invsize[9,9.5;]".. + SURVIVAL_FORMSPEC = + "invsize[9,9.5;]".. + default.inventory_header.. --"background[-0.4,-0.45;9.8,9.825;inventory_survival_inventory_bg.png]".. "list[detached:"..name.."_armor;armor_head;0,0;1,1;]".. "list[detached:"..name.."_armor;armor_torso;0,1;1,1;]".. @@ -54,7 +58,9 @@ local name = player:get_player_name() player:set_inventory_formspec(SURVIVAL_FORMSPEC) end -CRAFTING_FORMSPEC = "size[9,8.5]".. +CRAFTING_FORMSPEC = +"size[9,8.5]".. +default.inventory_header.. "background[-0.4,-0.5;9.78,9.5;inventory_crafting_inventory_bg.png]".. "list[current_player;main;0,4.32;9,4;9]".. "list[current_player;main;0,7.6;9,1;]"..