From 4733355851961e17da1202fec4fb342abbcf92d1 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Fri, 18 May 2018 23:51:17 +0200
Subject: [PATCH] Texture converter: Convert banner overlays

---
 tools/Texture_Converter.py | 58 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/tools/Texture_Converter.py b/tools/Texture_Converter.py
index 3a5305e2..22a6fe6b 100755
--- a/tools/Texture_Converter.py
+++ b/tools/Texture_Converter.py
@@ -296,6 +296,56 @@ def convert_textures():
 		os.system("convert "+tex_dir+"/blocks/"+r[0]+" -rotate 90 "+tempfile1.name)
 		os.system("composite -compose Dst_Over "+tempfile1.name+" "+tex_dir+"/blocks/"+r[0]+" "+target_dir("/mods/ENTITIES/mcl_minecarts/textures")+"/"+r[3])
 
+	# Convert banner overlays
+	overlays = [
+		"base",
+		"border",
+		"bricks",
+		"circle",
+		"creeper",
+		"cross",
+		"curly_border",
+		"diagonal_left",
+		"diagonal_right",
+		"diagonal_up_left",
+		"diagonal_up_right",
+		"flower",
+		"gradient",
+		"gradient_up",
+		"half_horizontal_bottom",
+		"half_horizontal",
+		"half_vertical",
+		"half_vertical_right",
+		"rhombus",
+		"mojang",
+		"skull",
+		"small_stripes",
+		"straight_cross",
+		"stripe_bottom",
+		"stripe_center",
+		"stripe_downleft",
+		"stripe_downright",
+		"stripe_left",
+		"stripe_middle",
+		"stripe_right",
+		"stripe_top",
+		"square_bottom_left",
+		"square_bottom_right",
+		"square_top_left",
+		"square_top_right",
+		"triangle_bottom",
+		"triangles_bottom",
+		"triangle_top",
+		"triangles_top",
+	]
+	for o in overlays:
+		orig = tex_dir + "/entity/banner/" + o + ".png"
+		if os.path.isfile(orig):
+			if o == "mojang":
+				o = "thing"
+			dest = target_dir("/mods/ITEMS/mcl_banners/textures")+"/"+"mcl_banners_"+o+".png"
+			os.system("convert "+orig+" -transparent-color white -background black -alpha remove -alpha copy -channel RGB -white-threshold 0 "+dest)
+
 	# Convert grass
 	grass_file = tex_dir + "/blocks/grass_top.png"
 	if os.path.isfile(grass_file):
@@ -335,14 +385,6 @@ def convert_textures():
 			colorize_alpha(GRASS, tex_dir+"/blocks/grass_side_overlay.png", o[0], str(PXSIZE), target_dir("/mods/ITEMS/mcl_core/textures")+"/default_"+o[2]+"_side.png")
 
 
-
-#	TODO: Convert banner masks
-#	if os.path.isdir(tex_dir + "/entity/banner"):
-# These are the ImageMagick commands needed to convert the mask images
-#		os.system("mogrify -transparent-color "+filename)
-#		os.system("mogrify -clip-mask "+tex_dir+"/entity/banner/base.png"+" -alpha Copy "+filename)
-#		os.system("mogrify -fill white -colorize 100 "+filename)
-
 		print("Textures conversion COMPLETE!")
 		if failed_conversions > 0:
 			print("WARNING: Number of missing files in original resource pack: "+str(failed_conversions))
-- 
2.11.4.GIT