Merge branch 'mc-1.21.3'

1 files changed, 17 insertions, 19 deletions

diff --git a/src/main/kotlin/repo/BetterRepoRecipeCache.kt b/src/main/kotlin/repo/BetterRepoRecipeCache.kt
index 91a6b50..4b32e57 100644
--- a/src/main/kotlin/repo/BetterRepoRecipeCache.kt
+++ b/src/main/kotlin/repo/BetterRepoRecipeCache.kt
@@ -1,4 +1,3 @@
-
 package moe.nea.firmament.repo
 
 import io.github.moulberry.repo.IReloadable
@@ -6,23 +5,22 @@ import io.github.moulberry.repo.NEURepository
 import io.github.moulberry.repo.data.NEURecipe
 import moe.nea.firmament.util.SkyblockId
 
-class BetterRepoRecipeCache(val essenceRecipeProvider: EssenceRecipeProvider) : IReloadable {
-    var usages: Map<SkyblockId, Set<NEURecipe>> = mapOf()
-    var recipes: Map<SkyblockId, Set<NEURecipe>> = mapOf()
+class BetterRepoRecipeCache(vararg val extraProviders: ExtraRecipeProvider) : IReloadable {
+	var usages: Map<SkyblockId, Set<NEURecipe>> = mapOf()
+	var recipes: Map<SkyblockId, Set<NEURecipe>> = mapOf()
 
-    override fun reload(repository: NEURepository) {
-        val usages = mutableMapOf<SkyblockId, MutableSet<NEURecipe>>()
-        val recipes = mutableMapOf<SkyblockId, MutableSet<NEURecipe>>()
-        val baseRecipes = repository.items.items.values
-            .asSequence()
-            .flatMap { it.recipes }
-        val extraRecipes = essenceRecipeProvider.recipes
-        (baseRecipes + extraRecipes)
-            .forEach { recipe ->
-                recipe.allInputs.forEach { usages.getOrPut(SkyblockId(it.itemId), ::mutableSetOf).add(recipe) }
-                recipe.allOutputs.forEach { recipes.getOrPut(SkyblockId(it.itemId), ::mutableSetOf).add(recipe) }
-            }
-        this.usages = usages
-        this.recipes = recipes
-    }
+	override fun reload(repository: NEURepository) {
+		val usages = mutableMapOf<SkyblockId, MutableSet<NEURecipe>>()
+		val recipes = mutableMapOf<SkyblockId, MutableSet<NEURecipe>>()
+		val baseRecipes = repository.items.items.values
+			.asSequence()
+			.flatMap { it.recipes }
+		(baseRecipes + extraProviders.flatMap { it.provideExtraRecipes() })
+			.forEach { recipe ->
+				recipe.allInputs.forEach { usages.getOrPut(SkyblockId(it.itemId), ::mutableSetOf).add(recipe) }
+				recipe.allOutputs.forEach { recipes.getOrPut(SkyblockId(it.itemId), ::mutableSetOf).add(recipe) }
+			}
+		this.usages = usages
+		this.recipes = recipes
+	}
 }