+ Added a dual fluid tank base tile entity.

% Changed the Rocket Engines to now require two separate fuels at once. (The secondary fuel will deplete quite slowly, consider using the better fuel here)
% Changed interface handling for the Tesseract Terminal.

5 files changed, 846 insertions, 250 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
new file mode 100644
index 0000000000..12094ad620
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_Container_BasicTank;
+import gregtech.api.gui.GT_Slot_Output;
+import gregtech.api.gui.GT_Slot_Render;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
+
+import java.util.Iterator;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Tanks
+ */
+public class CONTAINER_DeluxeTank extends GT_Container_BasicTank {
+
+    public int mContent = 0;
+
+    public CONTAINER_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 80, 17));
+        addSlotToContainer(new GT_Slot_Output(mTileEntity, 1, 80, 53));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 41, 42));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 3, 59, 42));
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+        if (((GT_MetaTileEntity_DeluxeTank) mTileEntity.getMetaTileEntity()).mFluid != null)
+            mContent = ((GT_MetaTileEntity_DeluxeTank) mTileEntity.getMetaTileEntity()).mFluid.amount;
+        else
+            mContent = 0;
+        Iterator var2 = this.crafters.iterator();
+        while (var2.hasNext()) {
+            ICrafting var1 = (ICrafting) var2.next();
+            var1.sendProgressBarUpdate(this, 100, mContent & 65535);
+            var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void updateProgressBar(int par1, int par2) {
+        super.updateProgressBar(par1, par2);
+        switch (par1) {
+            case 100:
+                mContent = mContent & -65536 | par2;
+                break;
+            case 101:
+                mContent = mContent & 65535 | par2 << 16;
+                break;
+        }
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 2;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 1;
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
new file mode 100644
index 0000000000..758aa55294
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
@@ -0,0 +1,35 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
+public class GUI_DeluxeTank extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(new CONTAINER_DeluxeTank(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
+        fontRendererObj.drawString(mName, 8, 6, 4210752);
+        if (mContainer != null) {
+            fontRendererObj.drawString("Fuel  | A | B |", 10, 20, 16448255);
+            //fontRendererObj.drawString(GT_Utility.parseNumberToString(((CONTAINER_DeluxeTank) mContainer).mContent), 10, 30, 16448255);
+        }
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
new file mode 100644
index 0000000000..2effc58f9a
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
@@ -0,0 +1,327 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_DeluxeTank;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_DeluxeTank;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually
+ */
+public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_BasicTank {
+
+	public FluidStack mFluid;
+	public FluidStack mFluid2;
+
+	/**
+	 * @param aInvSlotCount should be 3
+	 */
+	public GT_MetaTileEntity_DeluxeTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
+		super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
+	}
+
+	public GT_MetaTileEntity_DeluxeTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, aInvSlotCount, aDescription, aTextures);
+	}
+
+	@Override
+	public boolean isSimpleMachine() {
+		return false;
+	}
+
+	@Override
+	public boolean isValidSlot(int aIndex) {
+		return aIndex != getStackDisplaySlot();
+	}
+
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+		if (mFluid2 != null) aNBT.setTag("mFluid2", mFluid2.writeToNBT(new NBTTagCompound()));
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+		mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+		mFluid2 = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid2"));
+	}
+
+	@Override
+	public abstract boolean doesFillContainers();
+
+	@Override
+	public abstract boolean doesEmptyContainers();
+
+	@Override
+	public abstract boolean canTankBeFilled();
+
+	@Override
+	public abstract boolean canTankBeEmptied();
+
+	@Override
+	public abstract boolean displaysItemStack();
+
+	@Override
+	public abstract boolean displaysStackSize();
+
+	@Override
+	public int getInputSlot() {
+		return 0;
+	}
+
+	@Override
+	public int getOutputSlot() {
+		return 1;
+	}
+
+	@Override
+	public int getStackDisplaySlot() {
+		return 2;
+	}
+
+	public int getStackDisplaySlot2() {
+		return 3;
+	}
+
+	@Override
+	public boolean isFluidInputAllowed(FluidStack aFluid) {
+		return true;
+	}
+
+	@Override
+	public boolean isFluidChangingAllowed() {
+		return true;
+	}
+
+	@Override
+	public FluidStack getFillableStack() {
+		return getFillableStackEx(1);
+	}
+
+	public FluidStack getFillableStackEx(int stackID) {
+		if (stackID <= 1){
+			return mFluid;
+		}
+		return mFluid2;
+	}
+
+	@Override
+	public FluidStack setFillableStack(FluidStack aFluid) {
+		mFluid = aFluid;
+		return mFluid;
+	}
+	
+	public FluidStack setFillableStack2(FluidStack aFluid) {
+		mFluid2 = aFluid;
+		return mFluid2;
+	}
+
+	@Override
+	public FluidStack getDrainableStack() {
+		return getDrainableStackEx(1);
+	}
+
+	public FluidStack getDrainableStackEx(int stackID) {
+		if (stackID <= 1){
+			return mFluid;
+		}
+		return mFluid2;
+	}
+
+	@Override
+	public FluidStack setDrainableStack(FluidStack aFluid) {
+		mFluid = aFluid;
+		return mFluid;
+	}
+
+	@Override
+	public FluidStack getDisplayedFluid() {
+		return getDrainableStack();
+	}
+
+	@Override
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new CONTAINER_DeluxeTank(aPlayerInventory, aBaseMetaTileEntity);
+	}
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GUI_DeluxeTank(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+	}
+
+	@Override
+	public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide()) {
+			if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount <= 0)
+				setFillableStack(null);
+
+			if (displaysItemStack() && getStackDisplaySlot() >= 0 && getStackDisplaySlot() < mInventory.length) {
+				if (getDisplayedFluid() == null) {
+					if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true))
+						mInventory[getStackDisplaySlot()] = null;
+				} else {
+					mInventory[getStackDisplaySlot()] = GT_Utility.getFluidDisplayStack(getDisplayedFluid(), displaysStackSize());
+				}
+			}
+
+			if (displaysItemStack() && getStackDisplaySlot2() >= 0 && getStackDisplaySlot2() < mInventory.length) {
+				if (getDrainableStackEx(2) == null) {
+					if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot2()], true, true))
+						mInventory[getStackDisplaySlot2()] = null;
+				} else {
+					mInventory[getStackDisplaySlot2()] = GT_Utility.getFluidDisplayStack(getDrainableStackEx(2), displaysStackSize());
+				}
+			}
+
+			if (doesEmptyContainers()) {
+				FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
+				if (tFluid != null && isFluidInputAllowed(tFluid)) {
+
+					if (tFluid.isFluidEqual(getDrainableStackEx(1)) || getDrainableStackEx(1) == null){
+						if (getFillableStackEx(1) == null) {
+							if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									setFillableStack(tFluid.copy());
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						} else {
+							if (tFluid.isFluidEqual(getFillableStack()) && tFluid.amount + getFillableStack().amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									getFillableStack().amount += tFluid.amount;
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						}
+					}
+					else if (tFluid.isFluidEqual(getDrainableStackEx(2)) || (getDrainableStackEx(2) == null)){
+						if (getFillableStackEx(2) == null) {
+							if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									setFillableStack2(tFluid.copy());
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						} else {
+							if (tFluid.isFluidEqual(getFillableStackEx(2)) && tFluid.amount + getFillableStackEx(2).amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									getFillableStackEx(2).amount += tFluid.amount;
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						}
+					}
+					else {
+						Utils.LOG_INFO("Something broke when trying to empty cells between two fluid tank areas.");
+					}
+				}
+			}
+
+			if (doesFillContainers()) {
+				ItemStack tOutput = GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
+				if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
+					FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
+					aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+					if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
+					if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
+				}
+			}
+		}
+	}
+
+	@Override
+	public FluidStack getFluid() {
+		return getDrainableStack();
+	}
+
+	@Override
+	public int getFluidAmount() {
+		return getDrainableStack() != null ? getDrainableStack().amount : 0;
+	}
+
+	@Override
+	public int fill(FluidStack aFluid, boolean doFill) {
+		if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid))
+			return 0;
+
+		if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) {
+			if (aFluid.amount <= getCapacity()) {
+				if (doFill) {
+					setFillableStack(aFluid.copy());
+					getBaseMetaTileEntity().markDirty();
+				}
+				return aFluid.amount;
+			}
+			if (doFill) {
+				setFillableStack(aFluid.copy());
+				getFillableStack().amount = getCapacity();
+				getBaseMetaTileEntity().markDirty();
+			}
+			return getCapacity();
+		}
+
+		if (!getFillableStack().isFluidEqual(aFluid))
+			return 0;
+
+		int space = getCapacity() - getFillableStack().amount;
+		if (aFluid.amount <= space) {
+			if (doFill) {
+				getFillableStack().amount += aFluid.amount;
+				getBaseMetaTileEntity().markDirty();
+			}
+			return aFluid.amount;
+		}
+		if (doFill)
+			getFillableStack().amount = getCapacity();
+		return space;
+	}
+
+	@Override
+	public FluidStack drain(int maxDrain, boolean doDrain) {
+		if (getDrainableStack() == null || !canTankBeEmptied()) return null;
+		if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
+			setDrainableStack(null);
+			getBaseMetaTileEntity().markDirty();
+			return null;
+		}
+
+		int used = maxDrain;
+		if (getDrainableStack().amount < used)
+			used = getDrainableStack().amount;
+
+		if (doDrain) {
+			getDrainableStack().amount -= used;
+			getBaseMetaTileEntity().markDirty();
+		}
+
+		FluidStack drained = getDrainableStack().copy();
+		drained.amount = used;
+
+		if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
+			setDrainableStack(null);
+			getBaseMetaTileEntity().markDirty();
+		}
+
+		return drained;
+	}
+
+	@Override
+	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return aIndex == getOutputSlot();
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return aIndex == getInputSlot();
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index ce4042148e..2e10453a05 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
@@ -4,11 +4,12 @@ import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
 
 import java.util.Collection;
 
@@ -17,257 +18,390 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_BasicTank {
-	
-	private boolean useFuel = false;
-	
-    public GregtechRocketFuelGeneratorBase(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) {
-        super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
-    }
-
-    public GregtechRocketFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, 3, aDescription, aTextures);
-    }
+public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_DeluxeTank {
 
-    @Override
-    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
-        ITexture[][][] rTextures = new ITexture[10][17][];
-        for (byte i = -1; i < 16; i++) {
-            rTextures[0][i + 1] = getFront(i);
-            rTextures[1][i + 1] = getBack(i);
-            rTextures[2][i + 1] = getBottom(i);
-            rTextures[3][i + 1] = getTop(i);
-            rTextures[4][i + 1] = getSides(i);
-            rTextures[5][i + 1] = getFrontActive(i);
-            rTextures[6][i + 1] = getBackActive(i);
-            rTextures[7][i + 1] = getBottomActive(i);
-            rTextures[8][i + 1] = getTopActive(i);
-            rTextures[9][i + 1] = getSidesActive(i);
-        }
-        return rTextures;
-    }
-
-    @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        return mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
-    }
-
-    
-    @Override
-    public String[] getDescription() {
-        return new String[]{mDescription, "Fuel Efficiency: " + getEfficiency() + "%", CORE.GT_Tooltip};
-    }
-    
+	private boolean useFuel = false;
 
-    @Override
+	public GregtechRocketFuelGeneratorBase(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) {
+		super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
+	}
+
+	public GregtechRocketFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, 3, aDescription, aTextures);
+	}
+
+	@Override
+	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+		ITexture[][][] rTextures = new ITexture[10][17][];
+		for (byte i = -1; i < 16; i++) {
+			rTextures[0][i + 1] = getFront(i);
+			rTextures[1][i + 1] = getBack(i);
+			rTextures[2][i + 1] = getBottom(i);
+			rTextures[3][i + 1] = getTop(i);
+			rTextures[4][i + 1] = getSides(i);
+			rTextures[5][i + 1] = getFrontActive(i);
+			rTextures[6][i + 1] = getBackActive(i);
+			rTextures[7][i + 1] = getBottomActive(i);
+			rTextures[8][i + 1] = getTopActive(i);
+			rTextures[9][i + 1] = getSidesActive(i);
+		}
+		return rTextures;
+	}
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		return mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
+	}
+
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{mDescription, "Fuel Efficiency: " + getEfficiency() + "%", CORE.GT_Tooltip};
+	}
+
+
+	/* @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
         aBaseMetaTileEntity.openGUI(aPlayer);
         return true;
-    }
-
-    public ITexture[] getFront(byte aColor) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
-    }
-
-    public ITexture[] getBack(byte aColor) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
-    }
-
-    public ITexture[] getBottom(byte aColor) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
-    }
-
-    public ITexture[] getTop(byte aColor) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
-    }
-
-    public ITexture[] getSides(byte aColor) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
-    }
-
-    public ITexture[] getFrontActive(byte aColor) {
-        return getFront(aColor);
-    }
-
-    public ITexture[] getBackActive(byte aColor) {
-        return getBack(aColor);
-    }
-
-    public ITexture[] getBottomActive(byte aColor) {
-        return getBottom(aColor);
-    }
-
-    public ITexture[] getTopActive(byte aColor) {
-        return getTop(aColor);
-    }
-
-    public ITexture[] getSidesActive(byte aColor) {
-        return getSides(aColor);
-    }
-
-    @Override
-    public boolean isFacingValid(byte aSide) {
-        return aSide > 1;
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isValidSlot(int aIndex) {
-        return aIndex < 2;
-    }
-
-    @Override
-    public boolean isEnetOutput() {
-        return true;
-    }
-
-    @Override
-    public boolean isOutputFacing(byte aSide) {
-        return true;
-    }
-
-    @Override
-    public boolean isAccessAllowed(EntityPlayer aPlayer) {
-        return true;
-    }
-
-    @Override
-    public long maxEUOutput() {
-        return getBaseMetaTileEntity().isAllowedToWork() ? V[mTier] : 0;
-    }
-
-    @Override
-    public long maxEUStore() {
-        return Math.max(getEUVar(), V[mTier] * 80 + getMinimumStoredEU());
-    }
-
-    @Override
-    public boolean doesFillContainers() {
-        return getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean doesEmptyContainers() {
-        return getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean canTankBeFilled() {
-        return getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean canTankBeEmptied() {
-        return getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean displaysItemStack() {
-        return true;
-    }
-
-    @Override
-    public boolean displaysStackSize() {
-        return false;
-    }
-
-    @Override
-    public boolean isFluidInputAllowed(FluidStack aFluid) {
-        return getFuelValue(aFluid) > 0;
-    }
-
-    @Override
-    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10 == 0) {
-            if (mFluid == null) {
-                if (aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() + getMinimumStoredEU()) {
-                    mInventory[getStackDisplaySlot()] = null;
-                } else {
-                    if (mInventory[getStackDisplaySlot()] == null)
-                        mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
-                    mInventory[getStackDisplaySlot()].setStackDisplayName("Generating: " + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU");
-                }
-            } else {
-                int tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid);
-                if (tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) {
-                    long tFluidAmountToUse = Math.min(mFluid.amount / tConsumed, (maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
-                    if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)){
-                        if (useFuel){
-                        	mFluid.amount -= tFluidAmountToUse * tConsumed;
-                        	useFuel = false;
-                        }
-                        else {
-                        	useFuel = true;
-                        }
-                    }
-                }
-            }
-            if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) && GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) == null) {
-                int tFuelValue = getFuelValue(mInventory[getInputSlot()]);
-                if (tFuelValue > 0) {
-                    ItemStack tEmptyContainer = getEmptyContainer(mInventory[getInputSlot()]);
-                    if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tEmptyContainer)) {
-                        aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
-                        aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
-                    }
-                }
-            }
-        }
-
-        if (aBaseMetaTileEntity.isServerSide())
-            aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored() >= maxEUOutput() + getMinimumStoredEU());
-    }
-
-    public abstract GT_Recipe_Map getRecipes();
-
-    public abstract int getEfficiency();
-
-    public int consumedFluidPerOperation(FluidStack aLiquid) {
-        return 1;
-    }
-
-    public int getFuelValue(FluidStack aLiquid) {
-        if (aLiquid == null || getRecipes() == null) return 0;
-        FluidStack tLiquid;
-        Collection<GT_Recipe> tRecipeList = getRecipes().mRecipeList;
-        if (tRecipeList != null) for (GT_Recipe tFuel : tRecipeList)
-            if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null)
-                if (aLiquid.isFluidEqual(tLiquid))
-                    return (int) (((long) tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(tLiquid)) / 100);
-        return 0;
-    }
-
-    public int getFuelValue(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;
-        GT_Recipe tFuel = getRecipes().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
-        if (tFuel != null) return (int) ((tFuel.mSpecialValue * 1000L * getEfficiency()) / 100);
-        return 0;
-    }
-
-    public ItemStack getEmptyContainer(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return null;
-        GT_Recipe tFuel = getRecipes().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
-        if (tFuel != null) return GT_Utility.copy(tFuel.getOutput(0));
-        return GT_Utility.getContainerItem(aStack, true);
-    }
-
-    @Override
-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && (getFuelValue(aStack) > 0 || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0);
-    }
-
-    @Override
-    public int getCapacity() {
-        return 32000;
-    }
-
-    @Override
-    public int getTankPressure() {
-        return -100;
-    }
+    }*/
+
+	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		if (aBaseMetaTileEntity.isClientSide()){
+			Utils.LOG_WARNING("Entity is Client side, simply returning true");
+			return true;
+		}
+		Utils.LOG_WARNING("Entity is not Client side, opening entity Container and by extension, it's GUI, then returning true");
+		aBaseMetaTileEntity.openGUI(aPlayer);
+		return true;
+	} 
+
+	public ITexture[] getFront(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getBack(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getBottom(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getTop(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getSides(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getFrontActive(byte aColor) {
+		return getFront(aColor);
+	}
+
+	public ITexture[] getBackActive(byte aColor) {
+		return getBack(aColor);
+	}
+
+	public ITexture[] getBottomActive(byte aColor) {
+		return getBottom(aColor);
+	}
+
+	public ITexture[] getTopActive(byte aColor) {
+		return getTop(aColor);
+	}
+
+	public ITexture[] getSidesActive(byte aColor) {
+		return getSides(aColor);
+	}
+
+	@Override
+	public boolean isFacingValid(byte aSide) {
+		return aSide > 1;
+	}
+
+	@Override
+	public boolean isSimpleMachine() {
+		return false;
+	}
+
+	@Override
+	public boolean isValidSlot(int aIndex) {
+		return aIndex < 2;
+	}
+
+	@Override
+	public boolean isEnetOutput() {
+		return true;
+	}
+
+	@Override
+	public boolean isOutputFacing(byte aSide) {
+		return true;
+	}
+
+	@Override
+	public boolean isAccessAllowed(EntityPlayer aPlayer) {
+		return true;
+	}
+
+	@Override
+	public long maxEUOutput() {
+		return getBaseMetaTileEntity().isAllowedToWork() ? V[mTier] : 0;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return Math.max(getEUVar(), V[mTier] * 115 + getMinimumStoredEU());
+	}
+
+	@Override
+	public boolean doesFillContainers() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean doesEmptyContainers() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean canTankBeFilled() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean canTankBeEmptied() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean displaysItemStack() {
+		return true;
+	}
+
+	@Override
+	public boolean displaysStackSize() {
+		return false;
+	}
+
+	@Override
+	public boolean isFluidInputAllowed(FluidStack aFluid) {
+		return getFuelValue(aFluid) > 0;
+	}
+	
+	@Override
+	public long getMinimumStoredEU() {
+        return 512;
+    }
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10 == 0) {
+			if (mFluid == null) {
+				if (aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() + getMinimumStoredEU()) {
+					mInventory[getStackDisplaySlot()] = null;
+				} else {
+					if (mInventory[getStackDisplaySlot()] == null)
+						mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
+					mInventory[getStackDisplaySlot()].setStackDisplayName("Generating: " + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU");
+				}
+			} else {
+				if (mFluid != null && mFluid2 != null){
+					int tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid);
+					int tFuelValue2 = getFuelValue(mFluid2), tConsumed2 = consumedFluidPerOperation(mFluid2);
+					if ((tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed)/* && (tFuelValue2 > 0 && tConsumed2 > 0 && mFluid2.amount > tConsumed2)*/) {
+
+						Utils.LOG_WARNING("tFuelValue: "+tFuelValue);
+						Utils.LOG_WARNING("tConsumed: "+tConsumed);
+						Utils.LOG_WARNING("mFluid.name: "+mFluid.getFluid().getName());
+						Utils.LOG_WARNING("mFluid.amount: "+mFluid.amount);
+						Utils.LOG_WARNING("mFluid.amount > tConsumed: "+(mFluid.amount > tConsumed));    
+
+						Utils.LOG_WARNING("=========================================================");
+
+						Utils.LOG_WARNING("tFuelValue2: "+tFuelValue2);
+						Utils.LOG_WARNING("tConsumed2: "+tConsumed2);
+						Utils.LOG_WARNING("mFluid2.name: "+mFluid2.getFluid().getName());
+						Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
+						Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2));  
+						long tFluidAmountToUse = Math.min(mFluid.amount / tConsumed, (maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
+						long tFluidAmountToUse2 = Math.min(mFluid2.amount / tConsumed2, (maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2);
+
+						if (tFluidAmountToUse <= 0){
+							/*if ((mFluid.amount / tConsumed) == getCapacity()){
+								tFluidAmountToUse = 1;
+							}*/
+							
+							if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()-aBaseMetaTileEntity.getUniversalEnergyStored())){
+								tFluidAmountToUse = 1;
+								Utils.LOG_WARNING("=========================================================");
+								Utils.LOG_WARNING("tFluidAmountToUse - Updated: "+tFluidAmountToUse);
+								Utils.LOG_WARNING("=========================================================");
+							}
+						}
+						
+						if (tFluidAmountToUse2 <= 0){
+							/*if ((mFluid2.amount / tConsumed) == getCapacity()){
+								tFluidAmountToUse2 = 1;
+							}*/
+							if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()-aBaseMetaTileEntity.getUniversalEnergyStored())){
+								tFluidAmountToUse2 = 1;
+								Utils.LOG_WARNING("=========================================================");
+								Utils.LOG_WARNING("tFluidAmountToUse2 - Updated: "+tFluidAmountToUse2);
+								Utils.LOG_WARNING("=========================================================");
+							}
+						}
+						
+						Utils.LOG_WARNING("=========================================================");
+						Utils.LOG_WARNING("tFluidAmountToUse: "+tFluidAmountToUse);
+						Utils.LOG_WARNING("=========================================================");
+
+						/*Utils.LOG_WARNING("mFluid.amount / tConsumed: "+("fluidAmount:"+mFluid.amount)+(" tConsumed:"+tConsumed)+" | "+(mFluid.amount / tConsumed));
+						Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 + getMinimumStoredEU()));
+						Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
+						Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
+						Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));  
+						Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.getUniversalEnergyStored()));  
+						Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored())));  
+						Utils.LOG_WARNING("tFuelValue: "+(tFuelValue));
+						Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue));
+						*/
+						
+						Utils.LOG_WARNING("=========================================================");
+						Utils.LOG_WARNING("tFluidAmountToUse2: "+tFluidAmountToUse2);
+						Utils.LOG_WARNING("=========================================================");
+
+						/*Utils.LOG_WARNING("mFluid2.amount / tConsumed2: "+("fluidAmount2:"+mFluid2.amount)+(" tConsumed2:"+tConsumed2)+" | "+(mFluid2.amount / tConsumed2));
+						Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 + getMinimumStoredEU()));
+						Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
+						Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
+						Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));  
+						Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.getUniversalEnergyStored()));  
+						Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored())));  
+						Utils.LOG_WARNING("tFuelValue2: "+(tFuelValue2));
+						Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2));
+						*/
+						if ((tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) && (tFluidAmountToUse2 > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse2 * tFuelValue2, true))){
+
+							Utils.LOG_WARNING("tFuelValue: "+tFuelValue);
+							Utils.LOG_WARNING("tConsumed: "+tConsumed);
+							Utils.LOG_WARNING("mFluid.name: "+mFluid.getFluid().getName());
+							Utils.LOG_WARNING("mFluid.amount: "+mFluid.amount);
+							Utils.LOG_WARNING("mFluid.amount > tConsumed: "+(mFluid.amount > tConsumed));    
+
+							Utils.LOG_WARNING("=========================================================");
+
+							Utils.LOG_WARNING("tFuelValue2: "+tFuelValue2);
+							Utils.LOG_WARNING("tConsumed2: "+tConsumed2);
+							Utils.LOG_WARNING("mFluid2.name: "+mFluid2.getFluid().getName());
+							Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
+							Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2));  
+
+							if (useFuel){
+								mFluid.amount -= tFluidAmountToUse * tConsumed;
+								mFluid2.amount -= tFluidAmountToUse2 * tConsumed2;
+								useFuel = false;
+							}
+							else {
+								useFuel = true;
+							}
+
+						}
+						else {
+							Utils.LOG_WARNING("=========================================================");
+							Utils.LOG_WARNING("Either tFluidAmountToUse1 <= 0, power cannot be increased of tFluidAmountToUse2 <= 0");
+							Utils.LOG_WARNING("tFluidAmountToUse1: "+tFluidAmountToUse);
+							Utils.LOG_WARNING("tFluidAmountToUse2: "+tFluidAmountToUse2);
+						}
+					}
+					else {
+						/*Utils.LOG_WARNING("(tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) && (tFuelValue2 > 0 && tConsumed2 > 0 && mFluid2.amount > tConsumed2)"); 
+                		Utils.LOG_WARNING("tFuelValue: "+tFuelValue);
+                		Utils.LOG_WARNING("tConsumed: "+tConsumed);
+                		Utils.LOG_WARNING("mFluid.amount: "+mFluid.amount);
+                		Utils.LOG_WARNING("mFluid.amount > tConsumed: "+(mFluid.amount > tConsumed));    
+
+                		Utils.LOG_WARNING("=========================================================");
+
+                		Utils.LOG_WARNING("tFuelValue2: "+tFuelValue2);
+                		Utils.LOG_WARNING("tConsumed2: "+tConsumed2);
+                		Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
+                		Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2)); */ 
+					}
+				} 
+				else {
+					Utils.LOG_WARNING("One mFluid is null");
+					if (mFluid != null)
+						Utils.LOG_WARNING("mFluid1 is not null");
+					if (mFluid2 != null)
+						Utils.LOG_WARNING("mFluid2 is not null");
+				}
+			}
+			if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) && GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) == null) {
+				int tFuelValue = getFuelValue(mInventory[getInputSlot()]);
+				if (tFuelValue > 0) {
+					ItemStack tEmptyContainer = getEmptyContainer(mInventory[getInputSlot()]);
+					if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tEmptyContainer)) {
+						aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
+						aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+					}
+				}
+			}
+		}
+
+		if (aBaseMetaTileEntity.isServerSide())
+			aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored() >= maxEUOutput() + getMinimumStoredEU());
+	}
+
+	public abstract GT_Recipe_Map getRecipes();
+
+	public abstract int getEfficiency();
+
+	public int consumedFluidPerOperation(FluidStack aLiquid) {
+		return 1;
+	}
+
+	public int getFuelValue(FluidStack aLiquid) {
+		if (aLiquid == null || getRecipes() == null) return 0;
+		FluidStack tLiquid;
+		Collection<GT_Recipe> tRecipeList = getRecipes().mRecipeList;
+		if (tRecipeList != null) for (GT_Recipe tFuel : tRecipeList)
+			if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null)
+				if (aLiquid.isFluidEqual(tLiquid))
+					return (int) (((long) tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(tLiquid)) / 100);
+		return 0;
+	}
+
+	public int getFuelValue(ItemStack aStack) {
+		if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;
+		GT_Recipe tFuel = getRecipes().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+		if (tFuel != null) return (int) ((tFuel.mSpecialValue * 1000L * getEfficiency()) / 100);
+		return 0;
+	}
+
+	public ItemStack getEmptyContainer(ItemStack aStack) {
+		if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return null;
+		GT_Recipe tFuel = getRecipes().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+		if (tFuel != null) return GT_Utility.copy(tFuel.getOutput(0));
+		return GT_Utility.getContainerItem(aStack, true);
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && (getFuelValue(aStack) > 0 || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0);
+	}
+
+	@Override
+	public int getCapacity() {
+		return 32000;
+	}
+
+	@Override
+	public int getTankPressure() {
+		return -100;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
index 8c22b49260..51eb199e2a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
@@ -9,6 +9,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -140,7 +141,7 @@ extends GT_MetaTileEntity_BasicTank
 		sInterDimensionalTesseractAllowed = true;
 	}
 
-	public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ)
+	/*public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ)
 	{
 		if (aSide == getBaseMetaTileEntity().getFrontFacing())
 		{
@@ -156,9 +157,31 @@ extends GT_MetaTileEntity_BasicTank
 			GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency + (getTesseract(this.mFrequency, false) == null ? "" : new StringBuilder().append(EnumChatFormatting.GREEN).append(" (Connected)").toString()));
 		}
 		return true;
-	}
+	}*/
 
 	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ){
+		if (aSide == getBaseMetaTileEntity().getFrontFacing()){
+			float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ);
+			switch ((byte)((byte)(int)(tCoords[0] * 2.0F) + 2 * (byte)(int)(tCoords[1] * 2.0F))){
+			case 0: 
+				Utils.LOG_INFO("Freq. -1 | " + this.mFrequency);
+				this.mFrequency -= 1;
+				break;
+			case 1: 
+				Utils.LOG_INFO("Freq. +1 | " + this.mFrequency);
+				this.mFrequency += 1;
+			default:
+				//Utils.LOG_INFO("Did not click the correct place.");
+				break;
+			}
+			Utils.messagePlayer(aPlayer, "Frequency: " + this.mFrequency);
+			Utils.messagePlayer(aPlayer, (getTesseract(this.mFrequency, false) == null ? "" : new StringBuilder().append(EnumChatFormatting.GREEN).append(" (Connected)").toString()));
+		}
+		return true;
+	}
+	
+	@Override
 	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ)
 	{
 		if (aSide == getBaseMetaTileEntity().getFrontFacing())