Add missing Gas API methods

src/main/java/mekanism/api/gas/GasTank.java

@@ -7,7 +7,7 @@
  * @author aidancbrady
  *
  */
-public class GasTank
+public class GasTank implements GasTankInfo
 {
 	public GasStack stored;
 

src/main/java/mekanism/api/gas/GasTankInfo.java

@@ -0,0 +1,28 @@
+package mekanism.api.gas;
+
+import javax.annotation.Nullable;
+
+public interface GasTankInfo {
+
+	/**
+	 * Retrieve the stored gas stack. DO NOT MODIFY.
+	 * 
+	 * @return the stored gas, or null
+	 */
+	@Nullable
+	GasStack getGas();
+
+	/**
+	 * Gets the amount of gas stored by this GasTank
+	 * 
+	 * @return amount of gas stored
+	 */
+	int getStored();
+
+	/**
+	 * Gets the maximum amount of gas this tank can hold
+	 * 
+	 * @return - max gas
+	 */
+	int getMaxGas();
+}

src/main/java/mekanism/api/gas/IGasTankInfoProvider.java

@@ -0,0 +1,23 @@
+package mekanism.api.gas;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Implement this if your tile entity extends IGasHandler.
+ * Backported from 1.12.2, separated from IGasHandler to maintain compatibility.
+ */
+public interface IGasTankInfoProvider
+{
+
+	GasTankInfo[] NONE = new GasTankInfo[0];
+
+	/**
+     * Gets the tanks present on this handler. READ ONLY. DO NOT MODIFY.
+     *
+     * @return an array of GasTankInfo elements corresponding to all tanks.
+     */
+	@Nonnull
+	default GasTankInfo[] getTankInfo() {
+		return NONE;
+	}
+}

src/main/java/mekanism/common/multipart/PartPressurizedTube.java

@@ -2,13 +2,17 @@
 
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.MekanismConfig.client;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasNetwork;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.client.render.RenderPartTransmitter;
 import mekanism.common.Tier;
@@ -26,7 +30,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork> implements IGasHandler
+public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork> implements IGasHandler, IGasTankInfoProvider
 {
 	public Tier.TubeTier tier = Tier.TubeTier.BASIC;
 
@@ -303,6 +307,20 @@ public boolean canDrawGas(ForgeDirection side, Gas type)
 		return false;
 	}
 
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		if (getTransmitter().hasTransmitterNetwork())
+		{
+			GasNetwork network = getTransmitter().getTransmitterNetwork();
+			GasTank networkTank = new GasTank(network.getCapacity());
+			networkTank.setGas(network.buffer);
+			return new GasTankInfo[] {networkTank};
+		}
+		return new GasTankInfo[] {buffer};
+	}
+
 	public int takeGas(GasStack gasStack, boolean doEmit)
 	{
 		if(getTransmitter().hasTransmitterNetwork())

src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java

@@ -4,11 +4,15 @@
 
 import java.util.ArrayList;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.EnumColor;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.IGasHandler;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.common.MekanismBlocks;
@@ -35,7 +39,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedMachineRecipe<RECIPE>> extends TileEntityBasicMachine<AdvancedMachineInput, ItemStackOutput, RECIPE> implements IGasHandler, ITubeConnection, ITierUpgradeable
+public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedMachineRecipe<RECIPE>> extends TileEntityBasicMachine<AdvancedMachineInput, ItemStackOutput, RECIPE> implements IGasHandler, IGasTankInfoProvider, ITubeConnection, ITierUpgradeable
 {
 	/** How much secondary energy (fuel) this machine uses per tick, not including upgrades. */
 	public int BASE_SECONDARY_ENERGY_PER_TICK;
@@ -438,6 +442,13 @@ public boolean canDrawGas(ForgeDirection side, Gas type)
 		return false;
 	}
 
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		return new GasTankInfo[] {gasTank};
+	}
+
 	@Override
 	public void recalculateUpgradables(Upgrade upgrade)
 	{

src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java

@@ -5,18 +5,22 @@
 import java.util.ArrayList;
 import java.util.Random;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.IGasHandler;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.recipe.RecipeHandler;
 import mekanism.common.recipe.inputs.IntegerInput;
 import mekanism.common.recipe.machines.AmbientGasRecipe;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityAmbientAccumulator extends TileEntityContainerBlock implements IGasHandler, ITubeConnection
+public class TileEntityAmbientAccumulator extends TileEntityContainerBlock implements IGasHandler, IGasTankInfoProvider, ITubeConnection
 {
 	public GasTank collectedGas = new GasTank(1000);
 
@@ -86,6 +90,13 @@ public boolean canDrawGas(ForgeDirection side, Gas type)
 		return type == collectedGas.getGasType();
 	}
 
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		return new GasTankInfo[] {collectedGas};
+	}
+
 	@Override
 	public boolean canTubeConnect(ForgeDirection side)
 	{

src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java

@@ -4,6 +4,8 @@
 
 import java.util.ArrayList;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.Coord4D;
 import mekanism.api.EnumColor;
 import mekanism.api.IConfigCardAccess;
@@ -13,9 +15,11 @@
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.IGasItem;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.common.Mekanism;
@@ -43,7 +47,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager, IConfigCardAccess, ISecurityTile
+public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, IGasTankInfoProvider, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager, IConfigCardAccess, ISecurityTile
 {
 	public static final int MAX_GAS = 10000;
 
@@ -390,6 +394,13 @@ public boolean canDrawGas(ForgeDirection side, Gas type)
 		return false;
 	}
 
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		return new GasTankInfo[] {inputTank};
+	}
+
 	@Override
 	public boolean isItemValidForSlot(int slotID, ItemStack itemstack)
 	{

src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java

@@ -4,16 +4,20 @@
 
 import java.util.ArrayList;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig.usage;
 import mekanism.api.Range4D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.IGasItem;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.Mekanism;
 import mekanism.common.Upgrade;
@@ -39,7 +43,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IGasHandler, IUpgradeTile, ISustainedData, ITankManager, ISecurityTile
+public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IGasHandler, IGasTankInfoProvider, IUpgradeTile, ISustainedData, ITankManager, ISecurityTile
 {
 	public GasTank injectTank = new GasTank(MAX_GAS);
 	public GasTank outputTank = new GasTank(MAX_GAS);
@@ -453,6 +457,13 @@ public boolean canDrawGas(ForgeDirection side, Gas type)
 		return false;
 	}
 
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		return new GasTankInfo[] {injectTank, outputTank};
+	}
+
 	@Override
 	public TileComponentUpgrade getComponent() 
 	{

src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java

@@ -5,16 +5,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig.usage;
 import mekanism.api.Range4D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.IGasItem;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.Mekanism;
 import mekanism.common.Upgrade;
@@ -39,7 +43,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISustainedData, IUpgradeTile, IUpgradeInfoHandler, ITankManager, ISecurityTile
+public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock implements IGasHandler, IGasTankInfoProvider, ITubeConnection, IRedstoneControl, ISustainedData, IUpgradeTile, IUpgradeInfoHandler, ITankManager, ISecurityTile
 {
 	public GasTank leftTank = new GasTank(MAX_GAS);
 	public GasTank rightTank = new GasTank(MAX_GAS);
@@ -449,6 +453,13 @@ public boolean canDrawGas(ForgeDirection side, Gas type)
 		return getTank(side) != null && getTank(side) == centerTank ? getTank(side).canDraw(type) : false;
 	}
 
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		return new GasTankInfo[] {leftTank, rightTank, centerTank};
+	}
+
 	@Override
 	public boolean isItemValidForSlot(int slotID, ItemStack itemstack)
 	{

src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java

@@ -4,15 +4,19 @@
 
 import java.util.ArrayList;
 
+import javax.annotation.Nonnull;
+
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig.usage;
 import mekanism.api.Range4D;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import mekanism.api.gas.GasTankInfo;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.IGasItem;
+import mekanism.api.gas.IGasTankInfoProvider;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.Mekanism;
 import mekanism.common.Upgrade;
@@ -36,7 +40,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IUpgradeTile, ISustainedData, ITankManager, ISecurityTile
+public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IUpgradeTile, ISustainedData, ITankManager, ISecurityTile, IGasTankInfoProvider
 {
 	public GasTank gasTank = new GasTank(MAX_GAS);
 
@@ -408,6 +412,13 @@ public Object[] getTanks()
 	{
 		return new Object[] {gasTank};
 	}
+
+	@Override
+	@Nonnull
+	public GasTankInfo[] getTankInfo()
+	{
+		return new GasTankInfo[] {gasTank};
+	}
 
 	@Override
 	public TileComponentSecurity getSecurity()