From 8d7f11ae67903c04af0431dd22906c8ee9a15967 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Wed, 23 Jul 2014 12:47:12 +0200 Subject: [PATCH] Some updates Elminate 2d-skins Skinlist wrap around Save last visited page Cleaner codes -- Full compatible to pthe previous version --- u_skins/init.lua | 191 +++++++++++++++++++++---------------------- u_skins/players.lua | 27 +++--- u_skins/skinlist.lua | 6 +- 3 files changed, 106 insertions(+), 118 deletions(-) diff --git a/u_skins/init.lua b/u_skins/init.lua index bbf7dbd..38a1df7 100644 --- a/u_skins/init.lua +++ b/u_skins/init.lua @@ -3,51 +3,37 @@ -- Copyright (c) 2012 cornernote, Dean Montgomery -- License: GPLv3 u_skins = {} -u_skins.type = { SPRITE=0, MODEL=1, ERROR=99 } +u_skins.modpath = minetest.get_modpath("u_skins") +u_skins.file = minetest.get_worldpath().."/u_skins.mt" u_skins.pages = {} u_skins.u_skins = {} u_skins.file_save = false -u_skins.get_type = function(texture) - if not texture then return u_skins.type.ERROR end +--u_skins.get_type = function(texture) +u_skins.is_skin = function(texture) + if not texture then + return false + end if not u_skins.meta[texture] then - return u_skins.type.ERROR + return false end - if string.sub(texture,0,string.len("character")) == "character" then - return u_skins.type.MODEL - end - if string.sub(texture,0,string.len("player")) == "player" then - return u_skins.type.SPRITE - end - return u_skins.type.ERROR + return true end -u_skins.modpath = minetest.get_modpath("u_skins") dofile(u_skins.modpath.."/skinlist.lua") dofile(u_skins.modpath.."/players.lua") - u_skins.update_player_skin = function(player) local name = player:get_player_name() - local skin_type = u_skins.get_type(u_skins.u_skins[name]) - if skin_type == u_skins.type.ERROR then + if not u_skins.is_skin(u_skins.u_skins[name]) then u_skins.u_skins[name] = "character_1" - skin_type = u_skins.type.MODEL - end - if skin_type == u_skins.type.SPRITE then - player:set_properties({ - visual = "upright_sprite", - textures = {u_skins.u_skins[name]..".png",u_skins.u_skins[name].."_back.png"}, - visual_size = {x=1, y=2}, - }) - elseif skin_type == u_skins.type.MODEL then - player:set_properties({ - visual = "mesh", - mesh = "character.x", - textures = {u_skins.u_skins[name]..".png"}, - visual_size = {x=1, y=1}, - }) end + player:set_properties({ + visual = "mesh", + mesh = "character.x", + textures = {u_skins.u_skins[name]..".png"}, + visual_size = {x=1, y=1}, + }) u_skins.file_save = true end @@ -55,36 +41,35 @@ end unified_inventory.register_page("u_skins", { get_formspec = function(player) local name = player:get_player_name() - local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" - if u_skins.get_type(u_skins.u_skins[name]) == u_skins.type.MODEL then - formspec = formspec - .. "image[0,.75;1,2;"..u_skins.u_skins[name].."_preview.png]" - --.. "image[1,.75;1,2;"..u_skins.u_skins[name].."_preview_back.png]" - .. "label[6,.5;Raw texture:]" - .. "image[6,1;2,1;"..u_skins.u_skins[name]..".png]" - - else - formspec = formspec - .. "image[0,.75;1,2;"..u_skins.u_skins[name]..".png]" - .. "image[1,.75;1,2;"..u_skins.u_skins[name].."_back.png]" + if not u_skins.is_skin(u_skins.u_skins[name]) then + u_skins.u_skins[name] = "character_1" end + + local formspec = ("background[0.06,0.99;7.92,7.52;ui_misc_form.png]" + .."image[0,.75;1,2;"..u_skins.u_skins[name].."_preview.png]" + .."label[6,.5;Raw texture:]" + .."image[6,1;2,1;"..u_skins.u_skins[name]..".png]") + local meta = u_skins.meta[u_skins.u_skins[name]] if meta then if meta.name ~= "" then - formspec = formspec .. "label[2,.5;Name: "..minetest.formspec_escape(meta.name).."]" + formspec = formspec.."label[2,.5;Name: "..minetest.formspec_escape(meta.name).."]" end if meta.author ~= "" then - formspec = formspec .. "label[2,1;Author: "..minetest.formspec_escape(meta.author).."]" + formspec = formspec.."label[2,1;Author: "..minetest.formspec_escape(meta.author).."]" end - if meta.description ~= "" then - formspec = formspec .. "label[2,1.5;"..minetest.formspec_escape(meta.description).."]" + if meta.license ~= "" then + formspec = formspec.."label[2,1.5;License: "..minetest.formspec_escape(meta.license).."]" end - if meta.comment ~= "" then - formspec = formspec .. 'label[2,2;"'..minetest.formspec_escape(meta.comment)..'"]' + if meta.description ~= "" then --what's that?? + formspec = formspec.."label[2,2;Description: "..minetest.formspec_escape(meta.description).."]" end end - - formspec = formspec .. "button[.75,3;6.5,.5;u_skins_page_0;Change]" + local page = 0 + if u_skins.pages[name] then + page = u_skins.pages[name] + end + formspec = formspec .. "button[.75,3;6.5,.5;u_skins_page$"..page..";Change]" return {formspec=formspec} end, }) @@ -95,71 +80,79 @@ unified_inventory.register_button("u_skins", { }) -- Create all of the skin-picker pages. -for x = 0, math.floor(#u_skins.list/16+1) do - unified_inventory.register_page("u_skins_page_"..x, { - get_formspec = function(player) - page = u_skins.pages[player:get_player_name()] - if page == nil then page = 0 end - local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" - local index = 0 - local skip = 0 -- Skip u_skins, used for pages - -- skin thumbnails - for i, skin in ipairs(u_skins.list) do - if skip < page*16 then skip = skip + 1 else - if index < 16 then - formspec = formspec .. "image_button["..(index%8)..","..((math.floor(index/8))*2-0.2)..";1,2;"..skin - if u_skins.get_type(skin) == u_skins.type.MODEL then - formspec = formspec .. "_preview" - end - formspec = formspec .. ".png;u_skins_set_"..i..";]" - end - index = index +1 - end + +u_skins.generate_pages = function(texture) + local page = 0 + local pages = {} + for i, skin in ipairs(u_skins.list) do + local p_index = (i - 1) % 16 + if p_index == 0 then + page = page + 1 + pages[page] = {} + end + pages[page][p_index + 1] = {i, skin} + end + local total_pages = page + page = 1 + for page, arr in ipairs(pages) do + local formspec = "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" + local y = -0.1 + for i, skin in ipairs(arr) do + local x = (i - 1) % 8 + if i > 1 and x == 0 then + y = 1.8 end - -- prev next page buttons - if page > 0 then - formspec = formspec .. "button[0,3.8;1,.5;u_skins_page_"..(page-1)..";<<]" - else - formspec = formspec .. "button[0,3.8;1,.5;u_skins_page_"..page..";<<]" + formspec = (formspec.."image_button["..x..","..y..";1,2;" + ..skin[2].."_preview.png;u_skins_set$"..skin[1]..";]") + end + local page_prev = page - 2 + local page_next = page + if page_prev < 0 then + page_prev = total_pages - 1 + end + if page_next >= total_pages then + page_next = 0 + end + formspec = (formspec + .."button[0,3.8;1,.5;u_skins_page$"..page_prev..";<<]" + .."button[.75,3.8;6.5,.5;u_skins_null;Page "..page.."/"..total_pages.."]" + .."button[7,3.8;1,.5;u_skins_page$"..page_next..";>>]") + + unified_inventory.register_page("u_skins_page$"..(page - 1), { + get_formspec = function(player) + return {formspec=formspec} end - formspec = formspec .. "button[.75,3.8;6.5,.5;u_skins_page_"..page..";Page "..(page+1).."/"..math.floor(#u_skins.list/16+1).."]" -- a button is used so text is centered - if index > 16 then - formspec = formspec .. "button[7,3.8;1,.5;u_skins_page_"..(page+1)..";>>]" - else - formspec = formspec .. "button[7,3.8;1,.5;u_skins_page_"..page..";>>]" - end - return {formspec=formspec} - end, - }) + }) + end end -- click button handlers -minetest.register_on_player_receive_fields(function(player,formname,fields) +minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.u_skins then - unified_inventory.set_inventory_formspec(player,"craft") + unified_inventory.set_inventory_formspec(player, "craft") + return end for field, _ in pairs(fields) do - if string.sub(field,0,string.len("u_skins_set_")) == "u_skins_set_" then - u_skins.u_skins[player:get_player_name()] = u_skins.list[tonumber(string.sub(field,string.len("u_skins_set_")+1))] + local current = string.split(field, "$", 2) + if current[1] == "u_skins_set" then + u_skins.u_skins[player:get_player_name()] = u_skins.list[tonumber(current[2])] u_skins.update_player_skin(player) - unified_inventory.set_inventory_formspec(player,"u_skins") - end - if string.sub(field,0,string.len("u_skins_page_")) == "u_skins_page_" then - u_skins.pages[player:get_player_name()] = tonumber(string.sub(field,string.len("u_skins_page_")+1)) - unified_inventory.set_inventory_formspec(player,"u_skins_page_"..u_skins.pages[player:get_player_name()]) + unified_inventory.set_inventory_formspec(player, "u_skins") + elseif current[1] == "u_skins_page" then + u_skins.pages[player:get_player_name()] = current[2] + unified_inventory.set_inventory_formspec(player, "u_skins_page$"..current[2]) end end end) --- set defaults +-- Change skin on join - reset if invalid minetest.register_on_joinplayer(function(player) local player_name = player:get_player_name() - if not u_skins.u_skins[player_name] then + if not u_skins.is_skin(u_skins.u_skins[player_name]) then u_skins.u_skins[player_name] = "character_1" end - if not u_skins.meta[u_skins.u_skins[player_name]] then - u_skins.u_skins[player_name] = "character_1" - minetest.chat_send_player(player_name, "Skin error: Your skin does no longer exist, please switch to an other!") - end u_skins.update_player_skin(player) end) + +u_skins.generate_pages() +u_skins.load_players() \ No newline at end of file diff --git a/u_skins/players.lua b/u_skins/players.lua index e388470..772481e 100644 --- a/u_skins/players.lua +++ b/u_skins/players.lua @@ -1,16 +1,14 @@ -u_skins.file = minetest.get_worldpath() .. "/u_skins.mt" - -u_skins.load = function() +u_skins.load_players = function() local file = io.open(u_skins.file, "r") if file then for line in file:lines() do - local data = string.split(line, ' ', 2) + local data = string.split(line, " ", 2) u_skins.u_skins[data[1]] = data[2] end io.close(file) end end -u_skins.load() +u_skins.load_players() local ttime = 0 minetest.register_globalstep(function(t) @@ -18,25 +16,22 @@ minetest.register_globalstep(function(t) if ttime < 360 then --every 6min' return end - if(u_skins.file_save) then - u_skins.file_save = false - u_skins.save() - end ttime = 0 + u_skins.save() end) -minetest.register_on_shutdown(function() - if(u_skins.file_save) then - u_skins.save() - end -end) +minetest.register_on_shutdown(function() u_skins.save() end) u_skins.save = function() - local output = io.open(u_skins.file,'w') + if not u_skins.file_save then + return + end + u_skins.file_save = false + local output = io.open(u_skins.file, "w") for name, skin in pairs(u_skins.u_skins) do if name and skin then if skin ~= "character_1" then - output:write(name .. " " .. skin .. "\n") + output:write(name.." "..skin.."\n") end end end diff --git a/u_skins/skinlist.lua b/u_skins/skinlist.lua index 6a8844e..718646c 100644 --- a/u_skins/skinlist.lua +++ b/u_skins/skinlist.lua @@ -8,15 +8,15 @@ while fetched_skip < 40 do local name = "character_"..id local file = io.open(u_skins.modpath.."/meta/"..name..".txt", "r") if file then - local data = string.split(file:read('*all'), "\n", 3) + local data = string.split(file:read("*all"), "\n", 3) file:close() u_skins.list[internal_id] = name u_skins.meta[name] = {} u_skins.meta[name].name = data[1] u_skins.meta[name].author = data[2] - u_skins.meta[name].description = "" --not done - u_skins.meta[name].comment = data[3] + u_skins.meta[name].license = data[3] + u_skins.meta[name].description = "" --what's that?? fetched_skip = 0 internal_id = internal_id + 1