Merge 1.21(.1) into 1.21.4

* 1.21(.1):
  Update AnvilMenu Enchantability Matching (1.4.15-d:c4)
  Apply new Mixin in fabric.mod.json (1.4.15-d:c3)

# Conflicts:
#	src/main/java/de/pnku/mstv_base/mixin/AnvilMenuMixin.java

Author: pnk2u

src/main/java/de/pnku/mstv_base/mixin/AnvilMenuMixin.java

@@ -3,6 +3,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.inventory.AnvilMenu;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -11,6 +12,9 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static net.minecraft.tags.ItemTags.*;
 import static net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.*;
 
@@ -20,7 +24,7 @@ public abstract class AnvilMenuMixin {
     private boolean wrappedCreateResultItemStackIs(ItemStack firstInputStack, Item secondInputItem, Operation<Boolean> original) {
         if (original.call(firstInputStack, secondInputItem)) return true;
 
-        if (isSameToolType(firstInputStack, new ItemStack(secondInputItem))) {
+        if (isSameEnchantabilityType(firstInputStack, new ItemStack(secondInputItem))) {
             Repairable firstRepairable = firstInputStack.get(DataComponents.REPAIRABLE);
             Repairable secondRepairable = secondInputItem.getDefaultInstance().get(DataComponents.REPAIRABLE);
             if (firstRepairable != null) {
@@ -32,16 +36,14 @@ private boolean wrappedCreateResultItemStackIs(ItemStack firstInputStack, Item s
     }
 
     @Unique
-    private boolean isSameToolType(ItemStack stack1, ItemStack stack2) {
-        return (stack1.is(AXES) && stack2.is(AXES))
-                || (stack1.is(HOES) && stack2.is(HOES))
-                || (stack1.is(PICKAXES) && stack2.is(PICKAXES))
-                || (stack1.is(SHOVELS) && stack2.is(SHOVELS))
-                || (stack1.is(SWORDS) && stack2.is(SWORDS))
-                || (stack1.is(BOW_TOOLS) && stack2.is(BOW_TOOLS))
-                || (stack1.is(CROSSBOW_TOOLS) && stack2.is(CROSSBOW_TOOLS))
-                || (stack1.is(FISHING_ROD_TOOLS) && stack2.is(FISHING_ROD_TOOLS))
-                || (stack1.is(SHIELD_TOOLS) && stack2.is(SHIELD_TOOLS))
-                || (stack1.is(SPEAR_TOOLS) && stack2.is(SPEAR_TOOLS));
+    private boolean isSameEnchantabilityType(ItemStack stack1, ItemStack stack2) {
+        List <TagKey<Item>> enchantableTags = new ArrayList<>();
+        enchantableTags.add(AXES); enchantableTags.add(HOES); enchantableTags.add(PICKAXES); enchantableTags.add(SHOVELS); enchantableTags.add(SWORDS);
+        enchantableTags.add(BOW_ENCHANTABLE); enchantableTags.add(CROSSBOW_ENCHANTABLE); enchantableTags.add(FISHING_ENCHANTABLE);
+        enchantableTags.add(SHIELD_TOOLS); enchantableTags.add(SPEAR_TOOLS);
+        for (TagKey<Item> tag : enchantableTags) {
+            if (stack1.is(tag) && stack2.is(tag)) return true;
+        }
+        return false;
     }
 }

src/main/resources/fabric.mod.json

@@ -22,6 +22,7 @@
     ]
   },
   "mixins": [
+    "mstv-base.mixins.json",
     "mstv-base.trade.mixins.json"
   ],
   "accessWidener": "mstv-base.accesswidener",