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

loottracker: stack clue scrolls in the ui instead of at loot receive time

Browse Source
This commit is contained in:
Adam
2020-05-10 23:35:22 -04:00
parent ff0e2a5245
commit 0309ba41fd
6 changed files with 83 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
View File

@@ -201,18 +201,22 @@ class LootTrackerBox extends JPanel
outer:
for (LootTrackerItem item : record.getItems())
{
final int mappedItemId = LootTrackerMapping.map(item.getId(), item.getName());
// Combine it into an existing item if one already exists
for (int idx = 0; idx < items.size(); ++idx)
{
LootTrackerItem i = items.get(idx);
if (item.getId() == i.getId())
if (mappedItemId == i.getId())
{
items.set(idx, new LootTrackerItem(i.getId(), i.getName(), i.getQuantity() + item.getQuantity(), i.getGePrice(), i.getHaPrice(), i.isIgnored()));
continue outer;
}
}
items.add(item);
final LootTrackerItem mappedItem = mappedItemId == item.getId()
? item // reuse existing item
: new LootTrackerItem(mappedItemId, item.getName(), item.getQuantity(), item.getGePrice(), item.getHaPrice(), item.isIgnored());
items.add(mappedItem);
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
View File

@@ -25,11 +25,13 @@
package net.runelite.client.plugins.loottracker;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@AllArgsConstructor
@Getter
@EqualsAndHashCode
class LootTrackerItem
{
private final int id;

25
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerMapping.java
View File

@@ -24,13 +24,9 @@
*/
package net.runelite.client.plugins.loottracker;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import lombok.AllArgsConstructor;
import net.runelite.api.ItemComposition;
import net.runelite.api.ItemID;
import net.runelite.client.game.ItemManager;
import net.runelite.client.game.ItemStack;
@AllArgsConstructor
enum LootTrackerMapping
@@ -57,25 +53,8 @@ enum LootTrackerMapping
MAPPINGS = map.build();
}
private static int map(int itemId, ItemManager itemManager)
static int map(int itemId, String name)
{
ItemComposition itemComp = itemManager.getItemComposition(itemId);
if (Strings.isNullOrEmpty(itemComp.getName()))
{
return itemId;
}
return MAPPINGS.getOrDefault(itemComp.getName(), itemId);
}
static ItemStack map(ItemStack item, ItemManager itemManager)
{
int baseId = map(item.getId(), itemManager);
if (baseId == item.getId())
{
return item;
}
return new ItemStack(baseId, item.getQuantity(), item.getLocation());
return MAPPINGS.getOrDefault(name, itemId);
}
}

6
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
View File

@@ -215,14 +215,12 @@ public class LootTrackerPlugin extends Plugin
private LootTrackerClient lootTrackerClient;
private final List<LootRecord> queuedLoots = new ArrayList<>();
@VisibleForTesting
Collection<ItemStack> stack(Collection<ItemStack> items)
private static Collection<ItemStack> stack(Collection<ItemStack> items)
{
final List<ItemStack> list = new ArrayList<>();
for (ItemStack item : items)
for (final ItemStack item : items)
{
item = LootTrackerMapping.map(item, itemManager);
int quantity = 0;
for (final ItemStack i : list)
{