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

init.lua

@@ -77,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

@@ -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,13 +122,14 @@ 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

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
-			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",
 	image = "ui_sun_icon.png",