Add enchantment effects that trigger melee weapon callbacks.

Author: Provismet

src/main/java/com/provismet/CombatPlusCore/enchantment/effect/doubleEntity/WeaponPostCharged.java

@@ -0,0 +1,28 @@
+package com.provismet.CombatPlusCore.enchantment.effect.doubleEntity;
+
+import com.mojang.serialization.MapCodec;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
+import com.provismet.CombatPlusCore.interfaces.MeleeWeapon;
+import net.minecraft.enchantment.EnchantmentEffectContext;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.server.world.ServerWorld;
+
+public record WeaponPostCharged () implements CPCEnchantmentEntityEffect {
+    public static final MapCodec<WeaponPostCharged> CODEC = MapCodec.unit(WeaponPostCharged::new);
+
+    @Override
+    public void apply (ServerWorld world, int level, EnchantmentEffectContext context, Entity attacker, Entity target) {
+        if (attacker instanceof LivingEntity livingAttacker && target instanceof LivingEntity livingTarget) {
+            if (context.stack().getItem() instanceof MeleeWeapon meleeWeapon)
+                meleeWeapon.postChargedHit(context.stack(), livingAttacker, livingTarget);
+            else if (attacker.getWeaponStack().getItem() instanceof MeleeWeapon meleeWeapon)
+                meleeWeapon.postChargedHit(attacker.getWeaponStack(), livingAttacker, livingTarget);
+        }
+    }
+
+    @Override
+    public MapCodec<? extends CPCEnchantmentEntityEffect> getCodec () {
+        return CODEC;
+    }
+}

src/main/java/com/provismet/CombatPlusCore/enchantment/effect/doubleEntity/WeaponPostCritical.java

@@ -0,0 +1,28 @@
+package com.provismet.CombatPlusCore.enchantment.effect.doubleEntity;
+
+import com.mojang.serialization.MapCodec;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
+import com.provismet.CombatPlusCore.interfaces.MeleeWeapon;
+import net.minecraft.enchantment.EnchantmentEffectContext;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.server.world.ServerWorld;
+
+public record WeaponPostCritical () implements CPCEnchantmentEntityEffect {
+    public static final MapCodec<WeaponPostCritical> CODEC = MapCodec.unit(WeaponPostCritical::new);
+
+    @Override
+    public void apply (ServerWorld world, int level, EnchantmentEffectContext context, Entity attacker, Entity target) {
+        if (attacker instanceof LivingEntity livingAttacker && target instanceof LivingEntity livingTarget) {
+            if (context.stack().getItem() instanceof MeleeWeapon meleeWeapon)
+                meleeWeapon.postCriticalHit(context.stack(), livingAttacker, livingTarget);
+            else if (attacker.getWeaponStack().getItem() instanceof MeleeWeapon meleeWeapon)
+                meleeWeapon.postCriticalHit(attacker.getWeaponStack(), livingAttacker, livingTarget);
+        }
+    }
+
+    @Override
+    public MapCodec<? extends CPCEnchantmentEntityEffect> getCodec () {
+        return CODEC;
+    }
+}

src/main/java/com/provismet/CombatPlusCore/enchantment/effect/doubleEntity/WeaponPostKill.java

@@ -0,0 +1,28 @@
+package com.provismet.CombatPlusCore.enchantment.effect.doubleEntity;
+
+import com.mojang.serialization.MapCodec;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
+import com.provismet.CombatPlusCore.interfaces.MeleeWeapon;
+import net.minecraft.enchantment.EnchantmentEffectContext;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.server.world.ServerWorld;
+
+public record WeaponPostKill () implements CPCEnchantmentEntityEffect {
+    public static final MapCodec<WeaponPostKill> CODEC = MapCodec.unit(WeaponPostKill::new);
+
+    @Override
+    public void apply (ServerWorld world, int level, EnchantmentEffectContext context, Entity attacker, Entity target) {
+        if (attacker instanceof LivingEntity livingAttacker && target instanceof LivingEntity livingTarget) {
+            if (context.stack().getItem() instanceof MeleeWeapon meleeWeapon)
+                meleeWeapon.postKill(context.stack(), livingAttacker, livingTarget);
+            else if (attacker.getWeaponStack().getItem() instanceof MeleeWeapon meleeWeapon)
+                meleeWeapon.postKill(attacker.getWeaponStack(), livingAttacker, livingTarget);
+        }
+    }
+
+    @Override
+    public MapCodec<? extends CPCEnchantmentEntityEffect> getCodec () {
+        return CODEC;
+    }
+}

src/main/java/com/provismet/CombatPlusCore/registries/CPCEnchantmentDoubleEntityEffects.java

@@ -3,12 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import com.provismet.CombatPlusCore.CPCMain;
 import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
-import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyToBothEntityEnchantmentEffect;
-import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyKnockbackEnchantmentEffect;
-import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyToTargetEntityEnchantmentEffect;
-import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyToUserEntityEnchantmentEffect;
-import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.CodeExecutionDoubleEntityEnchantmentEffect;
-import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.InvertedEntityEnchantmentEffect;
+import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.*;
 import com.provismet.CombatPlusCore.utility.CPCRegistries;
 import net.minecraft.registry.Registry;
 
@@ -20,6 +15,9 @@ public static void register () {
         register("apply_to_both", ApplyToBothEntityEnchantmentEffect.CODEC);
         register("invert", InvertedEntityEnchantmentEffect.CODEC);
         register("apply_knockback", ApplyKnockbackEnchantmentEffect.CODEC);
+        register("weapon_post_charged_attack", WeaponPostCharged.CODEC);
+        register("weapon_post_critical_attack", WeaponPostCritical.CODEC);
+        register("weapon_post_kill", WeaponPostKill.CODEC);
     }
 
     private static <T extends CPCEnchantmentEntityEffect> void register (String name, MapCodec<T> codec) {