From 48dd5267dd7a789a586455ec6c496972718c55bc Mon Sep 17 00:00:00 2001
From: E <efr@gentoo.today>
Date: Thu, 22 Apr 2021 22:23:16 -0400
Subject: [PATCH] items/mcl_banners: fix preview masking

The `layer` string was inherited from the old patch, which I frankly
don't understand. I restructured it to `follow make_banner_texture` more
closely, with the addition of the mcl_banners_front mask, which
prevents the rear portions of the patterns from showing up.

The numbers in the final `[combine` and `[resize` steps are arbitrary,
and were derived by trial-and-error.
---
 mods/ITEMS/mcl_banners/init.lua                  |   4 ++--
 .../mcl_banners/textures/mcl_banners_front.png   | Bin 0 -> 5326 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 mods/ITEMS/mcl_banners/textures/mcl_banners_front.png

diff --git a/mods/ITEMS/mcl_banners/init.lua b/mods/ITEMS/mcl_banners/init.lua
index d6af4f50..ec97b801 100644
--- a/mods/ITEMS/mcl_banners/init.lua
+++ b/mods/ITEMS/mcl_banners/init.lua
@@ -158,7 +158,7 @@ local make_banner_overlay = function(base_color, layers)
 			local color = mcl_banners.colors[layerinfo.color][4]
 
 			-- Generate layer texture
-			local layer = "(([combine:20x40:-2,-2="..pattern.."^[resize:16x24^[colorize:"..color..":"..layer_ratio..")^[mask:"..pattern..")"
+			local layer = "((("..pattern.."^[mask:mcl_banners_front.png)^[colorize:"..color..":"..layer_ratio..")^[mask:"..pattern..")"
 
 			lovl = (lovl ~= "" and (lovl .. "^") or "") .. layer
 		end
@@ -167,7 +167,7 @@ local make_banner_overlay = function(base_color, layers)
 			 return text:gsub("%^", "\\%^"):gsub(":", "\\:") -- :gsub("%(", "\\%("):gsub("%)", "\\%)")
 		end
 
-		return "[combine:32x32:0,0=" .. escape(base) .. ":8,4=" .. escape(lovl)
+		return "[combine:32x32:0,0=" .. escape(base) .. ":7,3=" .. escape("("..lovl.."^[resize:50x38)")
 	end
 	return base
 end
diff --git a/mods/ITEMS/mcl_banners/textures/mcl_banners_front.png b/mods/ITEMS/mcl_banners/textures/mcl_banners_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..e90f9b197253c63f559401a04260a98b357e705b
GIT binary patch
literal 5326
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

literal 0
HcmV?d00001