Add itemstack callbacks to enchantment helper.

Author: Provismet

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.15.2
 
 # Mod Properties
-mod_version=0.5.3
+mod_version=0.5.4
 maven_group=com.provismet
 archives_base_name=combatplus-core
 

src/main/java/com/provismet/CombatPlusCore/utility/CPCEnchantmentHelper.java

@@ -60,37 +60,79 @@ public static float getAttackDamage (LivingEntity user, LivingEntity target) {
      * 
      * @param user The wielder of the item.
      * @param target The entity that was struck.
+     * @param slot The equipment slot to trigger callbacks for.
      */
     public static void postChargedHit (LivingEntity user, LivingEntity target, EquipmentSlot slot) {
         CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
             if (enchantment instanceof CPCEnchantment cpcEnchant) cpcEnchant.postChargedHit(level, user, target);
         }, user, slot);
     }
 
+    /**
+     * Calls enchantment callbacks for charged hits.
+     * 
+     * @param user The wielder of the item.
+     * @param target The entity that was struck.
+     * @param itemStack The item stack to trigger callbacks for.
+     */
+    public static void postChargedHit (LivingEntity user, LivingEntity target, ItemStack itemStack) {
+        CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
+            if (enchantment instanceof CPCEnchantment cpcEnchant) cpcEnchant.postChargedHit(level, user, target);
+        }, itemStack);
+    }
+
     /**
      * Calls enchantment callbacks for critical hits.
      * 
      * @param user The wielder of the item.
      * @param target The entity that was struck.
+     * @param slot The equipment slot to trigger callbacks for.
      */
     public static void postCriticalHit (LivingEntity user, LivingEntity target, EquipmentSlot slot) {
         CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
             if (enchantment instanceof CPCEnchantment cpcEnchant) cpcEnchant.postCriticalHit(level, user, target);
         }, user, slot);
     }
 
+    /**
+     * Calls enchantment callbacks for critical hits.
+     * 
+     * @param user The wielder of the item.
+     * @param target The entity that was struck.
+     * @param itemStack The item stack to trigger callbacks for.
+     */
+    public static void postCriticalHit (LivingEntity user, LivingEntity target, ItemStack itemStack) {
+        CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
+            if (enchantment instanceof CPCEnchantment cpcEnchant) cpcEnchant.postCriticalHit(level, user, target);
+        }, itemStack);
+    }
+
     /**
      * Calls enchantment callbacks for kills.
      * 
      * @param user The wielder of the item.
      * @param target The entity that was killed.
+     * @param slot The equipment slot to trigger callbacks for.
      */
     public static void postKill (LivingEntity user, LivingEntity target, EquipmentSlot slot) {
         CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
             if (enchantment instanceof CPCEnchantment cpcEnchant) cpcEnchant.postKill(level, user, target);
         }, user, slot);
     }
 
+    /**
+     * Calls enchantment callbacks for kills.
+     * 
+     * @param user The wielder of the item.
+     * @param target The entity that was killed.
+     * @param itemStack The item stack to trigger callbacks for.
+     */
+    public static void postKill (LivingEntity user, LivingEntity target, ItemStack itemStack) {
+        CPCEnchantmentHelper.forEachEnchantment((enchantment, level) -> {
+            if (enchantment instanceof CPCEnchantment cpcEnchant) cpcEnchant.postKill(level, user, target);
+        }, itemStack);
+    }
+
     /**
      * Iterates over all equipment slots on the user, activating a consumer for each enchantment.
      * 

src/main/resources/fabric.mod.json

@@ -8,7 +8,7 @@
 		"Provismet"
 	],
 	"contact": {
-		"homepage": "https://github.com/Provismet/CombatPlus-Core",
+		"homepage": "https://provismet.github.io/modding?tag=null&series=Combat%2B",
 		"sources": "https://github.com/Provismet/CombatPlus-Core"
 	},
 	"license": "MIT",