From a0b8ab0331ebe09f8ea9346e9b44ea7db83ccef6 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Fri, 8 Aug 2014 21:25:59 -0400 Subject: [PATCH] Quick cleanup --- src/main/java/mekanism/common/util/CableUtils.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index b0af6c156..a676801f8 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -22,18 +22,12 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.mj.IBatteryObject; import buildcraft.api.mj.MjAPI; import buildcraft.api.power.IPowerEmitter; -import buildcraft.api.power.IPowerReceptor; +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. @@ -152,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())); }