diff --git a/gradle.properties b/gradle.properties index c14d765..2f36058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel= -wctbuild=1.8.7.7-GTNH +wctbuild=1.8.7.8-GTNH wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java index 3a0766f..384f67f 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java @@ -311,6 +311,7 @@ public class GuiCraftConfirm extends WCTBaseGui { dspToolTip = Platform.getItemDisplayName(is); if (lineList.size() > 0) { + addItemTooltip(is, lineList); dspToolTip = dspToolTip + '\n' + Joiner.on("\n").join(lineList); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java index 2a9f2cf..2681716 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java @@ -293,6 +293,7 @@ public class GuiCraftingCPU extends WCTBaseGui implements ISortSource if( lineList.size() > 0 ) { + addItemTooltip(is, lineList); dspToolTip = dspToolTip + '\n' + Joiner.on( "\n" ).join( lineList ); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java index e57e612..a98767a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java @@ -21,6 +21,7 @@ import com.google.common.base.Stopwatch; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.ITooltip; import appeng.container.slot.SlotRestrictedInput; +import appeng.core.localization.GuiText; import appeng.helpers.InventoryAction; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ObfuscationReflectionHelper; @@ -771,4 +772,19 @@ public abstract class WCTBaseGui extends GuiContainer { public static final synchronized void setSwitchingGuis(final boolean switchingGuis) { WCTBaseGui.switchingGuis = switchingGuis; } + protected void addItemTooltip(ItemStack is, List lineList) + { + if (isShiftKeyDown()) + { + List l = is.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); + if (!l.isEmpty()) + l.remove(0); + lineList.addAll(l); + } + else + { + // TODO: update AE2 on maven and dependency in build gradle + // lineList.add(GuiText.HoldShiftForTooltip.getLocal()); + } + } }