From 0f8bf6145a480ef9b07f7feb9dffe9b5e74d4dce Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 28 Dec 2014 20:47:21 +0000 Subject: [PATCH] Fix incorrect positioning of formspec labels Minetest 0.4.11 broke the positioning, so the labels had to be re-aligned. --- mods/default/init.lua | 2 +- mods/default/nodes.lua | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mods/default/init.lua b/mods/default/init.lua index 8e74909..cc8b861 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -42,7 +42,7 @@ default.gui_suvival_form = "size[8,8.5]".. "label[0,3.75;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. - "label[0,8.2;"..default.gui_controls.."]".. + "label[0,8.4;"..default.gui_controls.."]".. "label[2.75,-0.1;"..minetest.formspec_escape(S("Crafting grid:")).."]".. "list[current_player;craft;2.75,0.5;3,3;]".. "label[6.75,0.9;"..minetest.formspec_escape(S("Output slot:")).."]".. diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 111747c..c6c9dc3 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -260,7 +260,7 @@ function default.chest_formspec() "label[0,4.35;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.85;8,1;]".. "list[current_player;main;0,6.08;8,3;8]".. - "label[0,8.8;"..default.gui_controls.."]".. + "label[0,9;"..default.gui_controls.."]".. default.get_hotbar_bg(0,4.85) end @@ -305,23 +305,23 @@ function default.furnace_active(pos, percent, item_percent) default.gui_bg.. default.gui_bg_img.. default.gui_slots.. - "label[-0.1,-0.4;"..minetest.formspec_escape(S("This furnace is active and constantly burning its fuel.")).."]".. - "label[2.75,0;"..minetest.formspec_escape(S("Source:")).."]".. + "label[-0.1,-0.3;"..minetest.formspec_escape(S("This furnace is active and constantly burning its fuel.")).."]".. + "label[2.75,0.1;"..minetest.formspec_escape(S("Source:")).."]".. "list[current_name;src;2.75,0.5;1,1;]".. - "label[2.75,2.4;"..minetest.formspec_escape(S("Fuel:")).."]".. + "label[2.75,2.5;"..minetest.formspec_escape(S("Fuel:")).."]".. "list[current_name;fuel;2.75,2.9;1,1;]".. - "label[2.75,1.2;"..minetest.formspec_escape(S("Flame:")).."]".. + "label[2.75,1.3;"..minetest.formspec_escape(S("Flame:")).."]".. "image[2.75,1.7;1,1;default_furnace_fire_bg.png^[lowpart:".. (100-percent)..":default_furnace_fire_fg.png]".. - "label[3.75,1.2;"..minetest.formspec_escape(S("Progress:")).."]".. + "label[3.75,1.3;"..minetest.formspec_escape(S("Progress:")).."]".. "image[3.75,1.7;1,1;gui_furnace_arrow_bg.png^[lowpart:".. (item_percent*100)..":gui_furnace_arrow_fg.png^[transformR270]".. - "label[4.75,0.66;"..minetest.formspec_escape(S("Output slots:")).."]".. + "label[4.75,0.76;"..minetest.formspec_escape(S("Output slots:")).."]".. "list[current_name;dst;4.75,1.16;2,2;]".. "label[0,3.75;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. - "label[0,8.2;"..default.gui_controls.."]".. + "label[0,8.4;"..default.gui_controls.."]".. default.get_hotbar_bg(0,4.25) return formspec end @@ -347,21 +347,21 @@ default.furnace_inactive_formspec = default.gui_bg.. default.gui_bg_img.. default.gui_slots.. - "label[-0.1,-0.4;"..minetest.formspec_escape(S("This furnace is inactive. Read the instructions to learn how to activate it.")).."]".. - "label[2.75,0;"..minetest.formspec_escape(S("Source:")).."]".. + "label[-0.1,-0.3;"..minetest.formspec_escape(S("This furnace is inactive. Read the instructions to learn how to activate it.")).."]".. + "label[2.75,0.1;"..minetest.formspec_escape(S("Source:")).."]".. "list[current_name;src;2.75,0.5;1,1;]".. - "label[2.75,2.4;"..minetest.formspec_escape(S("Fuel:")).."]".. + "label[2.75,2.5;"..minetest.formspec_escape(S("Fuel:")).."]".. "list[current_name;fuel;2.75,2.9;1,1;]".. - "label[2.75,1.2;"..minetest.formspec_escape(S("Flame:")).."]".. + "label[2.75,1.3;"..minetest.formspec_escape(S("Flame:")).."]".. "image[2.75,1.7;1,1;default_furnace_fire_bg.png]".. - "label[3.75,1.2;"..minetest.formspec_escape(S("Progress:")).."]".. + "label[3.75,1.3;"..minetest.formspec_escape(S("Progress:")).."]".. "image[3.75,1.7;1,1;gui_furnace_arrow_bg.png^[transformR270]".. - "label[4.75,0.66;"..minetest.formspec_escape(S("Output slots:")).."]".. + "label[4.75,0.76;"..minetest.formspec_escape(S("Output slots:")).."]".. "list[current_name;dst;4.75,1.16;2,2;]".. "label[0,3.75;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. - "label[0,8.2;"..default.gui_controls.."]".. + "label[0,8.4;"..default.gui_controls.."]".. default.get_hotbar_bg(0,4.25) minetest.register_node("default:furnace", { -- 2.11.4.GIT