minetest-mods
/
skinsdb
mirror of https://github.com/minetest-mods/skinsdb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

get unified_inventory working again

This commit is contained in:
Alexander Weber 2017-06-16 23:27:30 +02:00
parent 8d991881aa
commit 077312257d
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sfinv_page.lua
View File

@ -6,7 +6,6 @@ else
end end
local dropdown_values = {} local dropdown_values = {}
--local skins_reftab = {} --skins.list
-- collect skins data -- collect skins data
local total_pages = 1 local total_pages = 1

53
unified_inventory_page.lua
View File

@ -7,36 +7,31 @@ end
local dropdown_values = {} local dropdown_values = {}
local skins_reftab = {} local skins_reftab = {}
local skins_reftab_byskin = {}
unified_inventory.register_page("skins", { unified_inventory.register_page("skins", {
get_formspec = function(player) get_formspec = function(player)
local name = player:get_player_name() local name = player:get_player_name()
local skin = skins.get_player_skin(player) local skin = skins.get_player_skin(player)
local formspec = ("background[0.06,0.99;7.92,7.52;ui_misc_form.png]" local formspec = ("background[0.06,0.99;7.92,7.52;ui_misc_form.png]"
.."image[0,.75;1,2;"..skins.preview[skin].."]" .."image[0,.75;1,2;"..skin:get_preview().."]"
.."label[6,.5;"..S("Raw texture")..":]" .."label[6,.5;"..S("Raw texture")..":]"
.."image[6,1;2,1;"..skins.textures[skin].."]") .."image[6,1;2,1;"..skin:get_texture().."]")
local meta = skins.meta[skin]
if meta then local m_name = skin:get_meta_string("name")
if meta.name ~= "" then local m_author = skin:get_meta_string("author")
formspec = formspec.."label[2,.5;"..S("Name")..": "..minetest.formspec_escape(meta.name).."]" local m_license = skin:get_meta_string("license")
end if m_name ~= "" then
if meta.author ~= "" then formspec = formspec.."label[2,.5;"..S("Name")..": "..minetest.formspec_escape(m_name).."]"
formspec = formspec.."label[2,1;"..S("Author")..": "..minetest.formspec_escape(meta.author).."]"
end
if meta.license ~= "" then
formspec = formspec.."label[2,1.5;"..S("License")..": "..minetest.formspec_escape(meta.license).."]"
end
if meta.description ~= "" then --what's that??
formspec = formspec.."label[2,2;"..S("Description")..": "..minetest.formspec_escape(meta.description).."]"
end
end end
local page = 1 if m_author ~= "" then
if skins_reftab_byskin[skin] then formspec = formspec.."label[2,1;"..S("Author")..": "..minetest.formspec_escape(m_author).."]"
page = skins_reftab_byskin[skin].page
end end
if m_license ~= "" then
formspec = formspec.."label[2,1.5;"..S("License")..": "..minetest.formspec_escape(m_license).."]"
end
local page = skin:get_meta("inv_page") or 1
formspec = formspec .. "button[.75,3;6.5,.5;skins_page$"..page..";"..S("Change").."]" formspec = formspec .. "button[.75,3;6.5,.5;skins_page$"..page..";"..S("Change").."]"
return {formspec=formspec} return {formspec=formspec}
end, end,
@ -51,20 +46,20 @@ unified_inventory.register_button("skins", {
local total_pages = 1 local total_pages = 1
for i, skin in ipairs(skins.list) do for i, skin in ipairs(skins.list) do
local page = math.floor((i-1) / 16)+1 local page = math.floor((i-1) / 16)+1
local index_p = (i-1)%16+1 skin:set_meta("inv_page", page)
skin:set_meta("inv_page_index", (i-1)%16+1)
skins_reftab[i] = { index = i, page = page, index_p = index_p, skin = skin }
skins_reftab_byskin[skin] = skins_reftab[i]
total_pages = page total_pages = page
end end
for page=1, total_pages do for page=1, total_pages do
local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]"
for i = (page-1)*16+1, page*16 do for i = (page-1)*16+1, page*16 do
if not skins_reftab[i] then local skin = skins.list[i]
if not skin then
break break
end end
local index_p = skins_reftab[i].index_p
local index_p = skin:get_meta("inv_page_index")
local x = (index_p-1) % 8 local x = (index_p-1) % 8
local y local y
if index_p > 8 then if index_p > 8 then
@ -73,8 +68,8 @@ for page=1, total_pages do
y = -0.1 y = -0.1
end end
formspec = (formspec.."image_button["..x..","..y..";1,2;".. formspec = (formspec.."image_button["..x..","..y..";1,2;"..
skins.preview[skins_reftab[i].skin]..";skins_set$"..i..";]".. skin:get_preview()..";skins_set$"..i..";]"..
"tooltip[skins_set$"..i..";"..minetest.formspec_escape(skins.meta[skins_reftab[i].skin].name).."]") "tooltip[skins_set$"..i..";"..minetest.formspec_escape(skin:get_meta_string("name")).."]")
end end
local page_prev = page - 1 local page_prev = page - 1
local page_next = page + 1 local page_next = page + 1
@ -113,7 +108,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
for field, _ in pairs(fields) do for field, _ in pairs(fields) do
local current = string.split(field, "$", 2) local current = string.split(field, "$", 2)
if current[1] == "skins_set" then if current[1] == "skins_set" then
skins.set_player_skin(player, skins_reftab[tonumber(current[2])].skin) skins.set_player_skin(player, skins.list[tonumber(current[2])])
unified_inventory.set_inventory_formspec(player, "skins") unified_inventory.set_inventory_formspec(player, "skins")
return return
elseif current[1] == "skins_page" then elseif current[1] == "skins_page" then