diff --git a/.gitignore b/.gitignore index 1cfca5fc2..0be7d139b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,8 +55,6 @@ build/.cmake/ /clientmods/* !/clientmods/preview/ /client/mod_storage/ -/builtin/mainmenu/hosting/ -/textures/base/pack/hosting/ ## Configuration/log files multicraft.conf diff --git a/README.md b/README.md index cdeb0b417..638b7d4f1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ MultiCraft Open Source is a free open-source voxel game engine with easy modding MultiCraft is based on the Minetest project, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors). -Copyright © 2014-2022 Maksim Gamarnik [MoNTE48] & MultiCraft Development Team. +Copyright © 2014-2023 Maksim Gamarnik [MoNTE48] & MultiCraft Development Team. [![License](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://jb.gg/OpenSourceSupport) diff --git a/builtin/common/btn_style.lua b/builtin/common/btn_style.lua index 64d3e314b..a7a4919f2 100644 --- a/builtin/common/btn_style.lua +++ b/builtin/common/btn_style.lua @@ -25,7 +25,7 @@ function btn_style(field, color) "style[" .. field .. ";bgimg=" .. button_path .. "gui_button" .. color .. btn_size .. ".png;bgimg_middle=" .. (is_high_dpi() and 48 or 32) .. ";padding=" .. (is_high_dpi() and -36 or -24) .. "]" - if color ~= "_gray" then + if color ~= "_gray" and color:sub(-8) ~= "_pressed" then retval = retval .. "style[" .. field .. ":hovered;bgimg=" .. button_path .. "gui_button" .. color .. "_hovered" .. btn_size .. ".png]" .. diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index 1ed4d3abf..899916a17 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -248,25 +248,20 @@ local function button_header(self) for i = 1, #visible_tabs do local caption = visible_tabs[i].caption -- local w = btn_widths[i] * coords_per_char - local texture = "upper_buttons_middle" + local side = "middle" if i == 1 then - texture = "upper_buttons_left" + side = "left" elseif i == #visible_tabs then - texture = "upper_buttons_right" + side = "right" end local btn_name = self.name .. "_" .. i - toadd = toadd .. - "style[" .. btn_name .. ";padding=-10;bgimg=" .. defaulttexturedir_esc .. - DIR_DELIM_esc .. "gui" .. DIR_DELIM_esc .. texture - if i == math.abs(self.last_tab_index) then - toadd = toadd .. "_selected.png;" - else - toadd = toadd .. ".png;bgimg_hovered=" .. defaulttexturedir_esc .. - DIR_DELIM_esc .. "gui" .. DIR_DELIM_esc .. texture .. "_hover.png;" + side = side .. "_pressed" end - toadd = toadd .. "bgimg_middle=20;content_offset=0]" .. + toadd = toadd .. + btn_style(btn_name, side) .. + "style[" .. btn_name .. ";content_offset=0]" .. "image_button[" .. x .. ",-1.1;" .. w + 0.22 .. ",0.9;;" .. btn_name .. ";" .. caption .. ";true;false]" x = x + w diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua index 388a6ef08..bac35b52c 100644 --- a/builtin/mainmenu/dlg_config_world.lua +++ b/builtin/mainmenu/dlg_config_world.lua @@ -131,7 +131,7 @@ local function get_formspec(data) end retval = retval .. - btn_style("btn_config_world_save") .. + btn_style("btn_config_world_save", "green") .. "button[5.5,7.1;3,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" .. btn_style("btn_config_world_cancel") .. @@ -139,19 +139,21 @@ local function get_formspec(data) fgettext("Cancel") .. "]" .. btn_style("btn_config_world_cdb") .. "button[-0.05,7.1;3.5,0.5;btn_config_world_cdb;" .. - fgettext("Find More Mods") .. "]" + fgettext("Find More Mods") .. "]" .. + "image[0.09,7.05;0.6,0.6;" .. defaulttexturedir_esc .. "gui" .. + DIR_DELIM_esc .. "btn_download.png]" if mod.name ~= "" and not mod.is_game_content then if mod.is_modpack then if pkgmgr.is_modpack_entirely_enabled(data, mod.name) then retval = retval .. - btn_style("btn_mp_disable") .. + btn_style("btn_mp_disable", "yellow") .. "button[5.5,0.025;3,0.5;btn_mp_disable;" .. fgettext("Disable modpack") .. "]" else retval = retval .. - btn_style("btn_mp_enable") .. + btn_style("btn_mp_enable", "green") .. "button[5.5,0.025;3,0.5;btn_mp_enable;" .. fgettext("Enable modpack") .. "]" end @@ -163,12 +165,12 @@ local function get_formspec(data) end if enabled_all then retval = retval .. - btn_style("btn_disable_all_mods") .. + btn_style("btn_disable_all_mods", "yellow") .. "button[8.95,0.025;2.5,0.5;btn_disable_all_mods;" .. fgettext("Disable all") .. "]" else retval = retval .. - btn_style("btn_enable_all_mods") .. + btn_style("btn_enable_all_mods", "green") .. "button[8.95,0.025;2.5,0.5;btn_enable_all_mods;" .. fgettext("Enable all") .. "]" end diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 497adc1e8..8920f6ee4 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -70,7 +70,7 @@ tabs.local_default_game = dofile(menupath .. DIR_DELIM .. "tab_local_default.lua tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua") tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua") -local func = loadfile(menupath .. DIR_DELIM .. "hosting" .. DIR_DELIM .. "init.lua") +local func = loadfile(basepath .. DIR_DELIM .. "hosting" .. DIR_DELIM .. "init.lua") -------------------------------------------------------------------------------- local function main_event_handler(tabview, event) diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index d38315899..98190a3bb 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -23,13 +23,14 @@ local multicraft_developers = { "Alexander Zavrin (Ransom.00) ", "Luke (luk3yx) ", "Nathan Salapat (NathanS21) ", - "Vitaliy Lobachevskiy (numberZero) ", "Abdullaah Iqbal (An0n3m0us) ", "ElCeejo", + "Dawid Gan (deveee) ", + "Vitaliy Lobachevskiy (numberZero) ", "Jean-Patrick Guerrero (kilbith) ", "sfan5 ", "Stuart Jones (stujones11) ", - "And other people who helped make the world better!" + "And other people who have helped make the world better!" } local core_developers = { @@ -121,7 +122,7 @@ return { local fs = "image[-0.25,-0.3;2,2;" .. logofile .. "]" .. "label[1.3,-0.25;" .. "MultiCraft Open Source, ver. " .. version.string .. "\n" .. - "Copyright (C) 2014-2022 MultiCraft Development Team\n" .. + "Copyright (C) 2014–" .. os.date("%Y") .. " MultiCraft Development Team\n" .. "License: GNU LGPLv3.0+ and CC BY-SA 4.0\n" .. "Created and Powered by Minetest Engine, ver. 5.4.1]" .. @@ -157,14 +158,14 @@ return { end, cbf_button_handler = function(this, fields, name, tabdata) if fields.homepage then - core.open_url("http://multicraft.world") + core.open_url("https://multicraft.world") end if fields.privacy then - core.open_url("http://multicraft.world/privacy") + core.open_url("https://multicraft.world/privacy") end - if fields.userdata then + --[[if fields.userdata then core.open_dir(core.get_user_path()) - end + end]] end, } diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index 20ed8ded7..4dde40984 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -120,22 +120,23 @@ local function get_formspec(_, _, tab_data) local space = small_screen and ("\n"):rep(3) or ("\n"):rep(5) local retval = - "style[world_delete;fgimg=" .. defaulttexturedir_esc .. - "world_delete.png;fgimg_hovered=" .. defaulttexturedir_esc .. "world_delete_hover.png]" .. - "image_button[-0.1,4.84;3.45,0.92;;world_delete;;true;false]" .. - "tooltip[world_delete;".. fgettext("Delete") .. "]" .. + "style[world_delete,world_create,world_configure;font_size=*" .. + (small_screen and 1.2 or 1.5) .. "]" .. + btn_style("world_delete", "left") .. + "image_button[-0.12,4.85;3.48,0.9;;world_delete;" .. fgettext("Delete") .. ";true;false]" .. + "image[0.1,5;0.5,0.5;" .. defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc .. "world_delete.png]" .. - "style[world_create;fgimg=" .. defaulttexturedir_esc .. - "world_new.png;fgimg_hovered=" .. defaulttexturedir_esc .. "world_new_hover.png]" .. - "image_button[3.15,4.84;3.45,0.92;;world_create;;true;false]" .. - "tooltip[world_create;".. fgettext("New") .. "]" + btn_style("world_create", "right") .. + "image_button[3.14,4.85;3.48,0.9;;world_create;".. fgettext("Create") .. ";true;false]" .. + "image[3.35,5;0.5,0.5;" .. defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc .. "world_create.png]" local world = menudata.worldlist:get_list()[index] local game = world and pkgmgr.find_by_gameid(world.gameid) if game and game.moddable then retval = retval .. btn_style("world_configure") .. - "image_button[9,4.84;3,0.92;;world_configure;" .. fgettext("Select Mods") .. ";true;false]" + "image_button[8.1,4.85;4,0.9;;world_configure;" .. fgettext("Select Mods") .. ";true;false]" .. + "image[8.3,5.02;0.5,0.5;" .. defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc .. "world_settings.png]" end retval = retval .. @@ -157,8 +158,9 @@ local function get_formspec(_, _, tab_data) if tab_data.hidden then retval = retval .. + btn_style("switch_local_default") .. "style[switch_local_default;fgimg=" .. defaulttexturedir_esc .. "switch_local_default.png;fgimg_hovered=" .. - defaulttexturedir_esc .. "switch_local_default_hover.png]" .. + defaulttexturedir_esc .. "switch_local_default_hover.png;padding=" .. (is_high_dpi() and -42 or -30) .. "]" .. "image_button[10.6,-0.1;1.5,1.5;;switch_local_default;;true;false]" end @@ -289,11 +291,17 @@ local function main_button_handler(this, fields, name, tab_data) end if fields["world_create"] ~= nil then - local create_world_dlg = create_create_world_dlg(true) - create_world_dlg:set_parent(this) + local dlg + if #pkgmgr.games > 1 or (pkgmgr.games[1] and pkgmgr.games[1].id ~= "default") then + mm_texture.update("singleplayer", current_game()) + dlg = create_create_world_dlg(true) + else + dlg = create_store_dlg("game") + end + + dlg:set_parent(this) this:hide() - create_world_dlg:show() - mm_texture.update("singleplayer", current_game()) + dlg:show() return true end diff --git a/builtin/mainmenu/tab_local_default.lua b/builtin/mainmenu/tab_local_default.lua index 4f9074252..c999b2bc4 100644 --- a/builtin/mainmenu/tab_local_default.lua +++ b/builtin/mainmenu/tab_local_default.lua @@ -89,15 +89,15 @@ local function get_formspec(this) local space = small_screen and ("\n"):rep(3) or ("\n"):rep(5) local retval = - "style[world_delete;fgimg=" .. defaulttexturedir_esc .. - "world_delete.png;fgimg_hovered=" .. defaulttexturedir_esc .. "world_delete_hover.png]" .. - "image_button[-0.1,4.84;3.45,0.92;;world_delete;;true;false]" .. - "tooltip[world_delete;".. fgettext("Delete") .. "]" .. + "style[world_delete,world_create;font_size=*" .. + (small_screen and 1.2 or 1.5) .. "]" .. + btn_style("world_delete", "left") .. + "image_button[-0.12,4.85;3.48,0.9;;world_delete;" .. fgettext("Delete") .. ";true;false]" .. + "image[0.1,5;0.5,0.5;" .. defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc .. "world_delete.png]" .. - "style[world_create;fgimg=" .. defaulttexturedir_esc .. - "world_new.png;fgimg_hovered=" .. defaulttexturedir_esc .. "world_new_hover.png]" .. - "image_button[3.15,4.84;3.45,0.92;;world_create;;true;false]" .. - "tooltip[world_create;".. fgettext("New") .. "]" .. + btn_style("world_create", "right") .. + "image_button[3.14,4.85;3.48,0.9;;world_create;".. fgettext("Create") .. ";true;false]" .. + "image[3.35,5;0.5,0.5;" .. defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc .. "world_create.png]" .. btn_style("play") .. "style[play;font_size=*" .. (small_screen and 2.25 or 3) .. "]" .. @@ -115,17 +115,11 @@ local function get_formspec(this) "tableoptions[background=#0000;border=false]" .. "table[0,0;6.28,4.64;sp_worlds;" .. menu_render_worldlist() .. ";" .. index .. "]" .. + btn_style("switch_local") .. "style[switch_local;fgimg=" .. defaulttexturedir_esc .. "switch_local.png;fgimg_hovered=" .. - defaulttexturedir_esc .. "switch_local_hover.png]" .. + defaulttexturedir_esc .. "switch_local_hover.png;padding=" .. (is_high_dpi() and -42 or -30) .. "]" .. "image_button[10.6,-0.1;1.5,1.5;;switch_local;;true;false]" - if PLATFORM == "Android" then - retval = retval .. - "image_button[6.6,-0.1;1.5,1.5;" .. - defaulttexturedir_esc .. "gift_btn.png;upgrade;;true;false;" .. - defaulttexturedir_esc .. "gift_btn_pressed.png]" - end - local enable_server = core.settings:get_bool("enable_server") if enable_server then retval = retval .. @@ -274,10 +268,6 @@ local function main_button_handler(this, fields, name) return true end - if fields["upgrade"] then - core.upgrade("") - end - --[[if fields["world_configure"] ~= nil then local selected = core.get_table_index("sp_worlds") if selected ~= nil then diff --git a/textures/base/pack/gift_btn.png b/textures/base/pack/gift_btn.png deleted file mode 100644 index 240ca4f8d..000000000 Binary files a/textures/base/pack/gift_btn.png and /dev/null differ diff --git a/textures/base/pack/gift_btn_pressed.png b/textures/base/pack/gift_btn_pressed.png deleted file mode 100644 index 240ca4f8d..000000000 Binary files a/textures/base/pack/gift_btn_pressed.png and /dev/null differ diff --git a/textures/base/pack/gui/authors_menu.png b/textures/base/pack/gui/authors_menu.png index bd08e286a..091e5609c 100644 Binary files a/textures/base/pack/gui/authors_menu.png and b/textures/base/pack/gui/authors_menu.png differ diff --git a/textures/base/pack/gui/authors_menu_hover.png b/textures/base/pack/gui/authors_menu_hover.png index ad97a892c..143603e05 100644 Binary files a/textures/base/pack/gui/authors_menu_hover.png and b/textures/base/pack/gui/authors_menu_hover.png differ diff --git a/textures/base/pack/gui/authors_menu_selected.png b/textures/base/pack/gui/authors_menu_selected.png index 92f42dab6..4d2ce7fb4 100644 Binary files a/textures/base/pack/gui/authors_menu_selected.png and b/textures/base/pack/gui/authors_menu_selected.png differ diff --git a/textures/base/pack/gui/gui_button_left.png b/textures/base/pack/gui/gui_button_left.png new file mode 100644 index 000000000..f00837d47 Binary files /dev/null and b/textures/base/pack/gui/gui_button_left.png differ diff --git a/textures/base/pack/gui/gui_button_left.x2.png b/textures/base/pack/gui/gui_button_left.x2.png new file mode 100644 index 000000000..e8aaa9227 Binary files /dev/null and b/textures/base/pack/gui/gui_button_left.x2.png differ diff --git a/textures/base/pack/gui/gui_button_left_hovered.png b/textures/base/pack/gui/gui_button_left_hovered.png new file mode 100644 index 000000000..52a31f6b6 Binary files /dev/null and b/textures/base/pack/gui/gui_button_left_hovered.png differ diff --git a/textures/base/pack/gui/gui_button_left_hovered.x2.png b/textures/base/pack/gui/gui_button_left_hovered.x2.png new file mode 100644 index 000000000..046e307bc Binary files /dev/null and b/textures/base/pack/gui/gui_button_left_hovered.x2.png differ diff --git a/textures/base/pack/gui/gui_button_left_pressed.png b/textures/base/pack/gui/gui_button_left_pressed.png new file mode 100644 index 000000000..5dbd1a607 Binary files /dev/null and b/textures/base/pack/gui/gui_button_left_pressed.png differ diff --git a/textures/base/pack/gui/gui_button_left_pressed.x2.png b/textures/base/pack/gui/gui_button_left_pressed.x2.png new file mode 100644 index 000000000..fbb38a450 Binary files /dev/null and b/textures/base/pack/gui/gui_button_left_pressed.x2.png differ diff --git a/textures/base/pack/gui/gui_button_middle.png b/textures/base/pack/gui/gui_button_middle.png new file mode 100644 index 000000000..a1aadf4cc Binary files /dev/null and b/textures/base/pack/gui/gui_button_middle.png differ diff --git a/textures/base/pack/gui/gui_button_middle.x2.png b/textures/base/pack/gui/gui_button_middle.x2.png new file mode 100644 index 000000000..87bb871a7 Binary files /dev/null and b/textures/base/pack/gui/gui_button_middle.x2.png differ diff --git a/textures/base/pack/gui/gui_button_middle_hovered.png b/textures/base/pack/gui/gui_button_middle_hovered.png new file mode 100644 index 000000000..d05d26164 Binary files /dev/null and b/textures/base/pack/gui/gui_button_middle_hovered.png differ diff --git a/textures/base/pack/gui/gui_button_middle_hovered.x2.png b/textures/base/pack/gui/gui_button_middle_hovered.x2.png new file mode 100644 index 000000000..30f42664b Binary files /dev/null and b/textures/base/pack/gui/gui_button_middle_hovered.x2.png differ diff --git a/textures/base/pack/gui/gui_button_middle_pressed.png b/textures/base/pack/gui/gui_button_middle_pressed.png new file mode 100644 index 000000000..848b51036 Binary files /dev/null and b/textures/base/pack/gui/gui_button_middle_pressed.png differ diff --git a/textures/base/pack/gui/gui_button_middle_pressed.x2.png b/textures/base/pack/gui/gui_button_middle_pressed.x2.png new file mode 100644 index 000000000..9bc11425b Binary files /dev/null and b/textures/base/pack/gui/gui_button_middle_pressed.x2.png differ diff --git a/textures/base/pack/gui/gui_button_right.png b/textures/base/pack/gui/gui_button_right.png new file mode 100644 index 000000000..76731d61a Binary files /dev/null and b/textures/base/pack/gui/gui_button_right.png differ diff --git a/textures/base/pack/gui/gui_button_right.x2.png b/textures/base/pack/gui/gui_button_right.x2.png new file mode 100644 index 000000000..efdb5d6a0 Binary files /dev/null and b/textures/base/pack/gui/gui_button_right.x2.png differ diff --git a/textures/base/pack/gui/gui_button_right_hovered.png b/textures/base/pack/gui/gui_button_right_hovered.png new file mode 100644 index 000000000..db2b07fbd Binary files /dev/null and b/textures/base/pack/gui/gui_button_right_hovered.png differ diff --git a/textures/base/pack/gui/gui_button_right_hovered.x2.png b/textures/base/pack/gui/gui_button_right_hovered.x2.png new file mode 100644 index 000000000..e7a7cff20 Binary files /dev/null and b/textures/base/pack/gui/gui_button_right_hovered.x2.png differ diff --git a/textures/base/pack/gui/gui_button_right_pressed.png b/textures/base/pack/gui/gui_button_right_pressed.png new file mode 100644 index 000000000..1ab28c6ca Binary files /dev/null and b/textures/base/pack/gui/gui_button_right_pressed.png differ diff --git a/textures/base/pack/gui/gui_button_right_pressed.x2.png b/textures/base/pack/gui/gui_button_right_pressed.x2.png new file mode 100644 index 000000000..95ad574cd Binary files /dev/null and b/textures/base/pack/gui/gui_button_right_pressed.x2.png differ diff --git a/textures/base/pack/gui/settings_menu.png b/textures/base/pack/gui/settings_menu.png index 19ff673e8..b03c0eaf8 100644 Binary files a/textures/base/pack/gui/settings_menu.png and b/textures/base/pack/gui/settings_menu.png differ diff --git a/textures/base/pack/gui/settings_menu_hover.png b/textures/base/pack/gui/settings_menu_hover.png index d417d53fe..e477aece0 100644 Binary files a/textures/base/pack/gui/settings_menu_hover.png and b/textures/base/pack/gui/settings_menu_hover.png differ diff --git a/textures/base/pack/gui/settings_menu_selected.png b/textures/base/pack/gui/settings_menu_selected.png index c35d877aa..3950ff2df 100644 Binary files a/textures/base/pack/gui/settings_menu_selected.png and b/textures/base/pack/gui/settings_menu_selected.png differ diff --git a/textures/base/pack/gui/upper_buttons_left.png b/textures/base/pack/gui/upper_buttons_left.png deleted file mode 100644 index beebd57dd..000000000 Binary files a/textures/base/pack/gui/upper_buttons_left.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_left_hover.png b/textures/base/pack/gui/upper_buttons_left_hover.png deleted file mode 100644 index 585426c54..000000000 Binary files a/textures/base/pack/gui/upper_buttons_left_hover.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_left_selected.png b/textures/base/pack/gui/upper_buttons_left_selected.png deleted file mode 100644 index 5449a0237..000000000 Binary files a/textures/base/pack/gui/upper_buttons_left_selected.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_middle.png b/textures/base/pack/gui/upper_buttons_middle.png deleted file mode 100644 index d7ad66fa3..000000000 Binary files a/textures/base/pack/gui/upper_buttons_middle.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_middle_hover.png b/textures/base/pack/gui/upper_buttons_middle_hover.png deleted file mode 100644 index b8c61f35c..000000000 Binary files a/textures/base/pack/gui/upper_buttons_middle_hover.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_middle_selected.png b/textures/base/pack/gui/upper_buttons_middle_selected.png deleted file mode 100644 index 5ce60906e..000000000 Binary files a/textures/base/pack/gui/upper_buttons_middle_selected.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_right.png b/textures/base/pack/gui/upper_buttons_right.png deleted file mode 100644 index 2b88b4bdb..000000000 Binary files a/textures/base/pack/gui/upper_buttons_right.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_right_hover.png b/textures/base/pack/gui/upper_buttons_right_hover.png deleted file mode 100644 index 4f3cbecbf..000000000 Binary files a/textures/base/pack/gui/upper_buttons_right_hover.png and /dev/null differ diff --git a/textures/base/pack/gui/upper_buttons_right_selected.png b/textures/base/pack/gui/upper_buttons_right_selected.png deleted file mode 100644 index 6881c048d..000000000 Binary files a/textures/base/pack/gui/upper_buttons_right_selected.png and /dev/null differ diff --git a/textures/base/pack/gui/world_create.png b/textures/base/pack/gui/world_create.png new file mode 100644 index 000000000..2a8034f51 Binary files /dev/null and b/textures/base/pack/gui/world_create.png differ diff --git a/textures/base/pack/gui/world_delete.png b/textures/base/pack/gui/world_delete.png new file mode 100644 index 000000000..c6c415d35 Binary files /dev/null and b/textures/base/pack/gui/world_delete.png differ diff --git a/textures/base/pack/gui/world_settings.png b/textures/base/pack/gui/world_settings.png new file mode 100644 index 000000000..9a514db36 Binary files /dev/null and b/textures/base/pack/gui/world_settings.png differ diff --git a/textures/base/pack/switch_local.png b/textures/base/pack/switch_local.png index 5c41dfa91..a7ee82b0a 100644 Binary files a/textures/base/pack/switch_local.png and b/textures/base/pack/switch_local.png differ diff --git a/textures/base/pack/switch_local_default.png b/textures/base/pack/switch_local_default.png index bbb00ec71..ae5f3a9ea 100644 Binary files a/textures/base/pack/switch_local_default.png and b/textures/base/pack/switch_local_default.png differ diff --git a/textures/base/pack/switch_local_default_hover.png b/textures/base/pack/switch_local_default_hover.png index dca808e3a..fc599d1b8 100644 Binary files a/textures/base/pack/switch_local_default_hover.png and b/textures/base/pack/switch_local_default_hover.png differ diff --git a/textures/base/pack/switch_local_hover.png b/textures/base/pack/switch_local_hover.png index 01649f795..a16f958c5 100644 Binary files a/textures/base/pack/switch_local_hover.png and b/textures/base/pack/switch_local_hover.png differ diff --git a/textures/base/pack/world_delete.png b/textures/base/pack/world_delete.png deleted file mode 100644 index 339e0552e..000000000 Binary files a/textures/base/pack/world_delete.png and /dev/null differ diff --git a/textures/base/pack/world_delete_hover.png b/textures/base/pack/world_delete_hover.png deleted file mode 100644 index 7e1ea818c..000000000 Binary files a/textures/base/pack/world_delete_hover.png and /dev/null differ diff --git a/textures/base/pack/world_new.png b/textures/base/pack/world_new.png deleted file mode 100644 index b1499a179..000000000 Binary files a/textures/base/pack/world_new.png and /dev/null differ diff --git a/textures/base/pack/world_new_hover.png b/textures/base/pack/world_new_hover.png deleted file mode 100644 index 1cf5686cd..000000000 Binary files a/textures/base/pack/world_new_hover.png and /dev/null differ