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

Merge pull request #1530 from devLotto/hiscore-self-lookup

Browse Source 
hiscore: lookup local player on double-click
This commit is contained in:
Adam
2018-04-15 10:02:46 -04:00
committed by GitHub
parent 777673b8b3 8274b1905c
commit f193f22f8d
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
View File

@@ -40,6 +40,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
@@ -54,7 +55,9 @@ import javax.swing.UIManager;
import javax.swing.border.Border; import javax.swing.border.Border;
import javax.swing.event.MouseInputAdapter; import javax.swing.event.MouseInputAdapter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.Experience; import net.runelite.api.Experience;
import net.runelite.api.Player;
import net.runelite.client.ui.PluginPanel; import net.runelite.client.ui.PluginPanel;
import net.runelite.client.util.StackFormatter; import net.runelite.client.util.StackFormatter;
import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreClient;
@@ -112,6 +115,10 @@ public class HiscorePanel extends PluginPanel
@Inject @Inject
ScheduledExecutorService executor; ScheduledExecutorService executor;
@Inject
@Nullable
private Client client;
private final IconTextField input; private final IconTextField input;
private final List<JLabel> skillLabels = new ArrayList<>(); private final List<JLabel> skillLabels = new ArrayList<>();
@@ -122,7 +129,7 @@ public class HiscorePanel extends PluginPanel
private List<JToggleButton> endpointButtons; private List<JToggleButton> endpointButtons;
private final HiscoreClient client = new HiscoreClient(); private final HiscoreClient hiscoreClient = new HiscoreClient();
private HiscoreResult result; private HiscoreResult result;
public HiscorePanel() public HiscorePanel()
@@ -165,6 +172,29 @@ public class HiscorePanel extends PluginPanel
input = new IconTextField(); input = new IconTextField();
input.setIcon(search); input.setIcon(search);
input.addActionListener(e -> executor.execute(this::lookup)); input.addActionListener(e -> executor.execute(this::lookup));
input.addMouseListener(new MouseAdapter()
{
@Override
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() != 2)
{
return;
}
if (client == null)
{
return;
}
Player localPlayer = client.getLocalPlayer();
if (localPlayer != null)
{
executor.execute(() -> lookup(localPlayer.getName()));
}
}
});
inputPanel.add(input, BorderLayout.CENTER); inputPanel.add(input, BorderLayout.CENTER);
c.gridx = 0; c.gridx = 0;
@@ -482,7 +512,7 @@ public class HiscorePanel extends PluginPanel
HiscoreEndpoint endpoint = HiscoreEndpoint.valueOf(endpointButtonGroup.getSelection().getActionCommand()); HiscoreEndpoint endpoint = HiscoreEndpoint.valueOf(endpointButtonGroup.getSelection().getActionCommand());
log.debug("Hiscore endpoint " + endpoint.name() + " selected"); log.debug("Hiscore endpoint " + endpoint.name() + " selected");
result = client.lookup(lookup, endpoint); result = hiscoreClient.lookup(lookup, endpoint);
} }
catch (IOException ex) catch (IOException ex)
{ {