Display keybind key name in tooltips instead keybind name (#1366)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

src/main/java/appeng/client/gui/implementations/GuiWirelessNetworkManager.java

@@ -3,6 +3,7 @@ package appeng.client.gui.implementations;
 import java.util.ArrayList;
 
 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.player.InventoryPlayer;
 
 import org.lwjgl.input.Keyboard;
@@ -55,7 +56,8 @@ public class GuiWirelessNetworkManager extends AEBaseGui {
                     12,
                     AEColor.values()[y],
                     keyStatus.value(),
-                    GuiText.WirelessManagerToolTips.getLocal());
+                    GuiText.WirelessManagerToolTips.getLocal(
+                            GameSettings.getKeyDisplayString(ServerHelper.WIRELESS_EXTRA_ACTION.getKeyCode())));
             btn.visible = keyStatus.key();
             this.colorButtons.add(btn);
             this.buttonList.add(btn);

src/main/java/appeng/client/gui/slots/VirtualMEMonitorableSlot.java

@@ -8,10 +8,9 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.item.ItemStack;
 
-import org.lwjgl.input.Keyboard;
-
 import appeng.api.storage.data.AEStackTypeRegistry;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IAEStackType;
@@ -70,8 +69,8 @@ public class VirtualMEMonitorableSlot extends VirtualMESlot {
                             ButtonToolTips.ExtractFromNetworkToContainer
                                     .getLocal(
                                             this.typeFilterChecker.check(ITEM_STACK_TYPE)
-                                                    ? Keyboard.getKeyName(CONTAINER_INTERACTION_KEY.getKeyCode())
-                                                            + " + "
+                                                    ? GameSettings.getKeyDisplayString(
+                                                            CONTAINER_INTERACTION_KEY.getKeyCode()) + " + "
                                                     : "",
                                             stackInSlot.getDisplayName()));
                     added = true;
@@ -87,8 +86,8 @@ public class VirtualMEMonitorableSlot extends VirtualMESlot {
                             ButtonToolTips.InsertFromContainerToNetwork
                                     .getLocal(
                                             this.typeFilterChecker.check(ITEM_STACK_TYPE)
-                                                    ? Keyboard.getKeyName(CONTAINER_INTERACTION_KEY.getKeyCode())
-                                                            + " + "
+                                                    ? GameSettings.getKeyDisplayString(
+                                                            CONTAINER_INTERACTION_KEY.getKeyCode()) + " + "
                                                     : "",
                                             stack.getDisplayName()));
                     added = true;

src/main/java/appeng/client/gui/slots/VirtualMEPhantomSlot.java

@@ -9,10 +9,9 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.item.ItemStack;
 
-import org.lwjgl.input.Keyboard;
-
 import appeng.api.storage.StorageName;
 import appeng.api.storage.data.AEStackTypeRegistry;
 import appeng.api.storage.data.IAEStack;
@@ -206,7 +205,7 @@ public class VirtualMEPhantomSlot extends VirtualMESlot {
                 if (stack != null && stack.getStackSize() > 0) {
                     lines.add(
                             ButtonToolTips.RegisterContainerContent.getLocal(
-                                    Keyboard.getKeyName(CONTAINER_INTERACTION_KEY.getKeyCode()),
+                                    GameSettings.getKeyDisplayString(CONTAINER_INTERACTION_KEY.getKeyCode()),
                                     stack.getDisplayName()));
                     return;
                 }

src/main/java/appeng/items/tools/ToolWirelessKit.java

@@ -4,6 +4,7 @@ import java.util.EnumSet;
 import java.util.List;
 
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -122,7 +123,9 @@ public class ToolWirelessKit extends AEBaseItem implements IGuiItem {
         final IConfigManager cm = getConfigManager(is);
         final WirelessToolMode currentMode = (WirelessToolMode) cm.getSetting(Settings.WIRELESS_TOOL_MODE);
         lines.add(WirelessMessages.Mode.getLocal(currentMode.getLocal()));
-        lines.add(WirelessMessages.ModeToggle.getLocal());
+        lines.add(
+                WirelessMessages.ModeToggle
+                        .getLocal(GameSettings.getKeyDisplayString(ServerHelper.WIRELESS_MODE_SWITCH.getKeyCode())));
         lines.add(WirelessMessages.SuperClear.getLocal());
 
         final NBTTagCompound tag = ItemStackNBT.get(is);

src/main/resources/assets/appliedenergistics2/lang/en_US.lang

@@ -526,7 +526,7 @@ gui.appliedenergistics2.GuiDimensionalCoordShortNoDim=§c%s§r, §a%s§r, §9%s
 gui.appliedenergistics2.itemMEStackPacketDesc1=Leftover after inject in system operation
 gui.appliedenergistics2.itemMEStackPacketDesc2=Make sure you have free space and then put this item in ME Terminal
 
-gui.appliedenergistics2.WirelessManagerToolTips=Network\n§6LClick§7 - Select\n §6+ WirelessExtraAction§7 - Rename\n §6+ Sneak§7 - Remove
+gui.appliedenergistics2.WirelessManagerToolTips=Network\n§6LClick§7 - Select\n §6+ %s§7 - Rename\n §6+ Sneak§7 - Remove
 gui.appliedenergistics2.HoldCtrlForContents=Hold Ctrl for cell contents
 
 # GUI Tooltips
@@ -1124,7 +1124,7 @@ item.appliedenergistics2.WirelessMessages.Connected=§aConnected to %s
 item.appliedenergistics2.WirelessMessages.TargetHubFull=§cTarget hub is full
 item.appliedenergistics2.WirelessMessages.SourceHubFull=§cHub at %s §cis full
 item.appliedenergistics2.WirelessMessages.HubToHub=§cHub-to-hub connections are not allowed
-item.appliedenergistics2.WirelessMessages.ModeToggle="Wireless Mode Switch" + R-click to toggle mode
+item.appliedenergistics2.WirelessMessages.ModeToggle=§6%s§r + R-click to toggle mode
 item.appliedenergistics2.WirelessMessages.Security=Security violation - you are not allowed to modify this network
 item.appliedenergistics2.WirelessMessages.DimensionMismatch=Both connectors must be in the same dimension
 item.appliedenergistics2.WirelessMessages.InvalidTarget=§cInvalid target - must be Wireless Connector or Wireless Hub