From c84656f85a672e5ed77cc51d7603f3815c545714 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Tue, 5 Mar 2019 13:50:35 +0100
Subject: [PATCH] Add fancy GUI to select skin

---
 mods/HUD/mcl_inventory/creative.lua           |   5 +-
 mods/HUD/mcl_inventory/init.lua               |   3 +
 mods/PLAYER/mcl_skins/init.lua                | 109 +++++++++++++++---
 mods/PLAYER/mcl_skins/meta/character.txt      |   3 +-
 mods/PLAYER/mcl_skins/meta/character_1.txt    |   3 +-
 .../textures/inventory_plus_skins.png         | Bin 2182 -> 0 bytes
 .../mcl_skins/textures/mcl_skins_button.png   | Bin 0 -> 2010 bytes
 7 files changed, 100 insertions(+), 23 deletions(-)
 delete mode 100644 mods/PLAYER/mcl_skins/textures/inventory_plus_skins.png
 create mode 100644 mods/PLAYER/mcl_skins/textures/mcl_skins_button.png

diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua
index d9ad2e94..fcc8efdd 100644
--- a/mods/HUD/mcl_inventory/creative.lua
+++ b/mods/HUD/mcl_inventory/creative.lua
@@ -324,8 +324,11 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz
 				-- help button
 				"image_button[9,2;1,1;doc_button_icon_lores.png;__mcl_doc;]"..
 				"tooltip[__mcl_doc;Help]"..
+				-- skins button
+				"image_button[9,3;1,1;mcl_skins_button.png;__mcl_skins;]"..
+				"tooltip[__mcl_skins;Select player skin]"..
 				-- achievements button
-				"image_button[9,3;1,1;mcl_achievements_button.png;__mcl_achievements;]"..
+				"image_button[9,4;1,1;mcl_achievements_button.png;__mcl_achievements;]"..
 				"tooltip[__mcl_achievements;Achievements]"
 
 			-- For shortcuts
diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua
index 415c3075..05f61aac 100644
--- a/mods/HUD/mcl_inventory/init.lua
+++ b/mods/HUD/mcl_inventory/init.lua
@@ -105,6 +105,9 @@ local function set_inventory(player, armor_change_only)
 	-- help button
 	"image_button[8,3;1,1;doc_button_icon_lores.png;__mcl_doc;]"..
 	"tooltip[__mcl_doc;Help]"..
+	-- skins button
+	"image_button[3,3;1,1;mcl_skins_button.png;__mcl_skins;]"..
+	"tooltip[__mcl_skins;Select player skin]"..
 	-- achievements button
 	"image_button[7,3;1,1;mcl_achievements_button.png;__mcl_achievements;]"..
 	"tooltip[__mcl_achievements;Achievements]"..
diff --git a/mods/PLAYER/mcl_skins/init.lua b/mods/PLAYER/mcl_skins/init.lua
index c24ce4a4..8fe76db3 100644
--- a/mods/PLAYER/mcl_skins/init.lua
+++ b/mods/PLAYER/mcl_skins/init.lua
@@ -12,26 +12,26 @@ local S, NS = dofile(mcl_skins.modpath .. "/intllib.lua")
 
 
 -- load skin list and metadata
-local id, f, data, skin = 1
-
-mcl_skins.list[0] = "character"
+local id, f, data, skin = 0
 
 while true do
 
-	skin = "character_" .. id
+	if id == 0 then
+		skin = "character"
+	else
+		skin = "character_" .. id
 
-	-- does skin file exist ?
-	f = io.open(mcl_skins.modpath .. "/textures/" .. skin .. ".png")
+		-- does skin file exist ?
+		f = io.open(mcl_skins.modpath .. "/textures/" .. skin .. ".png")
 
-	-- escape loop if not found and remove last entry
-	if not f then
-		mcl_skins.list[id] = nil
-		id = id - 1
-		break
+		-- escape loop if not found
+		if not f then
+			break
+		end
+		f:close()
 	end
 
-	f:close()
-	table.insert(mcl_skins.list, skin)
+	mcl_skins.list[id] = skin
 
 	-- does metadata exist for that skin file ?
 	f = io.open(mcl_skins.modpath .. "/meta/" .. skin .. ".txt")
@@ -47,8 +47,10 @@ while true do
 		author = data and data.author or "",
 	}
 
+	if id > 0 then
+		mcl_skins.skin_count = mcl_skins.skin_count + 1
+	end
 	id = id + 1
-	mcl_skins.skin_count = mcl_skins.skin_count + 1
 end
 
 mcl_skins.set_player_skin = function(player, skin_id)
@@ -124,11 +126,15 @@ end
 
 -- command to set player skin (usually for custom skins)
 minetest.register_chatcommand("setskin", {
-	params = "[<player>] <skin number>",
+	params = "[<player>] [<skin number>]",
 	description = S("Select player skin of yourself or another player"),
 	privs = {},
 	func = function(name, param)
 
+		if param == "" and name ~= "" then
+			mcl_skins.show_formspec(name)
+			return true
+		end
 		local playername, skin_id = string.match(param, "([^ ]+) (%d+)")
 		if not playername or not skin_id then
 			skin_id = string.match(param, "(%d+)")
@@ -156,17 +162,84 @@ minetest.register_chatcommand("setskin", {
 		if not ok then
 			return false, S("Invalid skin number! Valid numbers: 0 to @1", mcl_skins.skin_count)
 		end
-		local skinfile = "Skin #"..skin_id
+		local skinfile = "#"..skin_id
 
-		local your_msg = S("Your skin has been set to: @1", skinfile)
+		local meta = mcl_skins.meta[mcl_skins.skins[playername]]
+		local your_msg = S("Your skin has been set to: @1 (@2)", meta.name, skinfile)
 		if name == playername then
 			return true, your_msg
 		else
 			minetest.chat_send_player(playername, your_msg)
-			return true, S("Skin of @1 set to: @2", playername, skinfile)
+			return true, S("Skin of @1 set to: @2 (@3)", playername, meta.name, skinfile)
 		end
 
 	end,
 })
 
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if fields.__mcl_skins then
+		mcl_skins.show_formspec(player:get_player_name())
+	end
+end)
+
+mcl_skins.show_formspec = function(playername)
+	local formspec = "size[7,8.5]"
+
+	formspec = formspec .. "label[2,2;" .. minetest.formspec_escape(S("Select player skin:")) .. "]"
+		.. "textlist[0,2.5;6.8,6;skins_set;"
+
+	local meta
+	local selected = 1
+
+	for i = 0, mcl_skins.skin_count do
+
+		local label = S("@1 (@2)", mcl_skins.meta[mcl_skins.list[i] ].name, "#"..i)
+
+		formspec = formspec .. minetest.formspec_escape(label)
+
+		if mcl_skins.skins[playername] == mcl_skins.list[i] then
+			selected = i + 1
+			meta = mcl_skins.meta[mcl_skins.list[i]]
+		end
+
+		if i < #mcl_skins.list then
+			formspec = formspec ..","
+		end
+	end
+
+	formspec = formspec .. ";" .. selected .. ";false]"
+
+	formspec = formspec .. "image[0,0;1.35,2.7;" .. mcl_skins.previews[playername] .. ".png]"
+
+	if meta then
+		if meta.name then
+			formspec = formspec .. "label[2,0.5;" .. minetest.formspec_escape(S("Name: @1", meta.name)) .. "]"
+		end
+	end
+
+	minetest.show_formspec(playername, "mcl_skins:skin_select", formspec)
+end
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+
+	if formname == "mcl_skins:skin_select" then
+
+		local name = player:get_player_name()
+
+		local event = minetest.explode_textlist_event(fields["skins_set"])
+
+		if event.type == "CHG" or event.type == "DCL" then
+
+			local skin_id = math.min(event.index - 1, mcl_skins.skin_count)
+			if not mcl_skins.list[skin_id] then
+				return -- Do not update wrong skin number
+			end
+
+			mcl_skins.set_player_skin(player, skin_id)
+			mcl_skins.show_formspec(name)
+		end
+	end
+end)
+
 minetest.log("action", "[mcl_skins] Mod initialized with "..mcl_skins.skin_count.." custom skin(s)")
+
diff --git a/mods/PLAYER/mcl_skins/meta/character.txt b/mods/PLAYER/mcl_skins/meta/character.txt
index 5a07db19..00061a65 100644
--- a/mods/PLAYER/mcl_skins/meta/character.txt
+++ b/mods/PLAYER/mcl_skins/meta/character.txt
@@ -1,3 +1,2 @@
 name = "Steve",
-author = "(Texture pack author)",
-description = "The default male skin.",
+author = "%TEXTURE_PACK_AUTHOR%",
diff --git a/mods/PLAYER/mcl_skins/meta/character_1.txt b/mods/PLAYER/mcl_skins/meta/character_1.txt
index ec438955..f96b13f6 100644
--- a/mods/PLAYER/mcl_skins/meta/character_1.txt
+++ b/mods/PLAYER/mcl_skins/meta/character_1.txt
@@ -1,3 +1,2 @@
 name = "Alex",
-author = "(Texture pack author)",
-description = "The default female skin.",
+author = "%TEXTURE_PACK_AUTHOR%",
diff --git a/mods/PLAYER/mcl_skins/textures/inventory_plus_skins.png b/mods/PLAYER/mcl_skins/textures/inventory_plus_skins.png
deleted file mode 100644
index 7cc97759cd8c906632a0ff2712b647c23abc2278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2182
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
KxvX<aXaWGX1uC8Z

diff --git a/mods/PLAYER/mcl_skins/textures/mcl_skins_button.png b/mods/PLAYER/mcl_skins/textures/mcl_skins_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..49acf85503e8e297abf2caa4e43bad6facee0ca7
GIT binary patch
literal 2010
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

literal 0
HcmV?d00001