merge and resolve conflicts

README.md

@@ -20,4 +20,4 @@ RealBadAngel: (WTFPL)
   * Everything else.
 
 Tango Project: (WTFPL)
-  * `ui_reset_icon.png
+  * `ui_reset_icon.png`

api.lua

@@ -27,7 +27,7 @@ minetest.after(0.01, function()
 							local groupchk = string.find(chk, "group:")
 							if (not groupchk and not minetest.registered_items[chk])
 							  or (groupchk and not unified_inventory.get_group_item(string.gsub(chk, "group:", "")).item)
-							  or minetest.get_item_group(chk, "exclude_from_craft_guide") ~= 0 then
+							  or minetest.get_item_group(chk, "not_in_craft_guide") ~= 0 then
 								unknowns = true
 							end
 						end
@@ -135,7 +135,7 @@ minetest.after(0.01, function()
 	for _, recipes in pairs(unified_inventory.crafts_for.recipe) do
 		for _, recipe in ipairs(recipes) do
 			local ingredient_items = {}
-			for _, spec in ipairs(recipe.items) do
+			for _, spec in pairs(recipe.items) do
 				local matches_spec = unified_inventory.canonical_item_spec_matcher(spec)
 				for _, name in ipairs(unified_inventory.items_list) do
 					if matches_spec(name) then

bags.lua

@@ -51,8 +51,33 @@ for i = 1, 4 do
 			elseif slots == 24 then
 				formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
 			end
-			formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]"
-					.."list[detached:trash;main;6,0.1;1,1;]")
+			local player_name = player:get_player_name() -- For if statement.
+			if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then
+				formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]"
+						.."list[detached:trash;main;6,0.1;1,1;]")
+			end
+			local inv = player:get_inventory()
+			for i = 1, 4 do
+				local def = inv:get_stack("bag"..i, 1):get_definition()
+				local button
+				if def.groups.bagslots then
+					local list_name = "bag"..i.."contents"
+					local size = inv:get_size(list_name)
+					local used = 0
+					for si = 1, size do
+						local stk = inv:get_stack(list_name, si)
+						if not stk:is_empty() then
+							used = used + 1
+						end
+					end
+					local img = def.inventory_image
+					local label = F("Bag @1", i).."\n"..used.."/"..size
+					button = "image_button["..(i+1)..",0;1,1;"..img..";bag"..i..";"..label.."]"
+				else
+					button = ""
+				end
+				formspec = formspec..button
+			end
 			return {formspec=formspec}
 		end,
 	})

callbacks.lua

@@ -154,7 +154,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 	end
 
-	if fields.searchbutton then
+	if fields.searchbutton
+			or fields.key_enter_field == "searchbox" then
 		unified_inventory.apply_filter(player, unified_inventory.current_searchbox[player_name], "nochange")
 		unified_inventory.set_inventory_formspec(player,
 				unified_inventory.current_page[player_name])

init.lua

@@ -45,6 +45,9 @@ unified_inventory = {
 
 	-- "Lite" mode
 	lite_mode = minetest.setting_getbool("unified_inventory_lite"),
+	
+	-- Trash enabled
+	trash_enabled = (minetest.setting_getbool("unified_inventory_trash") ~= false),
 
 	pagecols = 8,
 	pagerows = 10,
@@ -76,7 +79,10 @@ dofile(modpath.."/api.lua")
 dofile(modpath.."/internal.lua")
 dofile(modpath.."/callbacks.lua")
 dofile(modpath.."/register.lua")
--- dofile(modpath.."/bags.lua")
+
+if minetest.setting_getbool("unified_inventory_bags") ~= false then
+	dofile(modpath.."/bags.lua")
+end
 
 dofile(modpath.."/item_names.lua")
 

internal.lua

@@ -107,14 +107,23 @@ function unified_inventory.get_formspec(player, page)
 		end
 
 		if def.type == "image" then
-			formspec[n] = "image_button["
-			formspec[n+1] = ( ui_peruser.main_button_x + 0.65 * (i - 1) - button_col * 0.65 * 4)
-			formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
-			formspec[n+3] = minetest.formspec_escape(def.image)..";"
-			formspec[n+4] = minetest.formspec_escape(def.name)..";]"
-			formspec[n+5] = "tooltip["..minetest.formspec_escape(def.name)
-			formspec[n+6] = ";"..(def.tooltip or "").."]"
-			n = n+7
+			if (def.condition == nil or def.condition(player) == true) then
+				formspec[n] = "image_button["
+				formspec[n+1] = ( ui_peruser.main_button_x + 0.65 * (i - 1) - button_col * 0.65 * 4)
+				formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
+				formspec[n+3] = minetest.formspec_escape(def.image)..";"
+				formspec[n+4] = minetest.formspec_escape(def.name)..";]"
+				formspec[n+5] = "tooltip["..minetest.formspec_escape(def.name)
+				formspec[n+6] = ";"..(def.tooltip or "").."]"
+				n = n+7
+			else
+				formspec[n] = "image["
+				formspec[n+1] = ( ui_peruser.main_button_x + 0.65 * (i - 1) - button_col * 0.65 * 4)
+				formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
+				formspec[n+3] = minetest.formspec_escape(def.image).."^[colorize:#808080:alpha]"
+				n = n+4
+
+			end
 		end
 	end
 
@@ -173,6 +182,8 @@ function unified_inventory.get_formspec(player, page)
 	n = n+1
 
 	-- Search box
+	formspec[n] = "field_close_on_enter[searchbox;false]"
+	n = n+1
 
 	if not draw_lite_mode then
 		formspec[n] = "field[9.5,8.325;3,1;searchbox;;"

locale/pt.txt

@@ -0,0 +1,107 @@
+# Translation by Lunovox <lunovox@openmailbox.org>
+
+### api.lua ###
+Digging (by chance) = Cavando (por acaso)
+
+# Template
+### bags.lua ###
+Bags = Bolsas
+Bag @1 = Bolsa @1
+Small Bag = Bolsa Pequena
+Medium Bag = Bolsa Média
+Large Bag = Bolsa Grande
+
+### inernal.lua ###
+First page = Primeira Página
+Back three pages =  Voltar 3 Páginas
+Back one page = Voltar 1 Página
+Forward one page = Avançar 1 Página
+Forward three pages = Avançar 3 Páginas
+Last page = Ultima Página
+No matching items = Nenhum item correspondente
+Page = Página
+%s of %s = %s de %s
+Filter = Filtro
+Search = Pesquisar
+Reset search and display everything = Redefinir pesquisa e exibir tudo
+
+### register.lua ###
+Can use the creative inventory = Pode usar o inventário do criativo
+Forces Unified Inventory to be displayed in Full mode if Lite mode is configured globally = Força o Unified Inventory a ser exibido no modo Full se o modo Lite estiver configurado globalmente
+Home position set to: %s = Posição inicial definida para: %s
+Time of day set to 6am = Hora do dia definida para 06h
+You don't have the settime priviledge! = Você não tem o privilégio de 'settime'!
+Time of day set to 9pm = Hora do dia ajustada para 21h
+This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Este botão foi desativado fora do modo de criativo para evitar o descarte acidental de inventário. \nUse o slot de lixo em vez disso.
+Inventory cleared! = Inventário Apagado!
+Crafting = Artesanato
+Digging = Escavação
+Cooking = Cozimento
+Mixing = Muistura
+Trash: = Lixo:
+Refill: = Recarga:
+Crafting Guide = Guia de Artesanato
+Method: = Método:
+Result: %s = Resultado: %s
+crafting = artesanato
+shapeless crafting = artesanato sem formato
+cooking = cozinhar
+alloy cooking = Cozinhar em liga
+Copy to craft grid: = Copiar para grade de artesanato:
+All = MAX
+Alternate = Alternar
+Crafting Grid = Grade de Artesanato
+Show next recipe = Exibir Próxima Receita
+Show next usage = Mostrar Próxima Utilização
+Show previous recipe = Exibir Receita Anterior
+Show previous usage = Exibir Utilização Anterior
+
+# Shown for huge crafting recipes; try to keep the line length short and use multiple line breaks as needed
+This recipe is too\nlarge to be displayed. = Esta receita é grande \ndemais para ser apresentada.
+
+# %s = group name (e.g. wool)
+Any item belonging to the %s group = Qualquer item pertencente ao grupo '%s'.
+
+# %s = List of “and”-concatenated group names
+Any item belonging to the groups %s = Qualquer item pertencente aos grupos '%s'.
+Recipe %d of %d = Receita %s de %s
+Usage %d of %d = Utilização %s de %s
+No recipes = Sem Receita
+No usages = Sem Utilização
+Result = Resultado
+Ingredient = Ingrediente
+Set time to day = Definir turno para dia
+Set time to night = Definir turno para noite
+Set home position = Definir posição de casa
+Go home = Transportar para Casa
+Clear inventory = Limpar Inventário
+Give me: = Gerado: 
+To craft grid: = Para Grade de Artesanato
+
+### group.lua ###
+# Logical connective, example: “Any item belonging to the groups foo and bar”
+\sand\s = 
+
+### waypoints.lua ###
+White = Branco
+Yellow = Amarelo
+Red = Vermelho
+Green = Verde
+Blue = Azul
+Waypoints = Apontador de Direção
+Waypoint %d = Apontador de Direção %002
+Waypoint active = Apontador de Direção Ativo
+Waypoint inactive = Apontador de Direção Inativo
+World position = Posição Mundial
+Name = Nome
+HUD text color = Cor de HUD
+Edit waypoint name = Editar Nome de Apontador de Direção
+Rename waypoint = Renomear Apontador de Direção
+Change color of waypoint display = Mudar cor exibida do Apontador de Direção
+Set waypoint to current location = Configurar localização atual do Apontador de Direção
+Make waypoint visible = Fazer Apontador de Direção Visível
+Make waypoint invisible = Fazer Apontador de Direção Invisível
+Disable display of waypoint coordinates = Desativar exibição de coordenadas de Fazer Apontador de Direção
+Enable display of waypoint coordinates = Ativar exibição de coordenadas de Fazer Apontador de Direção
+Finish editing = Edição Finalizada
+Select Waypoint #%d = Seleção de Apontador de Direção #%02d

register.lua

@@ -40,46 +40,54 @@ unified_inventory.register_button("craftguide", {
 	tooltip = S("Crafting Guide")
 })
 
--- unified_inventory.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
--- 			unified_inventory.set_home(player, player:getpos())
--- 			local home = unified_inventory.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: %s"):format(minetest.pos_to_string(home)))
--- 			end
--- 		else
--- 			minetest.chat_send_player(player_name,
--- 				S("You don't have the \"home\" privilege!"))
--- 		end
--- 	end,
--- })
+unified_inventory.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
+			unified_inventory.set_home(player, player:getpos())
+			local home = unified_inventory.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: %s"):format(minetest.pos_to_string(home)))
+			end
+		else
+			minetest.chat_send_player(player_name,
+				S("You don't have the \"home\" privilege!"))
+			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+		end
+	end,
+	condition = function(player)
+		return minetest.check_player_privs(player:get_player_name(), {home=true})
+	end,
+})
 
--- unified_inventory.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
--- 			minetest.sound_play("teleport",
--- 				{to_player=player:get_player_name(), gain = 1.0})
--- 			unified_inventory.go_home(player)
--- 		else
--- 			minetest.chat_send_player(player_name,
--- 				S("You don't have the \"home\" privilege!"))
--- 		end
--- 	end,
--- })
+unified_inventory.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
+			minetest.sound_play("teleport",
+				{to_player=player:get_player_name(), gain = 1.0})
+			unified_inventory.go_home(player)
+		else
+			minetest.chat_send_player(player_name,
+				S("You don't have the \"home\" privilege!"))
+			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+		end
+	end,
+	condition = function(player)
+		return minetest.check_player_privs(player:get_player_name(), {home=true})
+	end,
+})
 
 unified_inventory.register_button("misc_set_day", {
 	type = "image",
@@ -97,8 +105,12 @@ unified_inventory.register_button("misc_set_day", {
 		else
 			minetest.chat_send_player(player_name,
 				S("You don't have the settime privilege!"))
+			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
 		end
 	end,
+	condition = function(player)
+		return minetest.check_player_privs(player:get_player_name(), {settime=true})
+	end,
 })
 
 unified_inventory.register_button("misc_set_night", {
@@ -117,8 +129,12 @@ unified_inventory.register_button("misc_set_night", {
 		else
 			minetest.chat_send_player(player_name,
 					S("You don't have the settime privilege!"))
+			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
 		end
 	end,
+	condition = function(player)
+		return minetest.check_player_privs(player:get_player_name(), {settime=true})
+	end,
 })
 
 unified_inventory.register_button("clear_inv", {
@@ -133,6 +149,7 @@ unified_inventory.register_button("clear_inv", {
 					.." of creative mode to prevent"
 					.." accidental inventory trashing."
 					.."\nUse the trash slot instead."))
+			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
 			return
 		end
 		player:get_inventory():set_list("main", {})
@@ -140,6 +157,9 @@ unified_inventory.register_button("clear_inv", {
 		minetest.sound_play("trash_all",
 				{to_player=player_name, gain = 1.0})
 	end,
+	condition = function(player)
+		return unified_inventory.is_creative(player:get_player_name())
+	end,
 })
 
 unified_inventory.register_page("craft", {
@@ -155,8 +175,11 @@ unified_inventory.register_page("craft", {
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]"
 		formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]"
-		formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]"
-		formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
+		if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then
+			formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]"
+			formspec = formspec.."background[7,"..(formspecy + 2)..";1,1;ui_single_slot.png]"
+			formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
+		end
 		formspec = formspec.."listring[current_name;craft]"
 		formspec = formspec.."listring[current_player;main]"
 		if unified_inventory.is_creative(player_name) then
@@ -249,6 +272,12 @@ unified_inventory.register_page("craftguide", {
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		local item_name = unified_inventory.current_item[player_name]
 		if not item_name then return {formspec=formspec} end
+		local item_name_shown
+		if minetest.registered_items[item_name] and minetest.registered_items[item_name].description then
+			item_name_shown = string.format(S("%s (%s)"), minetest.registered_items[item_name].description, item_name)
+		else
+			item_name_shown = item_name
+		end
 
 		local dir = unified_inventory.current_craft_direction[player_name]
 		local rdir
@@ -264,7 +293,7 @@ unified_inventory.register_page("craftguide", {
 
 		formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]"
 		formspec = formspec.."textarea["..craftresultx..","..craftresulty
-                           ..";10,1;;"..minetest.formspec_escape(F(role_text[dir])..": "..item_name)..";]"
+                           ..";10,1;;"..minetest.formspec_escape(F(role_text[dir])..": "..item_name_shown)..";]"
 		formspec = formspec..stack_image_button(0, formspecy, 1.1, 1.1, "item_button_"
 		                   .. rdir .. "_", ItemStack(item_name))
 
@@ -276,7 +305,7 @@ unified_inventory.register_page("craftguide", {
 			formspec = formspec.."image["..no_pos..","..formspecy..";1.1,1.1;ui_no.png]"
 			formspec = formspec..stack_image_button(item_pos, formspecy, 1.1, 1.1, "item_button_"
 			                   ..other_dir[dir].."_", ItemStack(item_name))
-			if player_privs.give == true then
+			if player_privs.give == true or player_privs.creative == true or minetest.setting_getbool("creative_mode") == true then
 				formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. F("Give me:") .. "]"
 						.."button[0,  "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]"
 						.."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]"
@@ -353,7 +382,7 @@ unified_inventory.register_page("craftguide", {
 					.."button[0.6,"..(formspecy + 1.5)..";0.7,0.5;craftguide_craft_10;10]"
 					.."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. F("All") .. "]"
 		end
-		if player_privs.give then
+		if player_privs.give == true or player_privs.creative == true or minetest.setting_getbool("creative_mode") == true then
 			formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. F("Give me:") .. "]"
 					.."button[0,  "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]"
 					.."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]"

settingtypes.txt

@@ -0,0 +1,11 @@
+#Enabling lite mode enables a smaller and simpler version of the Unified
+#Inventory, optimized for small displays.
+unified_inventory_lite (Lite mode) bool false
+
+#If enabled, bags will be made available which can be used to extend
+#inventory storage size.
+unified_inventory_bags (Enable bags) bool true
+
+#If enabled, the trash slot can be used by those without both creative
+#and the give privilege.
+unified_inventory_trash (Enable trash) bool true