diff options
Diffstat (limited to 'src/main/java/kubatech/tileentity')
2 files changed, 42 insertions, 22 deletions
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java index b94ceca89b..4548e1adca 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java @@ -870,18 +870,28 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .append("%)\n"); for (Map.Entry<ItemStack, Double> drop : GUIDropProgress.entrySet()) { - ret.append( - drop.getKey() - .getDisplayName()) - .append(": ") + int outputSize = Arrays.stream(mOutputItems) + .filter(s -> s.isItemEqual(drop.getKey())) + .mapToInt(i -> i.stackSize) + .sum(); + ret.append(EnumChatFormatting.AQUA) .append( - String.format( - "%.2f (+%d)\n", - drop.getValue(), - Arrays.stream(mOutputItems) - .filter(s -> s.isItemEqual(drop.getKey())) - .mapToInt(i -> i.stackSize) - .sum())); + drop.getKey() + .getDisplayName()) + .append(EnumChatFormatting.WHITE) + .append(": "); + if (outputSize == 0) { + ret.append(String.format("%.2f", drop.getValue() * 100)) + .append("%\n"); + } else { + ret.append(EnumChatFormatting.GOLD) + .append( + String.format( + "x%d %s(+%.2f/sec)\n", + outputSize, + EnumChatFormatting.WHITE, + (double) outputSize / (mMaxProgresstime / 20))); + } } return ret.toString(); diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java index 0a0027e017..8a8dd6d4fc 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java @@ -900,18 +900,28 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .append("%)\n"); for (Map.Entry<ItemStack, Double> drop : GUIDropProgress.entrySet()) { - ret.append( - drop.getKey() - .getDisplayName()) - .append(": ") + int outputSize = Arrays.stream(mOutputItems) + .filter(s -> s.isItemEqual(drop.getKey())) + .mapToInt(i -> i.stackSize) + .sum(); + ret.append(EnumChatFormatting.AQUA) .append( - String.format( - "%.2f (+%d)\n", - drop.getValue(), - Arrays.stream(mOutputItems) - .filter(s -> s.isItemEqual(drop.getKey())) - .mapToInt(i -> i.stackSize) - .sum())); + drop.getKey() + .getDisplayName()) + .append(EnumChatFormatting.WHITE) + .append(": "); + if (outputSize == 0) { + ret.append(String.format("%.2f", drop.getValue() * 100)) + .append("%\n"); + } else { + ret.append(EnumChatFormatting.GOLD) + .append( + String.format( + "x%d %s(+%.2f/sec)\n", + outputSize, + EnumChatFormatting.WHITE, + (double) outputSize / (mMaxProgresstime / 20))); + } } return ret.toString(); |