From 8e34cb7329b8b16cecd6112fe12550992d3a920d Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Wed, 29 May 2024 20:09:51 +0300 Subject: Add support for multiple stray rabbits at once --- .../skyblock/chocolatefactory/ChocolateFactorySolver.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky') 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 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 getStrayRabbitHighlight(Int2ObjectMap slots) { + private static List getStrayRabbitHighlight(Int2ObjectMap slots) { + final List 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) { -- cgit