diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 7ef6a7d84..b19cad6c6 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -166,7 +166,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection { } private boolean canPowerTo(TileEntity tile) { - return isActivated() && BlockUtil.isRFTile(getOrientation().getOpposite(), tile); + return isActivated() && BlockUtil.isEnergyReceiver(getOrientation().getOpposite(), tile); } private void setActive(boolean isActive) { @@ -185,7 +185,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection { TileEntity tile = worldObj.getTileEntity(xCoord + orient.offsetX, yCoord + orient.offsetY, zCoord + orient.offsetZ); - if (BlockUtil.isRFTile(getOrientation().getOpposite(), tile)) { + if (BlockUtil.isEnergyReceiver(getOrientation().getOpposite(), tile)) { setOrientation(orient); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); worldObj.func_147479_m(xCoord, yCoord, zCoord); diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index a4971a0e5..371ee06d5 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -26,7 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import forestry.core.config.Defaults; import forestry.core.vect.Vect; -import cofh.api.energy.IEnergyHandler; +import cofh.api.energy.IEnergyReceiver; public class BlockUtil { @@ -38,14 +38,11 @@ public class BlockUtil { } - public static boolean isRFTile(ForgeDirection side, TileEntity tile) { - if (tile == null) + public static boolean isEnergyReceiver(ForgeDirection side, TileEntity tile) { + if (!(tile instanceof IEnergyReceiver)) return false; - if (!(tile instanceof IEnergyHandler)) - return false; - - IEnergyHandler receptor = (IEnergyHandler) tile; + IEnergyReceiver receptor = (IEnergyReceiver) tile; return receptor.canConnectEnergy(side); } diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index 6de21acb2..6ff05ce5e 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -2,6 +2,8 @@ package forestry.energy; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; +import cofh.api.energy.IEnergyReceiver; + import forestry.core.GameMode; import forestry.core.utils.BlockUtil; import net.minecraft.nbt.NBTTagCompound; @@ -156,8 +158,8 @@ public class EnergyManager implements IEnergyHandler { */ public int sendEnergy(ForgeDirection orientation, TileEntity tile, int amount) { int sent = 0; - if (BlockUtil.isRFTile(orientation.getOpposite(), tile)) { - IEnergyHandler receptor = (IEnergyHandler) tile; + if (BlockUtil.isEnergyReceiver(orientation.getOpposite(), tile)) { + IEnergyReceiver receptor = (IEnergyReceiver) tile; int extractable = energyStorage.extractEnergy(amount, true); if (extractable > 0) {