Merge pull request minetest-mods#16 from bell07/clothing_support

clothing support

depends.txt

@@ -2,4 +2,5 @@ default
 intllib?
 unified_inventory?
 3d_armor?
+clothing?
 sfinv?

init.lua

@@ -51,6 +51,11 @@ if minetest.global_exists("armor") then
 	end
 end
 
+if minetest.global_exists("clothing") and clothing.player_textures then
+	skins.clothing_loaded = true
+	clothing:register_on_update(skins.update_player_skin)
+end
+
 -- Update skin on join
 skins.ui_context = {}
 minetest.register_on_joinplayer(function(player)

skin_meta_api.lua

@@ -60,6 +60,18 @@ function skin_class:get_preview()
 end
 
 function skin_class:apply_skin_to_player(player)
+
+	local function concat_texture(base, ext)
+		if base == "blank.png" then
+			return ext
+		elseif ext == "blank.png" then
+			return base
+		else
+			return	base .. "^" .. ext
+		end
+	end
+
+	local playername = player:get_player_name()
 	local ver = self:get_meta("format") or "1.0"
 	default.player_set_model(player, "skinsdb_3d_armor_character.b3d")
 
@@ -74,11 +86,26 @@ function skin_class:apply_skin_to_player(player)
 		v10_texture = self:get_texture()
 	end
 
+	-- Support for clothing
+	if skins.clothing_loaded and clothing.player_textures[playername] then
+		local cape = clothing.player_textures[playername].cape
+		local layers = {}
+		for k, v in pairs(clothing.player_textures[playername]) do
+			if k ~= "skin" and k ~= "cape" then
+				table.insert(layers, v)
+			end
+		end
+		local overlay = table.concat(layers, "^")
+		v10_texture = concat_texture(v10_texture, cape)
+		v18_texture = concat_texture(v18_texture, overlay)
+	end
+
+	-- Support for armor
 	if skins.armor_loaded then
-		local armor_textures = armor.textures[player:get_player_name()]
+		local armor_textures = armor.textures[playername]
 		if armor_textures then
-			armor_texture = armor_textures.armor
-			wielditem_texture = armor_textures.wielditem
+			armor_texture = concat_texture(armor_texture, armor_textures.armor)
+			wielditem_texture = concat_texture(wielditem_texture, armor_textures.wielditem)
 		end
 	end