From b77ca6ff0c65b070757df7454962fc72fdcbf189 Mon Sep 17 00:00:00 2001
From: aidancbrady <me@aidancbrady.com>
Date: Thu, 30 Jun 2016 01:03:13 -0400
Subject: [PATCH] Revert "Remove deprecated gas API methods"

This reverts commit c5a414df37b9bfc84d36b251e978ca36f47cf590.
---
 .../java/mekanism/api/gas/IGasHandler.java    |  6 +++++
 .../common/multipart/PartPressurizedTube.java | 12 ++++++++++
 .../TileEntityAdvancedElectricMachine.java    | 12 ++++++++++
 .../tile/TileEntityAmbientAccumulator.java    | 12 ++++++++++
 .../tile/TileEntityChemicalCrystallizer.java  | 12 ++++++++++
 .../TileEntityChemicalDissolutionChamber.java | 12 ++++++++++
 .../tile/TileEntityChemicalInfuser.java       | 12 ++++++++++
 .../common/tile/TileEntityChemicalWasher.java | 12 ++++++++++
 .../tile/TileEntityElectrolyticSeparator.java | 12 ++++++++++
 .../common/tile/TileEntityFactory.java        | 12 ++++++++++
 .../common/tile/TileEntityGasTank.java        | 12 ++++++++++
 .../mekanism/common/tile/TileEntityPRC.java   | 12 ++++++++++
 .../tile/TileEntityQuantumEntangloporter.java | 12 ++++++++++
 .../tile/TileEntityRotaryCondensentrator.java | 12 ++++++++++
 .../tile/TileEntitySolarNeutronActivator.java | 12 ++++++++++
 .../common/tile/TileEntityGasGenerator.java   | 12 ++++++++++
 .../tile/reactor/TileEntityReactorPort.java   | 22 ++++++++++++++++++-
 17 files changed, 207 insertions(+), 1 deletion(-)

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/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java
index f3d1ad25e..8a108cc98 100644
--- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java
+++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java
@@ -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) 
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
index 466af1e58..4362c3cce 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java
index 5089676ad..19df868d7 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
index 9309103eb..f9461f754 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
index 50eebeb45..79ad26d82 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
index 3ef43e6c2..e7d38e96a 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
index 31aee4f34..dcadafcc8 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
index 6816cf416..1d2eccff8 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java
index 912736aac..249746b26 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java
index ce78c4934..c1c6a4e15 100644
--- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java
+++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java
index 698c30e3e..a220cf3f2 100644
--- a/src/main/java/mekanism/common/tile/TileEntityPRC.java
+++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
index 183372175..452c29300 100644
--- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
+++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
index 22f2e347d..34364e373 100644
--- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
@@ -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)
 	{
diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
index 83bd7cd7d..f03706474 100644
--- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
+++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
@@ -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) 
 	{
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
index d0aca8237..80e73d10f 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
@@ -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)
 	{
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 76b103667..0c5c3584f 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
@@ -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