minetest-mods/skinsdb
1
0
Fork 0
mirror of https://github.com/minetest-mods/skinsdb.git synced 2024-11-18 07:50:23 +01:00
Code Issues Releases Wiki Activity

finalized unified_inventory rework

Browse Source
This commit is contained in:
Alexander Weber 2017-06-15 16:16:57 +02:00
parent adc435e66b
commit 0def2bbae1
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
players.lua
View File

@ -20,7 +20,7 @@ end
skins.update_player_skin = function(player)
local skin = skins.get_player_skin(player)
player:set_properties({
textures = {skins.list[skin]},
textures = {skins.textures[skin]},
})
end

9
skinlist.lua
View File

@ -1,8 +1,10 @@
skins.list = {}
skins.textures = {}
skins.meta = {}
skins.preview = {}
local skins_dir_list = minetest.get_dir_list(skins.modpath.."/textures")
local unsorted_skinslist = {}
for _, fn in pairs(skins_dir_list) do
if fn:find("^character_") then
nameparts = string.gsub(fn, "[.]", "_"):split("_")
@ -15,7 +17,8 @@ for _, fn in pairs(skins_dir_list) do
if file then
local data = string.split(file:read("*all"), "\n", 3)
file:close()
skins.list[name] = fn
table.insert(unsorted_skinslist, {id = tonumber(id) or id, name = name})
skins.textures[name] = fn
skins.meta[name] = {}
skins.meta[name].name = data[1]
skins.meta[name].author = data[2]
@ -26,3 +29,7 @@ for _, fn in pairs(skins_dir_list) do
end
end
table.sort(unsorted_skinslist, function(a,b) return a.id < b.id end)
for _,v in ipairs(unsorted_skinslist) do
table.insert(skins.list, v.name)
end

29
unified_inventory_page.lua
View File

@ -16,7 +16,7 @@ unified_inventory.register_page("skins", {
local formspec = ("background[0.06,0.99;7.92,7.52;ui_misc_form.png]"
.."image[0,.75;1,2;"..skins.preview[skin].."]"
.."label[6,.5;"..S("Raw texture")..":]"
.."image[6,1;2,1;"..skins.list[skin].."]")
.."image[6,1;2,1;"..skins.textures[skin].."]")
local meta = skins.meta[skin]
if meta then
@ -51,11 +51,10 @@ unified_inventory.register_button("skins", {
skins.generate_pages = function()
local total_pages = 1
local i = 0
for skin, _ in pairs(skins.list) do
local page = math.floor(i / 16)+1
local index_p = i%16+1
i = i + 1
for i, skin in ipairs(skins.list) do
local page = math.floor((i-1) / 16)+1
local index_p = (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
@ -63,23 +62,21 @@ skins.generate_pages = function()
for page=1, total_pages do
local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]"
print(dump(skins_reftab[i]))
for i = (page-1)*16+1, page*16+1 do
print("print", i)
for i = (page-1)*16+1, page*16 do
if not skins_reftab[i] then
break
end
local index_p = skins_reftab[i].index_p
local x = index_p % 8
local x = (index_p-1) % 8
local y
if index_p >= 8 then
if index_p > 8 then
y = 1.8
else
y = -0.1
end
formspec = (formspec.."image_button["..x..","..y..";1,2;"..
skins.preview[skins_reftab[i].skin]..";skins_set$"..i..";]"..
"tooltip[skins_set$"..i..";"..skins.meta[skins_reftab[i].skin].name.."]")
"tooltip[skins_set$"..i..";"..minetest.formspec_escape(skins.meta[skins_reftab[i].skin].name).."]")
end
local page_prev = page - 1
local page_next = page + 1
@ -99,9 +96,8 @@ print(dump(skins_reftab[i]))
end
formspec = (formspec
.."button[0,3.8;1,.5;skins_page$"..page_prev..";<<]"
.."dropdown[1,3.65;6.5,.5;skins_selpg;"..page_list..";"..page.."]"
.."dropdown[1,3.68;6.5,.5;skins_selpg;"..page_list..";"..page.."]"
.."button[7,3.8;1,.5;skins_page$"..page_next..";>>]")
print("register page", page, formspec)
unified_inventory.register_page("skins_page$"..(page), {
get_formspec = function(player)
return {formspec=formspec}
@ -118,9 +114,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
for field, _ in pairs(fields) do
local current = string.split(field, "$", 2)
print(field, current[1], current[2])
if current[1] == "skins_set" then
skins.set_player_skin(player, skins.list[skins_reftab[current[2]]])
skins.set_player_skin(player, skins_reftab[tonumber(current[2])].skin)
unified_inventory.set_inventory_formspec(player, "skins")
return
elseif current[1] == "skins_page" then
@ -129,7 +124,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
end
if fields.skins_selpg then
page = dropdown_values[fields.skins_selpg]
local page = dropdown_values[fields.skins_selpg]
unified_inventory.set_inventory_formspec(player, "skins_page$"..(page))
return
end