diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-07-01 01:16:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 01:16:10 +0200 |
| commit | 1497dc47e5a51eb0925eece6b183b37f4812d7e3 (patch) | |
| tree | c0703f76cc602d3b36039692c62b6c15f5703c3a /src/main/java/gregtech | |
| parent | f496def067f408867d9c6043e01accf4c4bb24f4 (diff) | |
| parent | d8df9e1565d07ccd5ac5523aab404bfb5467c0ab (diff) | |
| download | GT5-Unofficial-1497dc47e5a51eb0925eece6b183b37f4812d7e3.tar.gz GT5-Unofficial-1497dc47e5a51eb0925eece6b183b37f4812d7e3.tar.bz2 GT5-Unofficial-1497dc47e5a51eb0925eece6b183b37f4812d7e3.zip | |
Merge pull request #550 from Muramasa-/Default
Turbine tooltip fixes
Diffstat (limited to 'src/main/java/gregtech')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 458b65bda0..621eb6498b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -20,7 +20,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M protected int baseEff = 0; protected int optFlow = 0; - protected int realOptFlow = 0; + protected double realOptFlow = 0; protected int storedFluid = 0; protected int counter = 0; @@ -207,7 +207,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M "Large Turbine", tRunning, "Current Output: "+mEUt+" EU/t", - "Optimal Flow: "+realOptFlow+" L/t", + "Optimal Flow: "+(int)realOptFlow+" L/t", "Fuel Remaining: "+storedFluid+"L", "Current Speed: "+(mEfficiency/100)+"%", "Turbine Damage: "+tDura+"%", diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index f03df7ffa2..aa1f46afb3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -74,7 +74,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La int totalFlow = 0; // Byproducts are based on actual flow int flow = 0; 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++) { String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index e8a5ac95d9..923eaabcdb 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -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! int fuelValue = getFuelValue(firstFuelType); 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 flow = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 6cf3897ebb..1023235c59 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -83,7 +83,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg int totalFlow = 0; // Byproducts are based on actual flow 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. - 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. String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); |