diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
index 232dc42f3..41cd8d3b4 100644
--- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
+++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
@@ -212,6 +212,11 @@ public abstract class DynamicNetwork> implemen
transmittersAdded.add(transmitter);
}
+ for(IGridTransmitter transmitter : net.transmittersToAdd)
+ {
+ transmittersToAdd.add(transmitter);
+ }
+
possibleAcceptors.putAll(net.possibleAcceptors);
for(Entry> entry : net.acceptorDirections.entrySet())
@@ -394,7 +399,7 @@ public abstract class DynamicNetwork> implemen
public void queueClientUpdate(Collection> newTransmitters)
{
transmittersAdded.addAll(newTransmitters);
- updateDelay = 3;
+ updateDelay = 5;
}
public static class TransmittersAddedEvent extends Event
diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
index b9e4c06cf..92721b2bc 100644
--- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
+++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
@@ -246,10 +246,10 @@ public class TransmitterNetworkRegistry
public void start()
{
- iterate(startPoint.coord(), null);
+ iterate(startPoint.coord());
}
- public void iterate(Coord4D from, EnumFacing fromDirection)
+ public void iterate(Coord4D from)
{
if(iterated.contains(from))
{
@@ -269,14 +269,11 @@ public class TransmitterNetworkRegistry
for(EnumFacing direction : EnumFacing.VALUES)
{
- if(direction != fromDirection)
+ Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
+
+ if(directionCoord != null && !iterated.contains(directionCoord))
{
- Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
-
- if(!(directionCoord == null || iterated.contains(directionCoord)))
- {
- iterate(directionCoord, direction.getOpposite());
- }
+ iterate(directionCoord);
}
}
}
diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java
index 7ccdc92fd..0fcdaf530 100644
--- a/src/main/java/mekanism/client/voice/VoiceClient.java
+++ b/src/main/java/mekanism/client/voice/VoiceClient.java
@@ -65,37 +65,16 @@ public class VoiceClient extends Thread
Mekanism.logger.info("VoiceServer: Stopping client connection...");
try {
- try {
- inputThread.interrupt();
- outputThread.interrupt();
- } catch(Exception e) {}
-
- try {
- interrupt();
- } catch(Exception e) {}
-
- try {
- inputThread.close();
- outputThread.close();
- } catch(Exception e) {}
-
- try {
- output.flush();
- output.close();
- output = null;
- } catch(Exception e) {}
-
- try {
- input.close();
- input = null;
- } catch(Exception e) {}
-
- try {
- socket.close();
- socket = null;
- } catch(Exception e) {}
-
-
+ inputThread.interrupt();
+ outputThread.interrupt();
+ inputThread.close();
+ outputThread.close();
+ output.close();
+ input.close();
+ socket.close();
+
+ interrupt();
+
running = false;
} catch(Exception e) {
Mekanism.logger.error("VoiceServer: Error while stopping client connection.");
diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java
index eb51e1981..2b54984cc 100644
--- a/src/main/java/mekanism/common/base/IEnergyWrapper.java
+++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java
@@ -27,10 +27,8 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
})
public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory
{
- 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/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java
index 7038a6da5..a8f61e805 100644
--- a/src/main/java/mekanism/common/integration/OreDictManager.java
+++ b/src/main/java/mekanism/common/integration/OreDictManager.java
@@ -32,7 +32,7 @@ import net.minecraftforge.oredict.OreDictionary;
public final class OreDictManager
{
- private static final List minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium");
+ private static final List minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium", "Platinum", "Iridium");
public static void init()
{
diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java
index 9044ca7d9..88055b803 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 a25bf4769..34c53f0ae 100644
--- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
+++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
@@ -1559,19 +1559,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..4e5052ca0 100644
--- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
+++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
@@ -155,24 +155,12 @@ 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)
{
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/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 86b95c23f..9c751697b 100644
--- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java
+++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java
@@ -80,50 +80,21 @@ 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;
}
@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..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;
@@ -367,32 +365,24 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
}
@Override
- public EnumSet getOutputtingSides()
+ public boolean sideIsOutput(EnumFacing side)
{
- return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2);
- }
-
- @Override
- public boolean sideIsOutput(EnumFacing side) {
- if (!hasFrequency())
+ 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 7f08fc028..38684c0bd 100644
--- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java
+++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java
@@ -102,24 +102,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
- public EnumSet getOutputtingSides()
+ public boolean sideIsOutput(EnumFacing side)
{
- return EnumSet.noneOf(EnumFacing.class);
- }
-
- @Override
- 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/common/transmitters/grid/FluidNetwork.java b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java
index 2c73efbb6..3a61b8139 100644
--- a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java
+++ b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java
@@ -242,7 +242,7 @@ public class FluidNetwork extends DynamicNetwork
if(didTransfer != prevTransfer || needsUpdate)
{
- MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer));
+ MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer));
needsUpdate = false;
}
diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java
index 7c908bca3..9d5f31776 100644
--- a/src/main/java/mekanism/common/util/CableUtils.java
+++ b/src/main/java/mekanism/common/util/CableUtils.java
@@ -1,13 +1,16 @@
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 cofh.redstoneflux.api.IEnergyConnection;
import cofh.redstoneflux.api.IEnergyProvider;
import cofh.redstoneflux.api.IEnergyReceiver;
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 db1b03243..34b69850b 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
@@ -117,22 +117,11 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement
}
@Override
- public EnumSet getConsumingSides()
+ public boolean sideIsConsumer(EnumFacing side)
{
- return EnumSet.noneOf(EnumFacing.class);
- }
-
- @Override
- public boolean sideIsConsumer(EnumFacing side) {
return false;
}
- @Override
- public EnumSet getOutputtingSides()
- {
- return EnumSet.of(facing);
- }
-
@Override
public boolean sideIsOutput(EnumFacing side) {
return side == facing;
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
index b87916689..ca1ac9e5e 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 3f423e422..d703724f6 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java
@@ -77,24 +77,14 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock
}
@Override
- public EnumSet getOutputtingSides()
+ public boolean sideIsOutput(EnumFacing side)
{
- return EnumSet.noneOf(EnumFacing.class);
- }
-
- @Override
- 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..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,23 +284,11 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
}
}
- @Override
- public EnumSet getOutputtingSides()
- {
- return EnumSet.allOf(EnumFacing.class);
- }
-
@Override
public boolean sideIsOutput(EnumFacing side) {
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 b11e99aea..cc4315865 100644
--- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
+++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
@@ -73,43 +73,19 @@ 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;
}
@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/resources/assets/mekanism/lang/zh_cn.lang b/src/main/resources/assets/mekanism/lang/zh_cn.lang
index 1347cb4c3..cbce2c42b 100644
--- a/src/main/resources/assets/mekanism/lang/zh_cn.lang
+++ b/src/main/resources/assets/mekanism/lang/zh_cn.lang
@@ -187,28 +187,28 @@ tile.OreBlock.CopperOre.name=铜矿石
tile.OreBlock.TinOre.name=锡矿石
//Transmitters
-item.MultipartTransmitter.BasicPressurizedTube.name=基础加压管道
-item.MultipartTransmitter.AdvancedPressurizedTube.name=高级加压管道
-item.MultipartTransmitter.ElitePressurizedTube.name=精英加压管道
-item.MultipartTransmitter.UltimatePressurizedTube.name=终极加压管道
-item.MultipartTransmitter.BasicUniversalCable.name=基础通用线缆
-item.MultipartTransmitter.AdvancedUniversalCable.name=高级通用线缆
-item.MultipartTransmitter.EliteUniversalCable.name=精英通用线缆
-item.MultipartTransmitter.UltimateUniversalCable.name=终极通用线缆
-item.MultipartTransmitter.BasicMechanicalPipe.name=基础机械管道
-item.MultipartTransmitter.AdvancedMechanicalPipe.name=高级机械管道
-item.MultipartTransmitter.EliteMechanicalPipe.name=精英机械管道
-item.MultipartTransmitter.UltimateMechanicalPipe.name=终极机械管道
-item.MultipartTransmitter.BasicLogisticalTransporter.name=基础物流管道
-item.MultipartTransmitter.AdvancedLogisticalTransporter.name=高级物流管道
-item.MultipartTransmitter.EliteLogisticalTransporter.name=精英物流管道
-item.MultipartTransmitter.UltimateLogisticalTransporter.name=终极物流管道
-item.MultipartTransmitter.RestrictiveTransporter.name=限制传送管道
-item.MultipartTransmitter.DiversionTransporter.name=转移传送管道
-item.MultipartTransmitter.BasicThermodynamicConductor.name=基础热导线缆
-item.MultipartTransmitter.AdvancedThermodynamicConductor.name=高级热导线缆
-item.MultipartTransmitter.EliteThermodynamicConductor.name=精英热导线缆
-item.MultipartTransmitter.UltimateThermodynamicConductor.name=终极热导线缆
+tile.Transmitter.BasicPressurizedTube.name=基础加压管道
+tile.Transmitter.AdvancedPressurizedTube.name=高级加压管道
+tile.Transmitter.ElitePressurizedTube.name=精英加压管道
+tile.Transmitter.UltimatePressurizedTube.name=终极加压管道
+tile.Transmitter.BasicUniversalCable.name=基础通用线缆
+tile.Transmitter.AdvancedUniversalCable.name=高级通用线缆
+tile.Transmitter.EliteUniversalCable.name=精英通用线缆
+tile.Transmitter.UltimateUniversalCable.name=终极通用线缆
+tile.Transmitter.BasicMechanicalPipe.name=基础机械管道
+tile.Transmitter.AdvancedMechanicalPipe.name=高级机械管道
+tile.Transmitter.EliteMechanicalPipe.name=精英机械管道
+tile.Transmitter.UltimateMechanicalPipe.name=终极机械管道
+tile.Transmitter.BasicLogisticalTransporter.name=基础物流管道
+tile.Transmitter.AdvancedLogisticalTransporter.name=高级物流管道
+tile.Transmitter.EliteLogisticalTransporter.name=精英物流管道
+tile.Transmitter.UltimateLogisticalTransporter.name=终极物流管道
+tile.Transmitter.RestrictiveTransporter.name=限制传送管道
+tile.Transmitter.DiversionTransporter.name=转移传送管道
+tile.Transmitter.BasicThermodynamicConductor.name=基础热导线缆
+tile.Transmitter.AdvancedThermodynamicConductor.name=高级热导线缆
+tile.Transmitter.EliteThermodynamicConductor.name=精英热导线缆
+tile.Transmitter.UltimateThermodynamicConductor.name=终极热导线缆
//Glow Panel
item.GlowPanel.name=荧光板