diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index 7c4c2a54a..144bc9fca 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -1,8 +1,12 @@ package mekanism.api.gas; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -138,4 +142,60 @@ public final class GasTransmission return 0; } + + /** + * Emits gas from a central block by splitting the received stack among the sides given. + * @param sides - the list of sides to output from + * @param stack - the stack to output + * @param from - the TileEntity to output from + * @return the amount of gas emitted + */ + public static int emit(List sides, GasStack stack, TileEntity from) + { + if(stack == null) + { + return 0; + } + + List availableAcceptors = new ArrayList(); + IGasHandler[] possibleAcceptors = getConnectedAcceptors(from); + + for(int i = 0; i < possibleAcceptors.length; i++) + { + IGasHandler handler = possibleAcceptors[i]; + + if(handler != null && handler.canReceiveGas(ForgeDirection.getOrientation(i).getOpposite(), stack.getGas())) + { + availableAcceptors.add(handler); + } + } + + Collections.shuffle(availableAcceptors); + + int toSend = stack.amount; + int prevSending = toSend; + + if(!availableAcceptors.isEmpty()) + { + int divider = availableAcceptors.size(); + int remaining = toSend % divider; + int sending = (toSend-remaining)/divider; + + for(IGasHandler acceptor : availableAcceptors) + { + int currentSending = sending; + + if(remaining > 0) + { + currentSending++; + remaining--; + } + + ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); + toSend -= acceptor.receiveGas(dir, new GasStack(stack.getGas(), currentSending), true); + } + } + + return prevSending-toSend; + } } diff --git a/src/main/java/mekanism/common/base/IEjector.java b/src/main/java/mekanism/common/base/IEjector.java index 164a23bb3..2509b6eb9 100644 --- a/src/main/java/mekanism/common/base/IEjector.java +++ b/src/main/java/mekanism/common/base/IEjector.java @@ -5,7 +5,7 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IEjector { - public void onOutput(); + public void outputItems(); public EnumColor getOutputColor(); diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 05fb9afdf..35fd2c31c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -294,7 +294,7 @@ public abstract class TileEntityAdvancedElectricMachine sideData = new HashMap(); public Map trackers = new HashMap(); + + public static final int GAS_OUTPUT = 256; + public static final int FLUID_OUTPUT = 256; public TileComponentEjector(TileEntityContainerBlock tile) { @@ -89,32 +99,76 @@ public class TileComponentEjector implements ITileComponent, IEjector { if(tickDelay == 0) { - onOutput(); + if(sideData.get(TransmissionType.ITEM) != null) + { + outputItems(); + } } else { tickDelay--; } + + if(!tileEntity.getWorldObj().isRemote) + { + if(sideData.get(TransmissionType.GAS) != null && getEjecting(TransmissionType.GAS)) + { + SideData data = sideData.get(TransmissionType.GAS); + List outputSides = getOutputSides(TransmissionType.GAS, data); + + GasTank tank = (GasTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; + + if(tank.getStored() > 0) + { + GasStack toEmit = tank.getGas().copy().withAmount(Math.min(GAS_OUTPUT, tank.getStored())); + int emit = GasTransmission.emit(outputSides, toEmit, tileEntity); + tank.draw(emit, true); + } + } + + if(sideData.get(TransmissionType.FLUID) != null && getEjecting(TransmissionType.FLUID)) + { + SideData data = sideData.get(TransmissionType.FLUID); + List outputSides = getOutputSides(TransmissionType.FLUID, data); + + FluidTank tank = (FluidTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; + + if(tank.getFluidAmount() > 0) + { + FluidStack toEmit = new FluidStack(tank.getFluid().getFluid(), Math.min(FLUID_OUTPUT, tank.getFluidAmount())); + int emit = PipeUtils.emit(outputSides, toEmit, tileEntity); + tank.drain(emit, true); + } + } + } + } + + public List getOutputSides(TransmissionType type, SideData data) + { + List outputSides = new ArrayList(); + + ISideConfiguration configurable = (ISideConfiguration)tileEntity; + + for(int i = 0; i < configurable.getConfig().getConfig(type).length; i++) + { + if(configurable.getConfig().getConfig(type)[i] == configurable.getConfig().getOutputs(type).indexOf(data)) + { + outputSides.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(i, tileEntity.facing))); + } + } + + return outputSides; } @Override - public void onOutput() + public void outputItems() { if(!getEjecting(TransmissionType.ITEM) || tileEntity.getWorldObj().isRemote) { return; } - List outputSides = new ArrayList(); - - ISideConfiguration configurable = (ISideConfiguration)tileEntity; - - for(int i = 0; i < configurable.getConfig().getConfig(TransmissionType.ITEM).length; i++) - { - if(configurable.getConfig().getConfig(TransmissionType.ITEM)[i] == configurable.getConfig().getOutputs(TransmissionType.ITEM).indexOf(sideData)) - { - outputSides.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(i, tileEntity.facing))); - } - } + SideData data = sideData.get(TransmissionType.ITEM); + List outputSides = getOutputSides(TransmissionType.ITEM, data); for(int index = 0; index < sideData.get(TransmissionType.ITEM).availableSlots.length; index++) { diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 33a8e46a9..a6368cbbf 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -1,14 +1,17 @@ package mekanism.common.util; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.List; import mekanism.api.Coord4D; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; @@ -144,4 +147,60 @@ public final class PipeUtils return acceptors; } + + /** + * Emits fluid from a central block by splitting the received stack among the sides given. + * @param sides - the list of sides to output from + * @param stack - the stack to output + * @param from - the TileEntity to output from + * @return the amount of gas emitted + */ + public static int emit(List sides, FluidStack stack, TileEntity from) + { + if(stack == null) + { + return 0; + } + + List availableAcceptors = new ArrayList(); + IFluidHandler[] possibleAcceptors = getConnectedAcceptors(from); + + for(int i = 0; i < possibleAcceptors.length; i++) + { + IFluidHandler handler = possibleAcceptors[i]; + + if(handler != null && handler.canFill(ForgeDirection.getOrientation(i).getOpposite(), stack.getFluid())) + { + availableAcceptors.add(handler); + } + } + + Collections.shuffle(availableAcceptors); + + int toSend = stack.amount; + int prevSending = toSend; + + if(!availableAcceptors.isEmpty()) + { + int divider = availableAcceptors.size(); + int remaining = toSend % divider; + int sending = (toSend-remaining)/divider; + + for(IFluidHandler acceptor : availableAcceptors) + { + int currentSending = sending; + + if(remaining > 0) + { + currentSending++; + remaining--; + } + + ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); + toSend -= acceptor.fill(dir, new FluidStack(stack.getFluid(), currentSending), true); + } + } + + return prevSending-toSend; + } }