Allow per-user "full" mode when "lite" mode is set as global

default (give the user "ui_full" priv to turn it on).

Also, a few whitespace fixes.

1 files changed, 131 insertions, 113 deletions

diff --git a/register.lua b/register.lua
index b46cea5..be8d62f 100644
--- a/register.lua
+++ b/register.lua
@@ -5,6 +5,12 @@ minetest.register_privilege("creative", {
 	give_to_singleplayer = false,
 })
 
+minetest.register_privilege("ui_full", {
+	description = "Forces UI to display in Full mode when Lite mode is configured globally",
+	give_to_singleplayer = false,
+})
+
+
 local trash = minetest.create_detached_inventory("trash", {
 	--allow_put = function(inv, listname, index, stack, player)
 	--	if unified_inventory.is_creative(player:get_player_name()) then
@@ -33,84 +39,86 @@ unified_inventory.register_button("craftguide", {
 	tooltip = S("Crafting Guide")
 })
 
-if not unified_inventory.lite_mode then
-	unified_inventory.register_button("home_gui_set", {
-		type = "image",
-		image = "ui_sethome_icon.png",
-		tooltip = S("Set home position"),
-		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_go", {
-		type = "image",
-		image = "ui_gohome_icon.png",
-		tooltip = S("Go home"),
-		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("misc_set_day", {
-		type = "image",
-		image = "ui_sun_icon.png",
-		tooltip = S("Set time to day"),
-		action = function(player)
-			local player_name = player:get_player_name()
-			if minetest.check_player_privs(player_name, {settime=true}) then
-				minetest.sound_play("birds",
-						{to_player=player_name, gain = 1.0})
-				minetest.set_timeofday((6000 % 24000) / 24000)
-				minetest.chat_send_player(player_name,
-					S("Time of day set to 6am"))
-			else
-				minetest.chat_send_player(player_name,
-					S("You don't have the settime privilege!"))
-			end
-		end,
-	})
-
-	unified_inventory.register_button("misc_set_night", {
-		type = "image",
-		image = "ui_moon_icon.png",
-		tooltip = S("Set time to night"),
-		action = function(player)
-			local player_name = player:get_player_name()
-			if minetest.check_player_privs(player_name, {settime=true}) then
-				minetest.sound_play("owl",
+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.set_timeofday((21000 % 24000) / 24000)
-				minetest.chat_send_player(player_name,
-						S("Time of day set to 9pm"))
-			else
 				minetest.chat_send_player(player_name,
-						S("You don't have the settime privilege!"))
+					S("Home position set to: %s"):format(minetest.pos_to_string(home)))
 			end
-		end,
-	})
-end
+		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!"))
+		end
+	end,
+})
+
+unified_inventory.register_button("misc_set_day", {
+	type = "image",
+	image = "ui_sun_icon.png",
+	tooltip = S("Set time to day"),
+	hide_lite=true,
+	action = function(player)
+		local player_name = player:get_player_name()
+		if minetest.check_player_privs(player_name, {settime=true}) then
+			minetest.sound_play("birds",
+					{to_player=player_name, gain = 1.0})
+			minetest.set_timeofday((6000 % 24000) / 24000)
+			minetest.chat_send_player(player_name,
+				S("Time of day set to 6am"))
+		else
+			minetest.chat_send_player(player_name,
+				S("You don't have the settime privilege!"))
+		end
+	end,
+})
+
+unified_inventory.register_button("misc_set_night", {
+	type = "image",
+	image = "ui_moon_icon.png",
+	tooltip = S("Set time to night"),
+	hide_lite=true,
+	action = function(player)
+		local player_name = player:get_player_name()
+		if minetest.check_player_privs(player_name, {settime=true}) then
+			minetest.sound_play("owl",
+					{to_player=player_name, gain = 1.0})
+			minetest.set_timeofday((21000 % 24000) / 24000)
+			minetest.chat_send_player(player_name,
+					S("Time of day set to 9pm"))
+		else
+			minetest.chat_send_player(player_name,
+					S("You don't have the settime privilege!"))
+		end
+	end,
+})
 
 unified_inventory.register_button("clear_inv", {
 	type = "image",
@@ -134,19 +142,23 @@ unified_inventory.register_button("clear_inv", {
 })
 
 unified_inventory.register_page("craft", {
-	get_formspec = function(player, formspec)
+	get_formspec = function(player, perplayer_formspec)
+
+		local formspecy = perplayer_formspec.formspec_y
+		local formheadery =  perplayer_formspec.form_header_y
+
 		local player_name = player:get_player_name()
-		local formspec = "background[2,"..unified_inventory.formspec_y..";6,3;ui_crafting_form.png]"
-		formspec = formspec.."background[0,"..(unified_inventory.formspec_y + 3.5)..";8,4;ui_main_inventory.png]"
-		formspec = formspec.."label[0,"..unified_inventory.form_header_y..";Crafting]"
+		local formspec = "background[2,"..formspecy..";6,3;ui_crafting_form.png]"
+		formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]"
+		formspec = formspec.."label[0,"..formheadery..";Crafting]"
 		formspec = formspec.."listcolors[#00000000;#00000000]"
-		formspec = formspec.."list[current_player;craftpreview;6,"..unified_inventory.formspec_y..";1,1;]"
-		formspec = formspec.."list[current_player;craft;2,"..unified_inventory.formspec_y..";3,3;]"
-		formspec = formspec.."label[7,"..(unified_inventory.formspec_y + 1.5)..";" .. S("Trash:") .. "]"
-		formspec = formspec.."list[detached:trash;main;7,"..(unified_inventory.formspec_y + 2)..";1,1;]"
+		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)..";" .. S("Trash:") .. "]"
+		formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
 		if unified_inventory.is_creative(player_name) then
-			formspec = formspec.."label[0,"..(unified_inventory.formspec_y + 1.5)..";" .. S("Refill:") .. "]"
-			formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."refill;main;0,"..(unified_inventory.formspec_y +2)..";1,1;]"
+			formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. S("Refill:") .. "]"
+			formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."refill;main;0,"..(formspecy +2)..";1,1;]"
 		end
 		return {formspec=formspec}
 	end,
@@ -204,12 +216,18 @@ local other_dir = {
 }
 
 unified_inventory.register_page("craftguide", {
-	get_formspec = function(player)
+	get_formspec = function(player, perplayer_formspec)
+
+		local formspecy =    perplayer_formspec.formspec_y
+		local formheadery =  perplayer_formspec.form_header_y
+		local craftresultx = perplayer_formspec.craft_result_x
+		local craftresulty = perplayer_formspec.craft_result_y
+
 		local player_name = player:get_player_name()
 		local player_privs = minetest.get_player_privs(player_name)
 		local formspec = ""
-		formspec = formspec.."background[0,"..(unified_inventory.formspec_y + 3.5)..";8,4;ui_main_inventory.png]"
-		formspec = formspec.."label[0,"..unified_inventory.form_header_y..";" .. S("Crafting Guide") .. "]"
+		formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]"
+		formspec = formspec.."label[0,"..formheadery..";" .. S("Crafting Guide") .. "]"
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		local item_name = unified_inventory.current_item[player_name]
 		if not item_name then return {formspec=formspec} end
@@ -226,25 +244,25 @@ unified_inventory.register_page("craftguide", {
 			craft = crafts[alternate]
 		end
 
-		formspec = formspec.."background[0.5,"..(unified_inventory.formspec_y + 0.2)..";8,3;ui_craftguide_form.png]"
-		formspec = formspec.."textarea["..unified_inventory.craft_result_x..","..unified_inventory.craft_result_y
+		formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]"
+		formspec = formspec.."textarea["..craftresultx..","..craftresulty
                            ..";10,1;;"..minetest.formspec_escape(role_text[dir]..": "..item_name)..";]"
-		formspec = formspec..stack_image_button(0, unified_inventory.formspec_y, 1.1, 1.1, "item_button_"
+		formspec = formspec..stack_image_button(0, formspecy, 1.1, 1.1, "item_button_"
 		                   .. rdir .. "_", ItemStack(item_name))
 
 		if not craft then
-			formspec = formspec.."label[5.5,"..(unified_inventory.formspec_y + 2.35)..";"
+			formspec = formspec.."label[5.5,"..(formspecy + 2.35)..";"
 			                   ..minetest.formspec_escape(no_recipe_text[dir]).."]"
 			local no_pos = dir == "recipe" and 4.5 or 6.5
 			local item_pos = dir == "recipe" and 6.5 or 4.5
-			formspec = formspec.."image["..no_pos..","..unified_inventory.formspec_y..";1.1,1.1;ui_no.png]"
-			formspec = formspec..stack_image_button(item_pos, unified_inventory.formspec_y, 1.1, 1.1, "item_button_"
+			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
-				formspec = formspec.."label[0,"..(unified_inventory.formspec_y + 2.10)..";" .. S("Give me:") .. "]"
-						.."button[0,  "..(unified_inventory.formspec_y + 2.7)..";0.6,0.5;craftguide_giveme_1;1]"
-						.."button[0.6,"..(unified_inventory.formspec_y + 2.7)..";0.7,0.5;craftguide_giveme_10;10]"
-						.."button[1.3,"..(unified_inventory.formspec_y + 2.7)..";0.8,0.5;craftguide_giveme_99;99]"
+				formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. S("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]"
+						.."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]"
 			end
 			return {formspec = formspec}
 		end
@@ -252,10 +270,10 @@ unified_inventory.register_page("craftguide", {
 		local craft_type = unified_inventory.registered_craft_types[craft.type] or
 				unified_inventory.craft_type_defaults(craft.type, {})
 		if craft_type.icon then
-			formspec = formspec..string.format(" image[%f,%f;%f,%f;%s]",5.7,(unified_inventory.formspec_y + 0.05),0.5,0.5,craft_type.icon)
+			formspec = formspec..string.format(" image[%f,%f;%f,%f;%s]",5.7,(formspecy + 0.05),0.5,0.5,craft_type.icon)
 		end
-		formspec = formspec.."label[5.5,"..(unified_inventory.formspec_y + 1)..";" .. minetest.formspec_escape(craft_type.description).."]"
-		formspec = formspec..stack_image_button(6.5, unified_inventory.formspec_y, 1.1, 1.1, "item_button_usage_", ItemStack(craft.output))
+		formspec = formspec.."label[5.5,"..(formspecy + 1)..";" .. minetest.formspec_escape(craft_type.description).."]"
+		formspec = formspec..stack_image_button(6.5, formspecy, 1.1, 1.1, "item_button_usage_", ItemStack(craft.output))
 		local display_size = craft_type.dynamic_display_size and craft_type.dynamic_display_size(craft) or { width = craft_type.width, height = craft_type.height }
 		local craft_width = craft_type.get_shaped_craft_width and craft_type.get_shaped_craft_width(craft) or display_size.width
 
@@ -270,36 +288,36 @@ unified_inventory.register_page("craftguide", {
 			end
 			if item then
 				formspec = formspec..stack_image_button(
-						xoffset + x, unified_inventory.formspec_y - 1 + y, 1.1, 1.1,
+						xoffset + x, formspecy - 1 + y, 1.1, 1.1,
 						"item_button_recipe_",
 						ItemStack(item))
 			else
 				-- Fake buttons just to make grid
 				formspec = formspec.."image_button["
-					..tostring(xoffset + x)..","..tostring(unified_inventory.formspec_y - 1 + y)
+					..tostring(xoffset + x)..","..tostring(formspecy - 1 + y)
 					..";1,1;ui_blank_image.png;;]"
 			end
 		end
 		end
 
 		if craft_type.uses_crafting_grid then
-			formspec = formspec.."label[0,"..(unified_inventory.formspec_y + 0.9)..";" .. S("To craft grid:") .. "]"
-					.."button[0,  "..(unified_inventory.formspec_y + 1.5)..";0.6,0.5;craftguide_craft_1;1]"
-					.."button[0.6,"..(unified_inventory.formspec_y + 1.5)..";0.7,0.5;craftguide_craft_10;10]"
-					.."button[1.3,"..(unified_inventory.formspec_y + 1.5)..";0.8,0.5;craftguide_craft_max;" .. S("All") .. "]"
+			formspec = formspec.."label[0,"..(formspecy + 0.9)..";" .. S("To craft grid:") .. "]"
+					.."button[0,  "..(formspecy + 1.5)..";0.6,0.5;craftguide_craft_1;1]"
+					.."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;" .. S("All") .. "]"
 		end
 		if player_privs.give then
-			formspec = formspec.."label[0,"..(unified_inventory.formspec_y + 2.1)..";" .. S("Give me:") .. "]"
-					.."button[0,  "..(unified_inventory.formspec_y + 2.7)..";0.6,0.5;craftguide_giveme_1;1]"
-					.."button[0.6,"..(unified_inventory.formspec_y + 2.7)..";0.7,0.5;craftguide_giveme_10;10]"
-					.."button[1.3,"..(unified_inventory.formspec_y + 2.7)..";0.8,0.5;craftguide_giveme_99;99]"
+			formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. S("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]"
+					.."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]"
 		end
 
 		if alternates and alternates > 1 then
-			formspec = formspec.."label[5.5,"..(unified_inventory.formspec_y + 1.6)..";"..recipe_text[dir].." "
+			formspec = formspec.."label[5.5,"..(formspecy + 1.6)..";"..recipe_text[dir].." "
 					..tostring(alternate).." of "
 					..tostring(alternates).."]"
-					.."button[5.5,"..(unified_inventory.formspec_y + 2)..";2,1;alternate;" .. S("Alternate") .. "]"
+					.."button[5.5,"..(formspecy + 2)..";2,1;alternate;" .. S("Alternate") .. "]"
 		end
 		return {formspec = formspec}
 	end,