Remove isModLoaded check for GTNH Lib (#172)

Fix server test

dependencies.gradle

@@ -2,20 +2,20 @@
 
 dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.0:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev')
-    compileOnly("com.github.GTNewHorizons:GTNHLib:0.2.11:dev")
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.7:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.3.2:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.7.3:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-400-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.8.1:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-405-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.05:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.68:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.15.8:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.5-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.15.1-GTNH:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
@@ -24,5 +24,5 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha45:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api') {transitive = false}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 

src/main/java/crazypants/enderio/EnderIO.java

@@ -186,7 +186,7 @@ import crazypants.util.EE3Util;
         modid = MODID,
         name = MOD_NAME,
         version = VERSION,
-        dependencies = "required-after:CoFHLib@(1.0.3B3,);after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel",
+        dependencies = "required-after:CoFHLib@(1.0.3B3,);after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel;required-after:gtnhlib@[0.2.10,)",
         guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
 public class EnderIO {
 

src/main/java/crazypants/enderio/conduit/TileConduitBundle.java

@@ -25,6 +25,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
 import com.enderio.core.client.render.BoundingBox;
+import com.gtnewhorizon.gtnhlib.concurrent.cas.CasList;
 
 import appeng.api.networking.IGridNode;
 import appeng.api.util.AECableType;
@@ -66,7 +67,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
 
     public static final short NBT_VERSION = 1;
 
-    private final List<IConduit> conduits = new ArrayList<IConduit>();
+    private final List<IConduit> conduits = new CasList<>();
 
     private Block facadeId = null;
     private int facadeMeta = 0;
@@ -74,9 +75,9 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
 
     private boolean facadeChanged;
 
-    private final List<CollidableComponent> cachedCollidables = new ArrayList<CollidableComponent>();
+    private final List<CollidableComponent> cachedCollidables = new ArrayList<>();
 
-    private final List<CollidableComponent> cachedConnectors = new ArrayList<CollidableComponent>();
+    private final List<CollidableComponent> cachedConnectors = new ArrayList<>();
 
     private boolean conduitsDirty = true;
     private boolean collidablesDirty = true;
@@ -536,7 +537,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
 
     @Override
     public List<CollidableComponent> getConnectors() {
-        List<CollidableComponent> result = new ArrayList<CollidableComponent>();
+        List<CollidableComponent> result = new ArrayList<>();
         addConnectors(result);
         return result;
     }

src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java

@@ -2,10 +2,11 @@ package crazypants.enderio.conduit.liquid;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -113,27 +114,29 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         }
     }
 
-    private static Map<CollidableComponent, Map<Fluid, List<CachableRenderStatement>>> cache = new WeakHashMap<CollidableComponent, Map<Fluid, List<CachableRenderStatement>>>();
+    private static final Map<CollidableComponent, Map<Fluid, List<CachableRenderStatement>>> cache = Collections
+            .synchronizedMap(new WeakHashMap<>());
 
     public static List<CachableRenderStatement> computeFluidOutlineToCache(CollidableComponent component, Fluid fluid,
             double scaleFactor, float outlineWidth) {
 
-        Map<Fluid, List<CachableRenderStatement>> cache0 = cache.get(component);
-        if (cache0 == null) {
-            cache0 = new HashMap<Fluid, List<CachableRenderStatement>>();
-            cache.put(component, cache0);
-        }
+        // Only init once per component across all threads so the cache stays accurate.
+        Map<Fluid, List<CachableRenderStatement>> cache0 = cache
+                .computeIfAbsent(component, _k -> new ConcurrentHashMap<>());
+        // The rest of this function 'should' be in a `computeIfAbsent` as well for:
+        // `cache0.computeIfAbsent(fluid, _k -> ...)` but that won't cause a bug in this case,
+        // just a bit more garbage.
         List<CachableRenderStatement> data = cache0.get(fluid);
         if (data != null) {
             return data;
         }
-        data = new ArrayList<CachableRenderStatement>();
-        cache0.put(fluid, data);
+        data = new ArrayList<>();
 
         IIcon texture = fluid.getStillIcon();
         if (texture == null) {
             texture = fluid.getIcon();
             if (texture == null) {
+                cache0.put(fluid, data);
                 return data;
             }
         }
@@ -192,6 +195,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
                 }
             }
         }
+        cache0.put(fluid, data);
         return data;
     }
 

src/main/java/crazypants/enderio/config/Config.java

@@ -175,6 +175,34 @@ public final class Config {
      */
     public static int teleportStaffFailedBlinkDistance = 64;
 
+    /**
+     * Sets the teleport staff right-click action.
+     *
+     * <p>
+     * Values:
+     * <ul>
+     * <li><b>0:</b> Do nothing
+     * <li><b>1:</b> Teleport to look
+     * <li><b>2:</b> Teleport to anchor
+     * <li><b>3:</b> Teleport to anchor, or to look if no anchor <em>(default)</em>
+     * </ul>
+     */
+    public static int teleportStaffAction = 3;
+
+    /**
+     * Sets the teleport staff sneak right-click action.
+     *
+     * <p>
+     * Values:
+     * <ul>
+     * <li><b>0:</b> Do nothing
+     * <li><b>1:</b> Teleport to look <em>(default)</em>
+     * <li><b>2:</b> Teleport to anchor
+     * <li><b>3:</b> Teleport to anchor, or to look if no anchor
+     * </ul>
+     */
+    public static int teleportStaffSneakAction = 1;
+
     public static int enderIoRange = 8;
     public static boolean enderIoMeAccessEnabled = true;
 
@@ -1271,6 +1299,27 @@ public final class Config {
                         "Number of blocks teleported when no block is being looked at.")
                 .getInt(teleportStaffFailedBlinkDistance);
 
+        teleportStaffAction = config.get(
+                sectionStaff.name,
+                "teleportStaffAction",
+                teleportStaffAction,
+                "Sets the action for right-click with the staff of teleportation. Values:\n" + "    0: Do nothing\n"
+                        + "    1: Teleport to look\n"
+                        + "    2: Teleport to anchor\n"
+                        + "    3: Teleport to anchor, or look if no anchor (default)")
+                .getInt(teleportStaffAction);
+
+        teleportStaffSneakAction = config.get(
+                sectionStaff.name,
+                "teleportStaffSneakAction",
+                teleportStaffSneakAction,
+                "Sets the action for sneak right-click with the staff of teleportation. Values:\n"
+                        + "    0: Do nothing\n"
+                        + "    1: Teleport to look (default)\n"
+                        + "    2: Teleport to anchor\n"
+                        + "    3: Teleport to anchor, or look if no anchor")
+                .getInt(teleportStaffSneakAction);
+
         enderIoRange = config.get(
                 sectionEfficiency.name,
                 "enderIoRange",

src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java

@@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.api.teleport.TravelSource;
+import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.power.PowerDisplayUtil;
 
 public class ItemTeleportStaff extends ItemTravelStaff {
@@ -56,14 +57,30 @@ public class ItemTeleportStaff extends ItemTravelStaff {
     @Override
     public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) {
         if (world.isRemote) {
-            if (player.isSneaking()) {
-                TravelController.instance
-                        .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF);
-            } else {
-                TravelController.instance.doTeleport(player);
+            int action = player.isSneaking() ? Config.teleportStaffSneakAction : Config.teleportStaffAction;
+            switch (action) {
+                case 0:
+                    // Do nothing.
+                    break;
+
+                case 1:
+                    TravelController.instance.doTeleport(player);
+                    player.swingItem();
+                    break;
+
+                case 2:
+                    TravelController.instance
+                            .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF);
+                    player.swingItem();
+                    break;
+
+                case 3:
+                    TravelController.instance
+                            .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF, true);
+                    player.swingItem();
+                    break;
             }
         }
-        player.swingItem();
         return equipped;
     }
 

src/main/java/crazypants/enderio/teleport/TravelController.java

@@ -3,10 +3,8 @@ package crazypants.enderio.teleport;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
-import java.util.TreeMap;
 
 import javax.annotation.Nullable;
 
@@ -32,6 +30,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.event.world.WorldEvent;
 
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
@@ -41,10 +40,12 @@ import com.enderio.core.common.vecmath.VecmathUtil;
 import com.enderio.core.common.vecmath.Vector2d;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.google.common.collect.MultimapBuilder;
+import com.google.common.collect.RowSortedTable;
 import com.google.common.collect.SetMultimap;
+import com.google.common.collect.Table;
+import com.google.common.collect.TreeBasedTable;
 import com.gtnewhorizon.gtnhlib.GTNHLib;
 
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
@@ -148,8 +149,9 @@ public class TravelController {
                 // target must be a valid selectedCoord
                 // selectedCoord can either be a block right above/below when the player is on anchor...
                 if (on.x == x && on.z == z) return null;
-                // or another anchor
-                TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj);
+                // or another anchor. We need to look one block below because TP goes above the anchor.
+                BlockCoord belowTarget = target.getLocation(ForgeDirection.DOWN);
+                TileEntity maybeAnchor = belowTarget.getTileEntity(toTp.worldObj);
                 if (!(maybeAnchor instanceof ITravelAccessable)) return "not anchor";
                 ITravelAccessable anchor = (ITravelAccessable) maybeAnchor;
                 if (!isValidTarget(toTp, target, TravelSource.BLOCK)) {
@@ -190,12 +192,36 @@ public class TravelController {
     }
 
     public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source) {
+        return activateTravelAccessable(equipped, world, player, source, false);
+    }
+
+    public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source,
+            boolean alsoDoTeleport) {
         if (!hasTarget()) {
+            if (alsoDoTeleport) {
+                Optional<BlockCoord> destinationOptional = findTeleportDestination(player);
+                if (destinationOptional.isPresent()) {
+                    BlockCoord destination = destinationOptional.get();
+                    PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(
+                            player,
+                            false,
+                            source,
+                            true,
+                            destination.x,
+                            destination.y,
+                            destination.z);
+                    PacketHandler.INSTANCE.sendToServer(p);
+                    // We have no way of knowing if it will succeed, so just return false.
+                    return false;
+                }
+            }
+
             PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source);
             PacketHandler.INSTANCE.sendToServer(p);
             // We have no way of knowing if it will succeed, so just return false.
             return false;
         }
+
         BlockCoord target = selectedCoord;
         TileEntity te = world.getTileEntity(target.x, target.y, target.z);
         if (te instanceof ITravelAccessable) {
@@ -243,7 +269,10 @@ public class TravelController {
                 sample.add(eye);
                 // we test against our feets location
                 sample.y -= playerHeight;
-                if (doBlinkAround(player, source, sample, true)) {
+
+                Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
+                if (destinationOptional.isPresent()
+                        && travelToLocation(player, source, destinationOptional.get(), true)) {
                     return true;
                 }
             }
@@ -280,7 +309,9 @@ public class TravelController {
                 // we test against our feets location
                 sample.y -= playerHeight;
 
-                if (doBlinkAround(player, source, sample, false)) {
+                Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
+                if (destinationOptional.isPresent()
+                        && travelToLocation(player, source, destinationOptional.get(), false)) {
                     return true;
                 }
                 teleDistance++;
@@ -296,7 +327,9 @@ public class TravelController {
                 // we test against our feets location
                 sample.y -= playerHeight;
 
-                if (doBlinkAround(player, source, sample, false)) {
+                Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
+                if (destinationOptional.isPresent()
+                        && travelToLocation(player, source, destinationOptional.get(), false)) {
                     return true;
                 }
                 sampleDistance--;
@@ -308,114 +341,13 @@ public class TravelController {
 
     /** This is the teleport staff super-teleport. */
     public boolean doTeleport(EntityPlayer player) {
-        TravelSource source = TravelSource.TELEPORT_STAFF_BLINK;
-
-        Vector3d eye = Util.getEyePositionEio(player);
-        Vector3d look = Util.getLookVecEio(player);
-
-        double playerHeight = player.yOffset;
-        // +2 to compensate for the standard distance decrement of -2
-        double teleDistance = Config.teleportStaffFailedBlinkDistance + 2;
-        Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z);
-
-        // rayTraceBlocks has a limit of 200 distance.
-        double maxDistance = Config.teleportStaffMaxBlinkDistance;
-        double currDistance = 0;
-        Vec3 pos = eye3;
-        boolean loop = true;
-        while (loop) {
-            double distance = 200;
-            if (maxDistance - currDistance < 200) {
-                distance = maxDistance - currDistance;
-                loop = false;
-            }
-
-            Vector3d sample = new Vector3d(look);
-            sample.scale(distance);
-            sample.add(eye);
-            Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
-
-            MovingObjectPosition p = player.worldObj
-                    .rayTraceBlocks(pos, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
-            if (p != null) {
-                teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
-                break;
-            }
-
-            pos = end;
-            currDistance += distance;
-        }
-
-        Vector3d sample = new Vector3d(look);
-        sample.scale(Config.teleportStaffMaxBlinkDistance);
-        sample.add(eye);
-        Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
-        MovingObjectPosition p = player.worldObj
-                .rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
-        if (p != null) {
-            teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
-        }
-
-        double distanceIncrement = -2;
-        // Special case: if the targeted block is too close, we'll try to teleport through it.
-        if (teleDistance < 3) {
-            distanceIncrement = 2;
-        }
-
-        for (int i = 0; i < 8; i++) {
-            teleDistance += distanceIncrement;
-
-            sample.set(look);
-            sample.scale(teleDistance);
-            sample.add(eye);
-            // we test against our feets location
-            sample.y -= playerHeight;
-
-            if (doBlinkAround(player, source, sample, false)) {
-                return true;
-            }
+        Optional<BlockCoord> destinationOptional = findTeleportDestination(player);
+        if (destinationOptional.isPresent()) {
+            return travelToLocation(player, TravelSource.TELEPORT_STAFF_BLINK, destinationOptional.get(), false);
         }
         return false;
     }
 
-    /** Returns empty optional if no travel destination was found. */
-    public Optional<BlockCoord> findTravelDestination(EntityPlayer player, TravelSource source) {
-        Vector3d eye = Util.getEyePositionEio(player);
-        Vector3d look = Util.getLookVecEio(player);
-
-        // Map of distance to coordinate for eligible travel destinations (within angle).
-        Map<Double, BlockCoord> distanceMap = new TreeMap<>();
-        // Limit the max distance at which we'll display an out of range message.
-        // Otherwise, you could trigger the message for any travel anchor on the entire server.
-        double maxMessageDistance = 1.25 * source.getMaxDistanceTravelled();
-        boolean displayOutOfRangeMessage = false;
-        for (BlockCoord p : travelDestinations.get(player.worldObj.provider.dimensionId)) {
-            Vector3d block = new Vector3d(p.x + 0.5, p.y + 0.5, p.z + 0.5);
-            block.sub(eye);
-            double distance = block.length();
-            if (distance > maxMessageDistance) {
-                continue;
-            }
-            block.normalize();
-
-            double angle = Math.acos(look.dot(block));
-            // Roughly 5 degrees
-            if (angle < 0.087) {
-                if (distance > source.getMaxDistanceTravelled()) {
-                    displayOutOfRangeMessage = true;
-                } else {
-                    distanceMap.put(distance, p);
-                }
-            }
-        }
-
-        if (displayOutOfRangeMessage && distanceMap.isEmpty()) {
-            showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
-        }
-
-        return distanceMap.values().stream().findFirst();
-    }
-
     private boolean isBlackListedBlock(EntityPlayer player, MovingObjectPosition pos, Block hitBlock) {
         UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(hitBlock);
         if (ui == null) {
@@ -426,36 +358,6 @@ public class TravelController {
                         || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled);
     }
 
-    private boolean doBlinkAround(EntityPlayer player, TravelSource source, Vector3d sample, boolean conserveMomentum) {
-        if (travelToLocation(
-                player,
-                source,
-                new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z)),
-                conserveMomentum)) {
-            return true;
-        }
-        if (travelToLocation(
-                player,
-                source,
-                new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z)),
-                conserveMomentum)) {
-            return true;
-        }
-        if (!Config.travelStaffSearchOptimize) {
-            if (travelToLocation(
-                    player,
-                    source,
-                    new BlockCoord(
-                            (int) Math.floor(sample.x),
-                            (int) Math.floor(sample.y) - 1,
-                            (int) Math.floor(sample.z)),
-                    conserveMomentum)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public boolean showTargets() {
         return showTargets && selectionEnabled;
     }
@@ -492,6 +394,13 @@ public class TravelController {
                 .getBlock(selectedCoord.x, selectedCoord.y, selectedCoord.z) == EnderIO.blockEnderIo;
     }
 
+    @SubscribeEvent
+    public void onWorldLoad(WorldEvent.Load e) {
+        if (!e.world.isRemote) {
+            travelDestinations.removeAll(e.world.provider.dimensionId);
+        }
+    }
+
     @SubscribeEvent
     @SideOnly(Side.CLIENT)
     public void onRender(RenderWorldLastEvent event) {
@@ -527,7 +436,7 @@ public class TravelController {
             }
             onBlockCoord = getActiveTravelBlock(player);
             boolean onBlock = onBlockCoord != null;
-            showTargets = onBlock || isTravelItemActive(player, false);
+            showTargets = onBlock || (isTravelItemActive(player, false) && !shouldHideTargets(player));
             if (showTargets) {
                 updateSelectedTarget(player);
             } else {
@@ -619,6 +528,16 @@ public class TravelController {
         return getTravelItemTravelSource(ep, checkInventoryAndBaubles) != null;
     }
 
+    /** Currently, we only hide travel targets for the teleport staff, in certain action modes. */
+    public boolean shouldHideTargets(EntityPlayer ep) {
+        if (getTravelItemTravelSource(ep, false) != TravelSource.TELEPORT_STAFF) {
+            return false;
+        }
+
+        int action = ep.isSneaking() ? Config.teleportStaffSneakAction : Config.teleportStaffAction;
+        return action < 2;
+    }
+
     /** Returns null if no travel item is in inventory/baubles. */
     @Nullable
     public TravelSource getTravelItemTravelSource(EntityPlayer ep, boolean checkInventoryAndBaubles) {
@@ -713,43 +632,201 @@ public class TravelController {
         return travelItemSlot;
     }
 
+    /** Finds the destination for the teleport staff super-teleport, or returns empty optional if unsuccessful. */
+    public Optional<BlockCoord> findTeleportDestination(EntityPlayer player) {
+        TravelSource source = TravelSource.TELEPORT_STAFF_BLINK;
+
+        Vector3d eye = Util.getEyePositionEio(player);
+        Vector3d look = Util.getLookVecEio(player);
+
+        double playerHeight = player.yOffset;
+        // +2 to compensate for the standard distance decrement of -2
+        double teleDistance = Config.teleportStaffFailedBlinkDistance + 2;
+        Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z);
+
+        // rayTraceBlocks has a limit of 200 distance.
+        double maxDistance = Config.teleportStaffMaxBlinkDistance;
+        double currDistance = 0;
+        Vec3 pos = eye3;
+        boolean loop = true;
+        while (loop) {
+            double distance = 200;
+            if (maxDistance - currDistance < 200) {
+                distance = maxDistance - currDistance;
+                loop = false;
+            }
+
+            Vector3d sample = new Vector3d(look);
+            sample.scale(distance);
+            sample.add(eye);
+            Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
+
+            MovingObjectPosition p = player.worldObj
+                    .rayTraceBlocks(pos, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
+            if (p != null) {
+                teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
+                break;
+            }
+
+            pos = end;
+            currDistance += distance;
+        }
+
+        Vector3d sample = new Vector3d(look);
+        sample.scale(Config.teleportStaffMaxBlinkDistance);
+        sample.add(eye);
+        Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
+        MovingObjectPosition p = player.worldObj
+                .rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
+        if (p != null) {
+            teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
+        }
+
+        double distanceIncrement = -2;
+        int maxIter = Math.min(8, (int) teleDistance / 2);
+        // Special case: if the targeted block is too close, we'll try to teleport through it.
+        if (teleDistance < 4) {
+            distanceIncrement = 0.5;
+            maxIter = 32;
+        }
+
+        for (int i = 0; i < maxIter; i++) {
+            teleDistance += distanceIncrement;
+
+            sample.set(look);
+            sample.scale(teleDistance);
+            sample.add(eye);
+            // we test against our feets location
+            sample.y -= playerHeight;
+
+            Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
+            if (destinationOptional.isPresent()) {
+                return destinationOptional;
+            }
+        }
+        return Optional.empty();
+    }
+
+    /** Finds a long-distance travel anchor, or returns empty optional if unsuccessful. */
+    public Optional<BlockCoord> findTravelDestination(EntityPlayer player, TravelSource source) {
+        double maxDistance = source.getMaxDistanceTravelled();
+        double maxMessageDistance = 1.25 * maxDistance;
+        // Find possible destinations within about 5 degrees.
+        RowSortedTable<Double, Double, BlockCoord> possibleDestinations = findBlocksWithinAngle(
+                player,
+                travelDestinations.get(player.worldObj.provider.dimensionId),
+                0.087,
+                maxMessageDistance);
+
+        for (Table.Cell<Double, Double, BlockCoord> cell : possibleDestinations.cellSet()) {
+            if (cell.getColumnKey() <= maxDistance) {
+                return Optional.of(cell.getValue());
+            }
+        }
+
+        if (!possibleDestinations.isEmpty()) {
+            // We found at least one block within maxMessageDistance, but no blocks within maxDistance.
+            showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
+        }
+
+        return Optional.empty();
+    }
+
+    /** Finds a valid destination near the provided vector, or returns empty optional if unsuccessful. */
+    private Optional<BlockCoord> findNearbyDestination(EntityPlayer player, TravelSource source, Vector3d sample) {
+        Optional<BlockCoord> destinationOptional = findValidDestination(
+                player,
+                source,
+                new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z)));
+        if (destinationOptional.isPresent()) {
+            return destinationOptional;
+        }
+
+        destinationOptional = findValidDestination(
+                player,
+                source,
+                new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z)));
+        if (destinationOptional.isPresent()) {
+            return destinationOptional;
+        }
+
+        if (!Config.travelStaffSearchOptimize) {
+            destinationOptional = findValidDestination(
+                    player,
+                    source,
+                    new BlockCoord(
+                            (int) Math.floor(sample.x),
+                            (int) Math.floor(sample.y) - 1,
+                            (int) Math.floor(sample.z)));
+            if (destinationOptional.isPresent()) {
+                return destinationOptional;
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    /**
+     * Returns the provided position if it's valid, or returns empty optional if unsuccessful.
+     *
+     * <p>
+     * To be precise: if the destination is a travel anchor or other block, then the returned coordinates will be one
+     * block higher, to place the player on top of the block.
+     */
+    public Optional<BlockCoord> findValidDestination(EntityPlayer player, TravelSource source, BlockCoord coord) {
+        // Are we trying to travel to a block (anchor or telepad)?
+        boolean travelToBlock = source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK;
+
+        BlockCoord destination = coord;
+        if (travelToBlock) {
+            TileEntity te = player.worldObj.getTileEntity(coord.x, coord.y, coord.z);
+            if (te instanceof ITravelAccessable) {
+                ITravelAccessable ta = (ITravelAccessable) te;
+                if (!ta.canBlockBeAccessed(player)) {
+                    showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised"));
+                    return Optional.empty();
+                }
+            }
+
+            // We actually want to go on top of the block.
+            destination = coord.getLocation(ForgeDirection.UP);
+        }
+
+        if (!isInRangeTarget(player, destination, source.getMaxDistanceTravelledSq())) {
+            if (travelToBlock) {
+                showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
+            }
+            return Optional.empty();
+        }
+        if (!isValidTarget(player, destination, source)) {
+            if (travelToBlock) {
+                showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget"));
+            }
+            return Optional.empty();
+        }
+
+        return Optional.of(destination);
+    }
+
     public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) {
         return travelToLocation(player, source, selectedCoord, conserveMomentum);
     }
 
     public boolean travelToLocation(EntityPlayer player, TravelSource source, BlockCoord coord,
             boolean conserveMomentum) {
-
-        if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) {
-            TileEntity te = player.worldObj.getTileEntity(coord.x, coord.y, coord.z);
-            if (te instanceof ITravelAccessable) {
-                ITravelAccessable ta = (ITravelAccessable) te;
-                if (!ta.canBlockBeAccessed(player)) {
-                    showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised"));
-                    return false;
-                }
-            }
+        Optional<BlockCoord> destinationOptional = findValidDestination(player, source, coord);
+        if (!destinationOptional.isPresent()) {
+            return false;
         }
+        BlockCoord destination = destinationOptional.get();
 
         int requiredPower = 0;
-        requiredPower = getRequiredPower(player, source, coord);
+        requiredPower = getRequiredPower(player, source, destination);
         if (requiredPower < 0) {
             return false;
         }
 
-        if (!isInRangeTarget(player, coord, source.getMaxDistanceTravelledSq())) {
-            if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) {
-                showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
-            }
-            return false;
-        }
-        if (!isValidTarget(player, coord, source)) {
-            if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) {
-                showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget"));
-            }
-            return false;
-        }
-        if (doClientTeleport(player, coord, source, requiredPower, conserveMomentum)) {
+        if (doClientTeleport(player, destinationOptional.get(), source, requiredPower, conserveMomentum)) {
             for (int i = 0; i < 6; ++i) {
                 player.worldObj.spawnParticle(
                         "portal",
@@ -764,6 +841,17 @@ public class TravelController {
         return true;
     }
 
+    public boolean isValidTarget(EntityPlayer player, BlockCoord bc, TravelSource source) {
+        if (bc == null) {
+            return false;
+        }
+        World w = player.worldObj;
+        BlockCoord baseLoc = bc;
+
+        return canTeleportTo(player, source, baseLoc, w)
+                && canTeleportTo(player, source, baseLoc.getLocation(ForgeDirection.UP), w);
+    }
+
     public int getRequiredPower(EntityPlayer player, TravelSource source, BlockCoord coord) {
         if (!isTravelItemActive(player, true)) {
             return 0;
@@ -808,21 +896,6 @@ public class TravelController {
         return Math.sqrt(getDistanceSquared(player, coord));
     }
 
-    private boolean isValidTarget(EntityPlayer player, BlockCoord bc, TravelSource source) {
-        if (bc == null) {
-            return false;
-        }
-        World w = player.worldObj;
-        BlockCoord baseLoc = bc;
-        if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) {
-            // targeting a block so go one up
-            baseLoc = bc.getLocation(ForgeDirection.UP);
-        }
-
-        return canTeleportTo(player, source, baseLoc, w)
-                && canTeleportTo(player, source, baseLoc.getLocation(ForgeDirection.UP), w);
-    }
-
     private boolean canTeleportTo(EntityPlayer player, TravelSource source, BlockCoord bc, World w) {
         if (bc.y < 1) {
             return false;
@@ -904,6 +977,7 @@ public class TravelController {
         if (selectedBlock instanceof ITravelAccessable) {
             ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock;
             BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z);
+            BlockCoord destination = targetBlock.getLocation(ForgeDirection.UP);
 
             if (Config.travelAnchorSkipWarning) {
                 if (travelBlock.getRequiresPassword(player)) {
@@ -914,55 +988,67 @@ public class TravelController {
                         && !travelBlock.canUiBeAccessed(player)) {
                     showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate"));
                 }
-                if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
+                if (!isValidTarget(player, destination, TravelSource.BLOCK)) {
                     showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed"));
                 }
             }
-            if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
+            if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, destination, TravelSource.BLOCK)) {
                 return targetBlock;
             }
         }
         return null;
     }
 
+    /**
+     * Returns a row-sorted table with angle in radians as the row, distance as the column, and block coordinate as the
+     * value, holding all blocks which lie within the specified viewing angle and distance.
+     *
+     * <p>
+     * The table is sorted by angle ascending, so the smallest angle will be first.
+     *
+     * @param player      The player to search from.
+     * @param blocks      The blocks to search through.
+     * @param maxAngle    The maximum allowed angle, in radians.
+     * @param maxDistance The maximum allowed distance.
+     */
+    private RowSortedTable<Double, Double, BlockCoord> findBlocksWithinAngle(EntityPlayer player,
+            Iterable<BlockCoord> blocks, double maxAngle, double maxDistance) {
+        Vector3d eye = Util.getEyePositionEio(player);
+        Vector3d look = Util.getLookVecEio(player);
+
+        // Table of angle, distance, and block coordinate holding found blocks.
+        // Angle is the row, so this table will automatically be sorted by angle ascending.
+        RowSortedTable<Double, Double, BlockCoord> foundBlocks = TreeBasedTable.create();
+
+        for (BlockCoord p : blocks) {
+            Vector3d block = new Vector3d(p.x + 0.5, p.y + 0.5, p.z + 0.5);
+            block.sub(eye);
+            double distance = block.length();
+            if (distance > maxDistance) {
+                continue;
+            }
+            block.normalize();
+
+            double angle = Math.acos(look.dot(block));
+            if (angle <= maxAngle) {
+                foundBlocks.put(angle, distance, p);
+            }
+        }
+
+        return foundBlocks;
+    }
+
     @SideOnly(Side.CLIENT)
     private void updateSelectedTarget(EntityPlayer player) {
-        selectedCoord = null;
         if (candidates.isEmpty()) {
+            selectedCoord = null;
             return;
         }
 
-        double closestDistance = Double.MAX_VALUE;
-        for (BlockCoord bc : candidates.keySet()) {
-            if (!bc.equals(onBlockCoord)) {
-
-                double d = addRatio(bc);
-                if (d < closestDistance) {
-                    selectedCoord = bc;
-                    closestDistance = d;
-                }
-            }
-        }
-
-        if (selectedCoord != null) {
-
-            Vector3d blockCenter = new Vector3d(selectedCoord.x + 0.5, selectedCoord.y + 0.5, selectedCoord.z + 0.5);
-            Vector2d blockCenterPixel = currentView.getScreenPoint(blockCenter);
-
-            Vector2d screenMidPixel = new Vector2d(
-                    Minecraft.getMinecraft().displayWidth,
-                    Minecraft.getMinecraft().displayHeight);
-            screenMidPixel.scale(0.5);
-
-            double pixDist = blockCenterPixel.distance(screenMidPixel);
-            double rat = pixDist / Minecraft.getMinecraft().displayHeight;
-            if (rat != rat) {
-                rat = 0;
-            }
-            if (rat > 0.07) {
-                selectedCoord = null;
-            }
-        }
+        // Find the nearest travel anchor within roughly 10 degrees.
+        Optional<BlockCoord> selectedBlock = findBlocksWithinAngle(player, candidates.keySet(), 0.175, Double.MAX_VALUE)
+                .values().stream().findFirst();
+        selectedCoord = selectedBlock.orElse(null);
     }
 
     @SideOnly(Side.CLIENT)
@@ -1101,19 +1187,15 @@ public class TravelController {
     }
 
     public static void showMessage(EntityPlayer player, IChatComponent chatComponent) {
-        if (Loader.isModLoaded("gtnhlib")) {
-            if (player instanceof EntityPlayerMP) {
-                chatComponent.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.WHITE));
-                GTNHLib.proxy.sendMessageAboveHotbar((EntityPlayerMP) player, chatComponent, 60, true, true);
-            } else {
-                GTNHLib.proxy.printMessageAboveHotbar(
-                        EnumChatFormatting.WHITE + chatComponent.getFormattedText(),
-                        60,
-                        true,
-                        true);
-            }
+        if (player instanceof EntityPlayerMP) {
+            chatComponent.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.WHITE));
+            GTNHLib.proxy.sendMessageAboveHotbar((EntityPlayerMP) player, chatComponent, 60, true, true);
         } else {
-            player.addChatComponentMessage(chatComponent);
+            GTNHLib.proxy.printMessageAboveHotbar(
+                    EnumChatFormatting.WHITE + chatComponent.getFormattedText(),
+                    60,
+                    true,
+                    true);
         }
     }
 }

src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java

@@ -337,6 +337,9 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
     public void validate() {
         super.validate();
         if (isTravelSource()) {
+            // Note: travelDestinations is a SetMultimap, which does not allow duplicate entries.
+            // So it's okay if this gets called multiple times with the same BlockCoord.
+            // Though, I think that it's not currently getting called multiple times, anyway.
             TravelController.instance.travelDestinations.put(worldObj.provider.dimensionId, getLocation());
         }
     }
@@ -346,10 +349,4 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
         super.invalidate();
         TravelController.instance.travelDestinations.remove(worldObj.provider.dimensionId, getLocation());
     }
-
-    @Override
-    public void onChunkUnload() {
-        super.onChunkUnload();
-        TravelController.instance.travelDestinations.remove(worldObj.provider.dimensionId, getLocation());
-    }
 }

src/main/java/crazypants/enderio/teleport/packet/PacketLongDistanceTravelEvent.java

@@ -7,7 +7,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.play.server.S12PacketEntityVelocity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChatComponentTranslation;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
@@ -18,6 +21,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.Log;
 import crazypants.enderio.api.teleport.IItemOfTravel;
+import crazypants.enderio.api.teleport.ITravelAccessable;
 import crazypants.enderio.api.teleport.TeleportEntityEvent;
 import crazypants.enderio.api.teleport.TravelSource;
 import crazypants.enderio.teleport.ItemTeleportStaff;
@@ -30,13 +34,27 @@ public class PacketLongDistanceTravelEvent
     boolean conserveMotion;
     int entityId;
     int source;
+    // Below values are for also attempting a regular blink if the long-distance anchor check fails.
+    boolean alsoDoTeleport;
+    int tpX;
+    int tpY;
+    int tpZ;
 
     public PacketLongDistanceTravelEvent() {}
 
     public PacketLongDistanceTravelEvent(Entity entity, boolean conserveMotion, TravelSource source) {
+        this(entity, conserveMotion, source, false, 0, 0, 0);
+    }
+
+    public PacketLongDistanceTravelEvent(Entity entity, boolean conserveMotion, TravelSource source,
+            boolean alsoDoTeleport, int tpX, int tpY, int tpZ) {
         this.conserveMotion = conserveMotion;
         this.entityId = entity instanceof EntityPlayer ? -1 : entity.getEntityId();
         this.source = source.ordinal();
+        this.alsoDoTeleport = alsoDoTeleport;
+        this.tpX = tpX;
+        this.tpY = tpY;
+        this.tpZ = tpZ;
     }
 
     @Override
@@ -44,6 +62,10 @@ public class PacketLongDistanceTravelEvent
         buf.writeBoolean(conserveMotion);
         buf.writeInt(entityId);
         buf.writeInt(source);
+        buf.writeBoolean(alsoDoTeleport);
+        buf.writeInt(tpX);
+        buf.writeInt(tpY);
+        buf.writeInt(tpZ);
     }
 
     @Override
@@ -51,6 +73,10 @@ public class PacketLongDistanceTravelEvent
         conserveMotion = buf.readBoolean();
         entityId = buf.readInt();
         source = buf.readInt();
+        alsoDoTeleport = buf.readBoolean();
+        tpX = buf.readInt();
+        tpY = buf.readInt();
+        tpZ = buf.readInt();
     }
 
     @Override
@@ -69,7 +95,14 @@ public class PacketLongDistanceTravelEvent
 
         TravelSource source = TravelSource.values()[message.source];
 
-        if (!validate(toTp, source)) {
+        if (!validate(
+                toTp,
+                source,
+                message.conserveMotion,
+                message.alsoDoTeleport,
+                message.tpX,
+                message.tpY,
+                message.tpZ)) {
             Log.LOGGER.warn(
                     Log.securityMarker,
                     "Player {} tried to tp without valid prereq.",
@@ -77,35 +110,82 @@ public class PacketLongDistanceTravelEvent
             return null;
         }
 
-        doServerTeleport(toTp, message.conserveMotion, source);
+        doServerTeleport(
+                toTp,
+                message.conserveMotion,
+                source,
+                message.alsoDoTeleport,
+                message.tpX,
+                message.tpY,
+                message.tpZ);
 
         return null;
     }
 
-    private static boolean validate(EntityPlayerMP toTp, TravelSource source) {
+    private static boolean validate(EntityPlayerMP toTp, TravelSource source, boolean conserveMotion,
+            boolean alsoDoTeleport, int tpX, int tpY, int tpZ) {
         ItemStack equippedItem = toTp.getCurrentEquippedItem();
         switch (source) {
             case STAFF:
+                // Not allowed to do teleport staff teleport with regular staff.
+                if (alsoDoTeleport) {
+                    return false;
+                }
                 return equippedItem != null && equippedItem.getItem() instanceof IItemOfTravel
                         && ((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem);
             case TELEPORT_STAFF:
                 // tp staff is creative version of traveling staff
                 // no energy check or anything else needed
                 // but the player must actually be equipped with one of these
+                if (alsoDoTeleport) {
+                    String error = TravelController.instance
+                            .validatePacketTravelEvent(toTp, tpX, tpY, tpZ, 0, conserveMotion, source);
+                    if (error != null) {
+                        return false;
+                    }
+                }
                 return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff;
+
             default:
                 // all other types are not allowed
                 return false;
         }
     }
 
-    public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source) {
-        EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null;
-        Optional<BlockCoord> travelDestination = TravelController.instance.findTravelDestination(player, source);
-        if (!travelDestination.isPresent()) {
+    public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source,
+            boolean alsoDoTeleport, int tpX, int tpY, int tpZ) {
+        if (!(toTp instanceof EntityPlayer)) {
             return false;
         }
-        BlockCoord destination = travelDestination.get();
+        EntityPlayer player = (EntityPlayer) toTp;
+
+        Optional<BlockCoord> travelDestination = TravelController.instance.findTravelDestination(player, source);
+        if (!travelDestination.isPresent()) {
+            if (alsoDoTeleport) {
+                return PacketTravelEvent.doServerTeleport(toTp, tpX, tpY, tpZ, 0, conserveMotion, source);
+            }
+            return false;
+        }
+
+        BlockCoord targetBlock = travelDestination.get();
+        TileEntity te = player.worldObj.getTileEntity(targetBlock.x, targetBlock.y, targetBlock.z);
+        if (te instanceof ITravelAccessable) {
+            ITravelAccessable ta = (ITravelAccessable) te;
+            if (!ta.canBlockBeAccessed(player)) {
+                TravelController
+                        .showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised"));
+                return false;
+            }
+        }
+
+        // We're teleporting to a block, so go one above.
+        BlockCoord destination = targetBlock.getLocation(ForgeDirection.UP);
+        if (!TravelController.instance.isValidTarget(player, destination, source)) {
+            TravelController
+                    .showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget"));
+            return false;
+        }
+
         int x = destination.x;
         int y = destination.y;
         int z = destination.z;
@@ -113,7 +193,7 @@ public class PacketLongDistanceTravelEvent
         if (powerUse < 0) {
             return false;
         }
-        if (player != null && player.getCurrentEquippedItem() != null
+        if (player.getCurrentEquippedItem() != null
                 && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) {
             int used = ((IItemOfTravel) player.getCurrentEquippedItem().getItem())
                     .canExtractInternal(player.getCurrentEquippedItem(), powerUse);
@@ -134,32 +214,26 @@ public class PacketLongDistanceTravelEvent
 
         toTp.playSound(source.sound, 1.0F, 1.0F);
 
-        if (player != null) {
-            player.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5);
-        } else {
-            toTp.setPosition(x, y, z);
+        player.setPositionAndUpdate(x + 0.5, y + 0.1, z + 0.5);
+
+        player.worldObj.playSoundEffect(x, y, z, source.sound, 1.0F, 1.0F);
+        player.fallDistance = 0;
+
+        if (conserveMotion) {
+            Vector3d velocityVex = Util.getLookVecEio(player);
+            S12PacketEntityVelocity p = new S12PacketEntityVelocity(
+                    toTp.getEntityId(),
+                    velocityVex.x,
+                    velocityVex.y,
+                    velocityVex.z);
+            ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p);
         }
 
-        toTp.worldObj.playSoundEffect(x, y, z, source.sound, 1.0F, 1.0F);
-        toTp.fallDistance = 0;
-
-        if (player != null) {
-            if (conserveMotion) {
-                Vector3d velocityVex = Util.getLookVecEio(player);
-                S12PacketEntityVelocity p = new S12PacketEntityVelocity(
-                        toTp.getEntityId(),
-                        velocityVex.x,
-                        velocityVex.y,
-                        velocityVex.z);
-                ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p);
-            }
-
-            if (powerUse > 0 && player.getCurrentEquippedItem() != null
-                    && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) {
-                ItemStack item = player.getCurrentEquippedItem().copy();
-                ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse);
-                toTp.setCurrentItemOrArmor(0, item);
-            }
+        if (powerUse > 0 && player.getCurrentEquippedItem() != null
+                && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) {
+            ItemStack item = player.getCurrentEquippedItem().copy();
+            ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse);
+            toTp.setCurrentItemOrArmor(0, item);
         }
 
         return true;

src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java

@@ -118,7 +118,7 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel
         toTp.playSound(source.sound, 1.0F, 1.0F);
 
         if (player != null) {
-            player.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5);
+            player.setPositionAndUpdate(x + 0.5, y + 0.1, z + 0.5);
         } else {
             toTp.setPosition(x, y, z);
         }

src/main/resources/assets/enderio/lang/en_US.lang

@@ -150,7 +150,7 @@ enderio.silicon.name=Silicon
 enderio.conduitBinder.name=Conduit Binder
 enderio.binderComposite.name=Binder Composite
 enderio.phasedIronNugget.name=Pulsating Iron Nugget
-tile.blockDarkIronBars.name=Dark Iron Bars
+tile.blockDarkIronBars.name=Dark Steel Bars
 tile.blockSoulariumBars.name=Soularium Bars
 tile.blockEndSteelBars.name=End Steel Bars
 tile.blockEndermanSkull.name=Enderman Skull