From 080a4c21172a4015418b92bac9f70332a4a1cf75 Mon Sep 17 00:00:00 2001
From: Blood-Asp <Blood@Asp>
Date: Sat, 25 Jul 2015 18:34:52 +0200
Subject: V5.08.25

---
 .../multi/GT_MetaTileEntity_HeatExchanger.java      | 21 ++++++++++++++-------
 .../multi/GT_MetaTileEntity_LargeTurbine_Steam.java | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 11 deletions(-)

(limited to 'main/java/gregtech/common/tileentities/machines/multi')

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
index 5c16af3e37..89b8c29e69 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
@@ -75,14 +75,14 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc
 	  {
 		if(GT_ModHandler.isLava(mInputHotFluidHatch.getFluid())){
 			int fluidAmount = mInputHotFluidHatch.getFluidAmount();
-			if(fluidAmount >= 1000){superheated=true;}else{superheated=false;}
-			if(fluidAmount>2000){fluidAmount=2000;}
+			if(fluidAmount >= 500){superheated=true;}else{superheated=false;}
+			if(fluidAmount>1000){fluidAmount=1000;}
 			mInputHotFluidHatch.drain(fluidAmount, true);
 			mOutputColdFluidHatch.fill(FluidRegistry.getFluidStack("ic2pahoehoelava", fluidAmount), true);
 			
 			
 			           this.mMaxProgresstime = 20;
-			           this.mEUt = fluidAmount*2;
+			           this.mEUt = fluidAmount*4;
 			           this.mEfficiencyIncrease = 80;
 		return true;	
 		}
@@ -102,15 +102,22 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc
 		}
 		return false;}
 	  
+	   private float water;
+	   private int useWater(float input){
+		   water = water + input;
+		   int usage = (int)water;
+		   water = water - (int)usage;
+		   return  usage;
+	   }
+	  
 	  public boolean onRunningTick(ItemStack aStack)
 	  {
 	    if (this.mEUt > 0)
-	    {System.out.println("EU: "+mEUt+" Eff: "+mEfficiency);
+	    {
 	      int tGeneratedEU = (int)(this.mEUt * 2L * this.mEfficiency / 10000L);
 	      if (tGeneratedEU > 0) {
-	        if (depleteInput(GT_ModHandler.getDistilledWater(((superheated ? tGeneratedEU/2 :tGeneratedEU) + 160) / 160))) {
-							if(superheated){
-								addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", tGeneratedEU/2));
+	        if (depleteInput(GT_ModHandler.getDistilledWater(useWater(((float)(superheated ? tGeneratedEU/2 :tGeneratedEU) + 160f) / 160f)))) {
+							if(superheated){addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", tGeneratedEU/2));
 							}else{
 	          addOutput(GT_ModHandler.getSteam(tGeneratedEU));}
 	        } else {
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 0f20246eed..e43070333a 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -37,6 +37,15 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 	    		 "Needs a Turbine Item (inside controller GUI)" };
 	   }
 	   
+	   private float water;
+	   private int useWater(float input){
+		   water = water + input;
+		   int usage = (int)water;
+		   water = water - (int)usage;
+		   return  usage;
+	   }
+	   
+	   
 		@Override
 		public boolean checkRecipe(ItemStack aStack) {
 			ArrayList<FluidStack> steams = getStoredFluids();
@@ -47,11 +56,11 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 		    		optFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool)aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() * ((GT_MetaGenerated_Tool)aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed*50);
 		    	}
 		    int tEU=0;
-		    int distOut=0;
+		    float distOut=0;
 		    for(int i=0;i<steams.size();i++){
 		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.steam")||steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSteam")){
-		    		int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
-		    		depleteInput(new FluidStack(steams.get(i),out));
+		    		float out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
+		    		depleteInput(new FluidStack(steams.get(i),(int)out));
 		    		distOut += out/160;
 		    		tEU += steams.get(i).amount/2;
 		    	}
@@ -64,7 +73,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 //		      System.out.println("Eff: "+baseEff+" optFlow: "+optFlow+" tEff: "+tEff+" eut: "+mEUt+" out: "+distOut);
 		      this.mEfficiencyIncrease = (this.mMaxProgresstime * 10);
 		      if(mEUt==0){return false;}
-		      addOutput(GT_ModHandler.getDistilledWater(distOut));
+		      addOutput(GT_ModHandler.getDistilledWater(useWater(distOut)));
 		      return true;
 		    }
 		    if(this.mEfficiency>50){
-- 
cgit