diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 466a6b2ac..6993dfef0 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -48,7 +48,7 @@ import cpw.mods.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; -@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticrat API") +@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API") public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable { public double MAX_ELECTRICITY = 100000; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index a8df271a5..033140c14 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -484,7 +484,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock implements I if(tileEntity != null && tileEntity.isRendering) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); } } } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 31129f478..54219bcbb 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,7 +1,5 @@ package mekanism.common.util; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.MjAPI; import ic2.api.energy.EnergyNet; import ic2.api.energy.tile.IEnergyAcceptor; import ic2.api.energy.tile.IEnergySink; @@ -21,18 +19,15 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.tile.TileEntityElectricBlock; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.mj.IBatteryObject; +import buildcraft.api.mj.MjAPI; import buildcraft.api.power.IPowerEmitter; +import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; public final class CableUtils { - private static Set allSides; - - static - { - allSides = EnumSet.allOf(ForgeDirection.class); - allSides.remove(ForgeDirection.UNKNOWN); - } + private static Set allSides = EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN)); /** * Gets all the connected energy acceptors, whether IC2-based or BuildCraft-based, surrounding a specific tile entity. @@ -151,6 +146,7 @@ public final class CableUtils return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler && ((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite())) || + (MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) || (MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerEmitter && ((IPowerEmitter)tileEntity).canEmitPowerFrom(side.getOpposite())); }