Browse Source

finished work on private player skins support

pull/2/head
Alexander Weber 2 years ago
parent
commit
920061c0f1
6 changed files with 46 additions and 12 deletions
  1. +2
    -0
      .gitignore
  2. +0
    -1
      meta/placeholder.txt
  3. +5
    -0
      meta/readme.txt
  4. +1
    -1
      sfinv_page.lua
  5. +34
    -10
      skinlist.lua
  6. +4
    -0
      textures/readme.txt

+ 2
- 0
.gitignore View File

@@ -1,2 +1,4 @@
textures/character_*.png
textures/player_*.png
meta/character_*.txt
meta/player_*.txt

+ 0
- 1
meta/placeholder.txt View File

@@ -1 +0,0 @@
Please run the update_from_db.py script to update the skins.

+ 5
- 0
meta/readme.txt View File

@@ -0,0 +1,5 @@
For each skin in textures folder a metadata file can be applied with "txt" suffilx. See character_1.txt for skin character_1.png for reference.
The file contains:
Skin name
Author
License

+ 1
- 1
sfinv_page.lua View File

@@ -81,7 +81,7 @@ sfinv.register_page("skins:overview", {
title = "Skins",
get = function(self, player, context)
-- collect skins data
context.skins_list = skins.get_skinlist()
context.skins_list = skins.get_skinlist("player:"..player:get_player_name(), true)
context.total_pages = 1
for i, skin in ipairs(context.skins_list ) do
local page = math.floor((i-1) / 16)+1

+ 34
- 10
skinlist.lua View File

@@ -3,42 +3,65 @@ local skins_dir_list = minetest.get_dir_list(skins.modpath.."/textures")
local unsorted_skinslist = {}
local sorted_skinslist
for _, fn in pairs(skins_dir_list) do
if fn:find("^character_") then
nameparts = string.gsub(fn, "[.]", "_"):split("_")
local id = nameparts[2]
local name = "character_"..id
local nameparts = string.gsub(fn, "[.]", "_"):split("_")

local name, sort_id, assignment, is_preview
if nameparts[1] == "character" then
sort_id = tonumber(nameparts[2])+5000
name = "character_"..nameparts[2]
is_preview = (nameparts[3] == "preview")
elseif nameparts[1] == "player" then
assignment = "player:"..nameparts[2]
name = "player_"..nameparts[2]
if tonumber(nameparts[3]) then
sort_id = tonumber(nameparts[3])
is_preview = (nameparts[4] == "preview")
name = name.."_"..nameparts[3]
else
sort_id = 1
is_preview = (nameparts[3] == "preview")
end
end

if name then
local skin_obj = skins.get(name) or skins.new(name)
if nameparts[3] == "preview" then
if is_preview then
skin_obj:set_preview(fn)
else
skin_obj:set_texture(fn)
skin_obj:set_meta("_sort_id", sort_id)
if assignment then
skin_obj:set_meta("assignment", assignment)
end
local file = io.open(skins.modpath.."/meta/"..name..".txt", "r")
if file then
local data = string.split(file:read("*all"), "\n", 3)
file:close()
skin_obj:set_texture(fn)
skin_obj:set_meta("_sort_id", tonumber(id))
skin_obj:set_meta("name", data[1])
skin_obj:set_meta("author", data[2])
skin_obj:set_meta("license", data[3])
else
skin_obj:set_meta("name", name)
end
table.insert(unsorted_skinslist, skin_obj)
end
end
end

function skins.get_skinlist(listname)
-- get skinlist. If assignment given ("mod:wardrobe" or "player:bell07") select skins matches the assignment. select_unassigned selects the skins without any assignment too
function skins.get_skinlist(assignment, select_unassigned)
-- sort on demand
if not sorted_skinslist then
table.sort(unsorted_skinslist, function(a,b) return a:get_meta("_sort_id") < b:get_meta("_sort_id") end)
sorted_skinslist = unsorted_skinslist
end
if not listname then
if not assignment then
return sorted_skinslist
else
local ret = {}
for _, skin in ipairs(sorted_skinslist) do
if skin:get_meta(listname) then
if assignment == skin:get_meta("assignment") or
(select_unassigned and skin:get_meta("assignment") == nil) then
table.insert(ret, skin)
end
end

+ 4
- 0
textures/readme.txt View File

@@ -0,0 +1,4 @@
In this folder the skin files could be placed according the next file naming convention
character_[number].png - Public skin, available for all users
player_[nick].png or player_[nick]_[number].png - one or multiple private skins for player "nick"
*_preview.png - Preview files for public and private skins

Loading…
Cancel
Save