From c5a414df37b9bfc84d36b251e978ca36f47cf590 Mon Sep 17 00:00:00 2001
From: aidancbrady <me@aidancbrady.com>
Date: Wed, 29 Jun 2016 19:58:13 -0400
Subject: [PATCH] Remove deprecated gas API methods

---
 .../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, 1 insertion(+), 207 deletions(-)

diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java
index e06952317..3d99da62e 100644
--- a/src/main/java/mekanism/api/gas/IGasHandler.java
+++ b/src/main/java/mekanism/api/gas/IGasHandler.java
@@ -16,9 +16,6 @@ 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
@@ -26,9 +23,6 @@ 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 8a108cc98..f3d1ad25e 100644
--- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java
+++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java
@@ -272,24 +272,12 @@ 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 4362c3cce..466af1e58 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -398,24 +398,12 @@ 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 19df868d7..5089676ad 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java
@@ -56,24 +56,12 @@ 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 f9461f754..9309103eb 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
@@ -366,24 +366,12 @@ 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 79ad26d82..50eebeb45 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
@@ -423,24 +423,12 @@ 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 e7d38e96a..3ef43e6c2 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
@@ -420,12 +420,6 @@ 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)
 	{
@@ -437,12 +431,6 @@ 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 dcadafcc8..31aee4f34 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
@@ -428,12 +428,6 @@ 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)
 	{
@@ -445,12 +439,6 @@ 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 1d2eccff8..6816cf416 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
@@ -651,12 +651,6 @@ 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)
 	{
@@ -672,12 +666,6 @@ 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 249746b26..912736aac 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java
@@ -1093,12 +1093,6 @@ 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)
 	{
@@ -1127,12 +1121,6 @@ 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 c1c6a4e15..ce78c4934 100644
--- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java
+++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java
@@ -179,24 +179,12 @@ 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 a220cf3f2..698c30e3e 100644
--- a/src/main/java/mekanism/common/tile/TileEntityPRC.java
+++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java
@@ -406,12 +406,6 @@ 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)
 	{
@@ -423,12 +417,6 @@ 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 452c29300..183372175 100644
--- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
+++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
@@ -465,24 +465,12 @@ 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 34364e373..22f2e347d 100644
--- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
@@ -435,24 +435,12 @@ 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 f03706474..83bd7cd7d 100644
--- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
+++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
@@ -292,12 +292,6 @@ 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) 
 	{
@@ -309,12 +303,6 @@ 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 80e73d10f..d0aca8237 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
@@ -294,12 +294,6 @@ 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)
 	{
@@ -336,12 +330,6 @@ 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 52a08b13f..dabfe4c28 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
@@ -129,32 +129,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)
 	{
-		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)
 	{
@@ -164,7 +144,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
 	@Override
 	public boolean canDrawGas(ForgeDirection side, Gas type)
 	{
-		return (type == GasRegistry.getGas("steam"));
+		return false;
 	}
 
 	@Override