tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes #2585: Hide WAILA data when it cannot be retrieved. (#2586)

Browse source
This commit is contained in:
yueh 2016-11-06 20:28:36 +01:00 committed by shartte
parent 0e7981d717
commit 77bb28ded6
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java
View file

@ -80,10 +80,14 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider
final NBTTagCompound tag = accessor.getNBTData(); final NBTTagCompound tag = accessor.getNBTData();
final byte usedChannels = this.getUsedChannels( part, tag, this.cache ); 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 ); if( usedChannels >= 0 )
currentToolTip.add( formattedToolTip ); {
final byte maxChannels = (byte) ( ( part instanceof PartDenseCable ) ? 32 : 8 );
final String formattedToolTip = String.format( WailaText.Channels.getLocal(), usedChannels, maxChannels );
currentToolTip.add( formattedToolTip );
}
} }
return currentToolTip; return currentToolTip;
@ -116,7 +120,7 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider
} }
else else
{ {
usedChannels = 0; usedChannels = -1;
} }
return usedChannels; return usedChannels;

14
src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java
View file

@ -92,12 +92,16 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider
final NBTTagCompound tag = accessor.getNBTData(); final NBTTagCompound tag = accessor.getNBTData();
final long internalCurrentPower = this.getInternalCurrentPower( tag, te ); final long internalCurrentPower = this.getInternalCurrentPower( tag, te );
final long internalMaxPower = (long) ( 100 * maxPower );
final String formatCurrentPower = Platform.formatPowerLong( internalCurrentPower, false ); if( internalCurrentPower >= 0 )
final String formatMaxPower = Platform.formatPowerLong( internalMaxPower, false ); {
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 else
{ {
internalCurrentPower = 0; internalCurrentPower = -1;
} }
return internalCurrentPower; return internalCurrentPower;