Merge branch 'master' of https://github.com/minetest/minetest

16 files changed, 503 insertions, 207 deletions

diff --git a/builtin/fstk/ui.lua b/builtin/fstk/ui.lua
index 7eeebdd47..976659ed3 100644
--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@@ -18,6 +18,8 @@
 ui = {}
 ui.childlist = {}
 ui.default = nil
+-- Whether fstk is currently showing its own formspec instead of active ui elements.
+ui.overridden = false
 
 --------------------------------------------------------------------------------
 function ui.add(child)
@@ -55,6 +57,7 @@ end
 --------------------------------------------------------------------------------
 
 function ui.update()
+	ui.overridden = false
 	local formspec = {}
 
 	-- handle errors
@@ -71,6 +74,7 @@ function ui.update()
 			"button[2,6.6;4,1;btn_reconnect_yes;" .. fgettext("Reconnect") .. "]",
 			"button[8,6.6;4,1;btn_reconnect_no;" .. fgettext("Main menu") .. "]"
 		}
+		ui.overridden = true
 	elseif gamedata ~= nil and gamedata.errormessage ~= nil then
 		local error_message = core.formspec_escape(gamedata.errormessage)
 
@@ -89,6 +93,7 @@ function ui.update()
 				error_title, error_message),
 			"button[5,6.6;4,1;btn_error_confirm;" .. fgettext("OK") .. "]"
 		}
+		ui.overridden = true
 	else
 		local active_toplevel_ui_elements = 0
 		for key,value in pairs(ui.childlist) do
@@ -185,6 +190,16 @@ end
 
 --------------------------------------------------------------------------------
 core.event_handler = function(event)
+	-- Handle error messages
+	if ui.overridden then
+		if event == "MenuQuit" then
+			gamedata.errormessage = nil
+			gamedata.reconnect_requested = false
+			ui.update()
+		end
+		return
+	end
+
 	if ui.handle_events(event) then
 		ui.update()
 		return
diff --git a/builtin/game/deprecated.lua b/builtin/game/deprecated.lua
index 20f0482eb..c5c7848f5 100644
--- a/builtin/game/deprecated.lua
+++ b/builtin/game/deprecated.lua
@@ -1,29 +1,6 @@
 -- Minetest: builtin/deprecated.lua
 
 --
--- Default material types
---
-local function digprop_err()
-	core.log("deprecated", "The core.digprop_* functions are obsolete and need to be replaced by item groups.")
-end
-
-core.digprop_constanttime = digprop_err
-core.digprop_stonelike = digprop_err
-core.digprop_dirtlike = digprop_err
-core.digprop_gravellike = digprop_err
-core.digprop_woodlike = digprop_err
-core.digprop_leaveslike = digprop_err
-core.digprop_glasslike = digprop_err
-
-function core.node_metadata_inventory_move_allow_all()
-	core.log("deprecated", "core.node_metadata_inventory_move_allow_all is obsolete and does nothing.")
-end
-
-function core.add_to_creative_inventory(itemstring)
-	core.log("deprecated", "core.add_to_creative_inventory is obsolete and does nothing.")
-end
-
---
 -- EnvRef
 --
 core.env = {}
@@ -77,7 +54,7 @@ core.setting_save = setting_proxy("write")
 
 function core.register_on_auth_fail(func)
 	core.log("deprecated", "core.register_on_auth_fail " ..
-		"is obsolete and should be replaced by " ..
+		"is deprecated and should be replaced by " ..
 		"core.register_on_authplayer instead.")
 
 	core.register_on_authplayer(function (player_name, ip, is_success)
diff --git a/builtin/game/features.lua b/builtin/game/features.lua
index 4d3c90ff0..36ff1f0b0 100644
--- a/builtin/game/features.lua
+++ b/builtin/game/features.lua
@@ -18,6 +18,7 @@ core.features = {
 	pathfinder_works = true,
 	object_step_has_moveresult = true,
 	direct_velocity_on_players = true,
+	use_texture_alpha_string_modes = true,
 }
 
 function core.has_feature(arg)
diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 768df847b..30bb4a007 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -544,7 +544,7 @@ function core.node_dig(pos, node, digger)
 		log("info", diggername .. " tried to dig "
 			.. node.name .. " which is not diggable "
 			.. core.pos_to_string(pos))
-		return
+		return false
 	end
 
 	if core.is_protected(pos, diggername) then
@@ -553,7 +553,7 @@ function core.node_dig(pos, node, digger)
 				.. " at protected position "
 				.. core.pos_to_string(pos))
 		core.record_protection_violation(pos, diggername)
-		return
+		return false
 	end
 
 	log('action', diggername .. " digs "
@@ -636,6 +636,8 @@ function core.node_dig(pos, node, digger)
 		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
 		callback(pos_copy, node_copy, digger)
 	end
+
+	return true
 end
 
 function core.itemstring_with_palette(item, palette_index)
@@ -692,10 +694,6 @@ core.nodedef_default = {
 
 	on_receive_fields = nil,
 
-	on_metadata_inventory_move = core.node_metadata_inventory_move_allow_all,
-	on_metadata_inventory_offer = core.node_metadata_inventory_offer_allow_all,
-	on_metadata_inventory_take = core.node_metadata_inventory_take_allow_all,
-
 	-- Node properties
 	drawtype = "normal",
 	visual_scale = 1.0,
@@ -706,7 +704,6 @@ core.nodedef_default = {
 	--	{name="", backface_culling=true},
 	--	{name="", backface_culling=true},
 	--},
-	alpha = 255,
 	post_effect_color = {a=0, r=0, g=0, b=0},
 	paramtype = "none",
 	paramtype2 = "none",
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 96a0a2dda..b8c5e16a9 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -266,3 +266,26 @@ end
 function core.cancel_shutdown_requests()
 	core.request_shutdown("", false, -1)
 end
+
+
+-- Callback handling for dynamic_add_media
+
+local dynamic_add_media_raw = core.dynamic_add_media_raw
+core.dynamic_add_media_raw = nil
+function core.dynamic_add_media(filepath, callback)
+	local ret = dynamic_add_media_raw(filepath)
+	if ret == false then
+		return ret
+	end
+	if callback == nil then
+		core.log("deprecated", "Calling minetest.dynamic_add_media without "..
+			"a callback is deprecated and will stop working in future versions.")
+	else
+		-- At the moment async loading is not actually implemented, so we
+		-- immediately call the callback ourselves
+		for _, name in ipairs(ret) do
+			callback(name)
+		end
+	end
+	return true
+end
diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index 1f94a9dca..b006957e9 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -324,13 +324,6 @@ for name in pairs(forbidden_item_names) do
 	register_alias_raw(name, "")
 end
 
-
--- Obsolete:
--- Aliases for core.register_alias (how ironic...)
--- core.alias_node = core.register_alias
--- core.alias_tool = core.register_alias
--- core.alias_craftitem = core.register_alias
-
 --
 -- Built-in node definitions. Also defined in C.
 --
@@ -617,6 +610,7 @@ core.registered_can_bypass_userlimit, core.register_can_bypass_userlimit = make_
 core.registered_on_modchannel_message, core.register_on_modchannel_message = make_registration()
 core.registered_on_player_inventory_actions, core.register_on_player_inventory_action = make_registration()
 core.registered_allow_player_inventory_actions, core.register_allow_player_inventory_action = make_registration()
+core.registered_on_rightclickplayers, core.register_on_rightclickplayer = make_registration()
 
 --
 -- Compatibility for on_mapgen_init()
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 2bd8aa8a5..cd896f9ec 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -62,24 +62,6 @@ function image_column(tooltip, flagname)
 		"5=" .. core.formspec_escape(defaulttexturedir .. "server_ping_1.png")
 end
 
---------------------------------------------------------------------------------
-function order_favorite_list(list)
-	local res = {}
-	--orders the favorite list after support
-	for i = 1, #list do
-		local fav = list[i]
-		if is_server_protocol_compat(fav.proto_min, fav.proto_max) then
-			res[#res + 1] = fav
-		end
-	end
-	for i = 1, #list do
-		local fav = list[i]
-		if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then
-			res[#res + 1] = fav
-		end
-	end
-	return res
-end
 
 --------------------------------------------------------------------------------
 function render_serverlist_row(spec, is_favorite)
@@ -164,35 +146,15 @@ end
 
 --------------------------------------------------------------------------------
 os.tempfolder = function()
-	if core.settings:get("TMPFolder") then
-		return core.settings:get("TMPFolder") .. DIR_DELIM .. "MT_" .. math.random(0,10000)
-	end
-
-	local filetocheck = os.tmpname()
-	os.remove(filetocheck)
-
-	-- luacheck: ignore
-	-- https://blogs.msdn.microsoft.com/vcblog/2014/06/18/c-runtime-crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1/
-	--   The C runtime (CRT) function called by os.tmpname is tmpnam.
-	--   Microsofts tmpnam implementation in older CRT / MSVC releases is defective.
-	--   tmpnam return values starting with a backslash characterize this behavior.
-	-- https://sourceforge.net/p/mingw-w64/bugs/555/
-	--   MinGW tmpnam implementation is forwarded to the CRT directly.
-	-- https://sourceforge.net/p/mingw-w64/discussion/723797/thread/55520785/
-	--   MinGW links to an older CRT release (msvcrt.dll).
-	--   Due to legal concerns MinGW will never use a newer CRT.
-	--
-	--   Make use of TEMP to compose the temporary filename if an old
-	--   style tmpnam return value is detected.
-	if filetocheck:sub(1, 1) == "\\" then
-		local tempfolder = os.getenv("TEMP")
-		return tempfolder .. filetocheck
-	end
+	local temp = core.get_temp_path()
+	return temp .. DIR_DELIM .. "MT_" .. math.random(0, 10000)
+end
 
-	local randname = "MTTempModFolder_" .. math.random(0,10000)
-	local backstring = filetocheck:reverse()
-	return filetocheck:sub(0, filetocheck:len() - backstring:find(DIR_DELIM) + 1) ..
-		randname
+--------------------------------------------------------------------------------
+os.tmpname = function()
+	local path = os.tempfolder()
+	io.open(path, "w"):close()
+	return path
 end
 
 --------------------------------------------------------------------------------
@@ -227,41 +189,6 @@ function menu_handle_key_up_down(fields, textlist, settingname)
 end
 
 --------------------------------------------------------------------------------
-function asyncOnlineFavourites()
-	if not menudata.public_known then
-		menudata.public_known = {{
-			name = fgettext("Loading..."),
-			description = fgettext_ne("Try reenabling public serverlist and check your internet connection.")
-		}}
-	end
-	menudata.favorites = menudata.public_known
-	menudata.favorites_is_public = true
-
-	if not menudata.public_downloading then
-		menudata.public_downloading = true
-	else
-		return
-	end
-
-	core.handle_async(
-		function(param)
-			return core.get_favorites("online")
-		end,
-		nil,
-		function(result)
-			menudata.public_downloading = nil
-			local favs = order_favorite_list(result)
-			if favs[1] then
-				menudata.public_known = favs
-				menudata.favorites = menudata.public_known
-				menudata.favorites_is_public = true
-			end
-			core.event_handler("Refresh")
-		end
-	)
-end
-
---------------------------------------------------------------------------------
 function text2textlist(xpos, ypos, width, height, tl_name, textlen, text, transparency)
 	local textlines = core.wrap_text(text, textlen, true)
 	local retval = "textlist[" .. xpos .. "," .. ypos .. ";" .. width ..
diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index 32703a3b9..b058e4824 100644
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -23,7 +23,9 @@ if not minetest.get_http_api then
 	return
 end
 
-local store = { packages = {}, packages_full = {} }
+-- Unordered preserves the original order of the ContentDB API,
+-- before the package list is ordered based on installed state.
+local store = { packages = {}, packages_full = {}, packages_full_unordered = {} }
 
 local http = minetest.get_http_api()
 
@@ -572,6 +574,7 @@ function store.load()
 		end
 	end
 
+	store.packages_full_unordered = store.packages_full
 	store.packages = store.packages_full
 	store.loaded = true
 end
@@ -580,7 +583,7 @@ function store.update_paths()
 	local mod_hash = {}
 	pkgmgr.refresh_globals()
 	for _, mod in pairs(pkgmgr.clientmods:get_list()) do
-		if mod.author then
+		if mod.author and mod.release > 0 then
 			mod_hash[mod.author:lower() .. "/" .. mod.name] = mod
 		end
 	end
@@ -588,14 +591,14 @@ function store.update_paths()
 	local game_hash = {}
 	pkgmgr.update_gamelist()
 	for _, game in pairs(pkgmgr.games) do
-		if game.author ~= "" then
+		if game.author ~= "" and game.release > 0 then
 			game_hash[game.author:lower() .. "/" .. game.id] = game
 		end
 	end
 
 	local txp_hash = {}
 	for _, txp in pairs(pkgmgr.get_texture_packs()) do
-		if txp.author then
+		if txp.author and txp.release > 0 then
 			txp_hash[txp.author:lower() .. "/" .. txp.name] = txp
 		end
 	end
@@ -619,6 +622,33 @@ function store.update_paths()
 	end
 end
 
+function store.sort_packages()
+	local ret = {}
+
+	-- Add installed content
+	for i=1, #store.packages_full_unordered do
+		local package = store.packages_full_unordered[i]
+		if package.path then
+			ret[#ret + 1] = package
+		end
+	end
+
+	-- Sort installed content by title
+	table.sort(ret, function(a, b)
+		return a.title < b.title
+	end)
+
+	-- Add uninstalled content
+	for i=1, #store.packages_full_unordered do
+		local package = store.packages_full_unordered[i]
+		if not package.path then
+			ret[#ret + 1] = package
+		end
+	end
+
+	store.packages_full = ret
+end
+
 function store.filter_packages(query)
 	if query == "" and filter_type == 1 then
 		store.packages = store.packages_full
@@ -652,7 +682,6 @@ function store.filter_packages(query)
 			store.packages[#store.packages + 1] = package
 		end
 	end
-
 end
 
 function store.get_formspec(dlgdata)
@@ -960,6 +989,9 @@ function create_store_dlg(type)
 		store.load()
 	end
 
+	store.update_paths()
+	store.sort_packages()
+
 	search_string = ""
 	cur_page = 1
 
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 5c7e20932..2096b0cfc 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -34,6 +34,7 @@ dofile(basepath .. "fstk" .. DIR_DELIM .. "ui.lua")
 dofile(menupath .. DIR_DELIM .. "async_event.lua")
 dofile(menupath .. DIR_DELIM .. "common.lua")
 dofile(menupath .. DIR_DELIM .. "pkgmgr.lua")
+dofile(menupath .. DIR_DELIM .. "serverlistmgr.lua")
 dofile(menupath .. DIR_DELIM .. "textures.lua")
 
 dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index d4acb2b6a..588d10f81 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -72,6 +72,34 @@ local function cleanup_path(temppath)
 	return temppath
 end
 
+local function load_texture_packs(txtpath, retval)
+	local list = core.get_dir_list(txtpath, true)
+	local current_texture_path = core.settings:get("texture_path")
+
+	for _, item in ipairs(list) do
+		if item ~= "base" then
+			local name = item
+
+			local path = txtpath .. DIR_DELIM .. item .. DIR_DELIM
+			if path == current_texture_path then
+				name = fgettext("$1 (Enabled)", name)
+			end
+
+			local conf = Settings(path .. "texture_pack.conf")
+
+			retval[#retval + 1] = {
+				name = item,
+				author = conf:get("author"),
+				release = tonumber(conf:get("release") or "0"),
+				list_name = name,
+				type = "txp",
+				path = path,
+				enabled = path == current_texture_path,
+			}
+		end
+	end
+end
+
 function get_mods(path,retval,modpack)
 	local mods = core.get_dir_list(path, true)
 
@@ -112,7 +140,7 @@ function get_mods(path,retval,modpack)
 			toadd.type = "mod"
 
 			-- Check modpack.txt
-			--  Note: modpack.conf is already checked above
+			-- Note: modpack.conf is already checked above
 			local modpackfile = io.open(prefix .. DIR_DELIM .. "modpack.txt")
 			if modpackfile then
 				modpackfile:close()
@@ -136,32 +164,13 @@ pkgmgr = {}
 
 function pkgmgr.get_texture_packs()
 	local txtpath = core.get_texturepath()
-	local list = core.get_dir_list(txtpath, true)
+	local txtpath_system = core.get_texturepath_share()
 	local retval = {}
 
-	local current_texture_path = core.settings:get("texture_path")
-
-	for _, item in ipairs(list) do
-		if item ~= "base" then
-			local name = item
-
-			local path = txtpath .. DIR_DELIM .. item .. DIR_DELIM
-			if path == current_texture_path then
-				name = fgettext("$1 (Enabled)", name)
-			end
-
-			local conf = Settings(path .. "texture_pack.conf")
-
-			retval[#retval + 1] = {
-				name = item,
-				author = conf:get("author"),
-				release = tonumber(conf:get("release") or "0"),
-				list_name = name,
-				type = "txp",
-				path = path,
-				enabled = path == current_texture_path,
-			}
-		end
+	load_texture_packs(txtpath, retval)
+	-- on portable versions these two paths coincide. It avoids loading the path twice
+	if txtpath ~= txtpath_system then
+		load_texture_packs(txtpath_system, retval)
 	end
 
 	table.sort(retval, function(a, b)
diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua
new file mode 100644
index 000000000..9876d8ac5
--- /dev/null
+++ b/builtin/mainmenu/serverlistmgr.lua
@@ -0,0 +1,250 @@
+--Minetest
+--Copyright (C) 2020 rubenwardy
+--
+--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.
+
+serverlistmgr = {}
+
+--------------------------------------------------------------------------------
+local function order_server_list(list)
+	local res = {}
+	--orders the favorite list after support
+	for i = 1, #list do
+		local fav = list[i]
+		if is_server_protocol_compat(fav.proto_min, fav.proto_max) then
+			res[#res + 1] = fav
+		end
+	end
+	for i = 1, #list do
+		local fav = list[i]
+		if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then
+			res[#res + 1] = fav
+		end
+	end
+	return res
+end
+
+local public_downloading = false
+
+--------------------------------------------------------------------------------
+function serverlistmgr.sync()
+	if not serverlistmgr.servers then
+		serverlistmgr.servers = {{
+			name = fgettext("Loading..."),
+			description = fgettext_ne("Try reenabling public serverlist and check your internet connection.")
+		}}
+	end
+
+	local serverlist_url = core.settings:get("serverlist_url") or ""
+	if not core.get_http_api or serverlist_url == "" then
+		serverlistmgr.servers = {{
+			name = fgettext("Public server list is disabled"),
+			description = ""
+		}}
+		return
+	end
+
+	if public_downloading then
+		return
+	end
+	public_downloading = true
+
+	core.handle_async(
+		function(param)
+			local http = core.get_http_api()
+			local url = ("%s/list?proto_version_min=%d&proto_version_max=%d"):format(
+				core.settings:get("serverlist_url"),
+				core.get_min_supp_proto(),
+				core.get_max_supp_proto())
+
+			local response = http.fetch_sync({ url = url })
+			if not response.succeeded then
+				return {}
+			end
+
+			local retval = core.parse_json(response.data)
+			return retval and retval.list or {}
+		end,
+		nil,
+		function(result)
+			public_downloading = nil
+			local favs = order_server_list(result)
+			if favs[1] then
+				serverlistmgr.servers = favs
+			end
+			core.event_handler("Refresh")
+		end
+	)
+end
+
+--------------------------------------------------------------------------------
+local function get_favorites_path()
+	local base = core.get_user_path() .. DIR_DELIM .. "client" .. DIR_DELIM .. "serverlist" .. DIR_DELIM
+	return base .. core.settings:get("serverlist_file")
+end
+
+--------------------------------------------------------------------------------
+local function save_favorites(favorites)
+	local filename = core.settings:get("serverlist_file")
+	-- If setting specifies legacy format change the filename to the new one
+	if filename:sub(#filename - 3):lower() == ".txt" then
+		core.settings:set("serverlist_file", filename:sub(1, #filename - 4) .. ".json")
+	end
+
+	local path = get_favorites_path()
+	core.create_dir(path)
+	core.safe_file_write(path, core.write_json(favorites))
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.read_legacy_favorites(path)
+	local file = io.open(path, "r")
+	if not file then
+		return nil
+	end
+
+	local lines = {}
+	for line in file:lines() do
+		lines[#lines + 1] = line
+	end
+	file:close()
+
+	local favorites = {}
+
+	local i = 1
+	while i < #lines do
+		local function pop()
+			local line = lines[i]
+			i = i + 1
+			return line and line:trim()
+		end
+
+		if pop():lower() == "[server]" then
+			local name = pop()
+			local address = pop()
+			local port = tonumber(pop())
+			local description = pop()
+
+			if name == "" then
+				name = nil
+			end
+
+			if description == "" then
+				description = nil
+			end
+
+			if not address or #address < 3 then
+				core.log("warning", "Malformed favorites file, missing address at line " .. i)
+			elseif not port or port < 1 or port > 65535 then
+				core.log("warning", "Malformed favorites file, missing port at line " .. i)
+			elseif (name and name:upper() == "[SERVER]") or
+					(address and address:upper() == "[SERVER]") or
+					(description and description:upper() == "[SERVER]") then
+				core.log("warning", "Potentially malformed favorites file, overran at line " .. i)
+			else
+				favorites[#favorites + 1] = {
+					name = name,
+					address = address,
+					port = port,
+					description = description
+				}
+			end
+		end
+	end
+
+	return favorites
+end
+
+--------------------------------------------------------------------------------
+local function read_favorites()
+	local path = get_favorites_path()
+
+	-- If new format configured fall back to reading the legacy file
+	if path:sub(#path - 4):lower() == ".json" then
+		local file = io.open(path, "r")
+		if file then
+			local json = file:read("*all")
+			file:close()
+			return core.parse_json(json)
+		end
+
+		path = path:sub(1, #path - 5) .. ".txt"
+	end
+
+	local favs = serverlistmgr.read_legacy_favorites(path)
+	if favs then
+		save_favorites(favs)
+		os.remove(path)
+	end
+	return favs
+end
+
+--------------------------------------------------------------------------------
+local function delete_favorite(favorites, del_favorite)
+	for i=1, #favorites do
+		local fav = favorites[i]
+
+		if fav.address == del_favorite.address and fav.port == del_favorite.port then
+			table.remove(favorites, i)
+			return
+		end
+	end
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.get_favorites()
+	if serverlistmgr.favorites then
+		return serverlistmgr.favorites
+	end
+
+	serverlistmgr.favorites = {}
+
+	-- Add favorites, removing duplicates
+	local seen = {}
+	for _, fav in ipairs(read_favorites() or {}) do
+		local key = ("%s:%d"):format(fav.address:lower(), fav.port)
+		if not seen[key] then
+			seen[key] = true
+			serverlistmgr.favorites[#serverlistmgr.favorites + 1] = fav
+		end
+	end
+
+	return serverlistmgr.favorites
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.add_favorite(new_favorite)
+	assert(type(new_favorite.port) == "number")
+
+	-- Whitelist favorite keys
+	new_favorite = {
+		name = new_favorite.name,
+		address = new_favorite.address,
+		port = new_favorite.port,
+		description = new_favorite.description,
+	}
+
+	local favorites = serverlistmgr.get_favorites()
+	delete_favorite(favorites, new_favorite)
+	table.insert(favorites, 1, new_favorite)
+	save_favorites(favorites)
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.delete_favorite(del_favorite)
+	local favorites = serverlistmgr.get_favorites()
+	delete_favorite(favorites, del_favorite)
+	save_favorites(favorites)
+end
diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index 2eb4752bc..0e06c3bef 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -116,7 +116,7 @@ local function get_formspec(tabview, name, tabdata)
 
 	retval = retval ..
 			"button[3.9,3.8;2.8,1;world_delete;".. fgettext("Delete") .. "]" ..
-			"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Configure") .. "]" ..
+			"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Select Mods") .. "]" ..
 			"button[9.2,3.8;2.8,1;world_create;".. fgettext("New") .. "]" ..
 			"label[3.9,-0.05;".. fgettext("Select World:") .. "]"..
 			"checkbox[0,-0.20;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index 8f1341161..e6748ed88 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -20,11 +20,11 @@ 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
+	local selected
 	if menudata.search_result then
-		fav_selected = menudata.search_result[tabdata.fav_selected]
+		selected = menudata.search_result[tabdata.selected]
 	else
-		fav_selected = menudata.favorites[tabdata.fav_selected]
+		selected = serverlistmgr.servers[tabdata.selected]
 	end
 
 	if not tabdata.search_for then
@@ -58,18 +58,18 @@ local function get_formspec(tabview, name, tabdata)
 		-- Connect
 		"button[9.88,4.9;2.3,1;btn_mp_connect;" .. fgettext("Connect") .. "]"
 
-	if tabdata.fav_selected and fav_selected then
+	if tabdata.selected and selected then
 		if gamedata.fav then
 			retval = retval .. "button[7.73,4.9;2.3,1;btn_delete_favorite;" ..
 				fgettext("Del. Favorite") .. "]"
 		end
-		if fav_selected.description then
+		if selected.description then
 			retval = retval .. "textarea[8.1,2.3;4.23,2.9;;;" ..
 				core.formspec_escape((gamedata.serverdescription or ""), true) .. "]"
 		end
 	end
 
-	--favourites
+	--favorites
 	retval = retval .. "tablecolumns[" ..
 		image_column(fgettext("Favorite"), "favorite") .. ";" ..
 		image_column(fgettext("Ping")) .. ",padding=0.25;" ..
@@ -83,13 +83,12 @@ local function get_formspec(tabview, name, tabdata)
 		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;"
+		"table[-0.15,0.6;7.75,5.15;favorites;"
 
 	if menudata.search_result then
+		local favs = serverlistmgr.get_favorites()
 		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
@@ -103,29 +102,30 @@ local function get_formspec(tabview, name, tabdata)
 
 			retval = retval .. render_serverlist_row(server, server.is_favorite)
 		end
-	elseif #menudata.favorites > 0 then
-		local favs = core.get_favorites("local")
+	elseif #serverlistmgr.servers > 0 then
+		local favs = serverlistmgr.get_favorites()
 		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))
+				for j = 1, #serverlistmgr.servers do
+					if serverlistmgr.servers[j].address == favs[i].address and
+							serverlistmgr.servers[j].port == favs[i].port then
+						table.insert(serverlistmgr.servers, i, table.remove(serverlistmgr.servers, j))
+					end
 				end
-			end
-				if favs[i].address ~= menudata.favorites[i].address then
-					table.insert(menudata.favorites, i, favs[i])
+				if favs[i].address ~= serverlistmgr.servers[i].address then
+					table.insert(serverlistmgr.servers, 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))
+
+		retval = retval .. render_serverlist_row(serverlistmgr.servers[1], (#favs > 0))
+		for i = 2, #serverlistmgr.servers do
+			retval = retval .. "," .. render_serverlist_row(serverlistmgr.servers[i], (i <= #favs))
 		end
 	end
 
-	if tabdata.fav_selected then
-		retval = retval .. ";" .. tabdata.fav_selected .. "]"
+	if tabdata.selected then
+		retval = retval .. ";" .. tabdata.selected .. "]"
 	else
 		retval = retval .. ";0]"
 	end
@@ -135,21 +135,20 @@ end
 
 --------------------------------------------------------------------------------
 local function main_button_handler(tabview, fields, name, tabdata)
-	local serverlist = menudata.search_result or menudata.favorites
+	local serverlist = menudata.search_result or serverlistmgr.servers
 
 	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)
+	if fields.favorites then
+		local event = core.explode_table_event(fields.favorites)
 		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(
+				if not is_server_protocol_compat_or_error(
 							fav.proto_min, fav.proto_max) then
 					return true
 				end
@@ -178,7 +177,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
 		if event.type == "CHG" then
 			if event.row <= #serverlist then
 				gamedata.fav = false
-				local favs = core.get_favorites("local")
+				local favs = serverlistmgr.get_favorites()
 				local address = fav.address
 				local port    = fav.port
 				gamedata.serverdescription = fav.description
@@ -194,28 +193,28 @@ local function main_button_handler(tabview, fields, name, tabdata)
 					core.settings:set("address", address)
 					core.settings:set("remote_port", port)
 				end
-				tabdata.fav_selected = event.row
+				tabdata.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_idx = core.get_table_index("favorites")
 		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
+			elseif fields.key_down and fav_idx < #serverlistmgr.servers then
 				fav_idx = fav_idx + 1
 			end
 		else
 			fav_idx = 1
 		end
 
-		if not menudata.favorites or not fav then
-			tabdata.fav_selected = 0
+		if not serverlistmgr.servers or not fav then
+			tabdata.selected = 0
 			return true
 		end
 
@@ -227,17 +226,17 @@ local function main_button_handler(tabview, fields, name, tabdata)
 			core.settings:set("remote_port", port)
 		end
 
-		tabdata.fav_selected = fav_idx
+		tabdata.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
+		local current_favorite = core.get_table_index("favorites")
+		if not current_favorite then return end
 
-		core.delete_favorite(current_favourite)
-		asyncOnlineFavourites()
-		tabdata.fav_selected = nil
+		serverlistmgr.delete_favorite(serverlistmgr.servers[current_favorite])
+		serverlistmgr.sync()
+		tabdata.selected = nil
 
 		core.settings:set("address", "")
 		core.settings:set("remote_port", "30000")
@@ -251,11 +250,11 @@ local function main_button_handler(tabview, fields, name, tabdata)
 	end
 
 	if fields.btn_mp_search or fields.key_enter_field == "te_search" then
-		tabdata.fav_selected = 1
+		tabdata.selected = 1
 		local input = fields.te_search:lower()
 		tabdata.search_for = fields.te_search
 
-		if #menudata.favorites < 2 then
+		if #serverlistmgr.servers < 2 then
 			return true
 		end
 
@@ -275,8 +274,8 @@ local function main_button_handler(tabview, fields, name, tabdata)
 
 		-- Search the serverlist
 		local search_result = {}
-		for i = 1, #menudata.favorites do
-			local server = menudata.favorites[i]
+		for i = 1, #serverlistmgr.servers do
+			local server = serverlistmgr.servers[i]
 			local found = 0
 			for k = 1, #keywords do
 				local keyword = keywords[k]
@@ -293,7 +292,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
 				end
 			end
 			if found > 0 then
-				local points = (#menudata.favorites - i) / 5 + found
+				local points = (#serverlistmgr.servers - i) / 5 + found
 				server.points = points
 				table.insert(search_result, server)
 			end
@@ -312,7 +311,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
 	end
 
 	if fields.btn_mp_refresh then
-		asyncOnlineFavourites()
+		serverlistmgr.sync()
 		return true
 	end
 
@@ -321,30 +320,36 @@ local function main_button_handler(tabview, fields, name, tabdata)
 		gamedata.playername = fields.te_name
 		gamedata.password   = fields.te_pwd
 		gamedata.address    = fields.te_address
-		gamedata.port       = fields.te_port
+		gamedata.port       = tonumber(fields.te_port)
 		gamedata.selected_world = 0
-		local fav_idx = core.get_table_index("favourites")
+		local fav_idx = core.get_table_index("favorites")
 		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
+				fav.address == gamedata.address and
+				fav.port    == gamedata.port then
+
+			serverlistmgr.add_favorite(fav)
 
 			gamedata.servername        = fav.name
 			gamedata.serverdescription = fav.description
 
-			if menudata.favorites_is_public and
-					not is_server_protocol_compat_or_error(
+			if not is_server_protocol_compat_or_error(
 						fav.proto_min, fav.proto_max) then
 				return true
 			end
 		else
 			gamedata.servername        = ""
 			gamedata.serverdescription = ""
+
+			serverlistmgr.add_favorite({
+				address = gamedata.address,
+				port = gamedata.port,
+			})
 		end
 
-		core.settings:set("address",     fields.te_address)
-		core.settings:set("remote_port", fields.te_port)
+		core.settings:set("address",     gamedata.address)
+		core.settings:set("remote_port", gamedata.port)
 
 		core.start()
 		return true
@@ -354,7 +359,7 @@ end
 
 local function on_change(type, old_tab, new_tab)
 	if type == "LEAVE" then return end
-	asyncOnlineFavourites()
+	serverlistmgr.sync()
 end
 
 --------------------------------------------------------------------------------
diff --git a/builtin/mainmenu/tests/favorites_wellformed.txt b/builtin/mainmenu/tests/favorites_wellformed.txt
new file mode 100644
index 000000000..8b87b4398
--- /dev/null
+++ b/builtin/mainmenu/tests/favorites_wellformed.txt
@@ -0,0 +1,29 @@
+[server]
+
+127.0.0.1
+30000
+
+
+[server]
+
+localhost
+30000
+
+
+[server]
+
+vps.rubenwardy.com
+30001
+
+
+[server]
+
+gundul.ddnss.de
+39155
+
+
+[server]
+VanessaE's Dreambuilder creative Server
+daconcepts.com
+30000
+VanessaE's Dreambuilder creative-mode server. Lots of mods, whitelisted buckets.
diff --git a/builtin/mainmenu/tests/serverlistmgr_spec.lua b/builtin/mainmenu/tests/serverlistmgr_spec.lua
new file mode 100644
index 000000000..148e9b794
--- /dev/null
+++ b/builtin/mainmenu/tests/serverlistmgr_spec.lua
@@ -0,0 +1,36 @@
+_G.core = {}
+_G.unpack = table.unpack
+_G.serverlistmgr = {}
+
+dofile("builtin/common/misc_helpers.lua")
+dofile("builtin/mainmenu/serverlistmgr.lua")
+
+local base = "builtin/mainmenu/tests/"
+
+describe("legacy favorites", function()
+	it("loads well-formed correctly", function()
+		local favs = serverlistmgr.read_legacy_favorites(base .. "favorites_wellformed.txt")
+
+		local expected = {
+			{
+				address = "127.0.0.1",
+				port = 30000,
+			},
+
+			{ address = "localhost", port = 30000 },
+
+			{ address = "vps.rubenwardy.com", port = 30001 },
+
+			{ address = "gundul.ddnss.de", port = 39155 },
+
+			{
+				address = "daconcepts.com",
+				port = 30000,
+				name = "VanessaE's Dreambuilder creative Server",
+				description = "VanessaE's Dreambuilder creative-mode server. Lots of mods, whitelisted buckets."
+			},
+		}
+
+		assert.same(expected, favs)
+	end)
+end)
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 39a6f7231..15c48dfc1 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -976,7 +976,7 @@ serverlist_url (Serverlist URL) string servers.minetest.net
 
 #    File in client/serverlist/ that contains your favorite servers displayed in the
 #    Multiplayer Tab.
-serverlist_file (Serverlist file) string favoriteservers.txt
+serverlist_file (Serverlist file) string favoriteservers.json
 
 #    Maximum size of the out chat queue.
 #    0 to disable queueing and -1 to make the queue size unlimited.
@@ -1097,7 +1097,7 @@ default_stack_max (Default stack size) int 99
 #    Enable players getting damage and dying.
 enable_damage (Damage) bool false
 
-#    Enable creative mode for new created maps.
+#    Enable creative mode for all players
 creative_mode (Creative) bool false
 
 #    A chosen map seed for a new map, leave empty for random.