diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index c051f41b0..f73b72c5d 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -24,7 +24,6 @@ import cofh.api.energy.IEnergyReceiver; }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory { - public EnumSet getOutputtingSides(); public boolean sideIsOutput(EnumFacing side); 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 0f68c7af6..4e5052ca0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -161,12 +161,6 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } - @Override - public EnumSet getOutputtingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index a067767dd..5d599aa29 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -80,34 +80,15 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } } } - + @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { if(structure != null && mode) - { - EnumSet set = EnumSet.allOf(EnumFacing.class); - - for(EnumFacing side : EnumFacing.VALUES) - { - if(structure.locations.contains(Coord4D.get(this).offset(side))) - { - set.remove(side); - } - } - - return set; - } - - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { - if (structure != null && mode) { return !structure.locations.contains(Coord4D.get(this).offset(side)); } + return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 4614d0338..96c2449d7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -60,8 +60,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public List publicCache = new ArrayList(); public List privateCache = new ArrayList(); - - public static final EnumSet nothing = EnumSet.noneOf(EnumFacing.class); public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; @@ -366,12 +364,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return data; } - @Override - public EnumSet getOutputtingSides() - { - return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 1825013de..0cb276221 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -101,12 +101,6 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index f339b1309..cffde9691 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,10 +1,13 @@ package mekanism.common.util; -import java.util.*; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Function; import mekanism.api.Coord4D; -import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; @@ -39,17 +42,20 @@ public final class CableUtils * @param sides - set of sides to check * @return boolean[] of adjacent connections */ - public static boolean[] getConnections(TileEntity tileEntity, Set sides) + public static boolean[] getConnections(TileEntity tileEntity, Function sideFunction) { boolean[] connectable = new boolean[] {false, false, false, false, false, false}; Coord4D coord = Coord4D.get(tileEntity); - for(EnumFacing side : sides) + for(EnumFacing side : EnumFacing.values()) { - TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld()); - - connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side); - connectable[side.ordinal()] |= isCable(tile); + if(sideFunction.apply(side)) + { + TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld()); + + connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side); + connectable[side.ordinal()] |= isCable(tile); + } } return connectable; @@ -185,9 +191,9 @@ public final class CableUtils if(energyToSend > 0) { List outputtingSides = new LinkedList<>(); - boolean[] connectable = getConnections((TileEntity)emitter, emitter.getOutputtingSides()); + boolean[] connectable = getConnections((TileEntity)emitter, side -> emitter.sideIsOutput(side)); - for(EnumFacing side : emitter.getOutputtingSides()) + for(EnumFacing side : EnumFacing.values()) { if(connectable[side.ordinal()]) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 98aa47409..0f3e2d81b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -20,13 +20,8 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i } @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { - return EnumSet.of(facing); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { return side == facing; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 726c56cda..34b69850b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -117,14 +117,9 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement } @Override - public boolean sideIsConsumer(EnumFacing side) { - return false; - } - - @Override - public EnumSet getOutputtingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.of(facing); + return false; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 7d973fb07..30662db26 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -189,13 +189,8 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { - return EnumSet.of(EnumFacing.getFront(0)); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { return side == EnumFacing.DOWN; } 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 7a445809e..d703724f6 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -76,12 +76,6 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock attempted = false; } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsOutput(EnumFacing side) { 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 8fbb53418..e7a1ec655 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -284,12 +284,6 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.allOf(EnumFacing.class); - } - @Override public boolean sideIsOutput(EnumFacing side) { return true; 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 5dbd8501a..3778a9c6f 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -73,32 +73,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { if(structure != null) - { - EnumSet set = EnumSet.allOf(EnumFacing.class); - - for(EnumFacing side : EnumFacing.VALUES) - { - if(structure.locations.contains(Coord4D.get(this).offset(side))) - { - set.remove(side); - } - } - - return set; - } - - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { - if (structure != null) { return !structure.locations.contains(Coord4D.get(this).offset(side)); } + return false; }