Bump version

API.md

@@ -17,9 +17,7 @@ i3.new_tab("stuff", {
 	-- Determine if the tab is visible by a player, `false` or `nil` hide the tab
 	access = function(player, data)
 		local name = player:get_player_name()
-		if name == "singleplayer" then
+		return name == "singleplayer"
-			return false
-		end
 	end,
 
 	formspec = function(player, data, fs)

README.md

@@ -7,7 +7,7 @@
 This mod features a modern, powerful inventory menu with a good user experience.
 **`i3`** provides a rich [**API**](https://github.com/minetest-mods/i3/blob/master/API.md) for mod developers who want to extend it.
 
-This mod requires **Minetest 5.4+**
+This mod requires **Minetest 5.6+**
 
 #### List of features:
    - Crafting Guide (survival mode only)
@@ -43,6 +43,8 @@ To use this mod in the best conditions:
 If the inventory's font size is too big on certain setups (namely Windows 10/11 or 144 DPI display), you should lower the
 value of the setting `display_density_factor` in your `minetest.conf`. Note that the change is applied after restart.
 
+You can also use the font size slider in the inventory, settings window. 
+
 #### Notes
 
 `i3` uses a larger inventory than the usual inventories in Minetest games.
@@ -53,4 +55,4 @@ Report bugs on the [**Bug Tracker**](https://github.com/minetest-mods/i3/issues)
 
 **Video review on YouTube:** https://www.youtube.com/watch?v=Xd14BCdEZ3o
 
-![Preview](https://user-images.githubusercontent.com/7883281/144105848-535b5e4f-a6fc-44d6-add1-e62a45d36f63.png)
+![Preview](https://content.minetest.net/uploads/3abf3755de.png)

init.lua

@@ -13,20 +13,21 @@ 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 _loadfile = dofile(modpath .. "/src/preprocessor.lua")
 
 local function lf(path)
 	return assert(_loadfile(modpath .. path))
 end
 
 i3 = {
+	version = 180,
 	data = core.deserialize(storage:get_string"data") or {},
 
 	settings = {
 		debug_mode = false,
 		max_favs = 6,
 		max_waypoints = 30,
-		min_fs_version = 4,
+		min_fs_version = 6,
 		item_btn_size = 1.1,
 		drop_bag_on_die = true,
 		save_interval = 600, -- Player data save interval (in seconds)
@@ -51,9 +52,9 @@ i3 = {
 	saves = { -- Metadata to save
 		bag = true,
 		home = true,
+		font_size = true,
 		waypoints = true,
 		inv_items = true,
-		drop_items = true,
 		known_recipes = true,
 	},
 
@@ -63,7 +64,7 @@ i3 = {
 		caches = lf"/src/caches.lua",
 		callbacks = lf"/src/callbacks.lua",
 		common = lf"/src/common.lua",
-		compress = lf"/src/compress.lua",
+		compress = lf"/src/compression.lua",
 		detached = lf"/src/detached_inv.lua",
 		fields = lf"/src/fields.lua",
 		groups = lf"/src/groups.lua",
@@ -82,6 +83,7 @@ i3 = {
 
 	tabs = {},
 	cubes = {},
+	groups = {},
 	plants = {},
 	modules = {},
 	craft_types = {},

src/api.lua

@@ -167,6 +167,13 @@ function i3.set_fs(player)
 		sort_inventory(player, data)
 	end
 
+	for i, tab in ipairs(i3.tabs) do
+		if data.tab == i and tab.access and not tab.access(player, data) then
+			data.tab = 1
+			break
+		end
+	end
+
 	local fs = make_fs(player, data)
 	player:set_inventory_formspec(fs)
 end
@@ -221,8 +228,8 @@ function i3.set_tab(player, tabname)
 		return
 	end
 
-	for i, def in ipairs(i3.tabs) do
+	for i, tab in ipairs(i3.tabs) do
-		if def.name == tabname then
+		if tab.name == tabname then
 			data.tab = i
 			return
 		end
@@ -337,7 +344,7 @@ end
 i3.add_sorting_method("alphabetical", {
 	description = S"Sort items by name (A-Z)",
 	func = function(list, data)
-		sorter(list, data.reverse_sorting, 1)
+		sorter(list, data, 1)
 		return list
 	end
 })
@@ -345,7 +352,7 @@ i3.add_sorting_method("alphabetical", {
 i3.add_sorting_method("numerical", {
 	description = S"Sort items by number of items per stack",
 	func = function(list, data)
-		sorter(list, data.reverse_sorting, 2)
+		sorter(list, data, 2)
 		return list
 	end,
 })

src/caches.lua

@@ -1,11 +1,10 @@
-local PNG = i3.files.styles()
 local replacements = {fuel = {}}
 local http = ...
 
 IMPORT("maxn", "copy", "insert", "sort", "match", "sub")
-IMPORT("is_group", "extract_groups", "item_has_groups", "groups_to_items")
+IMPORT("true_str", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
-IMPORT("fmt", "reg_items", "reg_aliases", "reg_nodes", "draw_cube", "ItemStack")
+IMPORT("fmt", "reg_items", "reg_aliases", "reg_nodes", "is_cube", "get_cube", "ItemStack")
-IMPORT("true_str", "true_table", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
+IMPORT("is_group", "extract_groups", "item_has_groups", "groups_to_items", "get_group_stereotype")
 
 local function get_burntime(item)
 	return core.get_craft_result{method = "fuel", items = {item}}.time
@@ -23,10 +22,56 @@ local function cache_fuel(item)
 	end
 end
 
-local function get_item_usages(item, recipe, added)
+local function cache_groups(group, groups)
-	local groups = extract_groups(item)
+	i3.groups[group] = {}
+	i3.groups[group].groups = groups
+	i3.groups[group].items = groups_to_items(groups)
+
+	if #groups == 1 then
+		i3.groups[group].stereotype = get_group_stereotype(groups[1])
+	end
+
+	local items = i3.groups[group].items
+	if #items <= 1 then return end
+
+	local px, lim, c = 64, 10, 0
+	local sprite = "[combine:WxH"
+
+	for _, item in ipairs(items) do
+		local def = reg_items[item]
+		local tiles = def.tiles or def.tile_images
+		local texture = true_str(def.inventory_image) and def.inventory_image --or tiles[1]
+
+		if def.drawtype and is_cube(def.drawtype) then
+			texture = get_cube(tiles)
+		end
+
+		if texture then
+			texture = texture:gsub("%^", "\\^"):gsub(":", "\\:") .. fmt("\\^[resize\\:%ux%u", px, px)
+			sprite = sprite .. fmt(":0,%u=%s", c * px, texture)
+			c++
+			if c == lim then break end
+		end
+	end
+
+	if c > 1 then
+		sprite = sprite:gsub("WxH", px .. "x" .. px * c)
+
+		i3.groups[group].sprite = sprite
+		i3.groups[group].count = c
+	end
+end
+
+local function get_item_usages(item, recipe, added)
+	if is_group(item) then
+		local group = item:sub(7)
+		local group_cache = i3.groups[group]
+		local groups = group_cache and group_cache.groups or extract_groups(item)
+
+		if not group_cache then
+			cache_groups(group, groups)
+		end
 
-	if groups then
 		for name, def in pairs(reg_items) do
 			if not added[name] and valid_item(def) and item_has_groups(def.groups, groups) then
 				local usage = copy(recipe)
@@ -181,7 +226,7 @@ core.register_craft = function(def)
 
 	if is_group(output[1]) then
 		groups = extract_groups(output[1])
-		output = groups_to_items(groups, true)
+		output = groups_to_items(groups)
 	end
 
 	for i = 1, #output do
@@ -242,7 +287,7 @@ local function resolve_aliases(hash)
 			end
 		end
 
-		if newname ~= "" and i3.recipes_cache[oldname] and not hash[newname] then
+		if newname ~= "" and i3.recipes_cache[oldname] and reg_items[newname] and not hash[newname] then
 			insert(i3.init_items, newname)
 		end
 	end
@@ -284,40 +329,20 @@ local function init_recipes()
 	end
 end
 
-local function get_cube(tiles)
-	if not true_table(tiles) then
-		return PNG.blank
-	end
-
-	local top = tiles[1] or PNG.blank
-	if is_table(top) then
-		top = top.name or top.image
-	end
-
-	local left = tiles[3] or top or PNG.blank
-	if is_table(left) then
-		left = left.name or left.image
-	end
-
-	local right = tiles[5] or left or PNG.blank
-	if is_table(right) then
-		right = right.name or right.image
-	end
-
-	return draw_cube(top, left, right)
-end
-
 local function init_cubes()
 	for name, def in pairs(reg_nodes) do
 		if def then
 			local id = core.get_content_id(name)
+			local tiles = def.tiles or def.tile_images
 
-			if def.drawtype == "normal" or def.drawtype == "liquid" or
+			if is_cube(def.drawtype) then
-					sub(def.drawtype, 1, 9) == "glasslike" or
+				i3.cubes[id] = get_cube(tiles)
-					sub(def.drawtype, 1, 8) == "allfaces" then
-				i3.cubes[id] = get_cube(def.tiles)
 			elseif sub(def.drawtype, 1, 9) == "plantlike" or sub(def.drawtype, 1, 8) == "firelike" then
-				i3.plants[id] = def.inventory_image .. "^\\[resize:16x16"
+				local texture = true_str(def.inventory_image) and def.inventory_image or tiles[1]
+
+				if texture then
+					i3.plants[id] = texture
+				end
 			end
 		end
 	end

src/callbacks.lua

@@ -5,7 +5,7 @@ local init_detached = i3.files.detached()
 local init_hud = i3.files.hud()
 local set_fs = i3.set_fs
 
-IMPORT("slz", "min", "copy", "ItemStack")
+IMPORT("slz", "min", "insert", "copy", "ItemStack")
 IMPORT("spawn_item", "reset_data", "get_detached_inv")
 
 core.register_on_player_hpchange(function(player, hpchange)
@@ -134,6 +134,7 @@ local function init_data(player, info)
 	data.player_name     = name
 	data.filter          = ""
 	data.pagenum         = 1
+	data.skin_pagenum    = 1
 	data.items           = i3.init_items
 	data.items_raw       = i3.init_items
 	data.favs            = {}
@@ -148,6 +149,7 @@ local function init_data(player, info)
 	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
 
@@ -175,7 +177,7 @@ local function save_data(player_name)
 	storage:set_string("data", slz(_data))
 end
 
-core.register_on_joinplayer(function(player)
+insert(core.registered_on_joinplayers, 1, function(player)
 	local name = player:get_player_name()
 	local info = core.get_player_information and core.get_player_information(name)
 

src/common.lua

@@ -9,6 +9,14 @@ local fmt, find, match, gmatch, sub, split, lower, upper =
 	string.format, string.find, string.match, string.gmatch,
 	string.sub, string.split, string.lower, string.upper
 
+if not core.registered_privileges.creative then
+	core.register_privilege("creative", {
+		description = "Allow player to use creative inventory",
+		give_to_singleplayer = false,
+		give_to_admin = false,
+	})
+end
+
 local old_is_creative_enabled = core.is_creative_enabled
 
 function core.is_creative_enabled(name)
@@ -69,6 +77,16 @@ local function toupper(str)
 	return str:gsub("%f[%w]%l", upper):gsub("_", " ")
 end
 
+local function utf8_len(str)
+	local c = 0
+
+	for _ in str:gmatch"[%z\1-\127\194-\244][\128-\191]*" do -- Arguably working duct-tape code
+		c++
+	end
+
+	return c
+end
+
 local function get_bag_description(data, stack)
 	local desc = translate(data.lang_code, stack:get_description())
 	      desc = split(desc, "(")[1] or desc
@@ -101,7 +119,7 @@ local function search(data)
 	for i = 1, #data.items_raw do
 		local item = data.items_raw[i]
 		local def = reg_items[item]
-		local desc = lower(translate(data.lang_code, def and def.description)) or ""
+		local desc = lower(translate(data.lang_code, def.description)) or ""
 		local search_in = fmt("%s %s", item, desc)
 		local temp, j, to_add = {}, 1
 
@@ -228,9 +246,7 @@ local function is_group(item)
 end
 
 local function extract_groups(str)
-	if sub(str, 1, 6) == "group:" then
+	return split(sub(str, 7), ",")
-		return split(sub(str, 7), ",")
-	end
 end
 
 local function item_has_groups(item_groups, groups)
@@ -247,30 +263,56 @@ local function valid_item(def)
 		def.description and def.description ~= ""
 end
 
-local function groups_to_items(groups, get_all)
+local function get_group_stereotype(group)
-	if not get_all and #groups == 1 then
+	local stereotype = i3.group_stereotypes[group]
-		local group = groups[1]
+	local def = reg_items[stereotype]
-		local stereotype = i3.group_stereotypes[group]
-		local def = reg_items[stereotype]
 
-		if valid_item(def) then
+	if valid_item(def) then
-			return stereotype
+		return stereotype
-		end
 	end
+end
 
+local function groups_to_items(groups)
 	local names = {}
 
 	for name, def in pairs(reg_items) do
 		if valid_item(def) and item_has_groups(def.groups, groups) then
-			if get_all then
+			insert(names, name)
-				insert(names, name)
-			else
-				return name
-			end
 		end
 	end
 
-	return get_all and names or ""
+	sort(names)
+
+	return names
+end
+
+local function is_cube(drawtype)
+	return drawtype == "normal" or drawtype == "liquid" or
+		sub(drawtype, 1, 9) == "glasslike" or
+		sub(drawtype, 1, 8) == "allfaces"
+end
+
+local function get_cube(tiles)
+	if not true_table(tiles) then
+		return "i3_blank.png"
+	end
+
+	local top = tiles[1] or "i3_blank.png"
+	if is_table(top) then
+		top = top.name or top.image
+	end
+
+	local left = tiles[3] or top or "i3_blank.png"
+	if is_table(left) then
+		left = left.name or left.image
+	end
+
+	local right = tiles[5] or left or "i3_blank.png"
+	if is_table(right) then
+		right = right.name or right.image
+	end
+
+	return core.inventorycube(top, left, right)
 end
 
 local function apply_recipe_filters(recipes, player)
@@ -377,7 +419,8 @@ local function craft_stack(player, data, craft_rcp)
 		if is_group(name) then
 			items = {}
 			local groups = extract_groups(name)
-			local item_groups = groups_to_items(groups, true)
+			local groupname = name:sub(7)
+			local item_groups = i3.groups[groupname].items or groups_to_items(groups)
 			local remaining = count
 
 			for _, item in ipairs(item_groups) do
@@ -439,15 +482,16 @@ local function get_sorting_idx(name)
 	return idx
 end
 
-local function sorter(inv, reverse, mode)
+local function sorter(inv, data, mode)
 	sort(inv, function(a, b)
 		if mode == 1 then
-			a, b = a:get_name(), b:get_name()
+			a = translate(data.lang_code, a:get_short_description())
+			b = translate(data.lang_code, b:get_short_description())
 		else
 			a, b = a:get_count(), b:get_count()
 		end
 
-		if reverse then
+		if data.reverse_sorting then
 			return a > b
 		end
 
@@ -514,32 +558,12 @@ local function compress_items(list, start_i)
 	return new_inv
 end
 
-local function drop_items(player, inv, list, start_i, rej)
-	for i = start_i, #list do
-		local stack = list[i]
-		local name = stack:get_name()
-
-		for _, it in ipairs(rej) do
-			if name == it then
-				spawn_item(player, stack)
-				inv:set_stack("main", i, ItemStack(""))
-			end
-		end
-	end
-
-	return inv:get_list"main"
-end
-
 local function sort_inventory(player, data)
 	local inv = player:get_inventory()
 	local list = inv:get_list"main"
 	local size = inv:get_size"main"
 	local start_i = data.ignore_hotbar and (i3.settings.hotbar_len + 1) or 1
 
-	if true_table(data.drop_items) then
-		list = drop_items(player, inv, list, start_i, data.drop_items)
-	end
-
 	if data.inv_compress then
 		list = compress_items(list, start_i)
 	else
@@ -570,6 +594,7 @@ local function reset_data(data)
 	data.scrbar_rcp    = 1
 	data.scrbar_usg    = 1
 	data.query_item    = nil
+	data.enable_search = nil
 	data.recipes       = nil
 	data.usages        = nil
 	data.export_rcp    = nil
@@ -589,7 +614,7 @@ local function add_hud_waypoint(player, name, pos, color)
 	return player:hud_add {
 		hud_elem_type = "waypoint",
 		name = name,
-		text = " m",
+		text = "m",
 		world_pos = pos,
 		number = color,
 		z_index = -300,
@@ -630,6 +655,7 @@ local _ = {
 	extract_groups = extract_groups,
 	item_has_groups = item_has_groups,
 	groups_to_items = groups_to_items,
+	get_group_stereotype = get_group_stereotype,
 
 	-- Compression
 	compressible = compressible,
@@ -657,6 +683,8 @@ local _ = {
 	msg = msg,
 
 	-- Misc. functions
+	is_cube = is_cube,
+	get_cube = get_cube,
 	ItemStack = ItemStack,
 	valid_item = valid_item,
 	spawn_item = spawn_item,
@@ -709,6 +737,7 @@ local _ = {
 	match = string.match,
 	gmatch = string.gmatch,
 	toupper = toupper,
+	utf8_len = utf8_len,
 
 	-- Table
 	maxn = table.maxn,

src/fields.lua

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

@@ -11,6 +11,7 @@ i3.group_stereotypes = {
 	stone = "default:stone",
 	leaves = "default:leaves",
 	coal = "default:coal_lump",
+	fence = "default:fence_wood",
 	vessel = "vessels:glass_bottle",
 	flower = "flowers:dandelion_yellow",
 	water_bucket = "bucket:bucket_water",
@@ -26,6 +27,7 @@ i3.group_names = {
 	glass = S"Any glass",
 	stick = S"Any stick",
 	stone = S"Any stone",
+	fence = S"Any fence",
 	carpet = S"Any carpet",
 	flower = S"Any flower",
 	leaves = S"Any leaves",

src/preprocessor.lua

@@ -3,6 +3,8 @@
 
 local fmt, split = string.format, string.split
 local var = "[%w%.%[%]\"\'_]"
+local modpath = core.get_modpath"i3"
+local _,_, fs_elements = dofile(modpath .. "/src/styles.lua")
 
 local operators = {
 	["([%+%-%*%^/&|])="] = function(a, b, c)
@@ -43,6 +45,16 @@ local function compile(data)
 		return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
 	end)
 
+	data = data:gsub("([%w_]+)%(", function(a)
+		if fs_elements[a] then
+			return fmt("fs('%s',", a)
+		end
+	end)
+
+	data = data:gsub("([%w_]+)-%-\n", function(a)
+		return fmt("%s = %s - 1", a, a)
+	end)
+
 	for op, func in pairs(operators) do
 		data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
 	end

src/progressive.lua

@@ -32,7 +32,9 @@ local function item_in_inv(item, inv_items)
 	local inv_items_size = #inv_items
 
 	if is_group(item) then
-		local groups = extract_groups(item)
+		local groupname = item:sub(7)
+		local group_cache = i3.groups[groupname]
+		local groups = group_cache and group_cache.groups or extract_groups(item)
 
 		for i = 1, inv_items_size do
 			local def = core.registered_items[inv_items[i]]
@@ -89,6 +91,10 @@ local item_lists = {"main", "craft", "craftpreview"}
 
 local function get_inv_items(player)
 	local inv = player:get_inventory()
+	if not inv then
+		return {}
+	end
+
 	local stacks = {}
 
 	for i = 1, #item_lists do

src/styles.lua

@@ -1,3 +1,5 @@
+local fmt = string.format
+
 local PNG = {
 	blank = "i3_blank.png",
 	bg = "i3_bg.png",
@@ -23,7 +25,7 @@ local PNG = {
 	sign = "i3_sign.png",
 	cancel = "i3_cancel.png",
 	export = "i3_export.png",
-	slot = "i3_slot.png",
+	slot = "i3_slot.png^\\[resize:128x128",
 	tab = "i3_tab.png",
 	tab_small = "i3_tab_small.png",
 	tab_top = "i3_tab.png^\\[transformFY",
@@ -42,6 +44,9 @@ local PNG = {
 	home = "i3_home.png",
 	flag = "i3_flag.png",
 	edit = "i3_edit.png",
+	no_result = "i3_no_result.png",
+	find_more = "i3_find_more.png",
+	search_outline = "i3_search_outline.png",
 
 	cancel_hover = "i3_cancel.png^\\[brighten",
 	search_hover = "i3_search.png^\\[brighten",
@@ -72,19 +77,18 @@ local styles = string.format([[
 	style_type[label,field;font_size=16]
 	style_type[button;border=false;content_offset=0]
 	style_type[image_button,item_image_button,checkbox,dropdown;border=false;sound=i3_click]
-	style_type[item_image_button;bgimg_hovered=%s]
+	style_type[item_image_button;bgimg_middle=9;padding=-9]
+	style_type[item_image_button:hovered;bgimg=%s]
 
+	style[;sound=]
 	style[nofav;sound=i3_cannot]
 	style[pagenum,no_item,no_rcp;font=bold;font_size=18]
+	style[search;fgimg=%s;content_offset=0]
+	style[enable_search:hovered;bgimg=%s]
 	style[exit;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[cancel;fgimg=%s;fgimg_hovered=%s;content_offset=0]
-	style[search;fgimg=%s;fgimg_hovered=%s;content_offset=0]
+	style[prev_page,prev_recipe,prev_usage,prev_sort,prev_skin;fgimg=%s;fgimg_hovered=%s]
-	style[prev_page;fgimg=%s;fgimg_hovered=%s]
+	style[next_page,next_recipe,next_usage,next_sort,next_skin;fgimg=%s;fgimg_hovered=%s]
-	style[next_page;fgimg=%s;fgimg_hovered=%s]
-	style[prev_recipe;fgimg=%s;fgimg_hovered=%s]
-	style[next_recipe;fgimg=%s;fgimg_hovered=%s]
-	style[prev_usage;fgimg=%s;fgimg_hovered=%s]
-	style[next_usage;fgimg=%s;fgimg_hovered=%s]
 	style[waypoint_add;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[bag_rename;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[btn_bag,btn_armor,btn_skins;font=bold;font_size=18;content_offset=0;sound=i3_click]
@@ -97,13 +101,10 @@ local styles = string.format([[
 	style[confirm_trash_yes;sound=i3_trash]
 ]],
 PNG.slot,
+PNG.search_hover,
+PNG.search_outline,
 PNG.exit,     PNG.exit_hover,
 PNG.cancel,   PNG.cancel_hover,
-PNG.search,   PNG.search_hover,
-PNG.prev,     PNG.prev_hover,
-PNG.next,     PNG.next_hover,
-PNG.prev,     PNG.prev_hover,
-PNG.next,     PNG.next_hover,
 PNG.prev,     PNG.prev_hover,
 PNG.next,     PNG.next_hover,
 PNG.add,      PNG.add_hover,
@@ -116,9 +117,10 @@ local fs_elements = {
 	tooltip = "tooltip[%f,%f;%f,%f;%s]",
 	button = "button[%f,%f;%f,%f;%s;%s]",
 	checkbox = "checkbox[%f,%f;%s;%s;%s]",
+	slot = "image[%f,%f;%f,%f;" .. fmt("%s;9]", PNG.slot),
 	item_image = "item_image[%f,%f;%f,%f;%s]",
 	hypertext = "hypertext[%f,%f;%f,%f;%s;%s]",
-	bg9 = "background9[%f,%f;%f,%f;%s;false;%u]",
+	bg9 = "background9[%f,%f;%f,%f;%s;false;12]",
 	scrollbar = "scrollbar[%f,%f;%f,%f;%s;%s;%u]",
 	model = "model[%f,%f;%f,%f;%s;%s;%s;%s;%s;%s;%s]",
 	image_button = "image_button[%f,%f;%f,%f;%s;%s;%s]",

tests/test_tabs.lua

@@ -16,30 +16,18 @@ i3.new_tab("test2", {
 	end,
 })
 
-i3.new_tab("test3", {
+i3.new_tab("test_creative", {
-	description = "Test 3",
+	description = "Test creative",
 
 	access = function(player, data)
 		local name = player:get_player_name()
-		if name == "singleplayer" then
+		return core.is_creative_enabled(name)
-			return true
-		end
 	end,
 
 	formspec = function(player, data, fs)
-		fs("label[3,1;Test 3]")
+		fs("label[3,1;Creative enabled]")
 	end,
 
-	fields = function(player, data, fields)
+	fields = i3.set_fs,
-		i3.set_fs(player, "label[3,2;Test extra_fs]")
-	end,
 })
 
-i3.override_tab("test2", {
-	description = "Test override",
-	image = "i3_mesepick.png",
-
-	formspec = function(player, data, fs)
-		fs("label[3,1;Override!]")
-	end,
-})

util/luacheck.lua

@@ -1,6 +1,7 @@
 local exec = os.execute
 local fmt, find, sub = string.format, string.find, string.sub
 local var = "[%w%.%[%]\"\'_]"
+local _,_, fs_elements = dofile("../src/styles.lua")
 
 exec "clear"
 
@@ -34,7 +35,7 @@ local files = {
 	"caches",
 	"callbacks",
 	"common",
-	"compress",
+	"compression",
 	"detached_inv",
 	"fields",
 	"groups",
@@ -84,6 +85,16 @@ local function compile(data)
 		return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
 	end)
 
+	data = data:gsub("([%w_]+)%(", function(a)
+		if fs_elements[a] then
+			return fmt("fs('%s',", a)
+		end
+	end)
+
+	data = data:gsub("([%w_]+)-%-\n", function(a)
+		return fmt("%s = %s - 1", a, a)
+	end)
+
 	for op, func in pairs(operators) do
 		data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
 	end
@@ -116,7 +127,7 @@ for _, p in ipairs(files) do
 			end
 		end
 
-		local _file = io.open(path:match("(.*)%.") .. ".l", "w")
+		local _file = io.open(path:match("(.*)%.") .. ".lc", "w")
 		_file:write(data)
 		_file:close()
 	end
@@ -125,6 +136,6 @@ for _, p in ipairs(files) do
 end
 
 exec "luacheck ../init.lua"
-exec "luacheck ../src/operators.lua"
+exec "luacheck ../src/preprocessor.lua"
-exec "luacheck ../src/*.l"
+exec "luacheck ../src/*.lc"
-exec "rm ../src/*.l"
+exec "rm ../src/*.lc"