$ Fixed the XP Convertor.

% Rewrote base tile entity system.
% Added hashCode() to Pair.java.
% Changed some calculations on Materials.
% Made Rocket Engines produce heavy pollution.

3 files changed, 360 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/Pair.java b/src/Java/gtPlusPlus/api/objects/data/Pair.java
index 6ab781cf1e..e1d23e6b43 100644
--- a/src/Java/gtPlusPlus/api/objects/data/Pair.java
+++ b/src/Java/gtPlusPlus/api/objects/data/Pair.java
@@ -2,6 +2,8 @@ package gtPlusPlus.api.objects.data;
 
 import java.io.Serializable;
 
+import com.google.common.base.Objects;
+
 public class Pair<K,V> implements Serializable {
 
 	/**
@@ -24,4 +26,10 @@ public class Pair<K,V> implements Serializable {
 		return this.value;
 	}
 
+	@Override
+	public int hashCode() {
+		Integer aCode = Objects.hashCode(getKey(), getValue());		
+		return aCode != null ? aCode : super.hashCode();
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
new file mode 100644
index 0000000000..0b8f97b378
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
@@ -0,0 +1,188 @@
+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);
+	}
+
+
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java
new file mode 100644
index 0000000000..25968f1908
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java
@@ -0,0 +1,164 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.ArrayList;
+
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.tileentities.base.TileEntityBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+
+public class BTF_Inventory implements ISidedInventory{
+
+	public final ItemStack[] mInventory;
+	public final TileEntityBase mTile;
+	
+	public BTF_Inventory(int aSlots, TileEntityBase tile) {
+		this.mInventory = new ItemStack[aSlots];
+		this.mTile = tile;
+	}
+
+	public ItemStack[] getRealInventory() {
+		return this.mInventory;
+	}
+	
+	public int getSizeInventory() {
+		return this.mInventory.length;
+	}
+
+	public ItemStack getStackInSlot(int aIndex) {
+		return aIndex >= 0 && aIndex < this.mInventory.length ? this.mInventory[aIndex] : null;
+	}
+
+	public void setInventorySlotContents(int aIndex, ItemStack aStack) {
+		if (aIndex >= 0 && aIndex < this.mInventory.length) {
+			this.mInventory[aIndex] = aStack;
+		}
+	}	
+
+	public boolean isAccessAllowed(EntityPlayer aPlayer) {
+		return true;
+	}
+
+	public boolean isValidSlot(int aIndex) {
+		return true;
+	}
+	
+	public int getInventoryStackLimit() {
+		return 64;
+	}
+	
+ 
+    public boolean setStackToZeroInsteadOfNull(int aIndex) {
+        return false;
+}
+
+	public boolean isItemValidForSlot(int aIndex, ItemStack aStack) {
+		return isValidSlot(aIndex);
+	}
+
+	public ItemStack decrStackSize(int aIndex, int aAmount) {
+		ItemStack tStack = this.getStackInSlot(aIndex);
+		ItemStack rStack = GT_Utility.copy(new Object[]{tStack});
+		if (tStack != null) {
+			if (tStack.stackSize <= aAmount) {
+				if (this.setStackToZeroInsteadOfNull(aIndex)) {
+					tStack.stackSize = 0;
+				} else {
+					this.setInventorySlotContents(aIndex, (ItemStack) null);
+				}
+			} else {
+				rStack = tStack.splitStack(aAmount);
+				if (tStack.stackSize == 0 && !this.setStackToZeroInsteadOfNull(aIndex)) {
+					this.setInventorySlotContents(aIndex, (ItemStack) null);
+				}
+			}
+		}
+
+		return rStack;
+	}
+
+	public int[] getAccessibleSlotsFromSide(int aSide) {
+		ArrayList<Integer> tList = new ArrayList<Integer>();
+		TileEntityBase tTileEntity = this.mTile;
+		boolean tSkip = tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn((byte) aSide,
+				tTileEntity.getCoverIDAtSide((byte) aSide), tTileEntity.getCoverDataAtSide((byte) aSide), -2,
+				tTileEntity)
+				|| tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut((byte) aSide,
+						tTileEntity.getCoverIDAtSide((byte) aSide), tTileEntity.getCoverDataAtSide((byte) aSide), -2,
+						tTileEntity);
+
+		for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) {
+			if (this.isValidSlot(rArray) && (tSkip
+					|| tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut((byte) aSide,
+							tTileEntity.getCoverIDAtSide((byte) aSide), tTileEntity.getCoverDataAtSide((byte) aSide),
+							rArray, tTileEntity)
+					|| tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn((byte) aSide,
+							tTileEntity.getCoverIDAtSide((byte) aSide), tTileEntity.getCoverDataAtSide((byte) aSide),
+							rArray, tTileEntity))) {
+				tList.add(Integer.valueOf(rArray));
+			}
+		}
+
+		int[] arg6 = new int[tList.size()];
+
+		for (int i = 0; i < arg6.length; ++i) {
+			arg6[i] = ((Integer) tList.get(i)).intValue();
+		}
+
+		return arg6;
+	}
+
+	public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) {
+		return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length
+				&& (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex]))
+				&& this.allowPutStack(this.mTile, aIndex, (byte) aSide, aStack);
+	}
+
+	public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) {
+		return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length
+				&& this.allowPullStack(this.mTile, aIndex, (byte) aSide, aStack);
+	}
+	
+	public boolean allowPullStack(TileEntityBase mTile2, int aIndex, byte aSide, ItemStack aStack) {
+		return aIndex >= 0 && aIndex < this.getSizeInventory();
+	}
+
+	public boolean allowPutStack(TileEntityBase aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return (aIndex >= 0 && aIndex < this.getSizeInventory()) && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack));
+	}
+	
+	public ItemStack getStackInSlotOnClosing(int i) {
+		return null;
+	}
+
+	public final boolean hasCustomInventoryName() {
+		return mTile != null ? mTile.hasCustomInventoryName() : false;
+	}
+
+
+	public void markDirty() {
+		if (mTile != null) {
+			mTile.markDirty();
+		}
+	}
+
+	public boolean isUseableByPlayer(EntityPlayer entityplayer) {
+		return true;
+	}
+
+	public void openInventory() {
+		
+	}
+
+	public void closeInventory() {
+		
+	}
+	
+	@Override
+	public final String getInventoryName() {
+		return  this.mTile != null ? mTile.getInventoryName() : "";
+	}
+
+
+}