update

* Goodbye TESR, Hello ISBRH

* More fluid conduit rendering work

* more stuff

* spotless

* Add empty check to fluid conduit renderer

dependencies.gradle

@@ -2,21 +2,21 @@
 
 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.16:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.42-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.5.15: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-470-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: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:OpenComputers:1.10.11-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.49:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.14:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.3-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.26-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')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -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-alpha44:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta9:api') {transitive = false}
 }

gradle.properties

@@ -85,6 +85,11 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
@@ -117,9 +122,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.

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.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,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/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

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

src/main/java/crazypants/enderio/ClientProxy.java

@@ -27,7 +27,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.conduit.BlockConduitBundle;
 import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.TileConduitBundle;
 import crazypants.enderio.conduit.facade.FacadeRenderer;
 import crazypants.enderio.conduit.gas.GasConduit;
 import crazypants.enderio.conduit.gas.GasUtil;
@@ -378,7 +377,6 @@ public class ClientProxy extends CommonProxy {
         cbr = new ConduitBundleRenderer((float) Config.conduitScale);
         BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(cbr);
-        ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr);
 
         ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer());
 

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/LiquidConduit.java

@@ -143,7 +143,7 @@ public class LiquidConduit extends AbstractTankConduit {
                         }
                     }
                     if (!foundFluid) {
-                        return;
+                        continue;
                     }
 
                     FluidStack couldDrain = extTank.drain(dir.getOpposite(), MAX_EXTRACT_PER_TICK, false);

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

@@ -1,11 +1,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;
@@ -56,10 +56,17 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb);
     }
 
+    public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit,
+            double x, double y, double z, float partialTick, float worldLight) {
+
+    }
+
     @Override
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) {
+        Tessellator tessellator = Tessellator.instance;
         if (isNSEWUD(component.dir)) {
             LiquidConduit lc = (LiquidConduit) conduit;
+            IIcon fluidTex = conduit.getTransmitionTextureForState(component);
             FluidStack fluid = lc.getFluidType();
             if (fluid != null) {
                 renderFluidOutline(component, fluid);
@@ -67,33 +74,40 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
             BoundingBox[] cubes = toCubes(component.bound);
             for (BoundingBox cube : cubes) {
                 drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false);
+                // This check is kinda broken, but whatever, it was like that when this was done in a TESR too
+                if (lc.getTank().getFilledRatio() <= 0) {
+                    continue;
+                }
+                tessellator.setColorOpaque_F(0.7f, 0.7f, 0.7f);
+                drawSection(
+                        cube,
+                        fluidTex.getMinU(),
+                        fluidTex.getMaxU(),
+                        fluidTex.getMinV(),
+                        fluidTex.getMaxV(),
+                        component.dir,
+                        true);
             }
 
-        } else {
-            drawSection(
-                    component.bound,
-                    tex.getMinU(),
-                    tex.getMaxU(),
-                    tex.getMinV(),
-                    tex.getMaxV(),
-                    component.dir,
-                    true);
-        }
-
-        if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
-            final CubeRenderer cr = CubeRenderer.get();
-            int i;
-            tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
-            List<Vertex> corners = component.bound
-                    .getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
-            for (i = corners.size() - 1; i >= 0; i--) {
-                Vertex c = corners.get(i);
-                cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
-            }
-            // back face
-            for (i = corners.size() - 1; i >= 0; i--) {
-                Vertex c = corners.get(i);
-                cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+            if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
+                final CubeRenderer cr = CubeRenderer.get();
+                int i;
+                tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
+                List<Vertex> corners = component.bound.getCornersWithUvForFace(
+                        component.dir,
+                        tex.getMinU(),
+                        tex.getMaxU(),
+                        tex.getMinV(),
+                        tex.getMaxV());
+                for (i = corners.size() - 1; i >= 0; i--) {
+                    Vertex c = corners.get(i);
+                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                }
+                // back face
+                for (i = corners.size() - 1; i >= 0; i--) {
+                    Vertex c = corners.get(i);
+                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                }
             }
         }
     }
@@ -113,27 +127,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 +208,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
                 }
             }
         }
+        cache0.put(fluid, data);
         return data;
     }
 
@@ -239,49 +256,6 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         // done in the dynamic section
     }
 
-    @Override
-    public boolean isDynamic() {
-        return true;
-    }
-
-    @Override
-    public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit,
-            double x, double y, double z, float partialTick, float worldLight) {
-
-        if (((LiquidConduit) conduit).getTank().getFilledRatio() <= 0) {
-            return;
-        }
-
-        Collection<CollidableComponent> components = conduit.getCollidableComponents();
-        Tessellator tessellator = Tessellator.instance;
-
-        calculateRatios((LiquidConduit) conduit);
-        transmissionScaleFactor = conduit.getTransmitionGeometryScale();
-
-        IIcon tex;
-        for (CollidableComponent component : components) {
-            if (renderComponent(component)) {
-                if (isNSEWUD(component.dir) && conduit.getTransmitionTextureForState(component) != null) {
-
-                    tessellator.setColorOpaque_F(1, 1, 1);
-                    tex = conduit.getTransmitionTextureForState(component);
-
-                    BoundingBox[] cubes = toCubes(component.bound);
-                    for (BoundingBox cube : cubes) {
-                        drawSection(
-                                cube,
-                                tex.getMinU(),
-                                tex.getMaxU(),
-                                tex.getMinV(),
-                                tex.getMaxV(),
-                                component.dir,
-                                true);
-                    }
-                }
-            }
-        }
-    }
-
     @Override
     protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection id) {
 

src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java

@@ -11,7 +11,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
@@ -19,13 +18,9 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.IconUtil;
-import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.IBlockAccessWrapper;
 import com.google.common.collect.Lists;
@@ -53,59 +48,12 @@ import crazypants.util.RenderPassHelper;
 
 @SideOnly(Side.CLIENT)
 @ThreadSafeISBRH(perThread = false)
-public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
+public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
 
     public ConduitBundleRenderer(float conduitScale) {}
 
     public ConduitBundleRenderer() {}
 
-    @Override
-    public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) {
-        IConduitBundle bundle = (IConduitBundle) te;
-        EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
-        if (bundle == null || (bundle.hasFacade() && bundle.getFacadeId().isOpaqueCube()
-                && !ConduitUtil.isFacadeHidden(bundle, player))) {
-            return;
-        }
-        final Tessellator tessellator = Tessellator.instance;
-
-        float brightness = -1;
-        for (IConduit con : bundle.getConduits()) {
-            if (ConduitUtil.renderConduit(player, con)) {
-                final ConduitRenderer renderer = con.getRenderer();
-                if (renderer.isDynamic()) {
-                    if (brightness == -1) {
-                        BlockCoord loc = bundle.getLocation();
-                        brightness = bundle.getEntity().getWorldObj()
-                                .getLightBrightnessForSkyBlocks(loc.x, loc.y, loc.z, 0);
-
-                        RenderUtil.bindBlockTexture();
-
-                        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
-                        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-                        GL11.glEnable(GL11.GL_BLEND);
-                        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                        GL11.glShadeModel(GL11.GL_SMOOTH);
-
-                        GL11.glPushMatrix();
-                        GL11.glTranslated(x, y, z);
-
-                        tessellator.startDrawingQuads();
-                    }
-                    renderer.renderDynamicEntity(this, bundle, con, x, y, z, partialTick, brightness);
-                }
-            }
-        }
-
-        if (brightness != -1) {
-            tessellator.draw();
-
-            GL11.glShadeModel(GL11.GL_FLAT);
-            GL11.glPopMatrix();
-            GL11.glPopAttrib();
-        }
-    }
-
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks rb) {

src/main/java/crazypants/enderio/conduit/render/ConduitRenderer.java

@@ -10,8 +10,4 @@ public interface ConduitRenderer {
     void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x, double y,
             double z, float partialTick, float worldLight, RenderBlocks rb);
 
-    boolean isDynamic();
-
-    void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x,
-            double y, double z, float partialTick, float worldLight);
 }

src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java

@@ -63,10 +63,6 @@ public class DefaultConduitRenderer implements ConduitRenderer {
         }
     }
 
-    @Override
-    public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con,
-            double x, double y, double z, float partialTick, float worldLight) {}
-
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) {
         final CubeRenderer cr = CubeRenderer.get();
 
@@ -349,8 +345,4 @@ public class DefaultConduitRenderer implements ConduitRenderer {
         return new BoundingBox[] { bb };
     }
 
-    @Override
-    public boolean isDynamic() {
-        return false;
-    }
 }

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

@@ -174,8 +174,6 @@ public final class Config {
      * The distance travelled when no block is found within {@link #teleportStaffMaxBlinkDistance}.
      */
     public static int teleportStaffFailedBlinkDistance = 64;
-    /** If true, use the original staff of teleportation controls. */
-    public static boolean teleportStaffOriginalControls = false;
 
     /**
      * Sets the teleport staff right-click action.
@@ -188,9 +186,6 @@ public final class Config {
      * <li><b>2:</b> Teleport to anchor
      * <li><b>3:</b> Teleport to anchor, or to look if no anchor <em>(default)</em>
      * </ul>
-     *
-     * <p>
-     * Overridden if {@link #teleportStaffOriginalControls} is true.
      */
     public static int teleportStaffAction = 3;
 
@@ -205,9 +200,6 @@ public final class Config {
      * <li><b>2:</b> Teleport to anchor
      * <li><b>3:</b> Teleport to anchor, or to look if no anchor
      * </ul>
-     *
-     * <p>
-     * Overridden if {@link #teleportStaffOriginalControls} is true.
      */
     public static int teleportStaffSneakAction = 1;
 
@@ -397,6 +389,8 @@ public final class Config {
             "TwilightForest:item.steeleafHoe", "TwilightForest:item.ironwoodHoe", "IC2:itemToolBronzeHoe" };
     public static List<ItemStack> farmHoes = new ArrayList<ItemStack>();
     public static int farmSaplingReserveAmount = 8;
+    public static double farmParticlesMaxRange = 64;
+    public static int farmParticlesCount = 15;
 
     public static int magnetPowerUsePerSecondRF = 1;
     public static int magnetPowerCapacityRF = 100000;
@@ -1305,35 +1299,25 @@ public final class Config {
                         "Number of blocks teleported when no block is being looked at.")
                 .getInt(teleportStaffFailedBlinkDistance);
 
-        teleportStaffOriginalControls = config.get(
-                sectionPersonal.name,
-                "teleportStaffOriginalControls",
-                teleportStaffOriginalControls,
-                "If true, the staff of teleportation will use its original controls: R-Click for teleport to look, Shift R-Click for teleport to anchor.")
-                .getBoolean(teleportStaffOriginalControls);
-
         teleportStaffAction = config.get(
-                sectionPersonal.name,
+                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)\n"
-                        + "Overridden if teleportStaffOriginalControls is true.")
+                        + "    3: Teleport to anchor, or look if no anchor (default)")
                 .getInt(teleportStaffAction);
 
-        teleportStaffSneakAction = config
-                .get(
-                        sectionPersonal.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\n"
-                                + "Overridden if teleportStaffOriginalControls is true.")
+        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(
@@ -2127,6 +2111,18 @@ public final class Config {
                         + "always shear all leaves.")
                 .getInt(farmSaplingReserveAmount);
 
+        farmParticlesMaxRange = config.get(
+                sectionFarm.name,
+                "farmParticlesMaxRange",
+                farmParticlesMaxRange,
+                "The max range of the farm action particles.").getDouble(farmParticlesMaxRange);
+
+        farmParticlesCount = config.get(
+                sectionFarm.name,
+                "farmParticlesCount",
+                farmParticlesCount,
+                "The number of particles produces by farm action.").getInt(farmParticlesCount);
+
         combustionGeneratorUseOpaqueModel = config
                 .get(
                         sectionAesthetic.name,

src/main/java/crazypants/enderio/item/KeyTracker.java

@@ -154,7 +154,8 @@ public class KeyTracker {
                 if (player != null) {
                     ItemStack travelItem = player.getHeldItem();
                     if (travelItem == null || travelItem.getItem() == null
-                            || !(travelItem.getItem() instanceof IItemOfTravel)) {
+                            || !(travelItem.getItem() instanceof IItemOfTravel)
+                            || !((IItemOfTravel) travelItem.getItem()).isActive(player, travelItem)) {
                         travelItem = TravelController.instance.findTravelItemInInventoryOrBaubles(player);
                     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java

@@ -386,7 +386,15 @@ public class ItemDarkSteelSword extends ItemSword
 
     @Override
     public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        return isTravelUpgradeActive(ep, equipped);
+        if (ep != null && equipped != null && isTravelUpgradeActive(ep, equipped)) {
+            // Only "active" if held while sneaking. But still "active" for the purposes of travel keybind if not held
+            if (isEquipped(ep)) {
+                return ep.isSneaking();
+            } else {
+                return true;
+            }
+        }
+        return false;
     }
 
     @Override
@@ -400,12 +408,12 @@ public class ItemDarkSteelSword extends ItemSword
     }
 
     private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
-        return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
+        return ep != null && equipped != null && TravelUpgrade.loadFromItem(equipped) != null;
     }
 
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-        if (isTravelUpgradeActive(player, stack)) {
+        if (isActive(player, stack)) {
             if (world.isRemote) {
                 if (TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) {
                     player.swingItem();

src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java

@@ -9,6 +9,7 @@ import com.enderio.core.common.util.BlockCoord;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.config.Config;
 import crazypants.util.ClientUtil;
 import io.netty.buffer.ByteBuf;
 
@@ -51,11 +52,7 @@ public class PacketFarmAction implements IMessage, IMessageHandler<PacketFarmAct
 
     @Override
     public IMessage onMessage(PacketFarmAction message, MessageContext ctx) {
-        for (BlockCoord bc : message.coords) {
-            for (int i = 0; i < 15; i++) {
-                ClientUtil.spawnFarmParcticles(rand, bc);
-            }
-        }
+        ClientUtil.spawnFarmParticles(rand, message.coords, Config.farmParticlesCount);
         return null;
     }
 }

src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java

@@ -458,8 +458,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
             IHarvestResult harvest = FarmersCommune.instance.harvestBlock(this, bc, block, meta);
             if (harvest != null && harvest.getDrops() != null) {
                 PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks());
-                PacketHandler.INSTANCE
-                        .sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64));
+                PacketHandler.INSTANCE.sendToAllAround(
+                        pkt,
+                        new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, Config.farmParticlesMaxRange));
                 for (EntityItem ei : harvest.getDrops()) {
                     if (ei != null) {
                         insertHarvestDrop(ei, bc);
@@ -487,7 +488,12 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
                     inventory[minFirtSlot] = farmerJoe.inventory.mainInventory[0];
                     PacketHandler.INSTANCE.sendToAllAround(
                             new PacketFarmAction(bc),
-                            new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64));
+                            new TargetPoint(
+                                    worldObj.provider.dimensionId,
+                                    bc.x,
+                                    bc.y,
+                                    bc.z,
+                                    Config.farmParticlesMaxRange));
                     if (inventory[minFirtSlot] != null && inventory[minFirtSlot].stackSize == 0) {
                         inventory[minFirtSlot] = null;
                     }

src/main/java/crazypants/enderio/material/Alloy.java

@@ -33,9 +33,10 @@ public enum Alloy {
         if (oreDictName != null) {
             this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName));
             this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName));
+        } else {
+            this.oreIngots.add("ingot" + StringUtils.capitalize(baseName));
+            this.oreBlocks.add("block" + StringUtils.capitalize(baseName));
         }
-        this.oreIngots.add("ingot" + StringUtils.capitalize(baseName));
-        this.oreBlocks.add("block" + StringUtils.capitalize(baseName));
         this.hardness = hardness;
     }
 

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

@@ -57,38 +57,28 @@ public class ItemTeleportStaff extends ItemTravelStaff {
     @Override
     public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) {
         if (world.isRemote) {
-            if (Config.teleportStaffOriginalControls) {
-                if (player.isSneaking()) {
+            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);
-                } else {
-                    TravelController.instance.doTeleport(player);
-                }
-                player.swingItem();
-            } else {
-                int action = player.isSneaking() ? Config.teleportStaffSneakAction : Config.teleportStaffAction;
-                switch (action) {
-                    case 0:
-                        // Do nothing.
-                        break;
+                    player.swingItem();
+                    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;
-                }
+                case 3:
+                    TravelController.instance
+                            .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF, true);
+                    player.swingItem();
+                    break;
             }
         }
         return equipped;
@@ -116,6 +106,12 @@ public class ItemTeleportStaff extends ItemTravelStaff {
         return power;
     }
 
+    @Override
+    public int getEnergyStored(ItemStack item) {
+        // Has infinite energy, always report as being full of energy for any validation-code purposes.
+        return this.capacity;
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {

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

@@ -46,7 +46,6 @@ 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;
@@ -163,7 +162,8 @@ public class TravelController {
             case STAFF_BLINK:
                 if (Config.travelStaffKeybindEnabled) {
                     if (equippedItem == null || equippedItem.getItem() == null
-                            || !(equippedItem.getItem() instanceof IItemOfTravel)) {
+                            || !(equippedItem.getItem() instanceof IItemOfTravel)
+                            || !((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) {
                         equippedItem = findTravelItemInInventoryOrBaubles(toTp);
                     }
                 }
@@ -199,12 +199,11 @@ public class TravelController {
     public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source,
             boolean alsoDoTeleport) {
         if (!hasTarget()) {
-            PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source);
             if (alsoDoTeleport) {
                 Optional<BlockCoord> destinationOptional = findTeleportDestination(player);
                 if (destinationOptional.isPresent()) {
                     BlockCoord destination = destinationOptional.get();
-                    p = new PacketLongDistanceTravelEvent(
+                    PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(
                             player,
                             false,
                             source,
@@ -212,12 +211,18 @@ public class TravelController {
                             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) {
@@ -339,111 +344,11 @@ public class TravelController {
     public boolean doTeleport(EntityPlayer player) {
         Optional<BlockCoord> destinationOptional = findTeleportDestination(player);
         if (destinationOptional.isPresent()) {
-            return travelToLocation(player, TravelSource.TELEPORT_STAFF_BLINK, destinationOptional.get(), true);
+            return travelToLocation(player, TravelSource.TELEPORT_STAFF_BLINK, destinationOptional.get(), false);
         }
         return false;
     }
 
-    /** 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();
-    }
-
     private boolean isBlackListedBlock(EntityPlayer player, MovingObjectPosition pos, Block hitBlock) {
         UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(hitBlock);
         if (ui == null) {
@@ -624,9 +529,9 @@ 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
-                || Config.teleportStaffOriginalControls) {
+        if (getTravelItemTravelSource(ep, false) != TravelSource.TELEPORT_STAFF) {
             return false;
         }
 
@@ -643,7 +548,8 @@ public class TravelController {
 
         ItemStack equipped = ep.getCurrentEquippedItem();
         if (checkInventoryAndBaubles) {
-            if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)) {
+            if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)
+                    || !((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
                 equipped = findTravelItemInInventoryOrBaubles(ep);
             }
         }
@@ -672,7 +578,8 @@ public class TravelController {
         ItemStack travelItem = null;
         for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
             ItemStack stack = ep.inventory.getStackInSlot(i);
-            if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+            if (stack != null && stack.getItem() instanceof IItemOfTravel
+                    && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                 travelItem = stack;
                 break;
             }
@@ -683,7 +590,8 @@ public class TravelController {
             if (baubles != null) {
                 for (int i = 0; i < baubles.getSizeInventory(); i++) {
                     ItemStack stack = baubles.getStackInSlot(i);
-                    if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                    if (stack != null && stack.getItem() instanceof IItemOfTravel
+                            && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                         travelItem = stack;
                         break;
                     }
@@ -707,7 +615,8 @@ public class TravelController {
         int travelItemSlot = -1;
         for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
             ItemStack stack = ep.inventory.getStackInSlot(i);
-            if (stack != null && (stack.getItem() instanceof IItemOfTravel)) {
+            if (stack != null && stack.getItem() instanceof IItemOfTravel
+                    && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                 travelItemSlot = i;
                 break;
             }
@@ -718,7 +627,8 @@ public class TravelController {
             if (baubles != null) {
                 for (int i = 0; i < baubles.getSizeInventory(); i++) {
                     ItemStack stack = baubles.getStackInSlot(i);
-                    if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                    if (stack != null && stack.getItem() instanceof IItemOfTravel
+                            && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                         travelItemSlot = -(i + 2);
                         break;
                     }
@@ -728,6 +638,106 @@ 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(
@@ -1183,19 +1193,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());
         }
     }

src/main/java/crazypants/util/ClientUtil.java

@@ -1,10 +1,14 @@
 package crazypants.util;
 
+import java.util.List;
 import java.util.Random;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.particle.EntityPortalFX;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
 import com.enderio.core.common.util.BlockCoord;
 
@@ -47,18 +51,35 @@ public class ClientUtil {
         con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION);
     }
 
-    public static void spawnFarmParcticles(Random rand, BlockCoord bc) {
-        double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1;
-        double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2;
-        double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1;
-        Minecraft.getMinecraft().theWorld.spawnParticle(
-                "portal",
-                bc.x + xOff,
-                bc.y + yOff,
-                bc.z + zOff,
-                (rand.nextDouble() - 0.5) * 1.5,
-                -rand.nextDouble(),
-                (rand.nextDouble() - 0.5) * 1.5);
+    public static void spawnFarmParticles(Random rand, List<BlockCoord> coords, int particlesCount) {
+        // 0 = All, 1 = Decreased, 2 = Minimal
+        int particleSetting = Minecraft.getMinecraft().gameSettings.particleSetting;
+        if (particleSetting >= 2 /* Minimal */) {
+            return;
+        }
+
+        int particles = particleSetting == 0 ? particlesCount /* All */
+                : (particlesCount / 2) /* Decreased */;
+
+        World world = Minecraft.getMinecraft().theWorld;
+        EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer;
+
+        for (BlockCoord bc : coords) {
+            for (int i = 0; i < particles; i++) {
+                double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1;
+                double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2;
+                double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1;
+                effectRenderer.addEffect(
+                        new EntityPortalFX(
+                                world,
+                                bc.x + xOff,
+                                bc.y + yOff,
+                                bc.z + zOff,
+                                (rand.nextDouble() - 0.5) * 1.5,
+                                -rand.nextDouble(),
+                                (rand.nextDouble() - 0.5) * 1.5));
+            }
+        }
     }
 
     public static void setTankNBT(PacketCombustionTank message, int x, int y, int 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