$ Cleaned up the entire project.

> Much neat, very nices.

1 files changed, 321 insertions, 226 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
index 24bbfda9a1..61141417ae 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.D1;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
@@ -30,352 +28,449 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.*;
 
 public class GregtechMetaPipeEntityFluid extends MetaPipeEntity {
-	public final float mThickNess;
-	public final GT_Materials mMaterial;
-	public final int mCapacity, mHeatResistance;
-	public final boolean mGasProof;
-	public FluidStack mFluid;
-	public byte mLastReceivedFrom = 0, oLastReceivedFrom = 0;
-
-	public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) {
+	public final float			mThickNess;
+	public final GT_Materials	mMaterial;
+	public final int			mCapacity, mHeatResistance;
+	public final boolean		mGasProof;
+	public FluidStack			mFluid;
+	public byte					mLastReceivedFrom	= 0, oLastReceivedFrom = 0;
+
+	public GregtechMetaPipeEntityFluid(final int aID, final String aName, final String aNameRegional,
+			final float aThickNess, final GT_Materials aMaterial, final int aCapacity, final int aHeatResistance,
+			final boolean aGasProof) {
 		super(aID, aName, aNameRegional, 0);
-		mThickNess = aThickNess;
-		mMaterial = aMaterial;
-		mCapacity = aCapacity;
-		mGasProof = aGasProof;
-		mHeatResistance = aHeatResistance;
+		this.mThickNess = aThickNess;
+		this.mMaterial = aMaterial;
+		this.mCapacity = aCapacity;
+		this.mGasProof = aGasProof;
+		this.mHeatResistance = aHeatResistance;
 	}
 
-	public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) {
+	public GregtechMetaPipeEntityFluid(final String aName, final float aThickNess, final GT_Materials aMaterial,
+			final int aCapacity, final int aHeatResistance, final boolean aGasProof) {
 		super(aName, 0);
-		mThickNess = aThickNess;
-		mMaterial = aMaterial;
-		mCapacity = aCapacity;
-		mGasProof = aGasProof;
-		mHeatResistance = aHeatResistance;
+		this.mThickNess = aThickNess;
+		this.mMaterial = aMaterial;
+		this.mCapacity = aCapacity;
+		this.mGasProof = aGasProof;
+		this.mHeatResistance = aHeatResistance;
 	}
 
 	@Override
-	public byte getTileEntityBaseType() {
-		return mMaterial == null ? 4 : (byte) ((mMaterial.contains(SubTag.WOOD) ? 12 : 4) + Math.max(0, Math.min(3, mMaterial.mToolQuality)));
+	public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+			final ItemStack aStack) {
+		return false;
+	}
+
+	@Override
+	public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+			final ItemStack aStack) {
+		return false;
 	}
 
 	@Override
-	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaPipeEntityFluid(mName, mThickNess, mMaterial, mCapacity, mHeatResistance, mGasProof);
+	public void doSound(final byte aIndex, final double aX, final double aY, final double aZ) {
+		super.doSound(aIndex, aX, aY, aZ);
+		if (aIndex == 9) {
+			GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(4), 5, 1.0F, aX, aY, aZ);
+			for (byte i = 0; i < 6; i++) {
+				for (int l = 0; l < 2; ++l) {
+					this.getBaseMetaTileEntity().getWorld().spawnParticle("largesmoke", aX - 0.5 + Math.random(),
+							aY - 0.5 + Math.random(), aZ - 0.5 + Math.random(),
+							ForgeDirection.getOrientation(i).offsetX / 5.0,
+							ForgeDirection.getOrientation(i).offsetY / 5.0,
+							ForgeDirection.getOrientation(i).offsetZ / 5.0);
+				}
+			}
+		}
 	}
 
 	@Override
-	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) {
+	public final FluidStack drain(final int maxDrain, final boolean doDrain) {
+		if (this.mFluid == null) {
+			return null;
+		}
+		if (this.mFluid.amount <= 0) {
+			this.mFluid = null;
+			return null;
+		}
+
+		int used = maxDrain;
+		if (this.mFluid.amount < used) {
+			used = this.mFluid.amount;
+		}
+
+		if (doDrain) {
+			this.mFluid.amount -= used;
+		}
 
-		short[] colours = Dyes.getModulation(aColorIndex, mMaterial.mRGBa);
+		final FluidStack drained = this.mFluid.copy();
+		drained.amount = used;
+
+		if (this.mFluid.amount <= 0) {
+			this.mFluid = null;
+		}
+
+		return drained;
+	}
+
+	@Override
+	public final int fill_default(final ForgeDirection aSide, final FluidStack aFluid, final boolean doFill) {
+		if (aFluid == null || aFluid.getFluid().getID() <= 0) {
+			return 0;
+		}
+
+		if (this.mFluid == null || this.mFluid.getFluid().getID() <= 0) {
+			if (aFluid.amount <= this.getCapacity()) {
+				if (doFill) {
+					this.mFluid = aFluid.copy();
+					this.mLastReceivedFrom |= 1 << aSide.ordinal();
+				}
+				return aFluid.amount;
+			}
+			if (doFill) {
+				this.mFluid = aFluid.copy();
+				this.mLastReceivedFrom |= 1 << aSide.ordinal();
+				this.mFluid.amount = this.getCapacity();
+			}
+			return this.getCapacity();
+		}
+
+		if (!this.mFluid.isFluidEqual(aFluid)) {
+			return 0;
+		}
+
+		final int space = this.getCapacity() - this.mFluid.amount;
+		if (aFluid.amount <= space) {
+			if (doFill) {
+				this.mFluid.amount += aFluid.amount;
+				this.mLastReceivedFrom |= 1 << aSide.ordinal();
+			}
+			return aFluid.amount;
+		}
+		if (doFill) {
+			this.mFluid.amount = this.getCapacity();
+			this.mLastReceivedFrom |= 1 << aSide.ordinal();
+		}
+		return space;
+	}
+
+	@Override
+	public final int getCapacity() {
+		return this.mCapacity * 20;
+	}
+
+	@Override
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(final World aWorld, final int aX, final int aY, final int aZ) {
+		return AxisAlignedBB.getBoundingBox(aX + 0.125D, aY + 0.125D, aZ + 0.125D, aX + 0.875D, aY + 0.875D,
+				aZ + 0.875D);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[] {
+				EnumChatFormatting.BLUE + "Fluid Capacity: " + this.mCapacity * 20 + "L/sec" + EnumChatFormatting.GRAY,
+				EnumChatFormatting.RED + "Heat Limit: " + this.mHeatResistance + " K" + EnumChatFormatting.GRAY,
+				EnumChatFormatting.DARK_GREEN + "Gas Proof: " + this.mGasProof + EnumChatFormatting.GRAY,
+				CORE.GT_Tooltip
+		};
+	}
+
+	@Override
+	public final FluidStack getFluid() {
+		return this.mFluid;
+	}
+
+	@Override
+	public final int getFluidAmount() {
+		return this.mFluid != null ? this.mFluid.amount : 0;
+	}
+
+	@Override
+	public int getProgresstime() {
+		return this.getFluidAmount();
+	}
+
+	@Override
+	public int getTankPressure() {
+		return (this.mFluid == null ? 0 : this.mFluid.amount) - this.getCapacity() / 2;
+	}
+
+	@Override
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide,
+			final byte aConnections, final byte aColorIndex, final boolean aConnected, final boolean aRedstone) {
+
+		final short[] colours = Dyes.getModulation(aColorIndex, this.mMaterial.mRGBa);
 		if (aConnected) {
-			float tThickNess = getThickNess();
-			if (tThickNess < 0.37F){
-				return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[OrePrefixes.pipeTiny.mTextureIndex], colours)};
+			final float tThickNess = this.getThickNess();
+			if (tThickNess < 0.37F) {
+				return new ITexture[] {
+						new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[OrePrefixes.pipeTiny.mTextureIndex],
+								colours)
+				};
+			}
+			if (tThickNess < 0.49F) {
+				return new ITexture[] {
+						new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[OrePrefixes.pipeSmall.mTextureIndex],
+								colours)
+				};
 			}
-			if (tThickNess < 0.49F){
-				return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[OrePrefixes.pipeSmall.mTextureIndex], colours)};
+			if (tThickNess < 0.74F) {
+				return new ITexture[] {
+						new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[OrePrefixes.pipeMedium.mTextureIndex],
+								colours)
+				};
 			}
-			if (tThickNess < 0.74F){
-				return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[OrePrefixes.pipeMedium.mTextureIndex], colours)};
+			if (tThickNess < 0.99F) {
+				return new ITexture[] {
+						new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[OrePrefixes.pipeLarge.mTextureIndex],
+								colours)
+				};
 			}
-			if (tThickNess < 0.99F){
-				return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[OrePrefixes.pipeLarge.mTextureIndex], colours)};
-			}	
-			return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[OrePrefixes.pipeHuge.mTextureIndex], colours)};
+			return new ITexture[] {
+					new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[OrePrefixes.pipeHuge.mTextureIndex],
+							colours)
+			};
 		}
-		return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex], colours)};
+		return new ITexture[] {
+				new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex], colours)
+		};
 	}
 
 	@Override
-	public boolean isSimpleMachine() {
-		return true;
+	public float getThickNess() {
+		return this.mThickNess;
 	}
 
 	@Override
-	public boolean isFacingValid(byte aFacing) {
-		return false;
+	public byte getTileEntityBaseType() {
+		return this.mMaterial == null ? 4
+				: (byte) ((this.mMaterial.contains(SubTag.WOOD) ? 12 : 4)
+						+ Math.max(0, Math.min(3, this.mMaterial.mToolQuality)));
 	}
 
 	@Override
-	public boolean isValidSlot(int aIndex) {
+	public boolean isFacingValid(final byte aFacing) {
 		return false;
 	}
 
 	@Override
-	public final boolean renderInside(byte aSide) {
-		return false;
+	public boolean isSimpleMachine() {
+		return true;
 	}
 
 	@Override
-	public int getProgresstime() {
-		return getFluidAmount();
+	public boolean isValidSlot(final int aIndex) {
+		return false;
 	}
 
 	@Override
-	public int maxProgresstime() {
-		return getCapacity();
+	public void loadNBTData(final NBTTagCompound aNBT) {
+		this.mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+		this.mLastReceivedFrom = aNBT.getByte("mLastReceivedFrom");
 	}
 
 	@Override
-	public void saveNBTData(NBTTagCompound aNBT) {
-		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
-		aNBT.setByte("mLastReceivedFrom", mLastReceivedFrom);
+	public int maxProgresstime() {
+		return this.getCapacity();
 	}
 
 	@Override
-	public void loadNBTData(NBTTagCompound aNBT) {
-		mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
-		mLastReceivedFrom = aNBT.getByte("mLastReceivedFrom");
+	public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaPipeEntityFluid(this.mName, this.mThickNess, this.mMaterial, this.mCapacity,
+				this.mHeatResistance, this.mGasProof);
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity aEntity) {
-		if (mFluid != null && (((BaseMetaPipeEntity) getBaseMetaTileEntity()).mConnections & -128) == 0 && aEntity instanceof EntityLivingBase) {
-			int tTemperature = mFluid.getFluid().getTemperature(mFluid);
+	public void onEntityCollidedWithBlock(final World aWorld, final int aX, final int aY, final int aZ,
+			final Entity aEntity) {
+		if (this.mFluid != null && (((BaseMetaPipeEntity) this.getBaseMetaTileEntity()).mConnections & -128) == 0
+				&& aEntity instanceof EntityLivingBase) {
+			final int tTemperature = this.mFluid.getFluid().getTemperature(this.mFluid);
 			if (tTemperature > 320) {
 				GT_Utility.applyHeatDamage((EntityLivingBase) aEntity, (tTemperature - 300) / 50.0F);
-			} else if (tTemperature < 260) {
+			}
+			else if (tTemperature < 260) {
 				GT_Utility.applyFrostDamage((EntityLivingBase) aEntity, (270 - tTemperature) / 25.0F);
 			}
 		}
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-		return AxisAlignedBB.getBoundingBox(aX + 0.125D, aY + 0.125D, aZ + 0.125D, aX + 0.875D, aY + 0.875D, aZ + 0.875D);
-	}
-
-	@Override
-	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
 		if (aBaseMetaTileEntity.isServerSide() && aTick % 5 == 0) {
-			mLastReceivedFrom &= 63;
-			if (mLastReceivedFrom == 63) {
-				mLastReceivedFrom = 0;
+			this.mLastReceivedFrom &= 63;
+			if (this.mLastReceivedFrom == 63) {
+				this.mLastReceivedFrom = 0;
 			}
 
-			if (mFluid != null && mFluid.amount > 0) {
-				int tTemperature = mFluid.getFluid().getTemperature(mFluid);
-				if (tTemperature > mHeatResistance) {
+			if (this.mFluid != null && this.mFluid.amount > 0) {
+				final int tTemperature = this.mFluid.getFluid().getTemperature(this.mFluid);
+				if (tTemperature > this.mHeatResistance) {
 					if (aBaseMetaTileEntity.getRandomNumber(100) == 0) {
 						aBaseMetaTileEntity.setToFire();
 						return;
 					}
 					aBaseMetaTileEntity.setOnFire();
 				}
-				if (!mGasProof && mFluid.getFluid().isGaseous(mFluid)) {
-					mFluid.amount -= 5;
-					sendSound((byte) 9);
+				if (!this.mGasProof && this.mFluid.getFluid().isGaseous(this.mFluid)) {
+					this.mFluid.amount -= 5;
+					this.sendSound((byte) 9);
 					if (tTemperature > 320) {
 						try {
-							for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getXCoord() - 2, getBaseMetaTileEntity().getYCoord() - 2, getBaseMetaTileEntity().getZCoord() - 2, getBaseMetaTileEntity().getXCoord() + 3, getBaseMetaTileEntity().getYCoord() + 3, getBaseMetaTileEntity().getZCoord() + 3))) {
+							for (final EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) this
+									.getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(EntityLivingBase.class,
+											AxisAlignedBB.getBoundingBox(this.getBaseMetaTileEntity().getXCoord() - 2,
+													this.getBaseMetaTileEntity().getYCoord() - 2,
+													this.getBaseMetaTileEntity().getZCoord() - 2,
+													this.getBaseMetaTileEntity().getXCoord() + 3,
+													this.getBaseMetaTileEntity().getYCoord() + 3,
+													this.getBaseMetaTileEntity().getZCoord() + 3))) {
 								GT_Utility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F);
 							}
-						} catch (Throwable e) {
-							if (D1) e.printStackTrace(GT_Log.err);
 						}
-					} else if (tTemperature < 260) {
+						catch (final Throwable e) {
+							if (GT_Values.D1) {
+								e.printStackTrace(GT_Log.err);
+							}
+						}
+					}
+					else if (tTemperature < 260) {
 						try {
-							for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getXCoord() - 2, getBaseMetaTileEntity().getYCoord() - 2, getBaseMetaTileEntity().getZCoord() - 2, getBaseMetaTileEntity().getXCoord() + 3, getBaseMetaTileEntity().getYCoord() + 3, getBaseMetaTileEntity().getZCoord() + 3))) {
+							for (final EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) this
+									.getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(EntityLivingBase.class,
+											AxisAlignedBB.getBoundingBox(this.getBaseMetaTileEntity().getXCoord() - 2,
+													this.getBaseMetaTileEntity().getYCoord() - 2,
+													this.getBaseMetaTileEntity().getZCoord() - 2,
+													this.getBaseMetaTileEntity().getXCoord() + 3,
+													this.getBaseMetaTileEntity().getYCoord() + 3,
+													this.getBaseMetaTileEntity().getZCoord() + 3))) {
 								GT_Utility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F);
 							}
-						} catch (Throwable e) {
-							if (D1) e.printStackTrace(GT_Log.err);
 						}
+						catch (final Throwable e) {
+							if (GT_Values.D1) {
+								e.printStackTrace(GT_Log.err);
+							}
+						}
+					}
+					if (this.mFluid.amount <= 0) {
+						this.mFluid = null;
 					}
-					if (mFluid.amount <= 0) mFluid = null;
 				}
 			}
 
-			if (mLastReceivedFrom == oLastReceivedFrom) {
-				HashMap<IFluidHandler, ForgeDirection> tTanks = new HashMap<IFluidHandler, ForgeDirection>();
+			if (this.mLastReceivedFrom == this.oLastReceivedFrom) {
+				final HashMap<IFluidHandler, ForgeDirection> tTanks = new HashMap<IFluidHandler, ForgeDirection>();
 
-				mConnections = 0;
+				this.mConnections = 0;
 
 				for (byte tSide = 0, i = 0, j = (byte) aBaseMetaTileEntity.getRandomNumber(6); i < 6; i++) {
 					tSide = (byte) ((j + i) % 6);
 
-					IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(tSide);
+					final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(tSide);
 					if (tTileEntity != null) {
 						if (tTileEntity instanceof IGregTechTileEntity) {
 							if (aBaseMetaTileEntity.getColorization() >= 0) {
-								byte tColor = ((IGregTechTileEntity) tTileEntity).getColorization();
+								final byte tColor = ((IGregTechTileEntity) tTileEntity).getColorization();
 								if (tColor >= 0 && (tColor & 15) != (aBaseMetaTileEntity.getColorization() & 15)) {
 									continue;
 								}
 							}
 						}
-						FluidTankInfo[] tInfo = tTileEntity.getTankInfo(ForgeDirection.getOrientation(tSide).getOpposite());
+						final FluidTankInfo[] tInfo = tTileEntity
+								.getTankInfo(ForgeDirection.getOrientation(tSide).getOpposite());
 						if (tInfo != null && tInfo.length > 0) {
-							if (tTileEntity instanceof ICoverable && ((ICoverable) tTileEntity).getCoverBehaviorAtSide(GT_Utility.getOppositeSide(tSide)).alwaysLookConnected(GT_Utility.getOppositeSide(tSide), ((ICoverable) tTileEntity).getCoverIDAtSide(GT_Utility.getOppositeSide(tSide)), ((ICoverable) tTileEntity).getCoverDataAtSide(GT_Utility.getOppositeSide(tSide)), ((ICoverable) tTileEntity))) {
-								mConnections |= (1 << tSide);
+							if (tTileEntity instanceof ICoverable && ((ICoverable) tTileEntity)
+									.getCoverBehaviorAtSide(GT_Utility.getOppositeSide(tSide))
+									.alwaysLookConnected(GT_Utility.getOppositeSide(tSide),
+											((ICoverable) tTileEntity)
+													.getCoverIDAtSide(GT_Utility.getOppositeSide(tSide)),
+											((ICoverable) tTileEntity).getCoverDataAtSide(
+													GT_Utility.getOppositeSide(tSide)),
+											(ICoverable) tTileEntity)) {
+								this.mConnections |= 1 << tSide;
 							}
-							if (aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).letsFluidIn(tSide, aBaseMetaTileEntity.getCoverIDAtSide(tSide), aBaseMetaTileEntity.getCoverDataAtSide(tSide), null, aBaseMetaTileEntity)) {
-								mConnections |= (1 << tSide);
+							if (aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).letsFluidIn(tSide,
+									aBaseMetaTileEntity.getCoverIDAtSide(tSide),
+									aBaseMetaTileEntity.getCoverDataAtSide(tSide), null, aBaseMetaTileEntity)) {
+								this.mConnections |= 1 << tSide;
 							}
-							if (aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).letsFluidOut(tSide, aBaseMetaTileEntity.getCoverIDAtSide(tSide), aBaseMetaTileEntity.getCoverDataAtSide(tSide), null, aBaseMetaTileEntity)) {
-								mConnections |= (1 << tSide);
-								if (((1 << tSide) & mLastReceivedFrom) == 0)
+							if (aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).letsFluidOut(tSide,
+									aBaseMetaTileEntity.getCoverIDAtSide(tSide),
+									aBaseMetaTileEntity.getCoverDataAtSide(tSide), null, aBaseMetaTileEntity)) {
+								this.mConnections |= 1 << tSide;
+								if ((1 << tSide & this.mLastReceivedFrom) == 0) {
 									tTanks.put(tTileEntity, ForgeDirection.getOrientation(tSide).getOpposite());
+								}
 							}
-							if (aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).alwaysLookConnected(tSide, aBaseMetaTileEntity.getCoverIDAtSide(tSide), aBaseMetaTileEntity.getCoverDataAtSide(tSide), aBaseMetaTileEntity)) {
-								mConnections |= (1 << tSide);
+							if (aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).alwaysLookConnected(tSide,
+									aBaseMetaTileEntity.getCoverIDAtSide(tSide),
+									aBaseMetaTileEntity.getCoverDataAtSide(tSide), aBaseMetaTileEntity)) {
+								this.mConnections |= 1 << tSide;
 							}
 						}
 					}
 				}
 
-				if (mFluid != null && mFluid.amount > 0) {
-					int tAmount = Math.max(1, Math.min(mCapacity * 10, mFluid.amount / 2)), tSuccessfulTankAmount = 0;
+				if (this.mFluid != null && this.mFluid.amount > 0) {
+					int tAmount = Math.max(1, Math.min(this.mCapacity * 10, this.mFluid.amount / 2)),
+							tSuccessfulTankAmount = 0;
 
-					for (Entry<IFluidHandler, ForgeDirection> tEntry : tTanks.entrySet())
-						if (tEntry.getKey().fill(tEntry.getValue(), drain(tAmount, false), false) > 0)
+					for (final Entry<IFluidHandler, ForgeDirection> tEntry : tTanks.entrySet()) {
+						if (tEntry.getKey().fill(tEntry.getValue(), this.drain(tAmount, false), false) > 0) {
 							tSuccessfulTankAmount++;
+						}
+					}
 
 					if (tSuccessfulTankAmount > 0) {
 						if (tAmount >= tSuccessfulTankAmount) {
 							tAmount /= tSuccessfulTankAmount;
-							for (Entry<IFluidHandler, ForgeDirection> tTileEntity : tTanks.entrySet()) {
-								if (mFluid == null || mFluid.amount <= 0) break;
-								int tFilledAmount = tTileEntity.getKey().fill(tTileEntity.getValue(), drain(tAmount, false), false);
-								if (tFilledAmount > 0)
-									tTileEntity.getKey().fill(tTileEntity.getValue(), drain(tFilledAmount, true), true);
+							for (final Entry<IFluidHandler, ForgeDirection> tTileEntity : tTanks.entrySet()) {
+								if (this.mFluid == null || this.mFluid.amount <= 0) {
+									break;
+								}
+								final int tFilledAmount = tTileEntity.getKey().fill(tTileEntity.getValue(),
+										this.drain(tAmount, false), false);
+								if (tFilledAmount > 0) {
+									tTileEntity.getKey().fill(tTileEntity.getValue(), this.drain(tFilledAmount, true),
+											true);
+								}
 							}
-						} else {
-							for (Entry<IFluidHandler, ForgeDirection> tTileEntity : tTanks.entrySet()) {
-								if (mFluid == null || mFluid.amount <= 0) break;
-								int tFilledAmount = tTileEntity.getKey().fill(tTileEntity.getValue(), drain(mFluid.amount, false), false);
-								if (tFilledAmount > 0)
-									tTileEntity.getKey().fill(tTileEntity.getValue(), drain(tFilledAmount, true), true);
+						}
+						else {
+							for (final Entry<IFluidHandler, ForgeDirection> tTileEntity : tTanks.entrySet()) {
+								if (this.mFluid == null || this.mFluid.amount <= 0) {
+									break;
+								}
+								final int tFilledAmount = tTileEntity.getKey().fill(tTileEntity.getValue(),
+										this.drain(this.mFluid.amount, false), false);
+								if (tFilledAmount > 0) {
+									tTileEntity.getKey().fill(tTileEntity.getValue(), this.drain(tFilledAmount, true),
+											true);
+								}
 							}
 						}
 					}
 				}
 
-				mLastReceivedFrom = 0;
+				this.mLastReceivedFrom = 0;
 			}
 
-			oLastReceivedFrom = mLastReceivedFrom;
+			this.oLastReceivedFrom = this.mLastReceivedFrom;
 		}
 	}
 
 	@Override
-	public void doSound(byte aIndex, double aX, double aY, double aZ) {
-		super.doSound(aIndex, aX, aY, aZ);
-		if (aIndex == 9) {
-			GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(4), 5, 1.0F, aX, aY, aZ);
-			for (byte i = 0; i < 6; i++)
-				for (int l = 0; l < 2; ++l)
-					getBaseMetaTileEntity().getWorld().spawnParticle("largesmoke", aX - 0.5 + Math.random(), aY - 0.5 + Math.random(), aZ - 0.5 + Math.random(), ForgeDirection.getOrientation(i).offsetX / 5.0, ForgeDirection.getOrientation(i).offsetY / 5.0, ForgeDirection.getOrientation(i).offsetZ / 5.0);
-		}
-	}
-
-	@Override
-	public final int getCapacity() {
-		return mCapacity * 20;
-	}
-
-	@Override
-	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+	public final boolean renderInside(final byte aSide) {
 		return false;
 	}
 
 	@Override
-	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-		return false;
-	}
-
-	@Override
-	public final FluidStack getFluid() {
-		return mFluid;
-	}
-
-	@Override
-	public final int getFluidAmount() {
-		return mFluid != null ? mFluid.amount : 0;
-	}
-
-	@Override
-	public final int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {
-		if (aFluid == null || aFluid.getFluid().getID() <= 0) return 0;
-
-		if (mFluid == null || mFluid.getFluid().getID() <= 0) {
-			if (aFluid.amount <= getCapacity()) {
-				if (doFill) {
-					mFluid = aFluid.copy();
-					mLastReceivedFrom |= (1 << aSide.ordinal());
-				}
-				return aFluid.amount;
-			}
-			if (doFill) {
-				mFluid = aFluid.copy();
-				mLastReceivedFrom |= (1 << aSide.ordinal());
-				mFluid.amount = getCapacity();
-			}
-			return getCapacity();
-		}
-
-		if (!mFluid.isFluidEqual(aFluid)) return 0;
-
-		int space = getCapacity() - mFluid.amount;
-		if (aFluid.amount <= space) {
-			if (doFill) {
-				mFluid.amount += aFluid.amount;
-				mLastReceivedFrom |= (1 << aSide.ordinal());
-			}
-			return aFluid.amount;
-		}
-		if (doFill) {
-			mFluid.amount = getCapacity();
-			mLastReceivedFrom |= (1 << aSide.ordinal());
-		}
-		return space;
-	}
-
-	@Override
-	public final FluidStack drain(int maxDrain, boolean doDrain) {
-		if (mFluid == null) return null;
-		if (mFluid.amount <= 0) {
-			mFluid = null;
-			return null;
-		}
-
-		int used = maxDrain;
-		if (mFluid.amount < used)
-			used = mFluid.amount;
-
-		if (doDrain) {
-			mFluid.amount -= used;
-		}
-
-		FluidStack drained = mFluid.copy();
-		drained.amount = used;
-
-		if (mFluid.amount <= 0) {
-			mFluid = null;
+	public void saveNBTData(final NBTTagCompound aNBT) {
+		if (this.mFluid != null) {
+			aNBT.setTag("mFluid", this.mFluid.writeToNBT(new NBTTagCompound()));
 		}
-
-		return drained;
-	}
-
-	@Override
-	public int getTankPressure() {
-		return (mFluid == null ? 0 : mFluid.amount) - (getCapacity() / 2);
-	}
-
-	@Override
-	public String[] getDescription() {
-		return new String[]{
-				EnumChatFormatting.BLUE + "Fluid Capacity: " + (mCapacity * 20) + "L/sec" + EnumChatFormatting.GRAY,
-				EnumChatFormatting.RED + "Heat Limit: " + mHeatResistance + " K" + EnumChatFormatting.GRAY,
-				EnumChatFormatting.DARK_GREEN + "Gas Proof: " + (mGasProof) + EnumChatFormatting.GRAY,
-				CORE.GT_Tooltip
-		};
-	}
-
-	@Override
-	public float getThickNess() {
-		return mThickNess;
+		aNBT.setByte("mLastReceivedFrom", this.mLastReceivedFrom);
 	}
 }
\ No newline at end of file