update

Co-authored-by: GitHub GTNH Actions <>

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.3:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.1-GTNH:dev')
+    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: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.8.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-404-GTNH:api') {transitive = false}
+    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:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.14: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.15.0-GTNH:dev') {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('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-alpha52:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha44:api') {transitive = false}
 }

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

@@ -174,6 +174,8 @@ 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.
@@ -186,6 +188,9 @@ 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;
 
@@ -200,6 +205,9 @@ 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;
 
@@ -389,8 +397,6 @@ 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;
@@ -1299,25 +1305,35 @@ 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(
-                sectionStaff.name,
+                sectionPersonal.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)")
+                        + "    3: Teleport to anchor, or look if no anchor (default)\n"
+                        + "Overridden if teleportStaffOriginalControls is true.")
                 .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")
+        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.")
                 .getInt(teleportStaffSneakAction);
 
         enderIoRange = config.get(
@@ -2111,18 +2127,6 @@ 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/machine/farm/PacketFarmAction.java

@@ -9,7 +9,6 @@ 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;
 
@@ -52,7 +51,11 @@ public class PacketFarmAction implements IMessage, IMessageHandler<PacketFarmAct
 
     @Override
     public IMessage onMessage(PacketFarmAction message, MessageContext ctx) {
-        ClientUtil.spawnFarmParticles(rand, message.coords, Config.farmParticlesCount);
+        for (BlockCoord bc : message.coords) {
+            for (int i = 0; i < 15; i++) {
+                ClientUtil.spawnFarmParcticles(rand, bc);
+            }
+        }
         return null;
     }
 }

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

@@ -458,9 +458,8 @@ 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, Config.farmParticlesMaxRange));
+                PacketHandler.INSTANCE
+                        .sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64));
                 for (EntityItem ei : harvest.getDrops()) {
                     if (ei != null) {
                         insertHarvestDrop(ei, bc);
@@ -488,12 +487,7 @@ 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,
-                                    Config.farmParticlesMaxRange));
+                            new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64));
                     if (inventory[minFirtSlot] != null && inventory[minFirtSlot].stackSize == 0) {
                         inventory[minFirtSlot] = null;
                     }

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

@@ -57,28 +57,38 @@ public class ItemTeleportStaff extends ItemTravelStaff {
     @Override
     public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) {
         if (world.isRemote) {
-            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:
+            if (Config.teleportStaffOriginalControls) {
+                if (player.isSneaking()) {
                     TravelController.instance
                             .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF);
-                    player.swingItem();
-                    break;
+                } else {
+                    TravelController.instance.doTeleport(player);
+                }
+                player.swingItem();
+            } else {
+                int action = player.isSneaking() ? Config.teleportStaffSneakAction : Config.teleportStaffAction;
+                switch (action) {
+                    case 0:
+                        // Do nothing.
+                        break;
 
-                case 3:
-                    TravelController.instance
-                            .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF, true);
-                    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;
+                }
             }
         }
         return equipped;

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

@@ -199,11 +199,12 @@ 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();
-                    PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(
+                    p = new PacketLongDistanceTravelEvent(
                             player,
                             false,
                             source,
@@ -211,18 +212,12 @@ 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) {
@@ -344,11 +339,111 @@ 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(), false);
+            return travelToLocation(player, TravelSource.TELEPORT_STAFF_BLINK, destinationOptional.get(), true);
         }
         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) {
@@ -529,9 +624,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) {
+        if (getTravelItemTravelSource(ep, false) != TravelSource.TELEPORT_STAFF
+                || Config.teleportStaffOriginalControls) {
             return false;
         }
 
@@ -633,106 +728,6 @@ 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(

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

@@ -337,9 +337,6 @@ 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,14 +1,10 @@
 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;
 
@@ -51,35 +47,18 @@ public class ClientUtil {
         con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION);
     }
 
-    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 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 setTankNBT(PacketCombustionTank message, int x, int y, int z) {