]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/script/lua_api/l_mainmenu.cpp
Merge branch 'master' of https://github.com/minetest/minetest
[dragonfireclient.git] / src / script / lua_api / l_mainmenu.cpp
index 9a64bd0ab190b50f913f7aeda8558612e6b9b867..2b46a4d51b85041f7eed302d6fe58a7a92f01b40 100644 (file)
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_internal.h"
 #include "common/c_content.h"
 #include "cpp_api/s_async.h"
+#include "scripting_mainmenu.h"
 #include "gui/guiEngine.h"
 #include "gui/guiMainMenu.h"
 #include "gui/guiKeyChangeMenu.h"
@@ -29,15 +30,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "filesys.h"
 #include "convert_json.h"
-#include "content/packages.h"
 #include "content/content.h"
 #include "content/subgames.h"
 #include "serverlist.h"
 #include "mapgen/mapgen.h"
 #include "settings.h"
-
-#include <IFileArchive.h>
-#include <IFileSystem.h>
+#include "client/client.h"
 #include "client/renderingengine.h"
 #include "network/networkprotocol.h"
 
@@ -106,6 +104,21 @@ int ModApiMainMenu::l_update_formspec(lua_State *L)
        return 0;
 }
 
+/******************************************************************************/
+int ModApiMainMenu::l_set_formspec_prepend(lua_State *L)
+{
+       GUIEngine *engine = getGuiEngine(L);
+       sanity_check(engine != NULL);
+
+       if (engine->m_startgame)
+               return 0;
+
+       std::string formspec(luaL_checkstring(L, 1));
+       engine->setFormspecPrepend(formspec);
+
+       return 0;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_start(lua_State *L)
 {
@@ -260,176 +273,6 @@ int ModApiMainMenu::l_get_worlds(lua_State *L)
        return 1;
 }
 
-/******************************************************************************/
-int ModApiMainMenu::l_get_favorites(lua_State *L)
-{
-       std::string listtype = "local";
-
-       if (!lua_isnone(L,1)) {
-               listtype = luaL_checkstring(L,1);
-       }
-
-       std::vector<ServerListSpec> servers;
-
-       if(listtype == "online") {
-               servers = ServerList::getOnline();
-       } else {
-               servers = ServerList::getLocal();
-       }
-
-       lua_newtable(L);
-       int top = lua_gettop(L);
-       unsigned int index = 1;
-
-       for (const Json::Value &server : servers) {
-
-               lua_pushnumber(L,index);
-
-               lua_newtable(L);
-               int top_lvl2 = lua_gettop(L);
-
-               if (!server["clients"].asString().empty()) {
-                       std::string clients_raw = server["clients"].asString();
-                       char* endptr = 0;
-                       int numbervalue = strtol(clients_raw.c_str(),&endptr,10);
-
-                       if ((!clients_raw.empty()) && (*endptr == 0)) {
-                               lua_pushstring(L,"clients");
-                               lua_pushnumber(L,numbervalue);
-                               lua_settable(L, top_lvl2);
-                       }
-               }
-
-               if (!server["clients_max"].asString().empty()) {
-
-                       std::string clients_max_raw = server["clients_max"].asString();
-                       char* endptr = 0;
-                       int numbervalue = strtol(clients_max_raw.c_str(),&endptr,10);
-
-                       if ((!clients_max_raw.empty()) && (*endptr == 0)) {
-                               lua_pushstring(L,"clients_max");
-                               lua_pushnumber(L,numbervalue);
-                               lua_settable(L, top_lvl2);
-                       }
-               }
-
-               if (!server["version"].asString().empty()) {
-                       lua_pushstring(L,"version");
-                       std::string topush = server["version"].asString();
-                       lua_pushstring(L,topush.c_str());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["proto_min"].asString().empty()) {
-                       lua_pushstring(L,"proto_min");
-                       lua_pushinteger(L, server["proto_min"].asInt());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["proto_max"].asString().empty()) {
-                       lua_pushstring(L,"proto_max");
-                       lua_pushinteger(L, server["proto_max"].asInt());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["password"].asString().empty()) {
-                       lua_pushstring(L,"password");
-                       lua_pushboolean(L, server["password"].asBool());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["creative"].asString().empty()) {
-                       lua_pushstring(L,"creative");
-                       lua_pushboolean(L, server["creative"].asBool());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["damage"].asString().empty()) {
-                       lua_pushstring(L,"damage");
-                       lua_pushboolean(L, server["damage"].asBool());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["pvp"].asString().empty()) {
-                       lua_pushstring(L,"pvp");
-                       lua_pushboolean(L, server["pvp"].asBool());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["description"].asString().empty()) {
-                       lua_pushstring(L,"description");
-                       std::string topush = server["description"].asString();
-                       lua_pushstring(L,topush.c_str());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["name"].asString().empty()) {
-                       lua_pushstring(L,"name");
-                       std::string topush = server["name"].asString();
-                       lua_pushstring(L,topush.c_str());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["address"].asString().empty()) {
-                       lua_pushstring(L,"address");
-                       std::string topush = server["address"].asString();
-                       lua_pushstring(L,topush.c_str());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (!server["port"].asString().empty()) {
-                       lua_pushstring(L,"port");
-                       std::string topush = server["port"].asString();
-                       lua_pushstring(L,topush.c_str());
-                       lua_settable(L, top_lvl2);
-               }
-
-               if (server.isMember("ping")) {
-                       float ping = server["ping"].asFloat();
-                       lua_pushstring(L, "ping");
-                       lua_pushnumber(L, ping);
-                       lua_settable(L, top_lvl2);
-               }
-
-               lua_settable(L, top);
-               index++;
-       }
-       return 1;
-}
-
-/******************************************************************************/
-int ModApiMainMenu::l_delete_favorite(lua_State *L)
-{
-       std::vector<ServerListSpec> servers;
-
-       std::string listtype = "local";
-
-       if (!lua_isnone(L,2)) {
-               listtype = luaL_checkstring(L,2);
-       }
-
-       if ((listtype != "local") &&
-               (listtype != "online"))
-               return 0;
-
-
-       if(listtype == "online") {
-               servers = ServerList::getOnline();
-       } else {
-               servers = ServerList::getLocal();
-       }
-
-       int fav_idx     = luaL_checkinteger(L,1) -1;
-
-       if ((fav_idx >= 0) &&
-                       (fav_idx < (int) servers.size())) {
-
-               ServerList::deleteEntry(servers[fav_idx]);
-       }
-
-       return 0;
-}
-
 /******************************************************************************/
 int ModApiMainMenu::l_get_games(lua_State *L)
 {
@@ -480,9 +323,9 @@ int ModApiMainMenu::l_get_games(lua_State *L)
                lua_newtable(L);
                int table2 = lua_gettop(L);
                int internal_index = 1;
-               for (const std::string &addon_mods_path : game.addon_mods_paths) {
+               for (const auto &addon_mods_path : game.addon_mods_paths) {
                        lua_pushnumber(L, internal_index);
-                       lua_pushstring(L, addon_mods_path.c_str());
+                       lua_pushstring(L, addon_mods_path.second.c_str());
                        lua_settable(L,   table2);
                        internal_index++;
                }
@@ -555,10 +398,12 @@ int ModApiMainMenu::l_show_keys_menu(lua_State *L)
        GUIEngine* engine = getGuiEngine(L);
        sanity_check(engine != NULL);
 
-       GUIKeyChangeMenu *kmenu = new GUIKeyChangeMenu(RenderingEngine::get_gui_env(),
-                                                               engine->m_parent,
-                                                               -1,
-                                                               engine->m_menumanager);
+       GUIKeyChangeMenu *kmenu = new GUIKeyChangeMenu(
+                       engine->m_rendering_engine->get_gui_env(),
+                       engine->m_parent,
+                       -1,
+                       engine->m_menumanager,
+                       engine->m_texture_source);
        kmenu->drop();
        return 0;
 }
@@ -569,24 +414,53 @@ int ModApiMainMenu::l_create_world(lua_State *L)
        const char *name        = luaL_checkstring(L, 1);
        int gameidx                     = luaL_checkinteger(L,2) -1;
 
+       StringMap use_settings;
+       luaL_checktype(L, 3, LUA_TTABLE);
+       lua_pushnil(L);
+       while (lua_next(L, 3) != 0) {
+               // key at index -2 and value at index -1
+               use_settings[luaL_checkstring(L, -2)] = luaL_checkstring(L, -1);
+               lua_pop(L, 1);
+       }
+       lua_pop(L, 1);
+
        std::string path = porting::path_user + DIR_DELIM
                        "worlds" + DIR_DELIM
-                       + name;
+                       + sanitizeDirName(name, "world_");
 
        std::vector<SubgameSpec> games = getAvailableGames();
+       if (gameidx < 0 || gameidx >= (int) games.size()) {
+               lua_pushstring(L, "Invalid game index");
+               return 1;
+       }
 
-       if ((gameidx >= 0) &&
-                       (gameidx < (int) games.size())) {
+       // Set the settings for world creation
+       // this is a bad hack but the best we have right now..
+       StringMap backup;
+       for (auto it : use_settings) {
+               if (g_settings->existsLocal(it.first))
+                       backup[it.first] = g_settings->get(it.first);
+               g_settings->set(it.first, it.second);
+       }
 
-               // Create world if it doesn't exist
-               if (!loadGameConfAndInitWorld(path, games[gameidx])) {
-                       lua_pushstring(L, "Failed to initialize world");
-               } else {
-                       lua_pushnil(L);
-               }
-       } else {
-               lua_pushstring(L, "Invalid game index");
+       // Create world if it doesn't exist
+       try {
+               loadGameConfAndInitWorld(path, name, games[gameidx], true);
+               lua_pushnil(L);
+       } catch (const BaseException &e) {
+               auto err = std::string("Failed to initialize world: ") + e.what();
+               lua_pushstring(L, err.c_str());
        }
+
+       // Restore previous settings
+       for (auto it : use_settings) {
+               auto it2 = backup.find(it.first);
+               if (it2 == backup.end())
+                       g_settings->remove(it.first); // wasn't set before
+               else
+                       g_settings->set(it.first, it2->second); // was set before
+       }
+
        return 1;
 }
 
@@ -639,6 +513,14 @@ int ModApiMainMenu::l_get_mapgen_names(lua_State *L)
 }
 
 
+/******************************************************************************/
+int ModApiMainMenu::l_get_user_path(lua_State *L)
+{
+       std::string path = fs::RemoveRelativePathComponents(porting::path_user);
+       lua_pushstring(L, path.c_str());
+       return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_get_modpath(lua_State *L)
 {
@@ -648,6 +530,21 @@ int ModApiMainMenu::l_get_modpath(lua_State *L)
        return 1;
 }
 
+/******************************************************************************/
+int ModApiMainMenu::l_get_modpaths(lua_State *L)
+{
+       lua_newtable(L);
+
+       ModApiMainMenu::l_get_modpath(L);
+       lua_setfield(L, -2, "mods");
+
+       for (const std::string &component : getEnvModPaths()) {
+               lua_pushstring(L, component.c_str());
+               lua_setfield(L, -2, fs::AbsolutePath(component).c_str());
+       }
+       return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_get_clientmodpath(lua_State *L)
 {
@@ -675,6 +572,7 @@ int ModApiMainMenu::l_get_texturepath(lua_State *L)
        return 1;
 }
 
+/******************************************************************************/
 int ModApiMainMenu::l_get_texturepath_share(lua_State *L)
 {
        std::string gamepath = fs::RemoveRelativePathComponents(
@@ -683,12 +581,23 @@ int ModApiMainMenu::l_get_texturepath_share(lua_State *L)
        return 1;
 }
 
+/******************************************************************************/
 int ModApiMainMenu::l_get_cache_path(lua_State *L)
 {
        lua_pushstring(L, fs::RemoveRelativePathComponents(porting::path_cache).c_str());
        return 1;
 }
 
+/******************************************************************************/
+int ModApiMainMenu::l_get_temp_path(lua_State *L)
+{
+       if (lua_isnoneornil(L, 1) || !lua_toboolean(L, 1))
+               lua_pushstring(L, fs::TempPath().c_str());
+       else
+               lua_pushstring(L, fs::CreateTempFile().c_str());
+       return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_create_dir(lua_State *L) {
        const char *path = luaL_checkstring(L, 1);
@@ -725,26 +634,33 @@ int ModApiMainMenu::l_copy_dir(lua_State *L)
        const char *destination = luaL_checkstring(L, 2);
 
        bool keep_source = true;
+       if (!lua_isnoneornil(L, 3))
+               keep_source = readParam<bool>(L, 3);
 
-       if ((!lua_isnone(L,3)) &&
-                       (!lua_isnil(L,3))) {
-               keep_source = readParam<bool>(L,3);
-       }
+       std::string abs_destination = fs::RemoveRelativePathComponents(destination);
+       std::string abs_source = fs::RemoveRelativePathComponents(source);
 
-       std::string absolute_destination = fs::RemoveRelativePathComponents(destination);
-       std::string absolute_source = fs::RemoveRelativePathComponents(source);
+       if (!ModApiMainMenu::mayModifyPath(abs_destination) ||
+               (!keep_source && !ModApiMainMenu::mayModifyPath(abs_source))) {
+               lua_pushboolean(L, false);
+               return 1;
+       }
 
-       if ((ModApiMainMenu::mayModifyPath(absolute_destination))) {
-               bool retval = fs::CopyDir(absolute_source,absolute_destination);
+       bool retval;
+       if (keep_source)
+               retval = fs::CopyDir(abs_source, abs_destination);
+       else
+               retval = fs::MoveDir(abs_source, abs_destination);
+       lua_pushboolean(L, retval);
+       return 1;
+}
 
-               if (retval && (!keep_source)) {
+/******************************************************************************/
+int ModApiMainMenu::l_is_dir(lua_State *L)
+{
+       const char *path = luaL_checkstring(L, 1);
 
-                       retval &= fs::RecursiveDelete(absolute_source);
-               }
-               lua_pushboolean(L,retval);
-               return 1;
-       }
-       lua_pushboolean(L,false);
+       lua_pushboolean(L, fs::IsDir(path));
        return 1;
 }
 
@@ -757,75 +673,9 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)
        std::string absolute_destination = fs::RemoveRelativePathComponents(destination);
 
        if (ModApiMainMenu::mayModifyPath(absolute_destination)) {
-               fs::CreateAllDirs(absolute_destination);
-
-               io::IFileSystem *fs = RenderingEngine::get_filesystem();
-
-               if (!fs->addFileArchive(zipfile,true,false,io::EFAT_ZIP)) {
-                       lua_pushboolean(L,false);
-                       return 1;
-               }
-
-               sanity_check(fs->getFileArchiveCount() > 0);
-
-               /**********************************************************************/
-               /* WARNING this is not threadsafe!!                                   */
-               /**********************************************************************/
-               io::IFileArchive* opened_zip =
-                       fs->getFileArchive(fs->getFileArchiveCount()-1);
-
-               const io::IFileList* files_in_zip = opened_zip->getFileList();
-
-               unsigned int number_of_files = files_in_zip->getFileCount();
-
-               for (unsigned int i=0; i < number_of_files; i++) {
-                       std::string fullpath = destination;
-                       fullpath += DIR_DELIM;
-                       fullpath += files_in_zip->getFullFileName(i).c_str();
-                       std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
-
-                       if (!files_in_zip->isDirectory(i)) {
-                               if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
-                                       fs->removeFileArchive(fs->getFileArchiveCount()-1);
-                                       lua_pushboolean(L,false);
-                                       return 1;
-                               }
-
-                               io::IReadFile* toread = opened_zip->createAndOpenFile(i);
-
-                               FILE *targetfile = fopen(fullpath.c_str(),"wb");
-
-                               if (targetfile == NULL) {
-                                       fs->removeFileArchive(fs->getFileArchiveCount()-1);
-                                       lua_pushboolean(L,false);
-                                       return 1;
-                               }
-
-                               char read_buffer[1024];
-                               long total_read = 0;
-
-                               while (total_read < toread->getSize()) {
-
-                                       unsigned int bytes_read =
-                                                       toread->read(read_buffer,sizeof(read_buffer));
-                                       if ((bytes_read == 0 ) ||
-                                               (fwrite(read_buffer, 1, bytes_read, targetfile) != bytes_read))
-                                       {
-                                               fclose(targetfile);
-                                               fs->removeFileArchive(fs->getFileArchiveCount()-1);
-                                               lua_pushboolean(L,false);
-                                               return 1;
-                                       }
-                                       total_read += bytes_read;
-                               }
-
-                               fclose(targetfile);
-                       }
-
-               }
-
-               fs->removeFileArchive(fs->getFileArchiveCount()-1);
-               lua_pushboolean(L,true);
+               auto fs = RenderingEngine::get_raw_device()->getFileSystem();
+               bool ok = fs::extractZipFile(fs, zipfile, destination);
+               lua_pushboolean(L, ok);
                return 1;
        }
 
@@ -844,21 +694,28 @@ int ModApiMainMenu::l_get_mainmenu_path(lua_State *L)
 }
 
 /******************************************************************************/
-bool ModApiMainMenu::mayModifyPath(const std::string &path)
+bool ModApiMainMenu::mayModifyPath(std::string path)
 {
+       path = fs::RemoveRelativePathComponents(path);
+
        if (fs::PathStartsWith(path, fs::TempPath()))
                return true;
 
-       if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "games")))
-               return true;
+       std::string path_user = fs::RemoveRelativePathComponents(porting::path_user);
 
-       if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "mods")))
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "client"))
                return true;
-
-       if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "textures")))
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "clientmods"))
                return true;
-
-       if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "worlds")))
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "textures"))
+               return true;
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "games"))
+               return true;
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "mods"))
+               return true;
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "textures"))
+               return true;
+       if (fs::PathStartsWith(path, path_user + DIR_DELIM "worlds"))
                return true;
 
        if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_cache)))
@@ -867,6 +724,16 @@ bool ModApiMainMenu::mayModifyPath(const std::string &path)
        return false;
 }
 
+
+/******************************************************************************/
+int ModApiMainMenu::l_may_modify_path(lua_State *L)
+{
+       const char *target = luaL_checkstring(L, 1);
+       std::string absolute_destination = fs::RemoveRelativePathComponents(target);
+       lua_pushboolean(L, ModApiMainMenu::mayModifyPath(absolute_destination));
+       return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_show_path_select_dialog(lua_State *L)
 {
@@ -878,13 +745,13 @@ int ModApiMainMenu::l_show_path_select_dialog(lua_State *L)
        bool is_file_select = readParam<bool>(L, 3);
 
        GUIFileSelectMenu* fileOpenMenu =
-               new GUIFileSelectMenu(RenderingEngine::get_gui_env(),
-                                                               engine->m_parent,
-                                                               -1,
-                                                               engine->m_menumanager,
-                                                               title,
-                                                               formname,
-                                                               is_file_select);
+               new GUIFileSelectMenu(engine->m_rendering_engine->get_gui_env(),
+                               engine->m_parent,
+                               -1,
+                               engine->m_menumanager,
+                               title,
+                               formname,
+                               is_file_select);
        fileOpenMenu->setTextDest(engine->m_buttonhandler);
        fileOpenMenu->drop();
        return 0;
@@ -919,13 +786,12 @@ int ModApiMainMenu::l_get_video_drivers(lua_State *L)
 
        lua_newtable(L);
        for (u32 i = 0; i != drivers.size(); i++) {
-               const char *name  = RenderingEngine::getVideoDriverName(drivers[i]);
-               const char *fname = RenderingEngine::getVideoDriverFriendlyName(drivers[i]);
+               auto &info = RenderingEngine::getVideoDriverInfo(drivers[i]);
 
                lua_newtable(L);
-               lua_pushstring(L, name);
+               lua_pushstring(L, info.name.c_str());
                lua_setfield(L, -2, "name");
-               lua_pushstring(L, fname);
+               lua_pushstring(L, info.friendly_name.c_str());
                lua_setfield(L, -2, "friendly_name");
 
                lua_rawseti(L, -2, i + 1);
@@ -934,33 +800,12 @@ int ModApiMainMenu::l_get_video_drivers(lua_State *L)
        return 1;
 }
 
-/******************************************************************************/
-int ModApiMainMenu::l_get_video_modes(lua_State *L)
-{
-       std::vector<core::vector3d<u32> > videomodes
-               = RenderingEngine::getSupportedVideoModes();
-
-       lua_newtable(L);
-       for (u32 i = 0; i != videomodes.size(); i++) {
-               lua_newtable(L);
-               lua_pushnumber(L, videomodes[i].X);
-               lua_setfield(L, -2, "w");
-               lua_pushnumber(L, videomodes[i].Y);
-               lua_setfield(L, -2, "h");
-               lua_pushnumber(L, videomodes[i].Z);
-               lua_setfield(L, -2, "depth");
-
-               lua_rawseti(L, -2, i + 1);
-       }
-
-       return 1;
-}
-
 /******************************************************************************/
 int ModApiMainMenu::l_gettext(lua_State *L)
 {
-       std::string text = strgettext(std::string(luaL_checkstring(L, 1)));
-       lua_pushstring(L, text.c_str());
+       const char *srctext = luaL_checkstring(L, 1);
+       const char *text = *srctext ? gettext(srctext) : "";
+       lua_pushstring(L, text);
 
        return 1;
 }
@@ -974,15 +819,7 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
        lua_pushnumber(L,RenderingEngine::getDisplayDensity());
        lua_settable(L, top);
 
-       lua_pushstring(L,"display_width");
-       lua_pushnumber(L,RenderingEngine::getDisplaySize().X);
-       lua_settable(L, top);
-
-       lua_pushstring(L,"display_height");
-       lua_pushnumber(L,RenderingEngine::getDisplaySize().Y);
-       lua_settable(L, top);
-
-       const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+       const v2u32 &window_size = RenderingEngine::getWindowSize();
        lua_pushstring(L,"window_width");
        lua_pushnumber(L, window_size.X);
        lua_settable(L, top);
@@ -990,6 +827,10 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
        lua_pushstring(L,"window_height");
        lua_pushnumber(L, window_size.Y);
        lua_settable(L, top);
+
+       lua_pushstring(L, "render_info");
+       lua_pushstring(L, wide_to_utf8(RenderingEngine::get_video_driver()->getName()).c_str());
+       lua_settable(L, top);
        return 1;
 }
 
@@ -1006,23 +847,39 @@ int ModApiMainMenu::l_get_max_supp_proto(lua_State *L)
        return 1;
 }
 
+/******************************************************************************/
+int ModApiMainMenu::l_open_url(lua_State *L)
+{
+       std::string url = luaL_checkstring(L, 1);
+       lua_pushboolean(L, porting::open_url(url));
+       return 1;
+}
+
+/******************************************************************************/
+int ModApiMainMenu::l_open_dir(lua_State *L)
+{
+       std::string path = luaL_checkstring(L, 1);
+       lua_pushboolean(L, porting::open_directory(path));
+       return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_do_async_callback(lua_State *L)
 {
-       GUIEngine* engine = getGuiEngine(L);
+       MainMenuScripting *script = getScriptApi<MainMenuScripting>(L);
 
        size_t func_length, param_length;
        const char* serialized_func_raw = luaL_checklstring(L, 1, &func_length);
-
        const char* serialized_param_raw = luaL_checklstring(L, 2, &param_length);
 
        sanity_check(serialized_func_raw != NULL);
        sanity_check(serialized_param_raw != NULL);
 
-       std::string serialized_func = std::string(serialized_func_raw, func_length);
-       std::string serialized_param = std::string(serialized_param_raw, param_length);
+       u32 jobId = script->queueAsync(
+               std::string(serialized_func_raw, func_length),
+               std::string(serialized_param_raw, param_length));
 
-       lua_pushinteger(L, engine->queueAsync(serialized_func, serialized_param));
+       lua_pushinteger(L, jobId);
 
        return 1;
 }
@@ -1031,6 +888,7 @@ int ModApiMainMenu::l_do_async_callback(lua_State *L)
 void ModApiMainMenu::Initialize(lua_State *L, int top)
 {
        API_FCT(update_formspec);
+       API_FCT(set_formspec_prepend);
        API_FCT(set_clouds);
        API_FCT(get_textlist_index);
        API_FCT(get_table_index);
@@ -1039,33 +897,37 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
        API_FCT(get_content_info);
        API_FCT(start);
        API_FCT(close);
-       API_FCT(get_favorites);
        API_FCT(show_keys_menu);
        API_FCT(create_world);
        API_FCT(delete_world);
-       API_FCT(delete_favorite);
        API_FCT(set_background);
        API_FCT(set_topleft_text);
        API_FCT(get_mapgen_names);
+       API_FCT(get_user_path);
        API_FCT(get_modpath);
+       API_FCT(get_modpaths);
        API_FCT(get_clientmodpath);
        API_FCT(get_gamepath);
        API_FCT(get_texturepath);
        API_FCT(get_texturepath_share);
        API_FCT(get_cache_path);
+       API_FCT(get_temp_path);
        API_FCT(create_dir);
        API_FCT(delete_dir);
        API_FCT(copy_dir);
+       API_FCT(is_dir);
        API_FCT(extract_zip);
+       API_FCT(may_modify_path);
        API_FCT(get_mainmenu_path);
        API_FCT(show_path_select_dialog);
        API_FCT(download_file);
        API_FCT(gettext);
        API_FCT(get_video_drivers);
-       API_FCT(get_video_modes);
        API_FCT(get_screen_info);
        API_FCT(get_min_supp_proto);
        API_FCT(get_max_supp_proto);
+       API_FCT(open_url);
+       API_FCT(open_dir);
        API_FCT(do_async_callback);
 }
 
@@ -1074,18 +936,24 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
 {
        API_FCT(get_worlds);
        API_FCT(get_games);
-       API_FCT(get_favorites);
        API_FCT(get_mapgen_names);
+       API_FCT(get_user_path);
        API_FCT(get_modpath);
+       API_FCT(get_modpaths);
        API_FCT(get_clientmodpath);
        API_FCT(get_gamepath);
        API_FCT(get_texturepath);
        API_FCT(get_texturepath_share);
        API_FCT(get_cache_path);
+       API_FCT(get_temp_path);
        API_FCT(create_dir);
        API_FCT(delete_dir);
        API_FCT(copy_dir);
-       //API_FCT(extract_zip); //TODO remove dependency to GuiEngine
+       API_FCT(is_dir);
+       API_FCT(extract_zip);
+       API_FCT(may_modify_path);
        API_FCT(download_file);
-       //API_FCT(gettext); (gettext lib isn't threadsafe)
+       API_FCT(get_min_supp_proto);
+       API_FCT(get_max_supp_proto);
+       API_FCT(gettext);
 }