From 49ad1c1bf7f1c17004e1f8eb5475bff9e85afe80 Mon Sep 17 00:00:00 2001 From: BlockMen Date: Sun, 1 Jun 2014 10:49:50 +0200 Subject: [PATCH] Make gui part of default --- mods/creative/init.lua | 6 +++--- mods/default/init.lua | 14 +++++++------- mods/default/nodes.lua | 30 +++++++++++++++--------------- mods/default/player.lua | 12 ++++-------- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/mods/creative/init.lua b/mods/creative/init.lua index ce49ab20..41282b18 100644 --- a/mods/creative/init.lua +++ b/mods/creative/init.lua @@ -75,9 +75,9 @@ creative_inventory.set_creative_formspec = function(player, start_i, pagenum) player:set_inventory_formspec( "size[13,7.5]".. --"image[6,0.6;1,2;player.png]".. - gui_bg.. - gui_bg_img.. - gui_slots.. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[current_player;main;5,3.5;8,1;]".. "list[current_player;main;5,4.75;8,3;8]".. "list[current_player;craft;8,0;3,3;]".. diff --git a/mods/default/init.lua b/mods/default/init.lua index fc7e9008..7c3d077d 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -12,9 +12,9 @@ LIGHT_MAX = 14 default = {} -- GUI related stuff -gui_bg = "bgcolor[#080808BB;true]" -gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]" -gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]" +default.gui_bg = "bgcolor[#080808BB;true]" +default.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]" +default.gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]" function default.get_hotbar_bg(x,y) local out = "" @@ -24,10 +24,10 @@ function default.get_hotbar_bg(x,y) return out end -gui_suvival_form = "size[8,8.5]".. - gui_bg.. - gui_bg_img.. - gui_slots.. +default.gui_suvival_form = "size[8,8.5]".. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. "list[current_player;craft;1.75,0.5;3,3;]".. diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index aff25b6d..93d6981c 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -378,9 +378,9 @@ minetest.register_node("default:papyrus", { default.bookshelf_formspec = "size[8,7;]".. - gui_bg.. - gui_bg_img.. - gui_slots.. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[context;books;0,0.3;8,2;]".. "list[current_player;main;0,2.85;8,1;]".. "list[current_player;main;0,4.08;8,3;8]".. @@ -733,9 +733,9 @@ minetest.register_node("default:sign_wall", { default.chest_formspec = "size[8,9]".. - gui_bg.. - gui_bg_img.. - gui_slots.. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[current_name;main;0,0.3;8,4;]".. "list[current_player;main;0,4.85;8,1;]".. "list[current_player;main;0,6.08;8,3;8]".. @@ -745,9 +745,9 @@ function default.get_locked_chest_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," ..pos.z local formspec = "size[8,9]".. - gui_bg.. - gui_bg_img.. - gui_slots.. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]".. "list[current_player;main;0,4.85;8,1;]".. "list[current_player;main;0,6.08;8,3;8]".. @@ -869,9 +869,9 @@ minetest.register_node("default:chest_locked", { function default.furnace_active(pos, percent, item_percent) local formspec = "size[8,8.5]".. - gui_bg.. - gui_bg_img.. - gui_slots.. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[current_name;src;2.75,0.5;1,1;]".. "list[current_name;fuel;2.75,2.5;1,1;]".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. @@ -903,9 +903,9 @@ end default.furnace_inactive_formspec = "size[8,8.5]".. - gui_bg.. - gui_bg_img.. - gui_slots.. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. "list[current_name;src;2.75,0.5;1,1;]".. "list[current_name;fuel;2.75,2.5;1,1;]".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. diff --git a/mods/default/player.lua b/mods/default/player.lua index f804b6fe..0498b19f 100644 --- a/mods/default/player.lua +++ b/mods/default/player.lua @@ -146,15 +146,11 @@ minetest.register_on_joinplayer(function(player) player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30) -- set GUI - if minetest.setting_getbool("creative_mode") then - -- creative.set_creative_formspec(player, 0, 1) - else - player:set_inventory_formspec(gui_suvival_form) + if not minetest.setting_getbool("creative_mode") then + player:set_inventory_formspec(default.gui_suvival_form) end - minetest.after(0.5,function() - player:hud_set_hotbar_image("gui_hotbar.png") - player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") - end) + player:hud_set_hotbar_image("gui_hotbar.png") + player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") end) minetest.register_on_leaveplayer(function(player) -- 2.25.1