#include "lua_api/l_internal.h"
#include "common/c_content.h"
#include "cpp_api/s_async.h"
-#include "guiEngine.h"
-#include "guiMainMenu.h"
-#include "guiKeyChangeMenu.h"
-#include "guiFileSelectMenu.h"
-#include "subgame.h"
+#include "gui/guiEngine.h"
+#include "gui/guiMainMenu.h"
+#include "gui/guiKeyChangeMenu.h"
+#include "gui/guiPathSelectMenu.h"
#include "version.h"
#include "porting.h"
#include "filesys.h"
#include "convert_json.h"
+#include "content/content.h"
+#include "content/subgames.h"
#include "serverlist.h"
-#include "mapgen.h"
-#include "sound.h"
+#include "mapgen/mapgen.h"
#include "settings.h"
-#include "log.h"
-#include "EDriverTypes.h"
#include <IFileArchive.h>
#include <IFileSystem.h>
+#include "client/renderingengine.h"
+#include "network/networkprotocol.h"
+
/******************************************************************************/
std::string ModApiMainMenu::getTextData(lua_State *L, std::string name)
}
valid = true;
- return lua_toboolean(L, -1);
+ return readParam<bool>(L, -1);
}
/******************************************************************************/
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)
{
unsigned int minsize = 16;
if (!lua_isnone(L, 3)) {
- tile_image = lua_toboolean(L, 3);
+ tile_image = readParam<bool>(L, 3);
}
if (!lua_isnone(L, 4)) {
GUIEngine* engine = getGuiEngine(L);
sanity_check(engine != NULL);
- bool value = lua_toboolean(L,1);
+ bool value = readParam<bool>(L,1);
engine->m_clouds_enabled = value;
int top = lua_gettop(L);
unsigned int index = 1;
- for (unsigned int i = 0; i < worlds.size(); i++)
- {
+ for (const WorldSpec &world : worlds) {
lua_pushnumber(L,index);
lua_newtable(L);
int top_lvl2 = lua_gettop(L);
lua_pushstring(L,"path");
- lua_pushstring(L,worlds[i].path.c_str());
+ lua_pushstring(L, world.path.c_str());
lua_settable(L, top_lvl2);
lua_pushstring(L,"name");
- lua_pushstring(L,worlds[i].name.c_str());
+ lua_pushstring(L, world.name.c_str());
lua_settable(L, top_lvl2);
lua_pushstring(L,"gameid");
- lua_pushstring(L,worlds[i].gameid.c_str());
+ lua_pushstring(L, world.gameid.c_str());
lua_settable(L, top_lvl2);
lua_settable(L, top);
return 1;
}
-/******************************************************************************/
-int ModApiMainMenu::l_get_games(lua_State *L)
-{
- std::vector<SubgameSpec> games = getAvailableGames();
-
- lua_newtable(L);
- int top = lua_gettop(L);
- unsigned int index = 1;
-
- for (unsigned int i = 0; i < games.size(); i++)
- {
- lua_pushnumber(L,index);
- lua_newtable(L);
- int top_lvl2 = lua_gettop(L);
-
- lua_pushstring(L,"id");
- lua_pushstring(L,games[i].id.c_str());
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"path");
- lua_pushstring(L,games[i].path.c_str());
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"gamemods_path");
- lua_pushstring(L,games[i].gamemods_path.c_str());
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"name");
- lua_pushstring(L,games[i].name.c_str());
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"menuicon_path");
- lua_pushstring(L,games[i].menuicon_path.c_str());
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"addon_mods_paths");
- lua_newtable(L);
- int table2 = lua_gettop(L);
- int internal_index=1;
- for (std::set<std::string>::iterator iter = games[i].addon_mods_paths.begin();
- iter != games[i].addon_mods_paths.end(); iter++) {
- lua_pushnumber(L,internal_index);
- lua_pushstring(L,(*iter).c_str());
- lua_settable(L, table2);
- internal_index++;
- }
- lua_settable(L, top_lvl2);
- lua_settable(L, top);
- index++;
- }
- return 1;
-}
-/******************************************************************************/
-int ModApiMainMenu::l_get_modstore_details(lua_State *L)
-{
- const char *modid = luaL_checkstring(L, 1);
-
- if (modid != 0) {
- Json::Value details;
- std::string url = "";
- try{
- url = g_settings->get("modstore_details_url");
- }
- catch(SettingNotFoundException &e) {
- lua_pushnil(L);
- return 1;
- }
-
- size_t idpos = url.find("*");
- url.erase(idpos,1);
- url.insert(idpos,modid);
-
- details = getModstoreUrl(url);
-
- ModStoreModDetails current_mod = readModStoreModDetails(details);
-
- if ( current_mod.valid) {
- lua_newtable(L);
- int top = lua_gettop(L);
-
- lua_pushstring(L,"id");
- lua_pushnumber(L,current_mod.id);
- lua_settable(L, top);
-
- lua_pushstring(L,"title");
- lua_pushstring(L,current_mod.title.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"basename");
- lua_pushstring(L,current_mod.basename.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"description");
- lua_pushstring(L,current_mod.description.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"author");
- lua_pushstring(L,current_mod.author.username.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"download_url");
- lua_pushstring(L,current_mod.versions[0].file.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"versions");
- lua_newtable(L);
- int versionstop = lua_gettop(L);
- for (unsigned int i=0;i < current_mod.versions.size(); i++) {
- lua_pushnumber(L,i+1);
- lua_newtable(L);
- int current_element = lua_gettop(L);
-
- lua_pushstring(L,"date");
- lua_pushstring(L,current_mod.versions[i].date.c_str());
- lua_settable(L,current_element);
-
- lua_pushstring(L,"download_url");
- lua_pushstring(L,current_mod.versions[i].file.c_str());
- lua_settable(L,current_element);
-
- lua_settable(L,versionstop);
- }
- lua_settable(L, top);
-
- lua_pushstring(L,"screenshot_url");
- lua_pushstring(L,current_mod.titlepic.file.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"license");
- lua_pushstring(L,current_mod.license.shortinfo.c_str());
- lua_settable(L, top);
-
- lua_pushstring(L,"rating");
- lua_pushnumber(L,current_mod.rating);
- lua_settable(L, top);
-
- //TODO depends
-
- //TODO softdepends
- return 1;
- }
- }
- return 0;
-}
-
-/******************************************************************************/
-int ModApiMainMenu::l_get_modstore_list(lua_State *L)
-{
- Json::Value mods;
- std::string url = "";
- try{
- url = g_settings->get("modstore_listmods_url");
- }
- catch(SettingNotFoundException &e) {
- lua_pushnil(L);
- return 1;
- }
-
- mods = getModstoreUrl(url);
-
- std::vector<ModStoreMod> moddata = readModStoreList(mods);
-
- lua_newtable(L);
- int top = lua_gettop(L);
- unsigned int index = 1;
-
- for (unsigned int i = 0; i < moddata.size(); i++)
- {
- if (moddata[i].valid) {
- lua_pushnumber(L,index);
- lua_newtable(L);
-
- int top_lvl2 = lua_gettop(L);
-
- lua_pushstring(L,"id");
- lua_pushnumber(L,moddata[i].id);
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"title");
- lua_pushstring(L,moddata[i].title.c_str());
- lua_settable(L, top_lvl2);
-
- lua_pushstring(L,"basename");
- lua_pushstring(L,moddata[i].basename.c_str());
- lua_settable(L, top_lvl2);
-
- lua_settable(L, top);
- index++;
- }
- }
- return 1;
-}
-
/******************************************************************************/
int ModApiMainMenu::l_get_favorites(lua_State *L)
{
std::string listtype = "local";
- if (!lua_isnone(L,1)) {
- listtype = luaL_checkstring(L,1);
+ if (!lua_isnone(L, 1)) {
+ listtype = luaL_checkstring(L, 1);
}
std::vector<ServerListSpec> servers;
int top = lua_gettop(L);
unsigned int index = 1;
- for (unsigned int i = 0; i < servers.size(); i++)
- {
+ for (const Json::Value &server : servers) {
- lua_pushnumber(L,index);
+ lua_pushnumber(L, index);
lua_newtable(L);
int top_lvl2 = lua_gettop(L);
- if (servers[i]["clients"].asString().size()) {
- std::string clients_raw = servers[i]["clients"].asString();
+ if (!server["clients"].asString().empty()) {
+ std::string clients_raw = server["clients"].asString();
char* endptr = 0;
- int numbervalue = strtol(clients_raw.c_str(),&endptr,10);
+ int numbervalue = strtol(clients_raw.c_str(), &endptr,10);
- if ((clients_raw != "") && (*endptr == 0)) {
- lua_pushstring(L,"clients");
- lua_pushnumber(L,numbervalue);
+ if ((!clients_raw.empty()) && (*endptr == 0)) {
+ lua_pushstring(L, "clients");
+ lua_pushnumber(L, numbervalue);
lua_settable(L, top_lvl2);
}
}
- if (servers[i]["clients_max"].asString().size()) {
+ if (!server["clients_max"].asString().empty()) {
- std::string clients_max_raw = servers[i]["clients_max"].asString();
+ std::string clients_max_raw = server["clients_max"].asString();
char* endptr = 0;
- int numbervalue = strtol(clients_max_raw.c_str(),&endptr,10);
+ int numbervalue = strtol(clients_max_raw.c_str(), &endptr,10);
- if ((clients_max_raw != "") && (*endptr == 0)) {
- lua_pushstring(L,"clients_max");
- lua_pushnumber(L,numbervalue);
+ if ((!clients_max_raw.empty()) && (*endptr == 0)) {
+ lua_pushstring(L, "clients_max");
+ lua_pushnumber(L, numbervalue);
lua_settable(L, top_lvl2);
}
}
- if (servers[i]["version"].asString().size()) {
- lua_pushstring(L,"version");
- std::string topush = servers[i]["version"].asString();
- lua_pushstring(L,topush.c_str());
+ 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 (servers[i]["proto_min"].asString().size()) {
- lua_pushstring(L,"proto_min");
- lua_pushinteger(L,servers[i]["proto_min"].asInt());
+ if (!server["password"].asString().empty()) {
+ lua_pushstring(L, "password");
+ lua_pushboolean(L, server["password"].asBool());
lua_settable(L, top_lvl2);
}
- if (servers[i]["proto_max"].asString().size()) {
- lua_pushstring(L,"proto_max");
- lua_pushinteger(L,servers[i]["proto_max"].asInt());
+ if (!server["creative"].asString().empty()) {
+ lua_pushstring(L, "creative");
+ lua_pushboolean(L, server["creative"].asBool());
lua_settable(L, top_lvl2);
}
- if (servers[i]["password"].asString().size()) {
- lua_pushstring(L,"password");
- lua_pushboolean(L,servers[i]["password"].asBool());
+ if (!server["damage"].asString().empty()) {
+ lua_pushstring(L, "damage");
+ lua_pushboolean(L, server["damage"].asBool());
lua_settable(L, top_lvl2);
}
- if (servers[i]["creative"].asString().size()) {
- lua_pushstring(L,"creative");
- lua_pushboolean(L,servers[i]["creative"].asBool());
+ if (!server["pvp"].asString().empty()) {
+ lua_pushstring(L, "pvp");
+ lua_pushboolean(L, server["pvp"].asBool());
lua_settable(L, top_lvl2);
}
- if (servers[i]["damage"].asString().size()) {
- lua_pushstring(L,"damage");
- lua_pushboolean(L,servers[i]["damage"].asBool());
+ 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 (servers[i]["pvp"].asString().size()) {
- lua_pushstring(L,"pvp");
- lua_pushboolean(L,servers[i]["pvp"].asBool());
+ 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 (servers[i]["description"].asString().size()) {
- lua_pushstring(L,"description");
- std::string topush = servers[i]["description"].asString();
- lua_pushstring(L,topush.c_str());
+ 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 (servers[i]["name"].asString().size()) {
- lua_pushstring(L,"name");
- std::string topush = servers[i]["name"].asString();
- lua_pushstring(L,topush.c_str());
+ 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 (servers[i]["address"].asString().size()) {
- lua_pushstring(L,"address");
- std::string topush = servers[i]["address"].asString();
- lua_pushstring(L,topush.c_str());
+ if (server.isMember("ping")) {
+ float ping = server["ping"].asFloat();
+ lua_pushstring(L, "ping");
+ lua_pushnumber(L, ping);
+ lua_settable(L, top_lvl2);
+ }
+
+ if (server["clients_list"].isArray()) {
+ unsigned int index_lvl2 = 1;
+ lua_pushstring(L, "clients_list");
+ lua_newtable(L);
+ int top_lvl3 = lua_gettop(L);
+ for (const Json::Value &client : server["clients_list"]) {
+ lua_pushnumber(L, index_lvl2);
+ std::string topush = client.asString();
+ lua_pushstring(L, topush.c_str());
+ lua_settable(L, top_lvl3);
+ index_lvl2++;
+ }
lua_settable(L, top_lvl2);
}
- if (servers[i]["port"].asString().size()) {
- lua_pushstring(L,"port");
- std::string topush = servers[i]["port"].asString();
- lua_pushstring(L,topush.c_str());
+ if (server["mods"].isArray()) {
+ unsigned int index_lvl2 = 1;
+ lua_pushstring(L, "mods");
+ lua_newtable(L);
+ int top_lvl3 = lua_gettop(L);
+ for (const Json::Value &mod : server["mods"]) {
+
+ lua_pushnumber(L, index_lvl2);
+ std::string topush = mod.asString();
+ lua_pushstring(L, topush.c_str());
+ lua_settable(L, top_lvl3);
+ index_lvl2++;
+ }
lua_settable(L, top_lvl2);
}
return 0;
}
+/******************************************************************************/
+int ModApiMainMenu::l_get_games(lua_State *L)
+{
+ std::vector<SubgameSpec> games = getAvailableGames();
+
+ lua_newtable(L);
+ int top = lua_gettop(L);
+ unsigned int index = 1;
+
+ for (const SubgameSpec &game : games) {
+ lua_pushnumber(L, index);
+ lua_newtable(L);
+ int top_lvl2 = lua_gettop(L);
+
+ lua_pushstring(L, "id");
+ lua_pushstring(L, game.id.c_str());
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "path");
+ lua_pushstring(L, game.path.c_str());
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "type");
+ lua_pushstring(L, "game");
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "gamemods_path");
+ lua_pushstring(L, game.gamemods_path.c_str());
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "name");
+ lua_pushstring(L, game.name.c_str());
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "author");
+ lua_pushstring(L, game.author.c_str());
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "release");
+ lua_pushinteger(L, game.release);
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "menuicon_path");
+ lua_pushstring(L, game.menuicon_path.c_str());
+ lua_settable(L, top_lvl2);
+
+ lua_pushstring(L, "addon_mods_paths");
+ lua_newtable(L);
+ int table2 = lua_gettop(L);
+ int internal_index = 1;
+ for (const std::string &addon_mods_path : game.addon_mods_paths) {
+ lua_pushnumber(L, internal_index);
+ lua_pushstring(L, addon_mods_path.c_str());
+ lua_settable(L, table2);
+ internal_index++;
+ }
+ lua_settable(L, top_lvl2);
+ lua_settable(L, top);
+ index++;
+ }
+ return 1;
+}
+
+/******************************************************************************/
+int ModApiMainMenu::l_get_content_info(lua_State *L)
+{
+ std::string path = luaL_checkstring(L, 1);
+
+ ContentSpec spec;
+ spec.path = path;
+ parseContentInfo(spec);
+
+ lua_newtable(L);
+
+ lua_pushstring(L, spec.name.c_str());
+ lua_setfield(L, -2, "name");
+
+ lua_pushstring(L, spec.type.c_str());
+ lua_setfield(L, -2, "type");
+
+ lua_pushstring(L, spec.author.c_str());
+ lua_setfield(L, -2, "author");
+
+ lua_pushinteger(L, spec.release);
+ lua_setfield(L, -2, "release");
+
+ lua_pushstring(L, spec.desc.c_str());
+ lua_setfield(L, -2, "description");
+
+ lua_pushstring(L, spec.path.c_str());
+ lua_setfield(L, -2, "path");
+
+ if (spec.type == "mod") {
+ ModSpec spec;
+ spec.path = path;
+ parseModContents(spec);
+
+ // Dependencies
+ lua_newtable(L);
+ int i = 1;
+ for (const auto &dep : spec.depends) {
+ lua_pushstring(L, dep.c_str());
+ lua_rawseti(L, -2, i++);
+ }
+ lua_setfield(L, -2, "depends");
+
+ // Optional Dependencies
+ lua_newtable(L);
+ i = 1;
+ for (const auto &dep : spec.optdepends) {
+ lua_pushstring(L, dep.c_str());
+ lua_rawseti(L, -2, i++);
+ }
+ lua_setfield(L, -2, "optional_depends");
+ }
+
+ return 1;
+}
+
/******************************************************************************/
int ModApiMainMenu::l_show_keys_menu(lua_State *L)
{
GUIEngine* engine = getGuiEngine(L);
sanity_check(engine != NULL);
- GUIKeyChangeMenu *kmenu
- = new GUIKeyChangeMenu( engine->m_device->getGUIEnvironment(),
- engine->m_parent,
- -1,
- engine->m_menumanager);
+ GUIKeyChangeMenu *kmenu = new GUIKeyChangeMenu(RenderingEngine::get_gui_env(),
+ engine->m_parent,
+ -1,
+ engine->m_menumanager,
+ engine->m_texture_source);
kmenu->drop();
return 0;
}
std::string path = porting::path_user + DIR_DELIM
"worlds" + DIR_DELIM
- + name;
+ + sanitizeDirName(name, "world_");
std::vector<SubgameSpec> games = getAvailableGames();
(gameidx < (int) games.size())) {
// Create world if it doesn't exist
- if (!loadGameConfAndInitWorld(path, games[gameidx])) {
- lua_pushstring(L, "Failed to initialize world");
- } else {
+ try {
+ loadGameConfAndInitWorld(path, name, games[gameidx], true);
lua_pushnil(L);
+ } catch (const BaseException &e) {
+ lua_pushstring(L, (std::string("Failed to initialize world: ") + e.what()).c_str());
}
} else {
lua_pushstring(L, "Invalid game index");
/******************************************************************************/
int ModApiMainMenu::l_delete_world(lua_State *L)
{
- int worldidx = luaL_checkinteger(L,1) -1;
-
+ int world_id = luaL_checkinteger(L, 1) - 1;
std::vector<WorldSpec> worlds = getAvailableWorlds();
-
- if ((worldidx >= 0) &&
- (worldidx < (int) worlds.size())) {
-
- WorldSpec spec = worlds[worldidx];
-
- std::vector<std::string> paths;
- paths.push_back(spec.path);
- fs::GetRecursiveSubPaths(spec.path, paths);
-
- // Delete files
- if (!fs::DeletePaths(paths)) {
- lua_pushstring(L, "Failed to delete world");
- }
- else {
- lua_pushnil(L);
- }
- }
- else {
+ if (world_id < 0 || world_id >= (int) worlds.size()) {
lua_pushstring(L, "Invalid world index");
+ return 1;
}
- return 1;
+ const WorldSpec &spec = worlds[world_id];
+ if (!fs::RecursiveDelete(spec.path)) {
+ lua_pushstring(L, "Failed to delete world");
+ return 1;
+ }
+ return 0;
}
/******************************************************************************/
GUIEngine* engine = getGuiEngine(L);
sanity_check(engine != NULL);
- std::string text = "";
+ std::string text;
if (!lua_isnone(L,1) && !lua_isnil(L,1))
text = luaL_checkstring(L, 1);
int ModApiMainMenu::l_get_mapgen_names(lua_State *L)
{
std::vector<const char *> names;
- Mapgen::getMapgenNames(&names, lua_toboolean(L, 1));
+ bool include_hidden = lua_isboolean(L, 1) && readParam<bool>(L, 1);
+ Mapgen::getMapgenNames(&names, include_hidden);
lua_newtable(L);
for (size_t i = 0; i != names.size(); i++) {
return 1;
}
+/******************************************************************************/
+int ModApiMainMenu::l_get_clientmodpath(lua_State *L)
+{
+ std::string modpath = fs::RemoveRelativePathComponents(
+ porting::path_user + DIR_DELIM + "clientmods" + DIR_DELIM);
+ lua_pushstring(L, modpath.c_str());
+ return 1;
+}
+
/******************************************************************************/
int ModApiMainMenu::l_get_gamepath(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_create_dir(lua_State *L) {
const char *path = luaL_checkstring(L, 1);
- if (ModApiMainMenu::isMinetestPath(path)) {
+ if (ModApiMainMenu::mayModifyPath(path)) {
lua_pushboolean(L, fs::CreateAllDirs(path));
return 1;
}
std::string absolute_path = fs::RemoveRelativePathComponents(path);
- if (ModApiMainMenu::isMinetestPath(absolute_path)) {
+ if (ModApiMainMenu::mayModifyPath(absolute_path)) {
lua_pushboolean(L, fs::RecursiveDelete(absolute_path));
return 1;
}
if ((!lua_isnone(L,3)) &&
(!lua_isnil(L,3))) {
- keep_source = lua_toboolean(L,3);
+ keep_source = readParam<bool>(L,3);
}
std::string absolute_destination = fs::RemoveRelativePathComponents(destination);
std::string absolute_source = fs::RemoveRelativePathComponents(source);
- if ((ModApiMainMenu::isMinetestPath(absolute_source)) &&
- (ModApiMainMenu::isMinetestPath(absolute_destination))) {
+ if ((ModApiMainMenu::mayModifyPath(absolute_destination))) {
bool retval = fs::CopyDir(absolute_source,absolute_destination);
if (retval && (!keep_source)) {
/******************************************************************************/
int ModApiMainMenu::l_extract_zip(lua_State *L)
{
- GUIEngine* engine = getGuiEngine(L);
- sanity_check(engine);
-
const char *zipfile = luaL_checkstring(L, 1);
const char *destination = luaL_checkstring(L, 2);
std::string absolute_destination = fs::RemoveRelativePathComponents(destination);
- if (ModApiMainMenu::isMinetestPath(absolute_destination)) {
+ if (ModApiMainMenu::mayModifyPath(absolute_destination)) {
fs::CreateAllDirs(absolute_destination);
- io::IFileSystem* fs = engine->m_device->getFileSystem();
+ io::IFileSystem *fs = RenderingEngine::get_filesystem();
- if (!fs->addFileArchive(zipfile,true,false,io::EFAT_ZIP)) {
+ if (!fs->addFileArchive(zipfile, false, false, io::EFAT_ZIP)) {
lua_pushboolean(L,false);
return 1;
}
}
/******************************************************************************/
-bool ModApiMainMenu::isMinetestPath(std::string path)
+bool ModApiMainMenu::mayModifyPath(const std::string &path)
{
- if (fs::PathStartsWith(path,fs::TempPath()))
+ if (fs::PathStartsWith(path, fs::TempPath()))
return true;
- /* games */
- if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "games")))
+ if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "games")))
return true;
- /* mods */
- if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM + "mods")))
+ if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "mods")))
return true;
- /* worlds */
- if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM + "worlds")))
+ if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "clientmods")))
return true;
+ if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "textures")))
+ return true;
- return false;
-}
-
-/******************************************************************************/
-int ModApiMainMenu::l_show_file_open_dialog(lua_State *L)
-{
- GUIEngine* engine = getGuiEngine(L);
- sanity_check(engine != NULL);
+ if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "worlds")))
+ return true;
- const char *formname= luaL_checkstring(L, 1);
- const char *title = luaL_checkstring(L, 2);
+ if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_cache)))
+ return true;
- GUIFileSelectMenu* fileOpenMenu =
- new GUIFileSelectMenu(engine->m_device->getGUIEnvironment(),
- engine->m_parent,
- -1,
- engine->m_menumanager,
- title,
- formname);
- fileOpenMenu->setTextDest(engine->m_buttonhandler);
- fileOpenMenu->drop();
- return 0;
+ return false;
}
-/******************************************************************************/
-int ModApiMainMenu::l_get_version(lua_State *L)
-{
- lua_pushstring(L, g_version_string);
- return 1;
-}
/******************************************************************************/
-int ModApiMainMenu::l_sound_play(lua_State *L)
+int ModApiMainMenu::l_may_modify_path(lua_State *L)
{
- GUIEngine* engine = getGuiEngine(L);
-
- SimpleSoundSpec spec;
- read_soundspec(L, 1, spec);
- bool looped = lua_toboolean(L, 2);
-
- u32 handle = engine->playSound(spec, looped);
-
- lua_pushinteger(L, handle);
-
+ 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_sound_stop(lua_State *L)
+int ModApiMainMenu::l_show_path_select_dialog(lua_State *L)
{
GUIEngine* engine = getGuiEngine(L);
+ sanity_check(engine != NULL);
- u32 handle = luaL_checkinteger(L, 1);
- engine->stopSound(handle);
+ const char *formname= luaL_checkstring(L, 1);
+ const char *title = luaL_checkstring(L, 2);
+ bool is_file_select = readParam<bool>(L, 3);
- return 1;
+ GUIFileSelectMenu* fileOpenMenu =
+ new GUIFileSelectMenu(RenderingEngine::get_gui_env(),
+ engine->m_parent,
+ -1,
+ engine->m_menumanager,
+ title,
+ formname,
+ is_file_select);
+ fileOpenMenu->setTextDest(engine->m_buttonhandler);
+ fileOpenMenu->drop();
+ return 0;
}
/******************************************************************************/
//check path
std::string absolute_destination = fs::RemoveRelativePathComponents(target);
- if (ModApiMainMenu::isMinetestPath(absolute_destination)) {
+ if (ModApiMainMenu::mayModifyPath(absolute_destination)) {
if (GUIEngine::downloadFile(url,absolute_destination)) {
lua_pushboolean(L,true);
return 1;
/******************************************************************************/
int ModApiMainMenu::l_get_video_drivers(lua_State *L)
{
- std::vector<irr::video::E_DRIVER_TYPE> drivers
- = porting::getSupportedVideoDrivers();
+ std::vector<irr::video::E_DRIVER_TYPE> drivers = RenderingEngine::getSupportedVideoDrivers();
lua_newtable(L);
for (u32 i = 0; i != drivers.size(); i++) {
- const char *name = porting::getVideoDriverName(drivers[i]);
- const char *fname = porting::getVideoDriverFriendlyName(drivers[i]);
+ const char *name = RenderingEngine::getVideoDriverName(drivers[i]);
+ const char *fname = RenderingEngine::getVideoDriverFriendlyName(drivers[i]);
lua_newtable(L);
lua_pushstring(L, name);
int ModApiMainMenu::l_get_video_modes(lua_State *L)
{
std::vector<core::vector3d<u32> > videomodes
- = porting::getSupportedVideoModes();
+ = RenderingEngine::getSupportedVideoModes();
lua_newtable(L);
for (u32 i = 0; i != videomodes.size(); i++) {
lua_newtable(L);
int top = lua_gettop(L);
lua_pushstring(L,"density");
- lua_pushnumber(L,porting::getDisplayDensity());
+ lua_pushnumber(L,RenderingEngine::getDisplayDensity());
lua_settable(L, top);
lua_pushstring(L,"display_width");
- lua_pushnumber(L,porting::getDisplaySize().X);
+ lua_pushnumber(L,RenderingEngine::getDisplaySize().X);
lua_settable(L, top);
lua_pushstring(L,"display_height");
- lua_pushnumber(L,porting::getDisplaySize().Y);
+ lua_pushnumber(L,RenderingEngine::getDisplaySize().Y);
lua_settable(L, top);
+ const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
lua_pushstring(L,"window_width");
- lua_pushnumber(L,porting::getWindowSize().X);
+ lua_pushnumber(L, window_size.X);
lua_settable(L, top);
lua_pushstring(L,"window_height");
- lua_pushnumber(L,porting::getWindowSize().Y);
+ lua_pushnumber(L, window_size.Y);
lua_settable(L, top);
return 1;
}
/******************************************************************************/
int ModApiMainMenu::l_get_min_supp_proto(lua_State *L)
{
- u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
- CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
- lua_pushinteger(L, proto_version_min);
+ lua_pushinteger(L, CLIENT_PROTOCOL_VERSION_MIN);
return 1;
}
return 1;
}
+/******************************************************************************/
+int ModApiMainMenu::l_open_url(lua_State *L)
+{
+ std::string url = luaL_checkstring(L, 1);
+ lua_pushboolean(L, porting::openURL(url));
+ return 1;
+}
+
/******************************************************************************/
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);
API_FCT(get_worlds);
API_FCT(get_games);
+ API_FCT(get_content_info);
API_FCT(start);
API_FCT(close);
API_FCT(get_favorites);
API_FCT(set_topleft_text);
API_FCT(get_mapgen_names);
API_FCT(get_modpath);
+ API_FCT(get_clientmodpath);
API_FCT(get_gamepath);
API_FCT(get_texturepath);
API_FCT(get_texturepath_share);
+ API_FCT(get_cache_path);
API_FCT(create_dir);
API_FCT(delete_dir);
API_FCT(copy_dir);
API_FCT(extract_zip);
+ API_FCT(may_modify_path);
API_FCT(get_mainmenu_path);
- API_FCT(show_file_open_dialog);
- API_FCT(get_version);
+ API_FCT(show_path_select_dialog);
API_FCT(download_file);
- API_FCT(get_modstore_details);
- API_FCT(get_modstore_list);
- API_FCT(sound_play);
- API_FCT(sound_stop);
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(do_async_callback);
}
/******************************************************************************/
-void ModApiMainMenu::InitializeAsync(AsyncEngine& engine)
+void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
{
-
- ASYNC_API_FCT(get_worlds);
- ASYNC_API_FCT(get_games);
- ASYNC_API_FCT(get_favorites);
- ASYNC_API_FCT(get_mapgen_names);
- ASYNC_API_FCT(get_modpath);
- ASYNC_API_FCT(get_gamepath);
- ASYNC_API_FCT(get_texturepath);
- ASYNC_API_FCT(get_texturepath_share);
- ASYNC_API_FCT(create_dir);
- ASYNC_API_FCT(delete_dir);
- ASYNC_API_FCT(copy_dir);
- //ASYNC_API_FCT(extract_zip); //TODO remove dependency to GuiEngine
- ASYNC_API_FCT(get_version);
- ASYNC_API_FCT(download_file);
- ASYNC_API_FCT(get_modstore_details);
- ASYNC_API_FCT(get_modstore_list);
- //ASYNC_API_FCT(gettext); (gettext lib isn't threadsafe)
+ API_FCT(get_worlds);
+ API_FCT(get_games);
+ API_FCT(get_favorites);
+ API_FCT(get_mapgen_names);
+ API_FCT(get_modpath);
+ API_FCT(get_clientmodpath);
+ API_FCT(get_gamepath);
+ API_FCT(get_texturepath);
+ API_FCT(get_texturepath_share);
+ API_FCT(get_cache_path);
+ API_FCT(create_dir);
+ API_FCT(delete_dir);
+ API_FCT(copy_dir);
+ //API_FCT(extract_zip); //TODO remove dependency to GuiEngine
+ API_FCT(may_modify_path);
+ API_FCT(download_file);
+ //API_FCT(gettext); (gettext lib isn't threadsafe)
}
projects / dragonfireclient.git / blobdiff