ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

bank plugin: improve responsiveness of bank searches

Browse Source
This commit is contained in:
trimbe
2019-08-03 20:59:03 -04:00
parent 715c7a26b9
commit acabab9274
2 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
View File

@@ -26,6 +26,7 @@
*/ */
package net.runelite.client.plugins.bank; package net.runelite.client.plugins.bank;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.Arrays; import java.util.Arrays;
@@ -36,12 +37,17 @@ import net.runelite.api.InventoryID;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.SpriteID;
import net.runelite.api.VarClientInt;
import net.runelite.api.VarClientStr;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.ItemContainerChanged;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuShouldLeftClick; import net.runelite.api.events.MenuShouldLeftClick;
import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.events.VarClientStrChanged;
import net.runelite.api.events.WidgetLoaded; import net.runelite.api.events.WidgetLoaded;
import net.runelite.api.vars.InputType;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetID;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
@@ -96,6 +102,7 @@ public class BankPlugin extends Plugin
private ContainerCalculation seedVaultCalculation; private ContainerCalculation seedVaultCalculation;
private boolean forceRightClickFlag; private boolean forceRightClickFlag;
private String searchString;
@Provides @Provides
BankConfig getConfig(ConfigManager configManager) BankConfig getConfig(ConfigManager configManager)
@@ -108,6 +115,7 @@ public class BankPlugin extends Plugin
{ {
clientThread.invokeLater(() -> bankSearch.reset(false)); clientThread.invokeLater(() -> bankSearch.reset(false));
forceRightClickFlag = false; forceRightClickFlag = false;
searchString = "";
} }
@Subscribe @Subscribe
@@ -176,6 +184,35 @@ public class BankPlugin extends Plugin
updateSeedVaultTotal(); updateSeedVaultTotal();
} }
@Subscribe
public void onVarClientStrChanged(VarClientStrChanged event)
{
String searchVar = client.getVar(VarClientStr.INPUT_TEXT);
if (!searchVar.equals(searchString))
{
Widget searchButtonBackground = client.getWidget(WidgetInfo.BANK_SEARCH_BUTTON_BACKGROUND);
if (searchButtonBackground != null && searchButtonBackground.hasListener())
{
searchButtonBackground.setOnTimerListener((Object[]) null);
searchButtonBackground.setHasListener(false);
}
clientThread.invokeLater(() -> bankSearch.layoutBank());
searchString = searchVar;
}
if (client.getVar(VarClientInt.INPUT_TYPE) != InputType.SEARCH.getType() && Strings.isNullOrEmpty(client.getVar(VarClientStr.INPUT_TEXT)))
{
Widget searchBackground = client.getWidget(WidgetInfo.BANK_SEARCH_BUTTON_BACKGROUND);
if (searchBackground != null)
{
searchBackground.setSpriteId(SpriteID.EQUIPMENT_SLOT_TILE);
}
}
}
@Subscribe @Subscribe
public void onItemContainerChanged(ItemContainerChanged event) public void onItemContainerChanged(ItemContainerChanged event)
{ {

26
runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/BankSearch.java
View File

@@ -67,6 +67,22 @@ public class BankSearch
public void search(InputType inputType, String search, Boolean closeInput) public void search(InputType inputType, String search, Boolean closeInput)
{ {
clientThread.invoke(() -> clientThread.invoke(() ->
{
// This ensures that any chatbox input (e.g from search) will not remain visible when
// selecting/changing tab
if (closeInput)
{
client.runScript(ScriptID.RESET_CHATBOX_INPUT, 0, 0);
}
client.setVar(VarClientInt.INPUT_TYPE, inputType.getType());
client.setVar(VarClientStr.INPUT_TEXT, search);
layoutBank();
});
}
public void layoutBank()
{ {
Widget bankContainer = client.getWidget(WidgetInfo.BANK_CONTAINER); Widget bankContainer = client.getWidget(WidgetInfo.BANK_CONTAINER);
if (bankContainer == null || bankContainer.isHidden()) if (bankContainer == null || bankContainer.isHidden())
@@ -81,15 +97,6 @@ public class BankSearch
{ {
return; return;
} }
// This ensures that any chatbox input (e.g from search) will not remain visible when
// selecting/changing tab
if (closeInput)
{
client.runScript(ScriptID.RESET_CHATBOX_INPUT, 0, 0);
}
client.setVar(VarClientInt.INPUT_TYPE, inputType.getType());
client.setVar(VarClientStr.INPUT_TEXT, search);
client.runScript(ScriptID.BANK_LAYOUT, client.runScript(ScriptID.BANK_LAYOUT,
WidgetInfo.BANK_CONTAINER.getId(), WidgetInfo.BANK_CONTAINER.getId(),
@@ -105,7 +112,6 @@ public class BankSearch
widgetIds[INCINERATOR_IDX], widgetIds[INCINERATOR_IDX],
widgetIds[INCINERATOR_CONFIRM_IDX], widgetIds[INCINERATOR_CONFIRM_IDX],
widgetIds[HIDDEN_WIDGET_IDX]); widgetIds[HIDDEN_WIDGET_IDX]);
});
} }
public void reset(Boolean closeChat) public void reset(Boolean closeChat)