Merge remote-tracking branch 'github/master'

api.lua

@@ -51,7 +51,6 @@ minetest.after(0.01, function()
 			end
 		end
 	end
-
 	table.sort(ui.items_list)
 	ui.items_list_size = #ui.items_list
 	print("Unified Inventory. Inventory size: "..ui.items_list_size)

init.lua

@@ -53,9 +53,8 @@ unified_inventory = {
 	standard_background = "bgcolor[#0000]background9[0,0;1,1;ui_formbg_9_sliced.png;true;16]",
 
 	hide_disabled_buttons = minetest.settings:get_bool("unified_inventory_hide_disabled_buttons", false),
-	hide_uncraftable_items = minetest.settings:get_bool("unified_inventory_hide_uncraftable_items", false),
 
-	version = 5
+	version = 4
 }
 
 local ui = unified_inventory
@@ -199,3 +198,5 @@ if minetest.settings:get_bool("unified_inventory_waypoints") ~= false then
 	dofile(modpath.."/waypoints.lua")
 end
 dofile(modpath.."/legacy.lua") -- mod compatibility
+
+minetest.log("action", "[unified_inventory] loaded.")

internal.lua

@@ -270,8 +270,8 @@ local function formspec_add_item_browser(player, formspec, ui_peruser)
 					button_name, minetest.formspec_escape(tooltip)
 				)
 				n = n + 2
+				list_index = list_index + 1
 			end
-			list_index = list_index + 1
 		end
 	end
 	formspec[n] = "style[page_number;content_offset=0]"
@@ -349,25 +349,12 @@ function ui.apply_filter(player, filter, search_dir)
 	end
 	local player_name = player:get_player_name()
 
-	-- Whether to show uncraftable items
-	local fprefilter = function(_)
-		return true
-	end
-	if ui.hide_uncraftable_items and not ui.is_creative(player_name) then
-		fprefilter = function(name)
-			return ui.get_recipe_list(name)
-		end
-	end
-
-	local registered_items = minetest.registered_items
 	local lfilter = string.lower(filter)
 	local ffilter
-
 	if lfilter:sub(1, 6) == "group:" then
 		-- Group filter: all groups of the item must match
 		local groups = lfilter:sub(7):split(",")
-		ffilter = function(name)
-			local def = registered_items[name]
+		ffilter = function(name, def)
 			for _, group in ipairs(groups) do
 				if not def.groups[group]
 				or def.groups[group] <= 0 then
@@ -381,8 +368,7 @@ function ui.apply_filter(player, filter, search_dir)
 		local player_info = minetest.get_player_information(player_name)
 		local lang = player_info and player_info.lang_code or ""
 
-		ffilter = function(name)
-			local def = registered_items[name]
+		ffilter = function(name, def)
 			local lname = string.lower(name)
 			local ldesc = string.lower(def.description)
 			local llocaldesc = minetest.get_translated_string
@@ -392,29 +378,32 @@ function ui.apply_filter(player, filter, search_dir)
 		end
 	end
 
+	local is_itemdef_listable = ui.is_itemdef_listable
 	local filtered_items = {}
 
 	local category = ui.current_category[player_name] or 'all'
 	if category == 'all' then
-		for _, name in ipairs(ui.items_list) do
-			if fprefilter(name) and ffilter(name) then
+		for name, def in pairs(minetest.registered_items) do
+			if is_itemdef_listable(def)
+			and ffilter(name, def) then
 				table.insert(filtered_items, name)
 			end
 		end
 	elseif category == 'uncategorized' then
-		for _, name in ipairs(ui.items_list) do
-			if not ui.find_category(name)
-					and fprefilter(name)
-					and ffilter(name) then
+		for name, def in pairs(minetest.registered_items) do
+			if is_itemdef_listable(def)
+			and not ui.find_category(name)
+			and ffilter(name, def) then
 				table.insert(filtered_items, name)
 			end
 		end
 	else
 		-- Any other category is selected
 		for name, exists in pairs(ui.registered_category_items[category]) do
-			if exists
-					and fprefilter(name)
-					and ffilter(name) then
+			local def = minetest.registered_items[name]
+			if exists and def
+			and is_itemdef_listable(def)
+			and ffilter(name, def) then
 				table.insert(filtered_items, name)
 			end
 		end

register.lua

@@ -41,55 +41,6 @@ ui.register_button("craftguide", {
 	tooltip = S("Crafting Guide")
 })
 
-ui.register_button("home_gui_set", {
-	type = "image",
-	image = "ui_sethome_icon.png",
-	tooltip = S("Set home position"),
-	hide_lite=true,
-	action = function(player)
-		local player_name = player:get_player_name()
-		if minetest.check_player_privs(player_name, {home=true}) then
-			ui.set_home(player, player:get_pos())
-			local home = ui.home_pos[player_name]
-			if home ~= nil then
-				minetest.sound_play("dingdong",
-						{to_player=player_name, gain = 1.0})
-				minetest.chat_send_player(player_name,
-					S("Home position set to: @1", minetest.pos_to_string(home)))
-			end
-		else
-			minetest.chat_send_player(player_name,
-				S("You don't have the \"home\" privilege!"))
-			ui.set_inventory_formspec(player, ui.current_page[player_name])
-		end
-	end,
-	condition = function(player)
-		return minetest.check_player_privs(player:get_player_name(), {home=true})
-	end,
-})
-
-ui.register_button("home_gui_go", {
-	type = "image",
-	image = "ui_gohome_icon.png",
-	tooltip = S("Go home"),
-	hide_lite=true,
-	action = function(player)
-		local player_name = player:get_player_name()
-		if minetest.check_player_privs(player_name, {home=true}) then
-			if ui.go_home(player) then
-				minetest.sound_play("teleport", {to_player = player_name})
-			end
-		else
-			minetest.chat_send_player(player_name,
-				S("You don't have the \"home\" privilege!"))
-			ui.set_inventory_formspec(player, ui.current_page[player_name])
-		end
-	end,
-	condition = function(player)
-		return minetest.check_player_privs(player:get_player_name(), {home=true})
-	end,
-})
-
 ui.register_button("misc_set_day", {
 	type = "image",
 	image = "ui_sun_icon.png",

settingtypes.txt

@@ -16,10 +16,6 @@ unified_inventory_waypoints (Enable waypoints) bool true
 # If enabled, disabled buttons will be hidden instead of grayed out.
 unified_inventory_hide_disabled_buttons (Hide disabled buttons) bool false
 
-# Hides items with no known craft recipe from the category "all" (default).
-# This setting has no effect on players in creative mode.
-unified_inventory_hide_uncraftable_items (Hide uncraftable items) bool false
-
 # Automatically categorizes registered items based on their
 # groups. This is based on a fuzzy match, thus is not 100% accurate.
 unified_inventory_automatic_categorization (Categories: add items automatically) bool true