Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

api.lua

@@ -188,9 +188,7 @@ function unified_inventory.go_home(player)
 	local pos = unified_inventory.home_pos[player:get_player_name()]
 	if pos then
 		player:set_pos(pos)
-		return true
 	end
-	return false
 end
 
 -- register_craft

bags.lua

@@ -7,24 +7,22 @@ License: GPLv3
 
 local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
-local bags_inv_bg_prefix = "image[-0.1,1.0;10.05,"
 
 unified_inventory.register_page("bags", {
 	get_formspec = function(player)
 		local player_name = player:get_player_name()
 		return { formspec = table.concat({
-			string.gsub(unified_inventory.standard_inv_bg, "YYY", "4.4"),
-			bags_inv_bg_prefix.."1.175;ui_bags_header.png]",
+			"background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]",
 			"label[0,0;" .. F(S("Bags")) .. "]",
-			"button[0,2.2;2,0.5;bag1;" .. F(S("Bag @1", 1)) .. "]",
-			"button[2,2.2;2,0.5;bag2;" .. F(S("Bag @1", 2)) .. "]",
-			"button[4,2.2;2,0.5;bag3;" .. F(S("Bag @1", 3)) .. "]",
-			"button[6,2.2;2,0.5;bag4;" .. F(S("Bag @1", 4)) .. "]",
+			"button[0,2;2,0.5;bag1;" .. F(S("Bag @1", 1)) .. "]",
+			"button[2,2;2,0.5;bag2;" .. F(S("Bag @1", 2)) .. "]",
+			"button[4,2;2,0.5;bag3;" .. F(S("Bag @1", 3)) .. "]",
+			"button[6,2;2,0.5;bag4;" .. F(S("Bag @1", 4)) .. "]",
 			"listcolors[#00000000;#00000000]",
-			"list[detached:" .. F(player_name) .. "_bags;bag1;0.5,1.1;1,1;]",
-			"list[detached:" .. F(player_name) .. "_bags;bag2;2.5,1.1;1,1;]",
-			"list[detached:" .. F(player_name) .. "_bags;bag3;4.5,1.1;1,1;]",
-			"list[detached:" .. F(player_name) .. "_bags;bag4;6.5,1.1;1,1;]"
+			"list[detached:" .. F(player_name) .. "_bags;bag1;0.5,1;1,1;]",
+			"list[detached:" .. F(player_name) .. "_bags;bag2;2.5,1;1,1;]",
+			"list[detached:" .. F(player_name) .. "_bags;bag3;4.5,1;1,1;]",
+			"list[detached:" .. F(player_name) .. "_bags;bag4;6.5,1;1,1;]"
 		}) }
 	end,
 })
@@ -49,27 +47,26 @@ for bag_i = 1, 4 do
 			local stack = get_player_bag_stack(player, bag_i)
 			local image = stack:get_definition().inventory_image
 			local fs = {
-				string.gsub(unified_inventory.standard_inv_bg, "YYY", "4.4"),
 				"image[7,0;1,1;" .. image .. "]",
 				"label[0,0;" .. F(S("Bag @1", bag_i)) .. "]",
 				"listcolors[#00000000;#00000000]",
-				"list[current_player;bag" .. bag_i .. "contents;0,1.1;8,3;]",
+				"list[current_player;bag" .. bag_i .. "contents;0,1;8,3;]",
 				"listring[current_name;bag" .. bag_i .. "contents]",
-				"listring[current_player;main]",
+				"listring[current_player;main]"
 			}
 			local slots = stack:get_definition().groups.bagslots
 			if slots == 8 then
-					fs[#fs + 1] = bags_inv_bg_prefix.."1.175;ui_bags_inv_small.png]"
+					fs[#fs + 1] = "background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
 			elseif slots == 16 then
-					fs[#fs + 1] = bags_inv_bg_prefix.."2.35;ui_bags_inv_medium.png]"
+					fs[#fs + 1] = "background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]"
 			elseif slots == 24 then
-					fs[#fs + 1] = bags_inv_bg_prefix.."3.525;ui_bags_inv_large.png]"
+					fs[#fs + 1] = "background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
 			end
 			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
-				fs[#fs + 1] = "image[5.91,-0.06;1.21,1.15;ui_bags_trash.png]"
+				fs[#fs + 1] = "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()
@@ -135,7 +132,7 @@ end
 local function load_bags_metadata(player, bags_inv)
 	local player_inv = player:get_inventory()
 	local meta = player:get_meta()
-	local bags_meta = meta:get("unified_inventory:bags")
+	local bags_meta = meta:get_string("unified_inventory:bags")
 	local bags = bags_meta and minetest.deserialize(bags_meta) or {}
 	local dirty_meta = false
 	if not bags_meta then

depends.txt

@@ -0,0 +1,5 @@
+default
+creative?
+sfinv?
+datastorage?
+farming?

description.txt

@@ -0,0 +1 @@
+Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide.

init.lua

@@ -44,10 +44,7 @@ unified_inventory = {
 	main_button_y = 9,
 	craft_result_x = 0.3,
 	craft_result_y = 0.5,
-	form_header_y = 0,
-	standard_background = "background[-0.2,-0.2;1,1;ui_form_bg.png;true]",    -- the 'true' scales to fill, overrides the 1,1
-	standard_inv =        "list[current_player;main;0,YYY;8,4;]",             -- the YYY's are placeholders which get
-	standard_inv_bg =     "image[-0.1,YYY;10.05,4.70;ui_main_inventory.png]", -- replaced later by string.gsub()
+	form_header_y = 0
 }
 
 -- Disable default creative inventory
@@ -80,3 +77,5 @@ dofile(modpath.."/item_names.lua")
 if minetest.get_modpath("datastorage") then
 	dofile(modpath.."/waypoints.lua")
 end
+
+minetest.log("action", "[unified_inventory] loaded.")

internal.lua

@@ -65,13 +65,13 @@ function unified_inventory.get_formspec(player, page)
 	local formspec = {
 		"size[14,10]",
 		pagedef.formspec_prepend and "" or "no_prepend[]",
-		unified_inventory.standard_background -- Background
+		"background[-0.19,-0.25;14.4,10.75;ui_form_bg.png]" -- Background
 	}
 	local n = 4
 
 	if draw_lite_mode then
 		formspec[1] = "size[11,7.7]"
-		formspec[3] = unified_inventory.standard_background
+		formspec[3] = "background[-0.19,-0.2;11.4,8.4;ui_form_bg.png]"
 	end
 
 	if unified_inventory.is_creative(player_name)
@@ -99,17 +99,21 @@ function unified_inventory.get_formspec(player, page)
 		end
 	end
 
+	local j = 1 --Modif NALC (sys4 20/11/2018) 12 buttons max by row
 	for i, def in pairs(filtered_inv_buttons) do
 
 		if draw_lite_mode and i > 4 then
 			button_row = 1
 			button_col = 1
+		elseif not draw_lite_mode and j > 12 then
+			button_row = 1
+			j = 1
 		end
 
 		if def.type == "image" then
 			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+1] = ( ui_peruser.main_button_x + 0.65 * (j - 1) - button_col * 0.65 * 4) -- Modif NALC
 				formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
 				formspec[n+3] = F(def.image)..";"
 				formspec[n+4] = F(def.name)..";]"
@@ -118,19 +122,20 @@ function unified_inventory.get_formspec(player, page)
 				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+1] = ( ui_peruser.main_button_x + 0.65 * (j - 1) - button_col * 0.65 * 4) -- Modif NALC
 				formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
 				formspec[n+3] = F(def.image).."^[colorize:#808080:alpha]"
 				n = n+4
 
 			end
 		end
+		j = j + 1 -- Modif NALC
 	end
 
 	if fsdata.draw_inventory ~= false then
 		-- Player inventory
 		formspec[n] = "listcolors[#00000000;#00000000]"
-		formspec[n+1] = string.gsub(unified_inventory.standard_inv, "YYY", ui_peruser.formspec_y + 3.5)
+		formspec[n+1] = "list[current_player;main;0,"..(ui_peruser.formspec_y + 3.5)..";8,4;]"
 		n = n+2
 	end
 
@@ -290,14 +295,10 @@ function unified_inventory.apply_filter(player, filter, search_dir)
 			return true
 		end
 	else
-		local lang = minetest.get_player_information(player_name).lang_code
 		ffilter = function(name, def)
 			local lname = string.lower(name)
 			local ldesc = string.lower(def.description)
-			local llocaldesc = minetest.get_translated_string
-				and string.lower(minetest.get_translated_string(lang, def.description))
 			return string.find(lname, lfilter, 1, true) or string.find(ldesc, lfilter, 1, true)
-				or llocaldesc and string.find(llocaldesc, lfilter, 1, true)
 		end
 	end
 	unified_inventory.filtered_items_list[player_name]={}

locale/unified_inventory.zh_CN.tr

@@ -73,7 +73,6 @@ World position=世界位置
 Name=名称
 HUD text color=HUD文本颜色
 
-Reset search and display everything=重置搜索并显示所有物品
+#new
 
-Any item belonging to the @1 group=属于@1组的任何项目
-Any item belonging to the groups @1=属于组@1的任何项目
+Reset search and display everything=重置搜索并显示所有物品

locale/unified_inventory.zh_TW.tr

@@ -73,7 +73,6 @@ World position=世界位置
 Name=名稱
 HUD text color=HUD文本顏色
 
-Reset search and display everything=重置搜索並顯示所有物品
+#new
 
-Any item belonging to the @1 group=屬於@1組的任何項目
-Any item belonging to the groups @1=屬於組@1的任何項目
+Reset search and display everything=重置搜索並顯示所有物品

mod.conf

@@ -1,7 +1,4 @@
 name = unified_inventory
 depends = default
 optional_depends = creative, sfinv, datastorage, farming
-description = """
-Unified Inventory replaces the default survival and creative inventory.
-It adds a nicer interface and a number of features, such as a crafting guide.
-"""
+description = Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide.

register.lua

@@ -41,55 +41,6 @@ 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:get_pos())
-			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: @1", 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
-			if unified_inventory.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!"))
-			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",
 	image = "ui_sun_icon.png",
@@ -171,7 +122,7 @@ unified_inventory.register_page("craft", {
 
 		local player_name = player:get_player_name()
 		local formspec = "background[2,"..formspecy..";6,3;ui_crafting_form.png]"
-		formspec = formspec..string.gsub(unified_inventory.standard_inv_bg, "YYY", (formspecy + 3.4))
+		formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]"
 		formspec = formspec.."label[0,"..formheadery..";" ..F(S("Crafting")).."]"
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]"
@@ -268,7 +219,7 @@ unified_inventory.register_page("craftguide", {
 		local player_name = player:get_player_name()
 		local player_privs = minetest.get_player_privs(player_name)
 		local fs = {
-			string.gsub(unified_inventory.standard_inv_bg, "YYY", (formspecy + 3.4)),
+			"background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]",
 			"label[0,"..formheadery..";" .. F(S("Crafting Guide")) .. "]",
 			"listcolors[#00000000;#00000000]"
 		}

waypoints.lua

@@ -23,7 +23,7 @@ unified_inventory.register_page("waypoints", {
 		if not waypoints_temp[player_name] then waypoints_temp[player_name] = {hud = 1} end
 
 		local waypoints = datastorage.get(player_name, "waypoints")
-		local formspec = string.gsub(unified_inventory.standard_inv_bg, "YYY", "4.4") ..
+		local formspec = "background[0,4.5;8,4;ui_main_inventory.png]" ..
 			"image[0,0;1,1;ui_waypoints_icon.png]" ..
 			"label[1,0;" .. F(S("Waypoints")) .. "]"