Minor optimization

.github/workflows/luacheck.yml

@@ -1,21 +0,0 @@
-name: Luacheck
-
-on: [push, pull_request]
-
-jobs:
-
-  luacheck:
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup ‘lua’
-      uses: leafo/gh-actions-lua@v8
-      with:
-        luaVersion: 5.1
-    - name: Setup ‘luarocks’
-      uses: leafo/gh-actions-luarocks@v4
-    - name: Setup ‘luacheck’
-      run: luarocks install luacheck
-    - name: Run ‘luacheck’ linter
-      run: luacheck .

.luacheckrc

@@ -1,6 +1,7 @@
 allow_defined_top = true
 
 ignore = {
+	"631", -- Line is too long.
 	"get_debug_grid",
 }
 
@@ -13,6 +14,8 @@ read_globals = {
 	"string",
 	"table",
 	"ItemStack",
+	"VoxelArea",
+	"VoxelManip",
 }
 
 globals = {
@@ -25,6 +28,7 @@ globals = {
 exclude_files = {
 	"tests/test_compression.lua",
 	"tests/test_custom_recipes.lua",
+	"tests/test_operators.lua",
 	"tests/test_tabs.lua",
 
 	".install",

API.md

@@ -301,6 +301,14 @@ A map of all compressed item groups, indexed by stereotypes.
 
 ### Miscellaneous
 
+#### `i3.hud_notif(name, msg[, img])`
+
+Shows a Steam-like HUD notification on the bottom-right corner of the screen (experimental).
+
+- `name` is the player name.
+- `msg` is the HUD message to show.
+- `img` (optional) is the HUD image to show (preferably 16x16 px).
+
 #### `i3.get_recipes(item)`
 
 Returns a table of recipes and usages of `item`.

README.md

@@ -1,6 +1,6 @@
 # i3
 
-[![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://github.com/tterb/atomic-design-ui/blob/master/LICENSEs) ![workflow](https://github.com/minetest-mods/i3/actions/workflows/luacheck.yml/badge.svg) [![GitHub Release](https://img.shields.io/github/release/minetest-mods/i3.svg?style=flat)]() [![ContentDB](https://content.minetest.net/packages/jp/i3/shields/downloads/)](https://content.minetest.net/packages/jp/i3/) [![PayPal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/jpg84240)
+[![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://github.com/tterb/atomic-design-ui/blob/master/LICENSEs) [![GitHub Release](https://img.shields.io/github/release/minetest-mods/i3.svg?style=flat)]() [![ContentDB](https://content.minetest.net/packages/jp/i3/shields/downloads/)](https://content.minetest.net/packages/jp/i3/) [![PayPal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/jpg84240)
 
 #### **`i3`** is a next-generation inventory for Minetest.
 
@@ -14,6 +14,7 @@ This mod requires **Minetest 5.4+**
    - Progressive Mode¹
    - Quick Crafting
    - 3D Player Model Real-Time Preview
+   - Isometric Map Preview
    - Inventory Sorting (+ options: compression, reverse mode, automation, etc.)
    - Item List Compression (**`moreblocks`** is supported)
    - Item Bookmarks
@@ -50,4 +51,6 @@ The `i3`  inventory is 9 slots wide by default, such as Minecraft.
 
 Report bugs on the [**Bug Tracker**](https://github.com/minetest-mods/i3/issues).
 
-![Preview](https://user-images.githubusercontent.com/7883281/142780121-564c1969-b95b-4cc9-99df-9f2362c67e07.png)
+**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)

init.lua

@@ -1,7 +1,8 @@
 local modpath = core.get_modpath"i3"
+local _loadfile = dofile(modpath .. "/src/operators.lua")
 
 local function lf(path)
-	return loadfile(modpath .. path)
+	return _loadfile(modpath .. path)
 end
 
 i3 = {
@@ -12,9 +13,13 @@ i3 = {
 	INV_SIZE = 4*9,
 	HOTBAR_LEN = 9,
 	ITEM_BTN_SIZE = 1.1,
+	DROP_BAG_ON_DIE = true,
 	MIN_FORMSPEC_VERSION = 4,
 	SAVE_INTERVAL = 600, -- Player data save interval (in seconds)
 
+	HUD_TIMER_MAX = 1.5,
+	HUD_SPEED = 1,
+
 	SUBCAT = {
 		"bag",
 		"armor",
@@ -24,9 +29,8 @@ i3 = {
 	},
 
 	META_SAVES = {
+		bag = true,
 		home = true,
-		bag_item = true,
-		bag_size = true,
 		waypoints = true,
 		inv_items = true,
 		drop_items = true,
@@ -38,6 +42,8 @@ i3 = {
 	fuel_cache = {},
 	usages_cache = {},
 	recipes_cache = {},
+	cubes = {},
+	plants = {},
 
 	tabs = {},
 	craft_types = {},
@@ -47,18 +53,26 @@ i3 = {
 	sorting_methods = {},
 
 	files = {
-		api = lf("/src/api.lua"),
+		api = lf"/src/api.lua",
-		bags = lf("/src/bags.lua"),
+		bags = lf"/src/bags.lua",
-		callbacks = lf("/src/callbacks.lua"),
+		caches = lf"/src/caches.lua",
-		common = lf("/src/common.lua"),
+		callbacks = lf"/src/callbacks.lua",
-		compress = lf("/src/compress.lua"),
+		common = lf"/src/common.lua",
-		detached = lf("/src/detached_inv.lua"),
+		compress = lf"/src/compress.lua",
-		groups = lf("/src/groups.lua"),
+		detached = lf"/src/detached_inv.lua",
-		gui = lf("/src/gui.lua"),
+		groups = lf"/src/groups.lua",
-		model_alias = lf("/src/model_aliases.lua"),
+		gui = lf"/src/gui.lua",
-		progressive = lf("/src/progressive.lua"),
+		hud = lf"/src/hud.lua",
-		recipes = lf("/src/recipes.lua"),
+		model_alias = lf"/src/model_aliases.lua",
-		styles = lf("/src/styles.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",
+		}
 	},
 
 	progressive_mode = core.settings:get_bool"i3_progressive_mode",
@@ -72,14 +86,15 @@ i3.files.groups()
 i3.files.callbacks()
 
 local storage = core.get_mod_storage()
-local slz, dslz, copy, str_to_pos, add_hud_waypoint = i3.get("slz", "dslz", "copy", "str_to_pos", "add_hud_waypoint")
+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_inventories = i3.files.detached()
+local init_detached = i3.files.detached()
-local init_recipes = i3.files.recipes()
+local fill_caches = i3.files.caches()
+local init_hud = i3.files.hud()
 
 local function get_lang_code(info)
 	return info and info.lang_code
@@ -168,26 +183,6 @@ local function init_data(player, info)
 	core.after(0, set_fs, player)
 end
 
-local function init_waypoints(player)
-	local name = player:get_player_name()
-	local data = i3.data[name]
-	data.waypoints = data.waypoints or {}
-
-	for _, v in ipairs(data.waypoints) do
-		if not v.hide then
-			local id = add_hud_waypoint(player, v.name, str_to_pos(v.pos), v.color)
-			v.id = id
-		end
-	end
-end
-
-local function init_hudbar(player)
-	core.after(0, function()
-		player:hud_set_hotbar_itemcount(i3.HOTBAR_LEN)
-		player:hud_set_hotbar_image("i3_hotbar.png")
-	end)
-end
-
 local function save_data(player_name)
 	local _data = copy(i3.data)
 
@@ -207,7 +202,7 @@ local function save_data(player_name)
 end
 
 core.register_on_mods_loaded(function()
-	init_recipes()
+	fill_caches()
 	disable_inventories()
 end)
 
@@ -221,9 +216,8 @@ core.register_on_joinplayer(function(player)
 
 	init_data(player, info)
 	init_bags(player)
-	init_inventories(player)
+	init_detached(player)
-	init_waypoints(player)
+	init_hud(player)
-	init_hudbar(player)
 end)
 
 core.register_on_leaveplayer(function(player)
@@ -244,6 +238,7 @@ if i3.progressive_mode then
 	i3.files.progressive()
 end
 
---dofile(modpath .. "/tests/test_tabs.lua")
+--i3.files.tests.tabs()
---dofile(modpath .. "/tests/test_compression.lua")
+--i3.files.tests.operators()
---dofile(modpath .. "/tests/test_custom_recipes.lua")
+--i3.files.tests.compression()
+--i3.files.tests.custom_recipes()

luacheck.lua

@@ -0,0 +1,129 @@
+local exec = os.execute
+local fmt, find, sub = string.format, string.find, string.sub
+local var = "[%w%.%[%]\"\'_]"
+
+exec("reset")
+
+local function split(str, delim, include_empty, max_splits, sep_is_pattern)
+	delim = delim or ","
+	max_splits = max_splits or -2
+	local items = {}
+	local pos, len = 1, #str
+	local plain = not sep_is_pattern
+	max_splits = max_splits + 1
+	repeat
+		local np, npe = find(str, delim, pos, plain)
+		np, npe = (np or (len+1)), (npe or (len+1))
+		if (not np) or (max_splits == 1) then
+			np = len + 1
+			npe = np
+		end
+		local s = sub(str, pos, np - 1)
+		if include_empty or (s ~= "") then
+			max_splits = max_splits - 1
+			items[#items + 1] = s
+		end
+		pos = npe + 1
+	until (max_splits == 0) or (pos > (len + 1))
+	return items
+end
+
+local files = {
+	"api",
+	"bags",
+	"caches",
+	"callbacks",
+	"common",
+	"compress",
+	"detached_inv",
+	"groups",
+	"gui",
+	"hud",
+	"model_aliases",
+	"progressive",
+	"styles",
+}
+
+local operators = {
+	["([%+%-%*%^/&|])="] = function(a, b, c)
+		return fmt("%s = %s %s %s", a, a, b, c)
+	end,
+
+	["+%+"] = function(a, b)
+		return fmt("%s = %s + 1\n%s", a, a, b)
+	end,
+
+	["&"] = function(a, b)
+		return fmt("bit.band(%s, %s)", a, b)
+	end,
+
+	["|"] = function(a, b)
+		return fmt("bit.bor(%s, %s)", a, b)
+	end,
+
+	["<<"] = function(a, b)
+		return fmt("bit.lshift(%s, %s)", a, b)
+	end,
+
+	[">>"] = function(a, b)
+		return fmt("bit.rshift(%s, %s)", a, b)
+	end,
+
+	["<<="] = function(a, b)
+		return fmt("%s = bit.lshift(%s, %s)", a, a, b)
+	end,
+
+	[">>="] = function(a, b)
+		return fmt("%s = bit.rshift(%s, %s)", a, a, b)
+	end,
+}
+
+local function compile(data)
+	data = data:gsub("IMPORT%((.-)%)", function(a)
+		return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
+	end)
+
+	for op, func in pairs(operators) do
+		data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
+	end
+
+	return data
+end
+
+for _, p in ipairs(files) do
+	local function _load(path, line, data, t)
+		if line then
+			if not t then
+				t = split(data, "\n")
+			end
+			t[line] = t[line]:gsub("(" .. var .. "+)%s?=%s?(" .. var .. "*)", "%2")
+			data = table.concat(t, "\n")
+		else
+			local file = assert(io.open(path, "r"))
+			data = file:read"*a"
+			file:close()
+			data = compile(data)
+		end
+
+		local l, err = loadstring(data)
+
+		if not l then
+			local err_line = tonumber(err:match(":(%d+):"))
+
+			if line ~= err_line then
+				return _load(path, err_line, data, t)
+			end
+		end
+
+		local _file = io.open(path:match("(.*)%.") .. ".l", "w")
+		_file:write(data)
+		_file:close()
+	end
+
+	_load("./src/" .. p .. ".lua")
+end
+
+exec("luacheck init.lua")
+exec("luacheck ./src/operators.lua")
+exec("luacheck ./src/*.l")
+exec("rm ./src/*.l")

src/api.lua

@@ -1,11 +1,10 @@
 local make_fs = i3.files.gui()
 
-local gmatch, match, split = i3.get("gmatch", "match", "split")
+IMPORT("gmatch", "split")
-local S, err, fmt, reg_items = i3.get("S", "err", "fmt", "reg_items")
+IMPORT("S", "err", "fmt", "reg_items")
-local sorter, sort_inventory = i3.get("sorter", "sort_inventory")
+IMPORT("sorter", "sort_inventory")
-local sort, concat, copy, insert, remove = i3.get("sort", "concat", "copy", "insert", "remove")
+IMPORT("sort", "concat", "copy", "insert", "remove")
-local true_str, true_table, is_str, is_func, is_table, clean_name =
+IMPORT("true_str", "true_table", "is_str", "is_func", "is_table", "clean_name")
-	i3.get("true_str", "true_table", "is_str", "is_func", "is_table", "clean_name")
 
 function i3.register_craft_type(name, def)
 	if not true_str(name) then
@@ -88,7 +87,7 @@ function i3.register_craft(def)
 		end
 
 		for symbol in gmatch(concat(def.grid), ".") do
-			c = c + 1
+			c++
 			def.items[c] = def.key[symbol]
 		end
 	else
@@ -110,12 +109,12 @@ function i3.register_craft(def)
 		end
 
 		for name in gmatch(concat(items, ","), "[%s%w_:]+") do
-			c = c + 1
+			c++
 			def.items[c] = clean_name(name)
 		end
 	end
 
-	local item = match(def.output, "%S+")
+	local item = ItemStack(def.output):get_name()
 	i3.recipes_cache[item] = i3.recipes_cache[item] or {}
 
 	def.custom = true
@@ -298,6 +297,27 @@ function i3.compress(item, def)
 	end
 end
 
+function i3.hud_notif(name, msg, img)
+	if not true_str(name) then
+		return err "i3.hud_notif: player name missing"
+	elseif not true_str(msg) then
+		return err "i3.hud_notif: message missing"
+	end
+
+	local data = i3.data[name]
+
+	if not data then
+		return err "i3.hud_notif: no player data initialized"
+	end
+
+	data.show_hud = true
+	data.hud_msg = msg
+
+	if img then
+		data.hud_img = fmt("%s^[resize:16x16", img)
+	end
+end
+
 function i3.add_sorting_method(name, def)
 	if not true_str(name) then
 		return err "i3.add_sorting_method: name missing"

src/bags.lua

@@ -1,55 +1,19 @@
 local set_fs = i3.set_fs
-local ItemStack = ItemStack
-local S, ES, fmt, msg, slz, dslz = i3.get("S", "ES", "fmt", "msg", "slz", "dslz")
-local play_sound, create_inventory = i3.get("play_sound", "create_inventory")
 
-local function get_content_inv(name)
+IMPORT("get_bag_description", "ItemStack")
-	return core.get_inventory {
+IMPORT("S", "ES", "fmt", "msg", "slz", "dslz")
-		type = "detached",
+IMPORT("get_group", "play_sound", "get_detached_inv", "create_inventory")
-		name = fmt("i3_bag_content_%s", name)
-	}
-end
 
 local function get_content(content)
 	local t = {}
 
 	for i, v in pairs(content) do
-		local stack = ItemStack(v.name)
+		t[i] = ItemStack(v)
-
-		if v.meta then
-			local m = stack:get_meta()
-			m:from_table(v.meta)
-		end
-
-		if v.wear then
-			stack:set_wear(v.wear)
-		end
-
-		t[i] = stack
 	end
 
 	return t
 end
 
-local function safe_format(stack)
-	local meta = stack:get_meta():to_table()
-	local wear = stack:get_wear()
-	local has_meta = next(meta.fields)
-
-	local info = {}
-	info.name = fmt("%s %u", stack:get_name(), stack:get_count())
-
-	if has_meta then
-		info.meta = meta
-	end
-
-	if wear > 0 then
-		info.wear = wear
-	end
-
-	return info
-end
-
 local function init_bags(player)
 	local name = player:get_player_name()
 	local data = i3.data[name]
@@ -57,7 +21,7 @@ local function init_bags(player)
 	local bag = create_inventory(fmt("i3_bag_%s", name), {
 		allow_put = function(inv, _, _, stack)
 			local empty = inv:is_empty"main"
-			local item_group = core.get_item_group(stack:get_name(), "bag")
+			local item_group = get_group(stack:get_name(), "bag")
 
 			if empty and item_group > 0 and item_group <= 4 then
 				return 1
@@ -73,14 +37,13 @@ local function init_bags(player)
 		end,
 
 		on_put = function(_, _, _, stack)
-			data.bag_item = safe_format(stack)
+			data.bag = stack:to_string()
-			data.bag_size = core.get_item_group(stack:get_name(), "bag")
 
 			local meta = stack:get_meta()
 			local content = dslz(meta:get_string"content")
 
 			if content then
-				local inv = get_content_inv(name)
+				local inv = get_detached_inv("bag_content", name)
 				inv:set_list("main", get_content(content))
 			end
 
@@ -88,10 +51,10 @@ local function init_bags(player)
 		end,
 
 		on_take = function()
-			data.bag_item = nil
+			data.bag = nil
-			data.bag_size = nil
+			data.bag_rename = nil
 
-			local content = get_content_inv(name)
+			local content = get_detached_inv("bag_content", name)
 			content:set_list("main", {})
 
 			set_fs(player)
@@ -100,48 +63,40 @@ local function init_bags(player)
 
 	bag:set_size("main", 1)
 
-	if data.bag_item then
+	if data.bag then
-		bag:set_list("main", get_content{data.bag_item})
+		bag:set_list("main", get_content{data.bag})
 	end
 
 	local function save_content(inv)
 		local bagstack = bag:get_stack("main", 1)
 		local meta = bagstack:get_meta()
+		local desc = get_bag_description(data, bagstack)
 
-		if inv:is_empty("main") then
+		if inv:is_empty"main" then
-			meta:set_string("description", "")
+			meta:set_string("description", desc)
 			meta:set_string("content", "")
 		else
 			local list = inv:get_list"main"
-			local t = {}
+			local t, c = {}, 0
 
 			for i = 1, #list do
 				local stack = list[i]
 
 				if not stack:is_empty() then
-					t[i] = safe_format(stack)
+					c++
+					t[i] = stack:to_string()
 				end
 			end
 
-			local function count_items()
+			local bag_size = get_group(bagstack:get_name(), "bag")
-				local c = 0
+			local percent = fmt("%d", (c * 100) / (bag_size * 4))
 
-				for _ in pairs(t) do
+			meta:set_string("description", ES("@1 (@2% full)", desc, percent))
-					c = c + 1
-				end
-
-				return c
-			end
-
-			local percent = fmt("%.1f", (count_items() * 100) / (data.bag_size * 4))
-
-			meta:set_string("description", "")
-			meta:set_string("description", ES("@1 (@2% full)", bagstack:get_description(), percent))
 			meta:set_string("content", slz(t))
 		end
 
 		bag:set_stack("main", 1, bagstack)
-		data.bag_item = safe_format(bagstack)
+		data.bag = bagstack:to_string()
 
 		set_fs(player)
 	end
@@ -150,11 +105,23 @@ local function init_bags(player)
 		on_move = save_content,
 		on_put = save_content,
 		on_take = save_content,
+
+		allow_put = function(_, _, _, stack)
+			local meta = stack:get_meta()
+			local content = dslz(meta:get_string"content")
+
+			if content then
+				msg(name, "You cannot put a bag in another bag")
+				return 0, play_sound(name, "i3_cannot", 0.8)
+			end
+
+			return stack:get_count()
+		end,
 	}, name)
 
 	bag_content:set_size("main", 4*4)
 
-	if data.bag_item then
+	if data.bag then
 		local meta = bag:get_stack("main", 1):get_meta()
 		local content = dslz(meta:get_string"content")
 

src/caches.lua

@@ -1,13 +1,9 @@
 local replacements = {fuel = {}}
 
-local ItemStack = ItemStack
+IMPORT("maxn", "copy", "insert", "sort", "match", "sub")
-local fmt, reg_items, reg_aliases = i3.get("fmt", "reg_items", "reg_aliases")
+IMPORT("is_group", "extract_groups", "item_has_groups", "groups_to_items")
-local maxn, copy, insert, sort, match = i3.get("maxn", "copy", "insert", "sort", "match")
+IMPORT("fmt", "reg_items", "reg_aliases", "reg_nodes", "draw_cube", "ItemStack")
-
+IMPORT("true_str", "true_table", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
-local is_group, extract_groups, item_has_groups, groups_to_items =
-	i3.get("is_group", "extract_groups", "item_has_groups", "groups_to_items")
-local true_str, is_table, show_item, table_merge, table_replace, rcp_eq =
-	i3.get("true_str", "is_table", "show_item", "table_merge", "table_replace", "rcp_eq")
 
 local function get_burntime(item)
 	return core.get_craft_result{method = "fuel", items = {item}}.time
@@ -30,7 +26,7 @@ local function get_item_usages(item, recipe, added)
 
 	if groups then
 		for name, def in pairs(reg_items) do
-			if not added[name] and show_item(def) and item_has_groups(def.groups, groups) then
+			if not added[name] and valid_item(def) and item_has_groups(def.groups, groups) then
 				local usage = copy(recipe)
 				table_replace(usage.items, item, name)
 
@@ -40,7 +36,7 @@ local function get_item_usages(item, recipe, added)
 				added[name] = true
 			end
 		end
-	elseif show_item(reg_items[item]) then
+	elseif valid_item(reg_items[item]) then
 		i3.usages_cache[item] = i3.usages_cache[item] or {}
 		insert(i3.usages_cache[item], 1, recipe)
 	end
@@ -103,7 +99,7 @@ local function drop_table(name, drop)
 		end
 
 		if not di.rarity then
-			count_sure = count_sure + 1
+			count_sure++
 		end
 	end
 end
@@ -145,7 +141,7 @@ local function cache_recipes(item)
 		end
 
 		for k, v in pairs(replacements[item]) do
-			k = k + shift
+			k += shift
 
 			if _recipes[k] then
 				_recipes[k].replacements = v
@@ -254,7 +250,7 @@ local function init_recipes()
 	local _select, _preselect = {}, {}
 
 	for name, def in pairs(reg_items) do
-		if name ~= "" and show_item(def) then
+		if name ~= "" and valid_item(def) then
 			cache_drops(name, def.drop)
 			cache_fuel(name)
 			cache_recipes(name)
@@ -286,4 +282,50 @@ local function init_recipes()
 	end
 end
 
-return init_recipes
+local function get_cube(tiles)
+	if not true_table(tiles) then
+		return "i3_blank.png"
+	end
+
+	local t = copy(tiles)
+	local texture
+
+	for k, v in pairs(t) do
+		if type(v) == "table" then
+			t[k] = v.name
+		end
+	end
+
+	-- Tiles: up, down, right, left, back, front
+	-- Inventory cube: up, front, right
+	if #t <= 2 then
+		texture = draw_cube(t[1], t[1], t[1])
+	elseif #t <= 5 then
+		texture = draw_cube(t[1], t[3], t[3])
+	else -- Full tileset
+		texture = draw_cube(t[1], t[6], t[3])
+	end
+
+	return texture
+end
+
+local function init_cubes()
+	for name, def in pairs(reg_nodes) do
+		if def then
+			local id = core.get_content_id(name)
+
+			if def.drawtype == "normal" or def.drawtype == "liquid" or
+					sub(def.drawtype, 1, 9) == "glasslike" or
+					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"
+			end
+		end
+	end
+end
+
+return function()
+	init_recipes()
+	init_cubes()
+end

src/callbacks.lua

@@ -1,20 +1,14 @@
 local _, get_inventory_fs = i3.files.gui()
-
 local set_fs = i3.set_fs
-local ItemStack = ItemStack
-local S, clr = i3.get("S", "clr")
-local min, random = i3.get("min", "random")
-local reg_items, reg_aliases = i3.get("reg_items", "reg_aliases")
-local fmt, find, match, sub, lower, split = i3.get("fmt", "find", "match", "sub", "lower", "split")
-local vec_new, vec_eq, vec_round = i3.get("vec_new", "vec_eq", "vec_round")
-local sort, copy, insert, remove, indexof = i3.get("sort", "copy", "insert", "remove", "indexof")
 
-local msg, is_fav, pos_to_str, str_to_pos, add_hud_waypoint, play_sound =
+IMPORT("vec_eq", "vec_round")
-	i3.get("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound")
+IMPORT("reg_items", "reg_aliases")
-local search, get_sorting_idx, sort_inventory, sort_by_category, get_recipes =
+IMPORT("sort", "copy", "insert", "remove", "indexof")
-	i3.get("search", "get_sorting_idx", "sort_inventory", "sort_by_category", "get_recipes")
+IMPORT("S", "min", "random", "translate", "ItemStack")
-local show_item, get_stack, craft_stack, clean_name, compressible, check_privs, safe_teleport =
+IMPORT("fmt", "find", "match", "sub", "lower", "split", "toupper")
-	i3.get("show_item", "get_stack", "craft_stack", "clean_name", "compressible", "check_privs", "safe_teleport")
+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        = ""
@@ -82,14 +76,21 @@ i3.new_tab("inventory", {
 				local waypoint = data.waypoints[id]
 				if not waypoint then return end
 
-				if action == "delete" then
+				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 = vec_new(str_to_pos(waypoint.pos))
+					local pos = str_to_pos(waypoint.pos)
 					safe_teleport(player, pos)
-					msg(name, fmt("Teleported to %s", clr("#ff0", waypoint.name)))
+					msg(name, S("Teleported to: @1", waypoint.name))
 
 				elseif action == "refresh" then
 					local color = random(0xffffff)
@@ -116,6 +117,8 @@ i3.new_tab("inventory", {
 		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
@@ -140,6 +143,9 @@ i3.new_tab("inventory", {
 		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)
 
@@ -147,7 +153,7 @@ i3.new_tab("inventory", {
 			local idx = get_sorting_idx(data.sort)
 			local tot = #i3.sorting_methods
 
-			idx = idx - (fields.prev_sort and 1 or -1)
+			idx -= (fields.prev_sort and 1 or -1)
 
 			if idx > tot then
 				idx = 1
@@ -170,6 +176,28 @@ i3.new_tab("inventory", {
 		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
@@ -200,7 +228,7 @@ i3.new_tab("inventory", {
 				id    = id,
 			})
 
-			data.scrbar_inv = data.scrbar_inv + 1000
+			data.scrbar_inv += 1000
 		end
 
 		return set_fs(player)
@@ -258,9 +286,9 @@ local function select_item(player, data, _f)
 				local i = 1
 
 				for _, v in ipairs(items) do
-					if show_item(reg_items[clean_name(v)]) then
+					if valid_item(reg_items[clean_name(v)]) then
 						insert(data.alt_items, idx + i, v)
-						i = i + 1
+						i++
 					end
 				end
 			end
@@ -268,7 +296,7 @@ local function select_item(player, data, _f)
 	else
 		if sub(item, 1, 1) == "_" then
 			item = sub(item, 2)
-		elseif sub(item, 1, 6) == "group|" then
+		elseif sub(item, 1, 6) == "group!" then
 			item = match(item, "([%w:_]+)$")
 		end
 
@@ -327,7 +355,7 @@ local function rcp_fields(player, data, fields)
 
 	elseif fields.prev_page or fields.next_page then
 		if data.pagemax == 1 then return end
-		data.pagenum = data.pagenum - (fields.prev_page and 1 or -1)
+		data.pagenum -= (fields.prev_page and 1 or -1)
 
 		if data.pagenum > data.pagemax then
 			data.pagenum = 1
@@ -451,6 +479,18 @@ core.register_on_dieplayer(function(player)
 	local data = i3.data[name]
 	if not data then return end
 
+	if i3.DROP_BAG_ON_DIE then
+		local bagstack = ItemStack(data.bag)
+		spawn_item(player, bagstack)
+	end
+
+	data.bag = nil
+	local bag = get_detached_inv("bag", name)
+	local content = get_detached_inv("bag_content", name)
+
+	bag:set_list("main", {})
+	content:set_list("main", {})
+
 	set_fs(player)
 end)
 

src/common.lua

@@ -1,9 +1,12 @@
 local ItemStack = ItemStack
 local loadstring = loadstring
+local translate = core.get_translated_string
+local vec_new, vec_add, vec_mul = vector.new, vector.add, vector.multiply
 local sort, concat, insert = table.sort, table.concat, table.insert
 local min, floor, ceil = math.min, math.floor, math.ceil
-local fmt, find, match, gmatch, sub, split, lower =
+local fmt, find, match, gmatch, sub, split, lower, upper =
-	string.format, string.find, string.match, string.gmatch, string.sub, string.split, string.lower
+	string.format, string.find, string.match, string.gmatch,
+	string.sub, string.split, string.lower, string.upper
 
 local old_is_creative_enabled = core.is_creative_enabled
 
@@ -61,6 +64,18 @@ local function round(num, decimal)
 	return floor(num * mul + 0.5) / mul
 end
 
+local function toupper(str)
+	return str:gsub("%f[%w]%l", upper):gsub("_", " ")
+end
+
+local function get_bag_description(data, stack)
+	local desc = translate(data.lang_code, stack:get_description())
+	      desc = split(desc, "(")[1] or desc
+	      desc = toupper(desc:trim())
+
+	return desc
+end
+
 local function search(data)
 	reset_compression(data)
 
@@ -85,7 +100,7 @@ local function search(data)
 	for i = 1, #data.items_raw do
 		local item = data.items_raw[i]
 		local def = core.registered_items[item]
-		local desc = lower(core.get_translated_string(data.lang_code, def and def.description)) or ""
+		local desc = lower(translate(data.lang_code, def and def.description)) or ""
 		local search_in = fmt("%s %s", item, desc)
 		local temp, j, to_add = {}, 1
 
@@ -101,7 +116,7 @@ local function search(data)
 						temp[item] = true
 					end
 
-					j = j + 1
+					j++
 				end
 			end
 		else
@@ -120,7 +135,7 @@ local function search(data)
 		end
 
 		if to_add then
-			c = c + 1
+			c++
 			filtered_list[c] = item
 		end
 	end
@@ -148,7 +163,7 @@ local function table_merge(t1, t2, hash)
 		local c = #t1
 
 		for i = 1, #t2 do
-			c = c + 1
+			c++
 			t1[c] = t2[i]
 		end
 	end
@@ -174,7 +189,7 @@ local function array_diff(t1, t2)
 	for i = 1, #t1 do
 		local v = t1[i]
 		if hash[v] then
-			c = c + 1
+			c++
 			diff[c] = v
 		end
 	end
@@ -226,7 +241,7 @@ local function item_has_groups(item_groups, groups)
 	return true
 end
 
-local function show_item(def)
+local function valid_item(def)
 	return def and def.groups.not_in_creative_inventory ~= 1 and
 		def.description and def.description ~= ""
 end
@@ -237,7 +252,7 @@ local function groups_to_items(groups, get_all)
 		local stereotype = i3.group_stereotypes[group]
 		local def = core.registered_items[stereotype]
 
-		if show_item(def) then
+		if valid_item(def) then
 			return stereotype
 		end
 	end
@@ -245,7 +260,7 @@ local function groups_to_items(groups, get_all)
 	local names = {}
 
 	for name, def in pairs(core.registered_items) do
-		if show_item(def) and item_has_groups(def.groups, groups) then
+		if valid_item(def) and item_has_groups(def.groups, groups) then
 			if get_all then
 				insert(names, name)
 			else
@@ -319,7 +334,7 @@ local function spawn_item(player, stack)
 	local dir     = player:get_look_dir()
 	local ppos    = player:get_pos()
 	      ppos.y  = ppos.y + player:get_properties().eye_height
-	local look_at = vector.add(ppos, vector.multiply(dir, 1))
+	local look_at = vec_add(ppos, vec_mul(dir, 1))
 
 	core.add_item(look_at, stack)
 end
@@ -375,7 +390,7 @@ local function craft_stack(player, data, craft_rcp)
 				if item == _name and remaining > 0 then
 					local c = min(remaining, _count)
 					items[item] = c
-					remaining = remaining - c
+					remaining -= c
 				end
 
 				if remaining == 0 then break end
@@ -396,7 +411,7 @@ local function craft_stack(player, data, craft_rcp)
 		local c = min(stackmax, leftover)
 		local stack = ItemStack(fmt("%s %s", stackname, c))
 		get_stack(player, stack)
-		leftover = leftover - stackmax
+		leftover -= stackmax
 	end
 end
 
@@ -408,10 +423,13 @@ local function safe_teleport(player, pos)
 	local name = player:get_player_name()
 	play_sound(name, "i3_teleport", 0.8)
 
-	pos.y = pos.y + 0.5
 	local vel = player:get_velocity()
-	player:add_velocity(vector.multiply(vel, -1))
+	player:add_velocity(vec_mul(vel, -1))
-	player:set_pos(pos)
+
+	local p = vec_new(pos)
+	      p.y += 0.25
+
+	player:set_pos(p)
 end
 
 local function get_sorting_idx(name)
@@ -481,7 +499,7 @@ local function compress_items(list, start_i)
 				insert(special, stack)
 			else
 				hash[name] = hash[name] or 0
-				hash[name] = hash[name] + count
+				hash[name] += count
 			end
 		end
 	end
@@ -493,7 +511,7 @@ local function compress_items(list, start_i)
 
 		for _ = 1, iter do
 			insert(new_inv, ItemStack(fmt("%s %u", name, min(stackmax, leftover))))
-			leftover = leftover - stackmax
+			leftover -= stackmax
 		end
 	end
 
@@ -559,6 +577,13 @@ local function add_hud_waypoint(player, name, pos, color)
 	}
 end
 
+local function get_detached_inv(name, player_name)
+	return core.get_inventory {
+		type = "detached",
+		name = fmt("i3_%s_%s", name, player_name)
+	}
+end
+
 local function createunpack(n)
 	local ret = {"local t = ... return "}
 
@@ -612,9 +637,8 @@ local _ = {
 	msg = msg,
 
 	-- Misc. functions
-	get_stack = get_stack,
+	ItemStack = ItemStack,
-	craft_stack = craft_stack,
+	valid_item = valid_item,
-	show_item = show_item,
 	spawn_item = spawn_item,
 	clean_name = clean_name,
 	play_sound = play_sound,
@@ -626,9 +650,19 @@ local _ = {
 	slz = core.serialize,
 	dslz = core.deserialize,
 	ESC = core.formspec_escape,
+	draw_cube = core.inventorycube,
+	get_group = core.get_item_group,
 	pos_to_str = core.pos_to_string,
 	str_to_pos = core.string_to_pos,
 	check_privs = core.check_player_privs,
+	get_player_by_name = core.get_player_by_name,
+	get_connected_players = core.get_connected_players,
+
+	-- Inventory
+	get_stack = get_stack,
+	craft_stack = craft_stack,
+	get_detached_inv = get_detached_inv,
+	get_bag_description = get_bag_description,
 	create_inventory = core.create_detached_inventory,
 
 	-- Registered items
@@ -653,6 +687,7 @@ local _ = {
 	split = string.split,
 	match = string.match,
 	gmatch = string.gmatch,
+	toupper = toupper,
 
 	-- Table
 	maxn = table.maxn,
@@ -680,6 +715,8 @@ local _ = {
 	-- Vectors
 	vec_new = vector.new,
 	vec_add = vector.add,
+	vec_sub = vector.subtract,
+	vec_mul = vector.multiply,
 	vec_round = vector.round,
 	vec_eq = vector.equals,
 }

src/compress.lua

@@ -1,4 +1,4 @@
-local fmt, copy, insert = i3.get("fmt", "copy", "insert")
+IMPORT("fmt", "copy", "insert")
 
 local wood_types = {
 	"acacia_wood", "aspen_wood", "junglewood", "pine_wood",

src/detached_inv.lua

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

src/groups.lua

@@ -1,4 +1,4 @@
-local S = i3.get("S")
+IMPORT("S")
 
 i3.group_stereotypes = {
 	dye = "dye:white",

src/gui.lua

@@ -3,20 +3,20 @@ local damage_enabled = core.settings:get_bool "enable_damage"
 local model_aliases = i3.files.model_alias()
 local PNG, styles, fs_elements, colors = i3.files.styles()
 
-local ItemStack = ItemStack
+local sprintf = string.format
-local S, ES, translate = i3.get("S", "ES", "translate")
+local VoxelArea, VoxelManip = VoxelArea, VoxelManip
-local clr, ESC, check_privs = i3.get("clr", "ESC", "check_privs")
-local min, max, floor, ceil, round = i3.get("min", "max", "floor", "ceil", "round")
-local sprintf, find, match, sub, upper = i3.get("fmt", "find", "match", "sub", "upper")
-local reg_items, reg_tools, reg_entities = i3.get("reg_items", "reg_tools", "reg_entities")
-local maxn, sort, concat, copy, insert, remove, unpack =
-	i3.get("maxn", "sort", "concat", "copy", "insert", "remove", "unpack")
 
-local true_str, is_fav, is_num = i3.get("true_str", "is_fav", "is_num")
+IMPORT("clr", "ESC", "check_privs")
-local groups_to_items, compression_active, compressible =
+IMPORT("find", "match", "sub", "upper")
-	i3.get("groups_to_items", "compression_active", "compressible")
+IMPORT("vec_new", "vec_sub", "vec_round")
-local get_sorting_idx, is_group, extract_groups, item_has_groups =
+IMPORT("min", "max", "floor", "ceil", "round")
-	i3.get("get_sorting_idx", "is_group", "extract_groups", "item_has_groups")
+IMPORT("reg_items", "reg_tools", "reg_entities")
+IMPORT("get_bag_description", "get_detached_inv")
+IMPORT("S", "ES", "translate", "ItemStack", "toupper")
+IMPORT("groups_to_items", "compression_active", "compressible")
+IMPORT("true_str", "is_fav", "is_num", "get_group", "str_to_pos")
+IMPORT("maxn", "sort", "concat", "copy", "insert", "remove", "unpack")
+IMPORT("get_sorting_idx", "is_group", "extract_groups", "item_has_groups")
 
 local function fmt(elem, ...)
 	if not fs_elements[elem] then
@@ -35,10 +35,6 @@ local function weird_desc(str)
 	return not true_str(str) or find(str, "\n") or not find(str, "%u")
 end
 
-local function toupper(str)
-	return str:gsub("%f[%w]%l", upper):gsub("_", " ")
-end
-
 local function snip(str, limit)
 	return #str > limit and fmt("%s...", sub(str, 1, limit - 3)) or str
 end
@@ -71,8 +67,8 @@ local function get_desc(item)
 end
 
 local function get_stack_max(inv, data, is_recipe, rcp)
-	local list = inv:get_list("main")
+	local list = inv:get_list"main"
-	local size = inv:get_size("main")
+	local size = inv:get_size"main"
 	local counts_inv, counts_rcp, counts = {}, {}, {}
 	local rcp_usg = is_recipe and "recipe" or "usage"
 
@@ -128,7 +124,7 @@ end
 local function get_inv_slots(fs)
 	local inv_x, inv_y, size, spacing = 0.22, 6.9, 1, 0.1
 
-	fs("style_type[box;colors=#77777710,#77777710,#777,#777]")
+	fs"style_type[box;colors=#77777710,#77777710,#777,#777]"
 
 	for i = 0, i3.HOTBAR_LEN - 1 do
 		fs("box", i * size + inv_x + (i * spacing), inv_y, size, size, "")
@@ -142,7 +138,7 @@ local function get_inv_slots(fs)
 		i3.HOTBAR_LEN, i3.INV_SIZE / i3.HOTBAR_LEN, i3.HOTBAR_LEN),
 	   "style_type[list;size=1;spacing=0.15]")
 
-	fs("listring[current_player;craft]listring[current_player;main]")
+	fs"listring[current_player;craft]listring[current_player;main]"
 end
 
 local function add_subtitle(fs, name, y, ctn_len, font_size, sep, label)
@@ -155,7 +151,7 @@ local function add_subtitle(fs, name, y, ctn_len, font_size, sep, label)
 end
 
 local function get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlocked, award_list_nb)
-	local percent = fmt("%.1f%%", (awards_unlocked * 100) / award_list_nb):gsub(".0", "")
+	local percent = fmt("%.1f%%", (awards_unlocked * 100) / award_list_nb):gsub("%.0", "")
 
 	add_subtitle(fs, "awards", yextra, ctn_len, 18, false,
 		ES("Achievements: @1 of @2 (@3)", awards_unlocked, award_list_nb, percent))
@@ -208,7 +204,7 @@ local function get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlo
 			insert(fs, "style_type[label;font_size=14]")
 			insert(fs, fmt("label", icon_size + 0.55, y + 0.97, fmt("%u / %u", current, target)))
 
-			y = y - 0.14
+			y -= 0.14
 		end
 
 		local end_title = ESC(_title or title)
@@ -223,6 +219,41 @@ local function get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlo
 	end
 end
 
+local function get_isometric_view(fs, pos, X, Y)
+	pos = vec_round(pos)
+	local width = 8
+
+	local pos1 = vec_new(pos.x - width, pos.y - 1, pos.z - width)
+	local pos2 = vec_new(pos.x + width, pos.y + 3, pos.z + width)
+	core.emerge_area(pos1, pos2)
+
+	local vm = VoxelManip(pos1, pos2)
+	local emin, emax = vm:read_from_map(pos1, pos2)
+	local area = VoxelArea:new{MinEdge = emin, MaxEdge = emax}
+	local data = vm:get_data()
+
+	for idx in area:iterp(pos1, pos2) do
+		local cube = i3.cubes[data[idx]]
+		local plant = i3.plants[data[idx]]
+		local img = cube or plant
+
+		if img then
+			local p = area:position(idx)
+			      p = vec_sub(p, pos)
+
+			local size = 0.25
+			local x = 2 + (size / 2 * (p.z - p.x))
+			local y = 1.15 + (size / 4 * (p.x + p.z - 2 * p.y))
+
+			if plant then
+				size -= 0.05
+			end
+
+			insert(fs, fmt("image[%f,%f;%.1f,%.1f;%s]", x + X, y + Y, size, size, img))
+		end
+	end
+end
+
 local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 	fs(fmt("box[0,%f;4.9,0.6;#bababa25]", yextra + 1.1))
 	fs("label", 0, yextra + 0.85, ES"Waypoint name:")
@@ -236,7 +267,7 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 		local y = yextra + 1.35 + (i - (i * 0.3))
 		local icon_size, yi = 0.35, y + 0.12
 
-		fs("style_type[box;colors=#bababa30,#bababa30,#bababa05,#bababa05]")
+		fs"style_type[box;colors=#bababa30,#bababa30,#bababa05,#bababa05]"
 		fs("box", 0, y, ctn_len, 0.6, "")
 
 		local waypoint_name, lim = v.name, 18
@@ -245,7 +276,7 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 			waypoint_name = snip(waypoint_name, lim)
 		end
 
-		fs("style_type[label;font_size=17]")
+		fs"style_type[label;font_size=17]"
 
 		local hex = fmt("%02x", v.color)
 
@@ -253,10 +284,19 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 			hex = "0" .. hex
 		end
 
+		local teleport_priv = check_privs(player, {teleport = true})
+		local waypoint_preview = data.waypoint_see and data.waypoint_see == i
+
 		fs("label", 0.15, y + 0.33, clr(fmt("#%s", hex), waypoint_name))
-		fs("tooltip", 0, y, ctn_len - 2.5, 0.65,
+
-			fmt("Name: %s\nPosition:%s", clr("#dbeeff", v.name),
+		local tooltip = fmt("Name: %s\nPosition:%s", clr("#dbeeff", v.name),
-				v.pos:sub(2,-2):gsub("(%-*%d*%.?%d+)", clr("#dbeeff", " %1"))))
+				v.pos:sub(2,-2):gsub("(%-*%d*%.?%d+)", clr("#dbeeff", " %1")))
+
+		if teleport_priv then
+			tooltip = fmt("%s\n%s", tooltip, clr("#ff0", ES"[Click to teleport]"))
+		end
+
+		fs("tooltip", 0, y, ctn_len - 2.1, 0.65, tooltip)
 
 		local del = fmt("waypoint_%u_delete", i)
 		fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", del, PNG.trash, PNG.trash_hover))
@@ -268,24 +308,78 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
 		fs("image_button", ctn_len - 1, yi, icon_size, icon_size, "", rfs, "")
 		fs(fmt("tooltip[%s;%s]", rfs, ES"Change color"))
 
+		local see = fmt("waypoint_%u_see", i)
+		fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
+			see, waypoint_preview and PNG.search_hover or PNG.search, PNG.search, PNG.search_hover))
+		fs("image_button", ctn_len - 1.5, yi, icon_size, icon_size, "", see, "")
+		fs(fmt("tooltip[%s;%s]", see, ES"Preview the waypoint area"))
+
 		local vsb = fmt("waypoint_%u_hide", i)
 		fs(fmt("style[%s;fgimg=%s;content_offset=0]", vsb, v.hide and PNG.nonvisible or PNG.visible))
-		fs("image_button", ctn_len - 1.5, yi, icon_size, icon_size, "", vsb, "")
+		fs("image_button", ctn_len - 2, yi, icon_size, icon_size, "", vsb, "")
 		fs(fmt("tooltip[%s;%s]", vsb, v.hide and ES"Show waypoint" or ES"Hide waypoint"))
 
-		if check_privs(player, {teleport = true}) then
+		if teleport_priv then
 			local tp = fmt("waypoint_%u_teleport", i)
-			fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
+			fs("button", 0, y, ctn_len - 2.1, 0.6, tp, "")
-				tp, PNG.teleport, PNG.teleport_hover))
+		end
-			fs("image_button", ctn_len - 2, yi, icon_size, icon_size, "", tp, "")
+
-			fs(fmt("tooltip[%s;%s]", tp, ES"Teleport to waypoint"))
+		if waypoint_preview then
+			fs("image", 0.25, y - 3.5, 5, 4, PNG.bg_content)
+			fs("button", 0.25, y - 3.35, 5, 0.55, "area_preview", v.name)
+			fs("image_button", 4.65, y - 3.25, 0.25, 0.25,
+				PNG.cancel_hover .. "^\\[brighten", "close_preview", "")
+
+			local pos = str_to_pos(data.waypoints[i].pos)
+			get_isometric_view(fs, pos, 0.6, y - 2.5)
+			fs("image", 2.7, y - 1.5, 0.3, 0.3, PNG.flag)
 		end
 	end
 
-	fs("style_type[label;font_size=16]")
+	fs"style_type[label;font_size=16]"
 end
 
-local function get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb)
+local function get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
+	fs(fmt("list[detached:i3_bag_%s;main;0,%f;1,1;]", esc_name, yextra + 0.7))
+	local bag = get_detached_inv("bag", name)
+	if bag:is_empty"main" then return end
+
+	local v = {{1.9, 2, 0.12}, {3.05, 5, 0.06}, {4.2, 10}, {4.75, 10}}
+	local h, m, yy = unpack(v[bag_size])
+
+	local bagstack = bag:get_stack("main", 1)
+	local desc = ESC(get_bag_description(data, bagstack))
+
+	fs("image", 0.5, yextra + 1.85, 0.6, 0.6, PNG.arrow_content)
+	fs(fmt("style[bg_content;bgimg=%s;fgimg=i3_blank.png;bgimg_middle=10,%u;sound=]", PNG.bg_content, m))
+	fs("image_button", 1.1, yextra + 0.5 + (yy or 0), 4.75, h, "", "bg_content", "")
+
+	if not data.bag_rename then
+		fs("hypertext", 1.3, yextra + 0.8, 4.3, 0.6, "content",
+			fmt("<global size=16><center><b>%s</b></center>", desc))
+		fs("image_button", 5.22, yextra + 0.835, 0.25, 0.25, "", "bag_rename", "")
+		fs(fmt("tooltip[%s;%s]", "bag_rename", ES"Rename the bag"))
+	else
+		fs("box", 1.7, yextra + 0.82, 2.6, 0.4, "#707070")
+		fs(fmt("field[1.8,%f;2.5,0.4;bag_newname;;%s]", yextra + 0.82, desc),
+		   "field_close_on_enter[bag_newname;false]")
+		fs("hypertext", 4.4, yextra + 0.88, 0.8, 0.6, "confirm_rename",
+			fmt("<global size=16><tag name=action color=#fff hovercolor=%s>" ..
+				"<center><b><action name=ok>OK</action></b></center>", colors.yellow))
+	end
+
+	local x, size, spacing = 1.45, 0.9, 0.12
+
+	if bag_size == 4 then
+		x, size, spacing = 1.7, 0.8, 0.1
+	end
+
+	fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing))
+	fs(fmt("list[detached:i3_bag_content_%s;main;%f,%f;4,%u;]", esc_name, x, yextra + 1.3, bag_size))
+	fs"style_type[list;size=1;spacing=0.15]"
+end
+
+local function get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb, bag_size)
 	local name = data.player_name
 	local esc_name = ESC(name)
 
@@ -309,7 +403,7 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 				(half == 1 and i == floor(hearts)) and PNG.heart_half or PNG.heart)
 		end
 	else
-		yoffset = yoffset - 0.5
+		yoffset -= 0.5
 	end
 
 	fs(fmt("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45))
@@ -339,45 +433,23 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 	end
 
 	if data.subcat == 1 then
-		fs(fmt("list[detached:i3_bag_%s;main;0,%f;1,1;]", esc_name, yextra + 0.7))
+		get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
-
-		local inv = core.get_inventory{type = "detached", name = fmt("i3_bag_%s", name)}
-
-		if not inv:is_empty"main" then
-			local v = {{1.9, 2, 0.12}, {3.05, 5, 0.06}, {4.2, 10}, {4.75, 10}}
-			local h, m, yy = unpack(v[data.bag_size])
-
-			fs("image", 0.5, yextra + 1.85, 0.6, 0.6, PNG.arrow_content)
-			fs(fmt("style[bg_content;bgimg=%s;fgimg=i3_blank.png;bgimg_middle=10,%u;sound=]",
-				PNG.bg_content, m))
-			fs("image_button", 1.1, yextra + 0.5 + (yy or 0), 4.75, h, "", "bg_content", "")
-			fs("hypertext", 1.3, yextra + 0.8, 4.3, 0.6, "content",
-				fmt("<global size=16><center><b>%s</b></center>", ES"Content"))
-
-			local x, size, spacing = 1.45, 0.9, 0.12
-
-			if data.bag_size == 4 then
-				x, size, spacing = 1.7, 0.8, 0.1
-			end
-
-			fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing))
-			fs(fmt("list[detached:i3_bag_content_%s;main;%f,%f;4,%u;]",
-				esc_name, x, yextra + 1.3, data.bag_size))
-			fs("style_type[list;size=1;spacing=0.15]")
-		end
 
 	elseif data.subcat == 2 then
-		if i3.modules.armor then
+		if not i3.modules.armor then
+			return not_installed "3d_armor"
+		end
+
 		local armor_def = armor.def[name]
 		fs(fmt("list[detached:%s_armor;armor;0,%f;3,2;]", esc_name, yextra + 0.7))
 		fs("label", 3.65, yextra + 1.55, fmt("%s: %s", ES"Level", armor_def.level))
 		fs("label", 3.65, yextra + 2.05, fmt("%s: %s", ES"Heal", armor_def.heal))
-		else
-			not_installed("3d_armor")
-		end
 
 	elseif data.subcat == 3 then
-		if i3.modules.skins then
+		if not i3.modules.skins then
+			return not_installed "skinsdb"
+		end
+
 		local _skins = skins.get_skinlist_for_player(name)
 		local skin_name = skins.get_player_skin(player).name
 		local sks, id = {}, 1
@@ -391,20 +463,16 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
 		end
 
 		sks = concat(sks, ","):gsub(";", "")
-
 		fs("label", 0, yextra + 0.85, fmt("%s:", ES"Select a skin"))
 		fs(fmt("dropdown[0,%f;4,0.6;skins;%s;%u;true]", yextra + 1.1, sks, id))
-		else
-			not_installed("skinsdb")
-		end
 
 	elseif data.subcat == 4 then
-		if i3.modules.awards then
+		if not i3.modules.awards then
+			return not_installed "awards"
+		end
+
 		yextra = yextra + 0.7
 		get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlocked, award_list_nb)
-		else
-			not_installed("awards")
-		end
 
 	elseif data.subcat == 5 then
 		get_waypoint_fs(fs, data, player, yextra, ctn_len)
@@ -413,7 +481,7 @@ end
 
 local function show_popup(fs, data)
 	if data.confirm_trash then
-		fs("style_type[box;colors=#999,#999,#808080,#808080]")
+		fs"style_type[box;colors=#999,#999,#808080,#808080]"
 
 		for _ = 1, 3 do
 			fs("box", 2.97, 10.75, 4.3, 0.5, "")
@@ -424,7 +492,7 @@ local function show_popup(fs, data)
 		fs("image_button", 6.27, 10.75, 1, 0.5, "", "confirm_trash_no", "No")
 
 	elseif data.show_settings then
-		fs("style_type[box;colors=#999,#999,#808080,#808080]")
+		fs"style_type[box;colors=#999,#999,#808080,#808080]"
 
 		for _ = 1, 3 do
 			fs("box", 2.1, 9.25, 6, 2, "")
@@ -441,10 +509,10 @@ local function show_popup(fs, data)
 		local show_misc = data.show_setting == "misc"
 
 		fs(fmt("style[setting_home;textcolor=%s;font=bold;sound=i3_click]",
-			show_home and colors.yellow or "#fff"))
+			show_home and colors.yellow or "#fff"),
-		fs(fmt("style[setting_sorting;textcolor=%s;font=bold;sound=i3_click]",
+		   fmt("style[setting_sorting;textcolor=%s;font=bold;sound=i3_click]",
-			show_sorting and colors.yellow or "#fff"))
+			show_sorting and colors.yellow or "#fff"),
-		fs(fmt("style[setting_misc;textcolor=%s;font=bold;sound=i3_click]",
+		   fmt("style[setting_misc;textcolor=%s;font=bold;sound=i3_click]",
 			show_misc and colors.yellow or "#fff"))
 
 		fs("button", 2.2, 9.25, 1.8, 0.55, "setting_home", "Home")
@@ -457,7 +525,7 @@ local function show_popup(fs, data)
 			if data.home then
 				str = data.home:gsub(",", "  "):sub(2,-2):gsub("%.%d", ""):gsub(
 					"(%-?%d+)", function(a)
-						c = c + 1
+						c++
 						return fmt("<b>%s: <style color=%s font=mono>%s</style></b>",
 							coords[c], colors.black, a)
 					end)
@@ -469,13 +537,13 @@ local function show_popup(fs, data)
 		elseif show_sorting then
 			fs("button", 2.1, 9.7, 6, 0.8, "select_sorting", ES"Select the inventory sorting method:")
 
-			fs(fmt("style[prev_sort;fgimg=%s;fgimg_hovered=%s]", PNG.prev, PNG.prev_hover))
+			fs(fmt("style[prev_sort;fgimg=%s;fgimg_hovered=%s]", PNG.prev, PNG.prev_hover),
-			fs(fmt("style[next_sort;fgimg=%s;fgimg_hovered=%s]", PNG.next, PNG.next_hover))
+			   fmt("style[next_sort;fgimg=%s;fgimg_hovered=%s]", PNG.next, PNG.next_hover))
 
 			fs("image_button", 2.2, 10.6, 0.35, 0.35, "",  "prev_sort", "")
 			fs("image_button", 7.65, 10.6, 0.35, 0.35, "", "next_sort", "")
 
-			fs("style[sort_method;font=bold;font_size=20]")
+			fs"style[sort_method;font=bold;font_size=20]"
 			fs("button", 2.55, 10.36, 5.1, 0.8, "sort_method", toupper(data.sort))
 
 			local idx = get_sorting_idx(data.sort)
@@ -495,10 +563,10 @@ local function show_popup(fs, data)
 				fs("box", 5.4, 10.68, 2.4, 0.45, "#707070")
 			end
 
-			fs("style[drop_items;font_size=15;font=mono;textcolor=#dbeeff]")
+			fs("style[drop_items;font_size=15;font=mono;textcolor=#dbeeff]",
-			fs(fmt("field[5.4,10.68;2.4,0.45;drop_items;Drop items:;%s]",
+			   fmt("field[5.4,10.68;2.4,0.45;drop_items;Drop items:;%s]",
-				ESC(concat(data.drop_items or {}, ","))))
+				ESC(concat(data.drop_items or {}, ","))),
-			fs("field_close_on_enter[drop_items;false]")
+			   "field_close_on_enter[drop_items;false]")
 
 			fs(fmt("tooltip[cb_inv_compress;%s;#707070;#fff]",
 				ES"Enable this option to compress your inventory"),
@@ -516,7 +584,7 @@ local function show_popup(fs, data)
 end
 
 local function get_inventory_fs(player, data, fs)
-	fs("listcolors[#bababa50;#bababa99]")
+	fs"listcolors[#bababa50;#bababa99]"
 
 	get_inv_slots(fs)
 
@@ -545,16 +613,17 @@ local function get_inventory_fs(player, data, fs)
 
 	local awards_unlocked, award_list, award_list_nb = 0
 	local max_val = damage_enabled and 12 or 7
+	local bag_size = get_group(ItemStack(data.bag):get_name(), "bag")
 
-	if data.subcat == 1 and data.bag_size then
+	if data.subcat == 1 and bag_size > 0 then
-		max_val = max_val + min(32, 6 + ((data.bag_size - 1) * 10))
+		max_val += min(32, 6 + ((bag_size - 1) * 10))
 
 	elseif i3.modules.armor and data.subcat == 2 then
 		if data.scrbar_inv >= max_val then
-			data.scrbar_inv = data.scrbar_inv + 10
+			data.scrbar_inv += 10
 		end
 
-		max_val = max_val + 10
+		max_val += 10
 
 	elseif i3.modules.awards and data.subcat == 4 then
 		award_list = awards.get_award_states(data.player_name)
@@ -564,31 +633,31 @@ local function get_inventory_fs(player, data, fs)
 			local award = award_list[i]
 
 			if award.unlocked then
-				awards_unlocked = awards_unlocked + 1
+				awards_unlocked++
 			end
 		end
 
-		max_val = max_val + (award_list_nb * 13)
+		max_val += (award_list_nb * 13)
 
 	elseif data.subcat == 5 then
 		local wp_nb = #data.waypoints
 
 		if wp_nb > 0 then
 			local mul = (wp_nb > 8 and 7) or (wp_nb > 4 and 6) or 5
-			max_val = max_val + 11 + (wp_nb * mul)
+			max_val += 11 + (wp_nb * mul)
 		end
 	end
 
 	fs(fmt([[
-		scrollbaroptions[arrows=hide;thumbsize=%u;max=%u]
+		scrollbaroptions[arrows=hide;thumbsize=%d;max=%d]
 		scrollbar[%f,0.2;0.2,%f;vertical;scrbar_inv;%u]
 		scrollbaroptions[arrows=default;thumbsize=0;max=1000]
 	]],
 	(max_val * 4) / 12, max_val, 9.8, ctn_hgt, data.scrbar_inv))
 
 	fs(fmt("scroll_container[3.9,0.2;%f,%f;scrbar_inv;vertical]", ctn_len, ctn_hgt))
-		get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb)
+	get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb, bag_size)
-	fs("scroll_container_end[]")
+	fs"scroll_container_end[]"
 
 	local btn = {
 		{"trash",    ES"Clear inventory"},
@@ -643,7 +712,7 @@ local function get_tooltip(item, info, pos)
 
 	if info.replace then
 		for i = 1, #info.replace.items do
-			local rpl = match(info.replace.items[i], "%S+")
+			local rpl = ItemStack(info.replace.items[i]):get_name()
 			local desc = clr("#ff0", get_desc(rpl))
 
 			if info.replace.type == "cooking" then
@@ -676,8 +745,7 @@ local function get_tooltip(item, info, pos)
 
 			tooltip = add(S("Only drop if using one of these tools: @1", sub(names, 1, -2)))
 		else
-			tooltip = add(S("Only drop if using this tool: @1",
+			tooltip = add(S("Only drop if using this tool: @1", clr("#ff0", get_desc(info.tools[1]))))
-				clr("#ff0", get_desc(info.tools[1]))))
 		end
 	end
 
@@ -737,15 +805,11 @@ local function get_output_fs(fs, data, rcp, is_recipe, shapeless, right, btn_siz
 		local rcp_usg = is_recipe and "rcp" or "usg"
 
 		fs(fmt("style_type[list;size=%f]", i3.ITEM_BTN_SIZE))
-		fs("listcolors[#bababa50;#bababa99]")
+		fs"listcolors[#bababa50;#bababa99]"
 		fs(fmt("list[detached:i3_output_%s_%s;main;%f,%f;1,1;]", rcp_usg, data.player_name, X + 0.11, Y))
 		fs("button",  X + 0.11, Y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE, _name, "")
 
-		local inv = core.get_inventory {
+		local inv = get_detached_inv(fmt("output_%s", rcp_usg), data.player_name)
-			type = "detached",
-			name = fmt("i3_output_%s_%s", rcp_usg, data.player_name)
-		}
-
 		inv:set_stack("main", 1, item)
 		pos = {x = X + 0.11, y = Y}
 	else
@@ -798,7 +862,7 @@ local function get_grid_fs(fs, data, rcp, is_recipe)
 	local large_recipe = width > 3 or rows > 3
 
 	if large_recipe then
-		fs("style_type[item_image_button;border=true]")
+		fs"style_type[item_image_button;border=true]"
 	end
 
 	for i = 1, width * rows do
@@ -831,10 +895,10 @@ local function get_grid_fs(fs, data, rcp, is_recipe)
 			Y = btn_size * yi + data.yoffset + 0.2 + (yi * 0.05) + add_y
 		else
 			X = ceil((i - 1) % width - width)
-			X = X + (X * 0.2) + data.inv_width + 3.9
+			X += (X * 0.2) + data.inv_width + 3.9
 
 			Y = ceil(i / width) - min(2, rows)
-			Y = Y + (Y * 0.15) + data.yoffset + 1.4
+			Y += (Y * 0.15) + data.yoffset + 1.4
 		end
 
 		if X > right then
@@ -876,7 +940,7 @@ local function get_grid_fs(fs, data, rcp, is_recipe)
 			fs("image", X, Y, btn_size, btn_size, PNG.slot)
 		end
 
-		local btn_name = groups and fmt("group|%s|%s", groups[1], name) or name
+		local btn_name = groups and fmt("group!%s!%s", groups[1], name) or name
 
 		fs("item_image_button", X, Y, btn_size, btn_size,
 			fmt("%s %u", name, count * (is_recipe and data.scrbar_rcp or data.scrbar_usg or 1)),
@@ -1034,11 +1098,11 @@ local function get_header(fs, data)
 		tech_name = snip(tech_name, name_lim)
 	end
 
-	fs("style_type[label;font=bold;font_size=20]")
+	fs"style_type[label;font=bold;font_size=20]"
 	fs("label", X, Y1, desc)
-	fs("style_type[label;font=mono;font_size=16]")
+	fs"style_type[label;font=mono;font_size=16]"
 	fs("label", X, Y2, clr(colors.blue, tech_name))
-	fs("style_type[label;font=normal;font_size=16]")
+	fs"style_type[label;font=normal;font_size=16]"
 
 	local def = reg_items[data.query_item]
 	local model_alias = model_aliases[data.query_item]
@@ -1077,12 +1141,12 @@ local function get_export_fs(fs, data, is_recipe, is_usage, max_stacks_rcp, max_
 	fs(fmt("style[scrbar_%s;noclip=true]", name),
 	   fmt("scrollbaroptions[min=1;max=%u;smallstep=1]", craft_max))
 	fs("scrollbar", data.inv_width + 8.1, data.yoffset, 3, 0.35, "horizontal", fmt("scrbar_%s", name), stack_fs)
-	fs("button", data.inv_width + 8.1, data.yoffset + 0.4, 3, 0.7, fmt("craft_%s", name),
+	fs("button", data.inv_width + 8.1, data.yoffset + 0.4, 3, 0.7,
-		ES("Craft (×@1)", stack_fs))
+		fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
 end
 
 local function get_rcp_extra(player, fs, data, panel, is_recipe, is_usage)
-	fs("container[0,0.075]")
+	fs"container[0,0.075]"
 	local rn = panel.rcp and #panel.rcp
 
 	if rn then
@@ -1117,7 +1181,7 @@ local function get_rcp_extra(player, fs, data, panel, is_recipe, is_usage)
 		fs("button", data.inv_width + 0.1, data.yoffset + (panel.height / 2) - 0.5, 7.8, 1, "no_rcp", lbl)
 	end
 
-	fs("container_end[]")
+	fs"container_end[]"
 end
 
 local function get_items_fs(fs, data, full_height)
@@ -1173,10 +1237,10 @@ local function get_items_fs(fs, data, full_height)
 			local name = _compressed and item:sub(2) or item
 
 			local X = i % rows
-			      X = 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 - (Y * 0.085) + 0.95
+			Y -= (Y * 0.085) + 0.95
 
 			insert(fs, fmt("item_image_button", X, Y, size, size, name, item, ""))
 
@@ -1184,9 +1248,9 @@ local function get_items_fs(fs, data, full_height)
 				local expand = data.expand == name
 
 				fs(fmt("tooltip[%s;%s]", item, expand and ES"Click to hide" or ES"Click to expand"))
-				fs("style_type[label;font=bold;font_size=20]")
+				fs"style_type[label;font=bold;font_size=20]"
 				fs("label", X + 0.65, Y + 0.7, expand and "-" or "+")
-				fs("style_type[label;font=normal;font_size=16]")
+				fs"style_type[label;font=normal;font_size=16]"
 			end
 		end
 	end
@@ -1201,7 +1265,7 @@ local function get_items_fs(fs, data, full_height)
 		selected and PNG.tab_small_hover or PNG.tab_small,
 		PNG.tab_small_hover, selected and "#fff" or "#ddd"))
 
-		fs("style_type[image_button:hovered;textcolor=#fff]")
+		fs"style_type[image_button:hovered;textcolor=#fff]"
 		fs("image_button", (data.inv_width - 0.65) + (i * (tab_len + 0.1)),
 			full_height, tab_len, tab_hgh, "", fmt("itab_%u", i), title)
 	end
@@ -1297,7 +1361,7 @@ local function get_tabs_fs(player, data, fs, full_height)
 		local X = (data.inv_width / 2) + (c * (tab_len + 0.1)) - ((tab_len + 0.05) * (shift / 2))
 		local Y = btm and full_height or -tab_hgh
 
-		fs("style_type[image_button:hovered;textcolor=#fff]")
+		fs"style_type[image_button:hovered;textcolor=#fff]"
 		fs("image_button", X, Y, tab_len, tab_hgh, "", fmt("tab_%s", def.name), ESC(def.description))
 
 		if true_str(def.image) then
@@ -1307,7 +1371,7 @@ local function get_tabs_fs(player, data, fs, full_height)
 				Y + 0.05, 0.35, 0.35, fmt("%s^\\[resize:16x16", def.image))
 		end
 
-		c = c + 1
+		c++
 	end
 end
 
@@ -1318,7 +1382,7 @@ local function get_debug_grid(data, fs, full_height)
 	for x = 0, data.inv_width + 8, spacing do
 		fs("box", x, 0, 0.01, full_height, "#ff0")
 		fs("label", x, full_height + 0.1, tostring(i))
-		i = i + 1
+		i++
 	end
 
 	i = 61
@@ -1326,12 +1390,12 @@ local function get_debug_grid(data, fs, full_height)
 	for y = 0, full_height, spacing do
 		fs("box", 0, y, data.inv_width + 8, 0.01, "#ff0")
 		fs("label", -0.15, y, tostring(i))
-		i = i - 1
+		i -= 1
 	end
 
 	fs("box", data.inv_width / 2, 0, 0.01, full_height, "#f00")
 	fs("box", 0, full_height / 2, data.inv_width, 0.01, "#f00")
-	fs("style_type[label;font_size=16]")
+	fs"style_type[label;font_size=16]"
 end
 
 local function make_fs(player, data)

src/hud.lua

@@ -0,0 +1,123 @@
+IMPORT("get_connected_players", "str_to_pos", "add_hud_waypoint")
+
+local function init_hud(player)
+	local name = player:get_player_name()
+	local data = i3.data[name]
+
+	data.hud = {
+		bg = player:hud_add {
+			hud_elem_type = "image",
+			position      = {x = 0.78, y = 1},
+			alignment     = {x = 1,    y = 1},
+			scale         = {x = 370,  y = 112},
+			text          = "i3_bg.png",
+			z_index       = 0xDEAD,
+		},
+
+		img = player:hud_add {
+			hud_elem_type = "image",
+			position      = {x = 0.79, y = 1.02},
+			alignment     = {x = 1,    y = 1},
+			scale         = {x = 4,    y = 4},
+			text          = "",
+			z_index       = 0xDEAD,
+		},
+
+		text = player:hud_add {
+			hud_elem_type = "text",
+			position      = {x = 0.84, y = 1.04},
+			alignment     = {x = 1,    y = 1},
+			number        = 0xffffff,
+			text          = "",
+			z_index       = 0xDEAD,
+			style         = 1,
+		},
+	}
+
+	core.after(0, function()
+		player:hud_set_hotbar_itemcount(i3.HOTBAR_LEN)
+		player:hud_set_hotbar_image"i3_hotbar.png"
+	end)
+end
+
+local function show_hud(player, data)
+	-- It would better to have an engine function `hud_move` to only need
+	-- 2 calls for the notification's back and forth.
+
+	local hud_info_bg = player:hud_get(data.hud.bg)
+	local dt = 0.016
+
+	if hud_info_bg.position.y <= 0.9 then
+		data.show_hud = false
+		data.hud_timer = (data.hud_timer or 0) + dt
+	end
+
+	player:hud_change(data.hud.text, "text", data.hud_msg)
+
+	if data.hud_img then
+		player:hud_change(data.hud.img, "text", data.hud_img)
+	end
+
+	if data.show_hud then
+		for _, def in pairs(data.hud) do
+			local hud_info = player:hud_get(def)
+
+			player:hud_change(def, "position", {
+				x = hud_info.position.x,
+				y = hud_info.position.y - ((dt / 5) * i3.HUD_SPEED)
+			})
+		end
+
+	elseif data.show_hud == false then
+		if data.hud_timer >= i3.HUD_TIMER_MAX then
+			for _, def in pairs(data.hud) do
+				local hud_info = player:hud_get(def)
+
+				player:hud_change(def, "position", {
+					x = hud_info.position.x,
+					y = hud_info.position.y + ((dt / 5) * i3.HUD_SPEED)
+				})
+			end
+
+			if hud_info_bg.position.y >= 1 then
+				data.show_hud = nil
+				data.hud_timer = nil
+				data.hud_msg = nil
+				data.hud_img = nil
+			end
+		end
+	end
+end
+
+core.register_globalstep(function()
+	local players = get_connected_players()
+	players[0] = #players
+
+	for i = 1, players[0] do
+		local player = players[i]
+		local name = player:get_player_name()
+		local data = i3.data[name]
+
+		if data and data.show_hud ~= nil then
+			show_hud(player, data)
+		end
+	end
+end)
+
+local function init_waypoints(player)
+	local name = player:get_player_name()
+	local data = i3.data[name]
+	data.waypoints = data.waypoints or {}
+
+	for _, v in ipairs(data.waypoints) do
+		if not v.hide then
+			local id = add_hud_waypoint(player, v.name, str_to_pos(v.pos), v.color)
+			v.id = id
+		end
+	end
+end
+
+return function(player)
+	init_hud(player)
+	init_waypoints(player)
+end

src/operators.lua

@@ -0,0 +1,82 @@
+--[[    All source files have to be preprocessed before loading.
+	This allows implementing custom operators like bitwise ones.	]]
+
+local fmt, split = string.format, string.split
+local var = "[%w%.%[%]\"\'_]"
+
+local operators = {
+	["([%+%-%*%^/&|])="] = function(a, b, c)
+		return fmt("%s = %s %s %s", a, a, b, c)
+	end,
+
+	["+%+"] = function(a, b)
+		return fmt("%s = %s + 1\n%s", a, a, b)
+	end,
+
+	["&"] = function(a, b)
+		return fmt("bit.band(%s, %s)", a, b)
+	end,
+
+	["|"] = function(a, b)
+		return fmt("bit.bor(%s, %s)", a, b)
+	end,
+
+	["<<"] = function(a, b)
+		return fmt("bit.lshift(%s, %s)", a, b)
+	end,
+
+	[">>"] = function(a, b)
+		return fmt("bit.rshift(%s, %s)", a, b)
+	end,
+
+	["<<="] = function(a, b)
+		return fmt("%s = bit.lshift(%s, %s)", a, a, b)
+	end,
+
+	[">>="] = function(a, b)
+		return fmt("%s = bit.rshift(%s, %s)", a, a, b)
+	end,
+}
+
+local function compile(data)
+	data = data:gsub("IMPORT%((.-)%)", function(a)
+		return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
+	end)
+
+	for op, func in pairs(operators) do
+		data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
+	end
+
+	return data
+end
+
+local function _load(path, line, data, t)
+	if line then
+		if not t then
+			t = split(data, "\n")
+		end
+		t[line] = t[line]:gsub("(" .. var .. "+)%s?=%s?(" .. var .. "*)", "%2")
+		data = table.concat(t, "\n")
+	else
+		local file = assert(io.open(path, "r"))
+		data = file:read"*a"
+		file:close()
+		data = compile(data)
+	end
+
+	local l, err = loadstring(data)
+
+	if not l then
+		local err_line = tonumber(err:match(":(%d+):"))
+
+		if line ~= err_line then
+			return _load(path, err_line, data, t)
+		end
+	end
+
+	return l, err
+end
+
+return function(path)
+	return _load(path) or loadfile(path)
+end

src/progressive.lua

@@ -1,13 +1,9 @@
-local singleplayer = core.is_singleplayer()
-
 local set_fs = i3.set_fs
-local fmt, search, table_merge, array_diff =
+local hud_notif = i3.hud_notif
-	i3.get("fmt", "search", "table_merge", "array_diff")
-local is_group, extract_groups, item_has_groups, apply_recipe_filters =
-	i3.get("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters")
-
 local POLL_FREQ = 0.25
-local HUD_TIMER_MAX = 1.5
+
+IMPORT("fmt", "search", "table_merge", "array_diff")
+IMPORT("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters")
 
 local function get_filtered_items(player, data)
 	local items, known, c = {}, 0, 0
@@ -21,18 +17,13 @@ local function get_filtered_items(player, data)
 		usages = #apply_recipe_filters(usages or {}, player)
 
 		if recipes > 0 or usages > 0 then
-			c = c + 1
+			c++
 			items[c] = item
-
+			known += recipes + usages
-			if data then
-				known = known + recipes + usages
-			end
 		end
 	end
 
-	if data then
 	data.known_recipes = known
-	end
 
 	return items
 end
@@ -86,7 +77,7 @@ local function progressive_filter(recipes, player)
 	for i = 1, #recipes do
 		local recipe = recipes[i]
 		if recipe_in_inv(recipe, data.inv_items) then
-			c = c + 1
+			c++
 			filtered[c] = recipe
 		end
 	end
@@ -113,7 +104,7 @@ local function get_inv_items(player)
 		if not stack:is_empty() then
 			local name = stack:get_name()
 			if core.registered_items[name] then
-				c = c + 1
+				c++
 				inv_items[c] = name
 			end
 		end
@@ -122,104 +113,21 @@ local function get_inv_items(player)
 	return inv_items
 end
 
-local function init_hud(player, data)
-	data.hud = {
-		bg = player:hud_add {
-			hud_elem_type = "image",
-			position      = {x = 0.78, y = 1},
-			alignment     = {x = 1,    y = 1},
-			scale         = {x = 370,  y = 112},
-			text          = "i3_bg.png",
-			z_index       = 0xDEAD,
-		},
-
-		book = player:hud_add {
-			hud_elem_type = "image",
-			position      = {x = 0.79, y = 1.02},
-			alignment     = {x = 1,    y = 1},
-			scale         = {x = 4,    y = 4},
-			text          = "i3_book.png",
-			z_index       = 0xDEAD,
-		},
-
-		text = player:hud_add {
-			hud_elem_type = "text",
-			position      = {x = 0.84, y = 1.04},
-			alignment     = {x = 1,    y = 1},
-			number        = 0xffffff,
-			text          = "",
-			z_index       = 0xDEAD,
-			style         = 1,
-		},
-	}
-end
-
-local function show_hud_success(player, data)
-	-- It'd better to have an engine function `hud_move` to only need
-	-- 2 calls for the notification's back and forth.
-
-	local hud_info_bg = player:hud_get(data.hud.bg)
-	local dt = 0.016
-
-	if hud_info_bg.position.y <= 0.9 then
-		data.show_hud = false
-		data.hud_timer = (data.hud_timer or 0) + dt
-	end
-
-	if data.show_hud then
-		for _, def in pairs(data.hud) do
-			local hud_info = player:hud_get(def)
-
-			player:hud_change(def, "position", {
-				x = hud_info.position.x,
-				y = hud_info.position.y - (dt / 5)
-			})
-		end
-
-		player:hud_change(data.hud.text, "text",
-			fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or ""))
-
-	elseif data.show_hud == false then
-		if data.hud_timer >= HUD_TIMER_MAX then
-			for _, def in pairs(data.hud) do
-				local hud_info = player:hud_get(def)
-
-				player:hud_change(def, "position", {
-					x = hud_info.position.x,
-					y = hud_info.position.y + (dt / 5)
-				})
-			end
-
-			if hud_info_bg.position.y >= 1 then
-				data.show_hud = nil
-				data.hud_timer = nil
-			end
-		end
-	end
-end
-
 -- Workaround. Need an engine call to detect when the contents of
 -- the player inventory changed, instead.
-local function poll_new_items()
+local function poll_new_items(player, data, join)
-	local players = core.get_connected_players()
-
-	for i = 1, #players do
-		local player = players[i]
-		local name = player:get_player_name()
-		local data = i3.data[name]
-		if not data then return end
-
 	local inv_items = get_inv_items(player)
 	local diff = array_diff(inv_items, data.inv_items)
 
-		if #diff > 0 then
+	if join or #diff > 0 then
 		data.inv_items = table_merge(diff, data.inv_items)
 		local oldknown = data.known_recipes or 0
 		local items = get_filtered_items(player, data)
 		data.discovered = data.known_recipes - oldknown
 
-			if data.show_hud == nil and data.discovered > 0 then
+		if data.discovered > 0 then
-				data.show_hud = true
+			local msg = fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or "")
+			hud_notif(data.player_name, msg, "i3_book.png")
 		end
 
 		data.items_raw = items
@@ -228,23 +136,8 @@ local function poll_new_items()
 		search(data)
 		set_fs(player)
 	end
-	end
 
-	core.after(POLL_FREQ, poll_new_items)
+	core.after(POLL_FREQ, poll_new_items, player, data)
-end
-
-poll_new_items()
-
-if singleplayer then
-	core.register_globalstep(function()
-		local name = "singleplayer"
-		local player = core.get_player_by_name(name)
-		local data = i3.data[name]
-
-		if data and data.show_hud ~= nil then
-			show_hud_success(player, data)
-		end
-	end)
 end
 
 i3.add_recipe_filter("Default progressive filter", progressive_filter)
@@ -256,19 +149,7 @@ core.register_on_joinplayer(function(player)
 
 	data.inv_items = data.inv_items or {}
 	data.known_recipes = data.known_recipes or 0
+	data.discovered = data.discovered or 0
 
-	local oldknown = data.known_recipes
+	poll_new_items(player, data, true)
-	local items = get_filtered_items(player, data)
-	data.discovered = data.known_recipes - oldknown
-
-	data.items_raw = items
-	search(data)
-
-	if singleplayer then
-		init_hud(player, data)
-
-		if data.show_hud == nil and data.discovered > 0 then
-			data.show_hud = true
-		end
-	end
 end)

src/styles.lua

@@ -32,13 +32,14 @@ local PNG = {
 	awards = "i3_award.png",
 	skins = "i3_skin.png",
 	waypoints = "i3_waypoint.png",
-	teleport = "i3_teleport.png",
 	add = "i3_add.png",
 	refresh = "i3_refresh.png",
 	visible = "i3_visible.png^\\[brighten",
 	nonvisible = "i3_non_visible.png",
 	exit = "i3_exit.png",
 	home = "i3_home.png",
+	flag = "i3_flag.png",
+	edit = "i3_edit.png",
 
 	cancel_hover = "i3_cancel.png^\\[brighten",
 	search_hover = "i3_search.png^\\[brighten",
@@ -57,11 +58,11 @@ local PNG = {
 	awards_hover = "i3_award_hover.png",
 	skins_hover = "i3_skin_hover.png",
 	waypoints_hover = "i3_waypoint_hover.png",
-	teleport_hover = "i3_teleport.png^\\[brighten",
 	add_hover = "i3_add.png^\\[brighten",
 	refresh_hover = "i3_refresh.png^\\[brighten",
 	exit_hover = "i3_exit.png^\\[brighten",
 	home_hover = "i3_home.png^\\[brighten",
+	edit_hover = "i3_edit.png^\\[brighten",
 }
 
 local styles = string.format([[
@@ -83,6 +84,7 @@ local styles = string.format([[
 	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]
 	style[craft_rcp,craft_usg;noclip=true;font_size=16;sound=i3_craft;
 	      bgimg=i3_btn9.png;bgimg_hovered=i3_btn9_hovered.png;
@@ -102,7 +104,8 @@ 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)
+PNG.add,      PNG.add_hover,
+PNG.edit,     PNG.edit_hover)
 
 local fs_elements = {
 	label = "label[%f,%f;%s]",

tests/test_custom_recipes.lua

@@ -8,6 +8,7 @@ mt2:get_meta():set_string("color", "#ff0")
 
 local mt3 = ItemStack("default:pick_diamond")
 mt3:get_meta():set_string("description", "Worn Pick")
+mt3:get_meta():set_string("color", "yellow")
 mt3:set_wear(10000)
 
 minetest.register_craft({

tests/test_operators.lua

@@ -0,0 +1,26 @@
+local a, b, c = 0, 0, 0
+b+=1
+c++; local foo = "bar";
+local t = {
+	a = a++,
+	b = 2,
+	c = c+=2,
+	d = a&3,
+	e = 1,
+}
+t["b"] <<= 4
+t.b >>= 2
+assert(t.b == 8)
+--print(dump(t))
+--c += 1
+c*=2
+local i = 16
+i += i<<4
+assert(i == 272)
+assert((a+=2) == 2)
+assert(c++ == 3)
+assert((a-=1) == -1)
+assert((c^=4) == 16)
+assert((a&b) == 0)
+assert((c|=a) == 2)
+assert((1<<8) == 256)