Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Steam turbine getAverage() disabled

Browse source 
Removed requirement of getAverage()
This commit is contained in:
pyure 2015-08-12 15:17:31 -04:00
parent 0c7b825e7e
commit e41504b920
1 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
View file

@ -67,13 +67,13 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
@Override @Override
int fluidIntoPower(ArrayList<FluidStack> aFluids, int aOptFlow, int aBaseEff) { int fluidIntoPower(ArrayList<FluidStack> aFluids, int aOptFlow, int aBaseEff) {
int tEU = 0; int tEU = 0;
int averageFlow = 0; // To prevent closed water loops from breaking. EU is based on average flow
int totalFlow = 0; // Byproducts are based on actual flow int totalFlow = 0; // Byproducts are based on actual flow
int flow = 0; int flow = 0;
int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios. int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios.
for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and track totals. for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and track totals.
if(aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("fluid.steam")||aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("ic2.fluidSteam")){ if (aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("fluid.steam")
|| aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("ic2.fluidSteam")) {
flow = aFluids.get(i).amount; // Get all (steam) in hatch flow = aFluids.get(i).amount; // Get all (steam) in hatch
flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow
depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount
@ -81,18 +81,17 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
totalFlow += flow; // track total input used totalFlow += flow; // track total input used
} }
} }
averageFlow = getAverage(totalFlow); // calculate recent average usage for power output purposes but NOT byproduct generation. We used what we used, and get byproducts from that.
tEU = Math.min(aOptFlow, averageFlow); tEU = (int) (Math.min((float) aOptFlow, totalFlow));
addOutput(GT_ModHandler.getDistilledWater(useWater(totalFlow / 160.0f))); addOutput(GT_ModHandler.getDistilledWater(useWater(totalFlow / 160.0f)));
if(averageFlow > 0 && averageFlow != aOptFlow){ if (totalFlow > 0 && totalFlow != aOptFlow) {
float efficiency = 1.0f - Math.abs(((averageFlow - (float)aOptFlow) / aOptFlow)); float efficiency = 1.0f - Math.abs(((totalFlow - (float) aOptFlow) / aOptFlow));
tEU *= efficiency; tEU *= efficiency;
tEU = Math.max(1, tEU * aBaseEff / 20000); tEU = Math.max(1, tEU * aBaseEff / 20000);
} } else {
else {
tEU = tEU * aBaseEff / 20000; tEU = tEU * aBaseEff / 20000;
} }
return tEU; return tEU;
} }
} }