diff --git a/enchanting.lua b/enchanting.lua index 80507e2..e25e8b8 100644 --- a/enchanting.lua +++ b/enchanting.lua @@ -89,14 +89,15 @@ end function enchanting.put(_, listname, _, stack, _) local toolstack = stack:get_name() local toolname = toolstack:match("[%w_]+:([%w_]+)") + local count = stack:get_count() - if listname == "mese" and toolstack ~= "default:mese_crystal" then - return 0 - elseif listname == "tool" and not allowed(toolname) then - return 0 + if listname == "mese" and toolstack == "default:mese_crystal" then + return count + elseif listname == "tool" and allowed(toolname) then + return 1 end - return 1 + return 0 end xdecor.register("enchantment_table", { @@ -218,7 +219,8 @@ for _, ench in pairs(tooldef[3]) do minetest.register_tool(":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant, { description = string.format("Enchanted %s %s (%s)", cap(material), cap(tool), cap(enchant)), - inventory_image = original_tool.inventory_image.."^[colorize:blue:20", + inventory_image = original_tool.inventory_image, + texture = "3d_armor_"..tool.."_"..material, wield_image = original_tool.wield_image, groups = armorcaps, wear = 0 diff --git a/textures/3d_armor_enchanted_boots_bronze_speed.png b/textures/3d_armor_enchanted_boots_bronze_speed.png deleted file mode 100644 index e3c27cf..0000000 Binary files a/textures/3d_armor_enchanted_boots_bronze_speed.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_bronze_speed_preview.png b/textures/3d_armor_enchanted_boots_bronze_speed_preview.png deleted file mode 100644 index d0f3bad..0000000 Binary files a/textures/3d_armor_enchanted_boots_bronze_speed_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_bronze_strong.png b/textures/3d_armor_enchanted_boots_bronze_strong.png deleted file mode 100644 index e3c27cf..0000000 Binary files a/textures/3d_armor_enchanted_boots_bronze_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_bronze_strong_preview.png b/textures/3d_armor_enchanted_boots_bronze_strong_preview.png deleted file mode 100644 index d0f3bad..0000000 Binary files a/textures/3d_armor_enchanted_boots_bronze_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_diamond_speed.png b/textures/3d_armor_enchanted_boots_diamond_speed.png deleted file mode 100644 index eca0feb..0000000 Binary files a/textures/3d_armor_enchanted_boots_diamond_speed.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_diamond_speed_preview.png b/textures/3d_armor_enchanted_boots_diamond_speed_preview.png deleted file mode 100644 index d178a54..0000000 Binary files a/textures/3d_armor_enchanted_boots_diamond_speed_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_diamond_strong.png b/textures/3d_armor_enchanted_boots_diamond_strong.png deleted file mode 100644 index eca0feb..0000000 Binary files a/textures/3d_armor_enchanted_boots_diamond_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_diamond_strong_preview.png b/textures/3d_armor_enchanted_boots_diamond_strong_preview.png deleted file mode 100644 index d178a54..0000000 Binary files a/textures/3d_armor_enchanted_boots_diamond_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_gold_speed.png b/textures/3d_armor_enchanted_boots_gold_speed.png deleted file mode 100644 index b62bf93..0000000 Binary files a/textures/3d_armor_enchanted_boots_gold_speed.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_gold_speed_preview.png b/textures/3d_armor_enchanted_boots_gold_speed_preview.png deleted file mode 100644 index e6d07e1..0000000 Binary files a/textures/3d_armor_enchanted_boots_gold_speed_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_gold_strong.png b/textures/3d_armor_enchanted_boots_gold_strong.png deleted file mode 100644 index b62bf93..0000000 Binary files a/textures/3d_armor_enchanted_boots_gold_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_gold_strong_preview.png b/textures/3d_armor_enchanted_boots_gold_strong_preview.png deleted file mode 100644 index e6d07e1..0000000 Binary files a/textures/3d_armor_enchanted_boots_gold_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_steel_speed.png b/textures/3d_armor_enchanted_boots_steel_speed.png deleted file mode 100644 index 47bdb13..0000000 Binary files a/textures/3d_armor_enchanted_boots_steel_speed.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_steel_speed_preview.png b/textures/3d_armor_enchanted_boots_steel_speed_preview.png deleted file mode 100644 index 1aefd84..0000000 Binary files a/textures/3d_armor_enchanted_boots_steel_speed_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_steel_strong.png.png b/textures/3d_armor_enchanted_boots_steel_strong.png.png deleted file mode 100644 index a7d041a..0000000 Binary files a/textures/3d_armor_enchanted_boots_steel_strong.png.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_boots_steel_strong_preview.png b/textures/3d_armor_enchanted_boots_steel_strong_preview.png deleted file mode 100644 index 1aefd84..0000000 Binary files a/textures/3d_armor_enchanted_boots_steel_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_bronze_strong.png b/textures/3d_armor_enchanted_chestplate_bronze_strong.png deleted file mode 100644 index d06313e..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_bronze_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_bronze_strong_preview.png b/textures/3d_armor_enchanted_chestplate_bronze_strong_preview.png deleted file mode 100644 index 15cca70..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_bronze_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_diamond_strong.png b/textures/3d_armor_enchanted_chestplate_diamond_strong.png deleted file mode 100644 index e880f39..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_diamond_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_diamond_strong_preview.png b/textures/3d_armor_enchanted_chestplate_diamond_strong_preview.png deleted file mode 100644 index bed2a02..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_diamond_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_gold_strong.png b/textures/3d_armor_enchanted_chestplate_gold_strong.png deleted file mode 100644 index cf06017..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_gold_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_gold_strong_preview.png b/textures/3d_armor_enchanted_chestplate_gold_strong_preview.png deleted file mode 100644 index 229d3fd..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_gold_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_steel_strong.png b/textures/3d_armor_enchanted_chestplate_steel_strong.png deleted file mode 100644 index 62fe16e..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_steel_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_chestplate_steel_strong_preview.png b/textures/3d_armor_enchanted_chestplate_steel_strong_preview.png deleted file mode 100644 index 6d9dfb4..0000000 Binary files a/textures/3d_armor_enchanted_chestplate_steel_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_bronze_strong.png b/textures/3d_armor_enchanted_helmet_bronze_strong.png deleted file mode 100644 index a550a1b..0000000 Binary files a/textures/3d_armor_enchanted_helmet_bronze_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_bronze_strong_preview.png b/textures/3d_armor_enchanted_helmet_bronze_strong_preview.png deleted file mode 100644 index 323a51f..0000000 Binary files a/textures/3d_armor_enchanted_helmet_bronze_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_diamond_strong.png b/textures/3d_armor_enchanted_helmet_diamond_strong.png deleted file mode 100644 index 083e981..0000000 Binary files a/textures/3d_armor_enchanted_helmet_diamond_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_diamond_strong_preview.png b/textures/3d_armor_enchanted_helmet_diamond_strong_preview.png deleted file mode 100644 index c427c13..0000000 Binary files a/textures/3d_armor_enchanted_helmet_diamond_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_gold_strong.png b/textures/3d_armor_enchanted_helmet_gold_strong.png deleted file mode 100644 index 0a10446..0000000 Binary files a/textures/3d_armor_enchanted_helmet_gold_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_gold_strong_preview.png b/textures/3d_armor_enchanted_helmet_gold_strong_preview.png deleted file mode 100644 index ddda870..0000000 Binary files a/textures/3d_armor_enchanted_helmet_gold_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_steel_strong.png b/textures/3d_armor_enchanted_helmet_steel_strong.png deleted file mode 100644 index ff98024..0000000 Binary files a/textures/3d_armor_enchanted_helmet_steel_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_helmet_steel_strong_preview.png b/textures/3d_armor_enchanted_helmet_steel_strong_preview.png deleted file mode 100644 index 8286abf..0000000 Binary files a/textures/3d_armor_enchanted_helmet_steel_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_bronze_strong.png b/textures/3d_armor_enchanted_leggings_bronze_strong.png deleted file mode 100644 index ff732ec..0000000 Binary files a/textures/3d_armor_enchanted_leggings_bronze_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_bronze_strong_preview.png b/textures/3d_armor_enchanted_leggings_bronze_strong_preview.png deleted file mode 100644 index df6356f..0000000 Binary files a/textures/3d_armor_enchanted_leggings_bronze_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_diamond_strong.png b/textures/3d_armor_enchanted_leggings_diamond_strong.png deleted file mode 100644 index 7c7d319..0000000 Binary files a/textures/3d_armor_enchanted_leggings_diamond_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_diamond_strong_preview.png b/textures/3d_armor_enchanted_leggings_diamond_strong_preview.png deleted file mode 100644 index f563d31..0000000 Binary files a/textures/3d_armor_enchanted_leggings_diamond_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_gold_strong.png b/textures/3d_armor_enchanted_leggings_gold_strong.png deleted file mode 100644 index eaa7de9..0000000 Binary files a/textures/3d_armor_enchanted_leggings_gold_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_gold_strong_preview.png b/textures/3d_armor_enchanted_leggings_gold_strong_preview.png deleted file mode 100644 index ce31eaf..0000000 Binary files a/textures/3d_armor_enchanted_leggings_gold_strong_preview.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_steel_strong.png b/textures/3d_armor_enchanted_leggings_steel_strong.png deleted file mode 100644 index db8f1a0..0000000 Binary files a/textures/3d_armor_enchanted_leggings_steel_strong.png and /dev/null differ diff --git a/textures/3d_armor_enchanted_leggings_steel_strong_preview.png b/textures/3d_armor_enchanted_leggings_steel_strong_preview.png deleted file mode 100644 index ebc403a..0000000 Binary files a/textures/3d_armor_enchanted_leggings_steel_strong_preview.png and /dev/null differ