diff --git a/mods/email/depends.txt b/mods/email/depends.txt index aa2dd22..0a08b85 100644 --- a/mods/email/depends.txt +++ b/mods/email/depends.txt @@ -1 +1,2 @@ chatplus? +sfinv? diff --git a/mods/email/init.lua b/mods/email/init.lua index 90e6ac4..32d2a04 100644 --- a/mods/email/init.lua +++ b/mods/email/init.lua @@ -72,8 +72,7 @@ end) function email.get_formspec(name) local inbox = email.get_inbox(name) - local fs = "size[12,8]" - fs = fs .. "vertlabel[0,0;email Mail]" + local fs = "vertlabel[0,0;Your Inbox]" function row(fs, c1, date, from, msg) date = minetest.formspec_escape(date) @@ -127,7 +126,7 @@ function email.show_inbox(name, text_mode) return true, "End of mail (" .. #inbox .. " items)" end else - local fs = email.get_formspec(name) + local fs = "size[12,8]" .. email.get_formspec(name) minetest.show_formspec(name, "email:inbox", fs) return true, "Opened inbox!" @@ -136,6 +135,21 @@ function email.show_inbox(name, text_mode) return true end +if minetest.global_exists("sfinv") then + sfinv.register_page("email:inbox", { + title = "Inbox", + get = function(self, player, context) + local name = player:get_player_name() + return ([[ + size[12,8] + bgcolor[#080808BB;true] + background[5,5;1,1;gui_formbg.png;true] + {{ nav }} + ]]) .. email.get_formspec(name) + end + }) +end + minetest.register_on_player_receive_fields(function(player,formname,fields) if fields.clear then local name = player:get_player_name() diff --git a/mods/rules/init.lua b/mods/rules/init.lua index 88a56cf..88d7822 100644 --- a/mods/rules/init.lua +++ b/mods/rules/init.lua @@ -31,7 +31,7 @@ rules.txt = table.concat(items, ",") if minetest.global_exists("sfinv") then sfinv.register_page("rules:rules", { title = "Rules", - get = function(player, context) + get = function(self, player, context) return ([[ size[8,8.6] bgcolor[#080808BB;true] diff --git a/mods/sfinv/init.lua b/mods/sfinv/init.lua index 4a4b19c..e2843ab 100644 --- a/mods/sfinv/init.lua +++ b/mods/sfinv/init.lua @@ -5,7 +5,7 @@ sfinv.register_page("sfinv:crafting", { is_in_nav = function(player, context) return true end, - get = function(player, context) + get = function(self, player, context) return [[ {{ layout }} list[current_player;craft;1.75,0.5;3,3;] list[current_player;craftpreview;5.75,1.5;1,1;]