diff options
| -rw-r--r-- | formspecs.lua | 85 | ||||
| -rw-r--r-- | sfinv_page.lua | 80 | ||||
| -rw-r--r-- | skin_meta_api.lua | 1 | ||||
| -rw-r--r-- | unified_inventory_page.lua | 100 |
4 files changed, 119 insertions, 147 deletions
diff --git a/formspecs.lua b/formspecs.lua index de53adb..0659724 100644 --- a/formspecs.lua +++ b/formspecs.lua @@ -1,5 +1,23 @@ local S = skins.S + +-- Prepare server-site state / context +function skins.rebuild_formspec_context(player, context) + local skin = skins.get_player_skin(player) + context.skins_list = skins.get_skinlist_for_player(player:get_player_name()) + context.total_pages = 1 + for i, skin in ipairs(context.skins_list ) do + local page = math.floor((i-1) / 16)+1 + skin:set_meta("inv_page", page) + skin:set_meta("inv_page_index", (i-1)%16+1) + context.total_pages = page + end + context.skins_page = context.skins_page or skin:get_meta("inv_page") + context.dropdown_values = nil + return context +end + + -- Show skin info function skins.get_skin_info_formspec(skin) local texture = skin:get_texture() @@ -23,3 +41,70 @@ function skins.get_skin_info_formspec(skin) end return formspec end + +function skins.get_skin_selection_formspec(context, y_delta) + local page = context.skins_page or 1 + local formspec = "" + for i = (page-1)*16+1, page*16 do + local skin = context.skins_list[i] + if not skin then + break + end + + local index_p = skin:get_meta("inv_page_index") + local x = (index_p-1) % 8 + local y + if index_p > 8 then + y = y_delta + 1.9 + else + y = y_delta + end + formspec = formspec.."image_button["..x..","..y..";1,2;".. + skin:get_preview()..";skins_set$"..i..";]".. + "tooltip[skins_set$"..i..";"..minetest.formspec_escape(skin:get_meta_string("name")).."]" + end + + if context.total_pages > 1 then + local page_prev = page - 1 + local page_next = page + 1 + if page_prev < 1 then + page_prev = context.total_pages + end + if page_next > context.total_pages then + page_next = 1 + end + local page_list = "" + context.dropdown_values = {} + for pg=1, context.total_pages do + local pagename = S("Page").." "..pg.."/"..context.total_pages + context.dropdown_values[pagename] = pg + if pg > 1 then page_list = page_list.."," end + page_list = page_list..pagename + end + formspec = formspec + .."button[0,"..(y_delta+4.0)..";1,.5;skins_page$"..page_prev..";<<]" + .."dropdown[0.9,"..(y_delta+3.88)..";6.5,.5;skins_selpg;"..page_list..";"..page.."]" + .."button[7,"..(y_delta+4.0)..";1,.5;skins_page$"..page_next..";>>]" + end + return formspec +end + +function skins.on_skin_selection_receive_fields(player, context, fields) + for field, _ in pairs(fields) do + local current = string.split(field, "$", 2) + if current[1] == "skins_set" then + local selected_skin = context.skins_list[tonumber(current[2])] + setmetatable(selected_skin, skins.skin_class) + + skins.set_player_skin(player, selected_skin) + return 'set' + elseif current[1] == "skins_page" then + context.skins_page = tonumber(current[2]) + return 'page' + end + end + if fields.skins_selpg then + context.skins_page = tonumber(context.dropdown_values[fields.skins_selpg]) + return 'page' + end +end diff --git a/sfinv_page.lua b/sfinv_page.lua index ab9cb3c..e90dd38 100644 --- a/sfinv_page.lua +++ b/sfinv_page.lua @@ -2,58 +2,9 @@ local S = skins.S -- generate the current formspec local function get_formspec(player, context) - local name = player:get_player_name() local skin = skins.get_player_skin(player) local formspec = skins.get_skin_info_formspec(skin) - - local page = 1 - if context.skins_page then - page = context.skins_page - else - page = skin:get_meta("inv_page") or 1 - end - - for i = (page-1)*16+1, page*16 do - local skin = context.skins_list[i] - if not skin then - break - end - - local index_p = skin:get_meta("inv_page_index") - local x = (index_p-1) % 8 - local y - if index_p > 8 then - y = 5.5 - else - y = 3.2 - end - formspec = formspec.."image_button["..x..","..y..";1,2;".. - skin:get_preview()..";skins_set$"..i..";]".. - "tooltip[skins_set$"..i..";"..minetest.formspec_escape(skin:get_meta_string("name")).."]" - end - - if context.total_pages > 1 then - local page_prev = page - 1 - local page_next = page + 1 - if page_prev < 1 then - page_prev = context.total_pages - end - if page_next > context.total_pages then - page_next = 1 - end - local page_list = "" - context.dropdown_values = {} - for pg=1, context.total_pages do - local pagename = S("Page").." "..pg.."/"..context.total_pages - context.dropdown_values[pagename] = pg - if pg > 1 then page_list = page_list.."," end - page_list = page_list..pagename - end - formspec = formspec - .."button[0,8.3;1,.5;skins_page$"..page_prev..";<<]" - .."dropdown[1,8.16;6.5,.5;skins_selpg;"..page_list..";"..page.."]" - .."button[7,8.3;1,.5;skins_page$"..page_next..";>>]" - end + formspec = formspec..skins.get_skin_selection_formspec(context, 4) return formspec end @@ -61,34 +12,11 @@ sfinv.register_page("skins:overview", { title = "Skins", get = function(self, player, context) -- collect skins data - context.skins_list = skins.get_skinlist_for_player(player:get_player_name()) - context.total_pages = 1 - for i, skin in ipairs(context.skins_list ) do - local page = math.floor((i-1) / 16)+1 - skin:set_meta("inv_page", page) - skin:set_meta("inv_page_index", (i-1)%16+1) - context.total_pages = page - end - -- generate first formspec + context = skins.rebuild_formspec_context(player, context) return sfinv.make_formspec(player, context, get_formspec(player, context)) end, on_player_receive_fields = function(self, player, context, fields) - for field, _ in pairs(fields) do - local current = string.split(field, "$", 2) - if current[1] == "skins_set" then - skins.set_player_skin(player, context.skins_list[tonumber(current[2])]) - sfinv.set_player_inventory_formspec(player) - return - elseif current[1] == "skins_page" then - context.skins_page = tonumber(current[2]) - sfinv.set_player_inventory_formspec(player) - return - end - end - if fields.skins_selpg then - context.skins_page = tonumber(context.dropdown_values[fields.skins_selpg]) - sfinv.set_player_inventory_formspec(player) - return - end + skins.on_skin_selection_receive_fields(player, context, fields) + sfinv.set_player_inventory_formspec(player) end }) diff --git a/skin_meta_api.lua b/skin_meta_api.lua index 5ff17f1..ec57b58 100644 --- a/skin_meta_api.lua +++ b/skin_meta_api.lua @@ -2,6 +2,7 @@ skins.meta = {} local skin_class = {} skin_class.__index = skin_class +skins.skin_class = skin_class ----------------------- -- Class methods ----------------------- diff --git a/unified_inventory_page.lua b/unified_inventory_page.lua index 5a581d5..332e3cb 100644 --- a/unified_inventory_page.lua +++ b/unified_inventory_page.lua @@ -1,14 +1,10 @@ local S = skins.S -local dropdown_values = {} -local skins_reftab = {} -local skins_list = skins.get_skinlist_for_player() --public only unified_inventory.register_page("skins", { get_formspec = function(player) local skin = skins.get_player_skin(player) - local page = skin:get_meta("inv_page") or 1 local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]"..skins.get_skin_info_formspec(skin).. - "button[.75,3;6.5,.5;skins_page$"..page..";"..S("Change").."]" + "button[.75,3;6.5,.5;skins_page;"..S("Change").."]" return {formspec=formspec} end, }) @@ -18,85 +14,47 @@ unified_inventory.register_button("skins", { image = "skins_button.png", }) --- Create all of the skin-picker pages. -local total_pages = 1 -for i, skin in ipairs(skins_list) do - local page = math.floor((i-1) / 16)+1 - skin:set_meta("inv_page", page) - skin:set_meta("inv_page_index", (i-1)%16+1) - total_pages = page +local function get_formspec(player) + -- unified inventory is stateless, but skins pager needs some context usage to be more flexible + local context = minetest.deserialize(player:get_attribute('skinsdb_unified_inventory_context')) or {} + context = skins.rebuild_formspec_context(player, context) + local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]".. + skins.get_skin_selection_formspec(context, -0.2) + player:set_attribute('skinsdb_unified_inventory_context', minetest.serialize(context)) + return formspec end -for page=1, total_pages do - local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" - for i = (page-1)*16+1, page*16 do - local skin = skins_list[i] - if not skin then - break - end - - local index_p = skin:get_meta("inv_page_index") - local x = (index_p-1) % 8 - local y - if index_p > 8 then - y = 1.8 - else - y = -0.1 - end - formspec = (formspec.."image_button["..x..","..y..";1,2;".. - skin:get_preview()..";skins_set$"..i..";]".. - "tooltip[skins_set$"..i..";"..minetest.formspec_escape(skin:get_meta_string("name")).."]") - end - if total_pages > 1 then - local page_prev = page - 1 - local page_next = page + 1 - if page_prev < 1 then - page_prev = total_pages - end - if page_next > total_pages then - page_next = 1 - end - local page_list = "" - dropdown_values = {} - for pg=1, total_pages do - local pagename = S("Page").." "..pg.."/"..total_pages - dropdown_values[pagename] = pg - if pg > 1 then page_list = page_list.."," end - page_list = page_list..pagename - end - formspec = (formspec - .."button[0,3.8;1,.5;skins_page$"..page_prev..";<<]" - .."dropdown[1,3.68;6.5,.5;skins_selpg;"..page_list..";"..page.."]" - .."button[7,3.8;1,.5;skins_page$"..page_next..";>>]") +unified_inventory.register_page("skins_page", { + get_formspec = function(player) + return {formspec=get_formspec(player)} end - unified_inventory.register_page("skins_page$"..(page), { - get_formspec = function(player) - return {formspec=formspec} - end - }) -end - +}) -- click button handlers minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.skins then + player:set_attribute('skinsdb_unified_inventory_context',"") --reset context unified_inventory.set_inventory_formspec(player, "craft") return end + + local context -- read context only if skins related action for field, _ in pairs(fields) do - local current = string.split(field, "$", 2) - if current[1] == "skins_set" then - skins.set_player_skin(player, skins_list[tonumber(current[2])]) - unified_inventory.set_inventory_formspec(player, "skins") - return - elseif current[1] == "skins_page" then - unified_inventory.set_inventory_formspec(player, "skins_page$"..current[2]) - return + if field:sub(1,5) == "skins" then + context = minetest.deserialize(player:get_attribute('skinsdb_unified_inventory_context')) or {} + break end end - if fields.skins_selpg then - local page = dropdown_values[fields.skins_selpg] - unified_inventory.set_inventory_formspec(player, "skins_page$"..(page)) + if not context then return end + + local action = skins.on_skin_selection_receive_fields(player, context, fields) + if action == 'set' then + player:set_attribute('skinsdb_unified_inventory_context',"") --reset context + unified_inventory.set_inventory_formspec(player, "skins") + elseif action == 'page' then + player:set_attribute('skinsdb_unified_inventory_context', minetest.serialize(context)) + unified_inventory.set_inventory_formspec(player, "skins_page") + end end) |