1 files changed, 0 insertions, 188 deletions
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
deleted file mode 100644
index 0b8f97b378..0000000000
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package gtPlusPlus.api.objects.minecraft;
-
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTank;
-import net.minecraftforge.fluids.FluidTankInfo;
-
-public class BTF_FluidTank extends FluidTank {
-
-	public FluidStack mFluid;
-
-	public BTF_FluidTank(int capacity) {
-		super(capacity);
-	}
-	
-	/**
-	 * Let's replace the Default handling with GT's own handling code, because it's probably better, right?
-	 * @author Alkalus/GregoriusT
-	 */
-
-
-	public FluidStack getFluid() {
-		return this.getDrainableStack();
-	}
-
-	public int getFluidAmount() {
-		return this.getDrainableStack() != null ? this.getDrainableStack().amount : 0;
-	}
-
-	public NBTTagCompound writeToNBT(NBTTagCompound aNBT) {
-		super.writeToNBT(aNBT);
-		if (this.mFluid != null) {
-			aNBT.setTag("mFluid", this.mFluid.writeToNBT(new NBTTagCompound()));
-		}
-		return aNBT;
-	}
-
-	public FluidTank readFromNBT(NBTTagCompound aNBT) {
-		this.mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
-		return this;
-	}	
-
-/*	public abstract boolean isLiquidInput(byte arg0);
-
-	public abstract boolean isLiquidOutput(byte arg0);
-
-	public abstract boolean doesFillContainers();
-
-	public abstract boolean doesEmptyContainers();*/
-
-	public boolean canTankBeFilled() {
-		return true;
-	}
-
-	public boolean canTankBeEmptied() {
-		return true;
-	}
-
-
-	public boolean isFluidInputAllowed(FluidStack aFluid) {
-		return true;
-	}
-
-	public FluidStack getFillableStack() {
-		return this.mFluid;
-	}
-
-	public FluidStack setFillableStack(FluidStack aFluid) {
-		this.mFluid = aFluid;
-		return this.mFluid;
-	}
-
-	public FluidStack getDrainableStack() {
-		return this.mFluid;
-	}
-
-	public FluidStack setDrainableStack(FluidStack aFluid) {
-		this.mFluid = aFluid;
-		return this.mFluid;
-	}
-
-	public FluidStack getDisplayedFluid() {
-		return this.getDrainableStack();
-	}
-
-	public boolean isFluidChangingAllowed() {
-		return true;
-	}
-
-	public int fill(FluidStack aFluid, boolean doFill) {
-		if (aFluid != null && aFluid.getFluid().getID() > 0 && aFluid.amount > 0 && this.canTankBeFilled()
-				&& this.isFluidInputAllowed(aFluid)) {
-			if (this.getFillableStack() != null && this.getFillableStack().getFluid().getID() > 0) {
-				if (!this.getFillableStack().isFluidEqual(aFluid)) {
-					return 0;
-				} else {
-					int space = this.getCapacity() - this.getFillableStack().amount;
-					if (aFluid.amount <= space) {
-						if (doFill) {
-							FluidStack arg9999 = this.getFillableStack();
-							arg9999.amount += aFluid.amount;
-						}
-
-						return aFluid.amount;
-					} else {
-						if (doFill) {
-							this.getFillableStack().amount = this.getCapacity();
-						}
-
-						return space;
-					}
-				}
-			} else if (aFluid.amount <= this.getCapacity()) {
-				if (doFill) {
-					this.setFillableStack(aFluid.copy());
-				}
-
-				return aFluid.amount;
-			} else {
-				if (doFill) {
-					this.setFillableStack(aFluid.copy());
-					this.getFillableStack().amount = this.getCapacity();
-				}
-
-				return this.getCapacity();
-			}
-		} else {
-			return 0;
-		}
-	}
-
-	public FluidStack drain(int maxDrain, boolean doDrain) {
-		if (this.getDrainableStack() != null && this.canTankBeEmptied()) {
-			if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) {
-				this.setDrainableStack((FluidStack) null);
-				return null;
-			} else {
-				int used = maxDrain;
-				if (this.getDrainableStack().amount < maxDrain) {
-					used = this.getDrainableStack().amount;
-				}
-
-				if (doDrain) {
-					FluidStack arg9999 = this.getDrainableStack();
-					arg9999.amount -= used;
-				}
-
-				FluidStack drained = this.getDrainableStack().copy();
-				drained.amount = used;
-				if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) {
-					this.setDrainableStack((FluidStack) null);
-				}
-
-				return drained;
-			}
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public int getCapacity() {
-		return super.getCapacity();
-	}
-
-	@Override
-	public FluidTankInfo getInfo() {
-		return new FluidTankInfo(this);
-	}
-
-	@Override
-	public void setFluid(FluidStack fluid) {
-		setFillableStack(fluid);
-	}
-
-	@Override
-	public void setCapacity(int capacity) {
-		super.setCapacity(capacity);
-	}
-
-	public FluidStack drain(FluidStack aFluid, boolean doDrain) {
-		return drain(aFluid.amount, doDrain);
-	}
-
-
-
-}