Add swords to dual weapons and axes to melee weapons.

Axes are almost always considered melee weapons anyway. Additionally Swords should always be considered dual weapons.

Author: Provismet

src/main/java/com/provismet/CombatPlusCore/mixin/AxeItemMixin.java

@@ -0,0 +1,23 @@
+package com.provismet.CombatPlusCore.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+
+import com.provismet.CombatPlusCore.interfaces.MeleeWeapon;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.AxeItem;
+import net.minecraft.item.MiningToolItem;
+import net.minecraft.item.ToolMaterial;
+import net.minecraft.registry.tag.TagKey;
+
+@Mixin(AxeItem.class)
+public class AxeItemMixin extends MiningToolItem implements MeleeWeapon {
+    protected AxeItemMixin(float attackDamage, float attackSpeed, ToolMaterial material, TagKey<Block> effectiveBlocks, Settings settings) {
+        super(attackDamage, attackSpeed, material, effectiveBlocks, settings);
+    }
+
+    @Override
+    public float getWeaponDamage () {
+        return this.getAttackDamage();
+    }
+}

src/main/java/com/provismet/CombatPlusCore/mixin/SwordItemMixin.java

@@ -0,0 +1,27 @@
+package com.provismet.CombatPlusCore.mixin;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.provismet.CombatPlusCore.interfaces.DualWeapon;
+
+import net.minecraft.item.SwordItem;
+import net.minecraft.item.ToolItem;
+import net.minecraft.item.ToolMaterial;
+
+@Mixin(SwordItem.class)
+public abstract class SwordItemMixin extends ToolItem implements DualWeapon {
+    protected SwordItemMixin (ToolMaterial material, Settings settings) {
+        super(material, settings);
+    }
+
+    @Shadow
+    @Final
+    private float attackDamage;
+
+    @Override
+    public float getWeaponDamage () {
+        return this.attackDamage;
+    }
+}

src/main/resources/combat-plus.mixins.json

@@ -5,7 +5,9 @@
 	"mixins": [
 		"ItemStackMixin",
 		"PlayerEntityMixin",
-		"MobEntityMixin"
+		"MobEntityMixin",
+		"AxeItemMixin",
+		"SwordItemMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

src/main/resources/data/combat-plus/tags/items/melee_weapon.json

@@ -1,6 +1,10 @@
 {
     "replace": false,
     "values": [
-        "#combat-plus:dual_weapon"
+        "#combat-plus:dual_weapon",
+        {
+            "required": false,
+            "id": "#minecraft:axes"
+        }
     ]
 }