Revert "Remove deprecated gas API methods"

This reverts commit c5a414df37.
This commit is contained in:
aidancbrady 2016-06-30 01:03:13 -04:00
parent 425b43a4c4
commit b77ca6ff0c
17 changed files with 207 additions and 1 deletions

View file

@ -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

View file

@ -272,12 +272,24 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
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)
{

View file

@ -398,12 +398,24 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
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)
{

View file

@ -56,12 +56,24 @@ public class TileEntityAmbientAccumulator extends TileEntityContainerBlock 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)
{
return collectedGas.draw(amount, doTransfer);
}
@Override
public GasStack drawGas(ForgeDirection side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(ForgeDirection side, Gas type)
{

View file

@ -366,12 +366,24 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock
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 canDrawGas(ForgeDirection side, Gas type)
{

View file

@ -423,12 +423,24 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri
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)
{

View file

@ -420,6 +420,12 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
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)
{
@ -431,6 +437,12 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
return null;
}
@Override
public GasStack drawGas(ForgeDirection side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(ForgeDirection side, Gas type)
{

View file

@ -428,6 +428,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)
{
@ -439,6 +445,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)
{

View file

@ -651,6 +651,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)
{
@ -666,6 +672,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)
{

View file

@ -1093,6 +1093,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)
{
@ -1121,6 +1127,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)
{

View file

@ -179,12 +179,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)
{

View file

@ -406,6 +406,12 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
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)
{
@ -417,6 +423,12 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
return null;
}
@Override
public GasStack drawGas(ForgeDirection side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(ForgeDirection side, Gas type)
{

View file

@ -465,12 +465,24 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
return !hasFrequency() ? 0 : frequency.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 !hasFrequency() ? null : frequency.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)
{

View file

@ -435,12 +435,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)
{

View file

@ -292,6 +292,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)
{
@ -303,6 +309,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)
{

View file

@ -294,6 +294,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)
{
@ -330,6 +336,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)
{

View file

@ -152,12 +152,32 @@ 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)
{
if(getReactor() != null)
{
if(getReactor().getSteamTank().getFluidAmount() > 0)
{
return new GasStack(GasRegistry.getGas("steam"), getReactor().getSteamTank().drain(amount, doTransfer).amount);
}
}
return null;
}
@Override
public GasStack drawGas(ForgeDirection side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(ForgeDirection side, Gas type)
{
@ -167,7 +187,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
@Override
public boolean canDrawGas(ForgeDirection side, Gas type)
{
return false;
return (type == GasRegistry.getGas("steam"));
}
@Override