Reformat code

8 files changed, 807 insertions, 982 deletions

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
index 4ed569dcc2..eaa17b62ff 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
@@ -5,122 +5,99 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.ItemList;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.*;

-import gregtech.api.objects.GT_ArrayList;

+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;

 import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_Config;

 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 import net.minecraft.item.ItemStack;

 

 public class GT_MetaTileEntity_DieselGenerator

-  extends GT_MetaTileEntity_BasicGenerator

-{

-	

-				public int mEfficiency;

-  public boolean isOutputFacing(byte aSide)

-  {

-    return aSide == getBaseMetaTileEntity().getFrontFacing();

-  }

-  

-  public GT_MetaTileEntity_DieselGenerator(int aID, String aName, String aNameRegional, int aTier)

-  {

-    super(aID, aName, aNameRegional, aTier, "Requires liquid Fuel", new ITexture[0]);

-					onConfigLoad();

-  }

-  

-  public GT_MetaTileEntity_DieselGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

-  {

-    super(aName, aTier, aDescription, aTextures);

-				onConfigLoad();

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_DieselGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);

-  }

-  

-  public GT_Recipe.GT_Recipe_Map getRecipes()

-  {

-    return GT_Recipe.GT_Recipe_Map.sDieselFuels;

-  }

-  

-  public int getCapacity()

-  {

-    return 16000;

-  }

-

-  public void onConfigLoad()

-  {

-				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier."+this.mTier, (100 - this.mTier * 10));

-}

+        extends GT_MetaTileEntity_BasicGenerator {

+

+    public int mEfficiency;

+

+    public GT_MetaTileEntity_DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {

+        super(aID, aName, aNameRegional, aTier, "Requires liquid Fuel", new ITexture[0]);

+        onConfigLoad();

+    }

+

+    public GT_MetaTileEntity_DieselGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

+        super(aName, aTier, aDescription, aTextures);

+        onConfigLoad();

+    }

+

+    public boolean isOutputFacing(byte aSide) {

+        return aSide == getBaseMetaTileEntity().getFrontFacing();

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_DieselGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);

+    }

+

+    public GT_Recipe.GT_Recipe_Map getRecipes() {

+        return GT_Recipe.GT_Recipe_Map.sDieselFuels;

+    }

+

+    public int getCapacity() {

+        return 16000;

+    }

+

+    public void onConfigLoad() {

+        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (100 - this.mTier * 10));

+    }

+

+    public int getEfficiency() {

+        return this.mEfficiency;

+    }

+

+    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;

+    }

 

-  public int getEfficiency()

-  {

-    return this.mEfficiency;

-  }

-  

-  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;

-  }

-  

-  public ITexture[] getFront(byte aColor)

-  {

-    return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };

-  }

-  

-  public ITexture[] getBack(byte aColor)

-  {

-    return new ITexture[] { super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK) };

-  }

-  

-  public ITexture[] getBottom(byte aColor)

-  {

-    return new ITexture[] { super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };

-  }

-  

-  public ITexture[] getTop(byte aColor)

-  {

-    return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };

-  }

-  

-  public ITexture[] getSides(byte aColor)

-  {

-    return new ITexture[] { super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) };

-  }

-  

-  public ITexture[] getFrontActive(byte aColor)

-  {

-    return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };

-  }

-  

-  public ITexture[] getBackActive(byte aColor)

-  {

-    return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE) };

-  }

-  

-  public ITexture[] getBottomActive(byte aColor)

-  {

-    return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };

-  }

-  

-  public ITexture[] getTopActive(byte aColor)

-  {

-    return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };

-  }

-  

-  public ITexture[] getSidesActive(byte aColor)

-  {

-    return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) };

-  }

+    public ITexture[] getFront(byte aColor) {

+        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};

+    }

+

+    public ITexture[] getBack(byte aColor) {

+        return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK)};

+    }

+

+    public ITexture[] getBottom(byte aColor) {

+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)};

+    }

+

+    public ITexture[] getTop(byte aColor) {

+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)};

+    }

+

+    public ITexture[] getSides(byte aColor) {

+        return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)};

+    }

+

+    public ITexture[] getFrontActive(byte aColor) {

+        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};

+    }

+

+    public ITexture[] getBackActive(byte aColor) {

+        return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE)};

+    }

+

+    public ITexture[] getBottomActive(byte aColor) {

+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)};

+    }

+

+    public ITexture[] getTopActive(byte aColor) {

+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)};

+    }

+

+    public ITexture[] getSidesActive(byte aColor) {

+        return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)};

+    }

 }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
index fef02461b1..928c7261f7 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
@@ -3,106 +3,88 @@ package gregtech.common.tileentities.generators;
 import gregtech.api.GregTech_API;

 import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 

 public class GT_MetaTileEntity_FluidNaquadahReactor

-  extends GT_MetaTileEntity_BasicGenerator

-{

-	public int mEfficiency;

-  public boolean isOutputFacing(byte aSide)

-  {

-    return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing());

-  }

-  

-  public GT_MetaTileEntity_FluidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier)

-  {

-    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);onConfigLoad();

-  }

-  

-  public GT_MetaTileEntity_FluidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

-  {

-    super(aName, aTier, aDescription, aTextures);onConfigLoad();

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_FluidNaquadahReactor(this.mName, this.mTier, this.mDescription, this.mTextures);

-  }

-  

-  public GT_Recipe.GT_Recipe_Map getRecipes()

-  {

-    return GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels;

-  }

-  

-  public int getCapacity()

-  {

-    return 16000;

-  }

-  

-  public int getEfficiency()

-  {

-    return mEfficiency;

-  }

-  

-  public void onConfigLoad()

-  {

-				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "FluidNaquadah.efficiency.tier."+this.mTier, 100);

-}

-  

-  public ITexture[] getFront(byte aColor)

-  {

-    return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT) };

-  }

-  

-  public ITexture[] getBack(byte aColor)

-  {

-    return new ITexture[] { super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BACK) };

-  }

-  

-  public ITexture[] getBottom(byte aColor)

-  {

-    return new ITexture[] { super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BOTTOM) };

-  }

-  

-  public ITexture[] getTop(byte aColor)

-  {

-    return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP) };

-  }

-  

-  public ITexture[] getSides(byte aColor)

-  {

-    return new ITexture[] { super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };

-  }

-  

-  public ITexture[] getFrontActive(byte aColor)

-  {

-    return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT_ACTIVE) };

-  }

-  

-  public ITexture[] getBackActive(byte aColor)

-  {

-    return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BACK_ACTIVE) };

-  }

-  

-  public ITexture[] getBottomActive(byte aColor)

-  {

-    return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BOTTOM_ACTIVE) };

-  }

-  

-  public ITexture[] getTopActive(byte aColor)

-  {

-    return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE) };

-  }

-  

-  public ITexture[] getSidesActive(byte aColor)

-  {

-    return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };

-  }

+        extends GT_MetaTileEntity_BasicGenerator {

+    public int mEfficiency;

+

+    public GT_MetaTileEntity_FluidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier) {

+        super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);

+        onConfigLoad();

+    }

+

+    public GT_MetaTileEntity_FluidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

+        super(aName, aTier, aDescription, aTextures);

+        onConfigLoad();

+    }

+

+    public boolean isOutputFacing(byte aSide) {

+        return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing());

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_FluidNaquadahReactor(this.mName, this.mTier, this.mDescription, this.mTextures);

+    }

+

+    public GT_Recipe.GT_Recipe_Map getRecipes() {

+        return GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels;

+    }

+

+    public int getCapacity() {

+        return 16000;

+    }

+

+    public int getEfficiency() {

+        return mEfficiency;

+    }

+

+    public void onConfigLoad() {

+        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "FluidNaquadah.efficiency.tier." + this.mTier, 100);

+    }

+

+    public ITexture[] getFront(byte aColor) {

+        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT)};

+    }

+

+    public ITexture[] getBack(byte aColor) {

+        return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BACK)};

+    }

+

+    public ITexture[] getBottom(byte aColor) {

+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BOTTOM)};

+    }

+

+    public ITexture[] getTop(byte aColor) {

+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP)};

+    }

+

+    public ITexture[] getSides(byte aColor) {

+        return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)};

+    }

+

+    public ITexture[] getFrontActive(byte aColor) {

+        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT_ACTIVE)};

+    }

+

+    public ITexture[] getBackActive(byte aColor) {

+        return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BACK_ACTIVE)};

+    }

+

+    public ITexture[] getBottomActive(byte aColor) {

+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_BOTTOM_ACTIVE)};

+    }

+

+    public ITexture[] getTopActive(byte aColor) {

+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE)};

+    }

+

+    public ITexture[] getSidesActive(byte aColor) {

+        return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)};

+    }

 }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
index 488771a691..0f6db156c1 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
@@ -3,110 +3,90 @@ package gregtech.common.tileentities.generators;
 import gregtech.api.GregTech_API;

 import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 

 public class GT_MetaTileEntity_GasTurbine

-  extends GT_MetaTileEntity_BasicGenerator

-{

-

-	public int mEfficiency;

-  public boolean isOutputFacing(byte aSide)

-  {

-    return aSide == getBaseMetaTileEntity().getFrontFacing();

-  }

-  

-  public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier)

-  {

-    super(aID, aName, aNameRegional, aTier, "Requires flammable Gasses", new ITexture[0]);

-onConfigLoad();

-  }

-  

-  public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

-  {

-    super(aName, aTier, aDescription, aTextures);

-onConfigLoad();

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures);

-  }

-  

-  public GT_Recipe.GT_Recipe_Map getRecipes()

-  {

-    return GT_Recipe.GT_Recipe_Map.sTurbineFuels;

-  }

-  

-  public int getCapacity()

-  {

-    return 16000;

-  }

-

-public void onConfigLoad()

-  {

-				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier."+this.mTier, (100 - this.mTier * 10));

-}

+        extends GT_MetaTileEntity_BasicGenerator {

+

+    public int mEfficiency;

+

+    public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier) {

+        super(aID, aName, aNameRegional, aTier, "Requires flammable Gasses", new ITexture[0]);

+        onConfigLoad();

+    }

+

+    public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

+        super(aName, aTier, aDescription, aTextures);

+        onConfigLoad();

+    }

+

+    public boolean isOutputFacing(byte aSide) {

+        return aSide == getBaseMetaTileEntity().getFrontFacing();

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures);

+    }

+

+    public GT_Recipe.GT_Recipe_Map getRecipes() {

+        return GT_Recipe.GT_Recipe_Map.sTurbineFuels;

+    }

+

+    public int getCapacity() {

+        return 16000;

+    }

+

+    public void onConfigLoad() {

+        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, (100 - this.mTier * 10));

+    }

+

+

+    public int getEfficiency() {

+        return this.mEfficiency;

+    }

+

+    public ITexture[] getFront(byte aColor) {

+        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};

+    }

+

+    public ITexture[] getBack(byte aColor) {

+        return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BACK)};

+    }

+

+    public ITexture[] getBottom(byte aColor) {

+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BOTTOM)};

+    }

+

+    public ITexture[] getTop(byte aColor) {

+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_TOP)};

+    }

+

+    public ITexture[] getSides(byte aColor) {

+        return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE)};

+    }

+

+    public ITexture[] getFrontActive(byte aColor) {

+        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};

+    }

+

+    public ITexture[] getBackActive(byte aColor) {

+        return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BACK_ACTIVE)};

+    }

+

+    public ITexture[] getBottomActive(byte aColor) {

+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BOTTOM_ACTIVE)};

+    }

+

+    public ITexture[] getTopActive(byte aColor) {

+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_TOP_ACTIVE)};

+    }

 

-  

-  public int getEfficiency()

-  {

-    return this.mEfficiency;

-  }

-  

-  public ITexture[] getFront(byte aColor)

-  {

-    return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };

-  }

-  

-  public ITexture[] getBack(byte aColor)

-  {

-    return new ITexture[] { super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BACK) };

-  }

-  

-  public ITexture[] getBottom(byte aColor)

-  {

-    return new ITexture[] { super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BOTTOM) };

-  }

-  

-  public ITexture[] getTop(byte aColor)

-  {

-    return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_TOP) };

-  }

-  

-  public ITexture[] getSides(byte aColor)

-  {

-    return new ITexture[] { super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE) };

-  }

-  

-  public ITexture[] getFrontActive(byte aColor)

-  {

-    return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };

-  }

-  

-  public ITexture[] getBackActive(byte aColor)

-  {

-    return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BACK_ACTIVE) };

-  }

-  

-  public ITexture[] getBottomActive(byte aColor)

-  {

-    return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BOTTOM_ACTIVE) };

-  }

-  

-  public ITexture[] getTopActive(byte aColor)

-  {

-    return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_TOP_ACTIVE) };

-  }

-  

-  public ITexture[] getSidesActive(byte aColor)

-  {

-    return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE) };

-  }

+    public ITexture[] getSidesActive(byte aColor) {

+        return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE)};

+    }

 }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
index 06935e6137..602c7fc8d0 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
@@ -3,110 +3,90 @@ package gregtech.common.tileentities.generators;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Textures;
-import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 
 public class GT_MetaTileEntity_MagicEnergyConverter
-  extends GT_MetaTileEntity_BasicGenerator
-{
-
-	public int mEfficiency;
-  public boolean isOutputFacing(byte aSide)
-  {
-    return aSide == getBaseMetaTileEntity().getFrontFacing();
-  }
-  
-  public GT_MetaTileEntity_MagicEnergyConverter(int aID, String aName, String aNameRegional, int aTier)
-  {
-    super(aID, aName, aNameRegional, aTier, "Put your strange stuff in here", new ITexture[0]);
-onConfigLoad();
-  }
-  
-  public GT_MetaTileEntity_MagicEnergyConverter(String aName, int aTier, String aDescription, ITexture[][][] aTextures)
-  {
-    super(aName, aTier, aDescription, aTextures);
-onConfigLoad();
-  }
-  
-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-  {
-    return new GT_MetaTileEntity_MagicEnergyConverter(this.mName, this.mTier, this.mDescription, this.mTextures);
-  }
-  
-  public GT_Recipe.GT_Recipe_Map getRecipes()
-  {
-    return GT_Recipe.GT_Recipe_Map.sMagicFuels;
-  }
-  
-  public int getCapacity()
-  {
-    return 16000;
-  }
-
-public void onConfigLoad()
-  {
-				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyConverter.efficiency.tier."+this.mTier, 100-this.mTier*10);
-}
-
-  
-  public int getEfficiency()
-  {
-    return this.mEfficiency;
-  }
-  
-  public ITexture[] getFront(byte aColor)
-  {
-    return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
-  }
-  
-  public ITexture[] getBack(byte aColor)
-  {
-    return new ITexture[] { super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT) };
-  }
-  
-  public ITexture[] getBottom(byte aColor)
-  {
-    return new ITexture[] { super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
-  }
-  
-  public ITexture[] getTop(byte aColor)
-  {
-    return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
-  }
-  
-  public ITexture[] getSides(byte aColor)
-  {
-    return new ITexture[] { super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
-  }
-  
-  public ITexture[] getFrontActive(byte aColor)
-  {
-    return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
-  }
-  
-  public ITexture[] getBackActive(byte aColor)
-  {
-    return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE) };
-  }
-  
-  public ITexture[] getBottomActive(byte aColor)
-  {
-    return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
-  }
-  
-  public ITexture[] getTopActive(byte aColor)
-  {
-    return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
-  }
-  
-  public ITexture[] getSidesActive(byte aColor)
-  {
-    return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
-  }
+        extends GT_MetaTileEntity_BasicGenerator {
+
+    public int mEfficiency;
+
+    public GT_MetaTileEntity_MagicEnergyConverter(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, "Put your strange stuff in here", new ITexture[0]);
+        onConfigLoad();
+    }
+
+    public GT_MetaTileEntity_MagicEnergyConverter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        onConfigLoad();
+    }
+
+    public boolean isOutputFacing(byte aSide) {
+        return aSide == getBaseMetaTileEntity().getFrontFacing();
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_MagicEnergyConverter(this.mName, this.mTier, this.mDescription, this.mTextures);
+    }
+
+    public GT_Recipe.GT_Recipe_Map getRecipes() {
+        return GT_Recipe.GT_Recipe_Map.sMagicFuels;
+    }
+
+    public int getCapacity() {
+        return 16000;
+    }
+
+    public void onConfigLoad() {
+        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyConverter.efficiency.tier." + this.mTier, 100 - this.mTier * 10);
+    }
+
+
+    public int getEfficiency() {
+        return this.mEfficiency;
+    }
+
+    public ITexture[] getFront(byte aColor) {
+        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};
+    }
+
+    public ITexture[] getBack(byte aColor) {
+        return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT)};
+    }
+
+    public ITexture[] getBottom(byte aColor) {
+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
+    }
+
+    public ITexture[] getTop(byte aColor) {
+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
+    }
+
+    public ITexture[] getSides(byte aColor) {
+        return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
+    }
+
+    public ITexture[] getFrontActive(byte aColor) {
+        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};
+    }
+
+    public ITexture[] getBackActive(byte aColor) {
+        return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE)};
+    }
+
+    public ITexture[] getBottomActive(byte aColor) {
+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)};
+    }
+
+    public ITexture[] getTopActive(byte aColor) {
+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)};
+    }
+
+    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/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
index 18add4535b..f638bebad5 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
@@ -1,304 +1,270 @@
 package gregtech.common.tileentities.generators;
 
-import static gregtech.api.enums.GT_Values.V;
-
-import java.util.ArrayList;
-
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.aspects.IEssentiaContainerItem;
-import thaumcraft.api.visnet.VisNetHandler;
 import cpw.mods.fml.common.Loader;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Recipe;
 import net.minecraft.block.Block;