From b1b7a884552afef87727bfd68cc982ae17308bea Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 4 Mar 2023 01:30:17 +0100 Subject: Fixed garden visitor problems with mushroom, enchanted cactus green, enchanted golden carrot and enchanted cookie --- .../java/at/hannibal2/skyhanni/utils/NEUItems.kt | 27 +++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt index 5b7e33592..72bffdc46 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt @@ -114,7 +114,32 @@ object NEUItems { val map = mutableMapOf() for (ingredient in recipe.ingredients) { val count = ingredient.count.toInt() - val internalItemId = ingredient.internalItemId + var internalItemId = ingredient.internalItemId + // ignore cactus green + if (rawId == "ENCHANTED_CACTUS_GREEN") { + if (internalItemId == "INK_SACK-2") { + internalItemId = "CACTUS" + } + } + + // ignore wheat in enchanted cookie + if (rawId == "ENCHANTED_COOKIE") { + if (internalItemId == "WHEAT") { + continue + } + } + + // ignore golden carrot in enchanted golden carrot + if (rawId == "ENCHANTED_GOLDEN_CARROT") { + if (internalItemId == "GOLDEN_CARROT") { + continue + } + } + +// println("") +// println("rawId: $rawId") +// println("internalItemId: $internalItemId") + val old = map.getOrDefault(internalItemId, 0) map[internalItemId] = old + count } -- cgit