Merge pull request #1210 from thatsIch/e-1207-channels

Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display
This commit is contained in:
thatsIch 2015-04-06 13:09:54 +02:00
commit 8666937117
2 changed files with 3 additions and 3 deletions

View file

@ -32,7 +32,6 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import appeng.api.parts.IPart;
import appeng.core.localization.GuiText;
import appeng.core.localization.WailaText;
import appeng.parts.networking.PartCableSmart;
import appeng.parts.networking.PartDenseCable;
@ -82,7 +81,8 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider
final byte usedChannels = this.getUsedChannels( part, tag, this.cache );
final byte maxChannels = (byte) ( ( part instanceof PartDenseCable ) ? 32 : 8 );
currentToolTip.add( usedChannels + " " + GuiText.Of.getLocal() + ' ' + maxChannels + ' ' + WailaText.Channels.getLocal() );
final String formattedToolTip = String.format( WailaText.Channels.getLocal(), usedChannels, maxChannels );
currentToolTip.add( formattedToolTip );
}
return currentToolTip;

View file

@ -328,7 +328,7 @@ waila.appliedenergistics2.Locked=Locked
waila.appliedenergistics2.Unlocked=Unlocked
waila.appliedenergistics2.Showing=Showing
waila.appliedenergistics2.Contains=Contains
waila.appliedenergistics2.Channels=Channels
waila.appliedenergistics2.Channels=%1$d of %2$d Channels
item.appliedenergistics2.ItemBasicStorageCell.1k.name=1k ME Storage Cell
item.appliedenergistics2.ItemBasicStorageCell.4k.name=4k ME Storage Cell