aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorTechlone <techlone.mc@gmail.com>2017-04-27 03:03:20 +0500
committerTechlone <techlone.mc@gmail.com>2017-04-27 03:03:20 +0500
commita3de198ba0b9a9d545600f499f7a719c8733e4cd (patch)
tree901af87cf43c003b3bdfb31328298d4cb830c1d2 /src/main/java/gregtech/api/util
parent92674ba0dddb1cf4bb78012e1dc0c31ba9709bfa (diff)
parentbaa9caf06bd5793ccbddd8e8335668e3edd54900 (diff)
downloadGT5-Unofficial-a3de198ba0b9a9d545600f499f7a719c8733e4cd.tar.gz
GT5-Unofficial-a3de198ba0b9a9d545600f499f7a719c8733e4cd.tar.bz2
GT5-Unofficial-a3de198ba0b9a9d545600f499f7a719c8733e4cd.zip
Merge branch 'SteamProductionImprovement' into unstable
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 2bc8985c3f..3f1022167f 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -1406,17 +1406,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
private GT_Recipe addRecipe(GT_Recipe recipe, double baseBurnTime){
recipe = new GT_Recipe(recipe);
- //Some recipes will have a burn time like 15.9999999 and % always rounds down
- double floatErrorCorrection = 0.0001;
- double bronzeBurnTime = baseBurnTime * 2 + floatErrorCorrection;
- bronzeBurnTime -= bronzeBurnTime % 0.05;
- double steelBurnTime = baseBurnTime * 1.5 + floatErrorCorrection;
- steelBurnTime -= steelBurnTime % 0.05;
- double titaniumBurnTime = baseBurnTime * 1.3 + floatErrorCorrection;
- titaniumBurnTime -= titaniumBurnTime % 0.05;
- double tungstensteelBurnTime = baseBurnTime * 1.2 + floatErrorCorrection;
- tungstensteelBurnTime -= tungstensteelBurnTime % 0.05;
+ double bronzeBurnTime = baseBurnTime * 2;
+ double steelBurnTime = baseBurnTime * 1.5;
+ double titaniumBurnTime = baseBurnTime * 1.3;
+ double tungstensteelBurnTime = baseBurnTime * 1.2;
recipe.setNeiDesc("Burn time in seconds:",
String.format("Bronze Boiler: %.2f", bronzeBurnTime),