Add item component granting to enchantments.

Provismet · Provismet · commit affbbf9041fb · 2025-04-06T18:40:47.000+01:00
diff --git a/src/main/generated/assets/combat-plus-core/lang/en_us.json b/src/main/generated/assets/combat-plus-core/lang/en_us.json
@@ -24,7 +24,6 @@
   "tag.enchantment.combat-plus.aspect": "Aspect Enchantments",
   "tag.enchantment.combat-plus.offhand": "Offhand Enchantments",
   "tag.enchantment.combat-plus.weapon_utility": "Weapon Utility Enchantments",
-  "tag.item.combat-plus.breaks_shields": "Breaks Shields",
   "tag.item.combat-plus.dual_weapon": "Dual Weapons",
   "tag.item.combat-plus.enchantable.aspect": "Aspect Enchantable",
   "tag.item.combat-plus.enchantable.aspect_primary": "Primary Aspect Enchantable",
diff --git a/src/main/generated/data/combat-plus/tags/item/breaks_shields.json b/src/main/generated/data/combat-plus/tags/item/breaks_shields.json
diff --git a/src/main/generated/data/minecraft/enchantment/loyalty.json b/src/main/generated/data/minecraft/enchantment/loyalty.json
@@ -0,0 +1,42 @@
+{
+  "anvil_cost": 2,
+  "description": {
+    "translate": "enchantment.minecraft.loyalty"
+  },
+  "effects": {
+    "combat-plus:data_component": [
+      {
+        "effect": {
+          "type": "combat-plus:use_group_component",
+          "group": "combat-plus:loyalty_trident"
+        }
+      }
+    ],
+    "minecraft:trident_return_acceleration": [
+      {
+        "effect": {
+          "type": "minecraft:add",
+          "value": {
+            "type": "minecraft:linear",
+            "base": 1.0,
+            "per_level_above_first": 1.0
+          }
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 50,
+    "per_level_above_first": 0
+  },
+  "max_level": 3,
+  "min_cost": {
+    "base": 12,
+    "per_level_above_first": 7
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "supported_items": "#minecraft:enchantable/trident",
+  "weight": 5
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/CPCMain.java b/src/main/java/com/provismet/CombatPlusCore/CPCMain.java
@@ -1,6 +1,8 @@
 package com.provismet.CombatPlusCore;
 
 import com.provismet.CombatPlusCore.debug.registries.CPCDebugItems;
+import com.provismet.CombatPlusCore.registries.CPCDataComponentEffects;
+import com.provismet.CombatPlusCore.registries.CPCDataComponentTypes;
 import com.provismet.CombatPlusCore.registries.CPCEnchantmentComponentTypes;
 import com.provismet.CombatPlusCore.registries.CPCLootFunctionTypes;
 import com.provismet.CombatPlusCore.registries.DoubleEntityEffects;
@@ -51,6 +53,8 @@ public void onInitialize () {
         LambdaRegistry.register();
         CPCGameRules.init();
         SingleEntityEffects.register();
+        CPCDataComponentEffects.register();
+        CPCDataComponentTypes.init();
 
         LilyResourceConditions.register();
 
diff --git a/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/CPCDataComponentEntityEffect.java b/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/CPCDataComponentEntityEffect.java
@@ -0,0 +1,30 @@
+package com.provismet.CombatPlusCore.enchantment.effect;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+import com.provismet.CombatPlusCore.utility.CPCRegistries;
+import net.minecraft.component.ComponentType;
+import net.minecraft.item.ItemStack;
+
+import java.util.function.Function;
+
+public interface CPCDataComponentEntityEffect<T> {
+    Codec<CPCDataComponentEntityEffect<?>> CODEC = CPCRegistries.ENCHANTMENT_DATA_COMPONENT_EFFECT_TYPE.getCodec().dispatch(CPCDataComponentEntityEffect::getCodec, Function.identity());
+
+    default void apply (ItemStack stack, int level) {
+        if (stack.get(this.getComponentType()) == null) {
+            stack.set(this.getComponentType(), this.getComponent(level));
+        }
+    }
+
+    default void remove (ItemStack stack, int level) {
+        // Would this item normally have this component? If so then assume the enchantment never applied a new version.
+        if (stack.getItem().getDefaultStack().get(this.getComponentType()) == null) {
+            stack.remove(this.getComponentType());
+        }
+    }
+
+    T getComponent (int level);
+    ComponentType<T> getComponentType ();
+    MapCodec<? extends CPCDataComponentEntityEffect<?>> getCodec ();
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/component/BlocksAttacksComponentEntityEffect.java b/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/component/BlocksAttacksComponentEntityEffect.java
@@ -0,0 +1,63 @@
+package com.provismet.CombatPlusCore.enchantment.effect.component;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCDataComponentEntityEffect;
+import net.minecraft.component.ComponentType;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.BlocksAttacksComponent;
+import net.minecraft.enchantment.EnchantmentLevelBasedValue;
+import net.minecraft.entity.damage.DamageType;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.sound.SoundEvent;
+
+import java.util.List;
+import java.util.Optional;
+
+public record BlocksAttacksComponentEntityEffect (
+    EnchantmentLevelBasedValue blockDelaySeconds,
+    EnchantmentLevelBasedValue disableCooldownScale,
+    List<BlocksAttacksComponent.DamageReduction> damageReductions,
+    BlocksAttacksComponent.ItemDamage itemDamage,
+    Optional<TagKey<DamageType>> bypassedBy,
+    Optional<RegistryEntry<SoundEvent>> blockSound,
+    Optional<RegistryEntry<SoundEvent>> disableSound)
+    implements CPCDataComponentEntityEffect<BlocksAttacksComponent>
+{
+    public static final MapCodec<BlocksAttacksComponentEntityEffect> CODEC = RecordCodecBuilder.mapCodec(
+        instance -> instance.group(
+            EnchantmentLevelBasedValue.CODEC.optionalFieldOf("block_delay_seconds", EnchantmentLevelBasedValue.constant(0)).forGetter(BlocksAttacksComponentEntityEffect::blockDelaySeconds),
+            EnchantmentLevelBasedValue.CODEC.optionalFieldOf("disable_cooldown_scale", EnchantmentLevelBasedValue.constant(1)).forGetter(BlocksAttacksComponentEntityEffect::disableCooldownScale),
+            BlocksAttacksComponent.DamageReduction.CODEC.listOf().optionalFieldOf("damage_reductions", List.of(new BlocksAttacksComponent.DamageReduction(90f, Optional.empty(), 0f, 1f))).forGetter(BlocksAttacksComponentEntityEffect::damageReductions),
+            BlocksAttacksComponent.ItemDamage.CODEC.optionalFieldOf("item_damage", BlocksAttacksComponent.ItemDamage.DEFAULT).forGetter(BlocksAttacksComponentEntityEffect::itemDamage),
+            TagKey.codec(RegistryKeys.DAMAGE_TYPE).optionalFieldOf("bypassed_by").forGetter(BlocksAttacksComponentEntityEffect::bypassedBy),
+            SoundEvent.ENTRY_CODEC.optionalFieldOf("block_sound").forGetter(BlocksAttacksComponentEntityEffect::blockSound),
+            SoundEvent.ENTRY_CODEC.optionalFieldOf("disabled_sound").forGetter(BlocksAttacksComponentEntityEffect::disableSound)
+        ).apply(instance, BlocksAttacksComponentEntityEffect::new)
+    );
+
+    @Override
+    public MapCodec<BlocksAttacksComponentEntityEffect> getCodec () {
+        return CODEC;
+    }
+
+    @Override
+    public BlocksAttacksComponent getComponent (int level) {
+        return new BlocksAttacksComponent(
+            this.blockDelaySeconds.getValue(level),
+            this.disableCooldownScale.getValue(level),
+            this.damageReductions,
+            this.itemDamage,
+            this.bypassedBy,
+            this.blockSound,
+            this.disableSound
+        );
+    }
+
+    @Override
+    public ComponentType<BlocksAttacksComponent> getComponentType () {
+        return DataComponentTypes.BLOCKS_ATTACKS;
+    }
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/component/CooldownGroupComponentEntityEffect.java b/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/component/CooldownGroupComponentEntityEffect.java
@@ -0,0 +1,31 @@
+package com.provismet.CombatPlusCore.enchantment.effect.component;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCDataComponentEntityEffect;
+import com.provismet.CombatPlusCore.registries.CPCDataComponentTypes;
+import net.minecraft.component.ComponentType;
+import net.minecraft.util.Identifier;
+
+public record CooldownGroupComponentEntityEffect (Identifier group) implements CPCDataComponentEntityEffect<Identifier> {
+    public static final MapCodec<CooldownGroupComponentEntityEffect> CODEC = RecordCodecBuilder.mapCodec(
+        instance -> instance.group(
+            Identifier.CODEC.fieldOf("group").forGetter(CooldownGroupComponentEntityEffect::group)
+        ).apply(instance, CooldownGroupComponentEntityEffect::new)
+    );
+
+    @Override
+    public Identifier getComponent (int level) {
+        return this.group;
+    }
+
+    @Override
+    public ComponentType<Identifier> getComponentType () {
+        return CPCDataComponentTypes.COOLDOWN_GROUP;
+    }
+
+    @Override
+    public MapCodec<CooldownGroupComponentEntityEffect> getCodec () {
+        return CODEC;
+    }
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/component/UseCooldownComponentEntityEffect.java b/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/component/UseCooldownComponentEntityEffect.java
@@ -0,0 +1,36 @@
+package com.provismet.CombatPlusCore.enchantment.effect.component;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCDataComponentEntityEffect;
+import net.minecraft.component.ComponentType;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.UseCooldownComponent;
+import net.minecraft.enchantment.EnchantmentLevelBasedValue;
+import net.minecraft.util.Identifier;
+
+import java.util.Optional;
+
+public record UseCooldownComponentEntityEffect (EnchantmentLevelBasedValue seconds, Optional<Identifier> cooldownGroup) implements CPCDataComponentEntityEffect<UseCooldownComponent> {
+    public static final MapCodec<UseCooldownComponentEntityEffect> CODEC = RecordCodecBuilder.mapCodec(
+        instance -> instance.group(
+            EnchantmentLevelBasedValue.CODEC.fieldOf("seconds").forGetter(UseCooldownComponentEntityEffect::seconds),
+            Identifier.CODEC.optionalFieldOf("cooldown_group").forGetter(UseCooldownComponentEntityEffect::cooldownGroup)
+        ).apply(instance, UseCooldownComponentEntityEffect::new)
+    );
+
+    @Override
+    public UseCooldownComponent getComponent (int level) {
+        return new UseCooldownComponent(Math.max(this.seconds.getValue(level), 0.0001f), this.cooldownGroup);
+    }
+
+    @Override
+    public ComponentType<UseCooldownComponent> getComponentType () {
+        return DataComponentTypes.USE_COOLDOWN;
+    }
+
+    @Override
+    public MapCodec<UseCooldownComponentEntityEffect> getCodec () {
+        return CODEC;
+    }
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/singleEntity/SetCooldownEnchantmentEffect.java b/src/main/java/com/provismet/CombatPlusCore/enchantment/effect/singleEntity/SetCooldownEnchantmentEffect.java
@@ -0,0 +1,34 @@
+package com.provismet.CombatPlusCore.enchantment.effect.singleEntity;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.provismet.CombatPlusCore.registries.CPCEnchantmentComponentTypes;
+import com.provismet.CombatPlusCore.utility.CPCEnchantmentHelper;
+import net.minecraft.enchantment.EnchantmentEffectContext;
+import net.minecraft.enchantment.EnchantmentLevelBasedValue;
+import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.Vec3d;
+
+public record SetCooldownEnchantmentEffect (EnchantmentLevelBasedValue ticks) implements EnchantmentEntityEffect {
+    public static final MapCodec<SetCooldownEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
+        instance.group(
+            EnchantmentLevelBasedValue.CODEC.fieldOf("ticks").forGetter(SetCooldownEnchantmentEffect::ticks)
+        ).apply(instance, SetCooldownEnchantmentEffect::new)
+    );
+
+    @Override
+    public void apply (ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
+        if (!(user instanceof PlayerEntity player)) return;
+
+        int cooldown = (int)CPCEnchantmentHelper.modifyValue(CPCEnchantmentComponentTypes.MODIFY_COOLDOWN, world, context.stack(), user, this.ticks.getValue(level));
+        player.getItemCooldownManager().set(context.stack(), cooldown);
+    }
+
+    @Override
+    public MapCodec<? extends EnchantmentEntityEffect> getCodec () {
+        return CODEC;
+    }
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/mixin/ItemStackMixin.java b/src/main/java/com/provismet/CombatPlusCore/mixin/ItemStackMixin.java
@@ -0,0 +1,47 @@
+package com.provismet.CombatPlusCore.mixin;
+
+import com.provismet.CombatPlusCore.enchantment.effect.CPCDataComponentEntityEffect;
+import com.provismet.CombatPlusCore.registries.CPCEnchantmentComponentTypes;
+import com.provismet.CombatPlusCore.utility.CPCEnchantmentHelper;
+import net.minecraft.component.ComponentType;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ItemEnchantmentsComponent;
+import net.minecraft.enchantment.effect.EnchantmentEffectEntry;
+import net.minecraft.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(ItemStack.class)
+public abstract class ItemStackMixin {
+    @Shadow public abstract ItemEnchantmentsComponent getEnchantments ();
+
+    @Inject(method = "set", at = @At("HEAD"))
+    private <T> void applyItemComponentsFromEnchantments (ComponentType<T> type, @Nullable T value, CallbackInfoReturnable<T> cir) {
+        if (type != DataComponentTypes.ENCHANTMENTS) return;
+        if (!(value instanceof ItemEnchantmentsComponent newComponent)) return;
+
+        ItemStack thisItem = (ItemStack)(Object)this;
+
+        // Remove the old components.
+        CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
+            List<EnchantmentEffectEntry<CPCDataComponentEntityEffect<?>>> componentEffects = enchantment.value().getEffect(CPCEnchantmentComponentTypes.DATA_COMPONENT);
+            for (EnchantmentEffectEntry<CPCDataComponentEntityEffect<?>> effect : componentEffects) {
+                effect.effect().remove(thisItem, level);
+            }
+        }, thisItem);
+
+        // Add the new components.
+        newComponent.getEnchantmentEntries().forEach(entry -> {
+            List<EnchantmentEffectEntry<CPCDataComponentEntityEffect<?>>> componentEffects = entry.getKey().value().getEffect(CPCEnchantmentComponentTypes.DATA_COMPONENT);
+            for (EnchantmentEffectEntry<CPCDataComponentEntityEffect<?>> effect : componentEffects) {
+                effect.effect().apply(thisItem, entry.getIntValue());
+            }
+        });
+    }
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/registries/CPCDataComponentEffects.java b/src/main/java/com/provismet/CombatPlusCore/registries/CPCDataComponentEffects.java
@@ -0,0 +1,22 @@
+package com.provismet.CombatPlusCore.registries;
+
+import com.mojang.serialization.MapCodec;
+import com.provismet.CombatPlusCore.CPCMain;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCDataComponentEntityEffect;
+import com.provismet.CombatPlusCore.enchantment.effect.component.BlocksAttacksComponentEntityEffect;
+import com.provismet.CombatPlusCore.enchantment.effect.component.CooldownGroupComponentEntityEffect;
+import com.provismet.CombatPlusCore.enchantment.effect.component.UseCooldownComponentEntityEffect;
+import com.provismet.CombatPlusCore.utility.CPCRegistries;
+import net.minecraft.registry.Registry;
+
+public abstract class CPCDataComponentEffects {
+    public static void register () {
+        register("blocks_attacks_component", BlocksAttacksComponentEntityEffect.CODEC);
+        register("use_cooldown_component", UseCooldownComponentEntityEffect.CODEC);
+        register("use_group_component", CooldownGroupComponentEntityEffect.CODEC);
+    }
+
+    private static void register (String name, MapCodec<? extends CPCDataComponentEntityEffect<?>> codec) {
+        Registry.register(CPCRegistries.ENCHANTMENT_DATA_COMPONENT_EFFECT_TYPE, CPCMain.identifier(name), codec);
+    }
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/registries/CPCDataComponentTypes.java b/src/main/java/com/provismet/CombatPlusCore/registries/CPCDataComponentTypes.java
@@ -0,0 +1,19 @@
+package com.provismet.CombatPlusCore.registries;
+
+import com.provismet.CombatPlusCore.CPCMain;
+import net.minecraft.component.ComponentType;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+
+import java.util.function.UnaryOperator;
+
+public abstract class CPCDataComponentTypes {
+    public static final ComponentType<Identifier> COOLDOWN_GROUP = register("cooldown_group", builder -> builder.codec(Identifier.CODEC).packetCodec(Identifier.PACKET_CODEC));
+
+    private static <T> ComponentType<T> register (String name, UnaryOperator<ComponentType.Builder<T>> builderOperator) {
+        return Registry.register(Registries.DATA_COMPONENT_TYPE, CPCMain.identifier(name), builderOperator.apply(builderOperator.apply(ComponentType.builder())).build());
+    }
+
+    public static void init () {}
+}
diff --git a/src/main/java/com/provismet/CombatPlusCore/registries/CPCEnchantmentComponentTypes.java b/src/main/java/com/provismet/CombatPlusCore/registries/CPCEnchantmentComponentTypes.java
@@ -1,6 +1,7 @@
 package com.provismet.CombatPlusCore.registries;
 
 import com.provismet.CombatPlusCore.CPCMain;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCDataComponentEntityEffect;
 import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
 import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContextTypes;
 import net.minecraft.component.ComponentType;
@@ -13,13 +14,15 @@
 import java.util.List;
 import java.util.function.UnaryOperator;
 
-public class CPCEnchantmentComponentTypes {
+public abstract class CPCEnchantmentComponentTypes {
     public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_CHARGED_ATTACK = register("post_charged_attack", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
     public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_CRITICAL_ATTACK = register("post_critical_attack", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
     public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_KILL = register("post_kill", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
     public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_BLOCK = register("post_block", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
     public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentValueEffect>>> BONUS_DAMAGE = register("bonus_damage", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentValueEffect.CODEC, LootContextTypes.ENCHANTED_DAMAGE).listOf()));
     public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentValueEffect>>> GAMERULE_DAMAGE = register("gamerule_damage", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentValueEffect.CODEC, LootContextTypes.ENCHANTED_DAMAGE).listOf()));
+    public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentValueEffect>>> MODIFY_COOLDOWN = register("modify_cooldown", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentValueEffect.CODEC, LootContextTypes.ENCHANTED_ENTITY).listOf()));
+    public static final ComponentType<List<EnchantmentEffectEntry<CPCDataComponentEntityEffect<?>>>> DATA_COMPONENT = register("data_component", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCDataComponentEntityEffect.CODEC, LootContextTypes.ENCHANTED_ITEM).listOf()));
 
     public static void init () {}
 
diff --git a/src/main/java/com/provismet/CombatPlusCore/registries/SingleEntityEffects.java b/src/main/java/com/provismet/CombatPlusCore/registries/SingleEntityEffects.java
diff --git a/src/main/java/com/provismet/CombatPlusCore/utility/CPCRegistries.java b/src/main/java/com/provismet/CombatPlusCore/utility/CPCRegistries.java
diff --git a/src/main/java/com/provismet/CombatPlusCore/utility/CPCRegistryKeys.java b/src/main/java/com/provismet/CombatPlusCore/utility/CPCRegistryKeys.java
diff --git a/src/main/java/com/provismet/datagen/CombatPlusCore/EnchantmentGenerator.java b/src/main/java/com/provismet/datagen/CombatPlusCore/EnchantmentGenerator.java
diff --git a/src/main/resources/combat-plus.mixins.json b/src/main/resources/combat-plus.mixins.json
