diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 9c231c4e6..c051f41b0 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -27,7 +27,6 @@ public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, I public EnumSet getOutputtingSides(); public boolean sideIsOutput(EnumFacing side); - public EnumSet getConsumingSides(); public boolean sideIsConsumer(EnumFacing side); public double getMaxOutput(); diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 51540ed55..5878f1729 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -170,13 +170,8 @@ public class TileEntityChargepad extends TileEntityNoisyBlock } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.of(EnumFacing.DOWN, facing.getOpposite()); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return side == EnumFacing.DOWN || side == facing.getOpposite(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 602769200..4a8e6624b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1560,19 +1560,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return false; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), EnumFacing.DOWN); - } - @Override public boolean sideIsConsumer(EnumFacing side) { return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == EnumFacing.DOWN; } - @Override public TileComponentSecurity getSecurity() { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 48301963d..5df71925d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -415,12 +415,6 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return false; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index c6549c176..0f68c7af6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -155,12 +155,6 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return true; } - @Override - public EnumSet getConsumingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 5df3f9693..12cc53ddc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -389,12 +389,6 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } } - @Override - public EnumSet getConsumingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 55b5e7b5d..468b93207 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -378,12 +378,6 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return false; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index d14643187..a067767dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -112,18 +112,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - if(structure != null && !mode) - { - return EnumSet.allOf(EnumFacing.class); - } - - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return (structure != null && !mode); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 2ab5706e5..31094747e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -119,13 +119,8 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.of(facing.getOpposite()); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return side == facing.getOpposite(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 69c2cc5aa..463cbfe5a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -551,15 +551,10 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { return false; } - + @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 4459b21cc..4614d0338 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -373,26 +373,24 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean sideIsOutput(EnumFacing side) { - if (!hasFrequency()) + public boolean sideIsOutput(EnumFacing side) + { + if(!hasFrequency()) { return false; } + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 2, side); } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { - if (!hasFrequency()) + if(!hasFrequency()) { return false; } + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 951ead305..0a9060de7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -123,15 +123,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I } } } - - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing)); - } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 57a1902c7..af8e62f5d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -206,15 +206,10 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement { return controlType; } - - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return side == facing.getOpposite(); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java index 1e94bf290..98cd8e60e 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java @@ -39,15 +39,10 @@ public abstract class TileEntityBasicMachine, guiLocation = location; } - - @Override - public EnumSet getConsumingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 637d0a596..1825013de 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -108,18 +108,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public boolean sideIsOutput(EnumFacing side) { + public boolean sideIsOutput(EnumFacing side) + { return false; } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.allOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return true; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index db1b03243..726c56cda 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -116,12 +116,6 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement return output; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsConsumer(EnumFacing side) { return false; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 3f423e422..7a445809e 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -83,18 +83,14 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock } @Override - public boolean sideIsOutput(EnumFacing side) { + public boolean sideIsOutput(EnumFacing side) + { return false; } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return false; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 85895f821..8fbb53418 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -295,12 +295,6 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl return true; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsConsumer(EnumFacing side) { return false; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index dc1aeae00..5dbd8501a 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -103,13 +103,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return false; }