From f3f8a2cd0ef259bc7fcf0a58a2faed4e61377e76 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 16 Oct 2014 03:35:23 -0400 Subject: [PATCH] Localize tile.blockConduitBundle and fix dim. trans. WAILA text --- ReleaseNotes.txt | 2 ++ resources/assets/enderio/lang/en_US.lang | 1 + .../machine/transceiver/BlockTransceiver.java | 29 +++++++++++++------ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index ad010cd1..586dbb20 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -8,6 +8,8 @@ Changes - WAILA support on all IInternalPowerReceptor and IConduitBundle (tterrag) - WAILA support for photovoltaic panels (efficiency %) (tterrag) - Allow killer joe's sword to charge from wireless chargers, this means that onUpdate() is called each tick (tterrag) +- Localize tile.blockConduitBundle.name to Conduit Connector (tterrag) +- Fix WAILA tooltip for dim.trans., was showing channel types even with no channels assigned to them (tterrag) Bugs - Fix tormented enderman head (and future head variants) dropping damage 0 always (tterrag) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 05804970..bb2a2f4c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -709,6 +709,7 @@ enderio.gui.conduit.ioMode.input=Extract enderio.gui.conduit.ioMode.output=Insert enderio.gui.conduit.ioMode.disabled=Disabled enderio.gui.conduit.ioMode.notSet=Default +tile.blockConduitBundle.name=Conduit Connector enderio.gui.conduit.item.insertionFilter=Insert enderio.gui.conduit.item.extractionFilter=Extract diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 3cbe04ca..3734c4d8 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -108,23 +108,34 @@ public class BlockTransceiver extends AbstractMachineBlock { if (te instanceof TileTransceiver && player.isSneaking()) { TileTransceiver trans = (TileTransceiver) te; for (ChannelType type : ChannelType.VALUES) { - tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); - + List recieving = trans.getRecieveChannels(type); - List sending = trans.getSendChannels(type); + List sending = trans.getSendChannels(type); String recieve = "[" + buildString(recieving) + "]"; - String send = "[" + buildString(sending) + "]"; - - if(!"[]".equals(recieve)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.recieving"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, recieve)); + String send = "[" + buildString(sending) + "]"; + + if(isEmpty(recieve) && isEmpty(send)) { + break; } - if(!"[]".equals(send)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.sending"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, send)); + + tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); + + if(!isEmpty(recieve)) { + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.recieving"), Util.TAB + Util.ALIGNRIGHT + + EnumChatFormatting.WHITE, recieve)); + } + if(!isEmpty(send)) { + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.sending"), Util.TAB + Util.ALIGNRIGHT + + EnumChatFormatting.WHITE, send)); } } } } + private boolean isEmpty(String str) { + return "[]".equals(str); + } + private String buildString(List channels) { StringBuilder sb = new StringBuilder(); for (Channel c : channels) {