aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-04-27 00:28:07 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-04-27 00:28:07 +0200
commiteb4568864850c043e78958bdbeefb17de3899bc7 (patch)
treea98cbb665ec4b184b5e08665bb806ba7a0dc36db
parentbaa9caf06bd5793ccbddd8e8335668e3edd54900 (diff)
downloadGT5-Unofficial-eb4568864850c043e78958bdbeefb17de3899bc7.tar.gz
GT5-Unofficial-eb4568864850c043e78958bdbeefb17de3899bc7.tar.bz2
GT5-Unofficial-eb4568864850c043e78958bdbeefb17de3899bc7.zip
Fixed a bug where excess fuel didn't consider the distortion from
runtimeBoost. Adjusted the decimal points of the Large Boiler fuel tab to better represent the actual burn times.
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 3f1022167f..aed39defb2 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -1413,10 +1413,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
double tungstensteelBurnTime = baseBurnTime * 1.2;
recipe.setNeiDesc("Burn time in seconds:",
- String.format("Bronze Boiler: %.2f", bronzeBurnTime),
- String.format("Steel Boiler: %.2f", steelBurnTime),
- String.format("Titanium Boiler: %.2f", titaniumBurnTime),
- String.format("Tungstensteel Boiler: %.2f", tungstensteelBurnTime));
+ String.format("Bronze Boiler: %.4f", bronzeBurnTime),
+ String.format("Steel Boiler: %.4f", steelBurnTime),
+ String.format("Titanium Boiler: %.4f", titaniumBurnTime),
+ String.format("Tungstensteel Boiler: %.4f", tungstensteelBurnTime));
return super.addRecipe(recipe);
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index b3c0e8ce31..d720c688d8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -134,11 +134,11 @@ public abstract class GT_MetaTileEntity_LargeBoiler
ArrayList<ItemStack> tInputList = getStoredInputs();
if (!tInputList.isEmpty()) {
for (ItemStack tInput : tInputList) {
- if ((GT_Utility.getFluidForFilledItem(tInput, true) == null) && ((this.mMaxProgresstime = runtimeBoost(GT_ModHandler.getFuelValue(tInput) / 80)) > 0)) {
+ if ((GT_Utility.getFluidForFilledItem(tInput, true) == null) && ((this.mMaxProgresstime = GT_ModHandler.getFuelValue(tInput) / 80) > 0)) {
this.excessFuel += GT_ModHandler.getFuelValue(tInput) % 80;
this.mMaxProgresstime += this.excessFuel / 80;
this.excessFuel %= 80;
- this.mMaxProgresstime = adjustBurnTimeForConfig(this.mMaxProgresstime);
+ this.mMaxProgresstime = adjustBurnTimeForConfig(runtimeBoost(this.mMaxProgresstime));
this.mEUt = adjustEUtForConfig(getEUt());
this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease());
this.mOutputItems = new ItemStack[]{GT_Utility.getContainerItem(tInput, true)};