From 164b65a2ca0c8a2865f4f81b286f4d20ab863efe Mon Sep 17 00:00:00 2001 From: E Date: Sat, 1 May 2021 23:57:39 -0400 Subject: [PATCH] items/mcl_banners: reuse `escape` across functions --- mods/ITEMS/mcl_banners/init.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mods/ITEMS/mcl_banners/init.lua b/mods/ITEMS/mcl_banners/init.lua index 1ab57026..ff9d2f37 100644 --- a/mods/ITEMS/mcl_banners/init.lua +++ b/mods/ITEMS/mcl_banners/init.lua @@ -144,6 +144,10 @@ local on_destruct_hanging_banner = function(pos) return on_destruct_banner(pos, true) end +local function escape(text) + return text:gsub("%^", "\\%^"):gsub(":", "\\:") -- :gsub("%(", "\\%("):gsub("%)", "\\%)") +end + local make_banner_overlay = function(base_color, layers) local colorize = mcl_banners.colors[base_color][4] -- Base texture with base color @@ -163,10 +167,6 @@ local make_banner_overlay = function(base_color, layers) lovl = (lovl ~= "" and (lovl .. "^") or "") .. layer end - local function escape(text) - return text:gsub("%^", "\\%^"):gsub(":", "\\:") -- :gsub("%(", "\\%("):gsub("%)", "\\%)") - end - return "[combine:32x32:0,0=" .. escape(base) .. ":7,3=" .. escape("("..lovl.."^[resize:50x38)") end return base @@ -430,10 +430,6 @@ for colorid, colortab in pairs(mcl_banners.colors) do local layer = "(([combine:20x40:-2,-2="..pattern.."^[resize:16x24^[colorize:"..color..":"..layer_ratio.."))" - function escape(text) - return text:gsub("%^", "\\%^"):gsub(":", "\\:") -- :gsub("%(", "\\%("):gsub("%)", "\\%)") - end - finished_banner = "[combine:32x32:0,0=" .. escape(base) .. ":8,4=" .. escape(layer) end