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

Merge pull request #550 from Muramasa-/Default

Browse source 
Turbine tooltip fixes
This commit is contained in:
Blood-Asp 2016-07-01 01:16:10 +02:00 committed by GitHub
commit 1497dc47e5
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
View file

@ -20,7 +20,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
protected int baseEff = 0; protected int baseEff = 0;
protected int optFlow = 0; protected int optFlow = 0;
protected int realOptFlow = 0; protected double realOptFlow = 0;
protected int storedFluid = 0; protected int storedFluid = 0;
protected int counter = 0; protected int counter = 0;
@ -207,7 +207,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
"Large Turbine", "Large Turbine",
tRunning, tRunning,
"Current Output: "+mEUt+" EU/t", "Current Output: "+mEUt+" EU/t",
"Optimal Flow: "+realOptFlow+" L/t", "Optimal Flow: "+(int)realOptFlow+" L/t",
"Fuel Remaining: "+storedFluid+"L", "Fuel Remaining: "+storedFluid+"L",
"Current Speed: "+(mEfficiency/100)+"%", "Current Speed: "+(mEfficiency/100)+"%",
"Turbine Damage: "+tDura+"%", "Turbine Damage: "+tDura+"%",

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
View file

@ -74,7 +74,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
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 int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow
this.realOptFlow = (aOptFlow / 2); this.realOptFlow = aOptFlow;
for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) {
String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i));

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
View file

@ -93,7 +93,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. Doesn't matter which one. Ignore the rest! FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. Doesn't matter which one. Ignore the rest!
int fuelValue = getFuelValue(firstFuelType); int fuelValue = getFuelValue(firstFuelType);
actualOptimalFlow = (int) ((aOptFlow + fuelValue - 1) / fuelValue); actualOptimalFlow = (int) ((aOptFlow + fuelValue - 1) / fuelValue);
this.realOptFlow = (aOptFlow / fuelValue); // For scanner info this.realOptFlow = actualOptimalFlow; // For scanner info
int remainingFlow = (int) (actualOptimalFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios. int remainingFlow = (int) (actualOptimalFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios.
int flow = 0; int flow = 0;

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

@ -83,7 +83,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
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.
this.realOptFlow = ((aOptFlow / 2) / 2); this.realOptFlow = ((aOptFlow / 2) / (0.5));
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.
String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i));