feat: Keep reforge stats in essence upgrade recipesHEADmaster

2 files changed, 35 insertions, 36 deletions

diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockCraftingRecipeDynamicGenerator.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockCraftingRecipeDynamicGenerator.kt
index f52f418..72bd28c 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockCraftingRecipeDynamicGenerator.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockCraftingRecipeDynamicGenerator.kt
@@ -1,5 +1,3 @@
-
-
 package moe.nea.firmament.compat.rei
 
 import io.github.moulberry.repo.data.NEUCraftingRecipe
@@ -23,43 +21,43 @@ import moe.nea.firmament.repo.SBItemStack
 
 
 val SkyblockCraftingRecipeDynamicGenerator =
-    neuDisplayGenerator<SBCraftingRecipe, NEUCraftingRecipe> { SBCraftingRecipe(it) }
+	neuDisplayGenerator<SBCraftingRecipe, NEUCraftingRecipe> { SBCraftingRecipe(it) }
 
 val SkyblockForgeRecipeDynamicGenerator =
-    neuDisplayGenerator<SBForgeRecipe, NEUForgeRecipe> { SBForgeRecipe(it) }
+	neuDisplayGenerator<SBForgeRecipe, NEUForgeRecipe> { SBForgeRecipe(it) }
 
 val SkyblockMobDropRecipeDynamicGenerator =
-    neuDisplayGenerator<SBMobDropRecipe, NEUMobDropRecipe> { SBMobDropRecipe(it) }
+	neuDisplayGenerator<SBMobDropRecipe, NEUMobDropRecipe> { SBMobDropRecipe(it) }
 
 val SkyblockKatRecipeDynamicGenerator =
-    neuDisplayGenerator<SBKatRecipe, NEUKatUpgradeRecipe> { SBKatRecipe(it) }
+	neuDisplayGenerator<SBKatRecipe, NEUKatUpgradeRecipe> { SBKatRecipe(it) }
 val SkyblockEssenceRecipeDynamicGenerator =
-    neuDisplayGenerator<SBEssenceUpgradeRecipe, EssenceRecipeProvider.EssenceUpgradeRecipe> { SBEssenceUpgradeRecipe(it) }
+	neuDisplayGeneratorWithItem<SBEssenceUpgradeRecipe, EssenceRecipeProvider.EssenceUpgradeRecipe> { item, recipe ->
+		SBEssenceUpgradeRecipe(recipe, item)
+	}
 
 inline fun <D : Display, reified T : NEURecipe> neuDisplayGenerator(crossinline mapper: (T) -> D) =
-    object : DynamicDisplayGenerator<D> {
-        override fun getRecipeFor(entry: EntryStack<*>): Optional<List<D>> {
-            if (entry.type != SBItemEntryDefinition.type) return Optional.empty()
-            val item = entry.castValue<SBItemStack>()
-            val recipes = RepoManager.getRecipesFor(item.skyblockId)
-            val craftingRecipes = recipes.filterIsInstance<T>()
-            return Optional.of(craftingRecipes.map(mapper))
-        }
-
-        override fun generate(builder: ViewSearchBuilder): Optional<List<D>> {
-            if (SBCraftingRecipe.Category.catIdentifier !in builder.categories) return Optional.empty()
-            return Optional.of(
-                RepoManager.getAllRecipes().filterIsInstance<T>().map { mapper(it) }
-                    .toList()
-            )
-        }
-
-        override fun getUsageFor(entry: EntryStack<*>): Optional<List<D>> {
-            if (entry.type != SBItemEntryDefinition.type) return Optional.empty()
-            val item = entry.castValue<SBItemStack>()
-            val recipes = RepoManager.getUsagesFor(item.skyblockId)
-            val craftingRecipes = recipes.filterIsInstance<T>()
-            return Optional.of(craftingRecipes.map(mapper))
-
-        }
-    }
+	neuDisplayGeneratorWithItem<D, T> { _, it -> mapper(it) }
+
+inline fun <D : Display, reified T : NEURecipe> neuDisplayGeneratorWithItem(crossinline mapper: (SBItemStack, T) -> D) =
+	object : DynamicDisplayGenerator<D> {
+		override fun getRecipeFor(entry: EntryStack<*>): Optional<List<D>> {
+			if (entry.type != SBItemEntryDefinition.type) return Optional.empty()
+			val item = entry.castValue<SBItemStack>()
+			val recipes = RepoManager.getRecipesFor(item.skyblockId)
+			val craftingRecipes = recipes.filterIsInstance<T>()
+			return Optional.of(craftingRecipes.map { mapper(item, it) })
+		}
+
+		override fun generate(builder: ViewSearchBuilder): Optional<List<D>> {
+			return Optional.empty() // TODO: allows searching without blocking getRecipeFor
+		}
+
+		override fun getUsageFor(entry: EntryStack<*>): Optional<List<D>> {
+			if (entry.type != SBItemEntryDefinition.type) return Optional.empty()
+			val item = entry.castValue<SBItemStack>()
+			val recipes = RepoManager.getUsagesFor(item.skyblockId)
+			val craftingRecipes = recipes.filterIsInstance<T>()
+			return Optional.of(craftingRecipes.map { mapper(item, it) })
+		}
+	}
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBEssenceUpgradeRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBEssenceUpgradeRecipe.kt
index ec71ec8..e0a3784 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBEssenceUpgradeRecipe.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBEssenceUpgradeRecipe.kt
@@ -14,7 +14,8 @@ import moe.nea.firmament.repo.EssenceRecipeProvider
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.SkyblockId
 
-class SBEssenceUpgradeRecipe(override val neuRecipe: EssenceRecipeProvider.EssenceUpgradeRecipe) : SBRecipe() {
+class SBEssenceUpgradeRecipe(override val neuRecipe: EssenceRecipeProvider.EssenceUpgradeRecipe,
+							 val sourceItem: SBItemStack) : SBRecipe() {
 	object Category : DisplayCategory<SBEssenceUpgradeRecipe> {
 		override fun getCategoryIdentifier(): CategoryIdentifier<SBEssenceUpgradeRecipe> =
 			CategoryIdentifier.of(Firmament.MOD_ID, "essence_upgrade")
@@ -33,13 +34,13 @@ class SBEssenceUpgradeRecipe(override val neuRecipe: EssenceRecipeProvider.Essen
 			list.add(Widgets.createRecipeBase(bounds))
 			list.add(Widgets.createSlot(Point(bounds.minX + 12, bounds.centerY - 8 - 18 / 2))
 				         .markInput()
-				         .entry(SBItemEntryDefinition.getEntry(SBItemStack(recipe.itemId).copy(stars = recipe.starCountAfter - 1))))
+				         .entry(SBItemEntryDefinition.getEntry(display.sourceItem.copy(stars = recipe.starCountAfter - 1))))
 			list.add(Widgets.createSlot(Point(bounds.minX + 12, bounds.centerY - 8 + 18 / 2))
 				         .markInput()
 				         .entry(SBItemEntryDefinition.getEntry(recipe.essenceIngredient)))
 			list.add(Widgets.createSlot(Point(bounds.maxX - 12 - 16, bounds.centerY - 8))
 				         .markOutput()
-				         .entry(SBItemEntryDefinition.getEntry(SBItemStack(recipe.itemId).copy(stars = recipe.starCountAfter))))
+				         .entry(SBItemEntryDefinition.getEntry(display.sourceItem.copy(stars = recipe.starCountAfter))))
 			val extraItems = recipe.extraItems
 			list.add(Widgets.createArrow(Point(bounds.centerX - 24 / 2,
 			                                   if (extraItems.isEmpty()) bounds.centerY - 17 / 2