]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - builtin/mainmenu/init.lua
Merge branch 'master' of https://github.com/minetest/minetest
[dragonfireclient.git] / builtin / mainmenu / init.lua
index 79e6d5c029a3911c42b71a18098f9966006ca46c..94345467734943b5f10134224ea317d3b81817f0 100644 (file)
@@ -19,48 +19,39 @@ mt_color_grey  = "#AAAAAA"
 mt_color_blue  = "#6389FF"
 mt_color_green = "#72FF63"
 mt_color_dark_green = "#25C191"
-
---for all other colors ask sfan5 to complete his work!
+mt_color_orange  = "#FF8800"
 
 local menupath = core.get_mainmenu_path()
 local basepath = core.get_builtin_path()
 defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
                                        DIR_DELIM .. "pack" .. DIR_DELIM
 
-dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "async_event.lua")
-dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "filterlist.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "dialog.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "tabview.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "ui.lua")
+dofile(basepath .. "common" .. DIR_DELIM .. "filterlist.lua")
+dofile(basepath .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
+dofile(basepath .. "fstk" .. DIR_DELIM .. "dialog.lua")
+dofile(basepath .. "fstk" .. DIR_DELIM .. "tabview.lua")
+dofile(basepath .. "fstk" .. DIR_DELIM .. "ui.lua")
+dofile(menupath .. DIR_DELIM .. "async_event.lua")
 dofile(menupath .. DIR_DELIM .. "common.lua")
-dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
-dofile(menupath .. DIR_DELIM .. "modmgr.lua")
-dofile(menupath .. DIR_DELIM .. "store.lua")
-dofile(menupath .. DIR_DELIM .. "textures.lua")
+dofile(menupath .. DIR_DELIM .. "pkgmgr.lua")
+dofile(menupath .. DIR_DELIM .. "serverlistmgr.lua")
+dofile(menupath .. DIR_DELIM .. "game_theme.lua")
 
 dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
 dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
-if PLATFORM ~= "Android" then
-       dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
-       dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
-       dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
-       dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
-end
+dofile(menupath .. DIR_DELIM .. "dlg_contentstore.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_delete_content.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
 
 local tabs = {}
 
 tabs.settings = dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
-tabs.mods = dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
-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.texturepacks = dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
-end
+tabs.content  = dofile(menupath .. DIR_DELIM .. "tab_content.lua")
+tabs.about    = dofile(menupath .. DIR_DELIM .. "tab_about.lua")
+tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua")
+tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua")
 
 --------------------------------------------------------------------------------
 local function main_event_handler(tabview, event)
@@ -75,95 +66,61 @@ local function init_globals()
        -- Init gamedata
        gamedata.worldindex = 0
 
-       if PLATFORM == "Android" then
-               local world_list = core.get_worlds()
-               local world_index
-
-               local found_singleplayerworld = false
-               for i, world in ipairs(world_list) do
-                       if world.name == "singleplayerworld" then
-                               found_singleplayerworld = true
-                               world_index = i
-                               break
-                       end
+       menudata.worldlist = filterlist.create(
+               core.get_worlds,
+               compare_worlds,
+               -- Unique id comparison function
+               function(element, uid)
+                       return element.name == uid
+               end,
+               -- Filter function
+               function(element, gameid)
+                       return element.gameid == gameid
                end
+       )
 
-               if not found_singleplayerworld then
-                       core.create_world("singleplayerworld", 1)
+       menudata.worldlist:add_sort_mechanism("alphabetic", sort_worlds_alphabetic)
+       menudata.worldlist:set_sortmode("alphabetic")
 
-                       world_list = core.get_worlds()
-
-                       for i, world in ipairs(world_list) do
-                               if world.name == "singleplayerworld" then
-                                       world_index = i
-                                       break
-                               end
-                       end
-               end
-
-               gamedata.worldindex = world_index
-       else
-               menudata.worldlist = filterlist.create(
-                       core.get_worlds,
-                       compare_worlds,
-                       -- Unique id comparison function
-                       function(element, uid)
-                               return element.name == uid
-                       end,
-                       -- Filter function
-                       function(element, gameid)
-                               return element.gameid == gameid
-                       end
-               )
-
-               menudata.worldlist:add_sort_mechanism("alphabetic", sort_worlds_alphabetic)
-               menudata.worldlist:set_sortmode("alphabetic")
-
-               if not core.setting_get("menu_last_game") then
-                       local default_game = core.setting_get("default_game") or "minetest"
-                       core.setting_set("menu_last_game", default_game)
-               end
-
-               mm_texture.init()
+       if not core.settings:get("menu_last_game") then
+               local default_game = core.settings:get("default_game") or "minetest"
+               core.settings:set("menu_last_game", default_game)
        end
 
+       mm_game_theme.init()
+
        -- Create main tabview
        local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0})
 
-       if PLATFORM == "Android" then
-               tv_main:add(tabs.simple_main)
-               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.settings)
-               tv_main:add(tabs.texturepacks)
-       end
+       tv_main:set_autosave_tab(true)
+       tv_main:add(tabs.local_game)
+       tv_main:add(tabs.play_online)
 
-       tv_main:add(tabs.mods)
-       tv_main:add(tabs.credits)
+       tv_main:add(tabs.content)
+       tv_main:add(tabs.settings)
+       tv_main:add(tabs.about)
 
        tv_main:set_global_event_handler(main_event_handler)
        tv_main:set_fixed_size(false)
 
-       if PLATFORM ~= "Android" then
-               tv_main:set_tab(core.setting_get("maintab_LAST"))
+       local last_tab = core.settings:get("maintab_LAST")
+       if last_tab and tv_main.current_tab ~= last_tab then
+               tv_main:set_tab(last_tab)
        end
-       ui.set_default("maintab")
-       tv_main:show()
 
-       -- Create modstore ui
-       if PLATFORM == "Android" then
-               modstore.init({x = 12, y = 6}, 3, 2)
-       else
-               modstore.init({x = 12, y = 8}, 4, 3)
+       -- In case the folder of the last selected game has been deleted,
+       -- display "Minetest" as a header
+       if tv_main.current_tab == "local" then
+               local game = pkgmgr.find_by_gameid(core.settings:get("menu_last_game"))
+               if game == nil then
+                       mm_game_theme.reset()
+               end
        end
 
-       ui.update()
+       ui.set_default("maintab")
+       tv_main:show()
 
-       core.sound_play("main_menu", true)
+       ui.update()
 end
 
 init_globals()