From bb124fe91d310d08fbf17ea8972d9e7b8b89b319 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Tue, 31 Dec 2024 17:51:29 +0100 Subject: fix: Dungeon swords not being recognized for reforges --- .../java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/compat') diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt index 9c8d8f4..4d00a4f 100644 --- a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt +++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt @@ -171,9 +171,10 @@ class SBReforgeRecipe( is Reforge.ReforgeEligibilityFilter.AllowsItemType -> ReforgeStore.resolveItemType(it.itemType) - .flatMap { - RepoItemTypeCache.byItemType[it] ?: listOf() - } + .flatMapTo(mutableSetOf()) { + (RepoItemTypeCache.byItemType[it] ?: listOf()) + + (RepoItemTypeCache.byItemType[it.dungeonVariant] ?: listOf()) + }.toList() is Reforge.ReforgeEligibilityFilter.AllowsVanillaItemType -> { listOf() // TODO: add filter support for this and potentially rework this to search for the declared item type in repo, instead of remapped item type -- cgit