oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Use JSON for favorites, move server list code to Lua (#10085)

Browse source 
Co-authored-by: sfan5 <sfan5@live.de>
This commit is contained in:
rubenwardy 2021-01-22 15:08:57 +00:00 • committed by GitHub
parent 4fcd000e20
commit 67aa75d444
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 388 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

206
src/script/lua_api/l_mainmenu.cpp
View file

@ -274,207 +274,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);
}
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 (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);
}
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)
{
@ -1130,11 +929,9 @@ 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);
@ -1170,7 +967,6 @@ 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);
@ -1186,5 +982,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
//API_FCT(extract_zip); //TODO remove dependency to GuiEngine
API_FCT(may_modify_path);
API_FCT(download_file);
API_FCT(get_min_supp_proto);
API_FCT(get_max_supp_proto);
//API_FCT(gettext); (gettext lib isn't threadsafe)
}