Wording

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+- Mod version? Release or git?
+- Engine version?
+- LuaJIT enabled?
+- Operating system?
+- Did you try to disable other mods except i3?

.github/workflows/luacheck.yml

@@ -18,4 +18,4 @@ jobs:
     - name: Setup ‘luacheck’
       run: luarocks install luacheck
     - name: Run ‘luacheck’ linter
-      run: lua luacheck.lua .
+      run: cd util; lua luacheck.lua

API.md

@@ -280,7 +280,7 @@ A table containing all sorting methods.
 
 Adds a new group of items to compress.
 
-- `item` is the item that serve as stereotype for the group of compressed items.
+- `item` is the item which represent the group of compressed items.
 - `def` is a table specifying the substring replace patterns to be used.
 
 Example:

init.lua

@@ -12,6 +12,7 @@ print[[
 
 local modpath = core.get_modpath"i3"
 local http = core.request_http_api()
+local storage = core.get_mod_storage()
 local _loadfile = dofile(modpath .. "/src/operators.lua")
 
 local function lf(path)
@@ -19,8 +20,12 @@ local function lf(path)
 end
 
 i3 = {
+	data = core.deserialize(storage:get_string"data") or {},
+
 	settings = {
+		debug_mode = false,
 		max_favs = 6,
+		max_waypoints = 30,
 		min_fs_version = 4,
 		item_btn_size = 1.1,
 		drop_bag_on_die = true,
@@ -60,19 +65,13 @@ i3 = {
 		common = lf"/src/common.lua",
 		compress = lf"/src/compress.lua",
 		detached = lf"/src/detached_inv.lua",
+		fields = lf"/src/fields.lua",
 		groups = lf"/src/groups.lua",
 		gui = lf"/src/gui.lua",
 		hud = lf"/src/hud.lua",
 		model_alias = lf"/src/model_aliases.lua",
 		progressive = lf"/src/progressive.lua",
 		styles = lf"/src/styles.lua",
-
-		tests = {
-			tabs = lf"/tests/test_tabs.lua",
-			operators = lf"/tests/test_operators.lua",
-			compression = lf"/tests/test_compression.lua",
-			custom_recipes = lf"/tests/test_custom_recipes.lua",
-		}
 	},
 
 	-- Caches
@@ -99,162 +98,15 @@ i3.files.common()
 i3.files.api(http)
 i3.files.compress()
 i3.files.groups()
-i3.files.callbacks()
+i3.files.callbacks(http, storage)
-
-local storage = core.get_mod_storage()
-local slz, dslz, copy = i3.get("slz", "dslz", "copy")
-local set_fs = i3.set_fs
-
-i3.data = dslz(storage:get_string"data") or {}
-
-local init_bags = i3.files.bags()
-local init_detached = i3.files.detached()
-local fill_caches = i3.files.caches(http)
-local init_hud = i3.files.hud()
-
-local function get_lang_code(info)
-	return info and info.lang_code
-end
-
-local function get_formspec_version(info)
-	return info and info.formspec_version or 1
-end
-
-local function outdated(name)
-	local fs = ("size[6.3,1.3]image[0,0;1,1;i3_book.png]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]"):format(
-		"Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game.")
-
-	core.show_formspec(name, "i3_outdated", fs)
-end
-
-if rawget(_G, "armor") then
-	i3.modules.armor = true
-	armor:register_on_update(set_fs)
-end
-
-if rawget(_G, "skins") then
-	i3.modules.skins = true
-end
-
-if rawget(_G, "awards") then
-	i3.modules.awards = true
-
-	core.register_on_craft(function(_, player)
-		set_fs(player)
-	end)
-
-	core.register_on_dignode(function(_, _, player)
-		set_fs(player)
-	end)
-
-	core.register_on_placenode(function(_, _, player)
-		set_fs(player)
-	end)
-
-	core.register_on_chat_message(function(name)
-		local player = core.get_player_by_name(name)
-		set_fs(player)
-	end)
-end
-
-local function disable_inventories()
-	if rawget(_G, "sfinv") then
-		function sfinv.set_player_inventory_formspec() return end
-		sfinv.enabled = false
-	end
-
-	if rawget(_G, "unified_inventory") then
-		function unified_inventory.set_inventory_formspec() return end
-	end
-end
-
-local function init_data(player, info)
-	local name = player:get_player_name()
-	i3.data[name] = i3.data[name] or {}
-	local data = i3.data[name]
-
-	data.player_name     = name
-	data.filter          = ""
-	data.pagenum         = 1
-	data.items           = i3.init_items
-	data.items_raw       = i3.init_items
-	data.favs            = {}
-	data.sort            = "alphabetical"
-	data.show_setting    = "home"
-	data.ignore_hotbar   = false
-	data.auto_sorting    = false
-	data.reverse_sorting = false
-	data.inv_compress    = true
-	data.export_counts   = {}
-	data.tab             = 1
-	data.itab            = 1
-	data.subcat          = 1
-	data.scrbar_inv      = 0
-	data.lang_code       = get_lang_code(info)
-	data.fs_version      = info.formspec_version
-
-	local inv = player:get_inventory()
-	inv:set_size("main", i3.settings.inv_size)
-
-	core.after(0, set_fs, player)
-end
-
-local function save_data(player_name)
-	local _data = copy(i3.data)
-
-	for name, v in pairs(_data) do
-	for dat in pairs(v) do
-		if not i3.saves[dat] then
-			_data[name][dat] = nil
-
-			if player_name and i3.data[player_name] then
-				i3.data[player_name][dat] = nil -- To free up some memory
-			end
-		end
-	end
-	end
-
-	storage:set_string("data", slz(_data))
-end
-
-core.register_on_mods_loaded(function()
-	fill_caches()
-	disable_inventories()
-end)
-
-core.register_on_joinplayer(function(player)
-	local name = player:get_player_name()
-	local info = core.get_player_information and core.get_player_information(name)
-
-	if not info or get_formspec_version(info) < i3.settings.min_fs_version then
-		return outdated(name)
-	end
-
-	init_data(player, info)
-	init_bags(player)
-	init_detached(player)
-	init_hud(player)
-end)
-
-core.register_on_leaveplayer(function(player)
-	local name = player:get_player_name()
-	save_data(name)
-end)
-
-core.register_on_shutdown(save_data)
-
-local function routine()
-	save_data()
-	core.after(i3.settings.save_interval, routine)
-end
-
-core.after(i3.settings.save_interval, routine)
 
 if i3.settings.progressive_mode then
 	i3.files.progressive()
 end
 
---i3.files.tests.tabs()
+if i3.settings.debug_mode then
---i3.files.tests.operators()
+	lf("/tests/test_tabs.lua")()
---i3.files.tests.compression()
+	lf("/tests/test_operators.lua")()
---i3.files.tests.custom_recipes(http)
+	lf("/tests/test_compression.lua")()
+	lf("/tests/test_custom_recipes.lua")()
+end

mod.conf

@@ -1,3 +1,4 @@
 name = i3
-description = Tiling inventory for Minetest
+description = Next-generation inventory
 optional_depends = 3d_armor, skinsdb, awards
+min_minetest_version = 5.4

src/api.lua

@@ -1,5 +1,5 @@
-local make_fs = i3.files.gui()
 local http = ...
+local make_fs, get_inventory_fs = i3.files.gui()
 
 IMPORT("gmatch", "split")
 IMPORT("S", "err", "fmt", "reg_items")
@@ -22,7 +22,7 @@ end
 function i3.register_craft(def)
 	local width, c = 0, 0
 
-	if true_str(def.url) then
+	if http and true_str(def.url) then
 		http.fetch({url = def.url}, function(result)
 			if result.succeeded then
 				local t = core.parse_json(result.data)
@@ -51,7 +51,7 @@ function i3.register_craft(def)
 		def.result = nil
 	end
 
-	if not true_str(def.output) then
+	if not true_str(def.output) and not def.url then
 		return err "i3.register_craft: output missing"
 	end
 
@@ -69,9 +69,7 @@ function i3.register_craft(def)
 		end
 
 		local cp = copy(def.grid)
-		sort(cp, function(a, b)
+		sort(cp, function(a, b) return #a > #b end)
-			return #a > #b
-		end)
 
 		width = #cp[1]
 
@@ -86,26 +84,29 @@ function i3.register_craft(def)
 			def.items[c] = def.key[symbol]
 		end
 	else
-		local items, len = def.items, #def.items
+		local items = copy(def.items)
+		local lines = {}
 		def.items = {}
 
-		for i = 1, len do
+		for i = 1, #items do
-			local rlen = #split(items[i], ",")
+			lines[i] = split(items[i], ",", true)
 
-			if rlen > width then
+			if #lines[i] > width then
-				width = rlen
+				width = #lines[i]
 			end
 		end
 
-		for i = 1, len do
+		for i = 1, #items do
-			while #split(items[i], ",") < width do
+			while #lines[i] < width do
-				items[i] = fmt("%s,", items[i])
+				insert(lines[i], items[i])
 			end
 		end
 
-		for name in gmatch(concat(items, ","), "[%s%w_:]+") do
+		for _, line in ipairs(lines) do
-			c++
+			for _, v in ipairs(line) do
-			def.items[c] = clean_name(name)
+				c++
+				def.items[c] = clean_name(v)
+			end
 		end
 	end
 
@@ -185,6 +186,12 @@ function i3.new_tab(name, def)
 	insert(i3.tabs, def)
 end
 
+i3.new_tab("inventory", {
+	description = S"Inventory",
+	formspec = get_inventory_fs,
+	fields = i3.files.fields(),
+})
+
 function i3.remove_tab(name)
 	if not true_str(name) then
 		return err "i3.remove_tab: tab name missing"

src/callbacks.lua

@@ -1,467 +1,12 @@
-local _, get_inventory_fs = i3.files.gui()
+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
 
-IMPORT("vec_eq", "vec_round")
+IMPORT("slz", "min", "copy", "ItemStack")
-IMPORT("reg_items", "reg_aliases")
+IMPORT("spawn_item", "reset_data", "get_detached_inv")
-IMPORT("sort", "copy", "insert", "remove", "indexof")
-IMPORT("S", "min", "random", "translate", "ItemStack")
-IMPORT("fmt", "find", "match", "sub", "lower", "split", "toupper")
-IMPORT("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound", "spawn_item")
-IMPORT("search", "get_sorting_idx", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv")
-IMPORT("valid_item", "get_stack", "craft_stack", "clean_name", "compressible", "check_privs", "safe_teleport")
-
-local function reset_data(data)
-	data.filter        = ""
-	data.expand        = ""
-	data.pagenum       = 1
-	data.rnum          = 1
-	data.unum          = 1
-	data.scrbar_rcp    = 1
-	data.scrbar_usg    = 1
-	data.query_item    = nil
-	data.recipes       = nil
-	data.usages        = nil
-	data.export_rcp    = nil
-	data.export_usg    = nil
-	data.alt_items     = nil
-	data.confirm_trash = nil
-	data.show_settings = nil
-	data.show_setting  = "home"
-	data.items         = data.items_raw
-
-	if data.itab > 1 then
-		sort_by_category(data)
-	end
-end
-
-i3.new_tab("inventory", {
-	description = S"Inventory",
-	formspec = get_inventory_fs,
-
-	fields = function(player, data, fields)
-		local name = data.player_name
-		local inv = player:get_inventory()
-		local sb_inv = fields.scrbar_inv
-
-		if fields.skins then
-			local id = tonumber(fields.skins)
-			local _skins = skins.get_skinlist_for_player(name)
-			skins.set_player_skin(player, _skins[id])
-		end
-
-		if fields.drop_items then
-			local items = split(fields.drop_items, ",")
-			data.drop_items = items
-		end
-
-		for field in pairs(fields) do
-			if sub(field, 1, 4) == "btn_" then
-				data.subcat = indexof(i3.categories, sub(field, 5))
-				break
-
-			elseif sub(field, 1, 3) == "cb_" then
-				local str = sub(field, 4)
-				data[str] = false
-
-				if fields[field] == "true" then
-					data[str] = true
-				end
-
-			elseif sub(field, 1, 8) == "setting_" then
-				data.show_setting = match(field, "_(%w+)$")
-
-			elseif find(field, "waypoint_%d+") then
-				local id, action = match(field, "_(%d+)_(%w+)$")
-				      id = tonumber(id)
-				local waypoint = data.waypoints[id]
-				if not waypoint then return end
-
-				if action == "see" then
-					if data.waypoint_see and data.waypoint_see == id then
-						data.waypoint_see = nil
-					else
-						data.waypoint_see = id
-					end
-
-				elseif action == "delete" then
-					player:hud_remove(waypoint.id)
-					remove(data.waypoints, id)
-
-				elseif action == "teleport" then
-					local pos = str_to_pos(waypoint.pos)
-					safe_teleport(player, pos)
-					msg(name, S("Teleported to: @1", waypoint.name))
-
-				elseif action == "refresh" then
-					local color = random(0xffffff)
-					waypoint.color = color
-					player:hud_change(waypoint.id, "number", color)
-
-				elseif action == "hide" then
-					if waypoint.hide then
-						local new_id = add_hud_waypoint(
-							player, waypoint.name, str_to_pos(waypoint.pos), waypoint.color)
-
-						waypoint.id = new_id
-						waypoint.hide = nil
-					else
-						player:hud_remove(waypoint.id)
-						waypoint.hide = true
-					end
-				end
-
-				break
-			end
-		end
-
-		if fields.quit then
-			data.confirm_trash = nil
-			data.show_settings = nil
-			data.waypoint_see = nil
-			data.bag_rename = nil
-
-		elseif fields.trash then
-			data.show_settings = nil
-			data.confirm_trash = true
-
-		elseif fields.settings then
-			if not data.show_settings then
-				data.confirm_trash = nil
-				data.show_settings = true
-			else
-				data.show_settings = nil
-			end
-
-		elseif fields.confirm_trash_yes or fields.confirm_trash_no then
-			if fields.confirm_trash_yes then
-				inv:set_list("main", {})
-				inv:set_list("craft", {})
-			end
-
-			data.confirm_trash = nil
-
-		elseif fields.close_settings then
-			data.show_settings = nil
-
-		elseif fields.close_preview then
-			data.waypoint_see = nil
-
-		elseif fields.sort then
-			sort_inventory(player, data)
-
-		elseif fields.prev_sort or fields.next_sort then
-			local idx = get_sorting_idx(data.sort)
-			local tot = #i3.sorting_methods
-
-			idx -= (fields.prev_sort and 1 or -1)
-
-			if idx > tot then
-				idx = 1
-			elseif idx == 0 then
-				idx = tot
-			end
-
-			data.sort = i3.sorting_methods[idx].name
-
-		elseif fields.home then
-			if not data.home then
-				return msg(name, "No home set")
-			elseif not check_privs(name, {home = true}) then
-				return msg(name, "'home' privilege missing")
-			end
-
-			safe_teleport(player, str_to_pos(data.home))
-			msg(name, S"Welcome back home!")
-
-		elseif fields.set_home then
-			data.home = pos_to_str(player:get_pos(), 1)
-
-		elseif fields.bag_rename then
-			data.bag_rename = true
-
-		elseif fields.confirm_rename then
-			local bag = get_detached_inv("bag", name)
-			local bagstack = bag:get_stack("main", 1)
-			local meta = bagstack:get_meta()
-			local desc = translate(data.lang_code, bagstack:get_description())
-			local fill = split(desc, "(")[2]
-			local newname = fields.bag_newname:gsub("([%(%)])", "")
-			      newname = toupper(newname:trim())
-
-			if fill then
-				newname = fmt("%s (%s", newname, fill)
-			end
-
-			meta:set_string("description", newname)
-			bag:set_stack("main", 1, bagstack)
-
-			data.bag = bagstack:to_string()
-			data.bag_rename = nil
-
-		elseif sb_inv and sub(sb_inv, 1, 3) == "CHG" then
-			data.scrbar_inv = tonumber(match(sb_inv, "%d+"))
-			return
-
-		elseif fields.waypoint_add then
-			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
-					play_sound(name, "i3_cannot", 0.8)
-					return msg(name, "You already set a waypoint at this position")
-				end
-			end
-
-			local waypoint = fields.waypoint_name
-
-			if fields.waypoint_name == "" then
-				waypoint = "Waypoint"
-			end
-
-			local color = random(0xffffff)
-			local id = add_hud_waypoint(player, waypoint, pos, color)
-
-			insert(data.waypoints, {
-				name  = waypoint,
-				pos   = pos_to_str(pos, 1),
-				color = color,
-				id    = id,
-			})
-
-			data.scrbar_inv += 1000
-		end
-
-		return set_fs(player)
-	end,
-})
-
-local function select_item(player, data, _f)
-	local item
-
-	for field in pairs(_f) do
-		if find(field, ":") then
-			item = field
-			break
-		end
-	end
-
-	if not item then return end
-
-	if compressible(item, data) then
-		local idx
-
-		for i = 1, #data.items do
-			local it = data.items[i]
-			if it == item then
-				idx = i
-				break
-			end
-		end
-
-		if data.expand ~= "" then
-			data.alt_items = nil
-
-			if item == data.expand then
-				data.expand = nil
-				return
-			end
-		end
-
-		if idx and item ~= data.expand then
-			data.alt_items = copy(data.items)
-			data.expand = item
-
-			if i3.compress_groups[item] then
-				local items = copy(i3.compress_groups[item])
-				insert(items, fmt("_%s", item))
-
-				sort(items, function(a, b)
-					if a:sub(1, 1) == "_" then
-						a = a:sub(2)
-					end
-
-					return a < b
-				end)
-
-				local i = 1
-
-				for _, v in ipairs(items) do
-					if valid_item(reg_items[clean_name(v)]) then
-						insert(data.alt_items, idx + i, v)
-						i++
-					end
-				end
-			end
-		end
-	else
-		if sub(item, 1, 1) == "_" then
-			item = sub(item, 2)
-		elseif sub(item, 1, 6) == "group!" then
-			item = match(item, "([%w:_]+)$")
-		end
-
-		item = reg_aliases[item] or item
-		if not reg_items[item] then return end
-
-		if core.is_creative_enabled(data.player_name) then
-			local stack = ItemStack(item)
-			local stackmax = stack:get_stack_max()
-			      stack = fmt("%s %s", item, stackmax)
-
-			return get_stack(player, stack)
-		end
-
-		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.export_rcp = nil
-		data.export_usg = nil
-	end
-end
-
-local function rcp_fields(player, data, fields)
-	local sb_rcp, sb_usg = fields.scrbar_rcp, fields.scrbar_usg
-
-	if fields.cancel then
-		reset_data(data)
-
-	elseif fields.exit then
-		data.query_item = nil
-
-	elseif fields.key_enter_field == "filter" or fields.search then
-		if fields.filter == "" then
-			reset_data(data)
-			return set_fs(player)
-		end
-
-		local str = lower(fields.filter)
-		if data.filter == str then return end
-
-		data.filter = str
-		data.pagenum = 1
-
-		search(data)
-
-		if data.itab > 1 then
-			sort_by_category(data)
-		end
-
-	elseif fields.prev_page or fields.next_page then
-		if data.pagemax == 1 then return end
-		data.pagenum -= (fields.prev_page and 1 or -1)
-
-		if data.pagenum > data.pagemax then
-			data.pagenum = 1
-		elseif data.pagenum == 0 then
-			data.pagenum = data.pagemax
-		end
-
-	elseif fields.prev_recipe or fields.next_recipe then
-		local num = data.rnum + (fields.prev_recipe and -1 or 1)
-		data.rnum = data.recipes[num] and num or (fields.prev_recipe and #data.recipes or 1)
-		data.export_rcp = nil
-		data.scrbar_rcp = 1
-
-	elseif fields.prev_usage or fields.next_usage then
-		local num = data.unum + (fields.prev_usage and -1 or 1)
-		data.unum = data.usages[num] and num or (fields.prev_usage and #data.usages or 1)
-		data.export_usg = nil
-		data.scrbar_usg = 1
-
-	elseif fields.fav then
-		local fav, i = is_fav(data.favs, data.query_item)
-		local total = #data.favs
-
-		if total < i3.settings.max_favs and not fav then
-			data.favs[total + 1] = data.query_item
-		elseif fav then
-			remove(data.favs, i)
-		end
-
-	elseif fields.export_rcp or fields.export_usg then
-		if fields.export_rcp then
-			data.export_rcp = not data.export_rcp
-
-			if not data.export_rcp then
-				data.scrbar_rcp = 1
-			end
-		else
-			data.export_usg = not data.export_usg
-
-			if not data.export_usg then
-				data.scrbar_usg = 1
-			end
-		end
-
-	elseif (sb_rcp and sub(sb_rcp, 1, 3) == "CHG") or (sb_usg and sub(sb_usg, 1, 3) == "CHG") then
-		data.scrbar_rcp = sb_rcp and tonumber(match(sb_rcp, "%d+"))
-		data.scrbar_usg = sb_usg and tonumber(match(sb_usg, "%d+"))
-
-	elseif fields.craft_rcp or fields.craft_usg then
-		craft_stack(player, data, fields.craft_rcp)
-
-		if fields.craft_rcp then
-			data.export_rcp = nil
-			data.scrbar_rcp = 1
-		else
-			data.export_usg = nil
-			data.scrbar_usg = 1
-		end
-	else
-		select_item(player, data, fields)
-	end
-end
-
-core.register_on_player_receive_fields(function(player, formname, fields)
-	local name = player:get_player_name()
-
-	if formname == "i3_outdated" then
-		return false, core.kick_player(name, S"Come back when your client is up-to-date.")
-	elseif formname ~= "" then
-		return false
-	end
-
-	-- No-op buttons
-	if fields.player_name or fields.awards or fields.home_pos or fields.pagenum or
-	   fields.no_item or fields.no_rcp or fields.select_sorting or fields.sort_method or
-	   fields.bg_content then
-		return false
-	end
-
-	--print(dump(fields))
-	local data = i3.data[name]
-	if not data then return end
-
-	for f in pairs(fields) do
-		if sub(f, 1, 4) == "tab_" then
-			local tabname = sub(f, 5)
-			i3.set_tab(player, tabname)
-			break
-		elseif sub(f, 1, 5) == "itab_" then
-			data.pagenum = 1
-			data.itab = tonumber(f:sub(-1))
-			sort_by_category(data)
-			break
-		end
-	end
-
-	rcp_fields(player, data, fields)
-
-	local tab = i3.tabs[data.tab]
-
-	if tab and tab.fields then
-		return true, tab.fields(player, data, fields)
-	end
-
-	return true, set_fs(player)
-end)
 
 core.register_on_player_hpchange(function(player, hpchange)
 	local name = player:get_player_name()
@@ -520,3 +65,140 @@ core.register_on_player_inventory_action(function(player, _, _, info)
 		set_fs(player)
 	end
 end)
+
+if core.global_exists("armor") then
+	i3.modules.armor = true
+	armor:register_on_update(set_fs)
+end
+
+if core.global_exists("skins") then
+	i3.modules.skins = true
+end
+
+if core.global_exists("awards") then
+	i3.modules.awards = true
+
+	core.register_on_craft(function(_, player)
+		set_fs(player)
+	end)
+
+	core.register_on_dignode(function(_, _, player)
+		set_fs(player)
+	end)
+
+	core.register_on_placenode(function(_, _, player)
+		set_fs(player)
+	end)
+
+	core.register_on_chat_message(function(name)
+		local player = core.get_player_by_name(name)
+		set_fs(player)
+	end)
+end
+
+local function disable_inventories()
+	if rawget(_G, "sfinv") then
+		function sfinv.set_player_inventory_formspec() return end
+		sfinv.enabled = false
+	end
+
+	if rawget(_G, "unified_inventory") then
+		function unified_inventory.set_inventory_formspec() return end
+	end
+end
+
+core.register_on_mods_loaded(function()
+	fill_caches()
+	disable_inventories()
+end)
+
+local function get_lang_code(info)
+	return info and info.lang_code
+end
+
+local function get_formspec_version(info)
+	return info and info.formspec_version or 1
+end
+
+local function outdated(name)
+	core.show_formspec(name, "i3_outdated",
+		("size[6.5,1.3]image[0,0;1,1;i3_book.png]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]"):format(
+		"Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game."))
+end
+
+local function init_data(player, info)
+	local name = player:get_player_name()
+	i3.data[name] = i3.data[name] or {}
+	local data = i3.data[name]
+
+	data.player_name     = name
+	data.filter          = ""
+	data.pagenum         = 1
+	data.items           = i3.init_items
+	data.items_raw       = i3.init_items
+	data.favs            = {}
+	data.sort            = "alphabetical"
+	data.show_setting    = "home"
+	data.ignore_hotbar   = false
+	data.auto_sorting    = false
+	data.reverse_sorting = false
+	data.inv_compress    = true
+	data.export_counts   = {}
+	data.tab             = 1
+	data.itab            = 1
+	data.subcat          = 1
+	data.scrbar_inv      = 0
+	data.lang_code       = get_lang_code(info)
+	data.fs_version      = info.formspec_version
+
+	local inv = player:get_inventory()
+	inv:set_size("main", i3.settings.inv_size)
+
+	core.after(0, set_fs, player)
+end
+
+local function save_data(player_name)
+	local _data = copy(i3.data)
+
+	for name, v in pairs(_data) do
+	for dat in pairs(v) do
+		if not i3.saves[dat] then
+			_data[name][dat] = nil
+
+			if player_name and i3.data[player_name] then
+				i3.data[player_name][dat] = nil -- To free up some memory
+			end
+		end
+	end
+	end
+
+	storage:set_string("data", slz(_data))
+end
+
+core.register_on_joinplayer(function(player)
+	local name = player:get_player_name()
+	local info = core.get_player_information and core.get_player_information(name)
+
+	if not info or get_formspec_version(info) < i3.settings.min_fs_version then
+		return outdated(name)
+	end
+
+	init_data(player, info)
+	init_bags(player)
+	init_detached(player)
+	init_hud(player)
+end)
+
+core.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	save_data(name)
+end)
+
+core.register_on_shutdown(save_data)
+
+local function routine()
+	save_data()
+	core.after(i3.settings.save_interval, routine)
+end
+
+core.after(i3.settings.save_interval, routine)

src/common.lua

@@ -289,17 +289,12 @@ local function compressible(item, data)
 	return compression_active(data) and i3.compress_groups[item]
 end
 
-local function is_fav(favs, query_item)
+local function is_fav(data)
-	local fav, i
+	for i = 1, #data.favs do
-	for j = 1, #favs do
+		if data.favs[i] == data.query_item then
-		if favs[j] == query_item then
+			return i
-			fav = true
-			i = j
-			break
 		end
 	end
-
-	return fav, i
 end
 
 local function sort_by_category(data)
@@ -566,6 +561,30 @@ local function sort_inventory(player, data)
 	end
 end
 
+local function reset_data(data)
+	data.filter        = ""
+	data.expand        = ""
+	data.pagenum       = 1
+	data.rnum          = 1
+	data.unum          = 1
+	data.scrbar_rcp    = 1
+	data.scrbar_usg    = 1
+	data.query_item    = nil
+	data.recipes       = nil
+	data.usages        = nil
+	data.export_rcp    = nil
+	data.export_usg    = nil
+	data.alt_items     = nil
+	data.confirm_trash = nil
+	data.show_settings = nil
+	data.show_setting  = "home"
+	data.items         = data.items_raw
+
+	if data.itab > 1 then
+		sort_by_category(data)
+	end
+end
+
 local function add_hud_waypoint(player, name, pos, color)
 	return player:hud_add {
 		hud_elem_type = "waypoint",
@@ -643,6 +662,7 @@ local _ = {
 	spawn_item = spawn_item,
 	clean_name = clean_name,
 	play_sound = play_sound,
+	reset_data = reset_data,
 	safe_teleport = safe_teleport,
 	add_hud_waypoint = add_hud_waypoint,
 

src/compress.lua

@@ -277,13 +277,7 @@ for _, nodename in ipairs(v) do
 	t[nodename] = {}
 
 	for _, shape in ipairs(circular_saw_names) do
-		local to_add = true
+		if shape[1] ~= "slope" or shape[2] ~= "" then
-
-		if shape[1] == "slope" and shape[2] == "" then
-			to_add = nil
-		end
-
-		if to_add then
 			insert(t[nodename], fmt("%s_%s%s", shape[1], nodename, shape[2]))
 		end
 	end
@@ -292,7 +286,7 @@ for _, nodename in ipairs(v) do
 
 	to_compress[fmt("%s:%s", mod, slope_name)] = {
 		replace = slope_name,
-		by = t[nodename]
+		by = t[nodename],
 	}
 end
 end

src/fields.lua

@@ -0,0 +1,446 @@
+local set_fs = i3.set_fs
+
+IMPORT("vec_eq", "vec_round")
+IMPORT("reg_items", "reg_aliases")
+IMPORT("S", "random", "translate", "ItemStack")
+IMPORT("sort", "copy", "insert", "remove", "indexof")
+IMPORT("fmt", "find", "match", "sub", "lower", "split", "toupper")
+IMPORT("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound", "reset_data")
+IMPORT("search", "get_sorting_idx", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv")
+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
+	local inv = player:get_inventory()
+	local sb_inv = fields.scrbar_inv
+
+	if fields.skins then
+		local id = tonumber(fields.skins)
+		local _skins = skins.get_skinlist_for_player(name)
+		skins.set_player_skin(player, _skins[id])
+	end
+
+	if fields.drop_items then
+		local items = split(fields.drop_items, ",")
+		data.drop_items = items
+	end
+
+	for field in pairs(fields) do
+		if sub(field, 1, 4) == "btn_" then
+			data.subcat = indexof(i3.categories, sub(field, 5))
+			break
+
+		elseif sub(field, 1, 3) == "cb_" then
+			local str = sub(field, 4)
+			data[str] = false
+
+			if fields[field] == "true" then
+				data[str] = true
+			end
+
+		elseif sub(field, 1, 8) == "setting_" then
+			data.show_setting = match(field, "_(%w+)$")
+
+		elseif find(field, "waypoint_%d+") then
+			local id, action = match(field, "_(%d+)_(%w+)$")
+			      id = tonumber(id)
+			local waypoint = data.waypoints[id]
+			if not waypoint then return end
+
+			if action == "see" then
+				if data.waypoint_see and data.waypoint_see == id then
+					data.waypoint_see = nil
+				else
+					data.waypoint_see = id
+				end
+
+			elseif action == "delete" then
+				player:hud_remove(waypoint.id)
+				remove(data.waypoints, id)
+
+			elseif action == "teleport" then
+				local pos = str_to_pos(waypoint.pos)
+				safe_teleport(player, pos)
+				msg(name, S("Teleported to: @1", waypoint.name))
+
+			elseif action == "refresh" then
+				local color = random(0xffffff)
+				waypoint.color = color
+				player:hud_change(waypoint.id, "number", color)
+
+			elseif action == "hide" then
+				if waypoint.hide then
+					local new_id = add_hud_waypoint(
+						player, waypoint.name, str_to_pos(waypoint.pos), waypoint.color)
+
+					waypoint.id = new_id
+					waypoint.hide = nil
+				else
+					player:hud_remove(waypoint.id)
+					waypoint.hide = true
+				end
+			end
+
+			break
+		end
+	end
+
+	if fields.quit then
+		data.confirm_trash = nil
+		data.show_settings = nil
+		data.waypoint_see = nil
+		data.bag_rename = nil
+
+	elseif fields.trash then
+		data.show_settings = nil
+		data.confirm_trash = true
+
+	elseif fields.settings then
+		if not data.show_settings then
+			data.confirm_trash = nil
+			data.show_settings = true
+		else
+			data.show_settings = nil
+		end
+
+	elseif fields.confirm_trash_yes or fields.confirm_trash_no then
+		if fields.confirm_trash_yes then
+			inv:set_list("main", {})
+			inv:set_list("craft", {})
+		end
+
+		data.confirm_trash = nil
+
+	elseif fields.close_settings then
+		data.show_settings = nil
+
+	elseif fields.close_preview then
+		data.waypoint_see = nil
+
+	elseif fields.sort then
+		sort_inventory(player, data)
+
+	elseif fields.prev_sort or fields.next_sort then
+		local idx = get_sorting_idx(data.sort)
+		local tot = #i3.sorting_methods
+
+		idx -= (fields.prev_sort and 1 or -1)
+
+		if idx > tot then
+			idx = 1
+		elseif idx == 0 then
+			idx = tot
+		end
+
+		data.sort = i3.sorting_methods[idx].name
+
+	elseif fields.home then
+		if not data.home then
+			return msg(name, "No home set")
+		elseif not check_privs(name, {home = true}) then
+			return msg(name, "'home' privilege missing")
+		end
+
+		safe_teleport(player, str_to_pos(data.home))
+		msg(name, S"Welcome back home!")
+
+	elseif fields.set_home then
+		data.home = pos_to_str(player:get_pos(), 1)
+
+	elseif fields.bag_rename then
+		data.bag_rename = true
+
+	elseif fields.confirm_rename then
+		local bag = get_detached_inv("bag", name)
+		local bagstack = bag:get_stack("main", 1)
+		local meta = bagstack:get_meta()
+		local desc = translate(data.lang_code, bagstack:get_description())
+		local fill = split(desc, "(")[2]
+		local newname = fields.bag_newname:gsub("([%(%)])", "")
+		      newname = toupper(newname:trim())
+
+		if fill then
+			newname = fmt("%s (%s", newname, fill)
+		end
+
+		meta:set_string("description", newname)
+		bag:set_stack("main", 1, bagstack)
+
+		data.bag = bagstack:to_string()
+		data.bag_rename = nil
+
+	elseif sb_inv and sub(sb_inv, 1, 3) == "CHG" then
+		data.scrbar_inv = tonumber(match(sb_inv, "%d+"))
+		return
+
+	elseif fields.waypoint_add then
+		local max_waypoints = i3.settings.max_waypoints
+
+		if #data.waypoints >= max_waypoints then
+			play_sound(name, "i3_cannot", 0.8)
+			return msg(name, fmt("Waypoints limit reached (%u)", max_waypoints))
+		end
+
+		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
+				play_sound(name, "i3_cannot", 0.8)
+				return msg(name, S"You already set a waypoint at this position")
+			end
+		end
+
+		local waypoint = fields.waypoint_name
+
+		if fields.waypoint_name == "" then
+			waypoint = "Waypoint"
+		end
+
+		local color = random(0xffffff)
+		local id = add_hud_waypoint(player, waypoint, pos, color)
+
+		insert(data.waypoints, {
+			name  = waypoint,
+			pos   = pos_to_str(pos, 1),
+			color = color,
+			id    = id,
+		})
+
+		data.scrbar_inv += 1000
+
+	elseif fields.hide_debug_grid then
+		data.hide_debug_grid = not data.hide_debug_grid
+	end
+
+	return set_fs(player)
+end
+
+local function select_item(player, data, _f)
+	local item
+
+	for field in pairs(_f) do
+		if find(field, ":") then
+			item = field
+			break
+		end
+	end
+
+	if not item then return end
+
+	if compressible(item, data) then
+		local idx
+
+		for i = 1, #data.items do
+			local it = data.items[i]
+			if it == item then
+				idx = i
+				break
+			end
+		end
+
+		if data.expand ~= "" then
+			data.alt_items = nil
+
+			if item == data.expand then
+				data.expand = nil
+				return
+			end
+		end
+
+		if idx and item ~= data.expand then
+			data.alt_items = copy(data.items)
+			data.expand = item
+
+			if i3.compress_groups[item] then
+				local items = copy(i3.compress_groups[item])
+				insert(items, fmt("_%s", item))
+
+				sort(items, function(a, b)
+					if a:sub(1, 1) == "_" then
+						a = a:sub(2)
+					end
+
+					return a < b
+				end)
+
+				local i = 1
+
+				for _, v in ipairs(items) do
+					if valid_item(reg_items[clean_name(v)]) then
+						insert(data.alt_items, idx + i, v)
+						i++
+					end
+				end
+			end
+		end
+	else
+		if sub(item, 1, 1) == "_" then
+			item = sub(item, 2)
+		elseif sub(item, 1, 6) == "group!" then
+			item = match(item, "([%w:_]+)$")
+		end
+
+		item = reg_aliases[item] or item
+		if not reg_items[item] then return end
+
+		if core.is_creative_enabled(data.player_name) then
+			local stack = ItemStack(item)
+			local stackmax = stack:get_stack_max()
+			      stack = fmt("%s %s", item, stackmax)
+
+			return get_stack(player, stack)
+		end
+
+		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.export_rcp = nil
+		data.export_usg = nil
+	end
+end
+
+local function rcp_fields(player, data, fields)
+	local sb_rcp, sb_usg = fields.scrbar_rcp, fields.scrbar_usg
+
+	if fields.cancel then
+		reset_data(data)
+
+	elseif fields.exit then
+		data.query_item = nil
+
+	elseif fields.key_enter_field == "filter" or fields.search then
+		if fields.filter == "" then
+			reset_data(data)
+			return set_fs(player)
+		end
+
+		local str = lower(fields.filter)
+		if data.filter == str then return end
+
+		data.filter = str
+		data.pagenum = 1
+
+		search(data)
+
+		if data.itab > 1 then
+			sort_by_category(data)
+		end
+
+	elseif fields.prev_page or fields.next_page then
+		if data.pagemax == 1 then return end
+		data.pagenum -= (fields.prev_page and 1 or -1)
+
+		if data.pagenum > data.pagemax then
+			data.pagenum = 1
+		elseif data.pagenum == 0 then
+			data.pagenum = data.pagemax
+		end
+
+	elseif fields.prev_recipe or fields.next_recipe then
+		local num = data.rnum + (fields.prev_recipe and -1 or 1)
+		data.rnum = data.recipes[num] and num or (fields.prev_recipe and #data.recipes or 1)
+		data.export_rcp = nil
+		data.scrbar_rcp = 1
+
+	elseif fields.prev_usage or fields.next_usage then
+		local num = data.unum + (fields.prev_usage and -1 or 1)
+		data.unum = data.usages[num] and num or (fields.prev_usage and #data.usages or 1)
+		data.export_usg = nil
+		data.scrbar_usg = 1
+
+	elseif fields.fav then
+		local fav = is_fav(data)
+
+		if #data.favs < i3.settings.max_favs and not fav then
+			insert(data.favs, data.query_item)
+		elseif fav then
+			remove(data.favs, fav)
+		end
+
+	elseif fields.export_rcp or fields.export_usg then
+		if fields.export_rcp then
+			data.export_rcp = not data.export_rcp
+
+			if not data.export_rcp then
+				data.scrbar_rcp = 1
+			end
+		else
+			data.export_usg = not data.export_usg
+
+			if not data.export_usg then
+				data.scrbar_usg = 1
+			end
+		end
+
+	elseif (sb_rcp and sub(sb_rcp, 1, 3) == "CHG") or (sb_usg and sub(sb_usg, 1, 3) == "CHG") then
+		data.scrbar_rcp = sb_rcp and tonumber(match(sb_rcp, "%d+"))
+		data.scrbar_usg = sb_usg and tonumber(match(sb_usg, "%d+"))
+
+	elseif fields.craft_rcp or fields.craft_usg then
+		craft_stack(player, data, fields.craft_rcp)
+
+		if fields.craft_rcp then
+			data.export_rcp = nil
+			data.scrbar_rcp = 1
+		else
+			data.export_usg = nil
+			data.scrbar_usg = 1
+		end
+	else
+		select_item(player, data, fields)
+	end
+end
+
+core.register_on_player_receive_fields(function(player, formname, fields)
+	local name = player:get_player_name()
+
+	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).")
+	elseif formname ~= "" then
+		return false
+	end
+
+	-- No-op buttons
+	if fields.player_name or fields.awards or fields.home_pos or fields.pagenum or
+	   fields.no_item or fields.no_rcp or fields.select_sorting or fields.sort_method or
+	   fields.bg_content then
+		return false
+	end
+
+	--print(dump(fields))
+	local data = i3.data[name]
+	if not data then return end
+
+	for f in pairs(fields) do
+		if sub(f, 1, 4) == "tab_" then
+			local tabname = sub(f, 5)
+			i3.set_tab(player, tabname)
+			break
+		elseif sub(f, 1, 5) == "itab_" then
+			data.pagenum = 1
+			data.itab = tonumber(f:sub(-1))
+			sort_by_category(data)
+			break
+		end
+	end
+
+	rcp_fields(player, data, fields)
+
+	local tab = i3.tabs[data.tab]
+
+	if tab and tab.fields then
+		return true, tab.fields(player, data, fields)
+	end
+
+	return true, set_fs(player)
+end)
+
+return inv_fields

src/gui.lua

@@ -1,5 +1,6 @@
 local damage_enabled = i3.settings.damage_enabled
 local hotbar_len = i3.settings.hotbar_len
+local debug_mode = i3.settings.debug_mode
 
 local model_aliases = i3.files.model_alias()
 local PNG, styles, fs_elements, colors = i3.files.styles()
@@ -7,9 +8,9 @@ local PNG, styles, fs_elements, colors = i3.files.styles()
 local sprintf = string.format
 local VoxelArea, VoxelManip = VoxelArea, VoxelManip
 
-IMPORT("clr", "ESC", "check_privs")
 IMPORT("find", "match", "sub", "upper")
 IMPORT("vec_new", "vec_sub", "vec_round")
+IMPORT("clr", "ESC", "msg", "check_privs")
 IMPORT("min", "max", "floor", "ceil", "round")
 IMPORT("reg_items", "reg_tools", "reg_entities")
 IMPORT("get_bag_description", "get_detached_inv")
@@ -234,14 +235,14 @@ local function get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
 	local width = 8
 	local base_height = 4
 	local base_depth = depth == -1
-	local max_depth = -10
+	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 vm = VoxelManip(pos1, pos2)
-	local emin, emax = vm:read_from_map(pos1, pos2)
+	local emin, emax = vm:get_emerged_area()
 	local area = VoxelArea:new{MinEdge = emin, MaxEdge = emax}
 	local data = vm:get_data()
 
@@ -276,25 +277,25 @@ local function get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
 	if cubes < maxc and depth > max_depth then
 		-- if there's not enough map to preview, go deeper
 		depth -= 1
-		get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
+		return get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
-	else
+	end
-		local shift = -0.3 - high
 
-		for i = max_depth, 0 do
+	local shift = -0.3 - high
-			local dth = t[i]
+
-			if dth then
+	for i = max_depth, 0 do
-				dth[0] = #dth
+		local dth = t[i]
-				for j = 1, dth[0] do
+		if dth then
-					local params = dth[j]
+			dth[0] = #dth
-					      params[2] += shift
+			for j = 1, dth[0] do
-					insert(fs, fmt("image[%f,%f;%.1f,%.1f;%s]", unpack(params)))
+				local params = dth[j]
-				end
+				      params[2] += shift
+				insert(fs, fmt("image[%f,%f;%.1f,%.1f;%s]", unpack(params)))
 			end
 		end
-
-		shift += (base_depth and 0.45 or 0.95)
-		fs("image", 2.7, Y + shift, 0.3, 0.3, PNG.flag)
 	end
+
+	shift += (base_depth and 0.45 or 0.95)
+	fs("image", 2.7, Y + shift, 0.3, 0.3, PNG.flag)
 end
 
 local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
@@ -1093,8 +1094,7 @@ local function get_model_fs(fs, data, def, model_alias)
 					hex = "0" .. hex
 				end
 
-				_name = fmt("%s^[multiply:%s", v.name,
+				_name = fmt("%s^[multiply:%s", v.name, fmt("#%s%s", sub(hex, 3), sub(hex, 1, 2)))
-					fmt("#%s%s", sub(hex, 3), sub(hex, 1, 2)))
 			else
 				_name = fmt("%s^[multiply:%s", v.name, v.color)
 			end
@@ -1115,7 +1115,7 @@ local function get_model_fs(fs, data, def, model_alias)
 end
 
 local function get_header(fs, data)
-	local fav = is_fav(data.favs, data.query_item)
+	local fav = is_fav(data)
 	local nfavs = #data.favs
 	local max_favs = i3.settings.max_favs
 	local star_x, star_y, size = data.inv_width + 0.3, data.yoffset + 0.2, 0.4
@@ -1201,7 +1201,7 @@ local function get_export_fs(fs, data, is_recipe, is_usage, max_stacks_rcp, max_
 		fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
 end
 
-local function get_rcp_extra(fs, player, data, panel, is_recipe, is_usage)
+local function get_rcp_extra(fs, data, player, panel, is_recipe, is_usage)
 	fs"container[0,0.075]"
 	local rn = panel.rcp and #panel.rcp
 
@@ -1270,7 +1270,7 @@ local function hide_items(player, data)
 	end
 end
 
-local function get_items_fs(fs, player, data, full_height)
+local function get_items_fs(fs, data, player, full_height)
 	hide_items(player, data)
 
 	local items = data.alt_items or data.items or {}
@@ -1278,6 +1278,8 @@ local function get_items_fs(fs, player, data, full_height)
 	local ipp = rows * lines
 	local size = 0.85
 
+	fs("bg9", data.inv_width + 0.1, 0, 7.9, full_height, PNG.bg_full, 10)
+
 	fs(fmt("box[%f,0.2;4.05,0.6;#bababa25]", data.inv_width + 0.3),
 	   "set_focus[filter]",
 	   fmt("field[%f,0.2;2.95,0.6;filter;;%s]", data.inv_width + 0.35, ESC(data.filter)),
@@ -1312,10 +1314,10 @@ local function get_items_fs(fs, player, data, full_height)
 			local name = _compressed and item:sub(2) or item
 
 			local X = i % rows
-			X -= (X * 0.045) + data.inv_width + 0.28
+			      X -= (X * 0.045) + data.inv_width + 0.28
 
 			local Y = round((i % ipp - X) / rows + 1, 0)
-			Y -= (Y * 0.085) + 0.95
+			      Y -= (Y * 0.085) + 0.95
 
 			insert(fs, fmt("item_image_button", X, Y, size, size, name, item, ""))
 
@@ -1363,43 +1365,23 @@ local function get_favs(fs, data)
 	end
 end
 
-local function get_panels(fs, player, data, full_height)
+local function get_panels(fs, data, player)
-	local _title   = {name = "title", height = 1.4}
+	local title   = {name = "title", height = 1.4, func = get_header}
-	local _favs    = {name = "favs",  height = 2.23}
+	local favs    = {name = "favs", height = 2.23, func = get_favs}
-	local _items   = {name = "items", height = full_height}
+	local recipes = {name = "recipes", rcp = data.recipes, height = 4.045, func = get_rcp_extra}
-	local _recipes = {name = "recipes", rcp = data.recipes, height = 4.045}
+	local usages  = {name = "usages", rcp = data.usages, height = 4.045, func = get_rcp_extra}
-	local _usages  = {name = "usages",  rcp = data.usages,  height = 4.045}
+	local panels  = {title, recipes, usages, favs}
-	local panels
+	data.yoffset  = 0
 
-	if data.query_item then
+	for i, panel in ipairs(panels) do
-		panels = {_title, _recipes, _usages, _favs}
+		if i > 1 then
-	else
+			data.yoffset += panels[i - 1].height + 0.1
-		panels = {_items}
-	end
-
-	for idx = 1, #panels do
-		local panel = panels[idx]
-		data.yoffset = 0
-
-		if idx > 1 then
-			for _idx = idx - 1, 1, -1 do
-				data.yoffset = data.yoffset + panels[_idx].height + 0.1
-			end
 		end
 
 		fs("bg9", data.inv_width + 0.1, data.yoffset, 7.9, panel.height, PNG.bg_full, 10)
 
 		local is_recipe, is_usage = panel.name == "recipes", panel.name == "usages"
-
+		panel.func(fs, data, player, panel, is_recipe, is_usage)
-		if is_recipe or is_usage then
-			get_rcp_extra(fs, player, data, panel, is_recipe, is_usage)
-		elseif panel.name == "items" then
-			get_items_fs(fs, player, data, full_height)
-		elseif panel.name == "title" then
-			get_header(fs, data)
-		elseif panel.name == "favs" then
-			get_favs(fs, data)
-		end
 	end
 end
 
@@ -1452,6 +1434,10 @@ local function get_tabs_fs(fs, player, data, full_height)
 end
 
 local function get_debug_grid(data, fs, full_height)
+	fs"style[hide_debug_grid;noclip=true]"
+	fs("button", -2, full_height - 1, 2, 1, "hide_debug_grid", "Toggle grid")
+	if data.hide_debug_grid then return end
+
 	fs("style_type[label;font_size=8;noclip=true]")
 	local spacing, i = 0.2, 1
 
@@ -1475,7 +1461,7 @@ local function get_debug_grid(data, fs, full_height)
 end
 
 local function make_fs(player, data)
-	--local start = os.clock()
+	local start = debug_mode and core.get_us_time() or nil
 
 	local fs = setmetatable({}, {
 		__call = function(t, ...)
@@ -1493,26 +1479,31 @@ local function make_fs(player, data)
 	data.inv_width = 10.23
 	local full_height = 12
 
-	local tab = i3.tabs[data.tab]
-
 	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("bg9", 0, 0, data.inv_width, full_height, PNG.bg_full, 10)
 
+	local tab = i3.tabs[data.tab]
 	if tab then
 		tab.formspec(player, data, fs)
 	end
 
-	get_panels(fs, player, data, full_height)
+	if data.query_item then
+		get_panels(fs, data, player)
+	else
+		get_items_fs(fs, data, player, full_height)
+	end
 
 	if #i3.tabs > 1 then
 		get_tabs_fs(fs, player, data, full_height)
 	end
 
-	--get_debug_grid(data, fs, full_height)
+	if debug_mode then
-	--print("make_fs()", fmt("%.2f ms", (os.clock() - start) * 1000))
+		get_debug_grid(data, fs, full_height)
-	--print("#fs elements", #fs)
+		msg(data.player_name, fmt("make_fs(): %.2f ms", (core.get_us_time() - start) / 1000))
+		msg(data.player_name, fmt("#fs elements: %u", #fs))
+	end
 
 	return concat(fs)
 end

src/hud.lua

@@ -34,7 +34,7 @@ local function init_hud(player)
 		},
 	}
 
-	if not i3.legacy_inventory then
+	if not i3.settings.legacy_inventory then
 		core.after(0, function()
 			player:hud_set_hotbar_itemcount(i3.settings.hotbar_len)
 			player:hud_set_hotbar_image"i3_hotbar.png"

src/model_aliases.lua

@@ -1,4 +1,4 @@
-local model_alias = {
+return {
 	["boats:boat"] = {name = "boats:boat", drawtype = "entity"},
 	["carts:cart"] = {name = "carts:cart", drawtype = "entity", frames = "0,0"},
 	["default:chest"] = {name = "default:chest_open"},
@@ -9,5 +9,3 @@ local model_alias = {
 	["doors:door_steel"] = {name = "doors:door_steel_a"},
 	["xpanes:door_steel_bar"] = {name = "xpanes:door_steel_bar_a"},
 }
-
-return model_alias

tests/test_custom_recipes.lua

@@ -38,6 +38,24 @@ i3.register_craft({
 	items = {"default:copper_ingot 7, default:tin_ingot, default:steel_ingot 2"},
 })
 
+i3.register_craft {
+	result = "default:tree",
+	items = {
+		"default:wood",
+		"",
+		"default:wood"
+	},
+}
+
+i3.register_craft {
+	result = "default:cobble 16",
+	items = {
+		"default:stone, default:stone",
+		"default:stone,              , default:stone",
+		", default:stone, default:stone",
+	}
+}
+
 i3.register_craft({
 	grid = {
 		"X",
@@ -311,22 +329,3 @@ i3.register_craft({
 	},
 	result = "default:mese 3",
 })
-
-i3.register_craft({
-	grid = {
-		"X  #",
-		" ## ",
-		"X#X#",
-		"#X#X#",
-		"X  X##X#X",
-		" ## ",
-		"#X#X#",
-		"#X#X#",
-		"X  #",
-	},
-	key = {
-		['#'] = "default:wood",
-		['X'] = "default:glass",
-	},
-	result = "default:mese 3",
-})

util/luacheck.lua

@@ -2,7 +2,7 @@ local exec = os.execute
 local fmt, find, sub = string.format, string.find, string.sub
 local var = "[%w%.%[%]\"\'_]"
 
-exec("reset")
+exec "clear"
 
 local function split(str, delim, include_empty, max_splits, sep_is_pattern)
 	delim = delim or ","
@@ -36,6 +36,7 @@ local files = {
 	"common",
 	"compress",
 	"detached_inv",
+	"fields",
 	"groups",
 	"gui",
 	"hud",
@@ -120,10 +121,10 @@ for _, p in ipairs(files) do
 		_file:close()
 	end
 
-	_load("./src/" .. p .. ".lua")
+	_load("../src/" .. p .. ".lua")
 end
 
-exec("luacheck init.lua")
+exec "luacheck ../init.lua"
-exec("luacheck ./src/operators.lua")
+exec "luacheck ../src/operators.lua"
-exec("luacheck ./src/*.l")
+exec "luacheck ../src/*.l"
-exec("rm ./src/*.l")
+exec "rm ../src/*.l"

util/optipng.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Colors with 0 alpha need to be preserved, because opaque leaves ignore alpha.
+# For that purpose, the use of indexed colors is disabled (-nc).
+
+cd ../textures
+find -name '*.png' -print0 | xargs -0 optipng -o7 -zm1-9 -nc -strip all -clobber

util/servers.lua

@@ -0,0 +1,23 @@
+local JSON = require"JSON" -- luarocks install json-lua
+os.execute "clear"
+
+local list = io.popen("curl -s -H 'Accept: text/html' http://servers.minetest.net/list"):read("*a")
+      list = JSON:decode(list).list
+
+local servers = {}
+
+for _, server in ipairs(list) do
+	if server.mods then
+		for _, mod in ipairs(server.mods) do
+			if mod == "i3" then
+				table.insert(servers, server.name)
+			end
+		end
+	end
+end
+
+if #servers > 0 then
+	print(("=> %u/%u servers using [i3]:\n\t• %s"):format(#servers, #list, table.concat(servers, "\n\t• ")))
+else
+	print"No server using [i3]"
+end