From 7136e5461512f047eac0a4f794663ff1e312e73c Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Mon, 27 Jun 2022 12:40:21 +0200
Subject: [PATCH] make armor upgrade slightly more flexible

---
 mods/ITEMS/mcl_armor/api.lua      | 4 ++--
 mods/ITEMS/mcl_armor/register.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua
index 14ed5b666..8d08524c6 100644
--- a/mods/ITEMS/mcl_armor/api.lua
+++ b/mods/ITEMS/mcl_armor/api.lua
@@ -115,8 +115,8 @@ function mcl_armor.register_set(def)
 			groups[k] = v
 		end
 		local upgrade_item = nil
-		if itemstring:find("_diamond") then
-			upgrade_item = itemstring:gsub("_diamond","_netherite")
+		if itemstring:find("_diamond") and def._mcl_upgrade_item_material then
+			upgrade_item = itemstring:gsub("_[%l%d]*$",def._mcl_upgrade_item_material)
 		end
 
 		minetest.register_tool(itemstring, {
diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua
index 0023414f1..425bf75f0 100644
--- a/mods/ITEMS/mcl_armor/register.lua
+++ b/mods/ITEMS/mcl_armor/register.lua
@@ -80,7 +80,7 @@ mcl_armor.register_set({
 	toughness = 2,
 	craft_material = "mcl_core:diamond",
 	_mcl_upgradable = true,
-	_mcl_upgrade_item_add = "_netherite"
+	_mcl_upgrade_item_material = "_netherite"
 })
 
 mcl_armor.register_set({