- Reverted Rocket Engines to single fuels. @leagris

% Will re-use dual fluid generator code later.

4 files changed, 792 insertions, 383 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
new file mode 100644
index 0000000000..49f9fb1344
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
@@ -0,0 +1,407 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
+
+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.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;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_DeluxeTank {
+
+	private boolean useFuel = false;
+
+	public GregtechDoubleFuelGeneratorBase(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) {
+		super(aID, aName, aNameRegional, aTier, 4, aDescription, aTextures);
+	}
+
+	public GregtechDoubleFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, 4, 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;
+    }*/
+
+	@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/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index 7d0e43c5e2..ce4042148e 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,12 +4,11 @@ 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;
 
@@ -18,390 +17,257 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_DeluxeTank {
-
+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);
+    }
+
+    @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};
+    }
+    
 
-	public GregtechRocketFuelGeneratorBase(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) {
-		super(aID, aName, aNameRegional, aTier, 4, aDescription, aTextures);
-	}
-
-	public GregtechRocketFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-		super(aName, aTier, 4, 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
+    @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
         aBaseMetaTileEntity.openGUI(aPlayer);
         return true;
-    }*/
-
-	@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;
-	}
+    }
+
+    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;
+    }
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
new file mode 100644
index 0000000000..65a2892710
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
@@ -0,0 +1,136 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class GregtechMetaTileEntityDoubleFuelGeneratorBase
+        extends GregtechRocketFuelGeneratorBase {
+
+    public int mEfficiency;
+
+    public GregtechMetaTileEntityDoubleFuelGeneratorBase(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, "Requires two liquid Fuels. Fuel A is Fastburn, Fuel B is slowburn.", new ITexture[0]);
+        onConfigLoad();
+    }
+
+    public GregtechMetaTileEntityDoubleFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        onConfigLoad();
+    }
+
+    @Override
+	public boolean isOutputFacing(byte aSide) {
+        return aSide == getBaseMetaTileEntity().getFrontFacing();
+    }
+
+    @Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GregtechMetaTileEntityDoubleFuelGeneratorBase(this.mName, this.mTier, this.mDescription, this.mTextures);
+    }
+
+    @Override
+	public GT_Recipe.GT_Recipe_Map getRecipes() {
+        return GT_Recipe.GT_Recipe_Map.sDieselFuels;
+    }
+
+    @Override
+	public int getCapacity() {
+        return 32000;
+    }
+
+    public void onConfigLoad() {
+        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "RocketEngine.efficiency.tier." + this.mTier, (100 - this.mTier * 8));
+    }
+
+    @Override
+	public int getEfficiency() {
+        return this.mEfficiency;
+    }
+
+    @Override
+	public int getFuelValue(ItemStack aStack) {
+        int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack));
+        if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
+            rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
+        }
+        return rValue;
+    }
+    
+    private GT_RenderedTexture getCasingTexture(){
+    	if (this.mTier <= 4){
+    		return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+    	}
+    	else if (this.mTier == 5){
+
+    		return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
+    	}
+    	else if (this.mTier >= 6){
+
+    		return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
+    	}
+		return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+    }
+    
+
+    @Override
+	public ITexture[] getFront(byte aColor) {
+        return new ITexture[]{super.getFront(aColor)[0], getCasingTexture(), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getBack(byte aColor) {
+        return new ITexture[]{super.getBack(aColor)[0], getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)};
+    }
+
+    @Override
+	public ITexture[] getBottom(byte aColor) {
+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+    }
+
+    @Override
+	public ITexture[] getTop(byte aColor) {
+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)};
+    }
+
+    @Override
+	public ITexture[] getSides(byte aColor) {
+        return new ITexture[]{super.getSides(aColor)[0], getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)};
+    }
+
+    @Override
+	public ITexture[] getFrontActive(byte aColor) {
+        return new ITexture[]{super.getFrontActive(aColor)[0], getCasingTexture(), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getBackActive(byte aColor) {
+        return new ITexture[]{super.getBackActive(aColor)[0], getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)};
+    }
+
+    @Override
+	public ITexture[] getBottomActive(byte aColor) {
+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+    }
+
+    @Override
+	public ITexture[] getTopActive(byte aColor) {
+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)};
+    }
+
+    @Override
+	public ITexture[] getSidesActive(byte aColor) {
+        return new ITexture[]{super.getSidesActive(aColor)[0], getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)};
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index 3cb641db0a..59e4a1b875 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -21,7 +21,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator
     public int mEfficiency;
 
     public GregtechMetaTileEntityRocketFuelGenerator(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, "Requires two liquid Fuels. Fuel A is Fastburn, Fuel B is slowburn.", new ITexture[0]);
+        super(aID, aName, aNameRegional, aTier, "Requires liquid Fuels.", new ITexture[0]);
         onConfigLoad();
     }