diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java index 3d99da62e..e06952317 100644 --- a/src/main/java/mekanism/api/gas/IGasHandler.java +++ b/src/main/java/mekanism/api/gas/IGasHandler.java @@ -16,6 +16,9 @@ public interface IGasHandler */ public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer); + @Deprecated + public int receiveGas(ForgeDirection side, GasStack stack); + /** * Draws a certain amount of gas from this block. * @param amount - amount to draw @@ -23,6 +26,9 @@ public interface IGasHandler */ public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer); + @Deprecated + public GasStack drawGas(ForgeDirection side, int amount); + /** * Whether or not this block can accept gas from a certain side. * @param side - side to check diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java index f5d108a30..63e05acf9 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java +++ b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java @@ -81,12 +81,24 @@ public class SharedInventory implements IStrictEnergyStorage, IFluidHandler, IGa return storedGas.receive(stack, doTransfer); } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { return storedGas.draw(amount, doTransfer); } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index f796dc28f..b24952e6f 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -296,12 +296,24 @@ public class PartPressurizedTube extends PartTransmitter implements return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 89bf79c12..2cd556b34 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -391,12 +391,24 @@ public abstract class TileEntityAdvancedElectricMachine implements IGasHandler, ITubeConnection +public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectricMachine { public TileEntityChemicalInjectionChamber() { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 3645a6d15..0b2166f97 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -484,6 +484,12 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { @@ -495,6 +501,12 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canDrawGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 445fe2cbb..306e4e159 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -691,6 +691,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { @@ -706,6 +712,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index fe9d363f3..62aca60d2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -161,12 +161,24 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements return sharedInventory == null ? 0 : sharedInventory.receiveGas(side, stack, doTransfer); } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { return sharedInventory == null ? null : sharedInventory.drawGas(side, amount, doTransfer); } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index db46b2d94..af08db9ed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -993,6 +993,12 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { @@ -1021,6 +1027,12 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canDrawGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 9e30314fd..2a0596264 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -151,12 +151,24 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH return gasTank.receive(stack, doTransfer); } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canDrawGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 38ffe6cac..d04f9f87d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -397,6 +397,12 @@ public class TileEntityPRC extends TileEntityBasicMachine implements IGasHandler, ITubeConnection +public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMachine { public TileEntityPurificationChamber() { diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index ecc67dfff..97973adbe 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -519,12 +519,24 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp return gasTank.receive(stack, doTransfer); } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { return gasTank.draw(amount, doTransfer); } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canDrawGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 12a0168f5..c54c56326 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -282,6 +282,12 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { @@ -293,6 +299,12 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index b81a2e3a4..d24e07d50 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -260,6 +260,12 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public void readFromNBT(NBTTagCompound nbtTags) { @@ -296,6 +302,12 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canDrawGas(ForgeDirection side, Gas type) { 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 03a5bb4e2..c5588a9de 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -128,6 +128,12 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl return 0; } + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { @@ -142,6 +148,12 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) {