More updates.

Many bugfixes + 5 Tier Pump + API.jar

2 files changed, 10 insertions, 9 deletions

diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
index 708fe4b195..3249ea4531 100644
--- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
@@ -117,9 +117,9 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
 	      }
 	      if (this.mItemStack == null&&this.mInventory[0]!=null)
 	      {
-	        this.mItemStack = new ItemStack(mInventory[0].getItem());
+	        this.mItemStack = mInventory[0].copy();
 	      }
-	      if ((this.mInventory[0]!=null)&&(this.mItemCount < getMaxItemCount()) && (this.mInventory[0].getItem() == this.mItemStack.getItem()))
+	      if ((this.mInventory[0]!=null)&&(this.mItemCount < getMaxItemCount()) && GT_Utility.areStacksEqual(this.mInventory[0],this.mItemStack))
 	      {
 	        this.mItemCount += this.mInventory[0].stackSize;
 	        if (this.mItemCount > getMaxItemCount())
@@ -134,17 +134,18 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
 	      }
 	      if (this.mInventory[1] == null)
 	      {
-	        this.mInventory[1] = new ItemStack(mItemStack.getItem(),Math.min(mItemStack.getMaxStackSize(), this.mItemCount));
+	        this.mInventory[1] = mItemStack.copy();
+	        this.mInventory[1].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount);
 	        this.mItemCount -= this.mInventory[1].stackSize;
 	      }
-	      else if ((this.mItemCount > 0) && (this.mInventory[1].getItem() == this.mItemStack.getItem())&&this.mInventory[1].getMaxStackSize()>this.mInventory[1].stackSize)
+	      else if ((this.mItemCount > 0) && GT_Utility.areStacksEqual(this.mInventory[1],this.mItemStack)&&this.mInventory[1].getMaxStackSize()>this.mInventory[1].stackSize)
 	      {
 	    	  int tmp = Math.min(this.mItemCount, this.mInventory[1].getMaxStackSize()-this.mInventory[1].stackSize);
 	    	  this.mInventory[1].stackSize += tmp;
 	    	  this.mItemCount -= tmp;
 	      }
 	      if(this.mItemStack!=null){
-	    	  this.mInventory[2]= new ItemStack(this.mItemStack.getItem());
+	    	  this.mInventory[2]= this.mItemStack.copy();
 	      }else{this.mInventory[2]=null;}
 	    }
 	}
diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
index 56b06addec..1fb314d5c9 100644
--- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
+++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
@@ -14,7 +14,7 @@ public class GT_MetaTileEntity_QuantumTank
   extends GT_MetaTileEntity_BasicTank
 {
 	public GT_MetaTileEntity_QuantumTank(int aID, String aName, String aNameRegional, int aTier) {
-		super(aID, aName, aNameRegional, aTier, 3, "Stores "+((int)(Math.pow(6, aTier)*270000))+"L of fluid");
+		super(aID, aName, aNameRegional, aTier, 3, "Stores "+((int)(Math.pow(6, aTier)*267000))+"L of fluid");
 	}
 	
 	public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
@@ -28,7 +28,7 @@ public class GT_MetaTileEntity_QuantumTank
 
 	@Override
 	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-		return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};//aSide != aFacing ? mMachineBlock != 0 ? new ITexture[] {Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]} : new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]} : mMachineBlock != 0 ? aActive ? getTexturesActive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : getTexturesInactive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : aActive ? getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]) : getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]);
+		return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};
 	}
 	
 	@Override
@@ -79,7 +79,7 @@ public class GT_MetaTileEntity_QuantumTank
 	
 	@Override
 	public boolean displaysItemStack() {
-		return false;
+		return true;
 	}
 	
 	@Override
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_QuantumTank
   
 	@Override
 	public int getCapacity() {
-		return (int) (Math.pow(6, mTier)*270000);
+		return (int) (Math.pow(6, mTier)*267000);
 	}
 	
 	@Override