Merge pull request #4 from Blood-Asp/unstable

update

2 files changed, 18 insertions, 1 deletions

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 c2b8676c4d..46ebb56e9a 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
@@ -2,6 +2,7 @@ package gregtech.common.tileentities.generators;
 

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.ConfigCategories;

+import gregtech.api.enums.GT_Values;

 import gregtech.api.enums.Textures;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

@@ -43,6 +44,11 @@ public class GT_MetaTileEntity_FluidNaquadahReactor
     public int getEfficiency() {

         return mEfficiency;

     }

+    

+    @Override

+    public long maxEUStore() {

+        return Math.max(getEUVar(), GT_Values.V[mTier] * 120 + getMinimumStoredEU());

+    }

 

     public void onConfigLoad() {

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

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 8d27bd3fd9..99bbe17508 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
@@ -56,7 +56,8 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
     }

 

     public int getFuelValue(FluidStack aLiquid) {

-        return GT_ModHandler.isSteam(aLiquid) ? 3 : 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) {

@@ -109,4 +110,14 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
 	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);

+    }

 }