diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index e82968d2d..4ff1a7d16 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -30,7 +30,7 @@ public class MultipartMekanism implements IPartFactory MultipartGenerator.registerPassThroughInterface("mekanism.common.ILogisticalTransporter"); MultipartGenerator.registerPassThroughInterface("buildcraft.api.power.IPowerReceptor"); MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler"); - MultipartGenerator.registerPassThroughInterface("mekanism.common.IConfigurable"); + MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable"); MultipartGenerator.registerPassThroughInterface("mekanism.common.ITileNetwork"); MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IBlockableConnection"); MultipartGenerator.registerPassThroughInterface("mekanism.api.gas.IGasHandler"); diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 7ce236941..6a71e49c4 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -95,13 +95,13 @@ public class PartUniversalCable extends PartTransmitter implement List sides = getConnections(ConnectionType.PULL); if(!sides.isEmpty()) { - TileEntity[] connectedAcceptors = CableUtils.getConnectedEnergyAcceptors(tile()); + TileEntity[] connectedOutputters = CableUtils.getConnectedOutputters(tile()); for(ForgeDirection side : sides) { - if(connectedAcceptors[side.ordinal()] != null) + if(connectedOutputters[side.ordinal()] != null) { - TileEntity acceptor = connectedAcceptors[side.ordinal()]; + TileEntity acceptor = connectedOutputters[side.ordinal()]; if(acceptor instanceof IEnergySource) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index db63d4f24..563e456bb 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -137,7 +137,7 @@ public final class CableUtils { TileEntity outputter = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - if(isOutputter(tileEntity, orientation)) + if(isOutputter(outputter, orientation)) { outputters[orientation.ordinal()] = outputter; } @@ -149,7 +149,7 @@ public final class CableUtils public static boolean isOutputter(TileEntity tileEntity, ForgeDirection side) { return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) || - (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(tileEntity, side.getOpposite())) || + (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler && ((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite())) || (MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerEmitter && ((IPowerEmitter)tileEntity).canEmitPowerFrom(side.getOpposite())); }