Revert "$ Cleaned up the entire project."

This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747.

# Conflicts:
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java

Revert "% Cleaned up Imports."

This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.

6 files changed, 605 insertions, 789 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
index fee44a962e..c2cadab478 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
@@ -16,164 +16,129 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 
-public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
-	private int mRunTime = 0;
+public class GT_MetaTileEntity_Boiler_Solar
+        extends GT_MetaTileEntity_Boiler {
+    public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional, "Steam Power by the Sun", new ITexture[0]);
+    }
 
-	public GT_MetaTileEntity_Boiler_Solar(final int aID, final String aName, final String aNameRegional) {
-		super(aID, aName, aNameRegional, "Steam Power by the Sun", new ITexture[0]);
-	}
+    public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+    }
 
-	public GT_MetaTileEntity_Boiler_Solar(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
-		super(aName, aTier, aDescription, aTextures);
-	}
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        ITexture[][][] rTextures = new ITexture[4][17][];
+        for (byte i = -1; i < 16; i = (byte) (i + 1)) {
+            ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};
+            rTextures[0][(i + 1)] = tmp0;
+            ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)};
+            rTextures[1][(i + 1)] = tmp1;
+            ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))};
+            rTextures[2][(i + 1)] = tmp2;
+            ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
+            rTextures[3][(i + 1)] = tmp3;
+        }
+        return rTextures;
+    }
 
-	@Override
-	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory,
-			final IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);
-	}
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        return mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];
+    }
 
-	@Override
-	public Object getServerGUI(final int aID, final InventoryPlayer aPlayerInventory,
-			final IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);
-	}
+    public int maxProgresstime() {
+        return 500;
+    }
 
-	@Override
-	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
-			final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
-		return this.mTextures[aSide >= 2 ? (byte) (aSide != aFacing ? 2 : 3) : aSide][aColorIndex + 1];
-	}
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);
+    }
 
-	@Override
-	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
-		final ITexture[][][] rTextures = new ITexture[4][17][];
-		for (byte i = -1; i < 16; i = (byte) (i + 1)) {
-			final ITexture[] tmp0 = {
-					new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM,
-							Dyes.getModulation(i, Dyes._NULL.mRGBa))
-			};
-			rTextures[0][i + 1] = tmp0;
-			final ITexture[] tmp1 = {
-					new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP,
-							Dyes.getModulation(i, Dyes._NULL.mRGBa)),
-					new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)
-			};
-			rTextures[1][i + 1] = tmp1;
-			final ITexture[] tmp2 = {
-					new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE,
-							Dyes.getModulation(i, Dyes._NULL.mRGBa))
-			};
-			rTextures[2][i + 1] = tmp2;
-			final ITexture[] tmp3 = {
-					new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE,
-							Dyes.getModulation(i, Dyes._NULL.mRGBa)),
-					new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
-			};
-			rTextures[3][i + 1] = tmp3;
-		}
-		return rTextures;
-	}
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);
+    }
 
-	@Override
-	public void loadNBTData(final NBTTagCompound aNBT) {
-		super.loadNBTData(aNBT);
-		this.mRunTime = aNBT.getInteger("mRunTime");
-	}
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescription, this.mTextures);
+    }
+    
+    private int mRunTime = 0;
+    
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setInteger("mRunTime", this.mRunTime);
+    }
 
-	@Override
-	public int maxProgresstime() {
-		return 500;
-	}
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        this.mRunTime = aNBT.getInteger("mRunTime");
+    }
 
-	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescription, this.mTextures);
-	}
-
-	@Override
-	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-		if (aBaseMetaTileEntity.isServerSide() && aTick > 20L) {
-			if (this.mTemperature <= 20) {
-				this.mTemperature = 20;
-				this.mLossTimer = 0;
-			}
-			if (++this.mLossTimer > 45) {
-				this.mTemperature -= 1;
-				this.mLossTimer = 0;
-			}
-			if (this.mSteam != null) {
-				final byte i = aBaseMetaTileEntity.getFrontFacing();
-				final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
-				if (tTileEntity != null) {
-					final FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i),
-							Math.max(1, this.mSteam.amount / 2), false);
-					if (tDrained != null) {
-						final int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(),
-								tDrained, false);
-						if (tFilledAmount > 0) {
-							tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(),
-									aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true),
-									true);
-						}
-					}
-				}
-			}
-			if (aTick % 25L == 0L) {
-				if (this.mTemperature > 100) {
-					if (this.mFluid == null || !GT_ModHandler.isWater(this.mFluid) || this.mFluid.amount <= 0) {
-						this.mHadNoWater = true;
-					}
-					else {
-						if (this.mHadNoWater) {
-							aBaseMetaTileEntity.doExplosion(2048L);
-							return;
-						}
-						this.mFluid.amount -= 1;
-						this.mRunTime += 1;
-						int tOutput = 150;
-						if (this.mRunTime > 10000) {
-							tOutput = Math.max(50, 150 - (this.mRunTime - 10000) / 100);
-						}
-						if (this.mSteam == null) {
-							this.mSteam = GT_ModHandler.getSteam(tOutput);
-						}
-						else if (GT_ModHandler.isSteam(this.mSteam)) {
-							this.mSteam.amount += tOutput;
-						}
-						else {
-							this.mSteam = GT_ModHandler.getSteam(tOutput);
-						}
-					}
-				}
-				else {
-					this.mHadNoWater = false;
-				}
-			}
-			if (this.mSteam != null && this.mSteam.amount > 16000) {
-				this.sendSound((byte) 1);
-				this.mSteam.amount = 12000;
-			}
-			if (this.mProcessingEnergy <= 0 && aBaseMetaTileEntity.isAllowedToWork() && aTick % 256L == 0L
-					&& !aBaseMetaTileEntity.getWorld().isThundering()) {
-				final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining()
-						&& aBaseMetaTileEntity.getBiome().rainfall > 0.0F;
-				this.mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4
-						|| !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0
-								: !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
-			}
-			if (this.mTemperature < 500 && this.mProcessingEnergy > 0 && aTick % 12L == 0L) {
-				this.mProcessingEnergy -= 1;
-				this.mTemperature += 1;
-			}
-			aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
-		}
-	}
-
-	@Override
-	public void saveNBTData(final NBTTagCompound aNBT) {
-		super.saveNBTData(aNBT);
-		aNBT.setInteger("mRunTime", this.mRunTime);
-	}
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {
+            if (this.mTemperature <= 20) {
+                this.mTemperature = 20;
+                this.mLossTimer = 0;
+            }
+            if (++this.mLossTimer > 45) {
+                this.mTemperature -= 1;
+                this.mLossTimer = 0;
+            }
+            if (this.mSteam != null) {
+                byte i = aBaseMetaTileEntity.getFrontFacing();
+                IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
+                if (tTileEntity != null) {
+                    FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+                    if (tDrained != null) {
+                        int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+                        if (tFilledAmount > 0) {
+                            tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
+                        }
+                    }
+                }
+            }
+            if (aTick % 25L == 0L) {
+                if (this.mTemperature > 100) {
+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
+                        this.mHadNoWater = true;
+                    } else {
+                        if (this.mHadNoWater) {
+                            aBaseMetaTileEntity.doExplosion(2048L);
+                            return;
+                        }
+                        this.mFluid.amount -= 1;
+                        mRunTime += 1;
+                        int tOutput = 150;
+                        if(mRunTime > 10000){
+                        	tOutput = Math.max(50, 150 - ((mRunTime-10000)/100));
+                        }
+                        if (this.mSteam == null) {
+                            this.mSteam = GT_ModHandler.getSteam(tOutput);
+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {
+                            this.mSteam.amount += tOutput;
+                        } else {
+                            this.mSteam = GT_ModHandler.getSteam(tOutput);
+                        }
+                    }
+                } else {
+                    this.mHadNoWater = false;
+                }
+            }
+            if ((this.mSteam != null) &&
+                    (this.mSteam.amount > 16000)) {
+                sendSound((byte) 1);
+                this.mSteam.amount = 12000;
+            }
+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) {
+                boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F;
+                mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
+            }
+            if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
+                this.mProcessingEnergy -= 1;
+                this.mTemperature += 1;
+            }
+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
index b05e1cb2a0..65a2892710 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
@@ -1,8 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
+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;
@@ -12,152 +13,124 @@ 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(final int aID, final String aName, final String aNameRegional,
-			final int aTier) {
-		super(aID, aName, aNameRegional, aTier, "Requires two liquid Fuels. Fuel A is Fastburn, Fuel B is slowburn.",
-				new ITexture[0]);
-		this.onConfigLoad();
-	}
-
-	public GregtechMetaTileEntityDoubleFuelGeneratorBase(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
-		super(aName, aTier, aDescription, aTextures);
-		this.onConfigLoad();
-	}
-
-	@Override
-	public ITexture[] getBack(final byte aColor) {
-		return new ITexture[] {
-				super.getBack(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
-		};
-	}
-
-	@Override
-	public ITexture[] getBackActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBackActive(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
-		};
-	}
-
-	@Override
-	public ITexture[] getBottom(final byte aColor) {
-		return new ITexture[] {
-				super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
-		};
-	}
-
-	@Override
-	public ITexture[] getBottomActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
-		};
-	}
-
-	@Override
-	public int getCapacity() {
-		return 32000;
-	}
+public class GregtechMetaTileEntityDoubleFuelGeneratorBase
+        extends GregtechRocketFuelGeneratorBase {
 
-	private GT_RenderedTexture getCasingTexture() {
-		if (this.mTier <= 4) {
-			return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
-		}
-		else if (this.mTier == 5) {
+    public int mEfficiency;
 
-			return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
-		}
-		else if (this.mTier >= 6) {
+    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();
+    }
 
-			return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
-		}
-		return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
-	}
+    public GregtechMetaTileEntityDoubleFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        onConfigLoad();
+    }
 
-	@Override
-	public int getEfficiency() {
-		return this.mEfficiency;
-	}
-
-	@Override
-	public ITexture[] getFront(final byte aColor) {
-		return new ITexture[] {
-				super.getFront(aColor)[0], this.getCasingTexture(),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getFrontActive(final byte aColor) {
-		return new ITexture[] {
-				super.getFrontActive(aColor)[0], this.getCasingTexture(),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
-	}
-
-	@Override
-	public int getFuelValue(final 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;
-	}
-
-	@Override
+    @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 ITexture[] getSides(final byte aColor) {
-		return new ITexture[] {
-				super.getSides(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
-		};
-	}
-
-	@Override
-	public ITexture[] getSidesActive(final byte aColor) {
-		return new ITexture[] {
-				super.getSidesActive(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
-		};
-	}
-
-	@Override
-	public ITexture[] getTop(final byte aColor) {
-		return new ITexture[] {
-				super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
-		};
-	}
-
-	@Override
-	public ITexture[] getTopActive(final byte aColor) {
-		return new ITexture[] {
-				super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
-		};
-	}
-
-	@Override
-	public boolean isOutputFacing(final byte aSide) {
-		return aSide == this.getBaseMetaTileEntity().getFrontFacing();
-	}
-
-	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntityDoubleFuelGeneratorBase(this.mName, this.mTier, this.mDescription,
-				this.mTextures);
-	}
-
-	public void onConfigLoad() {
-		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig,
-				"RocketEngine.efficiency.tier." + this.mTier, 100 - this.mTier * 8);
-	}
+        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/GregtechMetaTileEntityGeothermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
index 6c0df9ea99..b45cf93bff 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
@@ -1,8 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
+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;
@@ -13,159 +14,132 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.GameRegistry;
 
-public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity_BasicGenerator {
+public class GregtechMetaTileEntityGeothermalGenerator
+extends GT_MetaTileEntity_BasicGenerator
+{
 
 	public int mEfficiency;
 
-	public GregtechMetaTileEntityGeothermalGenerator(final int aID, final String aName, final String aNameRegional,
-			final int aTier) {
+	public GregtechMetaTileEntityGeothermalGenerator(int aID, String aName, String aNameRegional, int aTier) {
 		super(aID, aName, aNameRegional, aTier, "Requires Pahoehoe Lava or Normal Lava as Fuel", new ITexture[0]);
-		this.onConfigLoad();
+		onConfigLoad();
 	}
 
-	public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
+	public GregtechMetaTileEntityGeothermalGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
 		super(aName, aTier, aDescription, aTextures);
-		this.onConfigLoad();
-	}
+		onConfigLoad();
+	}  
 
 	@Override
-	public ITexture[] getBack(final byte aColor) {
-		return new ITexture[] {
-				super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)
-		};
-	}
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		if (aBaseMetaTileEntity.isClientSide()){
+			return true;
+		}
+		aBaseMetaTileEntity.openGUI(aPlayer);
+		return true;
+	} 
 
 	@Override
-	public ITexture[] getBackActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBackActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)
-		};
+	public int getCapacity() {
+		//return MathUtils.roundToClosestMultiple(32000*(this.mTier/2), 25000);
+		return 5000*this.mTier;
 	}
 
-	@Override
-	public ITexture[] getBottom(final byte aColor) {
-		return new ITexture[] {
-				super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
-		};
+	public void onConfigLoad() {
+		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "ThermalGenerator.efficiency.tier." + this.mTier, (100 - this.mTier * 7));
 	}
 
 	@Override
-	public ITexture[] getBottomActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBottomActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
-		};
+	public int getEfficiency() {
+		return this.mEfficiency;
 	}
 
 	@Override
-	public int getCapacity() {
-		// return MathUtils.roundToClosestMultiple(32000*(this.mTier/2), 25000);
-		return 5000 * this.mTier;
+	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;
 	}
 
 	@Override
-	public String[] getDescription() {
-		return new String[] {
-				"Generates power from Lava/Pahoehoe at " + this.getEfficiency() + "% Efficiency per tick"
-		};
+	public boolean isOutputFacing(byte aSide) {
+		return aSide == getBaseMetaTileEntity().getFrontFacing();
 	}
 
 	@Override
-	public int getEfficiency() {
-		return this.mEfficiency;
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntityGeothermalGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
 	}
 
 	@Override
-	public ITexture[] getFront(final byte aColor) {
-		return new ITexture[] {
-				super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
+	public ITexture[] getFront(byte aColor) {
+		return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
 	}
 
 	@Override
-	public ITexture[] getFrontActive(final byte aColor) {
-		return new ITexture[] {
-				super.getFrontActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
+	public ITexture[] getBack(byte aColor) {
+		return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)};
 	}
 
 	@Override
-	public int getFuelValue(final 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;
+	public ITexture[] getBottom(byte aColor) {
+		return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)};
 	}
 
-	public int getPollution() {
-		return 100;
+	@Override
+	public ITexture[] getTop(byte aColor) {
+		return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)};
 	}
 
 	@Override
-	public GT_Recipe_Map getRecipes() {
-		return GT_Recipe_Map.sHotFuels;
+	public ITexture[] getSides(byte aColor) {
+		return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT)};
 	}
 
 	@Override
-	public ITexture[] getSides(final byte aColor) {
-		return new ITexture[] {
-				super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT)
-		};
+	public ITexture[] getFrontActive(byte aColor) {
+		return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
 	}
 
 	@Override
-	public ITexture[] getSidesActive(final byte aColor) {
-		return new ITexture[] {
-				super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)
-		};
+	public ITexture[] getBackActive(byte aColor) {
+		return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)};
 	}
 
 	@Override
-	public ITexture[] getTop(final byte aColor) {
-		return new ITexture[] {
-				super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-				new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)
-		};
+	public ITexture[] getBottomActive(byte aColor) {
+		return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)};
 	}
 
 	@Override
-	public ITexture[] getTopActive(final byte aColor) {
-		return new ITexture[] {
-				super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-				new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)
-		};
+	public ITexture[] getTopActive(byte aColor) {
+		return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)};
 	}
 
 	@Override
-	public boolean isOutputFacing(final byte aSide) {
-		return aSide == this.getBaseMetaTileEntity().getFrontFacing();
+	public ITexture[] getSidesActive(byte aColor) {
+		return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)};
 	}
 
+
 	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntityGeothermalGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+	public String[] getDescription()
+	{
+		return new String[] {"Generates power from Lava/Pahoehoe at " + getEfficiency() + "% Efficiency per tick"};
 	}
 
-	public void onConfigLoad() {
-		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig,
-				"ThermalGenerator.efficiency.tier." + this.mTier, 100 - this.mTier * 7);
+	@Override
+	public GT_Recipe_Map getRecipes()
+	{
+		return GT_Recipe_Map.sHotFuels;
 	}
 
-	@Override
-	public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-		if (aBaseMetaTileEntity.isClientSide()) {
-			return true;
-		}
-		aBaseMetaTileEntity.openGUI(aPlayer);
-		return true;
+	
+	public int getPollution() {
+		return 100;
 	}
 }
\ No newline at end of file
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 95194a5ecb..59e4a1b875 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -1,8 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
+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;
@@ -12,150 +13,124 @@ 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 GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFuelGeneratorBase {
-
-	public int mEfficiency;
-
-	public GregtechMetaTileEntityRocketFuelGenerator(final int aID, final String aName, final String aNameRegional,
-			final int aTier) {
-		super(aID, aName, aNameRegional, aTier, "Requires liquid Fuels.", new ITexture[0]);
-		this.onConfigLoad();
-	}
-
-	public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
-		super(aName, aTier, aDescription, aTextures);
-		this.onConfigLoad();
-	}
-
-	@Override
-	public ITexture[] getBack(final byte aColor) {
-		return new ITexture[] {
-				super.getBack(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
-		};
-	}
-
-	@Override
-	public ITexture[] getBackActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBackActive(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
-		};
-	}
-
-	@Override
-	public ITexture[] getBottom(final byte aColor) {
-		return new ITexture[] {
-				super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
-		};
-	}
-
-	@Override
-	public ITexture[] getBottomActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
-		};
-	}
-
-	@Override
-	public int getCapacity() {
-		return 32000;
-	}
+public class GregtechMetaTileEntityRocketFuelGenerator
+        extends GregtechRocketFuelGeneratorBase {
 
-	private GT_RenderedTexture getCasingTexture() {
-		if (this.mTier <= 4) {
-			return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
-		}
-		else if (this.mTier == 5) {
+    public int mEfficiency;
 
-			return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
-		}
-		else if (this.mTier >= 6) {
+    public GregtechMetaTileEntityRocketFuelGenerator(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, "Requires liquid Fuels.", new ITexture[0]);
+        onConfigLoad();
+    }
 
-			return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
-		}
-		return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
-	}
+    public GregtechMetaTileEntityRocketFuelGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        onConfigLoad();
+    }
 
-	@Override
-	public int getEfficiency() {
-		return this.mEfficiency;
-	}
-
-	@Override
-	public ITexture[] getFront(final byte aColor) {
-		return new ITexture[] {
-				super.getFront(aColor)[0], this.getCasingTexture(),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getFrontActive(final byte aColor) {
-		return new ITexture[] {
-				super.getFrontActive(aColor)[0], this.getCasingTexture(),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
-	}
-
-	@Override
-	public int getFuelValue(final 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;
-	}
-
-	@Override
+    @Override
+	public boolean isOutputFacing(byte aSide) {
+        return aSide == getBaseMetaTileEntity().getFrontFacing();
+    }
+
+    @Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GregtechMetaTileEntityRocketFuelGenerator(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 ITexture[] getSides(final byte aColor) {
-		return new ITexture[] {
-				super.getSides(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
-		};
-	}
-
-	@Override
-	public ITexture[] getSidesActive(final byte aColor) {
-		return new ITexture[] {
-				super.getSidesActive(aColor)[0], this.getCasingTexture(),
-				new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
-		};
-	}
-
-	@Override
-	public ITexture[] getTop(final byte aColor) {
-		return new ITexture[] {
-				super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
-		};
-	}
-
-	@Override
-	public ITexture[] getTopActive(final byte aColor) {
-		return new ITexture[] {
-				super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
-		};
-	}
-
-	@Override
-	public boolean isOutputFacing(final byte aSide) {
-		return aSide == this.getBaseMetaTileEntity().getFrontFacing();
-	}
-
-	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntityRocketFuelGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
-	}
-
-	public void onConfigLoad() {
-		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig,
-				"RocketEngine.efficiency.tier." + this.mTier, 100 - this.mTier * 8);
-	}
+        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/GregtechMetaTileEntitySolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index 50303dbfcd..c41c1851fa 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -1,7 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
+import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -14,200 +16,159 @@ import net.minecraft.entity.player.InventoryPlayer;
 
 public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGenerator {
 
-	ITexture SolarArray[] = {
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV),
-			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)
-	};
-
-	public GregtechMetaTileEntitySolarGenerator(final int aID, final String aName, final String aNameRegional,
-			final int aTier) {
+	public GregtechMetaTileEntitySolarGenerator(int aID, String aName, String aNameRegional, int aTier) {
 		super(aID, aName, aNameRegional, aTier, "Feasts on the power of the Sun!", new ITexture[0]);
-		this.onConfigLoad();
+		onConfigLoad();
 	}
 
-	public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
+	public GregtechMetaTileEntitySolarGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
 		super(aName, aTier, aDescription, aTextures);
-		this.onConfigLoad();
+		onConfigLoad();
 	}
 
 	@Override
-	public ITexture[] getBack(final byte aColor) {
-		return new ITexture[] {
-				super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
-		};
+	public boolean isOutputFacing(byte aSide) {
+		return aSide == getBaseMetaTileEntity().getFrontFacing();
 	}
 
 	@Override
-	public ITexture[] getBackActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
-		};
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new CONTAINER_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, 16000);
 	}
 
 	@Override
-	public ITexture[] getBottom(final byte aColor) {
-		return new ITexture[] {
-				super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
-		};
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GUI_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);
 	}
 
 	@Override
-	public ITexture[] getBottomActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBottomActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
-		};
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
 	}
 
-	@Override
-	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory,
-			final IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GUI_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);
+	public void onConfigLoad() {
+		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SunAbsorber.efficiency.tier." + this.mTier, 100 - this.mTier * 10);
+
 	}
 
 	@Override
-	public int getEfficiency() {
-		return this.mEfficiency;
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork()
+				&& aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()) {
+
+			if (this.mSolarCharge <= 20) {
+				//Utils.LOG_WARNING("1.");
+				this.mSolarCharge = 20;
+				this.mLossTimer = 0;
+			}
+			if (++this.mLossTimer > 45) {
+				//Utils.LOG_WARNING("2.");
+				this.mSolarCharge -= 1;
+				this.mLossTimer = 0;
+			}
+
+			if (aTick % 10L == 0L) {
+
+				Utils.LOG_WARNING("getUniversalEnergyStored: "+aBaseMetaTileEntity.getUniversalEnergyStored() + "    maxEUOutput * 20 + getMinimumStoredEU: " + (maxEUOutput() * 20 + getMinimumStoredEU()));
+
+				if ((this.mSolarCharge > 100) && (aBaseMetaTileEntity.isAllowedToWork()) && 
+						(!aBaseMetaTileEntity.getWorld().isThundering()) && 
+						aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUStore() - getMinimumStoredEU())) {
+					getBaseMetaTileEntity().increaseStoredEnergyUnits(sEnergyPerTick * getEfficiency(), true);
+				}
+			}			 
+
+			if ((this.mSolarCharge < 500) && (this.mProcessingEnergy != 0) && (aTick % 32L == 0L)) {
+				Utils.LOG_WARNING("Adding Solar Charge. Currently "+mSolarCharge);
+				this.mProcessingEnergy -= 1;
+				this.mSolarCharge += 1;
+			}
+
+			if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 64L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) {
+				Utils.LOG_WARNING("Adding Processing Energy. Currently "+mProcessingEnergy);
+				boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F;
+				mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
+			}
+
+			if (aBaseMetaTileEntity.isServerSide()){
+				//Utils.LOG_WARNING("6.");
+				aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored() >= maxEUOutput() + getMinimumStoredEU());
+			}
+		}
 	}
 
 	@Override
-	public ITexture[] getFront(final byte aColor) {
-		return new ITexture[] {
-				super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
+	public void inValidate() {
+
 	}
 
 	@Override
-	public ITexture[] getFrontActive(final byte aColor) {
-		return new ITexture[] {
-				super.getFrontActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
-		};
+	public int getEfficiency() {
+		return this.mEfficiency;
 	}
 
 	@Override
-	public Object getServerGUI(final int aID, final InventoryPlayer aPlayerInventory,
-			final IGregTechTileEntity aBaseMetaTileEntity) {
-		return new CONTAINER_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, 16000);
+	public long maxEUStore() {
+		return Math.max(getEUVar(), V[mTier] * 16000 + getMinimumStoredEU());
 	}
 
+
+	ITexture SolarArray[] = {new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), 
+			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV),
+			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV),
+			new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
+
+
 	@Override
-	public ITexture[] getSides(final byte aColor) {
-		return new ITexture[] {
-				super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
-		};
+	public ITexture[] getFront(byte aColor) {
+		return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
+				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
 	}
 
 	@Override
-	public ITexture[] getSidesActive(final byte aColor) {
-		return new ITexture[] {
-				super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
-		};
+	public ITexture[] getBack(byte aColor) {
+		return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
 	}
 
 	@Override
-	public ITexture[] getTop(final byte aColor) {
-		return new ITexture[] {
-				super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)
-		};
+	public ITexture[] getBottom(byte aColor) {
+		return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
 	}
 
 	@Override
-	public ITexture[] getTopActive(final byte aColor) {
-		return new ITexture[] {
-				super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)
-		};
+	public ITexture[] getTop(byte aColor) {
+		return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
 	}
 
 	@Override
-	public void inValidate() {
-
+	public ITexture[] getSides(byte aColor) {
+		return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
 	}
 
 	@Override
-	public boolean isOutputFacing(final byte aSide) {
-		return aSide == this.getBaseMetaTileEntity().getFrontFacing();
+	public ITexture[] getFrontActive(byte aColor) {
+		return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
+				Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};
 	}
 
 	@Override
-	public long maxEUStore() {
-		return Math.max(this.getEUVar(), GT_Values.V[this.mTier] * 16000 + this.getMinimumStoredEU());
+	public ITexture[] getBackActive(byte aColor) {
+		return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)};
 	}
 
 	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+	public ITexture[] getBottomActive(byte aColor) {
+		return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)};
 	}
 
-	public void onConfigLoad() {
-		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig,
-				"SunAbsorber.efficiency.tier." + this.mTier, 100 - this.mTier * 10);
-
+	@Override
+	public ITexture[] getTopActive(byte aColor) {
+		return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
 	}
 
 	@Override
-	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-		if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity
-				.getUniversalEnergyStored() < this.maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()) {
-
-			if (this.mSolarCharge <= 20) {
-				// Utils.LOG_WARNING("1.");
-				this.mSolarCharge = 20;
-				this.mLossTimer = 0;
-			}
-			if (++this.mLossTimer > 45) {
-				// Utils.LOG_WARNING("2.");
-				this.mSolarCharge -= 1;
-				this.mLossTimer = 0;
-			}
-
-			if (aTick % 10L == 0L) {
-
-				Utils.LOG_WARNING("getUniversalEnergyStored: " + aBaseMetaTileEntity.getUniversalEnergyStored()
-						+ "    maxEUOutput * 20 + getMinimumStoredEU: "
-						+ (this.maxEUOutput() * 20 + this.getMinimumStoredEU()));
-
-				if (this.mSolarCharge > 100 && aBaseMetaTileEntity.isAllowedToWork()
-						&& !aBaseMetaTileEntity.getWorld().isThundering() && aBaseMetaTileEntity
-								.getUniversalEnergyStored() < this.maxEUStore() - this.getMinimumStoredEU()) {
-					this.getBaseMetaTileEntity().increaseStoredEnergyUnits(
-							GregtechMetaSolarGenerator.sEnergyPerTick * this.getEfficiency(), true);
-				}
-			}
-
-			if (this.mSolarCharge < 500 && this.mProcessingEnergy != 0 && aTick % 32L == 0L) {
-				Utils.LOG_WARNING("Adding Solar Charge. Currently " + this.mSolarCharge);
-				this.mProcessingEnergy -= 1;
-				this.mSolarCharge += 1;
-			}
-
-			if (this.mProcessingEnergy <= 0 && aBaseMetaTileEntity.isAllowedToWork() && aTick % 64L == 0L
-					&& !aBaseMetaTileEntity.getWorld().isThundering()) {
-				Utils.LOG_WARNING("Adding Processing Energy. Currently " + this.mProcessingEnergy);
-				final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining()
-						&& aBaseMetaTileEntity.getBiome().rainfall > 0.0F;
-				this.mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4
-						|| !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0
-								: !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
-			}
-
-			if (aBaseMetaTileEntity.isServerSide()) {
-				// Utils.LOG_WARNING("6.");
-				aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity
-						.getUniversalEnergyStored() >= this.maxEUOutput() + this.getMinimumStoredEU());
-			}
-		}
+	public ITexture[] getSidesActive(byte aColor) {
+		return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)};
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
index be4a51a02f..5d1befbbad 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
@@ -8,129 +8,97 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSuperConductorNodeBase;
 
-public class GregtechMetaTileEntitySuperCondensor extends GregtechMetaSuperConductorNodeBase {
-
-	public int mEfficiency;
-
-	public GregtechMetaTileEntitySuperCondensor(final int aID, final String aName, final String aNameRegional,
-			final int aTier) {
-		super(aID, aName, aNameRegional, aTier, "Requires liquid Nitrogen/Helium", new ITexture[0]);
-		this.onConfigLoad();
-	}
-
-	public GregtechMetaTileEntitySuperCondensor(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
-		super(aName, aTier, aDescription, aTextures);
-		this.onConfigLoad();
-	}
-
-	@Override
-	public ITexture[] getBack(final byte aColor) {
-		return new ITexture[] {
-				super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getBackActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getBottom(final byte aColor) {
-		return new ITexture[] {
-				super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getBottomActive(final byte aColor) {
-		return new ITexture[] {
-				super.getBottomActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]
-		};
-	}
-
-	@Override
+public class GregtechMetaTileEntitySuperCondensor
+        extends GregtechMetaSuperConductorNodeBase {
+
+    public int mEfficiency;
+
+    public GregtechMetaTileEntitySuperCondensor(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, "Requires liquid Nitrogen/Helium", new ITexture[0]);
+        onConfigLoad();
+    }
+
+    public GregtechMetaTileEntitySuperCondensor(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 GregtechMetaTileEntitySuperCondensor(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 64000;
-	}
+        return 64000;
+    }
 
-	@Override
+    public void onConfigLoad() {
+        this.mEfficiency = 100;
+    }
+
+    @Override
 	public int getEfficiency() {
-		return this.mEfficiency;
-	}
-
-	@Override
-	public ITexture[] getFront(final byte aColor) {
-		return new ITexture[] {
-				super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getFrontActive(final byte aColor) {
-		return new ITexture[] {
-				super.getFrontActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-		};
-	}
-
-	@Override
-	public GT_Recipe.GT_Recipe_Map getRecipes() {
-		return GT_Recipe.GT_Recipe_Map.sDieselFuels;
-	}
-
-	@Override
-	public ITexture[] getSides(final byte aColor) {
-		return new ITexture[] {
-				super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getSidesActive(final byte aColor) {
-		return new ITexture[] {
-				super.getSidesActive(aColor)[0],
-				new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR),
-				Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]
-		};
-	}
-
-	@Override
-	public ITexture[] getTop(final byte aColor) {
-		return new ITexture[] {
-				super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
-		};
-	}
-
-	@Override
-	public ITexture[] getTopActive(final byte aColor) {
-		return new ITexture[] {
-				super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
-		};
-	}
-
-	@Override
-	public boolean isOutputFacing(final byte aSide) {
-		return aSide == this.getBaseMetaTileEntity().getFrontFacing();
-	}
-
-	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntitySuperCondensor(this.mName, this.mTier, this.mDescription, this.mTextures);
-	}
-
-	public void onConfigLoad() {
-		this.mEfficiency = 100;
-	}
+        return this.mEfficiency;
+    }
+
+    @Override
+	public ITexture[] getFront(byte aColor) {
+        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getBack(byte aColor) {
+        return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getBottom(byte aColor) {
+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getTop(byte aColor) {
+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)};
+    }
+
+    @Override
+	public ITexture[] getSides(byte aColor) {
+        return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getFrontActive(byte aColor) {
+        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getBackActive(byte aColor) {
+        return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getBottomActive(byte aColor) {
+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]};
+    }
+
+    @Override
+	public ITexture[] getTopActive(byte aColor) {
+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)};
+    }
+
+    @Override
+	public ITexture[] getSidesActive(byte aColor) {
+        return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR), Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier]};
+    }
 }