diff options
author | Alexander Weber <web.alexander@web.de> | 2016-09-05 21:02:53 +0200 |
---|---|---|
committer | Alexander Weber <web.alexander@web.de> | 2016-09-05 21:02:53 +0200 |
commit | 8aef2c19bab48d552c1701f22a273b6b521e51fa (patch) | |
tree | 2708416623a65fa2d28ba08380e4d8f3dfd091f7 /u_skins | |
parent | be8fa19b68f7362bce5bd0b519c61b0c743eb851 (diff) |
The u_skins is a mod, not a modpack. Moved u_skins to the root and all updater stuff to the (new) updater directory
Diffstat (limited to 'u_skins')
-rw-r--r-- | u_skins/depends.txt | 4 | ||||
-rw-r--r-- | u_skins/init.lua | 183 | ||||
-rw-r--r-- | u_skins/locale/de.txt | 9 | ||||
-rw-r--r-- | u_skins/locale/template.txt | 9 | ||||
-rw-r--r-- | u_skins/meta/character_1.txt | 3 | ||||
-rw-r--r-- | u_skins/meta/character_2.txt | 3 | ||||
-rw-r--r-- | u_skins/meta/placeholder.txt | 1 | ||||
-rw-r--r-- | u_skins/players.lua | 40 | ||||
-rw-r--r-- | u_skins/skinlist.lua | 26 | ||||
-rw-r--r-- | u_skins/textures/character_1.png | bin | 2055 -> 0 bytes | |||
-rw-r--r-- | u_skins/textures/character_1_preview.png | bin | 783 -> 0 bytes | |||
-rw-r--r-- | u_skins/textures/character_2.png | bin | 3223 -> 0 bytes | |||
-rw-r--r-- | u_skins/textures/character_2_preview.png | bin | 1051 -> 0 bytes | |||
-rw-r--r-- | u_skins/textures/inventory_plus_skins.png | bin | 673 -> 0 bytes | |||
-rw-r--r-- | u_skins/textures/u_skins_button.png | bin | 338 -> 0 bytes | |||
-rw-r--r-- | u_skins/textures/ui_misc_form.png | bin | 9354 -> 0 bytes |
16 files changed, 0 insertions, 278 deletions
diff --git a/u_skins/depends.txt b/u_skins/depends.txt deleted file mode 100644 index d6abd12..0000000 --- a/u_skins/depends.txt +++ /dev/null @@ -1,4 +0,0 @@ -unified_inventory -default -simple_skins? -intllib? diff --git a/u_skins/init.lua b/u_skins/init.lua deleted file mode 100644 index 2d3246c..0000000 --- a/u_skins/init.lua +++ /dev/null @@ -1,183 +0,0 @@ --- Unified Skins for Minetest - based modified Bags from unfied_inventory and skins from inventory_plus - --- Copyright (c) 2012 cornernote, Dean Montgomery --- License: GPLv3 --- Boilerplate to support localized strings if intllib mod is installed. -local S -if intllib then - S = intllib.Getter() -else - S = function(s) return s end -end - -u_skins = {} -u_skins.modpath = minetest.get_modpath("u_skins") -u_skins.file = minetest.get_worldpath().."/u_skins.mt" -u_skins.default = "character_1" -u_skins.pages = {} -u_skins.u_skins = {} -u_skins.file_save = false -u_skins.simple_skins = false - --- ( Deprecated -u_skins.type = { SPRITE=0, MODEL=1, ERROR=99 } -u_skins.get_type = function(texture) - if not u_skins.is_skin(texture) then - return u_skins.type.ERROR - end - return u_skins.type.MODEL -end --- ) - -u_skins.is_skin = function(texture) - if not texture then - return false - end - if not u_skins.meta[texture] then - return false - end - return true -end - -dofile(u_skins.modpath.."/skinlist.lua") -dofile(u_skins.modpath.."/players.lua") - -if rawget(_G, "skins") then - u_skins.simple_skins = true -end - -u_skins.update_player_skin = function(player) - local name = player:get_player_name() - if u_skins.simple_skins and u_skins.u_skins[name] == u_skins.default then - return - end - - if not u_skins.is_skin(u_skins.u_skins[name]) then - u_skins.u_skins[name] = u_skins.default - end - player:set_properties({ - textures = {u_skins.u_skins[name]..".png"}, - }) -end - --- Display Current Skin -unified_inventory.register_page("u_skins", { - get_formspec = function(player) - local name = player:get_player_name() - if not u_skins.is_skin(u_skins.u_skins[name]) then - u_skins.u_skins[name] = u_skins.default - 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;"..S("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;"..S("Name")..": "..minetest.formspec_escape(meta.name).."]" - end - if meta.author ~= "" then - 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 - 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..";"..S("Change").."]" - return {formspec=formspec} - end, -}) - -unified_inventory.register_button("u_skins", { - type = "image", - image = "u_skins_button.png", -}) - --- Create all of the skin-picker pages. - -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 - formspec = (formspec.."image_button["..x..","..y..";1,2;".. - skin[2].."_preview.png;u_skins_set$"..skin[1]..";]".. - "tooltip[u_skins_set$"..skin[1]..";"..u_skins.meta[skin[2]].name.."]") - 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;"..S("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 - }) - end -end - --- click button handlers -minetest.register_on_player_receive_fields(function(player, formname, fields) - if fields.u_skins then - unified_inventory.set_inventory_formspec(player, "craft") - return - end - for field, _ in pairs(fields) do - 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) - u_skins.file_save = true - 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) - --- Change skin on join - reset if invalid -minetest.register_on_joinplayer(function(player) - local player_name = player:get_player_name() - if not u_skins.is_skin(u_skins.u_skins[player_name]) then - u_skins.u_skins[player_name] = u_skins.default - end - u_skins.update_player_skin(player) -end) - -u_skins.generate_pages() -u_skins.load_players() diff --git a/u_skins/locale/de.txt b/u_skins/locale/de.txt deleted file mode 100644 index 6ad87f3..0000000 --- a/u_skins/locale/de.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Translation by Xanthin - -Raw texture = Rohtextur -Name = Name -Author = Autor -Change = Wechseln -Page = Seite -License = Lizenz -Description = Beschreibung diff --git a/u_skins/locale/template.txt b/u_skins/locale/template.txt deleted file mode 100644 index 6412b7f..0000000 --- a/u_skins/locale/template.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Template - -Raw texture = -Name = -Author = -Change = -Page = -License = -Description = diff --git a/u_skins/meta/character_1.txt b/u_skins/meta/character_1.txt deleted file mode 100644 index 7211029..0000000 --- a/u_skins/meta/character_1.txt +++ /dev/null @@ -1,3 +0,0 @@ -Sam 0 -Jordach -CC BY-SA 3.0
\ No newline at end of file diff --git a/u_skins/meta/character_2.txt b/u_skins/meta/character_2.txt deleted file mode 100644 index 0187cab..0000000 --- a/u_skins/meta/character_2.txt +++ /dev/null @@ -1,3 +0,0 @@ -Sam I -Jordach -CC BY-SA 3.0
\ No newline at end of file diff --git a/u_skins/meta/placeholder.txt b/u_skins/meta/placeholder.txt deleted file mode 100644 index a9e6fce..0000000 --- a/u_skins/meta/placeholder.txt +++ /dev/null @@ -1 +0,0 @@ -Please run the update_from_db.py script to update the skins. diff --git a/u_skins/players.lua b/u_skins/players.lua deleted file mode 100644 index 3053530..0000000 --- a/u_skins/players.lua +++ /dev/null @@ -1,40 +0,0 @@ -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) - u_skins.u_skins[data[1]] = data[2] - end - io.close(file) - end -end -u_skins.load_players() - -local ttime = 0 -minetest.register_globalstep(function(t) - ttime = ttime + t - if ttime < 360 then --every 6min' - return - end - ttime = 0 - u_skins.save() -end) - -minetest.register_on_shutdown(function() u_skins.save() end) - -u_skins.save = function() - 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 ~= u_skins.default then - output:write(name.." "..skin.."\n") - end - end - end - io.close(output) -end - diff --git a/u_skins/skinlist.lua b/u_skins/skinlist.lua deleted file mode 100644 index 718646c..0000000 --- a/u_skins/skinlist.lua +++ /dev/null @@ -1,26 +0,0 @@ -u_skins.list = {} -u_skins.meta = {} - -local id = 1 -local internal_id = 1 -local fetched_skip = 0 -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) - 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].license = data[3] - u_skins.meta[name].description = "" --what's that?? - - fetched_skip = 0 - internal_id = internal_id + 1 - end - fetched_skip = fetched_skip + 1 - id = id + 1 -end
\ No newline at end of file diff --git a/u_skins/textures/character_1.png b/u_skins/textures/character_1.png Binary files differdeleted file mode 100644 index 8d0dd99..0000000 --- a/u_skins/textures/character_1.png +++ /dev/null diff --git a/u_skins/textures/character_1_preview.png b/u_skins/textures/character_1_preview.png Binary files differdeleted file mode 100644 index 62a9ff2..0000000 --- a/u_skins/textures/character_1_preview.png +++ /dev/null diff --git a/u_skins/textures/character_2.png b/u_skins/textures/character_2.png Binary files differdeleted file mode 100644 index d794b87..0000000 --- a/u_skins/textures/character_2.png +++ /dev/null diff --git a/u_skins/textures/character_2_preview.png b/u_skins/textures/character_2_preview.png Binary files differdeleted file mode 100644 index 0736def..0000000 --- a/u_skins/textures/character_2_preview.png +++ /dev/null diff --git a/u_skins/textures/inventory_plus_skins.png b/u_skins/textures/inventory_plus_skins.png Binary files differdeleted file mode 100644 index 781b42f..0000000 --- a/u_skins/textures/inventory_plus_skins.png +++ /dev/null diff --git a/u_skins/textures/u_skins_button.png b/u_skins/textures/u_skins_button.png Binary files differdeleted file mode 100644 index cb49531..0000000 --- a/u_skins/textures/u_skins_button.png +++ /dev/null diff --git a/u_skins/textures/ui_misc_form.png b/u_skins/textures/ui_misc_form.png Binary files differdeleted file mode 100644 index d34d326..0000000 --- a/u_skins/textures/ui_misc_form.png +++ /dev/null |