From 8aef2c19bab48d552c1701f22a273b6b521e51fa Mon Sep 17 00:00:00 2001 From: Alexander Weber Date: Mon, 5 Sep 2016 21:02:53 +0200 Subject: [PATCH] The u_skins is a mod, not a modpack. Moved u_skins to the root and all updater stuff to the (new) updater directory --- README | 7 ++++--- u_skins/depends.txt => depends.txt | 0 u_skins/init.lua => init.lua | 0 {u_skins/locale => locale}/de.txt | 0 {u_skins/locale => locale}/template.txt | 0 {u_skins/meta => meta}/character_1.txt | 0 {u_skins/meta => meta}/character_2.txt | 0 {u_skins/meta => meta}/placeholder.txt | 0 modpack.txt | 0 u_skins/players.lua => players.lua | 0 u_skins/skinlist.lua => skinlist.lua | 0 {u_skins/textures => textures}/character_1.png | Bin .../textures => textures}/character_1_preview.png | Bin {u_skins/textures => textures}/character_2.png | Bin .../textures => textures}/character_2_preview.png | Bin .../textures => textures}/inventory_plus_skins.png | Bin {u_skins/textures => textures}/u_skins_button.png | Bin {u_skins/textures => textures}/ui_misc_form.png | Bin MT_skins_updater.cs => updater/MT_skins_updater.cs | 0 .../MT_skins_updater.exe | Bin Newtonsoft.Json.dll => updater/Newtonsoft.Json.dll | Bin update_from_db.py => updater/update_from_db.py | 4 ++-- update_skins_db.sh => updater/update_skins_db.sh | 7 ++++--- 23 files changed, 10 insertions(+), 8 deletions(-) rename u_skins/depends.txt => depends.txt (100%) rename u_skins/init.lua => init.lua (100%) rename {u_skins/locale => locale}/de.txt (100%) rename {u_skins/locale => locale}/template.txt (100%) rename {u_skins/meta => meta}/character_1.txt (100%) rename {u_skins/meta => meta}/character_2.txt (100%) rename {u_skins/meta => meta}/placeholder.txt (100%) delete mode 100644 modpack.txt rename u_skins/players.lua => players.lua (100%) rename u_skins/skinlist.lua => skinlist.lua (100%) rename {u_skins/textures => textures}/character_1.png (100%) rename {u_skins/textures => textures}/character_1_preview.png (100%) rename {u_skins/textures => textures}/character_2.png (100%) rename {u_skins/textures => textures}/character_2_preview.png (100%) rename {u_skins/textures => textures}/inventory_plus_skins.png (100%) rename {u_skins/textures => textures}/u_skins_button.png (100%) rename {u_skins/textures => textures}/ui_misc_form.png (100%) rename MT_skins_updater.cs => updater/MT_skins_updater.cs (100%) rename MT_skins_updater.exe => updater/MT_skins_updater.exe (100%) rename Newtonsoft.Json.dll => updater/Newtonsoft.Json.dll (100%) rename update_from_db.py => updater/update_from_db.py (98%) rename update_skins_db.sh => updater/update_skins_db.sh (89%) mode change 100644 => 100755 diff --git a/README b/README index ff45c16..dec6789 100644 --- a/README +++ b/README @@ -6,9 +6,10 @@ It downloads the skins from the Minetest skin database. (http://minetest.fensta. Requires latest unified_inventory from: https://github.com/minetest-technic/unified_inventory -To download the latest skins you need to run: - "./update_from_db.py" OR - the win32.NET client +To download the latest there are 3 tools available in "updater" folder: + "./update_skins_db.sh" bash and jq required + "./update_from_db.py" python3 required + "MT_skins_updater.exe .." windows or mono required. ".." is the path to u_skins folder Licenses: -------- diff --git a/u_skins/depends.txt b/depends.txt similarity index 100% rename from u_skins/depends.txt rename to depends.txt diff --git a/u_skins/init.lua b/init.lua similarity index 100% rename from u_skins/init.lua rename to init.lua diff --git a/u_skins/locale/de.txt b/locale/de.txt similarity index 100% rename from u_skins/locale/de.txt rename to locale/de.txt diff --git a/u_skins/locale/template.txt b/locale/template.txt similarity index 100% rename from u_skins/locale/template.txt rename to locale/template.txt diff --git a/u_skins/meta/character_1.txt b/meta/character_1.txt similarity index 100% rename from u_skins/meta/character_1.txt rename to meta/character_1.txt diff --git a/u_skins/meta/character_2.txt b/meta/character_2.txt similarity index 100% rename from u_skins/meta/character_2.txt rename to meta/character_2.txt diff --git a/u_skins/meta/placeholder.txt b/meta/placeholder.txt similarity index 100% rename from u_skins/meta/placeholder.txt rename to meta/placeholder.txt diff --git a/modpack.txt b/modpack.txt deleted file mode 100644 index e69de29..0000000 diff --git a/u_skins/players.lua b/players.lua similarity index 100% rename from u_skins/players.lua rename to players.lua diff --git a/u_skins/skinlist.lua b/skinlist.lua similarity index 100% rename from u_skins/skinlist.lua rename to skinlist.lua diff --git a/u_skins/textures/character_1.png b/textures/character_1.png similarity index 100% rename from u_skins/textures/character_1.png rename to textures/character_1.png diff --git a/u_skins/textures/character_1_preview.png b/textures/character_1_preview.png similarity index 100% rename from u_skins/textures/character_1_preview.png rename to textures/character_1_preview.png diff --git a/u_skins/textures/character_2.png b/textures/character_2.png similarity index 100% rename from u_skins/textures/character_2.png rename to textures/character_2.png diff --git a/u_skins/textures/character_2_preview.png b/textures/character_2_preview.png similarity index 100% rename from u_skins/textures/character_2_preview.png rename to textures/character_2_preview.png diff --git a/u_skins/textures/inventory_plus_skins.png b/textures/inventory_plus_skins.png similarity index 100% rename from u_skins/textures/inventory_plus_skins.png rename to textures/inventory_plus_skins.png diff --git a/u_skins/textures/u_skins_button.png b/textures/u_skins_button.png similarity index 100% rename from u_skins/textures/u_skins_button.png rename to textures/u_skins_button.png diff --git a/u_skins/textures/ui_misc_form.png b/textures/ui_misc_form.png similarity index 100% rename from u_skins/textures/ui_misc_form.png rename to textures/ui_misc_form.png diff --git a/MT_skins_updater.cs b/updater/MT_skins_updater.cs similarity index 100% rename from MT_skins_updater.cs rename to updater/MT_skins_updater.cs diff --git a/MT_skins_updater.exe b/updater/MT_skins_updater.exe similarity index 100% rename from MT_skins_updater.exe rename to updater/MT_skins_updater.exe diff --git a/Newtonsoft.Json.dll b/updater/Newtonsoft.Json.dll similarity index 100% rename from Newtonsoft.Json.dll rename to updater/Newtonsoft.Json.dll diff --git a/update_from_db.py b/updater/update_from_db.py similarity index 98% rename from update_from_db.py rename to updater/update_from_db.py index 159acf7..685d1e0 100755 --- a/update_from_db.py +++ b/updater/update_from_db.py @@ -10,8 +10,8 @@ def die(message,code=23): raise SystemExit(code) server = "minetest.fensta.bplaced.net" -skinsdir = "u_skins/textures/" -metadir = "u_skins/meta/" +skinsdir = "../textures/" +metadir = "../meta/" curskin = 0 curpage = 1 pages = None diff --git a/update_skins_db.sh b/updater/update_skins_db.sh old mode 100644 new mode 100755 similarity index 89% rename from update_skins_db.sh rename to updater/update_skins_db.sh index 8bf9e1a..8028b42 --- a/update_skins_db.sh +++ b/updater/update_skins_db.sh @@ -14,9 +14,10 @@ NUMPAGES="1" # Number of pages. Default is 1 page PERPAGE="2000" # Number of items per page. Default is 2000. JSONURL="http://minetest.fensta.bplaced.net/api/get.json.php?getlist&page=$NUMPAGES&outformat=base64&per_page=$PERPAGE" # The URL to the database PREVIEWURL="http://minetest.fensta.bplaced.net/skins/1/" # The url to the location of the previews. -temp=$PWD/tmp # Where the temp folder will be. Default is $PWD/tmp, which means that the tmp folder will be put in the current folder -METADEST=$PWD/u_skins/meta # This is the folder where the meta data will be saved -TEXTUREDEST=$PWD/u_skins/textures # This is the folder where the skins and the previews will be saved +curpath="$(dirname $0)" # all path are relative to this script place +temp="$curpath"/tmp # Where the temp folder will be. Default is $PWD/tmp, which means that the tmp folder will be put in the current folder +METADEST="$curpath"/../meta # This is the folder where the meta data will be saved +TEXTUREDEST="$curpath"/../textures # This is the folder where the skins and the previews will be saved # === Make a bunch of folders and download the db ===