mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch '1.11' into 1.12
* 1.11: Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay move zh_cn lang file back to thr correct place Update entity names Another cleanup Fix dev environment after adding SD compat Kill off some unused code Updated minor compat Conflicts: build.gradle
This commit is contained in:
commit
8ed83b0e4f
28 files changed
+92
-290
No files matched your search
@@ -212,6 +212,11 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
|
||||
transmittersAdded.add(transmitter);
|
||||
}
|
||||
|
||||
for(IGridTransmitter<A, N> transmitter : net.transmittersToAdd)
|
||||
{
|
||||
transmittersToAdd.add(transmitter);
|
||||
}
|
||||
|
||||
possibleAcceptors.putAll(net.possibleAcceptors);
|
||||
|
||||
for(Entry<Coord4D, EnumSet<EnumFacing>> entry : net.acceptorDirections.entrySet())
|
||||
@@ -394,7 +399,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
|
||||
public void queueClientUpdate(Collection<IGridTransmitter<A, N>> newTransmitters)
|
||||
{
|
||||
transmittersAdded.addAll(newTransmitters);
|
||||
updateDelay = 3;
|
||||
updateDelay = 5;
|
||||
}
|
||||
|
||||
public static class TransmittersAddedEvent extends Event
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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.");
|
||||
|
||||
@@ -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<EnumFacing> getOutputtingSides();
|
||||
public boolean sideIsOutput(EnumFacing side);
|
||||
|
||||
public EnumSet<EnumFacing> getConsumingSides();
|
||||
public boolean sideIsConsumer(EnumFacing side);
|
||||
|
||||
public double getMaxOutput();
|
||||
|
||||
@@ -32,7 +32,7 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public final class OreDictManager
|
||||
{
|
||||
private static final List<String> minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium");
|
||||
private static final List<String> minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium", "Platinum", "Iridium");
|
||||
|
||||
public static void init()
|
||||
{
|
||||
|
||||
@@ -170,13 +170,8 @@ public class TileEntityChargepad extends TileEntityNoisyBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> 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();
|
||||
}
|
||||
|
||||
|
||||
@@ -1559,19 +1559,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> 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()
|
||||
{
|
||||
|
||||
@@ -415,12 +415,6 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
{
|
||||
return EnumSet.of(facing.getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
|
||||
@@ -155,24 +155,12 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> 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<EnumFacing> getOutputtingSides()
|
||||
{
|
||||
return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
|
||||
@@ -389,12 +389,6 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
{
|
||||
return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
|
||||
@@ -378,12 +378,6 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
{
|
||||
return EnumSet.of(facing.getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
|
||||
@@ -80,50 +80,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
if(structure != null && mode)
|
||||
{
|
||||
EnumSet<EnumFacing> 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<EnumFacing> 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);
|
||||
}
|
||||
|
||||
|
||||
@@ -119,13 +119,8 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return EnumSet.of(facing.getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return side == facing.getOpposite();
|
||||
}
|
||||
|
||||
|
||||
@@ -551,15 +551,10 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -60,8 +60,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
|
||||
|
||||
public List<Frequency> publicCache = new ArrayList<Frequency>();
|
||||
public List<Frequency> privateCache = new ArrayList<Frequency>();
|
||||
|
||||
public static final EnumSet<EnumFacing> nothing = EnumSet.noneOf(EnumFacing.class);
|
||||
|
||||
public TileComponentEjector ejectorComponent;
|
||||
public TileComponentConfig configComponent;
|
||||
@@ -367,32 +365,24 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> 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<EnumFacing> 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);
|
||||
}
|
||||
|
||||
|
||||
@@ -123,15 +123,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> 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);
|
||||
}
|
||||
|
||||
|
||||
@@ -206,15 +206,10 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement
|
||||
{
|
||||
return controlType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
{
|
||||
return EnumSet.of(facing.getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return side == facing.getOpposite();
|
||||
}
|
||||
|
||||
|
||||
@@ -39,15 +39,10 @@ public abstract class TileEntityBasicMachine<INPUT extends MachineInput<INPUT>,
|
||||
|
||||
guiLocation = location;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> 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);
|
||||
}
|
||||
|
||||
|
||||
@@ -102,24 +102,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return EnumSet.allOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -242,7 +242,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
|
||||
|
||||
if(didTransfer != prevTransfer || needsUpdate)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer));
|
||||
MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer));
|
||||
needsUpdate = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -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<EnumFacing> sides)
|
||||
public static boolean[] getConnections(TileEntity tileEntity, Function<EnumFacing, Boolean> 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<EnumFacing> 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()])
|
||||
{
|
||||
|
||||
@@ -20,13 +20,8 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
return EnumSet.of(facing);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side) {
|
||||
return side == facing;
|
||||
}
|
||||
|
||||
|
||||
@@ -117,22 +117,11 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
{
|
||||
return EnumSet.of(facing);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side) {
|
||||
return side == facing;
|
||||
|
||||
@@ -189,13 +189,8 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
return EnumSet.of(EnumFacing.getFront(0));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side) {
|
||||
return side == EnumFacing.DOWN;
|
||||
}
|
||||
|
||||
|
||||
@@ -77,24 +77,14 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -284,23 +284,11 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
{
|
||||
return EnumSet.allOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsOutput(EnumFacing side) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getConsumingSides()
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return false;
|
||||
|
||||
@@ -73,43 +73,19 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<EnumFacing> getOutputtingSides()
|
||||
public boolean sideIsOutput(EnumFacing side)
|
||||
{
|
||||
if(structure != null)
|
||||
{
|
||||
EnumSet<EnumFacing> 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<EnumFacing> getConsumingSides()
|
||||
public boolean sideIsConsumer(EnumFacing side)
|
||||
{
|
||||
return EnumSet.noneOf(EnumFacing.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sideIsConsumer(EnumFacing side) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user