Merge remote-tracking branch 'upstream/master'

init.lua

@@ -170,3 +170,4 @@ end
 
 dofile(modpath.."/item_names.lua")
 dofile(modpath.."/waypoints.lua")
+minetest.log("action", "[unified_inventory] loaded.")

internal.lua

@@ -58,14 +58,18 @@ local function formspec_add_filters(player, formspec, style)
 		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 style.is_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
-			local pos_x = style.main_button_x + style.btn_spc * (i - 1) - button_col * style.btn_spc * 4
+			local pos_x = style.main_button_x + style.btn_spc * (j - 1) - button_col * style.btn_spc * 4
 			local pos_y = style.main_button_y + button_row * style.btn_spc
 			if (def.condition == nil or def.condition(player) == true) then
 				formspec[n] = string.format("image_button[%f,%f;%f,%f;%s;%s;]",
@@ -81,6 +85,7 @@ local function formspec_add_filters(player, formspec, style)
 				n = n+1
 			end
 		end
+		j = j + 1 -- Modif NALC
 	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",