Fix issues with ProjectileHitActionPowerFactories.

CHANGELOG.md

@@ -2,7 +2,8 @@
 Modify Scale is broken, I know about it. I got frustrated trying to fix it, so I released this version early so TooManyOrigins players don't have to wait.
 
 ## Power Types
-- Added `stop_after` field to `action_on_projectile_hit` power type.
+- Added `stop_after` field to the `action_on_projectile_hit` power type.
+- `action_when_projectile_hit` now functions when a non living entity is the owner of the projectile.
 
 ## Entity Condition Types
 - Added `space` field to `velocity` entity condition type.

common/src/main/java/net/merchantpug/apugli/power/factory/ActionWhenProjectileHitPowerFactory.java

@@ -6,8 +6,7 @@
 public interface ActionWhenProjectileHitPowerFactory<P> extends ProjectileHitActionPowerFactory<P> {
 
     default void execute(P power, LivingEntity entity, Projectile projectile) {
-        if (!(projectile.getOwner() instanceof LivingEntity living)) return;
-        this.execute(power, entity, living, entity, projectile, 1);
+        this.execute(power, entity, projectile.getOwner(), entity, projectile, getDataFromPower(power).getInt("stop_after"));
     }
 
 }

common/src/main/java/net/merchantpug/apugli/power/factory/ProjectileHitActionPowerFactory.java

@@ -18,7 +18,7 @@ static SerializableData getSerializableData() {
                 .add("stop_after", SerializableDataTypes.INT, 1);
     }
 
-    default void execute(P power, LivingEntity powerHolder, LivingEntity attacker, Entity target, Projectile projectile, int amountHit) {
+    default void execute(P power, LivingEntity powerHolder, Entity attacker, Entity target, Projectile projectile, int amountHit) {
         SerializableData.Instance data = getDataFromPower(power);
         if (canUse(power, powerHolder) && Services.CONDITION.checkBiEntity(data, "bientity_condition", projectile, target) && Services.CONDITION.checkBiEntity(data, "owner_bientity_condition", attacker, target)) {
             Services.ACTION.executeBiEntity(data, "bientity_action", projectile, target);

fabric/src/main/java/net/merchantpug/apugli/mixin/fabric/common/ProjectileEntityMixin.java

@@ -35,8 +35,8 @@ public abstract class ProjectileEntityMixin implements ProjectileEntityAccess {
             Services.POWER.getPowers(living, ApugliPowers.ACTION_WHEN_PROJECTILE_HIT.get()).forEach(power -> ApugliPowers.ACTION_WHEN_PROJECTILE_HIT.get().execute(power, living, (Projectile)(Object)this));
         if (hitResult instanceof EntityHitResult entityHitResult && this.getOwner() instanceof LivingEntity living)
             Services.POWER.getPowers(living, ApugliPowers.ACTION_ON_PROJECTILE_HIT.get()).forEach(power -> {
-                ApugliPowers.ACTION_ON_PROJECTILE_HIT.get().execute(power, living, entityHitResult.getEntity(), (Projectile)(Object)this, this.apugli$entitiesHit.getOrDefault(Services.POWER.getPowerId(power), 0));
                 this.apugli$entitiesHit.compute(Services.POWER.getPowerId(power), (resourceLocation, integer) -> integer != null ? integer + 1 : 1);
+                ApugliPowers.ACTION_ON_PROJECTILE_HIT.get().execute(power, living, entityHitResult.getEntity(), (Projectile)(Object)this, this.apugli$entitiesHit.getOrDefault(Services.POWER.getPowerId(power), 0));
             });
     }
 

neoforge/src/main/java/net/merchantpug/apugli/ApugliForgeEventHandler.java

@@ -199,8 +199,8 @@ public static void onProjectileImpact(ProjectileImpactEvent event) {
             Services.POWER.getPowers(living, ApugliPowers.ACTION_WHEN_PROJECTILE_HIT.get()).forEach(power -> ApugliPowers.ACTION_WHEN_PROJECTILE_HIT.get().execute(power, living, event.getProjectile()));
         if ((event.getProjectile().getOwner() instanceof LivingEntity living))
             Services.POWER.getPowers(living, ApugliPowers.ACTION_ON_PROJECTILE_HIT.get()).forEach(power -> {
+                event.getProjectile().getCapability(EntitiesHitCapability.INSTANCE).ifPresent(cap -> cap.addHitEntity(Services.POWER.getPowerId(power)));
                 ApugliPowers.ACTION_ON_PROJECTILE_HIT.get().execute(power, living, ((EntityHitResult)event.getRayTraceResult()).getEntity(), event.getProjectile(), event.getProjectile().getCapability(EntitiesHitCapability.INSTANCE).map(cap -> cap.getPowerValue(Services.POWER.getPowerId(power))).orElse(0));
-                event.getProjectile().getCapability(EntitiesHitCapability.INSTANCE).ifPresent(cap -> cap.addToPowersThatHaveLanded(Services.POWER.getPowerId(power)));
             });
     }
 

neoforge/src/main/java/net/merchantpug/apugli/capability/entity/EntitiesHitCapability.java

@@ -40,7 +40,7 @@ public int getPowerValue(ResourceLocation value) {
 
 
     @Override
-    public void addToPowersThatHaveLanded(ResourceLocation value) {
+    public void addHitEntity(ResourceLocation value) {
         this.apugli$entitiesHit.compute(value, (resourceLocation, integer) -> integer != null ? integer + 1 : 1);
     }
 }

neoforge/src/main/java/net/merchantpug/apugli/capability/entity/IEntitiesHitCapability.java

@@ -9,6 +9,6 @@ public interface IEntitiesHitCapability extends ProjectileEntityAccess {
 
     int getPowerValue(ResourceLocation value);
 
-    void addToPowersThatHaveLanded(ResourceLocation value);
+    void addHitEntity(ResourceLocation value);
 
 }