diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2022-09-25 16:45:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-25 17:45:04 +0200 |
| commit | 7d73ed7bdd2a1d33276ac0613dd94256f8d8e41f (patch) | |
| tree | 3bd941c9dd3024c222917ce6bf8701b3eeccdfa3 | |
| parent | da0b22e96b959f9b79af7466f6dd319528b43b2c (diff) | |
| download | GT5-Unofficial-7d73ed7bdd2a1d33276ac0613dd94256f8d8e41f.tar.gz GT5-Unofficial-7d73ed7bdd2a1d33276ac0613dd94256f8d8e41f.tar.bz2 GT5-Unofficial-7d73ed7bdd2a1d33276ac0613dd94256f8d8e41f.zip | |
Minor turbine fixes: correct EU/t display in scanner, update flow multipliers in plasma turbine (#1409)
2 files changed, 9 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 716a8c9cc6..9838076440 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 @@ -148,7 +148,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine return false; } ArrayList<FluidStack> tFluids = getStoredFluids(); - if (tFluids.size() > 0) { + if (!tFluids.isEmpty()) { if (baseEff == 0 || optFlow == 0 @@ -305,8 +305,8 @@ public abstract class GT_MetaTileEntity_LargeTurbine } String[] ret = new String[] { // 8 Lines available for information panels - tRunning + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(mEUt) + EnumChatFormatting.RESET - + " EU/t", /* 1 */ + tRunning + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(((long) mEUt * mEfficiency) / 10000) + + EnumChatFormatting.RESET + " EU/t", /* 1 */ tMaintainance, /* 2 */ StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW + (mEfficiency / 100F) + EnumChatFormatting.RESET + "%", /* 2 */ 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 4a7dc1f88f..cdf09fa9bd 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 @@ -238,6 +238,10 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar * ((GT_MetaGenerated_Tool) aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed * 50)); overflowMultiplier = getOverflowMultiplier(aStack); + + flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier; + flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mGasMultiplier; + flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier; } else { counter++; } @@ -323,8 +327,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar } String[] ret = new String[] { // 8 Lines available for information panels - tRunning + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(mEUt) + EnumChatFormatting.RESET - + " EU/t", /* 1 */ + tRunning + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(((long) mEUt * mEfficiency) / 10000) + + EnumChatFormatting.RESET + " EU/t", /* 1 */ tMaintainance, /* 2 */ StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW + (mEfficiency / 100F) + EnumChatFormatting.RESET + "%", /* 2 */ |