From 77bb28ded62bc157bf18ca5e50f653152cb90d8f Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 6 Nov 2016 20:28:36 +0100 Subject: [PATCH] Fixes #2585: Hide WAILA data when it cannot be retrieved. (#2586) --- .../waila/part/ChannelWailaDataProvider.java | 12 ++++++++---- .../waila/tile/PowerStorageWailaDataProvider.java | 14 +++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java index 48b00ddb..6064daf4 100644 --- a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java @@ -80,10 +80,14 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider final NBTTagCompound tag = accessor.getNBTData(); final byte usedChannels = this.getUsedChannels( part, tag, this.cache ); - final byte maxChannels = (byte) ( ( part instanceof PartDenseCable ) ? 32 : 8 ); - final String formattedToolTip = String.format( WailaText.Channels.getLocal(), usedChannels, maxChannels ); - currentToolTip.add( formattedToolTip ); + if( usedChannels >= 0 ) + { + final byte maxChannels = (byte) ( ( part instanceof PartDenseCable ) ? 32 : 8 ); + + final String formattedToolTip = String.format( WailaText.Channels.getLocal(), usedChannels, maxChannels ); + currentToolTip.add( formattedToolTip ); + } } return currentToolTip; @@ -116,7 +120,7 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider } else { - usedChannels = 0; + usedChannels = -1; } return usedChannels; diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java index 9f439062..7b8942eb 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java @@ -92,12 +92,16 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider final NBTTagCompound tag = accessor.getNBTData(); final long internalCurrentPower = this.getInternalCurrentPower( tag, te ); - final long internalMaxPower = (long) ( 100 * maxPower ); - final String formatCurrentPower = Platform.formatPowerLong( internalCurrentPower, false ); - final String formatMaxPower = Platform.formatPowerLong( internalMaxPower, false ); + if( internalCurrentPower >= 0 ) + { + final long internalMaxPower = (long) ( 100 * maxPower ); - currentToolTip.add( WailaText.Contains.getLocal() + ": " + formatCurrentPower + " / " + formatMaxPower ); + final String formatCurrentPower = Platform.formatPowerLong( internalCurrentPower, false ); + final String formatMaxPower = Platform.formatPowerLong( internalMaxPower, false ); + + currentToolTip.add( WailaText.Contains.getLocal() + ": " + formatCurrentPower + " / " + formatMaxPower ); + } } } @@ -162,7 +166,7 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider } else { - internalCurrentPower = 0; + internalCurrentPower = -1; } return internalCurrentPower;