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

Remove 4th invalid state from ground boxes

Browse Source 
Remove the possibility of having the item both highlighted and hidden
when using the highlight/hidden boxes.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-03-19 12:54:25 +01:00
parent 7a3ee8d1c0
commit b24a996263
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -36,13 +36,15 @@ import java.awt.Color;
import java.awt.Rectangle; import java.awt.Rectangle;
import static java.lang.Boolean.TRUE; import static java.lang.Boolean.TRUE;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.stream.Collector; import java.util.stream.Collector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -89,6 +91,12 @@ import net.runelite.http.api.item.ItemPrice;
@Slf4j @Slf4j
public class GroundItemsPlugin extends Plugin public class GroundItemsPlugin extends Plugin
{ {
private static final Splitter COMMA_SPLITTER = Splitter
.on(",")
.omitEmptyStrings()
.trimResults();
private static final Joiner COMMA_JOINER = Joiner.on(",").skipNulls();
//Size of one region //Size of one region
private static final int REGION_SIZE = 104; private static final int REGION_SIZE = 104;
// The max distance in tiles between the player and the item. // The max distance in tiles between the player and the item.
@@ -99,17 +107,17 @@ public class GroundItemsPlugin extends Plugin
private static final int COINS = ItemID.COINS_995; private static final int COINS = ItemID.COINS_995;
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final Map<Rectangle, String> hiddenBoxes = new HashMap<>(); private final Map<Rectangle, String> hiddenBoxes = new ConcurrentHashMap<>();
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final Map<Rectangle, String> highlightBoxes = new HashMap<>(); private final Map<Rectangle, String> highlightBoxes = new ConcurrentHashMap<>();
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE)
private boolean hotKeyPressed; private boolean hotKeyPressed;
private List<String> hiddenItemList = new ArrayList<>(); private List<String> hiddenItemList = new CopyOnWriteArrayList<>();
private List<String> highlightedItemsList = new ArrayList<>(); private List<String> highlightedItemsList = new CopyOnWriteArrayList<>();
private boolean dirty; private boolean dirty;
@Inject @Inject
@@ -309,13 +317,11 @@ public class GroundItemsPlugin extends Plugin
private void reset() private void reset()
{ {
Splitter COMMA_SPLITTER = Splitter.on(Pattern.compile("\\s*,\\s*"));
// gets the hidden items from the text box in the config // gets the hidden items from the text box in the config
hiddenItemList = COMMA_SPLITTER.splitToList(config.getHiddenItems().trim()); hiddenItemList = COMMA_SPLITTER.splitToList(config.getHiddenItems());
// gets the highlighted items from the text box in the config // gets the highlighted items from the text box in the config
highlightedItemsList = COMMA_SPLITTER.splitToList(config.getHighlightItems().trim()); highlightedItemsList = COMMA_SPLITTER.splitToList(config.getHighlightItems());
highlightedItems = CacheBuilder.newBuilder() highlightedItems = CacheBuilder.newBuilder()
.maximumSize(512L) .maximumSize(512L)
@@ -415,24 +421,27 @@ public class GroundItemsPlugin extends Plugin
void updateList(String item, boolean hiddenList) void updateList(String item, boolean hiddenList)
{ {
List<String> items = new ArrayList<>((hiddenList) ? hiddenItemList : highlightedItemsList); final Set<String> hiddenItemSet = new HashSet<>(hiddenItemList);
final Set<String> highlightedItemSet = new HashSet<>(highlightedItemsList);
items.removeIf(s -> s.isEmpty()); if (hiddenList)
if (!items.removeIf(s -> s.equalsIgnoreCase(item))) {
highlightedItemSet.removeIf(item::equalsIgnoreCase);
}
else
{
hiddenItemSet.removeIf(item::equalsIgnoreCase);
}
final Set<String> items = hiddenList ? hiddenItemSet : highlightedItemSet;
if (!items.removeIf(item::equalsIgnoreCase))
{ {
items.add(item); items.add(item);
} }
String newList = Joiner.on(", ").join(items); config.setHiddenItems(COMMA_JOINER.join(hiddenItemSet));
// This triggers the config update which updates the list config.setHighlightedItem(COMMA_JOINER.join(highlightedItemSet));
if (hiddenList)
{
config.setHiddenItems(newList);
}
else
{
config.setHighlightedItem(newList);
}
} }
public boolean isHighlighted(String item) public boolean isHighlighted(String item)