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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-25 22:34:25 +02:00
parent eba4b2be73 667a0e9297
commit 9d1edf8b58
22 changed files with 183 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
View File

@@ -267,18 +267,20 @@ public class ItemManager
*/
public int getItemPrice(int itemID, boolean ignoreUntradeableMap)
{
if (itemID == ItemID.COINS_995)
final int realId = canonicalize(itemID);
if (realId == ItemID.COINS_995)
{
return 1;
}
if (itemID == ItemID.PLATINUM_TOKEN)
if (realId == ItemID.PLATINUM_TOKEN)
{
return 1000;
}
if (!ignoreUntradeableMap)
{
UntradeableItemMapping p = UntradeableItemMapping.map(ItemVariationMapping.map(itemID));
UntradeableItemMapping p = UntradeableItemMapping.map(ItemVariationMapping.map(realId));
if (p != null)
{
return getItemPrice(p.getPriceID()) * p.getQuantity();
@@ -286,7 +288,7 @@ public class ItemManager
}
int price = 0;
for (int mappedID : ItemMapping.map(itemID))
for (int mappedID : ItemMapping.map(realId))
{
ItemPrice ip = itemPrices.get(mappedID);
if (ip != null)

5
runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
View File

@@ -123,4 +123,9 @@ public abstract class Plugin implements Module, ExtensionPoint
public void resetConfiguration()
{
}
public String getName()
{
return getClass().getAnnotation(PluginDescriptor.class).name();
}
}

3
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
View File

@@ -144,14 +144,13 @@ public class ConfigPlugin extends Plugin
}
// Expand config panel for plugin
PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
SwingUtilities.invokeLater(() ->
{
if (!navButton.isSelected())
{
navButton.getOnSelect().run();
}
pluginListPanel.openConfigurationPanel(descriptor.name());
pluginListPanel.openConfigurationPanel(plugin.getName());
});
}
}

13
runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
View File

@@ -26,6 +26,8 @@ package net.runelite.client.plugins.config;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.inject.Singleton;
import javax.swing.JButton;
import lombok.AccessLevel;
@@ -42,8 +44,15 @@ class HotkeyButton extends JButton
HotkeyButton(Keybind value, boolean modifierless)
{
setValue(value);
addActionListener(e ->
setValue(Keybind.NOT_SET));
addMouseListener(new MouseAdapter()
{
@Override
public void mouseReleased(MouseEvent e)
{
// We have to use a mouse adapter instead of an action listener so the press action key (space) can be bound
setValue(Keybind.NOT_SET);
}
});
addKeyListener(new KeyAdapter()
{
@Override

4
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBox.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.ui.overlay.infobox;
import java.awt.Color;
import java.awt.image.BufferedImage;
import javax.annotation.Nonnull;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@@ -33,6 +34,7 @@ import net.runelite.client.plugins.Plugin;
public abstract class InfoBox
{
@Nonnull
@Getter(AccessLevel.PACKAGE)
private final Plugin plugin;
@@ -52,7 +54,7 @@ public abstract class InfoBox
@Setter
private String tooltip;
public InfoBox(BufferedImage image, Plugin plugin)
public InfoBox(BufferedImage image, @Nonnull Plugin plugin)
{
this.plugin = plugin;
setImage(image);

56
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java
View File

@@ -27,11 +27,10 @@ package net.runelite.client.ui.overlay.infobox;
import com.google.common.collect.ComparisonChain;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Predicate;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -39,14 +38,13 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.client.config.RuneLiteConfig;
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.ConfigChanged;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.util.AsyncBufferedImage;
@Singleton
@Slf4j
public class InfoBoxManager
{
private final List<InfoBox> infoBoxes = new ArrayList<>();
private final List<InfoBox> infoBoxes = new CopyOnWriteArrayList<>();
private final RuneLiteConfig runeLiteConfig;
@Inject
@@ -71,8 +69,19 @@ public class InfoBoxManager
log.debug("Adding InfoBox {}", infoBox);
updateInfoBoxImage(infoBox);
infoBoxes.add(infoBox);
refreshInfoBoxes();
synchronized (this)
{
int idx = Collections.binarySearch(infoBoxes, infoBox, (b1, b2) -> ComparisonChain
.start()
.compare(b1.getPriority(), b2.getPriority())
.compare(b1.getPlugin().getName(), b2.getPlugin().getName())
.result());
if (idx < 0)
{
infoBoxes.add(-idx - 1, infoBox);
}
}
BufferedImage image = infoBox.getImage();
@@ -83,21 +92,19 @@ public class InfoBoxManager
}
}
public void removeInfoBox(InfoBox infoBox)
public synchronized void removeInfoBox(InfoBox infoBox)
{
if (infoBoxes.remove(infoBox))
{
log.debug("Removed InfoBox {}", infoBox);
refreshInfoBoxes();
}
}
public void removeIf(Predicate<InfoBox> filter)
public synchronized void removeIf(Predicate<InfoBox> filter)
{
if (infoBoxes.removeIf(filter))
{
log.debug("Removed InfoBoxes for filter {}", filter);
refreshInfoBoxes();
}
}
@@ -106,25 +113,9 @@ public class InfoBoxManager
return Collections.unmodifiableList(infoBoxes);
}
public void cull()
public synchronized void cull()
{
boolean culled = false;
for (Iterator<InfoBox> it = infoBoxes.iterator(); it.hasNext(); )
{
InfoBox box = it.next();
if (box.cull())
{
log.debug("Culling InfoBox {}", box);
it.remove();
culled = true;
}
}
if (culled)
{
refreshInfoBoxes();
}
infoBoxes.removeIf(InfoBox::cull);
}
public void updateInfoBoxImage(final InfoBox infoBox)
@@ -163,13 +154,4 @@ public class InfoBoxManager
infoBox.setScaledImage(resultImage);
}
private void refreshInfoBoxes()
{
infoBoxes.sort((b1, b2) -> ComparisonChain
.start()
.compare(b1.getPriority(), b2.getPriority())
.compare(b1.getPlugin().getClass().getAnnotation(PluginDescriptor.class).name(), b2.getPlugin().getClass().getAnnotation(PluginDescriptor.class).name())
.result());
}
}