aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-05-29 20:09:51 +0300
committerRime <81419447+Emirlol@users.noreply.github.com>2024-05-29 20:09:51 +0300
commit8e34cb7329b8b16cecd6112fe12550992d3a920d (patch)
tree2aefcf6f6e5b00d15ec25edafd21223f2754c177 /src/main/java/de/hysky/skyblocker
parente74fc54125c17fd85d1302e5dd5f315fcf37a7c9 (diff)
downloadSkyblocker-8e34cb7329b8b16cecd6112fe12550992d3a920d.tar.gz
Skyblocker-8e34cb7329b8b16cecd6112fe12550992d3a920d.tar.bz2
Skyblocker-8e34cb7329b8b16cecd6112fe12550992d3a920d.zip
Add support for multiple stray rabbits at once
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
index 5c698ae1..2662b8e1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
@@ -78,7 +78,7 @@ public class ChocolateFactorySolver extends ContainerSolver {
List<ColorHighlight> highlights = new ArrayList<>();
getPrestigeHighlight().ifPresent(highlights::add);
- getStrayRabbitHighlight(slots).ifPresent(highlights::add);
+ highlights.addAll(getStrayRabbitHighlight(slots));
if (totalChocolate <= 0 || cpsIncreaseFactors.isEmpty()) return highlights; //Something went wrong or there's nothing we can afford.
Rabbit bestRabbit = cpsIncreaseFactors.getFirst();
@@ -343,14 +343,15 @@ public class ChocolateFactorySolver extends ContainerSolver {
return Optional.of(ColorHighlight.red(PRESTIGE_SLOT));
}
- private static Optional<ColorHighlight> getStrayRabbitHighlight(Int2ObjectMap<ItemStack> slots) {
+ private static List<ColorHighlight> getStrayRabbitHighlight(Int2ObjectMap<ItemStack> slots) {
+ final List<ColorHighlight> highlights = new ArrayList<>();
for (byte i = STRAY_RABBIT_START; i < STRAY_RABBIT_END; i++) {
ItemStack item = slots.get(i);
if (item.isOf(Items.PLAYER_HEAD) && item.getName().getString().equals("CLICK ME!")) {
- return Optional.of(ColorHighlight.green(i));
+ highlights.add(ColorHighlight.green(i));
}
}
- return Optional.empty();
+ return highlights;
}
private record Rabbit(double cpsIncrease, int cost, int slot, ItemStack itemStack) {