Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Cette dernière n'était pas bien supportée par tous les terminaux.

init.lua

@@ -1,5 +1,12 @@
 craftguide = {}
 
+local p = 0
+local CORE_VERSION = core.get_version().string:match("[^%-]*"):gsub("%.", function(a)
+	p = p + 1
+	return p == 3 and a or ""
+end)
+CORE_VERSION = tonumber(CORE_VERSION)
+
 -- Caches
 local pdata         = {}
 local init_items    = {}
@@ -12,11 +19,6 @@ local toolrepair
 
 local progressive_mode = core.settings:get_bool("craftguide_progressive_mode")
 local sfinv_only = core.settings:get_bool("craftguide_sfinv_only") and rawget(_G, "sfinv")
-local enable_cache_progress_bar = core.settings:get_bool("craftguide_enable_cache_progress_bar")
-
-if enable_cache_progress_bar == nil then
-	enable_cache_progress_bar = true
-end
 
 local http = core.request_http_api()
 
@@ -42,19 +44,26 @@ local get_player_by_name = core.get_player_by_name
 local slz, dslz = core.serialize, core.deserialize
 local on_mods_loaded = core.register_on_mods_loaded
 local on_leaveplayer = core.register_on_leaveplayer
-local get_player_info = core.get_player_information
 local on_receive_fields = core.register_on_player_receive_fields
 
 local ESC = core.formspec_escape
-local S = core.get_translator("craftguide")
+local S = CORE_VERSION >= 500 and core.get_translator("craftguide") or
+	function(...)
+		local args, i = {...}, 1
+
+		return args[1]:gsub("@%d+", function()
+			i = i + 1
+			return args[i]
+		end)
+	end
 
 local ES = function(...)
 	return ESC(S(...))
 end
 
-local maxn, sort, concat, copy, insert, remove, unpack =
+local maxn, sort, concat, copy, insert, remove =
 	table.maxn, table.sort, table.concat, table.copy,
-	table.insert, table.remove, unpack
+	table.insert, table.remove
 
 local fmt, find, gmatch, match, sub, split, upper, lower =
 	string.format, string.find, string.gmatch, string.match,
@@ -64,8 +73,6 @@ local min, max, floor, ceil = math.min, math.max, math.floor, math.ceil
 local pairs, next, type, tostring, io = pairs, next, type, tostring, io
 local vec_add, vec_mul = vector.add, vector.multiply
 
-local FORMSPEC_MINIMAL_VERSION = 3
-
 local ROWS  = 9
 local LINES = sfinv_only and 5 or 9
 local IPP   = ROWS * LINES
@@ -83,12 +90,9 @@ local PNG = {
 	next     = "craftguide_next_icon.png",
 	arrow    = "craftguide_arrow.png",
 	fire     = "craftguide_fire.png",
-	fire_anim = "craftguide_fire_anim.png",
 	book     = "craftguide_book.png",
 	sign     = "craftguide_sign.png",
-	nothing   = "craftguide_no.png",
 	selected = "craftguide_selected.png",
-	furnace_anim = "craftguide_furnace_anim.png",
 
 	search_hover = "craftguide_search_icon_hover.png",
 	clear_hover  = "craftguide_clear_icon_hover.png",
@@ -104,16 +108,10 @@ local FMT = {
 	tooltip = "tooltip[%f,%f;%f,%f;%s]",
 	item_image = "item_image[%f,%f;%f,%f;%s]",
 	image_button = "image_button[%f,%f;%f,%f;%s;%s;%s]",
-	animated_image = "animated_image[%f,%f;%f,%f;;%s;%u;%u]",
 	item_image_button = "item_image_button[%f,%f;%f,%f;%s;%s;%s]",
 	arrow = "image_button[%f,%f;0.8,0.8;%s;%s;;;false;%s]",
 }
 
-local function get_fs_version(name)
-	local info = get_player_info(name)
-	return info and info.formspec_version or 1
-end
-
 local function mul_elem(elem, n)
 	local fstr, elems = "", {}
 
@@ -558,7 +556,7 @@ local function get_usages(item)
 end
 
 local function get_burntime(item)
-	return get_craft_result{method = "fuel", items = {item}}.time
+	return get_craft_result({method = "fuel", items = {item}}).time
 end
 
 local function cache_fuel(item)
@@ -592,15 +590,10 @@ local function get_recipes(item, data, player)
 	end
 
 	local no_recipes = not recipes or #recipes == 0
-
 	if no_recipes and not usages then
 		return
-	elseif sfinv_only then
+	elseif sfinv_only and usages and no_recipes then
-		if usages and no_recipes then
 		data.show_usages = true
-		elseif recipes and not usages then
-			data.show_usages = nil
-		end
 	end
 
 	if not sfinv_only or (sfinv_only and data.show_usages) then
@@ -646,24 +639,7 @@ local function repairable(tool)
 	return toolrepair and def and def.groups and def.groups.disable_repair ~= 1
 end
 
-local function is_fav(data)
-	local fav, i
-	for j = 1, #data.favs do
-		if data.favs[j] == data.query_item then
-			fav = true
-			i = j
-			break
-		end
-	end
-
-	return fav, i
-end
-
 local function get_desc(name)
-	if sub(name, 1, 1) == "_" then
-		name = sub(name, 2)
-	end
-
 	local def = reg_items[name]
 
 	return def and (match(def.description, "%)([%w%s]*)") or def.description) or
@@ -724,7 +700,7 @@ local function get_tooltip(name, info)
 	return fmt("tooltip[%s;%s]", name, ESC(tooltip))
 end
 
-local function get_output_fs(data, fs, L)
+local function get_output_fs(fs, L)
 	local custom_recipe = craft_types[L.recipe.type]
 
 	if custom_recipe or L.shapeless or L.recipe.type == "cooking" then
@@ -738,16 +714,15 @@ local function get_output_fs(data, fs, L)
 		local pos_x = L.rightest + L.btn_size + 0.1
 		local pos_y = YOFFSET + (sfinv_only and 0.25 or -0.45)
 
-		if sub(icon, 1, 18) == "craftguide_furnace" then
+		fs[#fs + 1] = fmt(FMT.image, pos_x, pos_y + L.spacing, 0.5, 0.5, icon)
-			fs[#fs + 1] = fmt(FMT.animated_image,
-				pos_x, pos_y + L.spacing, 0.5, 0.5, PNG.furnace_anim, 8, 180)
-		end
 
 		local tooltip = custom_recipe and custom_recipe.description or
 				L.shapeless and S"Shapeless" or S"Cooking"
 
+		if CORE_VERSION >= 500 then
 			fs[#fs + 1] = fmt(FMT.tooltip, pos_x, pos_y + L.spacing, 0.5, 0.5, ESC(tooltip))
 		end
+	end
 
 	local arrow_X = L.rightest + (L._btn_size or 1.1)
 	local output_X = arrow_X + 0.9
@@ -757,23 +732,23 @@ local function get_output_fs(data, fs, L)
 		0.9, 0.7, PNG.arrow)
 
 	if L.recipe.type == "fuel" then
-		fs[#fs + 1] = fmt(FMT.animated_image,
+		fs[#fs + 1] = fmt(FMT.image,
 			output_X, YOFFSET + (sfinv_only and 0.7 or 0) + L.spacing,
-			1.1, 1.1, PNG.fire_anim, 8, 180)
+			1.1, 1.1, PNG.fire)
 	else
 		local item = L.recipe.output
 		item = clean_name(item)
 		local name = match(item, "%S*")
 
+		if CORE_VERSION >= 510 then
 			fs[#fs + 1] = fmt(FMT.image,
 				output_X, YOFFSET + (sfinv_only and 0.7 or 0) + L.spacing,
 				1.1, 1.1, PNG.selected)
+		end
 
-		local _name = sfinv_only and name or fmt("_%s", name)
+		fs[#fs + 1] = fmt(FMT.item_image_button,
-
-		fs[#fs + 1] = fmt("item_image_button[%f,%f;%f,%f;%s;%s;%s]",
 			output_X, YOFFSET + (sfinv_only and 0.7 or 0) + L.spacing,
-			1.1, 1.1, item, _name, "")
+			1.1, 1.1, item, name, "")
 
 		local infos = {
 			unknown  = not reg_items[name] or nil,
@@ -783,7 +758,7 @@ local function get_output_fs(data, fs, L)
 		}
 
 		if next(infos) then
-			fs[#fs + 1] = get_tooltip(_name, infos)
+			fs[#fs + 1] = get_tooltip(name, infos)
 		end
 
 		if infos.burntime then
@@ -791,14 +766,14 @@ local function get_output_fs(data, fs, L)
 				output_X + 1, YOFFSET + (sfinv_only and 0.7 or 0.1) + L.spacing,
 				0.6, 0.4, PNG.arrow)
 
-			fs[#fs + 1] = fmt(FMT.animated_image,
+			fs[#fs + 1] = fmt(FMT.image,
 				output_X + 1.6, YOFFSET + (sfinv_only and 0.55 or 0) + L.spacing,
-				0.6, 0.6, PNG.fire_anim, 8, 180)
+				0.6, 0.6, PNG.fire)
 		end
 	end
 end
 
-local function get_grid_fs(data, fs, rcp, spacing)
+local function get_grid_fs(fs, rcp, spacing)
 	local width = rcp.width or 1
 	local replacements = rcp.replacements
 	local rarity = rcp.rarity
@@ -877,9 +852,10 @@ local function get_grid_fs(data, fs, rcp, spacing)
 			end
 		end
 
-		if not large_recipe then
+		if CORE_VERSION >= 510 and not large_recipe then
 			fs[#fs + 1] = fmt(FMT.image,
-				X, Y + (sfinv_only and 0.7 or 0), btn_size, btn_size, PNG.selected)
+				X, Y + (sfinv_only and 0.7 or 0),
+				btn_size, btn_size, PNG.selected)
 		end
 
 		fs[#fs + 1] = fmt(FMT.item_image_button,
@@ -903,7 +879,7 @@ local function get_grid_fs(data, fs, rcp, spacing)
 		fs[#fs + 1] = "style_type[item_image_button;border=false]"
 	end
 
-	get_output_fs(data, fs, {
+	get_output_fs(fs, {
 		recipe    = rcp,
 		shapeless = shapeless,
 		rightest  = rightest,
@@ -915,65 +891,37 @@ local function get_grid_fs(data, fs, rcp, spacing)
 end
 
 local function get_panels(data, fs)
-	local start_y = sfinv_only and 0.33 or 0
+	local panels = {recipes = data.recipes or {}, usages = data.usages or {}}
+	local x = 0.33
 
-	local panels = {
+	if sfinv_only then
-		{dat = data.usages or {}, height = 3.5},
+		panels = data.show_usages and {usages = data.usages} or {recipes = data.recipes}
-		{dat = data.recipes or {}, height = 3.5},
-	}
-
-	if not sfinv_only then
-		panels.favs = {height = 2.19}
-	else
-		panels = data.show_usages and
-			{{dat = data.usages}} or {{dat = data.recipes}}
 	end
 
 	for k, v in pairs(panels) do
-		start_y = start_y + 1
+		x = x + 1
-		local spacing = (start_y - 1) * 3.6
+		local spacing = (x - 1) * 3.6
 
 		if not sfinv_only then
-			fs[#fs + 1] = fmt("background9[8.1,%f;6.6,%f;%s;false;%d]",
+			fs[#fs + 1] = CORE_VERSION >= 510 and
-				-0.2 + spacing, v.height, PNG.bg_full, 10)
+				fmt("background9[8.1,%f;6.6,3.5;%s;false;%d]",
-
+					-0.2 + spacing, PNG.bg_full, 10) or
-			if k == 2 then
+				fmt("background[8.1,%f;6.6,3.5;%s;false]",
-				local fav = is_fav(data)
+					-0.2 + spacing, PNG.bg_full)
-				local nfavs = #data.favs
-
-				fs[#fs + 1] = fmt(
-					"style[fav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
-					fmt("craftguide_fav%s.png", fav and "" or "_off"),
-					fmt("craftguide_fav%s.png", fav and "_off" or ""),
-					fmt("craftguide_fav%s.png", fav and "_off" or ""))
-
-				if nfavs < 6 or (nfavs >= 6 and fav) then
-					fs[#fs + 1] = fmt(FMT.image_button,
-						14, spacing, 0.5, 0.45, "", "fav", "")
 		end
 
-				fs[#fs + 1] = fmt("tooltip[fav;%s]",
+		local rn = #v
-					fav and ES"Unmark this item" or ES"Mark this item")
-			end
-		end
-
-		local rn = v.dat and #v.dat or -1
 		local _rn = tostring(rn)
 		local xu = tostring(data.unum) .. _rn
 		local xr = tostring(data.rnum) .. _rn
-		xu = max(-0.3, -((#xu - 3) * 0.05))
+		xu = max(-0.3, -((#xu - 3) * 0.15))
-		xr = max(-0.3, -((#xr - 3) * 0.05))
+		xr = max(-0.3, -((#xr - 3) * 0.15))
 
-		local is_recipe = sfinv_only and not data.show_usages or k == 2
+		local is_recipe = k == "recipes"
-		local lbl = ""
+		local lbl
 
 		if not sfinv_only and rn == 0 then
-			fs[#fs + 1] = fmt(FMT.image,
+			lbl = clr("#f00", is_recipe and ES"No recipes" or ES"No usages")
-				XOFFSET - 0.7, YOFFSET - 0.4 + spacing, 2, 2, PNG.nothing)
-
-			fs[#fs + 1] = fmt(FMT.tooltip,
-				XOFFSET - 0.7, YOFFSET - 0.4 + spacing, 2, 2,
-				is_recipe and ES"No recipes" or ES"No usages")
 
 		elseif (not sfinv_only and is_recipe) or
 				(sfinv_only and not data.show_usages) then
@@ -990,88 +938,93 @@ local function get_panels(data, fs)
 
 		fs[#fs + 1] = fmt(FMT.label,
 			XOFFSET + (sfinv_only and 2.3 or 1.6) + (is_recipe and xr or xu),
-			YOFFSET + (sfinv_only and 3.4 or 1.5 + spacing), lbl)
+			YOFFSET + (sfinv_only and 3.35 or 1.5 + spacing), lbl)
 
 		if rn > 1 then
 			local btn_suffix = is_recipe and "recipe" or "usage"
 			local prev_name = fmt("prev_%s", btn_suffix)
 			local next_name = fmt("next_%s", btn_suffix)
 			local x_arrow = XOFFSET + (sfinv_only and 1.7 or 1)
-			local y_arrow = YOFFSET + (sfinv_only and 3.3 or 1.4 + spacing)
+			local y_arrow = YOFFSET + (sfinv_only and 3.25 or 1.4 + spacing)
 
+			if CORE_VERSION >= 520 then
 				fs[#fs + 1] = fmt(mul_elem(FMT.arrow, 2),
 					x_arrow + (is_recipe and xr or xu), y_arrow,
 						PNG.prev, prev_name, "",
 					x_arrow + 1.8, y_arrow, PNG.next, next_name, "")
+			else
+				fs[#fs + 1] = fmt(mul_elem(FMT.arrow, 2),
+					x_arrow + (is_recipe and xr or xu),
+						y_arrow, PNG.prev, prev_name, PNG.prev_hover,
+					x_arrow + 1.8, y_arrow, PNG.next, next_name, PNG.next_hover)
+			end
 		end
 
-		local rcp = v.dat and (is_recipe and v.dat[data.rnum] or v.dat[data.unum])
+		local rcp = is_recipe and v[data.rnum] or v[data.unum]
 		if rcp then
-			get_grid_fs(data, fs, rcp, spacing)
+			get_grid_fs(fs, rcp, spacing)
-		end
-
-		if k == "favs" and not sfinv_only then
-			fs[#fs + 1] = fmt(FMT.label, 8.3, spacing - 0.1, ES"Bookmarks")
-
-			for i = 1, #data.favs do
-				local item = data.favs[i]
-
-				if data.query_item == item then
-					fs[#fs + 1] = fmt(FMT.image,
-						7.85 + (i - 0.5), spacing + 0.45,
-						1.1, 1.1, PNG.selected)
-				end
-
-				fs[#fs + 1] = fmt(FMT.item_image_button,
-					7.85 + (i - 0.5), spacing + 0.45,
-					1.1, 1.1, item, item, "")
-			end
 		end
 	end
 end
 
-local function make_fs(data)
+local function make_formspec(name)
+	local data = pdata[name]
 	local fs = {}
 
+	if not sfinv_only then
 		fs[#fs + 1] = fmt([[
 			size[%f,%f]
 			no_prepend[]
 			bgcolor[#0000]
+			style_type[image_button;border=false]
+			style_type[item_image_button;border=false;bgimg_hovered=%s]
 		]],
-	ROWS + (data.query_item and 6.7 or 0) - 1.2, LINES - 0.3)
+		ROWS + (data.query_item and 6.7 or 0) - 1.2, LINES - 0.3, PNG.selected)
 
-	if not sfinv_only then
+		fs[#fs + 1] = CORE_VERSION >= 510 and
-		fs[#fs + 1] = fmt("background9[-0.15,-0.2;%f,%f;%s;false;%d]",
+			fmt("background9[-0.15,-0.2;%f,%f;%s;false;%d]",
-			ROWS - 0.9, LINES + 0.4, PNG.bg_full, 10)
+				ROWS - 0.9, LINES + 0.4, PNG.bg_full, 10) or
+			fmt("background[-0.15,-0.2;%f,%f;%s;false]",
+				ROWS - 0.9, LINES + 0.4, PNG.bg_full)
 	end
 
 	fs[#fs + 1] = fmt([[
-		style[filter;border=false]
+		field[0.25,0.2;%f,1;filter;;%s]
-		field[0.4,0.2;2.5,1;filter;;%s]
 		field_close_on_enter[filter;false]
-		box[0,0;2.4,0.6;#ffffff25]
 	]],
-	ESC(data.filter))
+	sfinv_only and 2.76 or 2.72, ESC(data.filter))
 
+	if CORE_VERSION >= 520 then
 		fs[#fs + 1] = fmt([[
-		style_type[image_button;border=false]
-		style_type[item_image_button;border=false;bgimg_hovered=%s;bgimg_pressed=%s]
 			style[search;fgimg=%s;fgimg_hovered=%s]
 			style[clear;fgimg=%s;fgimg_hovered=%s]
-		style[prev_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]
+			style[prev_page;fgimg=%s;fgimg_hovered=%s]
-		style[next_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]
+			style[next_page;fgimg=%s;fgimg_hovered=%s]
 		]],
-	PNG.selected, PNG.selected,
 		PNG.search, PNG.search_hover,
 		PNG.clear,  PNG.clear_hover,
-	PNG.prev, PNG.prev_hover, PNG.prev_hover,
+		PNG.prev,   PNG.prev_hover,
-	PNG.next, PNG.next_hover, PNG.next_hover)
+		PNG.next,   PNG.next_hover)
 
 		fs[#fs + 1] = fmt(mul_elem(FMT.image_button, 4),
 			sfinv_only and 2.6 or 2.54, -0.06, 0.85, 0.85, "", "search", "",
 			sfinv_only and 3.3 or 3.25, -0.06, 0.85, 0.85, "", "clear", "",
 			sfinv_only and 5.45 or (ROWS * 6.83) / 11, -0.06, 0.85, 0.85, "", "prev_page", "",
 			sfinv_only and 7.2  or (ROWS * 8.75) / 11, -0.06, 0.85, 0.85, "", "next_page", "")
+	else
+		fs[#fs + 1] = fmt([[
+			image_button[%f,-0.06;0.85,0.85;%s;search;;;false;%s]
+			image_button[%f,-0.06;0.85,0.85;%s;clear;;;false;%s]
+			]],
+			sfinv_only and 2.6 or 2.54, PNG.search, PNG.search_hover,
+			sfinv_only and 3.3 or 3.25, PNG.clear, PNG.clear_hover)
+
+		fs[#fs + 1] = fmt(mul_elem(FMT.arrow, 2),
+			sfinv_only and 5.45 or (ROWS * 6.83) / 11, -0.05,
+				PNG.prev, "prev_page", PNG.prev,
+			sfinv_only and 7.2 or (ROWS * 8.75) / 11, -0.05,
+				PNG.next, "next_page", PNG.next)
+	end
 
 	data.pagemax = max(1, ceil(#data.items / IPP))
 
@@ -1100,7 +1053,7 @@ local function make_fs(data)
 		local X = i % ROWS
 		local Y = (i % IPP - X) / ROWS + 1
 
-		if data.query_item == item then
+		if CORE_VERSION >= 510 and data.query_item == item then
 			fs[#fs + 1] = fmt(FMT.image,
 				X - (X * (sfinv_only and 0.12 or 0.14)) - 0.05,
 				Y - (Y * 0.1) - 0.1,
@@ -1121,11 +1074,10 @@ local function make_fs(data)
 end
 
 local show_fs = function(player, name)
-	local data = pdata[name]
 	if sfinv_only then
 		sfinv.set_player_inventory_formspec(player)
 	else
-		show_formspec(name, "craftguide", make_fs(data))
+		show_formspec(name, "craftguide", make_formspec(name))
 	end
 end
 
@@ -1139,6 +1091,16 @@ craftguide.register_craft_type("digging_chance", {
 	icon = "default_tool_mesepick.png",
 })
 
+local function sfind(str, filter)
+	if filter == "" then
+		return 0
+	end
+
+	if find(str, filter, 1, true) then
+		return #str - #filter
+	end
+end
+
 local function search(data)
 	local filter = data.filter
 
@@ -1160,30 +1122,28 @@ local function search(data)
 		end
 	end
 
-	local filtered_list, c = {}, 0
+	local filtered_list, order, c = {}, {}, 0
 
 	for i = 1, #data.items_raw do
 		local item = data.items_raw[i]
 		local def  = reg_items[item]
 		local desc = (def and def.description) and lower(def.description) or ""
-		local search_in = fmt("%s %s", item, desc)
 		local to_add
 
 		if search_filter then
 			for filter_name, values in pairs(filters) do
-				if values then
 				local func = search_filters[filter_name]
 				to_add = func(item, values) and (search_filter == "" or
-						find(search_in, search_filter, 1, true))
+					(sfind(item, search_filter) or sfind(desc, search_filter)))
-				end
 			end
 		else
-			to_add = find(search_in, filter, 1, true)
+			to_add = sfind(item, filter) or sfind(desc, filter)
 		end
 
 		if to_add then
 			c = c + 1
 			filtered_list[c] = item
+			order[item] = to_add
 		end
 	end
 
@@ -1196,6 +1156,10 @@ local function search(data)
 		end
 	end
 
+	sort(filtered_list, function(a, b)
+		return order[a] < order[b]
+	end)
+
 	data.items = filtered_list
 end
 
@@ -1356,20 +1320,20 @@ local function handle_drops_table(name, drop)
 	end
 
 	for item, count in pairs(drop_sure) do
-		craftguide.register_craft{
+		craftguide.register_craft({
 			type = "digging",
 			items = {name},
 			output = fmt("%s %u", item, count),
-		}
+		})
 	end
 
 	for item, data in pairs(drop_maybe) do
-		craftguide.register_craft{
+		craftguide.register_craft({
 			type = "digging_chance",
 			items = {name},
 			output = fmt("%s %u", item, data.output),
 			rarity = data.rarity,
-		}
+		})
 	end
 end
 
@@ -1378,11 +1342,11 @@ local function register_drops(name, def)
 	local dstack = ItemStack(drop)
 
 	if not dstack:is_empty() and dstack:get_name() ~= name then
-		craftguide.register_craft{
+		craftguide.register_craft({
 			type = "digging",
 			items = {name},
 			output = drop,
-		}
+		})
 	elseif is_table(drop) then
 		handle_drops_table(name, drop)
 	end
@@ -1452,19 +1416,17 @@ local function get_init_items()
 		last_str = str
 	end
 
-	local full_char, empty_char = "#", " "
+	local full_char, empty_char = "o", "."
 
 	for name, def in pairs(reg_items) do
 		ic = ic + 1
-		local percent, bar, len = (ic * 100) / it, "[", 20
+		local percent, bar, len = (ic * 100) / it, "", 20
 
 		for i = 1, len do
 			bar = bar .. (i <= percent / (100 / len) and full_char or empty_char)
 		end
 
-		if enable_cache_progress_bar then
+		iop(fmt("[craftguide] Caching data  %s  %u%%\n", bar, percent))
-			iop(fmt("[craftguide] Caching data  %s  %u%%\r", bar .. "]", percent))
-		end
 
 		if show_item(def) then
 			if not fuel_cache[name] then
@@ -1495,23 +1457,24 @@ local function get_init_items()
 			fuel    = fuel_cache,
 		}
 
-		http.fetch_async{
+		http.fetch_async({
 			url = craftguide.export_url,
 			post_data = write_json(post_data),
-		}
+		})
 	end
 
 	print()
 end
 
 local function init_data(name)
+	local items = CORE_VERSION >= 500 and init_items or
+		(#init_items == 0 and get_init_items() or init_items)
+
 	pdata[name] = {
 		filter    = "",
 		pagenum   = 1,
-		items      = init_items,
+		items     = items,
-		items_raw  = init_items,
+		items_raw = items,
-		favs       = {},
-		fs_version = get_fs_version(name),
 	}
 end
 
@@ -1527,7 +1490,9 @@ local function reset_data(data)
 	data.items       = data.items_raw
 end
 
-on_mods_loaded(get_init_items)
+if CORE_VERSION >= 500 then
+	on_mods_loaded(get_init_items)
+end
 
 on_joinplayer(function(player)
 	local name = player:get_player_name()
@@ -1537,25 +1502,22 @@ end)
 local function fields(player, _f)
 	local name = player:get_player_name()
 	local data = pdata[name]
-	--print(dump(_f))
 
 	if _f.clear then
 		reset_data(data)
+		return true, show_fs(player, name)
 
 	elseif _f.prev_recipe or _f.next_recipe then
 		local num = data.rnum + (_f.prev_recipe and -1 or 1)
 		data.rnum = data.recipes[num] and num or (_f.prev_recipe and #data.recipes or 1)
+		return true, show_fs(player, name)
 
 	elseif _f.prev_usage or _f.next_usage then
 		local num = data.unum + (_f.prev_usage and -1 or 1)
 		data.unum = data.usages[num] and num or (_f.prev_usage and #data.usages or 1)
-
-	elseif _f.key_enter_field == "filter" or _f.search then
-		if _f.filter == "" then
-			reset_data(data)
 		return true, show_fs(player, name)
-		end
 
+	elseif (_f.key_enter_field == "filter" or _f.search) and _f.filter ~= "" then
 		local str = lower(_f.filter)
 		if data.filter == str then return end
 
@@ -1563,6 +1525,8 @@ local function fields(player, _f)
 		data.pagenum = 1
 		search(data)
 
+		return true, show_fs(player, name)
+
 	elseif _f.prev_page or _f.next_page then
 		if data.pagemax == 1 then return end
 		data.pagenum = data.pagenum - (_f.prev_page and 1 or -1)
@@ -1573,15 +1537,7 @@ local function fields(player, _f)
 			data.pagenum = data.pagemax
 		end
 
-	elseif _f.fav then
+		return true, show_fs(player, name)
-		local fav, i = is_fav(data)
-		local total = #data.favs
-
-		if total < 6 and not fav then
-			data.favs[total + 1] = data.query_item
-		elseif fav then
-			remove(data.favs, i)
-		end
 	else
 		local item
 		for field in pairs(_f) do
@@ -1595,8 +1551,6 @@ local function fields(player, _f)
 			return
 		elseif sub(item, -4) == "_inv" then
 			item = sub(item, 1, -5)
-		elseif sub(item, 1, 1) == "_" then
-			item = sub(item, 2)
 		end
 
 		item = reg_aliases[item] or item
@@ -1607,37 +1561,28 @@ local function fields(player, _f)
 			else
 				data.show_usages = not data.show_usages
 			end
-		elseif item == data.query_item then
-			return
 		end
 
 		local recipes, usages = get_recipes(item, data, player)
 		if not recipes and not usages then return end
-		if data.show_usages and not usages then return end
 
 		data.query_item = item
 		data.recipes    = recipes
 		data.usages     = usages
 		data.rnum       = 1
 		data.unum       = 1
-	end
 
 		return true, show_fs(player, name)
+	end
 end
 
 if sfinv_only then
 	sfinv.register_page("craftguide:craftguide", {
 		title = S"Craft Guide",
 
-		is_in_nav = function(self, player, context)
-			local name = player:get_player_name()
-			return get_fs_version(name) >= FORMSPEC_MINIMAL_VERSION
-		end,
-
 		get = function(self, player, context)
 			local name = player:get_player_name()
-			local data = pdata[name]
+			local formspec = make_formspec(name)
-			local formspec = make_fs(data)
 
 			return sfinv.make_formspec(player, context, formspec)
 		end,
@@ -1665,28 +1610,14 @@ else
 
 	local function on_use(user)
 		local name = user:get_player_name()
-		local data = pdata[name]
-
-		if data.fs_version < FORMSPEC_MINIMAL_VERSION then
-			local fs = fmt([[
-				size[6.6,1.3]
-				image[0,0;1,1;%s]
-				label[1,0;%s]
-				button_exit[2.8,0.8;1,1;;OK]
-			]],
-			PNG.nothing,
-			"Your Minetest client is outdated.\n" ..
-			"Get the latest version on minetest.net to use the Crafting Guide.")
-
-			return show_formspec(name, "craftguide", fs)
-		end
 
 		if next(recipe_filters) then
+			local data = pdata[name]
 			data.items_raw = get_filtered_items(user)
 			search(data)
 		end
 
-		show_formspec(name, "craftguide", make_fs(data))
+		show_formspec(name, "craftguide", make_formspec(name))
 	end
 
 	core.register_craftitem("craftguide:book", {
@@ -1709,7 +1640,7 @@ else
 		paramtype = "light",
 		paramtype2 = "wallmounted",
 		sunlight_propagates = true,
-		groups = {choppy = 1, attached_node = 1, oddly_breakable_by_hand = 1, flammable = 3},
+		groups = {oddly_breakable_by_hand = 1, flammable = 3},
 		node_box = {
 			type = "wallmounted",
 			wall_top    = {-0.5, 0.4375, -0.5, 0.5, 0.5, 0.5},
@@ -1727,29 +1658,29 @@ else
 		end
 	})
 
-	core.register_craft{
+	core.register_craft({
 		output = "craftguide:book",
 		type   = "shapeless",
 		recipe = {"default:book"}
-	}
+	})
 
-	core.register_craft{
+	core.register_craft({
 		type = "fuel",
 		recipe = "craftguide:book",
 		burntime = 3
-	}
+	})
 
-	core.register_craft{
+	core.register_craft({
 		output = "craftguide:sign",
 		type   = "shapeless",
 		recipe = {"default:sign_wall_wood"}
-	}
+	})
 
-	core.register_craft{
+	core.register_craft({
 		type = "fuel",
 		recipe = "craftguide:sign",
 		burntime = 10
-	}
+	})
 
 	if rawget(_G, "sfinv_buttons") then
 		sfinv_buttons.register_button("craftguide", {
@@ -1955,47 +1886,64 @@ if progressive_mode then
 		local name = player:get_player_name()
 		local data = pdata[name]
 
+		if CORE_VERSION >= 500 then
 			local meta = player:get_meta()
 			data.inv_items = dslz(meta:get_string("inv_items")) or {}
 			data.known_recipes = dslz(meta:get_string("known_recipes")) or 0
+		else
+			data.inv_items = dslz(player:get_attribute("inv_items")) or {}
+			data.known_recipes = dslz(player:get_attribute("known_recipes")) or 0
+		end
 
 		data.hud = {
-			bg = player:hud_add{
+			bg = player:hud_add({
 				hud_elem_type = "image",
 				position      = {x = 0.78, y = 1},
 				alignment     = {x = 1,    y = 1},
 				scale         = {x = 370,  y = 112},
 				text          = PNG.bg,
-			},
+			}),
 
-			book = player:hud_add{
+			book = player:hud_add({
 				hud_elem_type = "image",
 				position      = {x = 0.79, y = 1.02},
 				alignment     = {x = 1,    y = 1},
 				scale         = {x = 4,    y = 4},
 				text          = PNG.book,
-			},
+			}),
 
-			text = player:hud_add{
+			text = player:hud_add({
 				hud_elem_type = "text",
 				position      = {x = 0.84, y = 1.04},
 				alignment     = {x = 1,    y = 1},
-				number        = 0xffffff,
+				number        = 0xfff,
 				text          = "",
-			},
+			}),
 		}
 	end)
 
-	local to_save = {"inv_items", "known_recipes"}
+	local to_save = {
+		"inv_items",
+		"known_recipes",
+	}
 
 	local function save_meta(player)
-		local meta = player:get_meta()
+		local meta
 		local name = player:get_player_name()
 		local data = pdata[name]
 
+		if CORE_VERSION >= 500 then
+			meta = player:get_meta()
+		end
+
 		for i = 1, #to_save do
 			local meta_name = to_save[i]
+
+			if CORE_VERSION >= 500 then
 				meta:set_string(meta_name, slz(data[meta_name]))
+			else
+				player:set_attribute(meta_name, slz(data[meta_name]))
+			end
 		end
 	end
 
@@ -2081,3 +2029,5 @@ register_command("craft", {
 		return true, craftguide.show(name, node_name)
 	end,
 })
+
+minetest.log("action", "[craftguide] loaded.")

license.txt

@@ -3,7 +3,7 @@ License of source code
 
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 Jean-Patrick Guerrero and contributors.
+Copyright (c) 2015-2019 Jean-Patrick Guerrero and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

settingtypes.txt

@@ -3,6 +3,3 @@ craftguide_progressive_mode	(Progressive Mode)	bool false
 
 # Integration in the default Minetest Game inventory.
 craftguide_sfinv_only		(Sfinv only)		bool false
-
-# Display the cache-building progress bar in the server console.
-craftguide_enable_cache_progress_bar	(Enable console cache progress bar)	bool true