Some cleaning

2025-07-03 00:50:22 +02:00 · 2021-11-22 17:42:44 +01:00
34 changed files with 1351 additions and 2135 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,24 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
- Mod version? Release or git?
- Engine version?
- LuaJIT enabled?
- Operating system?
- Did you try to disable other mods except i3?
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@ -18,4 +18,4 @@ jobs:
    - name: Setup ‘luacheck’
      run: luarocks install luacheck
    - name: Run ‘luacheck’ linter
-      run: cd util; lua luacheck.lua
+      run: luacheck .
--- a/.luacheckrc
+++ b/.luacheckrc
@ -1,7 +1,6 @@
 allow_defined_top = true

 ignore = {
-	"631", -- Line is too long.
 	"get_debug_grid",
 }

@ -14,8 +13,6 @@ read_globals = {
 	"string",
 	"table",
 	"ItemStack",
-	"VoxelArea",
-	"VoxelManip",
 }

 globals = {
@ -28,7 +25,6 @@ globals = {
 exclude_files = {
 	"tests/test_compression.lua",
 	"tests/test_custom_recipes.lua",
-	"tests/test_operators.lua",
 	"tests/test_tabs.lua",

 	".install",
--- a/API.md
+++ b/API.md
@ -17,7 +17,9 @@ 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()
-		return name == "singleplayer"
+		if name == "singleplayer" then
+			return false
+		end
 	end,

 	formspec = function(player, data, fs)
@ -278,7 +280,7 @@ A table containing all sorting methods.

 Adds a new group of items to compress.

- `item` is the item which represent the group of compressed items.
+- `item` is the item that serve as stereotype for the group of compressed items.
 - `def` is a table specifying the substring replace patterns to be used.

 Example:
@ -299,14 +301,6 @@ 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`.
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
-![logo](https://user-images.githubusercontent.com/7883281/145490041-d91d6bd6-a654-438d-b208-4d5736845ab7.png)
+# i3

-[![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)]() ![workflow](https://github.com/minetest-mods/i3/actions/workflows/luacheck.yml/badge.svg) [![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) ![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)

 #### **`i3`** is a next-generation inventory for Minetest.

@ -14,7 +14,6 @@ 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
@ -51,6 +50,4 @@ 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).

-**Video review on YouTube:** https://www.youtube.com/watch?v=Xd14BCdEZ3o
-
-![Preview](https://content.minetest.net/uploads/3abf3755de.png)
+![Preview](https://user-images.githubusercontent.com/7883281/142780121-564c1969-b95b-4cc9-99df-9f2362c67e07.png)
--- a/init.lua
+++ b/init.lua
@ -1,47 +1,21 @@
-print[[
-
-	Powered by
-
-	██╗██████╗
-	██║╚════██╗
-	██║ █████╔╝
-	██║ ╚═══██╗
-	██║██████╔╝
-	╚═╝╚═════╝
-]]
-
-local modpath = core.get_modpath"i3"
-local http = core.request_http_api()
-local storage = core.get_mod_storage()
-local _loadfile = dofile(modpath .. "/src/preprocessor.lua")
+local modpath = core.get_modpath "i3"

 local function lf(path)
-	return assert(_loadfile(modpath .. path))
+	return loadfile(modpath .. path)
 end

 i3 = {
-	version = 174,
-	data = core.deserialize(storage:get_string"data") or {},
+	modules = {},
+	http = core.request_http_api(),

-	settings = {
-		debug_mode = false,
-		max_favs = 6,
-		max_waypoints = 30,
-		min_fs_version = 4,
-		item_btn_size = 1.1,
-		drop_bag_on_die = true,
-		save_interval = 600, -- Player data save interval (in seconds)
+	MAX_FAVS = 6,
+	INV_SIZE = 4*9,
+	HOTBAR_LEN = 9,
+	ITEM_BTN_SIZE = 1.1,
+	MIN_FORMSPEC_VERSION = 4,
+	SAVE_INTERVAL = 600, -- Player data save interval (in seconds)

-		hud_speed = 1,
-		hud_timer_max = 1.5,
-
-		damage_enabled   = core.settings:get_bool"enable_damage",
-		progressive_mode = core.settings:get_bool"i3_progressive_mode",
-		legacy_inventory = core.settings:get_bool"i3_legacy_inventory",
-		item_compression = core.settings:get_bool("i3_item_compression", true),
-	},
-
-	categories = {
+	SUBCAT = {
 		"bag",
 		"armor",
 		"skins",
@ -49,32 +23,16 @@ i3 = {
 		"waypoints",
 	},

-	saves = { -- Metadata to save
-		bag = true,
+	META_SAVES = {
 		home = true,
+		bag_item = true,
+		bag_size = true,
 		waypoints = true,
 		inv_items = true,
 		drop_items = true,
 		known_recipes = true,
 	},

-	files = {
-		api = lf"/src/api.lua",
-		bags = lf"/src/bags.lua",
-		caches = lf"/src/caches.lua",
-		callbacks = lf"/src/callbacks.lua",
-		common = lf"/src/common.lua",
-		compress = lf"/src/compression.lua",
-		detached = lf"/src/detached_inv.lua",
-		fields = lf"/src/fields.lua",
-		groups = lf"/src/groups.lua",
-		gui = lf"/src/gui.lua",
-		hud = lf"/src/hud.lua",
-		model_alias = lf"/src/model_aliases.lua",
-		progressive = lf"/src/progressive.lua",
-		styles = lf"/src/styles.lua",
-	},
-
 	-- Caches
 	init_items = {},
 	fuel_cache = {},
@ -82,33 +40,211 @@ i3 = {
 	recipes_cache = {},

 	tabs = {},
-	cubes = {},
-	groups = {},
-	plants = {},
-	modules = {},
 	craft_types = {},

 	recipe_filters = {},
 	search_filters = {},
 	sorting_methods = {},
+
+	files = {
+		api = lf("/src/api.lua"),
+		bags = lf("/src/bags.lua"),
+		callbacks = lf("/src/callbacks.lua"),
+		common = lf("/src/common.lua"),
+		compress = lf("/src/compress.lua"),
+		detached = lf("/src/detached_inv.lua"),
+		groups = lf("/src/groups.lua"),
+		gui = lf("/src/gui.lua"),
+		model_alias = lf("/src/model_aliases.lua"),
+		progressive = lf("/src/progressive.lua"),
+		recipes = lf("/src/recipes.lua"),
+		styles = lf("/src/styles.lua"),
+	},
+
+	progressive_mode = core.settings:get_bool"i3_progressive_mode",
+	item_compression = core.settings:get_bool("i3_item_compression", true),
 }

-i3.settings.hotbar_len = i3.settings.legacy_inventory and 8 or 9
-i3.settings.inv_size   = 4 * i3.settings.hotbar_len
-
 i3.files.common()
-i3.files.api(http)
+i3.files.api()
 i3.files.compress()
 i3.files.groups()
-i3.files.callbacks(http, storage)
+i3.files.callbacks()

-if i3.settings.progressive_mode then
+local storage = core.get_mod_storage()
+local slz, dslz, copy = i3.get("slz", "dslz", "copy")
+local str_to_pos, add_hud_waypoint = i3.get("str_to_pos", "add_hud_waypoint")
+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_recipes = i3.files.recipes()
+
+local function get_lang_code(info)
+	return info and info.lang_code
+end
+
+local function get_formspec_version(info)
+	return info and info.formspec_version or 1
+end
+
+local function outdated(name)
+	local fs = ("size[6.3,1.3]image[0,0;1,1;i3_book.png]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]"):format(
+		"Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game.")
+
+	core.show_formspec(name, "i3_outdated", fs)
+end
+
+if rawget(_G, "armor") then
+	i3.modules.armor = true
+	armor:register_on_update(set_fs)
+end
+
+if rawget(_G, "skins") then
+	i3.modules.skins = true
+end
+
+if rawget(_G, "awards") then
+	i3.modules.awards = true
+
+	core.register_on_craft(function(_, player)
+		set_fs(player)
+	end)
+
+	core.register_on_dignode(function(_, _, player)
+		set_fs(player)
+	end)
+
+	core.register_on_placenode(function(_, _, player)
+		set_fs(player)
+	end)
+
+	core.register_on_chat_message(function(name)
+		local player = core.get_player_by_name(name)
+		set_fs(player)
+	end)
+end
+
+local function disable_inventories()
+	if rawget(_G, "sfinv") then
+		function sfinv.set_player_inventory_formspec() return end
+		sfinv.enabled = false
+	end
+
+	if rawget(_G, "unified_inventory") then
+		function unified_inventory.set_inventory_formspec() return end
+	end
+end
+
+local function init_data(player, info)
+	local name = player:get_player_name()
+	i3.data[name] = i3.data[name] or {}
+	local data = i3.data[name]
+
+	data.player_name     = name
+	data.filter          = ""
+	data.pagenum         = 1
+	data.items           = i3.init_items
+	data.items_raw       = i3.init_items
+	data.favs            = {}
+	data.sort            = "alphabetical"
+	data.show_setting    = "home"
+	data.ignore_hotbar   = false
+	data.auto_sorting    = false
+	data.reverse_sorting = false
+	data.inv_compress    = true
+	data.export_counts   = {}
+	data.tab             = 1
+	data.itab            = 1
+	data.subcat          = 1
+	data.scrbar_inv      = 0
+	data.lang_code       = get_lang_code(info)
+	data.fs_version      = info.formspec_version
+
+	local inv = player:get_inventory()
+	inv:set_size("main", i3.INV_SIZE)
+
+	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)
+
+	for name, v in pairs(_data) do
+	for dat in pairs(v) do
+		if not i3.META_SAVES[dat] then
+			_data[name][dat] = nil
+
+			if player_name and i3.data[player_name] then
+				i3.data[player_name][dat] = nil -- To free up some memory
+			end
+		end
+	end
+	end
+
+	storage:set_string("data", slz(_data))
+end
+
+core.register_on_mods_loaded(function()
+	init_recipes()
+	disable_inventories()
+end)
+
+core.register_on_joinplayer(function(player)
+	local name = player:get_player_name()
+	local info = core.get_player_information and core.get_player_information(name)
+
+	if not info or get_formspec_version(info) < i3.MIN_FORMSPEC_VERSION then
+		return outdated(name)
+	end
+
+	init_data(player, info)
+	init_bags(player)
+	init_inventories(player)
+	init_waypoints(player)
+	init_hudbar(player)
+end)
+
+core.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	save_data(name)
+end)
+
+core.register_on_shutdown(save_data)
+
+local function routine()
+	save_data()
+	core.after(i3.SAVE_INTERVAL, routine)
+end
+
+core.after(i3.SAVE_INTERVAL, routine)
+
+if i3.progressive_mode then
 	i3.files.progressive()
 end

-if i3.settings.debug_mode then
-	lf("/tests/test_tabs.lua")()
-	lf("/tests/test_operators.lua")()
-	lf("/tests/test_compression.lua")()
-	lf("/tests/test_custom_recipes.lua")()
-end
+--dofile(modpath .. "/tests/test_tabs.lua")
+--dofile(modpath .. "/tests/test_compression.lua")
+--dofile(modpath .. "/tests/test_custom_recipes.lua")
--- a/mod.conf
+++ b/mod.conf
@ -1,4 +1,3 @@
 name = i3
-description = Next-generation inventory
+description = Tiling inventory for Minetest
 optional_depends = 3d_armor, skinsdb, awards
-min_minetest_version = 5.4
--- a/settingtypes.txt
+++ b/settingtypes.txt
@ -2,7 +2,4 @@
 i3_progressive_mode    (Learn crafting recipes progressively)    bool false

 # Regroup the items of the same type in the item list.
-i3_item_compression    (Regroup items of the same type)          bool true
-
-# Set the inventory size to common chests size (8*4).
-i3_legacy_inventory    (Legacy inventory size)                   bool false
+i3_item_compression    (Regroup items of the same type)    bool true
--- a/src/api.lua
+++ b/src/api.lua
@ -1,11 +1,11 @@
-local http = ...
-local make_fs, get_inventory_fs = i3.files.gui()
+local make_fs = i3.files.gui()

-IMPORT("gmatch", "split")
-IMPORT("S", "err", "fmt", "reg_items")
-IMPORT("sorter", "sort_inventory")
-IMPORT("sort", "concat", "copy", "insert", "remove")
-IMPORT("true_str", "true_table", "is_str", "is_func", "is_table", "clean_name")
+local gmatch, split = i3.get("gmatch", "split")
+local S, err, fmt, reg_items = i3.get("S", "err", "fmt", "reg_items")
+local sorter, sort_inventory = i3.get("sorter", "sort_inventory")
+local sort, concat, copy, insert, remove = i3.get("sort", "concat", "copy", "insert", "remove")
+local 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
@ -22,8 +22,14 @@ end
 function i3.register_craft(def)
 	local width, c = 0, 0

-	if http and true_str(def.url) then
-		http.fetch({url = def.url}, function(result)
+	if true_str(def.url) then
+		if not i3.http then
+			return err(fmt([[i3.register_craft(): Unable to reach %s.
+				No HTTP support for this mod: add it to the `secure.http_mods` or
+				`secure.trusted_mods` setting.]], def.url))
+		end
+
+		i3.http.fetch({url = def.url}, function(result)
 			if result.succeeded then
 				local t = core.parse_json(result.data)
 				if is_table(t) then
@ -51,7 +57,7 @@ function i3.register_craft(def)
 		def.result = nil
 	end

-	if not true_str(def.output) and not def.url then
+	if not true_str(def.output) then
 		return err "i3.register_craft: output missing"
 	end

@ -69,7 +75,9 @@ function i3.register_craft(def)
 		end

 		local cp = copy(def.grid)
-		sort(cp, function(a, b) return #a > #b end)
+		sort(cp, function(a, b)
+			return #a > #b
+		end)

 		width = #cp[1]

@ -80,33 +88,30 @@ function i3.register_craft(def)
 		end

 		for symbol in gmatch(concat(def.grid), ".") do
-			c++
+			c = c + 1
 			def.items[c] = def.key[symbol]
 		end
 	else
-		local items = copy(def.items)
-		local lines = {}
+		local items, len = def.items, #def.items
 		def.items = {}

-		for i = 1, #items do
-			lines[i] = split(items[i], ",", true)
+		for i = 1, len do
+			local rlen = #split(items[i], ",")

-			if #lines[i] > width then
-				width = #lines[i]
+			if rlen > width then
+				width = rlen
 			end
 		end

-		for i = 1, #items do
-			while #lines[i] < width do
-				insert(lines[i], items[i])
+		for i = 1, len do
+			while #split(items[i], ",") < width do
+				items[i] = fmt("%s,", items[i])
 			end
 		end

-		for _, line in ipairs(lines) do
-			for _, v in ipairs(line) do
-				c++
-				def.items[c] = clean_name(v)
-			end
+		for name in gmatch(concat(items, ","), "[%s%w_:]+") do
+			c = c + 1
+			def.items[c] = clean_name(name)
 		end
 	end

@ -150,11 +155,10 @@ function i3.add_search_filter(name, f)
 end

 function i3.get_recipes(item)
-	item = core.registered_aliases[item] or item
-	local recipes = i3.recipes_cache[item]
-	local usages = i3.usages_cache[item]
-
-	return {recipes = recipes, usages = usages}
+	return {
+		recipes = i3.recipes_cache[item],
+		usages = i3.usages_cache[item]
+	}
 end

 function i3.set_fs(player)
@ -167,13 +171,6 @@ 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
@ -193,12 +190,6 @@ function i3.new_tab(name, def)
 	insert(i3.tabs, def)
 end

-i3.new_tab("inventory", {
-	description = S"Inventory",
-	formspec = get_inventory_fs,
-	fields = i3.files.fields(),
-})
-
 function i3.remove_tab(name)
 	if not true_str(name) then
 		return err "i3.remove_tab: tab name missing"
@ -228,8 +219,8 @@ function i3.set_tab(player, tabname)
 		return
 	end

-	for i, tab in ipairs(i3.tabs) do
-		if tab.name == tabname then
+	for i, def in ipairs(i3.tabs) do
+		if def.name == tabname then
 			data.tab = i
 			return
 		end
@ -307,27 +298,6 @@ 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"
--- a/src/bags.lua
+++ b/src/bags.lua
@ -1,8 +1,14 @@
 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")

-IMPORT("get_bag_description", "ItemStack")
-IMPORT("S", "ES", "fmt", "msg", "slz", "dslz")
-IMPORT("get_group", "play_sound", "get_detached_inv", "create_inventory")
+local function get_content_inv(name)
+	return core.get_inventory {
+		type = "detached",
+		name = fmt("i3_bag_content_%s", name)
+	}
+end

 local function get_content(content)
 	local t = {}
@ -21,7 +27,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 = get_group(stack:get_name(), "bag")
+			local item_group = core.get_item_group(stack:get_name(), "bag")

 			if empty and item_group > 0 and item_group <= 4 then
 				return 1
@ -37,13 +43,14 @@ local function init_bags(player)
 		end,

 		on_put = function(_, _, _, stack)
-			data.bag = stack:to_string()
+			data.bag_item = 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_detached_inv("bag_content", name)
+				local inv = get_content_inv(name)
 				inv:set_list("main", get_content(content))
 			end

@ -51,10 +58,10 @@ local function init_bags(player)
 		end,

 		on_take = function()
-			data.bag = nil
-			data.bag_rename = nil
+			data.bag_item = nil
+			data.bag_size = nil

-			local content = get_detached_inv("bag_content", name)
+			local content = get_content_inv(name)
 			content:set_list("main", {})

 			set_fs(player)
@ -63,40 +70,48 @@ local function init_bags(player)

 	bag:set_size("main", 1)

-	if data.bag then
-		bag:set_list("main", get_content{data.bag})
+	if data.bag_item then
+		bag:set_list("main", get_content{data.bag_item})
 	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
-			meta:set_string("description", desc)
+		if inv:is_empty("main") then
+			meta:set_string("description", "")
 			meta:set_string("content", "")
 		else
 			local list = inv:get_list"main"
-			local t, c = {}, 0
+			local t = {}

 			for i = 1, #list do
 				local stack = list[i]

 				if not stack:is_empty() then
-					c++
 					t[i] = stack:to_string()
 				end
 			end

-			local bag_size = get_group(bagstack:get_name(), "bag")
-			local percent = fmt("%d", (c * 100) / (bag_size * 4))
+			local function count_items()
+				local c = 0

-			meta:set_string("description", ES("@1 (@2% full)", desc, percent))
+				for _ in pairs(t) do
+					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 = bagstack:to_string()
+		data.bag_item = bagstack:to_string()

 		set_fs(player)
 	end
@ -105,23 +120,11 @@ 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 then
+	if data.bag_item then
 		local meta = bag:get_stack("main", 1):get_meta()
 		local content = dslz(meta:get_string"content")

--- a/src/callbacks.lua
+++ b/src/callbacks.lua
@ -1,12 +1,439 @@
-local http, storage = ...
-local init_bags = i3.files.bags()
-local fill_caches = i3.files.caches(http)
-local init_detached = i3.files.detached()
-local init_hud = i3.files.hud()
-local set_fs = i3.set_fs
+local _, get_inventory_fs = i3.files.gui()

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

 core.register_on_player_hpchange(function(player, hpchange)
 	local name = player:get_player_name()
@ -24,18 +451,6 @@ core.register_on_dieplayer(function(player)
 	local data = i3.data[name]
 	if not data then return end

-	if i3.settings.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)

@ -65,141 +480,3 @@ core.register_on_player_inventory_action(function(player, _, _, info)
 		set_fs(player)
 	end
 end)
-
-if core.global_exists("armor") then
-	i3.modules.armor = true
-	armor:register_on_update(set_fs)
-end
-
-if core.global_exists("skins") then
-	i3.modules.skins = true
-end
-
-if core.global_exists("awards") then
-	i3.modules.awards = true
-
-	core.register_on_craft(function(_, player)
-		set_fs(player)
-	end)
-
-	core.register_on_dignode(function(_, _, player)
-		set_fs(player)
-	end)
-
-	core.register_on_placenode(function(_, _, player)
-		set_fs(player)
-	end)
-
-	core.register_on_chat_message(function(name)
-		local player = core.get_player_by_name(name)
-		set_fs(player)
-	end)
-end
-
-local function disable_inventories()
-	if rawget(_G, "sfinv") then
-		function sfinv.set_player_inventory_formspec() return end
-		sfinv.enabled = false
-	end
-
-	if rawget(_G, "unified_inventory") then
-		function unified_inventory.set_inventory_formspec() return end
-	end
-end
-
-core.register_on_mods_loaded(function()
-	fill_caches()
-	disable_inventories()
-end)
-
-local function get_lang_code(info)
-	return info and info.lang_code
-end
-
-local function get_formspec_version(info)
-	return info and info.formspec_version or 1
-end
-
-local function outdated(name)
-	core.show_formspec(name, "i3_outdated",
-		("size[6.5,1.3]image[0,0;1,1;i3_book.png]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]"):format(
-		"Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game."))
-end
-
-local function init_data(player, info)
-	local name = player:get_player_name()
-	i3.data[name] = i3.data[name] or {}
-	local data = i3.data[name]
-
-	data.player_name     = name
-	data.filter          = ""
-	data.pagenum         = 1
-	data.skin_pagenum    = 1
-	data.items           = i3.init_items
-	data.items_raw       = i3.init_items
-	data.favs            = {}
-	data.sort            = "alphabetical"
-	data.show_setting    = "home"
-	data.ignore_hotbar   = false
-	data.auto_sorting    = false
-	data.reverse_sorting = false
-	data.inv_compress    = true
-	data.export_counts   = {}
-	data.tab             = 1
-	data.itab            = 1
-	data.subcat          = 1
-	data.scrbar_inv      = 0
-	data.lang_code       = get_lang_code(info)
-	data.fs_version      = info.formspec_version
-
-	local inv = player:get_inventory()
-	inv:set_size("main", i3.settings.inv_size)
-
-	core.after(0, set_fs, player)
-end
-
-local function save_data(player_name)
-	local _data = copy(i3.data)
-
-	for name, v in pairs(_data) do
-	for dat in pairs(v) do
-		if not i3.saves[dat] then
-			_data[name][dat] = nil
-
-			if player_name and i3.data[player_name] then
-				i3.data[player_name][dat] = nil -- To free up some memory
-			end
-		end
-	end
-	end
-
-	storage:set_string("data", slz(_data))
-end
-
-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)
-
-	if not info or get_formspec_version(info) < i3.settings.min_fs_version then
-		return outdated(name)
-	end
-
-	init_data(player, info)
-	init_bags(player)
-	init_detached(player)
-	init_hud(player)
-end)
-
-core.register_on_leaveplayer(function(player)
-	local name = player:get_player_name()
-	save_data(name)
-end)
-
-core.register_on_shutdown(save_data)
-
-local function routine()
-	save_data()
-	core.after(i3.settings.save_interval, routine)
-end
-
-core.after(i3.settings.save_interval, routine)
--- a/src/common.lua
+++ b/src/common.lua
@ -1,21 +1,9 @@
 local ItemStack = ItemStack
 local loadstring = loadstring
-local reg_items = core.registered_items
-local translate = core.get_translated_string
-local vec_new, vec_add, vec_mul = vector.new, vector.add, vector.multiply
 local sort, concat, insert = table.sort, table.concat, table.insert
 local min, floor, ceil = math.min, math.floor, math.ceil
-local fmt, find, match, gmatch, sub, split, lower, upper =
-	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 fmt, find, match, gmatch, sub, split, lower =
+	string.format, string.find, string.match, string.gmatch, string.sub, string.split, string.lower

 local old_is_creative_enabled = core.is_creative_enabled

@ -27,7 +15,7 @@ function core.is_creative_enabled(name)
 	return core.check_player_privs(name, {creative = true}) or old_is_creative_enabled(name)
 end

-local S = core.get_translator"i3"
+local S = core.get_translator "i3"
 local ES = function(...) return core.formspec_escape(S(...)) end

 local function is_num(x)
@ -73,28 +61,6 @@ 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 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
-	      desc = toupper(desc:trim())
-
-	return desc
-end
-
 local function search(data)
 	reset_compression(data)

@ -118,8 +84,8 @@ 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.description)) or ""
+		local def = core.registered_items[item]
+		local desc = lower(core.get_translated_string(data.lang_code, def and def.description)) or ""
 		local search_in = fmt("%s %s", item, desc)
 		local temp, j, to_add = {}, 1

@ -135,7 +101,7 @@ local function search(data)
 						temp[item] = true
 					end

-					j++
+					j = j + 1
 				end
 			end
 		else
@ -154,7 +120,7 @@ local function search(data)
 		end

 		if to_add then
-			c++
+			c = c + 1
 			filtered_list[c] = item
 		end
 	end
@ -182,7 +148,7 @@ local function table_merge(t1, t2, hash)
 		local c = #t1

 		for i = 1, #t2 do
-			c++
+			c = c + 1
 			t1[c] = t2[i]
 		end
 	end
@ -208,7 +174,7 @@ local function array_diff(t1, t2)
 	for i = 1, #t1 do
 		local v = t1[i]
 		if hash[v] then
-			c++
+			c = c + 1
 			diff[c] = v
 		end
 	end
@ -246,7 +212,9 @@ local function is_group(item)
 end

 local function extract_groups(str)
-	return split(sub(str, 7), ",")
+	if sub(str, 1, 6) == "group:" then
+		return split(sub(str, 7), ",")
+	end
 end

 local function item_has_groups(item_groups, groups)
@ -258,61 +226,35 @@ local function item_has_groups(item_groups, groups)
 	return true
 end

-local function valid_item(def)
+local function show_item(def)
 	return def and def.groups.not_in_creative_inventory ~= 1 and
 		def.description and def.description ~= ""
 end

-local function get_group_stereotype(group)
-	local stereotype = i3.group_stereotypes[group]
-	local def = reg_items[stereotype]
+local function groups_to_items(groups, get_all)
+	if not get_all and #groups == 1 then
+		local group = groups[1]
+		local stereotype = i3.group_stereotypes[group]
+		local def = core.registered_items[stereotype]

-	if valid_item(def) then
-		return stereotype
-	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
-			insert(names, name)
+		if show_item(def) then
+			return stereotype
 		end
 	end

-	sort(names)
+	local 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"
+	for name, def in pairs(core.registered_items) do
+		if show_item(def) and item_has_groups(def.groups, groups) then
+			if get_all then
+				insert(names, name)
+			else
+				return name
+			end
+		end
 	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)
+	return get_all and names or ""
 end

 local function apply_recipe_filters(recipes, player)
@ -324,19 +266,24 @@ local function apply_recipe_filters(recipes, player)
 end

 local function compression_active(data)
-	return i3.settings.item_compression and not next(i3.recipe_filters) and data.filter == ""
+	return i3.item_compression and not next(i3.recipe_filters) and data.filter == ""
 end

 local function compressible(item, data)
 	return compression_active(data) and i3.compress_groups[item]
 end

-local function is_fav(data)
-	for i = 1, #data.favs do
-		if data.favs[i] == data.query_item then
-			return i
+local function is_fav(favs, query_item)
+	local fav, i
+	for j = 1, #favs do
+		if favs[j] == query_item then
+			fav = true
+			i = j
+			break
 		end
 	end
+
+	return fav, i
 end

 local function sort_by_category(data)
@ -372,15 +319,15 @@ local function spawn_item(player, stack)
 	local dir     = player:get_look_dir()
 	local ppos    = player:get_pos()
 	      ppos.y  = ppos.y + player:get_properties().eye_height
-	local look_at = vec_add(ppos, vec_mul(dir, 1))
+	local look_at = vector.add(ppos, vector.multiply(dir, 1))

 	core.add_item(look_at, stack)
 end

 local function get_recipes(player, item)
-	item = core.registered_aliases[item] or item
-	local recipes = i3.recipes_cache[item]
-	local usages = i3.usages_cache[item]
+	local clean_item = core.registered_aliases[item] or item
+	local recipes = i3.recipes_cache[clean_item]
+	local usages = i3.usages_cache[clean_item]

 	if recipes then
 		recipes = apply_recipe_filters(recipes, player)
@ -389,6 +336,7 @@ local function get_recipes(player, item)
 	local no_recipes = not recipes or #recipes == 0
 	if no_recipes and not usages then return end
 	usages = apply_recipe_filters(usages, player)
+
 	local no_usages = not usages or #usages == 0

 	return not no_recipes and recipes or nil,
@ -419,8 +367,7 @@ local function craft_stack(player, data, craft_rcp)
 		if is_group(name) then
 			items = {}
 			local groups = extract_groups(name)
-			local groupname = name:sub(7)
-			local item_groups = i3.groups[groupname].items or groups_to_items(groups)
+			local item_groups = groups_to_items(groups, true)
 			local remaining = count

 			for _, item in ipairs(item_groups) do
@ -428,7 +375,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 -= c
+					remaining = remaining - c
 				end

 				if remaining == 0 then break end
@ -449,7 +396,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 -= stackmax
+		leftover = leftover - stackmax
 	end
 end

@ -461,13 +408,10 @@ 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(vec_mul(vel, -1))
-
-	local p = vec_new(pos)
-	      p.y += 0.25
-
-	player:set_pos(p)
+	player:add_velocity(vector.multiply(vel, -1))
+	player:set_pos(pos)
 end

 local function get_sorting_idx(name)
@ -537,7 +481,7 @@ local function compress_items(list, start_i)
 				insert(special, stack)
 			else
 				hash[name] = hash[name] or 0
-				hash[name] += count
+				hash[name] = hash[name] + count
 			end
 		end
 	end
@ -549,7 +493,7 @@ local function compress_items(list, start_i)

 		for _ = 1, iter do
 			insert(new_inv, ItemStack(fmt("%s %u", name, min(stackmax, leftover))))
-			leftover -= stackmax
+			leftover = leftover - stackmax
 		end
 	end

@ -557,17 +501,14 @@ local function compress_items(list, start_i)
 	return new_inv
 end

-local function drop_items(player, inv, list, start_i, rej, remove)
+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
-				if not remove then
-					spawn_item(player, stack)
-				end
-
+				spawn_item(player, stack)
 				inv:set_stack("main", i, ItemStack(""))
 			end
 		end
@ -580,10 +521,10 @@ 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
+	local start_i = data.ignore_hotbar and 10 or 1

 	if true_table(data.drop_items) then
-		list = drop_items(player, inv, list, start_i, data.drop_items, true)
+		list = drop_items(player, inv, list, start_i, data.drop_items)
 	end

 	if data.inv_compress then
@ -607,50 +548,17 @@ local function sort_inventory(player, data)
 	end
 end

-local function reset_data(data)
-	data.filter        = ""
-	data.expand        = ""
-	data.pagenum       = 1
-	data.rnum          = 1
-	data.unum          = 1
-	data.scrbar_rcp    = 1
-	data.scrbar_usg    = 1
-	data.query_item    = nil
-	data.enable_search = nil
-	data.recipes       = nil
-	data.usages        = nil
-	data.export_rcp    = nil
-	data.export_usg    = nil
-	data.alt_items     = nil
-	data.confirm_trash = nil
-	data.show_settings = nil
-	data.show_setting  = "home"
-	data.items         = data.items_raw
-
-	if data.itab > 1 then
-		sort_by_category(data)
-	end
-end
-
 local function add_hud_waypoint(player, name, pos, color)
 	return player:hud_add {
 		hud_elem_type = "waypoint",
 		name = name,
-		text = "m",
+		text = " m",
 		world_pos = pos,
 		number = color,
 		z_index = -300,
 	}
 end

-local function get_detached_inv(name, player_name)
-	return core.get_inventory {
-		type = "detached",
-		name = fmt("i3_%s_%s", name, player_name)
-	}
-end
-
-- Much faster implementation of `unpack`
 local function createunpack(n)
 	local ret = {"local t = ... return "}

@ -677,7 +585,6 @@ 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,
@ -705,14 +612,12 @@ local _ = {
 	msg = msg,

 	-- Misc. functions
-	is_cube = is_cube,
-	get_cube = get_cube,
-	ItemStack = ItemStack,
-	valid_item = valid_item,
+	get_stack = get_stack,
+	craft_stack = craft_stack,
+	show_item = show_item,
 	spawn_item = spawn_item,
 	clean_name = clean_name,
 	play_sound = play_sound,
-	reset_data = reset_data,
 	safe_teleport = safe_teleport,
 	add_hud_waypoint = add_hud_waypoint,

@ -721,19 +626,9 @@ 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
@ -758,8 +653,6 @@ local _ = {
 	split = string.split,
 	match = string.match,
 	gmatch = string.gmatch,
-	toupper = toupper,
-	utf8_len = utf8_len,

 	-- Table
 	maxn = table.maxn,
@ -787,8 +680,6 @@ 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,
 }
--- a/src/compression.lua
+++ b/src/compression.lua
@ -1,4 +1,4 @@
-IMPORT("fmt", "copy", "insert")
+local fmt, copy, insert = i3.get("fmt", "copy", "insert")

 local wood_types = {
 	"acacia_wood", "aspen_wood", "junglewood", "pine_wood",
@ -277,7 +277,13 @@ for _, nodename in ipairs(v) do
 	t[nodename] = {}

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

 	to_compress[fmt("%s:%s", mod, slope_name)] = {
 		replace = slope_name,
-		by = t[nodename],
+		by = t[nodename]
 	}
 end
 end
--- a/src/detached_inv.lua
+++ b/src/detached_inv.lua
@ -1,5 +1,5 @@
 local set_fs = i3.set_fs
-IMPORT("fmt", "play_sound", "create_inventory")
+local fmt, play_sound, create_inventory = i3.get("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_detached(player)
+local function init_inventories(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_detached(player)
 	output_usg:set_size("main", 1)
 end

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

 i3.group_stereotypes = {
 	dye = "dye:white",
@ -11,7 +11,6 @@ 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",
@ -27,7 +26,6 @@ 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",
--- a/src/gui.lua
+++ b/src/gui.lua
--- a/src/hud.lua
+++ b/src/hud.lua
@ -1,125 +0,0 @@
-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,
-		},
-	}
-
-	if not i3.settings.legacy_inventory then
-		core.after(0, function()
-			player:hud_set_hotbar_itemcount(i3.settings.hotbar_len)
-			player:hud_set_hotbar_image"i3_hotbar.png"
-		end)
-	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.settings.hud_speed)
-			})
-		end
-
-	elseif data.show_hud == false then
-		if data.hud_timer >= i3.settings.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.settings.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
--- a/src/model_aliases.lua
+++ b/src/model_aliases.lua
@ -1,4 +1,4 @@
-return {
+local model_alias = {
 	["boats:boat"] = {name = "boats:boat", drawtype = "entity"},
 	["carts:cart"] = {name = "carts:cart", drawtype = "entity", frames = "0,0"},
 	["default:chest"] = {name = "default:chest_open"},
@ -9,3 +9,5 @@ return {
 	["doors:door_steel"] = {name = "doors:door_steel_a"},
 	["xpanes:door_steel_bar"] = {name = "xpanes:door_steel_bar_a"},
 }
+
+return model_alias
--- a/src/preprocessor.lua
+++ b/src/preprocessor.lua
@ -1,94 +0,0 @@
--[[    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 modpath = core.get_modpath"i3"
-local _,_, fs_elements = dofile(modpath .. "/src/styles.lua")
-
-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)
-
-	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
-
-	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
--- a/src/progressive.lua
+++ b/src/progressive.lua
@ -1,9 +1,13 @@
-local set_fs = i3.set_fs
-local hud_notif = i3.hud_notif
-local POLL_FREQ = 0.25
+local singleplayer = core.is_singleplayer()

-IMPORT("fmt", "search", "table_merge", "array_diff")
-IMPORT("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters")
+local set_fs = i3.set_fs
+local fmt, search, table_merge, array_diff =
+	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

 local function get_filtered_items(player, data)
 	local items, known, c = {}, 0, 0
@ -17,13 +21,18 @@ local function get_filtered_items(player, data)
 		usages = #apply_recipe_filters(usages or {}, player)

 		if recipes > 0 or usages > 0 then
-			c++
+			c = c + 1
 			items[c] = item
-			known += recipes + usages
+
+			if data then
+				known = known + recipes + usages
+			end
 		end
 	end

-	data.known_recipes = known
+	if data then
+		data.known_recipes = known
+	end

 	return items
 end
@ -32,9 +41,7 @@ local function item_in_inv(item, inv_items)
 	local inv_items_size = #inv_items

 	if is_group(item) then
-		local groupname = item:sub(7)
-		local group_cache = i3.groups[groupname]
-		local groups = group_cache and group_cache.groups or extract_groups(item)
+		local groups = extract_groups(item)

 		for i = 1, inv_items_size do
 			local def = core.registered_items[inv_items[i]]
@ -79,7 +86,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 = c + 1
 			filtered[c] = recipe
 		end
 	end
@ -91,10 +98,6 @@ 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
@ -110,7 +113,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 = c + 1
 				inv_items[c] = name
 			end
 		end
@ -119,31 +122,129 @@ local function get_inv_items(player)
 	return inv_items
 end

-- Workaround. Need an engine call to detect when the contents of
-- the player inventory changed, instead.
-local function poll_new_items(player, data, join)
-	local inv_items = get_inv_items(player)
-	local diff = array_diff(inv_items, data.inv_items)
+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,
+		},

-	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
+		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,
+		},

-		if data.discovered > 0 then
-			local msg = fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or "")
-			hud_notif(data.player_name, msg, "i3_book.png")
-		end
+		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

-		data.items_raw = items
-		data.itab = 1
+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.

-		search(data)
-		set_fs(player)
+	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

-	core.after(POLL_FREQ, poll_new_items, player, data)
+	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 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
+			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
+				data.show_hud = true
+			end
+
+			data.items_raw = items
+			data.itab = 1
+
+			search(data)
+			set_fs(player)
+		end
+	end
+
+	core.after(POLL_FREQ, poll_new_items)
+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)
@ -155,7 +256,19 @@ 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

-	poll_new_items(player, data, true)
+	local oldknown = data.known_recipes
+	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)
--- a/src/recipes.lua
+++ b/src/recipes.lua
@ -1,10 +1,13 @@
 local replacements = {fuel = {}}
-local http = ...

-IMPORT("maxn", "copy", "insert", "sort", "match", "sub")
-IMPORT("true_str", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
-IMPORT("fmt", "reg_items", "reg_aliases", "reg_nodes", "is_cube", "get_cube", "ItemStack")
-IMPORT("is_group", "extract_groups", "item_has_groups", "groups_to_items", "get_group_stereotype")
+local ItemStack = ItemStack
+local fmt, reg_items, reg_aliases = i3.get("fmt", "reg_items", "reg_aliases")
+local maxn, copy, insert, sort, match = i3.get("maxn", "copy", "insert", "sort", "match")
+
+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
@ -22,58 +25,12 @@ local function cache_fuel(item)
 	end
 end

-local function cache_groups(group, groups)
-	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
+	local groups = extract_groups(item)

+	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
+			if not added[name] and show_item(def) and item_has_groups(def.groups, groups) then
 				local usage = copy(recipe)
 				table_replace(usage.items, item, name)

@ -83,7 +40,7 @@ local function get_item_usages(item, recipe, added)
 				added[name] = true
 			end
 		end
-	elseif valid_item(reg_items[item]) then
+	elseif show_item(reg_items[item]) then
 		i3.usages_cache[item] = i3.usages_cache[item] or {}
 		insert(i3.usages_cache[item], 1, recipe)
 	end
@ -146,7 +103,7 @@ local function drop_table(name, drop)
 		end

 		if not di.rarity then
-			count_sure++
+			count_sure = count_sure + 1
 		end
 	end
 end
@ -188,7 +145,7 @@ local function cache_recipes(item)
 		end

 		for k, v in pairs(replacements[item]) do
-			k += shift
+			k = k + shift

 			if _recipes[k] then
 				_recipes[k].replacements = v
@ -226,7 +183,7 @@ core.register_craft = function(def)

 	if is_group(output[1]) then
 		groups = extract_groups(output[1])
-		output = groups_to_items(groups)
+		output = groups_to_items(groups, true)
 	end

 	for i = 1, #output do
@ -287,7 +244,7 @@ local function resolve_aliases(hash)
 			end
 		end

-		if newname ~= "" and i3.recipes_cache[oldname] and reg_items[newname] and not hash[newname] then
+		if newname ~= "" and i3.recipes_cache[oldname] and not hash[newname] then
 			insert(i3.init_items, newname)
 		end
 	end
@ -297,7 +254,7 @@ local function init_recipes()
 	local _select, _preselect = {}, {}

 	for name, def in pairs(reg_items) do
-		if name ~= "" and valid_item(def) then
+		if name ~= "" and show_item(def) then
 			cache_drops(name, def.drop)
 			cache_fuel(name)
 			cache_recipes(name)
@ -316,39 +273,17 @@ local function init_recipes()
 	resolve_aliases(_select)
 	sort(i3.init_items)

-	if http and true_str(i3.export_url) then
+	if i3.http and true_str(i3.export_url) then
 		local post_data = {
 			recipes = i3.recipes_cache,
 			usages  = i3.usages_cache,
 		}

-		http.fetch_async {
+		i3.http.fetch_async {
 			url = i3.export_url,
 			post_data = core.write_json(post_data),
 		}
 	end
 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 is_cube(def.drawtype) then
-				i3.cubes[id] = get_cube(tiles)
-			elseif sub(def.drawtype, 1, 9) == "plantlike" or sub(def.drawtype, 1, 8) == "firelike" then
-				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
-end
-
-return function()
-	init_recipes()
-	init_cubes()
-end
+return init_recipes
--- a/src/styles.lua
+++ b/src/styles.lua
@ -1,5 +1,4 @@
 local PNG = {
-	blank = "i3_blank.png",
 	bg = "i3_bg.png",
 	bg_full = "i3_bg_full.png",
 	bg_content = "i3_bg_content.png",
@ -28,22 +27,18 @@ local PNG = {
 	tab_small = "i3_tab_small.png",
 	tab_top = "i3_tab.png^\\[transformFY",
 	furnace_anim = "i3_furnace_anim.png",
-	shapeless = "i3_shapeless.png",
 	bag = "i3_bag.png",
 	armor = "i3_armor.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",
-	no_result = "i3_no_result.png",
-	find_more = "i3_find_more.png",

 	cancel_hover = "i3_cancel.png^\\[brighten",
 	search_hover = "i3_search.png^\\[brighten",
@ -62,11 +57,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([[
@ -76,16 +71,18 @@ local styles = string.format([[
 	style_type[image_button,item_image_button,checkbox,dropdown;border=false;sound=i3_click]
 	style_type[item_image_button;bgimg_hovered=%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[exit;fgimg=%s;fgimg_hovered=%s;content_offset=0]
 	style[cancel;fgimg=%s;fgimg_hovered=%s;content_offset=0]
-	style[prev_page,prev_recipe,prev_usage,prev_sort,prev_skin;fgimg=%s;fgimg_hovered=%s]
-	style[next_page,next_recipe,next_usage,next_sort,next_skin;fgimg=%s;fgimg_hovered=%s]
+	style[search;fgimg=%s;fgimg_hovered=%s;content_offset=0]
+	style[prev_page;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]
 	style[craft_rcp,craft_usg;noclip=true;font_size=16;sound=i3_craft;
 	      bgimg=i3_btn9.png;bgimg_hovered=i3_btn9_hovered.png;
@ -96,13 +93,16 @@ local styles = string.format([[
 	style[confirm_trash_yes;sound=i3_trash]
 ]],
 PNG.slot,
-PNG.search_hover,
 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.add,      PNG.add_hover,
-PNG.edit,     PNG.edit_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)

 local fs_elements = {
 	label = "label[%f,%f;%s]",
--- a/tests/test_custom_recipes.lua
+++ b/tests/test_custom_recipes.lua
@ -38,24 +38,6 @@ i3.register_craft({
 	items = {"default:copper_ingot 7, default:tin_ingot, default:steel_ingot 2"},
 })

-i3.register_craft {
-	result = "default:tree",
-	items = {
-		"default:wood",
-		"",
-		"default:wood"
-	},
-}
-
-i3.register_craft {
-	result = "default:cobble 16",
-	items = {
-		"default:stone, default:stone",
-		"default:stone,              , default:stone",
-		", default:stone, default:stone",
-	}
-}
-
 i3.register_craft({
 	grid = {
 		"X",
@ -329,3 +311,22 @@ i3.register_craft({
 	},
 	result = "default:mese 3",
 })
+
+i3.register_craft({
+	grid = {
+		"X  #",
+		" ## ",
+		"X#X#",
+		"#X#X#",
+		"X  X##X#X",
+		" ## ",
+		"#X#X#",
+		"#X#X#",
+		"X  #",
+	},
+	key = {
+		['#'] = "default:wood",
+		['X'] = "default:glass",
+	},
+	result = "default:mese 3",
+})
--- a/tests/test_operators.lua
+++ b/tests/test_operators.lua
@ -1,26 +0,0 @@
-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)
--- a/tests/test_tabs.lua
+++ b/tests/test_tabs.lua
@ -16,18 +16,30 @@ i3.new_tab("test2", {
 	end,
 })

-i3.new_tab("test_creative", {
-	description = "Test creative",
+i3.new_tab("test3", {
+	description = "Test 3",

 	access = function(player, data)
 		local name = player:get_player_name()
-		return core.is_creative_enabled(name)
+		if name == "singleplayer" then
+			return true
+		end
 	end,

 	formspec = function(player, data, fs)
-		fs("label[3,1;Creative enabled]")
+		fs("label[3,1;Test 3]")
 	end,

-	fields = i3.set_fs,
+	fields = function(player, data, fields)
+		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,
+})
--- a/textures/i3_edit.png
+++ b/textures/i3_edit.png
--- a/textures/i3_find_more.png
+++ b/textures/i3_find_more.png
--- a/textures/i3_flag.png
+++ b/textures/i3_flag.png
--- a/textures/i3_no_result.png
+++ b/textures/i3_no_result.png
--- a/textures/i3_teleport.png
+++ b/textures/i3_teleport.png
--- a/util/luacheck.lua
+++ b/util/luacheck.lua
@ -1,141 +0,0 @@
-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"
-
-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",
-	"compression",
-	"detached_inv",
-	"fields",
-	"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)
-
-	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
-
-	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("(.*)%.") .. ".lc", "w")
-		_file:write(data)
-		_file:close()
-	end
-
-	_load("../src/" .. p .. ".lua")
-end
-
-exec "luacheck ../init.lua"
-exec "luacheck ../src/preprocessor.lua"
-exec "luacheck ../src/*.lc"
-exec "rm ../src/*.lc"
--- a/util/optipng.sh
+++ b/util/optipng.sh
@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Colors with 0 alpha need to be preserved, because opaque leaves ignore alpha.
-# For that purpose, the use of indexed colors is disabled (-nc).
-
-cd ../textures
-find -name '*.png' -print0 | xargs -0 optipng -o7 -zm1-9 -nc -strip all -clobber
--- a/util/servers.lua
+++ b/util/servers.lua
@ -1,23 +0,0 @@
-local JSON = require"JSON" -- luarocks install json-lua
-os.execute "clear"
-
-local list = io.popen("curl -s -H 'Accept: text/html' http://servers.minetest.net/list"):read("*a")
-      list = JSON:decode(list).list
-
-local servers = {}
-
-for _, server in ipairs(list) do
-	if server.mods then
-		for _, mod in ipairs(server.mods) do
-			if mod == "i3" then
-				table.insert(servers, server.name)
-			end
-		end
-	end
-end
-
-if #servers > 0 then
-	print(("=> %u/%u servers using [i3]:\n\t• %s"):format(#servers, #list, table.concat(servers, "\n\t• ")))
-else
-	print"No server using [i3]"
-end