Merge branch 'master' of https://github.com/minetest/minetest into scrollbar-improvements

Author: Swagtoy

.github/workflows/macos.yml

@@ -29,8 +29,8 @@ on:
 
 jobs:
   build:
-    # use lowest possible macOS running on x86_64 to support more users
-    runs-on: macos-12
+    # use lowest possible macOS running on x86_64 supported by brew to support more users
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - name: Install deps

LICENSE.txt

@@ -57,12 +57,10 @@ srifqi:
   textures/base/pack/minimap_btn.png
 
 Zughy:
-  textures/base/pack/cdb_add.png
   textures/base/pack/cdb_downloading.png
   textures/base/pack/cdb_queued.png
   textures/base/pack/cdb_update.png
   textures/base/pack/cdb_update_cropped.png
-  textures/base/pack/cdb_viewonline.png
   textures/base/pack/settings_btn.png
   textures/base/pack/settings_info.png
   textures/base/pack/settings_reset.png
@@ -79,7 +77,6 @@ kilbith:
   textures/base/pack/progress_bar_bg.png
 
 SmallJoker:
-  textures/base/pack/cdb_clear.png
   textures/base/pack/server_favorite_delete.png (based on server_favorite.png)
 
 DS:

builtin/common/item_s.lua

@@ -166,20 +166,19 @@ function core.is_colored_paramtype(ptype)
 end
 
 function core.strip_param2_color(param2, paramtype2)
-	if not core.is_colored_paramtype(paramtype2) then
-		return nil
-	end
-	if paramtype2 == "colorfacedir" then
-		param2 = math.floor(param2 / 32) * 32
+	if paramtype2 == "color" then
+		return param2
+	elseif paramtype2 == "colorfacedir" then
+		return math.floor(param2 / 32) * 32
 	elseif paramtype2 == "color4dir" then
-		param2 = math.floor(param2 / 4) * 4
+		return math.floor(param2 / 4) * 4
 	elseif paramtype2 == "colorwallmounted" then
-		param2 = math.floor(param2 / 8) * 8
+		return math.floor(param2 / 8) * 8
 	elseif paramtype2 == "colordegrotate" then
-		param2 = math.floor(param2 / 32) * 32
+		return math.floor(param2 / 32) * 32
+	else
+		return nil
 	end
-	-- paramtype2 == "color" requires no modification.
-	return param2
 end
 
 -- Content ID caching

builtin/common/misc_helpers.lua

@@ -235,6 +235,16 @@ function core.formspec_escape(text)
 end
 
 
+local hypertext_escapes = {
+	["\\"] = "\\\\",
+	["<"] = "\\<",
+	[">"] = "\\>",
+}
+function core.hypertext_escape(text)
+	return text and text:gsub("[\\<>]", hypertext_escapes)
+end
+
+
 function core.wrap_text(text, max_length, as_table)
 	local result = {}
 	local line = {}

builtin/mainmenu/content/contentdb.lua

@@ -182,6 +182,23 @@ function contentdb.get_package_by_id(id)
 end
 
 
+function contentdb.calculate_package_id(type, author, name)
+	local id = author:lower() .. "/"
+	if (type == nil or type == "game") and #name > 5 and name:sub(#name - 4) == "_game" then
+		id = id .. name:sub(1, #name - 5)
+	else
+		id = id .. name
+	end
+	return id
+end
+
+
+function contentdb.get_package_by_info(author, name)
+	local id = contentdb.calculate_package_id(nil, author, name)
+	return contentdb.package_by_id[id]
+end
+
+
 -- Create a coroutine from `fn` and provide results to `callback` when complete (dead).
 -- Returns a resumer function.
 local function make_callback_coroutine(fn, callback)
@@ -415,15 +432,7 @@ local function fetch_pkgs(params)
 	local aliases = {}
 
 	for _, package in pairs(packages) do
-		local name_len = #package.name
-		-- This must match what contentdb.update_paths() does!
-		package.id = package.author:lower() .. "/"
-		if package.type == "game" and name_len > 5 and package.name:sub(name_len - 4) == "_game" then
-			package.id = package.id .. package.name:sub(1, name_len - 5)
-		else
-			package.id = package.id .. package.name
-		end
-
+		package.id = params.calculate_package_id(package.type, package.author, package.name)
 		package.url_part = core.urlencode(package.author) .. "/" .. core.urlencode(package.name)
 
 		if package.aliases then
@@ -443,7 +452,7 @@ end
 
 function contentdb.fetch_pkgs(callback)
 	contentdb.loading = true
-	core.handle_async(fetch_pkgs, nil, function(result)
+	core.handle_async(fetch_pkgs, { calculate_package_id = contentdb.calculate_package_id  }, function(result)
 		if result then
 			contentdb.load_ok = true
 			contentdb.load_error = false
@@ -581,3 +590,78 @@ function contentdb.filter_packages(query, by_type)
 		end
 	end
 end
+
+
+function contentdb.get_full_package_info(package, callback)
+	assert(package)
+	if package.full_info then
+		callback(package.full_info)
+		return
+	end
+
+	local function fetch(params)
+		local version = core.get_version()
+		local base_url = core.settings:get("contentdb_url")
+
+		local languages
+		local current_language = core.get_language()
+		if current_language ~= "" then
+			languages = { current_language, "en;q=0.8" }
+		else
+			languages = { "en" }
+		end
+
+		local url = base_url ..
+				"/api/packages/" .. params.package.url_part .. "/for-client/?" ..
+				"protocol_version=" .. core.urlencode(core.get_max_supp_proto()) ..
+				"&engine_version=" .. core.urlencode(version.string) ..
+				"&formspec_version=" .. core.urlencode(core.get_formspec_version()) ..
+				"&include_images=false"
+		local http = core.get_http_api()
+		local response = http.fetch_sync({
+			url = url,
+			extra_headers = {
+				"Accept-Language: " .. table.concat(languages, ", ")
+			},
+		})
+		if not response.succeeded then
+			return nil
+		end
+
+		return core.parse_json(response.data)
+	end
+
+	local function my_callback(value)
+		package.full_info = value
+		callback(value)
+	end
+
+	if not core.handle_async(fetch, { package = package }, my_callback) then
+		core.log("error", "ERROR: async event failed")
+		callback(nil)
+	end
+end
+
+
+function contentdb.get_formspec_padding()
+	-- Padding is increased on Android to account for notches
+	-- TODO: use Android API to determine size of cut outs
+	return { x = PLATFORM == "Android" and 1 or 0.5, y = PLATFORM == "Android" and 0.25 or 0.5 }
+end
+
+
+function contentdb.get_formspec_size()
+	local window = core.get_window_info()
+	local size = { x = window.max_formspec_size.x, y = window.max_formspec_size.y }
+
+	-- Minimum formspec size
+	local min_x = 15.5
+	local min_y = 10
+	if size.x < min_x or size.y < min_y then
+		local scale = math.max(min_x / size.x, min_y / size.y)
+		size.x = size.x * scale
+		size.y = size.y * scale
+	end
+
+	return size
+end