Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
)
@Slf4j
public class AutoMiningPlugin extends Plugin {
public static final String version = "1.0.14";
public static final String version = "1.0.15";
@Inject
private AutoMiningConfig config;
@Provides
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public boolean run(AutoMiningConfig config) {

updateActiveRock(config);

if (config.progressiveMode() && ensureProgressiveLocation(config)) {
if (config.progressiveMode() && state == State.MINING && ensureProgressiveLocation(config)) {
return;
}

Expand Down Expand Up @@ -214,7 +214,7 @@ else if (activeRock == Rocks.GEM && Rs2Player.getWorldLocation().getRegionID() =
}

} else {
Rs2Inventory.dropAllExcept(false, config.interactOrder(), Arrays.stream(config.itemsToKeep().split(",")).map(String::trim).toArray(String[]::new));
Rs2Inventory.dropAllExcept(false, config.interactOrder(), MiningBankRule.parseItemsToKeep(config.itemsToKeep()).toArray(new String[0]));
}

state = State.MINING;
Expand Down Expand Up @@ -313,9 +313,7 @@ private boolean ensureProgressiveLocation(AutoMiningConfig config) {

WorldPoint targetPoint = activeLocation.getWorldPoint();

// Only update initialPlayerLocation if it's null
// Don't update just because player is far away (e.g., at bank) - that breaks return-to-location
if (initialPlayerLocation == null) {
if (!targetPoint.equals(initialPlayerLocation)) {
initialPlayerLocation = targetPoint;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;

final class MiningBankRule {
private static final String UNCUT_GEM_PREFIX = "uncut ";
private static final String DEFAULT_ITEM_TO_KEEP = "pickaxe";

private MiningBankRule() {
}
Expand All @@ -22,6 +24,11 @@ static List<String> parseItemNames(String itemsToBank) {
.collect(Collectors.toList());
}

static List<String> parseItemsToKeep(String itemsToKeep) {
List<String> keep = parseItemNames(itemsToKeep);
return keep.isEmpty() ? Collections.singletonList(DEFAULT_ITEM_TO_KEEP) : keep;
}

static boolean shouldBank(String itemName, Collection<Rocks> rocks, List<String> itemNames) {
if (itemName == null) {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ void parsesCommaSeparatedNames() {
assertTrue(MiningBankRule.parseItemNames(" , ").isEmpty());
}

@Test
void blankKeepListFallsBackToPickaxe() {
assertEquals(Collections.singletonList("pickaxe"), MiningBankRule.parseItemsToKeep(""));
assertEquals(Collections.singletonList("pickaxe"), MiningBankRule.parseItemsToKeep(" , "));
assertEquals(Collections.singletonList("pickaxe"), MiningBankRule.parseItemsToKeep(","));
assertEquals(Collections.singletonList("pickaxe"), MiningBankRule.parseItemsToKeep(", "));
}

@Test
void defaultListStillBanksOres() {
assertTrue(MiningBankRule.shouldBank("Tin ore", only(Rocks.TIN), DEFAULT_ITEMS));
Expand Down
Loading