Merge pull request #1 from GTNewHorizons/experimental

5/24

4 files changed, 291 insertions, 299 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 b1505b0e2a..c745bfae20 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
@@ -1,129 +1,132 @@
-package gregtech.common.tileentities.generators;

-

-import cpw.mods.fml.common.registry.GameRegistry;

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.ConfigCategories;

-import gregtech.api.enums.ItemList;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

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

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_Log;

-import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.item.ItemStack;

-

-public class GT_MetaTileEntity_DieselGenerator

-        extends GT_MetaTileEntity_BasicGenerator {

-

-    public static final int BASE_POLLUTION = 2;

-

-    public int mEfficiency;

-

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

-        super(aID, aName, aNameRegional, aTier, new String[]{

-                "Requires liquid Fuel",

-                "Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"});

-        onConfigLoad();

-    }

-

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

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

-        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.mDescriptionArray, 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 * 5));

-    }

-

-    public int getEfficiency() {

-        return this.mEfficiency;

-    }

-

-    public int getFuelValue(ItemStack aStack) {

-        if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;

-        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 void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

-        if(aTick%100==0 && mFluid!=null && mFluid.amount>this.getCapacity()){

-            GT_Log.err.println("Dupe Abuse: "+aBaseMetaTileEntity.getOwnerName()+" Coords: "+aBaseMetaTileEntity.getXCoord()+" "+aBaseMetaTileEntity.getYCoord()+" "+aBaseMetaTileEntity.getZCoord());

-            aBaseMetaTileEntity.setToFire();

-        }

-        super.onPostTick(aBaseMetaTileEntity, aTick);

-    }

-

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

-    }

-

-    @Override

-    public int getPollution() {

-        return (int) (GT_MetaTileEntity_DieselGenerator.BASE_POLLUTION * Math.pow(2, mTier - 1));

-    }

-}

+package gregtech.common.tileentities.generators;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+public class GT_MetaTileEntity_DieselGenerator
+        extends GT_MetaTileEntity_BasicGenerator {
+
+    public static final int BASE_POLLUTION = 2;
+
+    public int mEfficiency;
+
+    public GT_MetaTileEntity_DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, new String[]{
+                "Requires liquid Fuel",
+                "Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"});
+        onConfigLoad();
+    }
+
+    public GT_MetaTileEntity_DieselGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        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.mDescriptionArray, 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 * 5));
+    }
+
+    public int getEfficiency() {
+        return this.mEfficiency;
+    }
+
+    public int getFuelValue(ItemStack aStack) {
+        if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;
+        long 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);
+        }
+        if(rValue> Integer.MAX_VALUE){
+            throw new ArithmeticException("Integer LOOPBACK!");
+        }
+        return (int)rValue;
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if(aTick%100==0 && mFluid!=null && mFluid.amount>this.getCapacity()){
+            GT_Log.err.println("Dupe Abuse: "+aBaseMetaTileEntity.getOwnerName()+" Coords: "+aBaseMetaTileEntity.getXCoord()+" "+aBaseMetaTileEntity.getYCoord()+" "+aBaseMetaTileEntity.getZCoord());
+            aBaseMetaTileEntity.setToFire();
+        }
+        super.onPostTick(aBaseMetaTileEntity, aTick);
+    }
+
+    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)};
+    }
+
+    @Override
+    public int getPollution() {
+        return (int) (GT_MetaTileEntity_DieselGenerator.BASE_POLLUTION * Math.pow(2, mTier - 1));
+    }
+}
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 bb3b24f5e3..b92307002e 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
@@ -27,9 +27,7 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.util.ForgeDirection;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectSourceHelper;
-import thaumcraft.api.aspects.IAspectSource;
+import thaumcraft.api.aspects.*;
 import thaumcraft.api.visnet.VisNetHandler;
 
 import java.util.*;
@@ -567,14 +565,21 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
             IGregTechTileEntity tBaseMetaTileEntity = mAbsorber.getBaseMetaTileEntity();
             if (tBaseMetaTileEntity.isInvalidTileEntity()) return;
             int tRange = getRange();
+            int tY = tBaseMetaTileEntity.getYCoord();
+            int tMaxY = tBaseMetaTileEntity.getWorld().getHeight()-1;
+            // Make sure relative Y range stays between 0 and world max Y
+            int rYMin = (tY - tRange >= 0) ? -tRange : -(tY);
+            int rYMax = (((tY + tRange) <= tMaxY)? tRange : tMaxY - tY);
             mAvailableAspects.clear();
             for (int rX = -tRange; rX <= tRange; rX++) {
                 for (int rZ = -tRange; rZ <= tRange; rZ++) {
-                    // rY < tRange is not a bug. See: thaumcraft.common.lib.events.EssentiaHandler.getSources()
-                    for (int rY = -tRange; rY < tRange; rY++) {
+                    // rY < rYMax is not a bug. See: thaumcraft.common.lib.events.EssentiaHandler.getSources()
+                    for (int rY = rYMin; rY < rYMax; rY++) {
                         TileEntity tTile = tBaseMetaTileEntity.getTileEntityOffset(rX, rY, rZ);
-                        if (tTile instanceof IAspectSource) {
-                            Set<Aspect> tAspects = ((IAspectSource) tTile).getAspects().aspects.keySet();
+                        if (tTile instanceof IAspectContainer) {
+                            AspectList tAspectList = ((IAspectContainer) tTile).getAspects();
+                            if (tAspectList == null || tAspectList.aspects.isEmpty()) continue;
+                            Set<Aspect> tAspects = tAspectList.aspects.keySet();
                             mAvailableAspects.addAll(tAspects);
                         }
                     }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
index 769b87676c..c075fda8a4 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
@@ -12,25 +12,21 @@ import gregtech.api.util.GT_Recipe;
 
 public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGenerator {
 
-    public int mEfficiency;
-    public GT_Recipe.GT_Recipe_Map mRecipeMap = null;
+    private int mEfficiency;
 
     public GT_MetaTileEntity_NaquadahReactor(int aID, String aName, String[] aDescription, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, aDescription, new ITexture[0]);
         if (aTier > 8 || aTier < 4) {
-            new Exception("Tier without Recipe Map!");
+            new Exception("Tier without Recipe Map!").printStackTrace();
         }
         onConfigLoad();
     }
 
-    public GT_MetaTileEntity_NaquadahReactor(int aID, String aName, String[] aDescription, String aNameRegional, GT_Recipe.GT_Recipe_Map mRecipeMap, int aTier) {
-        super(aID, aName, aNameRegional, aTier, aDescription, new ITexture[0]);
-        this.mRecipeMap=mRecipeMap;
-        onConfigLoad();
-    }
-
     public GT_MetaTileEntity_NaquadahReactor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
+        if (aTier > 8 || aTier < 4) {
+            new Exception("Tier without Recipe Map!").printStackTrace();
+        }
         onConfigLoad();
     }
 
@@ -66,7 +62,7 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
                 break;
             }
             default:{
-                ret = mRecipeMap;
+                ret = null;
                 break;
             }
 
@@ -75,31 +71,19 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
     }
 
     public int getCapacity() {
-        return mRecipeMap != null ? mRecipeMap.mMinimalInputFluids>0 ? 8000*(mTier+1) : 0 : 0 ;
+        return getRecipes() != null ? getRecipes().mMinimalInputFluids>0 ? 8000*(mTier+1) : 0 : 0 ;
     }
 
     public int getEfficiency() {
-        return mEfficiency;
+        return mEfficiency == 0 ? onConfigLoad() : mEfficiency;
     }
 
     private int getBaseEff(){
-        int ret;
-        switch (this.mTier){
-            case 4: {
-                ret = 80;
-                break;
-            }
-            default: {
-                ret = 100 + (50*(mTier-5));
-                break;
-            }
-
-        }
-        return ret;
+        return mTier == 4 ? 80 : 100 + (50*(mTier-5));
     }
 
-    public void onConfigLoad() {
-        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier." + this.mTier, getBaseEff());
+    public int onConfigLoad() {
+       return this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier." + this.mTier, getBaseEff());
     }
 
     public ITexture[] getFront(byte aColor) {
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
index e63fbe0579..b248dc5aae 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
@@ -1,136 +1,136 @@
-package gregtech.common.tileentities.generators;

-

-import gregtech.api.GregTech_API;

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

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

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Recipe;

-import net.minecraftforge.fluids.FluidStack;

-

-public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGenerator {

-

-    public int mEfficiency;

-

-    public GT_MetaTileEntity_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, new String[]{

-                "Converts Steam into EU",

-                "Base rate: 2L of Steam -> 1 EU"});

-        onConfigLoad();

-    }

-

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

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

-        onConfigLoad();

-    }

-

-    public GT_MetaTileEntity_SteamTurbine(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_SteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);

-    }

-

-    public GT_Recipe.GT_Recipe_Map getRecipes() {

-        return null;

-    }

-

-    @Override

-    public String[] getDescription() {

-        String[] desc = new String[mDescriptionArray.length + 2];

-        System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);

-        desc[mDescriptionArray.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";

-        desc[mDescriptionArray.length + 1] = String.format("Consumes up to %sL of Steam per second",

-                (int) (4000 * (8 * Math.pow(4, mTier) + Math.pow(2, mTier)) / (600 / getEfficiency())));

-        return desc;

-    }

-

-    public int getCapacity() {

-        return 24000 * this.mTier;

-    }

-

-    public void onConfigLoad() {

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

-    }

-

-    public int getEfficiency() {

-        return this.mEfficiency;

-    }

-

-    public int getFuelValue(FluidStack aLiquid) {

-        if (aLiquid == null) return 0;

-        String fluidName = aLiquid.getFluid().getUnlocalizedName(aLiquid);

-        return GT_ModHandler.isSteam(aLiquid) || fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name") ? 3 : 0;

-    }

-

-    public int consumedFluidPerOperation(FluidStack aLiquid) {

-        return this.mEfficiency;

-    }

-

-    public ITexture[] getFront(byte aColor) {

-        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_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.STEAM_TURBINE_BACK)};

-    }

-

-    public ITexture[] getBottom(byte aColor) {

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

-    }

-

-    public ITexture[] getTop(byte aColor) {

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

-    }

-

-    public ITexture[] getSides(byte aColor) {

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

-    }

-

-    public ITexture[] getFrontActive(byte aColor) {

-        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_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.STEAM_TURBINE_BACK_ACTIVE)};

-    }

-

-    public ITexture[] getBottomActive(byte aColor) {

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

-    }

-

-    public ITexture[] getTopActive(byte aColor) {

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

-    }

-

-    public ITexture[] getSidesActive(byte aColor) {

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

-    }

-

-    @Override

-    public int getPollution() {

-        return 0;

-    }

-

-    @Override

-    public boolean isFluidInputAllowed(FluidStack aFluid) {

-        if (aFluid.getFluid().getUnlocalizedName(aFluid).equals("ic2.fluidSuperheatedSteam")) {

-            aFluid.amount = 0;

-            aFluid = null;

-            return false;

-        }

-        return super.isFluidInputAllowed(aFluid);

-    }

-}

+package gregtech.common.tileentities.generators;
+
+import gregtech.api.GregTech_API;
+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;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGenerator {
+
+    public int mEfficiency;
+
+    public GT_MetaTileEntity_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, new String[]{
+                "Converts Steam into EU",
+                "Base rate: 2L of Steam -> 1 EU"});
+        onConfigLoad();
+    }
+
+    public GT_MetaTileEntity_SteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        onConfigLoad();
+    }
+
+    public GT_MetaTileEntity_SteamTurbine(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_SteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+    }
+
+    public GT_Recipe.GT_Recipe_Map getRecipes() {
+        return null;
+    }
+
+    @Override
+    public String[] getDescription() {
+        String[] desc = new String[mDescriptionArray.length + 2];
+        System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
+        desc[mDescriptionArray.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";
+        desc[mDescriptionArray.length + 1] = String.format("Consumes up to %sL of Steam per second",
+                (int) (4000 * (8 * Math.pow(4, mTier) + Math.pow(2, mTier)) / (600 / getEfficiency())));
+        return desc;
+    }
+
+    public int getCapacity() {
+        return 24000 * this.mTier;
+    }
+
+    public void onConfigLoad() {
+        this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + this.mTier);
+    }
+
+    public int getEfficiency() {
+        return this.mEfficiency;
+    }
+
+    public int getFuelValue(FluidStack aLiquid) {
+        if (aLiquid == null) return 0;
+        String fluidName = aLiquid.getFluid().getUnlocalizedName(aLiquid);
+        return GT_ModHandler.isSteam(aLiquid) || fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name") ? 3 : 0;
+    }
+
+    public int consumedFluidPerOperation(FluidStack aLiquid) {
+        return this.mEfficiency;
+    }
+
+    public ITexture[] getFront(byte aColor) {
+        return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_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.STEAM_TURBINE_BACK)};
+    }
+
+    public ITexture[] getBottom(byte aColor) {
+        return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_BOTTOM)};
+    }
+
+    public ITexture[] getTop(byte aColor) {
+        return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_TOP)};
+    }
+
+    public ITexture[] getSides(byte aColor) {
+        return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_SIDE)};
+    }
+
+    public ITexture[] getFrontActive(byte aColor) {
+        return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_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.STEAM_TURBINE_BACK_ACTIVE)};
+    }
+
+    public ITexture[] getBottomActive(byte aColor) {
+        return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_BOTTOM_ACTIVE)};
+    }
+
+    public ITexture[] getTopActive(byte aColor) {
+        return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_TOP_ACTIVE)};
+    }
+
+    public ITexture[] getSidesActive(byte aColor) {
+        return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_SIDE_ACTIVE)};
+    }
+
+    @Override
+    public int getPollution() {
+        return 0;
+    }
+
+    @Override
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        if (aFluid.getFluid().getUnlocalizedName(aFluid).equals("ic2.fluidSuperheatedSteam")) {
+            aFluid.amount = 0;
+            aFluid = null;
+            return false;
+        }
+        return super.isFluidInputAllowed(aFluid);
+    }
+}