diff options
| author | Technus <daniel112092@gmail.com> | 2017-02-05 12:29:47 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-02-05 12:29:47 +0100 |
| commit | f58f2100c38fdff661b80c68027a51efd9da76ff (patch) | |
| tree | 29aa998af2556a268397ad5033f74061add4fc81 /src/main/java/gregtech/common | |
| parent | 8dd2dc84b6fddaf64e4af57ff5d2a85bd2486c7a (diff) | |
| parent | b0fcf3eec65f0d609474b0a3ca9a4f97ced8daf9 (diff) | |
| download | GT5-Unofficial-f58f2100c38fdff661b80c68027a51efd9da76ff.tar.gz GT5-Unofficial-f58f2100c38fdff661b80c68027a51efd9da76ff.tar.bz2 GT5-Unofficial-f58f2100c38fdff661b80c68027a51efd9da76ff.zip | |
Merge branch 'experimental' into eM
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index a56ed347eb..bf73286039 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -91,7 +91,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock fuelValue = aFuel.mSpecialValue; fuelRemaining = hatchFluid1.amount; //Record available fuel - this.mEUt = mEfficiency < 2000 ? 0 : (int) (2048 * (((float) Math.min(mEfficiency,10000)) / 10000)); //Output 0 if startup is less than 20% + this.mEUt = mEfficiency < 2000 ? 0 : (int) ((boostEu?6144:2048) * (((float) Math.min(mEfficiency,10000)) / 10000)); //Output 0 if startup is less than 20% this.mProgresstime = 1; this.mMaxProgresstime = 1; this.mEfficiencyIncrease = 15; @@ -254,7 +254,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock "Stored Energy:", EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET +" EU / "+ EnumChatFormatting.YELLOW + Long.toString(maxEnergy) + EnumChatFormatting.RESET +" EU", - "Current Output: "+EnumChatFormatting.RED+(-mEUt*mEfficiency/10000)+EnumChatFormatting.RESET+" EU/t", + "Current Output: "+EnumChatFormatting.RED+(-mEUt)+EnumChatFormatting.RESET+" EU/t", "Fuel Consumption: "+EnumChatFormatting.YELLOW+fuelConsumption+EnumChatFormatting.RESET+" L/t", "Fuel Value: "+EnumChatFormatting.YELLOW+fuelValue+EnumChatFormatting.RESET+" EU/L", "Fuel Remaining: "+EnumChatFormatting.GOLD+fuelRemaining+EnumChatFormatting.RESET+" L", |