From 94482f5aed49604fa7c45631c98cddc2b0ebb208 Mon Sep 17 00:00:00 2001 From: loldudester Date: Tue, 19 May 2020 20:51:29 +0100 Subject: [PATCH] keyremapping: Don't remap f-keys when the bank pin interface is open --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 6 ++++++ .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 1 + .../client/plugins/keyremapping/KeyRemappingPlugin.java | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 479251c5f6..93ee94fc96 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -154,6 +154,7 @@ public class WidgetID public static final int ADVENTURE_LOG_ID = 187; public static final int COUNTERS_LOG_GROUP_ID = 625; public static final int GAUNTLET_TIMER_GROUP_ID = 637; + public static final int BANK_PIN_GROUP_ID = 213; static class WorldMap { @@ -918,4 +919,9 @@ public class WidgetID { static final int CONTAINER = 2; } + + static class BankPin + { + static final int CONTAINER = 0; + } } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 59cb4f4160..eea24201ba 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -146,6 +146,7 @@ public enum WidgetInfo BANK_ITEM_COUNT_TOP(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_TOP), BANK_ITEM_COUNT_BAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BAR), BANK_ITEM_COUNT_BOTTOM(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BOTTOM), + BANK_PIN_CONTAINER(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.CONTAINER), GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER), GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index c2b2ee146f..d0bcbf6d4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -138,7 +138,10 @@ public class KeyRemappingPlugin extends Plugin // Most chat dialogs with numerical input are added without the chatbox or its key listener being removed, // so chatboxFocused() is true. The chatbox onkey script uses the following logic to ignore key presses, // so we will use it too to not remap F-keys. - return isHidden(WidgetInfo.CHATBOX_MESSAGES) || isHidden(WidgetInfo.CHATBOX_TRANSPARENT_LINES); + return isHidden(WidgetInfo.CHATBOX_MESSAGES) || isHidden(WidgetInfo.CHATBOX_TRANSPARENT_LINES) + // We want to block F-key remapping in the bank pin interface too, so it does not interfere with the + // Keyboard Bankpin feature of the Bank plugin + || !isHidden(WidgetInfo.BANK_PIN_CONTAINER); } private boolean isHidden(WidgetInfo widgetInfo)