Menu: Merge singleplayer and server tabs (#5627)
authorElijah Duffy <enduffy2014@outlook.com>
Sun, 21 May 2017 08:07:05 +0000 (01:07 -0700)
committerLoïc Blot <nerzhul@users.noreply.github.com>
Sun, 21 May 2017 08:07:05 +0000 (10:07 +0200)
Rename "Singleplayer" tab to "Play" and remove "Server" tab placing server functionality under a "Host Game" checkbox in "Play."

builtin/mainmenu/init.lua
builtin/mainmenu/tab_local.lua [new file with mode: 0644]
builtin/mainmenu/tab_multiplayer.lua [deleted file]
builtin/mainmenu/tab_online.lua [new file with mode: 0644]
builtin/mainmenu/tab_server.lua [deleted file]
builtin/mainmenu/tab_singleplayer.lua [deleted file]

index 492bb22d6dcee8a1a217834e1c9b8b3b65ad1c0d..7c6af7d277596faf1c49f7834aad7cf07c80d9e6 100644 (file)
@@ -56,9 +56,8 @@ tabs.credits = dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
 if PLATFORM == "Android" then
        tabs.simple_main = dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
 else
-       tabs.singleplayer = dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
-       tabs.multiplayer = dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
-       tabs.server = dofile(menupath .. DIR_DELIM .. "tab_server.lua")
+       tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua")
+       tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua")
        tabs.texturepacks = dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
 end
 
@@ -135,9 +134,8 @@ local function init_globals()
                tv_main:add(tabs.settings)
        else
                tv_main:set_autosave_tab(true)
-               tv_main:add(tabs.singleplayer)
-               tv_main:add(tabs.multiplayer)
-               tv_main:add(tabs.server)
+               tv_main:add(tabs.local_game)
+               tv_main:add(tabs.play_online)
                tv_main:add(tabs.settings)
                tv_main:add(tabs.texturepacks)
        end
@@ -167,4 +165,3 @@ local function init_globals()
 end
 
 init_globals()
-
diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
new file mode 100644 (file)
index 0000000..3e62078
--- /dev/null
@@ -0,0 +1,317 @@
+--Minetest
+--Copyright (C) 2014 sapier
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+local function current_game()
+       local last_game_id = core.settings:get("menu_last_game")
+       local game, index = gamemgr.find_by_gameid(last_game_id)
+
+       return game
+end
+
+local function singleplayer_refresh_gamebar()
+
+       local old_bar = ui.find_by_name("game_button_bar")
+
+       if old_bar ~= nil then
+               old_bar:delete()
+       end
+
+       local function game_buttonbar_button_handler(fields)
+               for key,value in pairs(fields) do
+                       for j=1,#gamemgr.games,1 do
+                               if ("game_btnbar_" .. gamemgr.games[j].id == key) then
+                                       mm_texture.update("singleplayer", gamemgr.games[j])
+                                       core.set_topleft_text(gamemgr.games[j].name)
+                                       core.settings:set("menu_last_game",gamemgr.games[j].id)
+                                       menudata.worldlist:set_filtercriteria(gamemgr.games[j].id)
+                                       local index = filterlist.get_current_index(menudata.worldlist,
+                                               tonumber(core.settings:get("mainmenu_last_selected_world")))
+                                       if not index or index < 1 then
+                                               local selected = core.get_textlist_index("sp_worlds")
+                                               if selected ~= nil and selected < #menudata.worldlist:get_list() then
+                                                       index = selected
+                                               else
+                                                       index = #menudata.worldlist:get_list()
+                                               end
+                                       end
+                                       menu_worldmt_legacy(index)
+                                       return true
+                               end
+                       end
+               end
+       end
+
+       local btnbar = buttonbar_create("game_button_bar",
+               game_buttonbar_button_handler,
+               {x=-0.3,y=5.9}, "horizontal", {x=12.4,y=1.15})
+
+       for i=1,#gamemgr.games,1 do
+               local btn_name = "game_btnbar_" .. gamemgr.games[i].id
+
+               local image = nil
+               local text = nil
+               local tooltip = core.formspec_escape(gamemgr.games[i].name)
+
+               if gamemgr.games[i].menuicon_path ~= nil and
+                       gamemgr.games[i].menuicon_path ~= "" then
+                       image = core.formspec_escape(gamemgr.games[i].menuicon_path)
+               else
+
+                       local part1 = gamemgr.games[i].id:sub(1,5)
+                       local part2 = gamemgr.games[i].id:sub(6,10)
+                       local part3 = gamemgr.games[i].id:sub(11)
+
+                       text = part1 .. "\n" .. part2
+                       if part3 ~= nil and
+                               part3 ~= "" then
+                               text = text .. "\n" .. part3
+                       end
+               end
+               btnbar:add_button(btn_name, text, image, tooltip)
+       end
+end
+
+local function get_formspec(tabview, name, tabdata)
+       local retval = ""
+
+       local index = filterlist.get_current_index(menudata.worldlist,
+                               tonumber(core.settings:get("mainmenu_last_selected_world"))
+                               )
+
+       retval = retval ..
+                       "button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
+                       "button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
+                       "button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
+                       "label[4,-0.25;".. fgettext("Select World:") .. "]"..
+                       "checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
+                       dump(core.settings:get_bool("creative_mode")) .. "]"..
+                       "checkbox[0.25,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
+                       dump(core.settings:get_bool("enable_damage")) .. "]"..
+                       "checkbox[0.25,1.15;cb_server;".. fgettext("Host Server") ..";" ..
+                       dump(core.settings:get_bool("enable_server")) .. "]" ..
+                       "textlist[4,0.25;7.5,3.7;sp_worlds;" ..
+                       menu_render_worldlist() ..
+                       ";" .. index .. "]"
+
+       if core.settings:get_bool("enable_server") then
+               retval = retval ..
+                               "button[8.5,5;3.25,0.5;play;".. fgettext("Host Game") .. "]" ..
+                               "checkbox[0.25,1.6;cb_server_announce;" .. fgettext("Announce Server") .. ";" ..
+                               dump(core.settings:get_bool("server_announce")) .. "]" ..
+                               "label[0.25,2.2;" .. fgettext("Name/Password") .. "]" ..
+                               "field[0.55,3.2;3.5,0.5;te_playername;;" ..
+                               core.formspec_escape(core.settings:get("name")) .. "]" ..
+                               "pwdfield[0.55,4;3.5,0.5;te_passwd;]"
+
+               local bind_addr = core.settings:get("bind_address")
+               if bind_addr ~= nil and bind_addr ~= "" then
+                       retval = retval ..
+                               "field[0.55,5.2;2.25,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
+                               core.formspec_escape(core.settings:get("bind_address")) .. "]" ..
+                               "field[2.8,5.2;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
+                               core.formspec_escape(core.settings:get("port")) .. "]"
+               else
+                       retval = retval ..
+                               "field[0.55,5.2;3.5,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
+                               core.formspec_escape(core.settings:get("port")) .. "]"
+               end
+       else
+               retval = retval ..
+                               "button[8.5,5;3.25,0.5;play;".. fgettext("Play Game") .. "]"
+       end
+
+       return retval
+end
+
+local function main_button_handler(this, fields, name, tabdata)
+
+       assert(name == "local")
+
+       local world_doubleclick = false
+
+       if fields["sp_worlds"] ~= nil then
+               local event = core.explode_textlist_event(fields["sp_worlds"])
+               local selected = core.get_textlist_index("sp_worlds")
+
+               menu_worldmt_legacy(selected)
+
+               if event.type == "DCL" then
+                       world_doubleclick = true
+               end
+
+               if event.type == "CHG" and selected ~= nil then
+                       core.settings:set("mainmenu_last_selected_world",
+                               menudata.worldlist:get_raw_index(selected))
+                       return true
+               end
+       end
+
+       if menu_handle_key_up_down(fields,"sp_worlds","mainmenu_last_selected_world") then
+               return true
+       end
+
+       if fields["cb_creative_mode"] then
+               core.settings:set("creative_mode", fields["cb_creative_mode"])
+               local selected = core.get_textlist_index("sp_worlds")
+               menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"])
+
+               return true
+       end
+
+       if fields["cb_enable_damage"] then
+               core.settings:set("enable_damage", fields["cb_enable_damage"])
+               local selected = core.get_textlist_index("sp_worlds")
+               menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"])
+
+               return true
+       end
+
+       if fields["cb_server"] then
+               core.settings:set("enable_server", fields["cb_server"])
+
+               return true
+       end
+
+       if fields["cb_server_announce"] then
+               core.settings:set("server_announce", fields["cb_server_announce"])
+               local selected = core.get_textlist_index("srv_worlds")
+               menu_worldmt(selected, "server_announce", fields["cb_server_announce"])
+
+               return true
+       end
+
+       if fields["play"] ~= nil or world_doubleclick or fields["key_enter"] then
+               local selected = core.get_textlist_index("sp_worlds")
+               gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
+
+               if core.settings:get_bool("enable_server") then
+                       if selected ~= nil and gamedata.selected_world ~= 0 then
+                               gamedata.playername     = fields["te_playername"]
+                               gamedata.password       = fields["te_passwd"]
+                               gamedata.port           = fields["te_serverport"]
+                               gamedata.address        = ""
+
+                               core.settings:set("port",gamedata.port)
+                               if fields["te_serveraddr"] ~= nil then
+                                       core.settings:set("bind_address",fields["te_serveraddr"])
+                               end
+
+                               --update last game
+                               local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
+                               if world then
+                                       local game, index = gamemgr.find_by_gameid(world.gameid)
+                                       core.settings:set("menu_last_game", game.id)
+                               end
+
+                               core.start()
+                       else
+                               gamedata.errormessage =
+                                       fgettext("No world created or selected!")
+                       end
+               else
+                       if selected ~= nil and gamedata.selected_world ~= 0 then
+                               gamedata.singleplayer = true
+                               core.start()
+                       else
+                               gamedata.errormessage =
+                                       fgettext("No world created or selected!")
+                       end
+                       return true
+               end
+       end
+
+       if fields["world_create"] ~= nil then
+               local create_world_dlg = create_create_world_dlg(true)
+               create_world_dlg:set_parent(this)
+               this:hide()
+               create_world_dlg:show()
+               mm_texture.update("singleplayer",current_game())
+               return true
+       end
+
+       if fields["world_delete"] ~= nil then
+               local selected = core.get_textlist_index("sp_worlds")
+               if selected ~= nil and
+                       selected <= menudata.worldlist:size() then
+                       local world = menudata.worldlist:get_list()[selected]
+                       if world ~= nil and
+                               world.name ~= nil and
+                               world.name ~= "" then
+                               local index = menudata.worldlist:get_raw_index(selected)
+                               local delete_world_dlg = create_delete_world_dlg(world.name,index)
+                               delete_world_dlg:set_parent(this)
+                               this:hide()
+                               delete_world_dlg:show()
+                               mm_texture.update("singleplayer",current_game())
+                       end
+               end
+
+               return true
+       end
+
+       if fields["world_configure"] ~= nil then
+               local selected = core.get_textlist_index("sp_worlds")
+               if selected ~= nil then
+                       local configdialog =
+                               create_configure_world_dlg(
+                                               menudata.worldlist:get_raw_index(selected))
+
+                       if (configdialog ~= nil) then
+                               configdialog:set_parent(this)
+                               this:hide()
+                               configdialog:show()
+                               mm_texture.update("singleplayer",current_game())
+                       end
+               end
+
+               return true
+       end
+end
+
+local function on_change(type, old_tab, new_tab)
+       local buttonbar = ui.find_by_name("game_button_bar")
+
+       if ( buttonbar == nil ) then
+               singleplayer_refresh_gamebar()
+               buttonbar = ui.find_by_name("game_button_bar")
+       end
+
+       if (type == "ENTER") then
+               local game = current_game()
+
+               if game then
+                       menudata.worldlist:set_filtercriteria(game.id)
+                       core.set_topleft_text(game.name)
+                       mm_texture.update("singleplayer",game)
+               end
+               buttonbar:show()
+       else
+               menudata.worldlist:set_filtercriteria(nil)
+               buttonbar:hide()
+               core.set_topleft_text("")
+               mm_texture.update(new_tab,nil)
+       end
+end
+
+--------------------------------------------------------------------------------
+return {
+       name = "local",
+       caption = fgettext("Local Game"),
+       cbf_formspec = get_formspec,
+       cbf_button_handler = main_button_handler,
+       on_change = on_change
+}
diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua
deleted file mode 100644 (file)
index f40b707..0000000
+++ /dev/null
@@ -1,350 +0,0 @@
---Minetest
---Copyright (C) 2014 sapier
---
---This program is free software; you can redistribute it and/or modify
---it under the terms of the GNU Lesser General Public License as published by
---the Free Software Foundation; either version 2.1 of the License, or
---(at your option) any later version.
---
---This program is distributed in the hope that it will be useful,
---but WITHOUT ANY WARRANTY; without even the implied warranty of
---MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---GNU Lesser General Public License for more details.
---
---You should have received a copy of the GNU Lesser General Public License along
---with this program; if not, write to the Free Software Foundation, Inc.,
---51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
---------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-       -- Update the cached supported proto info,
-       -- it may have changed after a change by the settings menu.
-       common_update_cached_supp_proto()
-       local fav_selected = nil
-       if menudata.search_result then
-               fav_selected = menudata.search_result[tabdata.fav_selected]
-       else
-               fav_selected = menudata.favorites[tabdata.fav_selected]
-       end
-
-       if not tabdata.search_for then
-               tabdata.search_for = ""
-       end
-
-       local retval =
-               -- Search
-               "field[0.15,0.35;6.05,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]"..
-               "button[5.8,0.1;2,0.1;btn_mp_search;" .. fgettext("Search") .. "]" ..
-
-               -- Address / Port
-               "label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" ..
-               "field[8,0.65;3.25,0.5;te_address;;" ..
-                       core.formspec_escape(core.settings:get("address")) .. "]" ..
-               "field[11.1,0.65;1.4,0.5;te_port;;" ..
-                       core.formspec_escape(core.settings:get("remote_port")) .. "]" ..
-
-               -- Name / Password
-               "label[7.75,0.95;" .. fgettext("Name / Password") .. "]" ..
-               "field[8,1.85;2.9,0.5;te_name;;" ..
-                       core.formspec_escape(core.settings:get("name")) .. "]" ..
-               "pwdfield[10.73,1.85;1.77,0.5;te_pwd;]" ..
-
-               -- Description Background
-               "box[7.73,2.25;4.25,2.6;#999999]"..
-
-               -- Connect
-               "button[10.1,5.15;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]"
-
-       if tabdata.fav_selected and fav_selected then
-               if gamedata.fav then
-                       retval = retval .. "button[7.75,5.15;2.3,0.5;btn_delete_favorite;" ..
-                               fgettext("Del. Favorite") .. "]"
-               end
-               if fav_selected.description then
-                       retval = retval .. "textarea[8.1,2.3;4.23,2.9;;" ..
-                               core.formspec_escape((gamedata.serverdescription or ""), true) .. ";]"
-               end
-       end
-
-       --favourites
-       retval = retval .. "tablecolumns[" ..
-               image_column(fgettext("Favorite"), "favorite") .. ";" ..
-               image_column(fgettext("Ping")) .. ",padding=0.25;" ..
-               "color,span=3;" ..
-               "text,align=right;" ..                -- clients
-               "text,align=center,padding=0.25;" ..  -- "/"
-               "text,align=right,padding=0.25;" ..   -- clients_max
-               image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
-               image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
-               image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
-               "color,span=1;" ..
-               "text,padding=1]" ..
-               "table[-0.15,0.6;7.75,5.15;favourites;"
-
-       if menudata.search_result then
-               for i = 1, #menudata.search_result do
-                       local favs = core.get_favorites("local")
-                       local server = menudata.search_result[i]
-
-                       for fav_id = 1, #favs do
-                               if server.address == favs[fav_id].address and
-                                               server.port == favs[fav_id].port then
-                                       server.is_favorite = true
-                               end
-                       end
-
-                       if i ~= 1 then
-                               retval = retval .. ","
-                       end
-
-                       retval = retval .. render_serverlist_row(server, server.is_favorite)
-               end
-       elseif #menudata.favorites > 0 then
-               local favs = core.get_favorites("local")
-               if #favs > 0 then
-                       for i = 1, #favs do
-                       for j = 1, #menudata.favorites do
-                               if menudata.favorites[j].address == favs[i].address and
-                                               menudata.favorites[j].port == favs[i].port then
-                                       table.insert(menudata.favorites, i, table.remove(menudata.favorites, j))
-                               end
-                       end
-                               if favs[i].address ~= menudata.favorites[i].address then
-                                       table.insert(menudata.favorites, i, favs[i])
-                               end
-                       end
-               end
-               retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0))
-               for i = 2, #menudata.favorites do
-                       retval = retval .. "," .. render_serverlist_row(menudata.favorites[i], (i <= #favs))
-               end
-       end
-
-       if tabdata.fav_selected then
-               retval = retval .. ";" .. tabdata.fav_selected .. "]"
-       else
-               retval = retval .. ";0]"
-       end
-
-       return retval
-end
-
---------------------------------------------------------------------------------
-local function main_button_handler(tabview, fields, name, tabdata)
-       local serverlist = menudata.search_result or menudata.favorites
-
-       if fields.te_name then
-               gamedata.playername = fields.te_name
-               core.settings:set("name", fields.te_name)
-       end
-
-       if fields.favourites then
-               local event = core.explode_table_event(fields.favourites)
-               local fav = serverlist[event.row]
-
-               if event.type == "DCL" then
-                       if event.row <= #serverlist then
-                               if menudata.favorites_is_public and
-                                               not is_server_protocol_compat_or_error(
-                                                       fav.proto_min, fav.proto_max) then
-                                       return true
-                               end
-
-                               gamedata.address    = fav.address
-                               gamedata.port       = fav.port
-                               gamedata.playername = fields.te_name
-                               gamedata.selected_world = 0
-
-                               if fields.te_pwd then
-                                       gamedata.password = fields.te_pwd
-                               end
-
-                               gamedata.servername        = fav.name
-                               gamedata.serverdescription = fav.description
-
-                               if gamedata.address and gamedata.port then
-                                       core.settings:set("address", gamedata.address)
-                                       core.settings:set("remote_port", gamedata.port)
-                                       core.start()
-                               end
-                       end
-                       return true
-               end
-
-               if event.type == "CHG" then
-                       if event.row <= #serverlist then
-                               gamedata.fav = false
-                               local favs = core.get_favorites("local")
-                               local address = fav.address
-                               local port    = fav.port
-                               gamedata.serverdescription = fav.description
-
-                               for i = 1, #favs do
-                                       if fav.address == favs[i].address and
-                                                       fav.port == favs[i].port then
-                                               gamedata.fav = true
-                                       end
-                               end
-
-                               if address and port then
-                                       core.settings:set("address", address)
-                                       core.settings:set("remote_port", port)
-                               end
-                               tabdata.fav_selected = event.row
-                       end
-                       return true
-               end
-       end
-
-       if fields.key_up or fields.key_down then
-               local fav_idx = core.get_table_index("favourites")
-               local fav = serverlist[fav_idx]
-
-               if fav_idx then
-                       if fields.key_up and fav_idx > 1 then
-                               fav_idx = fav_idx - 1
-                       elseif fields.key_down and fav_idx < #menudata.favorites then
-                               fav_idx = fav_idx + 1
-                       end
-               else
-                       fav_idx = 1
-               end
-
-               if not menudata.favorites or not fav then
-                       tabdata.fav_selected = 0
-                       return true
-               end
-
-               local address = fav.address
-               local port    = fav.port
-               gamedata.serverdescription = fav.description
-               if address and port then
-                       core.settings:set("address", address)
-                       core.settings:set("remote_port", port)
-               end
-
-               tabdata.fav_selected = fav_idx
-               return true
-       end
-
-       if fields.btn_delete_favorite then
-               local current_favourite = core.get_table_index("favourites")
-               if not current_favourite then return end
-
-               core.delete_favorite(current_favourite)
-               asyncOnlineFavourites()
-               tabdata.fav_selected = nil
-
-               core.settings:set("address", "")
-               core.settings:set("remote_port", "30000")
-               return true
-       end
-
-       if fields.btn_mp_search or fields.key_enter_field == "te_search" then
-               tabdata.fav_selected = 1
-               local input = fields.te_search:lower()
-               tabdata.search_for = fields.te_search
-
-               if #menudata.favorites < 2 then
-                       return true
-               end
-
-               menudata.search_result = {}
-
-               -- setup the keyword list
-               local keywords = {}
-               for word in input:gmatch("%S+") do
-                       table.insert(keywords, word)
-               end
-
-               if #keywords == 0 then
-                       menudata.search_result = nil
-                       return true
-               end
-
-               -- Search the serverlist
-               local search_result = {}
-               for i = 1, #menudata.favorites do
-                       local server = menudata.favorites[i]
-                       local found = 0
-                       for k = 1, #keywords do
-                               local keyword = keywords[k]
-                               if server.name then
-                                       local name = server.name:lower()
-                                       local _, count = name:gsub(keyword, keyword)
-                                       found = found + count * 4
-                               end
-
-                               if server.description then
-                                       local desc = server.description:lower()
-                                       local _, count = desc:gsub(keyword, keyword)
-                                       found = found + count * 2
-                               end
-                       end
-                       if found > 0 then
-                               local points = (#menudata.favorites - i) / 5 + found
-                               server.points = points
-                               table.insert(search_result, server)
-                       end
-               end
-               if #search_result > 0 then
-                       table.sort(search_result, function(a, b)
-                               return a.points > b.points
-                       end)
-                       menudata.search_result = search_result
-                       local first_server = search_result[1]
-                       core.settings:set("address",     first_server.address)
-                       core.settings:set("remote_port", first_server.port)
-               end
-               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
-               gamedata.password   = fields.te_pwd
-               gamedata.address    = fields.te_address
-               gamedata.port       = fields.te_port
-               gamedata.selected_world = 0
-               local fav_idx = core.get_table_index("favourites")
-               local fav = serverlist[fav_idx]
-
-               if fav_idx and fav_idx <= #serverlist and
-                               fav.address == fields.te_address and
-                               fav.port    == fields.te_port then
-
-                       gamedata.servername        = fav.name
-                       gamedata.serverdescription = fav.description
-
-                       if menudata.favorites_is_public and
-                                       not is_server_protocol_compat_or_error(
-                                               fav.proto_min, fav.proto_max) then
-                               return true
-                       end
-               else
-                       gamedata.servername        = ""
-                       gamedata.serverdescription = ""
-               end
-
-               core.settings:set("address",     fields.te_address)
-               core.settings:set("remote_port", fields.te_port)
-
-               core.start()
-               return true
-       end
-       return false
-end
-
-local function on_change(type, old_tab, new_tab)
-       if type == "LEAVE" then return end
-       asyncOnlineFavourites()
-end
-
---------------------------------------------------------------------------------
-return {
-       name = "multiplayer",
-       caption = fgettext("Client"),
-       cbf_formspec = get_formspec,
-       cbf_button_handler = main_button_handler,
-       on_change = on_change
-}
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
new file mode 100644 (file)
index 0000000..ab23a4b
--- /dev/null
@@ -0,0 +1,350 @@
+--Minetest
+--Copyright (C) 2014 sapier
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+--------------------------------------------------------------------------------
+local function get_formspec(tabview, name, tabdata)
+       -- Update the cached supported proto info,
+       -- it may have changed after a change by the settings menu.
+       common_update_cached_supp_proto()
+       local fav_selected = nil
+       if menudata.search_result then
+               fav_selected = menudata.search_result[tabdata.fav_selected]
+       else
+               fav_selected = menudata.favorites[tabdata.fav_selected]
+       end
+
+       if not tabdata.search_for then
+               tabdata.search_for = ""
+       end
+
+       local retval =
+               -- Search
+               "field[0.15,0.35;6.05,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]"..
+               "button[5.8,0.1;2,0.1;btn_mp_search;" .. fgettext("Search") .. "]" ..
+
+               -- Address / Port
+               "label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" ..
+               "field[8,0.65;3.25,0.5;te_address;;" ..
+                       core.formspec_escape(core.settings:get("address")) .. "]" ..
+               "field[11.1,0.65;1.4,0.5;te_port;;" ..
+                       core.formspec_escape(core.settings:get("remote_port")) .. "]" ..
+
+               -- Name / Password
+               "label[7.75,0.95;" .. fgettext("Name / Password") .. "]" ..
+               "field[8,1.85;2.9,0.5;te_name;;" ..
+                       core.formspec_escape(core.settings:get("name")) .. "]" ..
+               "pwdfield[10.73,1.85;1.77,0.5;te_pwd;]" ..
+
+               -- Description Background
+               "box[7.73,2.25;4.25,2.6;#999999]"..
+
+               -- Connect
+               "button[10.1,5.15;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]"
+
+       if tabdata.fav_selected and fav_selected then
+               if gamedata.fav then
+                       retval = retval .. "button[7.75,5.15;2.3,0.5;btn_delete_favorite;" ..
+                               fgettext("Del. Favorite") .. "]"
+               end
+               if fav_selected.description then
+                       retval = retval .. "textarea[8.1,2.3;4.23,2.9;;" ..
+                               core.formspec_escape((gamedata.serverdescription or ""), true) .. ";]"
+               end
+       end
+
+       --favourites
+       retval = retval .. "tablecolumns[" ..
+               image_column(fgettext("Favorite"), "favorite") .. ";" ..
+               image_column(fgettext("Ping")) .. ",padding=0.25;" ..
+               "color,span=3;" ..
+               "text,align=right;" ..                -- clients
+               "text,align=center,padding=0.25;" ..  -- "/"
+               "text,align=right,padding=0.25;" ..   -- clients_max
+               image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
+               image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
+               image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
+               "color,span=1;" ..
+               "text,padding=1]" ..
+               "table[-0.15,0.6;7.75,5.15;favourites;"
+
+       if menudata.search_result then
+               for i = 1, #menudata.search_result do
+                       local favs = core.get_favorites("local")
+                       local server = menudata.search_result[i]
+
+                       for fav_id = 1, #favs do
+                               if server.address == favs[fav_id].address and
+                                               server.port == favs[fav_id].port then
+                                       server.is_favorite = true
+                               end
+                       end
+
+                       if i ~= 1 then
+                               retval = retval .. ","
+                       end
+
+                       retval = retval .. render_serverlist_row(server, server.is_favorite)
+               end
+       elseif #menudata.favorites > 0 then
+               local favs = core.get_favorites("local")
+               if #favs > 0 then
+                       for i = 1, #favs do
+                       for j = 1, #menudata.favorites do
+                               if menudata.favorites[j].address == favs[i].address and
+                                               menudata.favorites[j].port == favs[i].port then
+                                       table.insert(menudata.favorites, i, table.remove(menudata.favorites, j))
+                               end
+                       end
+                               if favs[i].address ~= menudata.favorites[i].address then
+                                       table.insert(menudata.favorites, i, favs[i])
+                               end
+                       end
+               end
+               retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0))
+               for i = 2, #menudata.favorites do
+                       retval = retval .. "," .. render_serverlist_row(menudata.favorites[i], (i <= #favs))
+               end
+       end
+
+       if tabdata.fav_selected then
+               retval = retval .. ";" .. tabdata.fav_selected .. "]"
+       else
+               retval = retval .. ";0]"
+       end
+
+       return retval
+end
+
+--------------------------------------------------------------------------------
+local function main_button_handler(tabview, fields, name, tabdata)
+       local serverlist = menudata.search_result or menudata.favorites
+
+       if fields.te_name then
+               gamedata.playername = fields.te_name
+               core.settings:set("name", fields.te_name)
+       end
+
+       if fields.favourites then
+               local event = core.explode_table_event(fields.favourites)
+               local fav = serverlist[event.row]
+
+               if event.type == "DCL" then
+                       if event.row <= #serverlist then
+                               if menudata.favorites_is_public and
+                                               not is_server_protocol_compat_or_error(
+                                                       fav.proto_min, fav.proto_max) then
+                                       return true
+                               end
+
+                               gamedata.address    = fav.address
+                               gamedata.port       = fav.port
+                               gamedata.playername = fields.te_name
+                               gamedata.selected_world = 0
+
+                               if fields.te_pwd then
+                                       gamedata.password = fields.te_pwd
+                               end
+
+                               gamedata.servername        = fav.name
+                               gamedata.serverdescription = fav.description
+
+                               if gamedata.address and gamedata.port then
+                                       core.settings:set("address", gamedata.address)
+                                       core.settings:set("remote_port", gamedata.port)
+                                       core.start()
+                               end
+                       end
+                       return true
+               end
+
+               if event.type == "CHG" then
+                       if event.row <= #serverlist then
+                               gamedata.fav = false
+                               local favs = core.get_favorites("local")
+                               local address = fav.address
+                               local port    = fav.port
+                               gamedata.serverdescription = fav.description
+
+                               for i = 1, #favs do
+                                       if fav.address == favs[i].address and
+                                                       fav.port == favs[i].port then
+                                               gamedata.fav = true
+                                       end
+                               end
+
+                               if address and port then
+                                       core.settings:set("address", address)
+                                       core.settings:set("remote_port", port)
+                               end
+                               tabdata.fav_selected = event.row
+                       end
+                       return true
+               end
+       end
+
+       if fields.key_up or fields.key_down then
+               local fav_idx = core.get_table_index("favourites")
+               local fav = serverlist[fav_idx]
+
+               if fav_idx then
+                       if fields.key_up and fav_idx > 1 then
+                               fav_idx = fav_idx - 1
+                       elseif fields.key_down and fav_idx < #menudata.favorites then
+                               fav_idx = fav_idx + 1
+                       end
+               else
+                       fav_idx = 1
+               end
+
+               if not menudata.favorites or not fav then
+                       tabdata.fav_selected = 0
+                       return true
+               end
+
+               local address = fav.address
+               local port    = fav.port
+               gamedata.serverdescription = fav.description
+               if address and port then
+                       core.settings:set("address", address)
+                       core.settings:set("remote_port", port)
+               end
+
+               tabdata.fav_selected = fav_idx
+               return true
+       end
+
+       if fields.btn_delete_favorite then
+               local current_favourite = core.get_table_index("favourites")
+               if not current_favourite then return end
+
+               core.delete_favorite(current_favourite)
+               asyncOnlineFavourites()
+               tabdata.fav_selected = nil
+
+               core.settings:set("address", "")
+               core.settings:set("remote_port", "30000")
+               return true
+       end
+
+       if fields.btn_mp_search or fields.key_enter_field == "te_search" then
+               tabdata.fav_selected = 1
+               local input = fields.te_search:lower()
+               tabdata.search_for = fields.te_search
+
+               if #menudata.favorites < 2 then
+                       return true
+               end
+
+               menudata.search_result = {}
+
+               -- setup the keyword list
+               local keywords = {}
+               for word in input:gmatch("%S+") do
+                       table.insert(keywords, word)
+               end
+
+               if #keywords == 0 then
+                       menudata.search_result = nil
+                       return true
+               end
+
+               -- Search the serverlist
+               local search_result = {}
+               for i = 1, #menudata.favorites do
+                       local server = menudata.favorites[i]
+                       local found = 0
+                       for k = 1, #keywords do
+                               local keyword = keywords[k]
+                               if server.name then
+                                       local name = server.name:lower()
+                                       local _, count = name:gsub(keyword, keyword)
+                                       found = found + count * 4
+                               end
+
+                               if server.description then
+                                       local desc = server.description:lower()
+                                       local _, count = desc:gsub(keyword, keyword)
+                                       found = found + count * 2
+                               end
+                       end
+                       if found > 0 then
+                               local points = (#menudata.favorites - i) / 5 + found
+                               server.points = points
+                               table.insert(search_result, server)
+                       end
+               end
+               if #search_result > 0 then
+                       table.sort(search_result, function(a, b)
+                               return a.points > b.points
+                       end)
+                       menudata.search_result = search_result
+                       local first_server = search_result[1]
+                       core.settings:set("address",     first_server.address)
+                       core.settings:set("remote_port", first_server.port)
+               end
+               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
+               gamedata.password   = fields.te_pwd
+               gamedata.address    = fields.te_address
+               gamedata.port       = fields.te_port
+               gamedata.selected_world = 0
+               local fav_idx = core.get_table_index("favourites")
+               local fav = serverlist[fav_idx]
+
+               if fav_idx and fav_idx <= #serverlist and
+                               fav.address == fields.te_address and
+                               fav.port    == fields.te_port then
+
+                       gamedata.servername        = fav.name
+                       gamedata.serverdescription = fav.description
+
+                       if menudata.favorites_is_public and
+                                       not is_server_protocol_compat_or_error(
+                                               fav.proto_min, fav.proto_max) then
+                               return true
+                       end
+               else
+                       gamedata.servername        = ""
+                       gamedata.serverdescription = ""
+               end
+
+               core.settings:set("address",     fields.te_address)
+               core.settings:set("remote_port", fields.te_port)
+
+               core.start()
+               return true
+       end
+       return false
+end
+
+local function on_change(type, old_tab, new_tab)
+       if type == "LEAVE" then return end
+       asyncOnlineFavourites()
+end
+
+--------------------------------------------------------------------------------
+return {
+       name = "online",
+       caption = fgettext("Play Online"),
+       cbf_formspec = get_formspec,
+       cbf_button_handler = main_button_handler,
+       on_change = on_change
+}
diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua
deleted file mode 100644 (file)
index 8f25ce8..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
---Minetest
---Copyright (C) 2014 sapier
---
---This program is free software; you can redistribute it and/or modify
---it under the terms of the GNU Lesser General Public License as published by
---the Free Software Foundation; either version 2.1 of the License, or
---(at your option) any later version.
---
---This program is distributed in the hope that it will be useful,
---but WITHOUT ANY WARRANTY; without even the implied warranty of
---MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---GNU Lesser General Public License for more details.
---
---You should have received a copy of the GNU Lesser General Public License along
---with this program; if not, write to the Free Software Foundation, Inc.,
---51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
---------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-       
-       local index = menudata.worldlist:get_current_index(
-                               tonumber(core.settings:get("mainmenu_last_selected_world"))
-                               )
-
-       local retval =
-               "button[4,4.15;2.6,0.5;world_delete;" .. fgettext("Delete") .. "]" ..
-               "button[6.5,4.15;2.8,0.5;world_create;" .. fgettext("New") .. "]" ..
-               "button[9.2,4.15;2.55,0.5;world_configure;" .. fgettext("Configure") .. "]" ..
-               "button[8.5,5;3.25,0.5;start_server;" .. fgettext("Start Game") .. "]" ..
-               "label[4,-0.25;" .. fgettext("Select World:") .. "]" ..
-               "checkbox[0.25,0.25;cb_creative_mode;" .. fgettext("Creative Mode") .. ";" ..
-               dump(core.settings:get_bool("creative_mode")) .. "]" ..
-               "checkbox[0.25,0.7;cb_enable_damage;" .. fgettext("Enable Damage") .. ";" ..
-               dump(core.settings:get_bool("enable_damage")) .. "]" ..
-               "checkbox[0.25,1.15;cb_server_announce;" .. fgettext("Public") .. ";" ..
-               dump(core.settings:get_bool("server_announce")) .. "]" ..
-               "label[0.25,2.2;" .. fgettext("Name/Password") .. "]" ..
-               "field[0.55,3.2;3.5,0.5;te_playername;;" ..
-               core.formspec_escape(core.settings:get("name")) .. "]" ..
-               "pwdfield[0.55,4;3.5,0.5;te_passwd;]"
-
-       local bind_addr = core.settings:get("bind_address")
-       if bind_addr ~= nil and bind_addr ~= "" then
-               retval = retval ..
-                       "field[0.55,5.2;2.25,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
-                       core.formspec_escape(core.settings:get("bind_address")) .. "]" ..
-                       "field[2.8,5.2;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
-                       core.formspec_escape(core.settings:get("port")) .. "]"
-       else
-               retval = retval ..
-                       "field[0.55,5.2;3.5,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
-                       core.formspec_escape(core.settings:get("port")) .. "]"
-       end
-
-       retval = retval ..
-               "textlist[4,0.25;7.5,3.7;srv_worlds;" ..
-               menu_render_worldlist() ..
-               ";" .. index .. "]"
-       
-       return retval
-end
-
---------------------------------------------------------------------------------
-local function main_button_handler(this, fields, name, tabdata)
-
-       local world_doubleclick = false
-
-       if fields["srv_worlds"] ~= nil then
-               local event = core.explode_textlist_event(fields["srv_worlds"])
-               local selected = core.get_textlist_index("srv_worlds")
-
-               menu_worldmt_legacy(selected)
-
-               if event.type == "DCL" then
-                       world_doubleclick = true
-               end
-               if event.type == "CHG" then
-                       core.settings:set("mainmenu_last_selected_world",
-                               menudata.worldlist:get_raw_index(core.get_textlist_index("srv_worlds")))
-                       return true
-               end
-       end
-
-       if menu_handle_key_up_down(fields,"srv_worlds","mainmenu_last_selected_world") then
-               return true
-       end
-
-       if fields["cb_creative_mode"] then
-               core.settings:set("creative_mode", fields["cb_creative_mode"])
-               local selected = core.get_textlist_index("srv_worlds")
-               menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"])
-
-               return true
-       end
-
-       if fields["cb_enable_damage"] then
-               core.settings:set("enable_damage", fields["cb_enable_damage"])
-               local selected = core.get_textlist_index("srv_worlds")
-               menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"])
-
-               return true
-       end
-
-       if fields["cb_server_announce"] then
-               core.settings:set("server_announce", fields["cb_server_announce"])
-               local selected = core.get_textlist_index("srv_worlds")
-               menu_worldmt(selected, "server_announce", fields["cb_server_announce"])
-
-               return true
-       end
-
-       if fields["start_server"] ~= nil or
-               world_doubleclick or
-               fields["key_enter"] then
-               local selected = core.get_textlist_index("srv_worlds")
-               gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
-               if selected ~= nil and gamedata.selected_world ~= 0 then
-                       gamedata.playername     = fields["te_playername"]
-                       gamedata.password       = fields["te_passwd"]
-                       gamedata.port           = fields["te_serverport"]
-                       gamedata.address        = ""
-
-                       core.settings:set("port",gamedata.port)
-                       if fields["te_serveraddr"] ~= nil then
-                               core.settings:set("bind_address",fields["te_serveraddr"])
-                       end
-
-                       --update last game
-                       local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
-                       if world then
-                               local game, index = gamemgr.find_by_gameid(world.gameid)
-                               core.settings:set("menu_last_game", game.id)
-                       end
-                       
-                       core.start()
-               else
-                       gamedata.errormessage =
-                               fgettext("No world created or selected!")
-               end
-               return true
-       end
-
-       if fields["world_create"] ~= nil then
-               local create_world_dlg = create_create_world_dlg(true)
-               create_world_dlg:set_parent(this)
-               create_world_dlg:show()
-               this:hide()
-               return true
-       end
-
-       if fields["world_delete"] ~= nil then
-               local selected = core.get_textlist_index("srv_worlds")
-               if selected ~= nil and
-                       selected <= menudata.worldlist:size() then
-                       local world = menudata.worldlist:get_list()[selected]
-                       if world ~= nil and
-                               world.name ~= nil and
-                               world.name ~= "" then
-                               local index = menudata.worldlist:get_raw_index(selected)
-                               local delete_world_dlg = create_delete_world_dlg(world.name,index)
-                               delete_world_dlg:set_parent(this)
-                               delete_world_dlg:show()
-                               this:hide()
-                       end
-               end
-               
-               return true
-       end
-
-       if fields["world_configure"] ~= nil then
-               local selected = core.get_textlist_index("srv_worlds")
-               if selected ~= nil then
-                       local configdialog =
-                               create_configure_world_dlg(
-                                               menudata.worldlist:get_raw_index(selected))
-                       
-                       if (configdialog ~= nil) then
-                               configdialog:set_parent(this)
-                               configdialog:show()
-                               this:hide()
-                       end
-               end
-               return true
-       end
-       return false
-end
-
---------------------------------------------------------------------------------
-return {
-       name = "server",
-       caption = fgettext("Server"),
-       cbf_formspec = get_formspec,
-       cbf_button_handler = main_button_handler,
-       on_change = nil
-}
diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua
deleted file mode 100644 (file)
index c58ad41..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
---Minetest
---Copyright (C) 2014 sapier
---
---This program is free software; you can redistribute it and/or modify
---it under the terms of the GNU Lesser General Public License as published by
---the Free Software Foundation; either version 2.1 of the License, or
---(at your option) any later version.
---
---This program is distributed in the hope that it will be useful,
---but WITHOUT ANY WARRANTY; without even the implied warranty of
---MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---GNU Lesser General Public License for more details.
---
---You should have received a copy of the GNU Lesser General Public License along
---with this program; if not, write to the Free Software Foundation, Inc.,
---51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-local function current_game()
-       local last_game_id = core.settings:get("menu_last_game")
-       local game, index = gamemgr.find_by_gameid(last_game_id)
-       
-       return game
-end
-
-local function singleplayer_refresh_gamebar()
-
-       local old_bar = ui.find_by_name("game_button_bar")
-
-       if old_bar ~= nil then
-               old_bar:delete()
-       end
-
-       local function game_buttonbar_button_handler(fields)
-               for key,value in pairs(fields) do
-                       for j=1,#gamemgr.games,1 do
-                               if ("game_btnbar_" .. gamemgr.games[j].id == key) then
-                                       mm_texture.update("singleplayer", gamemgr.games[j])
-                                       core.set_topleft_text(gamemgr.games[j].name)
-                                       core.settings:set("menu_last_game",gamemgr.games[j].id)
-                                       menudata.worldlist:set_filtercriteria(gamemgr.games[j].id)
-                                       local index = filterlist.get_current_index(menudata.worldlist,
-                                               tonumber(core.settings:get("mainmenu_last_selected_world")))
-                                       if not index or index < 1 then
-                                               local selected = core.get_textlist_index("sp_worlds")
-                                               if selected ~= nil and selected < #menudata.worldlist:get_list() then
-                                                       index = selected
-                                               else
-                                                       index = #menudata.worldlist:get_list()
-                                               end
-                                       end
-                                       menu_worldmt_legacy(index)
-                                       return true
-                               end
-                       end
-               end
-       end
-
-       local btnbar = buttonbar_create("game_button_bar",
-               game_buttonbar_button_handler,
-               {x=-0.3,y=5.9}, "horizontal", {x=12.4,y=1.15})
-
-       for i=1,#gamemgr.games,1 do
-               local btn_name = "game_btnbar_" .. gamemgr.games[i].id
-               
-               local image = nil
-               local text = nil
-               local tooltip = core.formspec_escape(gamemgr.games[i].name)
-               
-               if gamemgr.games[i].menuicon_path ~= nil and
-                       gamemgr.games[i].menuicon_path ~= "" then
-                       image = core.formspec_escape(gamemgr.games[i].menuicon_path)
-               else
-               
-                       local part1 = gamemgr.games[i].id:sub(1,5)
-                       local part2 = gamemgr.games[i].id:sub(6,10)
-                       local part3 = gamemgr.games[i].id:sub(11)
-                       
-                       text = part1 .. "\n" .. part2
-                       if part3 ~= nil and
-                               part3 ~= "" then
-                               text = text .. "\n" .. part3
-                       end
-               end
-               btnbar:add_button(btn_name, text, image, tooltip)
-       end
-end
-
-local function get_formspec(tabview, name, tabdata)
-       local retval = ""
-
-       local index = filterlist.get_current_index(menudata.worldlist,
-                               tonumber(core.settings:get("mainmenu_last_selected_world"))
-                               )
-
-       retval = retval ..
-                       "button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
-                       "button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
-                       "button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
-                       "button[8.5,5;3.25,0.5;play;".. fgettext("Play") .. "]" ..
-                       "label[4,-0.25;".. fgettext("Select World:") .. "]"..
-                       "checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
-                       dump(core.settings:get_bool("creative_mode")) .. "]"..
-                       "checkbox[0.25,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
-                       dump(core.settings:get_bool("enable_damage")) .. "]"..
-                       "textlist[4,0.25;7.5,3.7;sp_worlds;" ..
-                       menu_render_worldlist() ..
-                       ";" .. index .. "]"
-       return retval
-end
-
-local function main_button_handler(this, fields, name, tabdata)
-
-       assert(name == "singleplayer")
-
-       local world_doubleclick = false
-
-       if fields["sp_worlds"] ~= nil then
-               local event = core.explode_textlist_event(fields["sp_worlds"])
-               local selected = core.get_textlist_index("sp_worlds")
-
-               menu_worldmt_legacy(selected)
-
-               if event.type == "DCL" then
-                       world_doubleclick = true
-               end
-
-               if event.type == "CHG" and selected ~= nil then
-                       core.settings:set("mainmenu_last_selected_world",
-                               menudata.worldlist:get_raw_index(selected))
-                       return true
-               end
-       end
-
-       if menu_handle_key_up_down(fields,"sp_worlds","mainmenu_last_selected_world") then
-               return true
-       end
-
-       if fields["cb_creative_mode"] then
-               core.settings:set("creative_mode", fields["cb_creative_mode"])
-               local selected = core.get_textlist_index("sp_worlds")
-               menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"])
-
-               return true
-       end
-
-       if fields["cb_enable_damage"] then
-               core.settings:set("enable_damage", fields["cb_enable_damage"])
-               local selected = core.get_textlist_index("sp_worlds")
-               menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"])
-
-               return true
-       end
-
-       if fields["play"] ~= nil or
-               world_doubleclick or
-               fields["key_enter"] then
-               local selected = core.get_textlist_index("sp_worlds")
-               gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
-               
-               if selected ~= nil and gamedata.selected_world ~= 0 then
-                       gamedata.singleplayer = true
-                       core.start()
-               else
-                       gamedata.errormessage =
-                               fgettext("No world created or selected!")
-               end
-               return true
-       end
-
-       if fields["world_create"] ~= nil then
-               local create_world_dlg = create_create_world_dlg(true)
-               create_world_dlg:set_parent(this)
-               this:hide()
-               create_world_dlg:show()
-               mm_texture.update("singleplayer",current_game())
-               return true
-       end
-
-       if fields["world_delete"] ~= nil then
-               local selected = core.get_textlist_index("sp_worlds")
-               if selected ~= nil and
-                       selected <= menudata.worldlist:size() then
-                       local world = menudata.worldlist:get_list()[selected]
-                       if world ~= nil and
-                               world.name ~= nil and
-                               world.name ~= "" then
-                               local index = menudata.worldlist:get_raw_index(selected)
-                               local delete_world_dlg = create_delete_world_dlg(world.name,index)
-                               delete_world_dlg:set_parent(this)
-                               this:hide()
-                               delete_world_dlg:show()
-                               mm_texture.update("singleplayer",current_game())
-                       end
-               end
-               
-               return true
-       end
-
-       if fields["world_configure"] ~= nil then
-               local selected = core.get_textlist_index("sp_worlds")
-               if selected ~= nil then
-                       local configdialog =
-                               create_configure_world_dlg(
-                                               menudata.worldlist:get_raw_index(selected))
-                       
-                       if (configdialog ~= nil) then
-                               configdialog:set_parent(this)
-                               this:hide()
-                               configdialog:show()
-                               mm_texture.update("singleplayer",current_game())
-                       end
-               end
-               
-               return true
-       end
-end
-
-local function on_change(type, old_tab, new_tab)
-       local buttonbar = ui.find_by_name("game_button_bar")
-       
-       if ( buttonbar == nil ) then
-               singleplayer_refresh_gamebar()
-               buttonbar = ui.find_by_name("game_button_bar")
-       end
-       
-       if (type == "ENTER") then
-               local game = current_game()
-               
-               if game then
-                       menudata.worldlist:set_filtercriteria(game.id)
-                       core.set_topleft_text(game.name)
-                       mm_texture.update("singleplayer",game)
-               end
-               buttonbar:show()
-       else
-               menudata.worldlist:set_filtercriteria(nil)
-               buttonbar:hide()
-               core.set_topleft_text("")
-               mm_texture.update(new_tab,nil)
-       end
-end
-
---------------------------------------------------------------------------------
-return {
-       name = "singleplayer",
-       caption = fgettext("Singleplayer"),
-       cbf_formspec = get_formspec,
-       cbf_button_handler = main_button_handler,
-       on_change = on_change
-}