Modifier behavior tweaks

Enderporting now triggers on harvest
Exchaging now no longer requires the tool to be effective to exchange

src/main/java/slimeknights/tconstruct/library/modifiers/hooks/IHarvestModifier.java

@@ -1,9 +1,9 @@
 package slimeknights.tconstruct.library.modifiers.hooks;
 
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.world.level.block.state.BlockState;
 import slimeknights.tconstruct.library.tools.nbt.IToolStackView;
 
 /**
@@ -15,7 +15,7 @@ public interface IHarvestModifier {
    * Called after a block is successfully harvested
    * @param tool    Tool used in harvesting
    * @param level   Tool level
-   * @param context Item use context, cooresponds to the original targeted position
+   * @param context Item use context, corresponds to the original targeted position
    * @param world   Server world instance
    * @param state   State before it was harvested
    * @param pos     Position that was harvested, may be different from the context

src/main/java/slimeknights/tconstruct/tools/modifiers/ability/tool/ExchangingModifier.java

@@ -32,7 +32,7 @@ public Boolean removeBlock(IToolStackView tool, int level, ToolHarvestContext co
     BlockState state = context.getState();
     Level world = context.getWorld();
     BlockPos pos = context.getPos();
-    if ((!context.isEffective() && state.getDestroySpeed(world, pos) > 0) || offhand.isEmpty() || !(offhand.getItem() instanceof BlockItem blockItem)) {
+    if (offhand.isEmpty() || !(offhand.getItem() instanceof BlockItem blockItem)) {
       return null;
     }
 

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

@@ -7,12 +7,16 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.MinecraftForge;
+import org.jetbrains.annotations.Nullable;
 import slimeknights.tconstruct.common.Sounds;
 import slimeknights.tconstruct.library.events.teleport.EnderportingTeleportEvent;
+import slimeknights.tconstruct.library.modifiers.hooks.IHarvestModifier;
 import slimeknights.tconstruct.library.modifiers.impl.NoLevelsModifier;
 import slimeknights.tconstruct.library.tools.context.ToolAttackContext;
 import slimeknights.tconstruct.library.tools.context.ToolHarvestContext;
@@ -21,7 +25,7 @@
 
 import java.util.Set;
 
-public class EnderportingModifier extends NoLevelsModifier {
+public class EnderportingModifier extends NoLevelsModifier implements IHarvestModifier {
   private static final Set<RelativeArgument> PACKET_FLAGS = ImmutableSet.of(RelativeArgument.X, RelativeArgument.Y, RelativeArgument.Z);
 
   @Override
@@ -101,4 +105,21 @@ public void finishBreakingBlocks(IToolStackView tool, int level, ToolHarvestCont
       }
     }
   }
+
+  @Override
+  public void afterHarvest(IToolStackView tool, int level, UseOnContext context, ServerLevel world, BlockState state, BlockPos pos) {
+    // only teleport to the center block
+    if (context.getClickedPos().equals(pos)) {
+      LivingEntity living = context.getPlayer();
+      if (living != null && tryTeleport(living, pos.getX() + 0.5f, pos.getY(), pos.getZ() + 0.5f)) {
+        ToolDamageUtil.damageAnimated(tool, 2, living);
+      }
+    }
+  }
+
+  @Nullable
+  @Override
+  public <T> T getModule(Class<T> type) {
+    return tryModuleMatch(type, IHarvestModifier.class, this);
+  }
 }