From bc3da8dab8dcf3bfc4a841ef383001ccfa030366 Mon Sep 17 00:00:00 2001 From: chmodsayshello Date: Wed, 7 Jun 2023 21:01:55 +0200 Subject: [PATCH] add armor trim color support --- mods/ITEMS/mcl_armor_trims/init.lua | 61 +++++++++++++++-------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/mods/ITEMS/mcl_armor_trims/init.lua b/mods/ITEMS/mcl_armor_trims/init.lua index 82e070a18..9321ca111 100644 --- a/mods/ITEMS/mcl_armor_trims/init.lua +++ b/mods/ITEMS/mcl_armor_trims/init.lua @@ -1,7 +1,7 @@ mcl_armor_trims = { blacklisted = {["mcl_farming:pumpkin_face"]=true, ["mcl_armor:elytra"]=true, ["mcl_armor:elytra_enchanted"]=true}, overlays = {"sentry","dune","coast","wild","tide","ward","vex","rib","snout","eye","spire"}, - colors = {"bf352d"} + colors = {["amethyst"]="#8246a5",["gold"]="#ce9627",["emerald"]="#1b9958",["copper"]="#c36447",["diamond"]="#5faed8",["iron"]="#938e88",["lapis"]="#1c306b",["netherite"]="#302a26",["quartz"]="#c9bcb9",["redstone"]="#af2c23"} } local function define_items() @@ -9,36 +9,39 @@ local function define_items() for itemname, itemdef in pairs(minetest.registered_tools) do if itemdef._mcl_armor_texture and type(itemdef._mcl_armor_texture) == "string" and not mcl_armor_trims.blacklisted[itemname] then for _, overlay in pairs(mcl_armor_trims.overlays) do - local new_name = itemname .. "_trimmed_" .. overlay - minetest.override_item(itemname, {_mcl_armor_trims_trim = new_name}) - local new_def = table.copy(itemdef) + for mineral, color in pairs(mcl_armor_trims.colors) do + local new_name = itemname .. "_trimmed_" .. overlay .. "_" .. mineral + minetest.override_item(itemname, {_mcl_armor_trims_trim = new_name}) + local new_def = table.copy(itemdef) - local piece_overlay = overlay - local invOverlay = "" - if string.find(itemname,"helmet") then - invOverlay = "^helmet_trim.png" - piece_overlay = piece_overlay .. "_helmet" - elseif string.find(itemname,"chestplate") then - invOverlay = "^chestplate_trim.png" - piece_overlay = piece_overlay .. "_chestplate" - elseif string.find(itemname,"leggings") then - invOverlay = "^leggings_trim.png" - piece_overlay = piece_overlay .. "_leggings" - elseif string.find(itemname,"boots") then - invOverlay = "^boots_trim.png" - piece_overlay = piece_overlay .. "_boots" + local piece_overlay = overlay + local invOverlay = "" + if string.find(itemname,"helmet") then + invOverlay = "^(helmet_trim.png" + piece_overlay = piece_overlay .. "_helmet" + elseif string.find(itemname,"chestplate") then + invOverlay = "^(chestplate_trim.png" + piece_overlay = piece_overlay .. "_chestplate" + elseif string.find(itemname,"leggings") then + invOverlay = "^(leggings_trim.png" + piece_overlay = piece_overlay .. "_leggings" + elseif string.find(itemname,"boots") then + invOverlay = "^(boots_trim.png" + piece_overlay = piece_overlay .. "_boots" + end + + invOverlay = invOverlay .. "^[colorize:" .. color .. ")" + piece_overlay = piece_overlay .. ".png" + + new_def.groups.not_in_creative_inventory = 0 --set this to 1 later! + new_def.groups.not_in_craft_guide = 1 + new_def._mcl_armor_texture = new_def._mcl_armor_texture .. "^(" .. piece_overlay .. "^[colorize:" .. color .. ")" + + new_def.inventory_image = itemdef.inventory_image .. invOverlay + new_def._mcl_armor_trims_trim = new_name + + register_list[":" .. new_name] = new_def end - - piece_overlay = piece_overlay .. ".png" - - new_def.groups.not_in_creative_inventory = 0 --set this to 1 later! - new_def.groups.not_in_craft_guide = 1 - new_def._mcl_armor_texture = new_def._mcl_armor_texture .. "^(" .. piece_overlay .. "^[colorize:purple)" - - new_def.inventory_image = itemdef.inventory_image .. invOverlay - new_def._mcl_armor_trims_trim = new_name - - register_list[":" .. new_name] = new_def end end end