diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index 1ad1e199..63f985ae 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -60,7 +60,7 @@ local function get_bg(tsize, tabname) tabname = tabname or "common" return "background[0,0;" .. tsize.width .. "," .. tsize.height .. ";" .. core.formspec_escape(defaulttexturedir .. - "multicraft_" .. tabname .. "_bg.png") .. ";true]" + "bg_" .. tabname .. ".png") .. ";true]" end -------------------------------------------------------------------------------- diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index ee7fc653..34663317 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -31,22 +31,22 @@ local function get_formspec(tabview, name, tabdata) ) retval = retval .. - "image_button[0,4.8;3.375,0.9;" .. + "image_button[0,4.84;3.31,0.92;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_delete_btn.png") .. ";world_delete;;true;false]" .. - "image_button[3.12,4.8;3.375,0.9;" .. + "blank.png") .. ";world_delete;;true;false]" .. + "image_button[3.14,4.84;3.3,0.92;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_new_btn.png") .. ";world_create;;true;false]" + "blank.png") .. ";world_create;;true;false]" local creative_mode = core.settings:get_bool("creative_mode") retval = retval .. - "image_button[6.8,1.5;5,1.3;" .. + "image_button[6.72,1.43;4.96,1.41;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_play_btn.png") .. ";play;;true;false]" .. - "image_button[7.5,3.15;3.8,0.95;" .. + "blank.png") .. ";play;;true;false]" .. + "image_button[7.33,3.09;3.73,0.86;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_creative_" .. + "local_creative_" .. tostring(creative_mode) .. "_btn.png") .. ";cb_creative_mode;;true;false]" .. "textlist[0,0;6.24,4.6;sp_worlds;" .. diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua index 8448daad..fd919a2f 100644 --- a/builtin/mainmenu/tab_online.lua +++ b/builtin/mainmenu/tab_online.lua @@ -33,8 +33,10 @@ local function get_formspec(tabview, name, tabdata) local retval = -- Search - "field[0.15,0.5;6.05,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]".. - "button[5.8,0.25;2,0.1;btn_mp_search;" .. fgettext("Search") .. "]" .. + "field[0.15,0.075;5.91,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" .. + "button[5.62,-0.25;1.5,1;btn_mp_search;" .. fgettext("Search") .. "]" .. + "image_button[6.97,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png") + .. ";btn_mp_refresh;" .. fgettext("") .. "]" .. -- Address / Port "label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" .. @@ -299,6 +301,11 @@ local function main_button_handler(tabview, fields, name, tabdata) return true end + if fields.btn_mp_refresh then + asyncOnlineFavourites() + return true + end + if (fields.btn_mp_connect or fields.key_enter) and fields.te_address ~= "" and fields.te_port then gamedata.playername = fields.te_name diff --git a/textures/base/bg_common.png b/textures/base/bg_common.png new file mode 100644 index 00000000..046effa6 Binary files /dev/null and b/textures/base/bg_common.png differ diff --git a/textures/base/bg_local.png b/textures/base/bg_local.png new file mode 100644 index 00000000..8d8a6eef Binary files /dev/null and b/textures/base/bg_local.png differ diff --git a/textures/base/local_creative_false_btn.png b/textures/base/local_creative_false_btn.png new file mode 100644 index 00000000..5ac15e66 Binary files /dev/null and b/textures/base/local_creative_false_btn.png differ diff --git a/textures/base/local_creative_true_btn.png b/textures/base/local_creative_true_btn.png new file mode 100644 index 00000000..198fe53b Binary files /dev/null and b/textures/base/local_creative_true_btn.png differ diff --git a/textures/base/multicraft_common_bg.png b/textures/base/multicraft_common_bg.png deleted file mode 100644 index b71e5049..00000000 Binary files a/textures/base/multicraft_common_bg.png and /dev/null differ diff --git a/textures/base/multicraft_local_bg.png b/textures/base/multicraft_local_bg.png deleted file mode 100644 index af16d09b..00000000 Binary files a/textures/base/multicraft_local_bg.png and /dev/null differ diff --git a/textures/base/multicraft_local_creative_false_btn.png b/textures/base/multicraft_local_creative_false_btn.png deleted file mode 100644 index e9fbb982..00000000 Binary files a/textures/base/multicraft_local_creative_false_btn.png and /dev/null differ diff --git a/textures/base/multicraft_local_creative_true_btn.png b/textures/base/multicraft_local_creative_true_btn.png deleted file mode 100644 index 2d9722ea..00000000 Binary files a/textures/base/multicraft_local_creative_true_btn.png and /dev/null differ diff --git a/textures/base/multicraft_local_delete_btn.png b/textures/base/multicraft_local_delete_btn.png deleted file mode 100644 index 013530f1..00000000 Binary files a/textures/base/multicraft_local_delete_btn.png and /dev/null differ diff --git a/textures/base/multicraft_local_new_btn.png b/textures/base/multicraft_local_new_btn.png deleted file mode 100644 index 74572059..00000000 Binary files a/textures/base/multicraft_local_new_btn.png and /dev/null differ diff --git a/textures/base/multicraft_local_play_btn.png b/textures/base/multicraft_local_play_btn.png deleted file mode 100644 index b55a4b91..00000000 Binary files a/textures/base/multicraft_local_play_btn.png and /dev/null differ diff --git a/textures/base/refresh.png b/textures/base/refresh.png new file mode 100644 index 00000000..3e087c2a Binary files /dev/null and b/textures/base/refresh.png differ