Merge pull request #3170 from QiuShui1012/fix/1.21

Fix bugs about merciless 修复无情的问题

Author: Gu-ZT

src/main/java/dev/dubhe/anvilcraft/item/property/component/Merciless.java

@@ -47,7 +47,7 @@ private static void tickEnabled(ItemStack stack) {
         int levels = 0;
 
         // 将已无情的魔咒的等级添至总等级
-        ItemEnchantments mercilessEnchs = stack.get(ModComponents.MERCILESS_ENCHANTMENTS);
+        ItemEnchantments mercilessEnchs = stack.getOrDefault(ModComponents.MERCILESS_ENCHANTMENTS, ItemEnchantments.EMPTY);
         for (Holder<Enchantment> enchantment : mercilessEnchs.keySet()) {
             levels += mercilessEnchs.getLevel(enchantment);
         }
@@ -114,11 +114,11 @@ private static void tickDisabled(ItemStack stack) {
             stack.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)
         );
         ItemEnchantments.Mutable mercilessEnchsMut = new ItemEnchantments.Mutable(mercilessEnchs);
-        for (Iterator<Holder<Enchantment>> it = mercilessEnchsMut.keySet().iterator(); it.hasNext(); ) {
-            Holder<Enchantment> enchantment = it.next();
+        for (Holder<Enchantment> enchantment : mercilessEnchsMut.keySet()) {
             enchsMut.set(enchantment, mercilessEnchsMut.getLevel(enchantment));
-            it.remove();
         }
+        stack.set(DataComponents.ENCHANTMENTS, enchsMut.toImmutable());
+        stack.set(ModComponents.MERCILESS_ENCHANTMENTS, ItemEnchantments.EMPTY);
 
         // 移除属性修饰符
         ItemAttributeModifiers.Builder builder = ItemAttributeModifiers.builder();