From ff7b23c1f50fcf8a92e9061f52f516f0b38d3daa Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Mon, 2 Mar 2020 02:42:50 +0100 Subject: tfft scanner data should now correctly show power usage during maintenance issues --- src/main/java/tileentities/GTMTE_FluidMultiStorage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/java/tileentities/GTMTE_FluidMultiStorage.java') diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java index 05af3faad5..9ac2dd887a 100644 --- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java @@ -120,8 +120,8 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { public boolean checkRecipe(ItemStack guiSlotItem) { super.mEfficiency = 10000 - (super.getIdealStatus() - super.getRepairStatus()) * 1000; - this.mEfficiencyIncrease = 10000; - this.mEUt = runningCost; + super.mEfficiencyIncrease = 10000; + super.mEUt = runningCost; super.mMaxProgresstime = 10; // If there are no basic I/O hatches, let multi hatches handle it and skip a lot of code! @@ -492,7 +492,9 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { ll.add(EnumChatFormatting.YELLOW + "Operational Data:" + EnumChatFormatting.RESET); ll.add("Auto-voiding: " + doVoidExcess); ll.add("Per-Fluid Capacity: " + mfh.getCapacity() + "L"); - ll.add("Running Cost: " + (-super.mEUt) + "EU/t"); + ll.add("Running Cost: " + // mEUt does not naturally reflect efficiency status. Do that here. + + ((-super.mEUt) * 10000 / Math.max(1000, super.mEfficiency)) + "EU/t"); ll.add("Maintenance Status: " + ((super.getRepairStatus() == super.getIdealStatus()) ? EnumChatFormatting.GREEN + "Working perfectly" + EnumChatFormatting.RESET : EnumChatFormatting.RED + "Has Problems" + EnumChatFormatting.RESET)); -- cgit