Improve interaction of enderporting and enderference, and enderportin…

…g in general

Enderporting melee/arrows now swap you with the target instead of just teleporting you
Adding in enderference to either side, you can prevent one side from teleporting. SImpliest case is you teleport to the target but they stay still for a tool with both traits

src/main/java/slimeknights/tconstruct/library/modifiers/hook/ProjectileHitModifierHook.java

@@ -18,7 +18,7 @@ public interface ProjectileHitModifierHook {
   ProjectileHitModifierHook EMPTY = new ProjectileHitModifierHook() {};
 
   /** Merger instance */
-  Function<Collection<ProjectileHitModifierHook>,ProjectileHitModifierHook> FIRST_MERGER = FirstMerger::new;
+  Function<Collection<ProjectileHitModifierHook>,ProjectileHitModifierHook> FIRST_MERGER = AllMerger::new;
 
   /**
    * Called when a projectile hits an entity
@@ -29,7 +29,7 @@ public interface ProjectileHitModifierHook {
    * @param hit             Hit result
    * @param attacker        Living entity who fired the projectile, null if non-living or not fired
    * @param target          Living target, will be null if not living
-   * @return true if the hit should be canceled, preventing further modifiers from running
+   * @return true if the hit should be canceled, preventing vanilla logic
    */
   default boolean onProjectileHitEntity(ModifierNBT modifiers, NamespacedNBT persistentData, ModifierEntry modifier, Projectile projectile, EntityHitResult hit, @Nullable LivingEntity attacker, @Nullable LivingEntity target) {
     return false;
@@ -43,32 +43,30 @@ default boolean onProjectileHitEntity(ModifierNBT modifiers, NamespacedNBT persi
    * @param projectile      Projectile that hit the entity
    * @param hit             Hit result
    * @param attacker        Living entity who fired the projectile, null if non-living or not fired
-   * @return true if the hit should be canceled, preventing further modifiers from running
+   * @return true if the hit should be canceled
    */
   default boolean onProjectileHitBlock(ModifierNBT modifiers, NamespacedNBT persistentData, ModifierEntry modifier, Projectile projectile, BlockHitResult hit, @Nullable LivingEntity attacker) {
     return false;
   }
 
-  /** Merger that returns when the first hook returns true */
-  record FirstMerger(Collection<ProjectileHitModifierHook> modules) implements ProjectileHitModifierHook {
+  /** Merger that runs all hooks and returns true if any did */
+  record AllMerger(Collection<ProjectileHitModifierHook> modules) implements ProjectileHitModifierHook {
     @Override
     public boolean onProjectileHitEntity(ModifierNBT modifiers, NamespacedNBT persistentData, ModifierEntry modifier, Projectile projectile, EntityHitResult hit, @Nullable LivingEntity attacker, @Nullable LivingEntity target) {
+      boolean ret = false;
       for (ProjectileHitModifierHook module : modules) {
-        if (module.onProjectileHitEntity(modifiers, persistentData, modifier, projectile, hit, attacker, target)) {
-          return true;
-        }
+        ret |= module.onProjectileHitEntity(modifiers, persistentData, modifier, projectile, hit, attacker, target);
       }
-      return false;
+      return ret;
     }
 
     @Override
     public boolean onProjectileHitBlock(ModifierNBT modifiers, NamespacedNBT persistentData, ModifierEntry modifier, Projectile projectile, BlockHitResult hit, @Nullable LivingEntity attacker) {
+      boolean ret = false;
       for (ProjectileHitModifierHook module : modules) {
-        if (module.onProjectileHitBlock(modifiers, persistentData, modifier, projectile, hit, attacker)) {
-          return true;
-        }
+        ret |= module.onProjectileHitBlock(modifiers, persistentData, modifier, projectile, hit, attacker);
       }
-      return false;
+      return ret;
     }
   }
 }

src/main/java/slimeknights/tconstruct/tools/logic/ToolEvents.java

@@ -414,7 +414,6 @@ static void projectileHit(ProjectileImpactEvent event) {
             for (ModifierEntry entry : modifiers.getModifiers()) {
               if (entry.getHook(TinkerHooks.PROJECTILE_HIT).onProjectileHitEntity(modifiers, nbt, entry, projectile, entityHit, attacker, target)) {
                 event.setCanceled(true);
-                return;
               }
             }
           }
@@ -424,7 +423,6 @@ static void projectileHit(ProjectileImpactEvent event) {
           for (ModifierEntry entry : modifiers.getModifiers()) {
             if (entry.getHook(TinkerHooks.PROJECTILE_HIT).onProjectileHitBlock(modifiers, nbt, entry, projectile, blockHit, attacker)) {
               event.setCanceled(true);
-              return;
             }
           }
         }

src/main/java/slimeknights/tconstruct/tools/modifiers/traits/general/EnderportingModifier.java

@@ -42,7 +42,7 @@ public class EnderportingModifier extends NoLevelsModifier implements PlantHarve
 
   @Override
   public int getPriority() {
-    return 75;
+    return 45;
   }
 
   /** Attempts to teleport to the given location */
@@ -97,9 +97,11 @@ public int afterEntityHit(IToolStackView tool, int level, ToolAttackContext cont
     if (!context.isExtraAttack()) {
       LivingEntity target = context.getLivingTarget();
       // if the entity is dead now
-      if (target != null && target.getHealth() == 0) {
-        Vec3 pos = target.position();
-        if (tryTeleport(context.getAttacker(), pos.x(), pos.y(), pos.z())) {
+      if (target != null) {
+        LivingEntity attacker = context.getAttacker();
+        Vec3 oldPosition = attacker.position();
+        if (tryTeleport(attacker, target.getX(), target.getY(), target.getZ())) {
+          tryTeleport(target, oldPosition.x, oldPosition.y, oldPosition.z);
           return 2;
         }
       }
@@ -131,9 +133,12 @@ public void afterHarvest(IToolStackView tool, ModifierEntry modifier, UseOnConte
 
   @Override
   public boolean onProjectileHitEntity(ModifierNBT modifiers, NamespacedNBT persistentData, ModifierEntry modifier, Projectile projectile, EntityHitResult hit, @Nullable LivingEntity attacker, @Nullable LivingEntity target) {
-    if (attacker != null) {
+    if (attacker != null && attacker != target) {
       Entity hitEntity = hit.getEntity();
-      tryTeleport(attacker, hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
+      Vec3 oldPosition = attacker.position();
+      if (tryTeleport(attacker, hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()) && target != null) {
+        tryTeleport(target, oldPosition.x, oldPosition.y, oldPosition.z);
+      }
     }
     return false;
   }

src/main/java/slimeknights/tconstruct/tools/modifiers/traits/melee/EnderferenceModifier.java

@@ -183,7 +183,6 @@ public boolean onProjectileHitEntity(ModifierNBT modifiers, NamespacedNBT persis
           }
         }
 
-
         return true;
       }
     }