Show colored itemstacks the right way

init.lua

@@ -20,7 +20,7 @@ local function lf(path)
 end
 
 i3 = {
-	version = 1115,
+	version = 1121,
 	data = core.deserialize(storage:get_string"data") or {},
 
 	settings = {
@@ -36,9 +36,8 @@ i3 = {
 		hud_speed = 1,
 		hud_timer_max = 1.5,
 
-		damage_enabled   = core.settings:get_bool"enable_damage",
+		damage_enabled = core.settings:get_bool"enable_damage",
 		progressive_mode = core.settings:get_bool"i3_progressive_mode",
-		item_compression = core.settings:get_bool("i3_item_compression", true),
 	},
 
 	categories = {
@@ -52,15 +51,28 @@ i3 = {
 	saves = { -- Metadata to save
 		bag = true,
 		home = true,
+		sort = true,
+		collapse = true,
 		font_size = true,
 		hide_tabs = true,
 		waypoints = true,
 		inv_items = true,
+		auto_sorting = true,
+		inv_compress = true,
 		known_recipes = true,
 		wielditem_hud = true,
+		ignore_hotbar = true,
+		reverse_sorting = true,
 		legacy_inventory = true,
 	},
 
+	default_data = {
+		sort = 1,
+		font_size = 0,
+		collapse = true,
+		inv_compress = true,
+	},
+
 	files = {
 		api = lf"/src/api.lua",
 		bags = lf"/src/bags.lua",
@@ -99,6 +111,7 @@ i3 = {
 i3.files.common()
 i3.files.api(http)
 i3.files.compress()
+i3.files.detached()
 i3.files.groups()
 i3.files.callbacks(http, storage)
 
@@ -108,7 +121,7 @@ end
 
 if i3.settings.debug_mode then
 	lf("/tests/test_tabs.lua")()
-	lf("/tests/test_operators.lua")()
+--	lf("/tests/test_operators.lua")()
 	lf("/tests/test_compression.lua")()
 	lf("/tests/test_custom_recipes.lua")()
 end

settingtypes.txt

@@ -1,5 +1,2 @@
 # The progressive mode shows recipes you can craft from items you ever had in your inventory.
 i3_progressive_mode    (Learn crafting recipes progressively)    bool false
-
-# Regroup the items of the same type in the item list.
-i3_item_compression    (Regroup items of the same type)          bool true

src/api.lua

@@ -3,7 +3,7 @@ local make_fs, get_inventory_fs = i3.files.gui()
 
 IMPORT("gmatch", "split")
 IMPORT("S", "err", "fmt", "reg_items")
-IMPORT("sorter", "sort_inventory")
+IMPORT("sorter", "sort_inventory", "play_sound")
 IMPORT("sort", "concat", "copy", "insert", "remove")
 IMPORT("true_str", "true_table", "is_str", "is_func", "is_table", "clean_name")
 
@@ -323,8 +323,10 @@ function i3.hud_notif(name, msg, img)
 	data.show_hud = true
 	data.hud_msg = msg
 
+	play_sound(name, "i3_achievement", 1.0)
+
 	if img then
-		data.hud_img = fmt("%s^[resize:16x16", img)
+		data.hud_img = fmt("%s^[resize:64x64", img)
 	end
 end
 

src/callbacks.lua

@@ -1,7 +1,6 @@
 local http, storage = ...
 local init_bags = i3.files.bags()
 local fill_caches = i3.files.caches(http)
-local init_detached = i3.files.detached()
 local init_hud = i3.files.hud()
 local set_fs = i3.set_fs
 
@@ -204,6 +203,15 @@ local function init_data(player, info)
 	i3.data[name] = i3.data[name] or {}
 	local data = i3.data[name]
 
+	for k, v in pairs(i3.default_data) do
+		local val = data[k]
+		if val == nil then
+			val = v
+		end
+
+		data[k] = val
+	end
+
 	data.player_name     = name
 	data.filter          = ""
 	data.pagenum         = 1
@@ -212,17 +220,11 @@ local function init_data(player, info)
 	data.items_raw       = i3.init_items
 	data.favs            = {}
 	data.show_setting    = "home"
-	data.ignore_hotbar   = false
-	data.auto_sorting    = false
-	data.reverse_sorting = false
-	data.inv_compress    = true
 	data.crafting_counts = {}
-	data.sort            = 1
 	data.tab             = 1
 	data.itab            = 1
 	data.subcat          = 1
 	data.scrbar_inv      = 0
-	data.font_size       = data.font_size or 0
 	data.lang_code       = get_lang_code(info)
 	data.fs_version      = info.formspec_version
 
@@ -259,7 +261,6 @@ insert(core.registered_on_joinplayers, 1, function(player)
 
 	init_data(player, info)
 	init_bags(player)
-	init_detached(player)
 	init_hud(player)
 end)
 

src/common.lua

@@ -1,8 +1,8 @@
+local vec = vector.new
 local ItemStack = ItemStack
 local loadstring = loadstring
 local reg_items = core.registered_items
 local translate = core.get_translated_string
-local vec_new, vec_add, vec_mul = vector.new, vector.add, vector.multiply
 local sort, concat, insert = table.sort, table.concat, table.insert
 local min, floor, ceil = math.min, math.floor, math.ceil
 local fmt, find, match, gmatch, sub, split, lower, upper =
@@ -327,8 +327,12 @@ local function apply_recipe_filters(recipes, player)
 	return recipes
 end
 
+local function recipe_filter_set()
+	return next(i3.recipe_filters)
+end
+
 local function compression_active(data)
-	return i3.settings.item_compression and not next(i3.recipe_filters) and data.filter == ""
+	return data.collapse and not recipe_filter_set() and data.filter == ""
 end
 
 local function compressible(item, data)
@@ -376,7 +380,7 @@ local function spawn_item(player, stack)
 	local dir     = player:get_look_dir()
 	local ppos    = player:get_pos()
 	      ppos.y  = ppos.y + player:get_properties().eye_height
-	local look_at = vec_add(ppos, vec_mul(dir, 1))
+	local look_at = ppos + dir
 
 	core.add_item(look_at, stack)
 end
@@ -473,9 +477,9 @@ local function safe_teleport(player, pos)
 	play_sound(name, "i3_teleport", 0.8)
 
 	local vel = player:get_velocity()
-	player:add_velocity(vec_mul(vel, -1))
+	player:add_velocity(-vel)
 
-	local p = vec_new(pos)
+	local p = vec(pos)
 	      p.y += 0.25
 
 	player:set_pos(p)
@@ -684,6 +688,7 @@ local _ = {
 	get_recipes = get_recipes,
 	sort_inventory = sort_inventory,
 	sort_by_category = sort_by_category,
+	recipe_filter_set = recipe_filter_set,
 	apply_recipe_filters = apply_recipe_filters,
 
 	-- Type checks
@@ -780,12 +785,8 @@ local _ = {
 	random = math.random,
 
 	-- Vectors
-	vec_new = vector.new,
-	vec_add = vector.add,
-	vec_sub = vector.subtract,
-	vec_mul = vector.multiply,
+	vec = vector.new,
 	vec_round = vector.round,
-	vec_eq = vector.equals,
 }
 
 function i3.get(...)

src/detached_inv.lua

@@ -1,5 +1,5 @@
 local set_fs = i3.set_fs
-IMPORT("fmt", "play_sound", "create_inventory")
+IMPORT("play_sound", "create_inventory")
 
 local trash = create_inventory("i3_trash", {
 	allow_put = function(_, _, _, stack)
@@ -22,15 +22,3 @@ local trash = create_inventory("i3_trash", {
 })
 
 trash:set_size("main", 1)
-
-local function init_detached(player)
-	local name = player:get_player_name()
-
-	local output_rcp = create_inventory(fmt("i3_output_rcp_%s", name), {}, name)
-	output_rcp:set_size("main", 1)
-
-	local output_usg = create_inventory(fmt("i3_output_usg_%s", name), {}, name)
-	output_usg:set_size("main", 1)
-end
-
-return init_detached

src/fields.lua

@@ -1,13 +1,13 @@
 local set_fs = i3.set_fs
 
+IMPORT("min", "max", "vec_round")
 IMPORT("reg_items", "reg_aliases")
-IMPORT("min", "max", "vec_eq", "vec_round")
-IMPORT("S", "random", "translate", "ItemStack")
 IMPORT("sort", "copy", "insert", "remove", "indexof")
+IMPORT("S", "random", "translate", "compressible", "ItemStack")
 IMPORT("fmt", "find", "match", "sub", "lower", "split", "toupper")
+IMPORT("valid_item", "get_stack", "craft_stack", "clean_name", "check_privs", "safe_teleport")
 IMPORT("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound", "reset_data")
 IMPORT("search", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv", "update_inv_size")
-IMPORT("valid_item", "get_stack", "craft_stack", "clean_name", "compressible", "check_privs", "safe_teleport")
 
 local function inv_fields(player, data, fields)
 	local name = data.player_name
@@ -19,6 +19,12 @@ local function inv_fields(player, data, fields)
 		return
 	end
 
+	if fields.dd_sorting_method then
+		data.sort = tonumber(fields.dd_sorting_method)
+	elseif fields.sb_font_size then
+		data.font_size = tonumber(fields.sb_font_size:match"-?%d+$")
+	end
+
 	for field in pairs(fields) do
 		if sub(field, 1, 4) == "btn_" then
 			data.subcat = indexof(i3.categories, sub(field, 5))
@@ -34,6 +40,8 @@ local function inv_fields(player, data, fields)
 
 			if str == "legacy_inventory" then
 				update_inv_size(player, data)
+			elseif str == "collapse" then
+				search(data)
 			end
 
 		elseif sub(field, 1, 8) == "setting_" then
@@ -42,6 +50,8 @@ local function inv_fields(player, data, fields)
 		elseif sub(field, 1, 9) == "skin_btn_" then
 			local id = tonumber(field:match("%d+"))
 			local _skins = skins.get_skinlist_for_player(name)
+
+			play_sound(name, "i3_skin_change", 0.6)
 			skins.set_player_skin(player, _skins[id])
 
 		elseif find(field, "waypoint_%d+") then
@@ -128,9 +138,6 @@ local function inv_fields(player, data, fields)
 	elseif fields.sort then
 		sort_inventory(player, data)
 
-	elseif fields.dd_sorting_method then
-		data.sort = tonumber(fields.dd_sorting_method)
-
 	elseif fields.home then
 		if not data.home then
 			return msg(name, "No home set")
@@ -147,9 +154,6 @@ local function inv_fields(player, data, fields)
 	elseif fields.bag_rename then
 		data.bag_rename = true
 
-	elseif fields.sb_font_size then
-		data.font_size = tonumber(fields.sb_font_size:match"-?%d+$")
-
 	elseif fields.confirm_rename then
 		local bag = get_detached_inv("bag", name)
 		local bagstack = bag:get_stack("main", 1)
@@ -180,7 +184,7 @@ local function inv_fields(player, data, fields)
 		local pos = player:get_pos()
 
 		for _, v in ipairs(data.waypoints) do
-			if vec_eq(vec_round(pos), vec_round(str_to_pos(v.pos))) then
+			if vec_round(pos) == vec_round(str_to_pos(v.pos)) then
 				play_sound(name, "i3_cannot", 0.8)
 				return msg(name, S"You already have set a waypoint at this position")
 			end
@@ -290,13 +294,13 @@ local function select_item(player, data, fields)
 		if item == data.query_item then return end
 		local recipes, usages = get_recipes(player, item)
 
-		data.query_item = item
-		data.recipes    = recipes
-		data.usages     = usages
-		data.rnum       = 1
-		data.unum       = 1
-		data.scrbar_rcp = 1
-		data.scrbar_usg = 1
+		data.query_item   = item
+		data.recipes      = recipes
+		data.usages       = usages
+		data.rnum         = 1
+		data.unum         = 1
+		data.scrbar_rcp   = 1
+		data.scrbar_usg   = 1
 		data.crafting_rcp = nil
 		data.crafting_usg = nil
 	end
@@ -428,7 +432,7 @@ core.register_on_player_receive_fields(function(player, formname, fields)
 
 	if formname == "i3_outdated" then
 		return false, core.kick_player(name,
-			S"Come back when your Minetest client is up-to-date (www.minetest.net).")
+			S"Your Minetest client needs updating (www.minetest.net)")
 	elseif formname ~= "" then
 		return false
 	end

src/gui.lua

@@ -7,14 +7,14 @@ local PNG, styles, fs_elements, colors = i3.files.styles()
 local sprintf = string.format
 local VoxelArea, VoxelManip = VoxelArea, VoxelManip
 
+IMPORT("vec", "vec_round")
 IMPORT("find", "match", "sub", "upper")
-IMPORT("vec_new", "vec_sub", "vec_round")
 IMPORT("clr", "ESC", "msg", "check_privs")
-IMPORT("compression_active", "compressible")
 IMPORT("min", "max", "floor", "ceil", "round")
-IMPORT("reg_items", "reg_tools", "reg_entities")
 IMPORT("true_str", "is_fav", "is_num", "str_to_pos")
+IMPORT("reg_items", "reg_nodes", "reg_tools", "reg_entities")
 IMPORT("get_bag_description", "get_detached_inv", "get_recipes")
+IMPORT("compression_active", "compressible", "recipe_filter_set")
 IMPORT("S", "ES", "translate", "ItemStack", "toupper", "utf8_len")
 IMPORT("maxn", "sort", "concat", "copy", "insert", "remove", "unpack")
 IMPORT("extract_groups", "groups_to_items", "is_group", "item_has_groups", "get_group")
@@ -141,20 +141,20 @@ local function get_inv_slots(data, fs)
 		box(i * size + inv_x + (i * spacing), inv_y, size, size, "")
 	end
 
-	fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing),
-	   fmt("list[current_player;main;%f,%f;%u,1;]", inv_x, inv_y, hotbar_len))
+	fs("style_type[list;size=%f;spacing=%f]", size, spacing)
+	fs("list[current_player;main;%f,%f;%u,1;]", inv_x, inv_y, hotbar_len)
 
-	fs(fmt("style_type[list;size=%f;spacing=%f,%f]", size, spacing, legacy_inventory and 0.15 or spacing))
+	fs("style_type[list;size=%f;spacing=%f,%f]", size, spacing, legacy_inventory and 0.15 or spacing)
 
-	fs(fmt("list[current_player;main;%f,%f;%u,%u;%u]", inv_x, inv_y + (legacy_inventory and 1.25 or 1.15),
-		hotbar_len, data.inv_size / hotbar_len, hotbar_len))
+	fs("list[current_player;main;%f,%f;%u,%u;%u]", inv_x, inv_y + (legacy_inventory and 1.25 or 1.15),
+		hotbar_len, data.inv_size / hotbar_len, hotbar_len)
 
 	fs"style_type[list;size=1;spacing=0.15]"
 	fs"listring[current_player;craft]listring[current_player;main]"
 end
 
 local function add_subtitle(fs, name, y, ctn_len, font_size, sep, label)
-	fs(fmt("style[%s;font=bold;font_size=%u]", name, font_size))
+	fs("style[%s;font=bold;font_size=%u]", name, font_size)
 	button(0, y, ctn_len, 0.5, name, ESC(label))
 
 	if sep then
@@ -240,8 +240,8 @@ local function get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
 	local max_depth = -7
 	local height = base_depth and (base_height - 1) or depth
 
-	local pos1 = vec_new(pos.x - width, pos.y + depth, pos.z - width)
-	local pos2 = vec_new(pos.x + width, pos.y + height, pos.z + width)
+	local pos1 = vec(pos.x - width, pos.y + depth, pos.z - width)
+	local pos2 = vec(pos.x + width, pos.y + height, pos.z + width)
 
 	local vm = VoxelManip(pos1, pos2)
 	local emin, emax = vm:get_emerged_area()
@@ -255,7 +255,7 @@ local function get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
 
 		if img then
 			local p = area:position(idx)
-			      p = vec_sub(p, pos)
+			      p -= pos
 
 			local size = 0.25
 			local x = 2 + (size / 2 * (p.z - p.x))
@@ -297,15 +297,15 @@ local function get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
 	end
 
 	shift += (base_depth and 0.45 or 0.95)
-	image(2.7, Y + shift, 0.3, 0.3, PNG.flag)
+	animated_image(2.75, Y + shift, 3/14, 0.3, "i3_flag_anim.png", 4, 150)
 end
 
 local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
-	fs(fmt("box[0,%f;4.9,0.6;#bababa25]", yextra + 1.1))
+	fs("box[0,%f;4.9,0.6;#bababa25]", yextra + 1.1)
 	label(0, yextra + 0.85, ES"New waypoint" .. ":")
-	fs(fmt("field[0.1,%f;4.8,0.6;waypoint_name;;]", yextra + 1.1))
+	fs("field[0.1,%f;4.8,0.6;waypoint_name;;]", yextra + 1.1)
 	image_button(5.1, yextra + 1.15, 0.5, 0.5, "", "waypoint_add", "")
-	fs(fmt("tooltip[waypoint_add;%s]", ES"Add waypoint"))
+	fs("tooltip[waypoint_add;%s]", ES"Add waypoint")
 
 	if #data.waypoints == 0 then return end
 	fs"style_type[label;font=bold;font_size=17]"
@@ -332,7 +332,7 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 		label(0.15, y + 0.33, clr(fmt("#%s", hex), waypoint_name))
 
 		local tooltip = fmt("Name: %s\nPosition:%s", clr("#dbeeff", v.name),
-				v.pos:sub(2,-2):gsub("(%-*%d*%.?%d+)", clr("#dbeeff", " %1")))
+					v.pos:sub(2,-2):gsub("(%-*%d*%.?%d+)", clr("#dbeeff", " %1")))
 
 		if teleport_priv then
 			tooltip = fmt("%s\n%s", tooltip, clr("#ff0", ES"[Click to teleport]"))
@@ -341,25 +341,25 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 		tooltip(0, y, ctn_len - 2.1, 0.65, tooltip)
 
 		local del = fmt("waypoint_%u_delete", i)
-		fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", del, PNG.trash, PNG.trash_hover))
+		fs("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", del, PNG.trash, PNG.trash_hover)
 		image_button(ctn_len - 0.5, yi, icon_size, icon_size, "", del, "")
-		fs(fmt("tooltip[%s;%s]", del, ES"Remove waypoint"))
+		fs("tooltip[%s;%s]", del, ES"Remove waypoint")
 
 		local rfs = fmt("waypoint_%u_refresh", i)
-		fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", rfs, PNG.refresh, PNG.refresh_hover))
+		fs("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", rfs, PNG.refresh, PNG.refresh_hover)
 		image_button(ctn_len - 1, yi, icon_size, icon_size, "", rfs, "")
-		fs(fmt("tooltip[%s;%s]", rfs, ES"Change color"))
+		fs("tooltip[%s;%s]", rfs, ES"Change color")
 
 		local see = fmt("waypoint_%u_see", i)
-		fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
-			see, waypoint_preview and PNG.search_hover or PNG.search, PNG.search, PNG.search_hover))
+		fs("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
+			see, waypoint_preview and PNG.search_hover or PNG.search, PNG.search, PNG.search_hover)
 		image_button(ctn_len - 1.5, yi, icon_size, icon_size, "", see, "")
-		fs(fmt("tooltip[%s;%s]", see, ES"Preview the waypoint area"))
+		fs("tooltip[%s;%s]", see, ES"Preview the waypoint area")
 
 		local vsb = fmt("waypoint_%u_hide", i)
-		fs(fmt("style[%s;fgimg=%s;content_offset=0]", vsb, v.hide and PNG.nonvisible or PNG.visible))
+		fs("style[%s;fgimg=%s;content_offset=0]", vsb, v.hide and PNG.nonvisible or PNG.visible)
 		image_button(ctn_len - 2, yi, icon_size, icon_size, "", vsb, "")
-		fs(fmt("tooltip[%s;%s]", vsb, v.hide and ES"Show waypoint" or ES"Hide waypoint"))
+		fs("tooltip[%s;%s]", vsb, v.hide and ES"Show waypoint" or ES"Hide waypoint")
 
 		if teleport_priv then
 			local tp = fmt("waypoint_%u_teleport", i)
@@ -381,7 +381,7 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 end
 
 local function get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
-	fs(fmt("list[detached:i3_bag_%s;main;0,%f;1,1;]", esc_name, yextra + 0.7))
+	fs("list[detached:i3_bag_%s;main;0,%f;1,1;]", esc_name, yextra + 0.7)
 	local bag = get_detached_inv("bag", name)
 	if bag:is_empty"main" then return end
 
@@ -392,18 +392,18 @@ local function get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
 	local desc = ESC(get_bag_description(data, bagstack))
 
 	image(0.5, yextra + 1.85, 0.6, 0.6, PNG.arrow_content)
-	fs(fmt("style[bg_content;bgimg=%s;fgimg=i3_blank.png;bgimg_middle=10,%u;sound=]", PNG.bg_content, m))
+	fs("style[bg_content;bgimg=%s;fgimg=i3_blank.png;bgimg_middle=10,%u;sound=]", PNG.bg_content, m)
 	image_button(1.1, yextra + 0.5 + (yy or 0), 4.75, h, "", "bg_content", "")
 
 	if not data.bag_rename then
 		hypertext(1.3, yextra + 0.8, 4.3, 0.6, "content",
 			fmt("<global size=16><center><b>%s</b></center>", desc))
 		image_button(5.22, yextra + 0.835, 0.25, 0.25, "", "bag_rename", "")
-		fs(fmt("tooltip[%s;%s]", "bag_rename", ES"Rename the bag"))
+		fs("tooltip[bag_rename;%s]", ES"Rename the bag")
 	else
 		box(1.7, yextra + 0.82, 2.6, 0.4, "#707070")
-		fs(fmt("field[1.8,%f;2.5,0.4;bag_newname;;%s]", yextra + 0.82, desc),
-		   "field_close_on_enter[bag_newname;false]")
+		fs("field[1.8,%f;2.5,0.4;bag_newname;;%s]", yextra + 0.82, desc)
+		fs"field_close_on_enter[bag_newname;false]"
 		hypertext(4.4, yextra + 0.88, 0.8, 0.6, "confirm_rename",
 			fmt("<global size=16><tag name=action color=#fff hovercolor=%s>" ..
 				"<center><b><action name=ok>OK</action></b></center>", colors.yellow))
@@ -415,8 +415,8 @@ local function get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
 		x, size, spacing = 1.7, 0.8, 0.1
 	end
 
-	fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing))
-	fs(fmt("list[detached:i3_bag_content_%s;main;%f,%f;4,%u;]", esc_name, x, yextra + 1.3, bag_size))
+	fs("style_type[list;size=%f;spacing=%f]", size, spacing)
+	fs("list[detached:i3_bag_content_%s;main;%f,%f;4,%u;]", esc_name, x, yextra + 1.3, bag_size)
 	fs"style_type[list;size=1;spacing=0.15]"
 end
 
@@ -435,7 +435,7 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 
 		for i = 1, 10 do
 			image(heart_x + ((i - 1) * (heart_size + 0.1)), heart_h,
-				heart_size, heart_size, PNG.heart_grey)
+				heart_size, heart_size, PNG.heart .. "^[colorize:#232428")
 		end
 
 		for i = 1, hearts do
@@ -447,21 +447,21 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 		yoffset -= 0.5
 	end
 
-	fs(fmt("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45))
+	fs("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45)
 	image(3.47, yoffset + 2.69, 0.85, 0.85, PNG.arrow)
-	fs(fmt("list[current_player;craftpreview;%f,%f;1,1;]", 4.45, yoffset + 2.6),
-	   fmt("list[detached:i3_trash;main;%f,%f;1,1;]", 4.45, yoffset + 3.75))
+	fs("list[current_player;craftpreview;%f,%f;1,1;]", 4.45, yoffset + 2.6)
+	fs("list[detached:i3_trash;main;%f,%f;1,1;]", 4.45, yoffset + 3.75)
 	image(4.45, yoffset + 3.75, 1, 1, PNG.trash)
 
 	local yextra = damage_enabled and 5.5 or 5
 
 	for i, title in ipairs(i3.categories) do
 		local btn_name = fmt("btn_%s", title)
-		fs(fmt("style[btn_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", title,
+		fs("style[btn_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", title,
 			data.subcat == i and PNG[fmt("%s_hover", title)] or PNG[title],
-			PNG[fmt("%s_hover", title)]))
+			PNG[fmt("%s_hover", title)])
 		image_button(0.25 + ((i - 1) * 1.18), yextra - 0.2, 0.5, 0.5, "", btn_name, "")
-		fs(fmt("tooltip[%s;%s]", btn_name, title:gsub("^%l", upper)))
+		fs("tooltip[%s;%s]", btn_name, title:gsub("^%l", upper))
 	end
 
 	box(0, yextra + 0.45, ctn_len, 0.045, "#bababa50")
@@ -484,7 +484,7 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 		local armor_def = armor.def[name]
 		local _, armor_inv = armor:get_valid_player(player, "3d_armor")
 
-		fs(fmt("list[detached:%s_armor;armor;0,%f;5,1;]", esc_name, yextra + 0.7))
+		fs("list[detached:%s_armor;armor;0,%f;5,1;]", esc_name, yextra + 0.7)
 
 		for i = 1, 5 do
 			local stack = armor_inv:get_stack("armor", i)
@@ -548,11 +548,10 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 			if not skin then break end
 			local btn_name = fmt("skin_btn_%u", i + 1)
 
-			fs(fmt([[ style[%s;padding=10;
-					fgimg=%s;bgimg=%s;bgimg_hovered=i3_btn9_hovered.png;
-					bgimg_pressed=i3_btn9_pressed.png;bgimg_middle=4,6] ]],
+			fs([[ style[%s;padding=10;fgimg=%s;bgimg=%s;bgimg_hovered=i3_btn9_hovered.png;
+					bgimg_pressed=i3_btn9_pressed.png;bgimg_middle=4,6;sound=] ]],
 				btn_name, skin:get_preview(),
-				skin.name == skin_name and "i3_btn9_hovered.png" or "i3_btn9.png"))
+				skin.name == skin_name and "i3_btn9_hovered.png" or "i3_btn9.png")
 
 			local X = (i % 3) * 1.93
 
@@ -560,7 +559,7 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 			      Y += (Y * 2.45) + yextra - 2.75 + add_y
 
 			image_button(X, Y, 1.86, 3.4, "", btn_name, "")
-			fs(fmt("tooltip[%s;%s]", btn_name, ESC(skin.name)))
+			fs("tooltip[%s;%s]", btn_name, ESC(skin.name))
 		end
 
 	elseif data.subcat == 4 then
@@ -584,32 +583,33 @@ local function show_settings(fs, data)
 		image_button(6.17, 10.75, 1, 0.5, "", "confirm_trash_no", "No")
 
 	elseif data.show_settings then
-		image(2.2, 9, 6, 2.35, PNG.bg_content)
+		fs"container[-0.06,0]"
+		image(2.2, 9, 6.1, 2.35, PNG.bg_content)
 
 		local show_home = data.show_setting == "home"
 		local show_style = data.show_setting == "style"
 		local show_sorting = data.show_setting == "sorting"
 
 		fs"style[setting_home,setting_style,setting_sorting;font=bold;font_size=16;sound=i3_click]"
-		fs(fmt("style[setting_home:hovered;textcolor=%s]", show_home and colors.yellow or "#fff"))
-		fs(fmt("style[setting_style:hovered;textcolor=%s]", show_style and colors.yellow or "#fff"))
-		fs(fmt("style[setting_sorting:hovered;textcolor=%s]", show_sorting and colors.yellow or "#fff"))
+		fs("style[setting_home:hovered;textcolor=%s]", show_home and colors.yellow or "#fff")
+		fs("style[setting_style:hovered;textcolor=%s]", show_style and colors.yellow or "#fff")
+		fs("style[setting_sorting:hovered;textcolor=%s]", show_sorting and colors.yellow or "#fff")
 
-		fs(fmt("style[setting_home;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;textcolor=%s]",
+		fs("style[setting_home;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;textcolor=%s]",
 			show_home and PNG.pagenum_hover or "", PNG.pagenum_hover,
-			show_home and colors.yellow or "#ddd"),
-		   fmt("style[setting_style;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;textcolor=%s]",
+			show_home and colors.yellow or "#ddd")
+		fs("style[setting_style;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;textcolor=%s]",
 			show_style and PNG.pagenum_hover or "", PNG.pagenum_hover,
-			show_style and colors.yellow or "#ddd"),
-		   fmt("style[setting_sorting;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;textcolor=%s]",
+			show_style and colors.yellow or "#ddd")
+		fs("style[setting_sorting;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;textcolor=%s]",
 			show_sorting and PNG.pagenum_hover or "", PNG.pagenum_hover,
-			show_sorting and colors.yellow or "#ddd"))
+			show_sorting and colors.yellow or "#ddd")
 
 		local X = 2.5
 		button(X, 9.1, 1.6, 0.55, "setting_home", "Home")
-		button(X + 1.6, 9.1, 1.6, 0.55, "setting_style", "Style")
-		button(X + 3.2, 9.1, 1.6, 0.55, "setting_sorting", "Sorting")
-		image_button(X + 5, 9.2, 0.25, 0.25, PNG.cancel_hover .. "^\\[brighten", "close_settings", "")
+		button(X + 1.7, 9.1, 1.6, 0.55, "setting_style", "Style")
+		button(X + 3.4, 9.1, 1.6, 0.55, "setting_sorting", "Sorting")
+		image_button(X + 5.12, 9.2, 0.25, 0.25, PNG.cancel_hover .. "^\\[brighten", "close_settings", "")
 
 		if show_home then
 			local coords, c, str = {"X", "Y", "Z"}, 0, ES"No home set"
@@ -623,33 +623,39 @@ local function show_settings(fs, data)
 					end)
 			end
 
-			hypertext(2.1, 9.9, 6, 0.6, "home_pos", fmt("<global size=16><center>%s</center>", str))
-			image_button(4.2, 10.4, 1.8, 0.7, "", "set_home", "Set home")
+			hypertext(2.2, 9.9, 6, 0.6, "home_pos", fmt("<global size=16><center>%s</center>", str))
+			image_button(4.3, 10.4, 1.8, 0.7, "", "set_home", "Set home")
 
 		elseif show_style then
 			checkbox(2.6, 9.95, "cb_hide_tabs", "Hide tabs", tostring(data.hide_tabs))
 			checkbox(2.6, 10.4, "cb_legacy_inventory", "Legacy inventory", tostring(data.legacy_inventory))
 			checkbox(2.6, 10.85, "cb_wielditem_hud", "HUD description", tostring(data.wielditem_hud))
 
+			if not recipe_filter_set() then
+				checkbox(5.3, 10.85, "cb_collapse", "Collapse list", tostring(data.collapse))
+			end
+
 			local sign = (data.font_size > 0 and "+") or (data.font_size > 0 and "-") or ""
 			label(5.3, 9.95, ES"Font size" .. fmt(": %s", sign .. data.font_size))
 
 			local range = 5
-			fs(fmt("scrollbaroptions[min=-%u;max=%u;smallstep=1;largestep=1;thumbsize=2]", range, range))
-			fs(fmt("scrollbar[5.3,10.25;2.45,0.3;horizontal;sb_font_size;%d]", data.font_size))
+			fs("scrollbaroptions[min=-%u;max=%u;smallstep=1;largestep=1;thumbsize=2]", range, range)
+			fs("scrollbar[5.3,10.2;2.55,0.3;horizontal;sb_font_size;%d]", data.font_size)
 
-			fs(fmt("tooltip[cb_hide_tabs;%s;#707070;#fff]",
-				ES"Enable this option to change the style of the right panel"),
-			   fmt("tooltip[cb_legacy_inventory;%s;#707070;#fff]",
-				ES"Enable this option to set the classic inventory size in Minetest"),
-			   fmt("tooltip[cb_wielditem_hud;%s;#707070;#fff]",
-				ES"Enable this option to show the wielded item description in your HUD"))
+			fs("tooltip[cb_hide_tabs;%s;#707070;#fff]",
+				ES"Enable this option to change the style of the right panel")
+			fs("tooltip[cb_legacy_inventory;%s;#707070;#fff]",
+				ES"Enable this option to set the classic inventory size in Minetest")
+			fs("tooltip[cb_wielditem_hud;%s;#707070;#fff]",
+				ES"Enable this option to show the wielded item description in your HUD")
+			fs("tooltip[cb_collapse;%s;#707070;#fff]",
+				ES"Enable this option to collapse the inventory list by grouping some items")
 
 		elseif show_sorting then
 			checkbox(2.6, 9.95, "cb_inv_compress", "Compression", tostring(data.inv_compress))
 			checkbox(2.6, 10.4,  "cb_reverse_sorting", "Reverse mode", tostring(data.reverse_sorting))
 			checkbox(2.6, 10.85, "cb_ignore_hotbar", "Ignore hotbar", tostring(data.ignore_hotbar))
-			checkbox(5.4, 9.95, "cb_auto_sorting", "Automation", tostring(data.auto_sorting))
+			checkbox(5.3, 9.95, "cb_auto_sorting", "Automation", tostring(data.auto_sorting))
 
 			local methods = {}
 
@@ -658,24 +664,26 @@ local function show_settings(fs, data)
 				insert(methods, name)
 			end
 
-			label(5.4, 10.4, ES"Sorting method:")
-			fs(fmt("dropdown[%f,%f;2.4,0.5;dd_sorting_method;%s;%u;true]",
-				5.4, 10.6, concat(methods, ","), data.sort))
+			label(5.3, 10.4, ES"Sorting method:")
+			fs("dropdown[%f,%f;2.6,0.5;dd_sorting_method;%s;%u;true]",
+				5.3, 10.6, concat(methods, ","), data.sort)
 
 			local desc = i3.sorting_methods[data.sort].description
 			if desc then
-				tooltip(5.4, 10.6, 2.4, 0.5, ESC(desc))
+				tooltip(5.3, 10.6, 2.4, 0.5, ESC(desc))
 			end
 
-			fs(fmt("tooltip[cb_inv_compress;%s;#707070;#fff]",
-				ES"Enable this option to compress your inventory"),
-			   fmt("tooltip[cb_reverse_sorting;%s;#707070;#fff]",
-				ES"Enable this option to sort your inventory in reverse order"),
-			   fmt("tooltip[cb_ignore_hotbar;%s;#707070;#fff]",
-				ES"Enable this option to sort your inventory except the hotbar slots"),
-			   fmt("tooltip[cb_auto_sorting;%s;#707070;#fff]",
-				ES"Enable this option to sort your inventory automatically"))
+			fs("tooltip[cb_inv_compress;%s;#707070;#fff]",
+				ES"Enable this option to compress your inventory")
+			fs("tooltip[cb_reverse_sorting;%s;#707070;#fff]",
+				ES"Enable this option to sort your inventory in reverse order")
+			fs("tooltip[cb_ignore_hotbar;%s;#707070;#fff]",
+				ES"Enable this option to sort your inventory except the hotbar slots")
+			fs("tooltip[cb_auto_sorting;%s;#707070;#fff]",
+				ES"Enable this option to sort your inventory automatically")
 		end
+
+		fs"container_end[]"
 	end
 end
 
@@ -755,14 +763,12 @@ local function get_inventory_fs(player, data, fs)
 		end
 	end
 
-	fs(fmt([[
-		scrollbaroptions[arrows=hide;thumbsize=%d;max=%d]
+	fs([[   scrollbaroptions[arrows=hide;thumbsize=%d;max=%d]
 		scrollbar[%f,0.2;0.2,%f;vertical;scrbar_inv;%u]
-		scrollbaroptions[arrows=default;thumbsize=0;max=1000]
-	]],
-	(max_val * 4) / 12, max_val, 9.8, ctn_hgt, data.scrbar_inv))
+		scrollbaroptions[arrows=default;thumbsize=0;max=1000]   ]],
+	(max_val * 4) / 12, max_val, 9.8, ctn_hgt, data.scrbar_inv)
 
-	fs(fmt("scroll_container[3.9,0.2;%f,%f;scrbar_inv;vertical]", ctn_len, ctn_hgt))
+	fs("scroll_container[3.9,0.2;%f,%f;scrbar_inv;vertical]", ctn_len, ctn_hgt)
 	get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb, bag_size)
 	fs"scroll_container_end[]"
 
@@ -775,16 +781,16 @@ local function get_inventory_fs(player, data, fs)
 
 	for i, v in ipairs(btn) do
 		local btn_name, tooltip = unpack(v)
-		fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
-			btn_name, PNG[btn_name], PNG[fmt("%s_hover", btn_name)]))
+		fs("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
+			btn_name, PNG[btn_name], PNG[fmt("%s_hover", btn_name)])
 		image_button(i + 3.43 - (i * 0.4), 11.43, 0.35, 0.35, "", btn_name, "")
-		fs(fmt("tooltip[%s;%s]", btn_name, tooltip))
+		fs("tooltip[%s;%s]", btn_name, tooltip)
 	end
 
 	show_settings(fs, data)
 end
 
-local function get_tooltip(item, info, pos, lang_code)
+local function get_tooltip(item, info, lang_code)
 	local tooltip
 
 	if info.groups then
@@ -857,11 +863,6 @@ local function get_tooltip(item, info, pos, lang_code)
 		end
 	end
 
-	if pos then
-		local btn_size = i3.settings.item_btn_size
-		return fmt("tooltip", pos.x, pos.y, btn_size, btn_size, ESC(tooltip))
-	end
-
 	return fmt("tooltip[%s;%s]", item, ESC(tooltip))
 end
 
@@ -933,28 +934,16 @@ local function get_output_fs(fs, data, rcp, is_recipe, is_usage, shapeless, righ
 	local meta  = item:get_meta()
 	local name  = item:get_name()
 	local count = item:get_count()
-	local wear  = item:get_wear()
 	local _name = fmt("_%s", name)
-	local pos
 
-	if meta:get_string"color" ~= "" or meta:get_string"palette_index" ~= "" then
-		local rcp_usg = is_recipe and "rcp" or "usg"
+	local size = BTN_SIZE * 1.2
+	slot(X, Y - 0.11, size, size)
 
-		fs(fmt("style_type[list;size=%f]", BTN_SIZE))
-		fs"listcolors[#bababa50;#bababa99]"
-		fs(fmt("list[detached:i3_output_%s_%s;main;%f,%f;1,1;]", rcp_usg, data.player_name, X + 0.11, Y))
-		button(X + 0.11, Y, BTN_SIZE, BTN_SIZE, _name, "")
+	count = get_true_count(data, count, is_recipe, is_usage)
+	item:set_count(count)
 
-		local inv = get_detached_inv(fmt("output_%s", rcp_usg), data.player_name)
-		inv:set_stack("main", 1, item)
-		pos = {x = X + 0.11, y = Y}
-	else
-		local size = BTN_SIZE * 1.2
-		slot(X, Y - 0.11, size, size)
-
-		count = get_true_count(data, count, is_recipe, is_usage)
-		item_image_button(X + 0.11, Y, BTN_SIZE, BTN_SIZE, fmt("%s %u %u", name, count, wear), _name, "")
-	end
+	local itemstr = ESC(item:to_string())
+	item_image_button(X + 0.11, Y, BTN_SIZE, BTN_SIZE, itemstr, _name, "")
 
 	local def = reg_items[name]
 	local unknown = not def or nil
@@ -977,7 +966,7 @@ local function get_output_fs(fs, data, rcp, is_recipe, is_usage, shapeless, righ
 	}
 
 	if next(infos) then
-		fs(get_tooltip(_name, infos, pos, data.lang_code))
+		fs(get_tooltip(_name, infos, data.lang_code))
 	end
 end
 
@@ -1094,7 +1083,10 @@ local function get_grid_fs(fs, data, rcp, is_recipe, is_usage)
 				label(X + 0.8, Y + 0.9, count)
 			end
 		else
-			item_image_button(X, Y, btn_size, btn_size, fmt("%s %u", name, count), btn_name, label)
+			item:set_name(name)
+			item:set_count(count)
+			local itemstr = ESC(item:to_string())
+			item_image_button(X, Y, btn_size, btn_size, itemstr, btn_name, label)
 		end
 
 		local def = reg_items[name]
@@ -1119,7 +1111,7 @@ local function get_grid_fs(fs, data, rcp, is_recipe, is_usage)
 		}
 
 		if next(infos) then
-			fs(get_tooltip(btn_name, infos, nil, data.lang_code))
+			fs(get_tooltip(btn_name, infos, data.lang_code))
 		end
 	end
 
@@ -1134,9 +1126,13 @@ local function get_rcp_lbl(fs, data, panel, rn, is_recipe, is_usage)
 	local rcp = is_recipe and panel.rcp[data.rnum] or panel.rcp[data.unum]
 
 	if rcp.custom then
-		local desc = i3.craft_types[rcp.type].description
-		hypertext(data.inv_width + 4.8, data.yoffset + 0.12, 3, 1, "custom_rcp",
-			fmt("<right><i><global size=16>%s\n<global size=15>%s</i></right>", ES"Custom recipe", desc))
+		local craft_type = i3.craft_types[rcp.type]
+		if craft_type then
+			local desc = craft_type.description
+			hypertext(data.inv_width + 4.8, data.yoffset + 0.12, 3, 1, "custom_rcp",
+				fmt("<right><i><global size=16>%s\n<global size=15>%s</i></right>",
+					ES"Custom recipe", ESC(desc)))
+		end
 	end
 
 	local lbl = ES("Usage @1 of @2", data.unum, rn)
@@ -1218,19 +1214,19 @@ local function get_header(fs, data)
 
 	if nfavs < max_favs or (nfavs == max_favs and fav) then
 		local fav_marked = fmt("i3_fav%s.png", fav and "_off" or "")
-		fs(fmt("style[fav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
-			fmt("i3_fav%s.png", fav and "" or "_off"), fav_marked, fav_marked))
+		fs("style[fav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
+			fmt("i3_fav%s.png", fav and "" or "_off"), fav_marked, fav_marked)
 		image_button(star_x, star_y, size, size, "", "fav", "")
-		fs(fmt("tooltip[fav;%s]", fav and ES"Unmark this item" or ES"Mark this item"))
+		fs("tooltip[fav;%s]", fav and ES"Unmark this item" or ES"Mark this item")
 	else
-		fs(fmt("style[nofav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
-			"i3_fav_off.png", PNG.cancel, PNG.cancel))
+		fs("style[nofav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
+			"i3_fav_off.png", PNG.cancel, PNG.cancel)
 		image_button(star_x, star_y, size, size, "", "nofav", "")
-		fs(fmt("tooltip[nofav;%s]", ES"Cannot mark this item. Bookmark limit reached."))
+		fs("tooltip[nofav;%s]", ES"Cannot mark this item. Bookmark limit reached.")
 	end
 
 	image_button(star_x + 0.05, star_y + 0.6, size, size, "", "exit", "")
-	fs(fmt("tooltip[exit;%s]", ES"Back to item list"))
+	fs("tooltip[exit;%s]", ES"Back to item list")
 
 	local desc_lim, name_lim = 34, 35
 	local desc = get_desc(data.query_item, data.lang_code)
@@ -1270,10 +1266,10 @@ local function get_crafting_fs(fs, data, is_recipe, is_usage, max_stacks_rcp, ma
 	local name = is_recipe and "rcp" or "usg"
 	local show_crafting = (is_recipe and data.crafting_rcp) or (is_usage and data.crafting_usg)
 
-	fs(fmt("style[crafting_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
-		name, fmt("%s", show_crafting and PNG.crafting_hover or PNG.crafting), PNG.crafting_hover))
+	fs("style[crafting_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
+		name, fmt("%s", show_crafting and PNG.crafting_hover or PNG.crafting), PNG.crafting_hover)
 	image_button(data.inv_width + 7.35, data.yoffset + 0.2, 0.45, 0.45, "", fmt("crafting_%s", name), "")
-	fs(fmt("tooltip[crafting_%s;%s]", name, ES"Quick crafting"))
+	fs("tooltip[crafting_%s;%s]", name, ES"Quick crafting")
 
 	if not show_crafting then return end
 
@@ -1297,8 +1293,8 @@ local function get_crafting_fs(fs, data, is_recipe, is_usage, max_stacks_rcp, ma
 	fs"style[quick_crafting;font_size=16;textcolor=#ddd]"
 	button(x, data.yoffset + 0.85, 3.05, 0.55, "quick_crafting", ES"Quick Crafting")
 
-	fs(fmt("style[scrbar_%s;noclip=true]", name),
-	   fmt("scrollbaroptions[min=1;max=%u;smallstep=1]", craft_max))
+	fs("style[scrbar_%s;noclip=true]", name)
+	fs("scrollbaroptions[min=1;max=%u;smallstep=1]", craft_max)
 
 	scrollbar(x + 0.2, data.yoffset + 1.45, 2.5, 0.35, "horizontal", fmt("scrbar_%s", name), stack_fs)
 	button(x + 0.2, data.yoffset + 1.85, 2.5, 0.7, fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
@@ -1359,7 +1355,7 @@ local function hide_items(player, data)
 		data.items = new
 	end
 
-	if not core.is_creative_enabled(data.player_name) then
+	if not core.is_creative_enabled(data.player_name) and not recipe_filter_set() then
 		local new = {}
 
 		for i = 1, #data.items do
@@ -1380,17 +1376,17 @@ local function get_header_items_fs(fs, data)
 	fs"set_focus[filter;true]"
 
 	if data.hide_tabs then
-		fs(fmt("style[enable_search;bgimg=%s;bgimg_hovered=%s;bgimg_pressed=%s]",
-			data.enable_search and PNG.search_hover or PNG.search, PNG.search_hover, PNG.search_hover))
+		fs("style[enable_search;bgimg=%s;bgimg_hovered=%s;bgimg_pressed=%s]",
+			data.enable_search and PNG.search_hover or PNG.search, PNG.search_hover, PNG.search_hover)
 		image_button(X + 0.3, 0.2, 0.5, 0.5, "", "enable_search", "")
-		fs(fmt("tooltip[enable_search;%s]", ES"Search"))
+		fs("tooltip[enable_search;%s]", ES"Search")
 
 		if data.enable_search then
 			image(X + 0.4, 0.75, 3.4, 0.8, PNG.bg_goto)
 
-			fs("style[filter;font_size=16]",
-			   fmt("field[%f,%f;3,0.45;filter;;%s]", X + 0.6, 0.95, data.filter),
-			   "field_close_on_enter[filter;false]")
+			fs"style[filter;font_size=16]"
+			fs("field[%f,%f;3,0.45;filter;;%s]", X + 0.6, 0.95, data.filter)
+			fs"field_close_on_enter[filter;false]"
 		end
 
 		box(X + 1, 0.2, 0.01, 0.5, "#bababa50")
@@ -1400,20 +1396,20 @@ local function get_header_items_fs(fs, data)
 			local name, desc = unpack(cat[i])
 			local active = PNG[name .. "_hover"]
 
-			fs(fmt("style[itab_%u;bgimg=%s;bgimg_hovered=%s;bgimg_pressed=%s;sound=i3_tab]",
-				i, data.itab == i and active or PNG[name], active, active))
+			fs("style[itab_%u;bgimg=%s;bgimg_hovered=%s;bgimg_pressed=%s;sound=i3_tab]",
+				i, data.itab == i and active or PNG[name], active, active)
 			image_button(X + 1.25 + ((i - 1) * 0.7), 0.2, 0.5, 0.5, "", fmt("itab_%s", i), "")
-			fs(fmt("tooltip[itab_%u;Show %s]", i, desc))
+			fs("tooltip[itab_%u;Show %s]", i, desc)
 		end
 	else
-		fs(fmt("style[search;bgimg=%s]", PNG.search_hover))
+		fs("style[search;bgimg=%s]", PNG.search_hover)
 		image_button(X + 0.35, 0.32, 0.35, 0.35, "", "search", "")
-		fs(fmt("tooltip[search;%s]", ES"Search"))
+		fs("tooltip[search;%s]", ES"Search")
 
 		if data.enable_search then
-			fs("style[filter;font_size=18]",
-			   fmt("field[%f,0.2;3.35,0.6;filter;;%s]", X + 0.85, ESC(data.filter)),
-			   "field_close_on_enter[filter;false]")
+			fs"style[filter;font_size=18]"
+			fs("field[%f,0.2;3.35,0.6;filter;;%s]", X + 0.85, ESC(data.filter))
+			fs"field_close_on_enter[filter;false]"
 
 			if not true_str(data.filter) then
 				image(X + 0.85, 0.75, 4, 0.01, PNG.search_outline_trim .. "^[opacity:100")
@@ -1427,7 +1423,7 @@ local function get_header_items_fs(fs, data)
 
 		if true_str(data.filter) then
 			image_button(X + 4.3, 0.4, 0.2, 0.2,  "", "cancel", "")
-			fs(fmt("tooltip[cancel;%s]", ES"Clear"))
+			fs("tooltip[cancel;%s]", ES"Clear")
 			box(X + 0.85, 0.75, 3.74, 0.01, "#f9826c")
 		end
 	end
@@ -1435,8 +1431,8 @@ local function get_header_items_fs(fs, data)
 	image_button(X + 5.27, 0.3, 0.35, 0.35, "", "prev_page", "")
 	image_button(X + 7.45, 0.3, 0.35, 0.35, "", "next_page", "")
 
-	fs(fmt("style[pagenum;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;sound=i3_click]",
-		data.goto_page and PNG.pagenum_hover or "", PNG.pagenum_hover))
+	fs("style[pagenum;bgimg=%s;bgimg_hovered=%s;bgimg_middle=9;padding=-9;sound=i3_click]",
+		data.goto_page and PNG.pagenum_hover or "", PNG.pagenum_hover)
 
 	button(X + 5.8, 0.14, 1.48, 0.7, "pagenum",
 		fmt("%s / %u", clr(colors.yellow, data.pagenum), data.pagemax))
@@ -1447,9 +1443,9 @@ local function get_header_items_fs(fs, data)
 		label(X + 5, 1.25, ES"Go to page" .. ":")
 		box(X + 6.5, 1, 1, 0.45, "#bababa10")
 
-		fs(fmt("style[goto_page;font=mono,bold;font_size=16;textcolor=%s]", colors.yellow),
-		   fmt("field[%f,%f;1,0.45;goto_page;;%s]", X + 6.55, 1.05, data.pagenum),
-		   "field_close_on_enter[goto_page;false]")
+		fs("style[goto_page;font=mono,bold;font_size=16;textcolor=%s]", colors.yellow)
+		fs("field[%f,%f;1,0.45;goto_page;;%s]", X + 6.55, 1.05, data.pagenum)
+		fs"field_close_on_enter[goto_page;false]"
 
 		fs"style_type[label;font_size=16;textcolor=#fff]"
 	end
@@ -1463,11 +1459,11 @@ local function get_minitabs(fs, data, full_height)
 		local selected = i == data.itab
 		local hover_texture = selected and PNG.tab_small_hover or PNG.tab_small
 
-		fs(fmt([[style_type[image_button;bgimg=%s;bgimg_hovered=%s;
-			bgimg_middle=14,0,-14,-14;padding=-14,0,14,14] ]], hover_texture, PNG.tab_small_hover))
+		fs([[ style_type[image_button;bgimg=%s;bgimg_hovered=%s;
+			bgimg_middle=14,0,-14,-14;padding=-14,0,14,14] ]], hover_texture, PNG.tab_small_hover)
 
-		fs(fmt([[style_type[image_button;noclip=true;font=bold;font_size=16;
-			textcolor=%s;content_offset=0;sound=i3_tab] ]], selected and "#fff" or "#bbb"))
+		fs([[ style_type[image_button;noclip=true;font=bold;font_size=16;
+			textcolor=%s;content_offset=0;sound=i3_tab] ]], selected and "#fff" or "#bbb")
 		fs"style_type[image_button:hovered;textcolor=#fff]"
 		image_button((data.inv_width - 0.65) + (i * (tab_len + 0.1)),
 			full_height, tab_len, tab_hgh, "", fmt("itab_%u", i), title)
@@ -1485,11 +1481,15 @@ local function get_items_fs(fs, data, player, full_height)
 
 	data.pagemax = max(1, ceil(#items / ipp))
 
+	if data.pagenum > data.pagemax then
+		data.pagenum = data.pagemax
+	end
+
 	if #items == 0 then
 		local lbl = ES"No item to show"
 		local icon, width, offset = PNG.no_result, 4, 2
 
-		if next(i3.recipe_filters) and #i3.init_items > 0 and data.filter == "" then
+		if recipe_filter_set() and #i3.init_items > 0 and data.filter == "" then
 			lbl = ES"Collect items to reveal more recipes" -- Progressive mode, etc.
 			icon, width, offset = PNG.find_more, 2.5, 2.75
 		end
@@ -1512,12 +1512,30 @@ local function get_items_fs(fs, data, player, full_height)
 			local Y = round((i % ipp - X) / rows + 1, 0)
 			      Y -= (Y * 0.085) + 0.92
 
-			insert(fs, fmt("item_image_button", X, Y, size, size, name, item, ""))
+			local item_btn = fmt("item_image_button", X, Y, size, size, name, item, "")
+
+			if recipe_filter_set() then
+				if data.items_progress[item] then
+					insert(fs, item_btn)
+				else
+					local col = "^\\[colorize:#232428^\\[opacity:245"
+					local img = reg_items[item].inventory_image .. col
+					local nodedef = reg_nodes[item]
+
+					if nodedef and not true_str(nodedef.inventory_image) then
+						img = PNG.cube .. col
+					end
+
+					insert(fs, fmt("image", X, Y, size, size, img))
+				end
+			else
+				insert(fs, item_btn)
+			end
 
 			if compressible(item, data) then
 				local expand = data.expand == name
 
-				fs(fmt("tooltip[%s;%s]", item, expand and ES"Click to hide" or ES"Click to expand"))
+				fs("tooltip[%s;%s]", item, expand and ES"Click to hide" or ES"Click to expand")
 				fs"style_type[label;font=bold;font_size=20]"
 				label(X + 0.65, Y + 0.7, expand and "-" or "+")
 				fs"style_type[label;font=normal;font_size=16]"
@@ -1597,11 +1615,11 @@ local function get_tabs_fs(fs, player, data, full_height)
 		local middle = btm and "16,0,-16,-16" or "16,16,-16,-16"
 		local padding = btm and "-16,0,16,16" or "-16,-16,16,16"
 
-		fs(fmt([[style_type[image_button;bgimg=%s;bgimg_hovered=%s;bgimg_middle=%s;padding=%s] ]],
-			bgimg, bgimg_hover, middle, padding))
+		fs([[ style_type[image_button;bgimg=%s;bgimg_hovered=%s;bgimg_middle=%s;padding=%s] ]],
+			bgimg, bgimg_hover, middle, padding)
 
-		fs(fmt("style_type[image_button;noclip=true;font_size=16;textcolor=%s;content_offset=0;sound=i3_tab]",
-			selected and "#fff" or "#ddd"))
+		fs("style_type[image_button;noclip=true;font_size=16;textcolor=%s;content_offset=0;sound=i3_tab]",
+			selected and "#fff" or "#ddd")
 
 		local X = (data.inv_width / 2) + (c * (tab_len + 0.1)) - ((tab_len + 0.05) * (shift / 2))
 		local Y = btm and full_height or -tab_hgh
@@ -1654,10 +1672,11 @@ local function make_fs(player, data)
 	local fs = setmetatable({}, {
 		__call = function(t, ...)
 			local args = {...}
-			local elem = fs_elements[args[1]]
 
-			if elem then
-				insert(t, fmt(elem, select(2, ...)))
+			if #args > 1 then
+				local arg1 = args[1]
+				local elem = fs_elements[arg1]
+				insert(t, fmt(elem or arg1, select(2, ...)))
 			else
 				insert(t, concat(args))
 			end
@@ -1667,8 +1686,10 @@ local function make_fs(player, data)
 	data.inv_width = 10.23
 	local full_height = 12
 
-	fs(fmt("formspec_version[%u]size[%f,%f]no_prepend[]bgcolor[#0000]",
-		i3.settings.min_fs_version, data.inv_width + 8, full_height), styles)
+	fs("formspec_version[%u]size[%f,%f]no_prepend[]bgcolor[#0000]",
+		i3.settings.min_fs_version, data.inv_width + 8, full_height)
+
+	fs(styles)
 
 	bg9(0, 0, data.inv_width, full_height, PNG.bg_full)
 

src/hud.lua

@@ -26,7 +26,7 @@ local function init_hud(player)
 			hud_elem_type = "image",
 			position      = {x = 0.79, y = 1.02},
 			alignment     = {x = 1,    y = 1},
-			scale         = {x = 4,    y = 4},
+			scale         = {x = 1,    y = 1},
 			text          = "",
 			z_index       = 0xDEAD,
 		},
@@ -59,7 +59,7 @@ local function show_hud(player, data)
 	-- 2 calls for the notification's back and forth.
 
 	local hud_info_bg = player:hud_get(data.hud.bg)
-	local dt = 0.016
+	local dt = 0.025
 
 	if hud_info_bg.position.y <= 0.9 then
 		data.show_hud = false

src/preprocessor.lua

@@ -81,6 +81,10 @@ local function _load(path, line, data, t)
 	if not l then
 		local err_line = tonumber(err:match(":(%d+):"))
 
+		if t then
+			print("err_line", err_line, t[err_line])
+		end
+
 		if line ~= err_line then
 			return _load(path, err_line, data, t)
 		end

src/progressive.lua

@@ -2,11 +2,12 @@ local set_fs = i3.set_fs
 local hud_notif = i3.hud_notif
 local POLL_FREQ = 0.25
 
+IMPORT("reg_items", "reg_nodes")
 IMPORT("fmt", "search", "table_merge", "array_diff")
 IMPORT("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters")
 
 local function get_filtered_items(player, data)
-	local items, known, c = {}, 0, 0
+	local items, known = {}, 0
 
 	for i = 1, #i3.init_items do
 		local item = i3.init_items[i]
@@ -17,8 +18,7 @@ local function get_filtered_items(player, data)
 		usages = #apply_recipe_filters(usages or {}, player)
 
 		if recipes > 0 or usages > 0 then
-			c++
-			items[c] = item
+			items[item] = true
 			known += recipes + usages
 		end
 	end
@@ -133,10 +133,18 @@ local function poll_new_items(player, data, join)
 
 		if data.discovered > 0 then
 			local msg = fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or "")
-			hud_notif(data.player_name, msg, "i3_book.png")
+			local last_discovered = diff[1]
+			local img = reg_items[last_discovered].inventory_image
+
+			if reg_nodes[last_discovered] then
+				local id = core.get_content_id(last_discovered)
+				img = i3.cubes[id] or img
+			end
+
+			hud_notif(data.player_name, msg, img)
 		end
 
-		data.items_raw = items
+		data.items_progress = items
 		data.itab = 1
 
 		search(data)

src/styles.lua

@@ -12,7 +12,6 @@ local PNG = {
 	search = "i3_search.png",
 	heart = "i3_heart.png",
 	heart_half = "i3_heart_half.png",
-	heart_grey = "i3_heart_grey.png",
 	prev = "i3_next.png^\\[transformFX",
 	next = "i3_next.png",
 	arrow = "i3_arrow.png",
@@ -45,7 +44,7 @@ local PNG = {
 	nonvisible = "i3_non_visible.png",
 	exit = "i3_exit.png",
 	home = "i3_home.png",
-	flag = "i3_flag.png",
+	flag = "i3_flag_anim.png",
 	edit = "i3_edit.png",
 	no_result = "i3_no_result.png",
 	find_more = "i3_find_more.png",
@@ -54,6 +53,7 @@ local PNG = {
 	all = "i3_all.png",
 	node = "i3_node.png",
 	item = "i3_item.png",
+	cube = "i3_cube.png",
 
 	cancel_hover = "i3_cancel.png^\\[brighten",
 	search_hover = "i3_search.png^\\[brighten",
@@ -95,7 +95,6 @@ local styles = string.format([[
 	style[search;content_offset=0]
 	style[pagenum,no_item,no_rcp;font=bold;font_size=18]
 	style[enable_search:hovered;bgimg=%s]
-	style[enable_search:pressed;bgimg=%s^[opacity:178]
 	style[exit;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[cancel;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[prev_page,prev_recipe,prev_usage,prev_sort,prev_skin;fgimg=%s;fgimg_hovered=%s]
@@ -112,7 +111,7 @@ local styles = string.format([[
 	style[confirm_trash_yes;sound=i3_trash]
 ]],
 PNG.slot,
-PNG.search_outline, PNG.search_outline,
+PNG.search_outline,
 PNG.exit,           PNG.exit_hover,
 PNG.cancel,         PNG.cancel_hover,
 PNG.prev,           PNG.prev_hover,