Fix missing tags in REI renderingupdate

4 files changed, 105 insertions, 0 deletions

diff --git a/src/main/kotlin/repo/SBItemStack.kt b/src/main/kotlin/repo/SBItemStack.kt
index e1cbdbb..18126ee 100644
--- a/src/main/kotlin/repo/SBItemStack.kt
+++ b/src/main/kotlin/repo/SBItemStack.kt
@@ -58,6 +58,7 @@ data class SBItemStack constructor(
 				SBItemStack(id, count)
 			}
 		}
+		val EMPTY = SBItemStack(SkyblockId.NULL, 0)
 
 		operator fun invoke(itemStack: ItemStack): SBItemStack {
 			val skyblockId = itemStack.skyBlockId ?: SkyblockId.NULL
@@ -133,6 +134,8 @@ data class SBItemStack constructor(
 			val itemStack = itemStack_ ?: run {
 				if (skyblockId == SkyblockId.COINS)
 					return@run ItemCache.coinItem(stackSize).also { it.appendLore(extraLore) }
+				if (stackSize == 0)
+					return@run ItemStack.EMPTY
 				val replacementData = mutableMapOf<String, String>()
 				injectReplacementDataForPets(replacementData)
 				return@run neuItem.asItemStack(idHint = skyblockId, replacementData)
diff --git a/src/main/kotlin/repo/recipes/GenericRecipeRenderer.kt b/src/main/kotlin/repo/recipes/GenericRecipeRenderer.kt
new file mode 100644
index 0000000..9a1aea5
--- /dev/null
+++ b/src/main/kotlin/repo/recipes/GenericRecipeRenderer.kt
@@ -0,0 +1,19 @@
+package moe.nea.firmament.repo.recipes
+
+import io.github.moulberry.repo.NEURepository
+import io.github.moulberry.repo.data.NEURecipe
+import me.shedaniel.math.Rectangle
+import net.minecraft.item.ItemStack
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+import moe.nea.firmament.repo.SBItemStack
+
+interface GenericRecipeRenderer<T : NEURecipe> {
+	fun render(recipe: T, bounds: Rectangle, layouter: RecipeLayouter)
+	fun getInputs(recipe: T): Collection<SBItemStack>
+	fun getOutputs(recipe: T): Collection<SBItemStack>
+	val icon: ItemStack
+	val title: Text
+	val identifier: Identifier
+	fun findAllRecipes(neuRepository: NEURepository): Iterable<T>
+}
diff --git a/src/main/kotlin/repo/recipes/RecipeLayouter.kt b/src/main/kotlin/repo/recipes/RecipeLayouter.kt
new file mode 100644
index 0000000..109bff5
--- /dev/null
+++ b/src/main/kotlin/repo/recipes/RecipeLayouter.kt
@@ -0,0 +1,33 @@
+package moe.nea.firmament.repo.recipes
+
+import io.github.notenoughupdates.moulconfig.gui.GuiComponent
+import net.minecraft.text.Text
+import moe.nea.firmament.repo.SBItemStack
+
+interface RecipeLayouter {
+	enum class SlotKind {
+		SMALL_INPUT,
+		SMALL_OUTPUT,
+
+		/**
+		 * Create a bigger background and mark the slot as output. The coordinates should still refer the upper left corner of the item stack, not of the bigger background.
+		 */
+		BIG_OUTPUT,
+	}
+
+	fun createItemSlot(
+		x: Int, y: Int,
+		content: SBItemStack?,
+		slotKind: SlotKind,
+	)
+
+	fun createLabel(
+		x: Int, y: Int,
+		text: Text
+	)
+
+	fun createArrow(x: Int, y: Int)
+
+	fun createMoulConfig(x: Int, y: Int, w: Int, h: Int, component: GuiComponent)
+}
+
diff --git a/src/main/kotlin/repo/recipes/SBCraftingRecipeRenderer.kt b/src/main/kotlin/repo/recipes/SBCraftingRecipeRenderer.kt
new file mode 100644
index 0000000..fd0c750
--- /dev/null
+++ b/src/main/kotlin/repo/recipes/SBCraftingRecipeRenderer.kt
@@ -0,0 +1,50 @@
+package moe.nea.firmament.repo.recipes
+
+import io.github.moulberry.repo.NEURepository
+import io.github.moulberry.repo.data.NEUCraftingRecipe
+import me.shedaniel.math.Point
+import me.shedaniel.math.Rectangle
+import net.minecraft.block.Blocks
+import net.minecraft.item.ItemStack
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+import moe.nea.firmament.Firmament
+import moe.nea.firmament.repo.SBItemStack
+import moe.nea.firmament.util.tr
+
+class SBCraftingRecipeRenderer : GenericRecipeRenderer<NEUCraftingRecipe> {
+	override fun render(recipe: NEUCraftingRecipe, bounds: Rectangle, layouter: RecipeLayouter) {
+		val point = Point(bounds.centerX - 58, bounds.centerY - 27)
+		layouter.createArrow(point.x + 60, point.y + 18)
+		for (i in 0 until 3) {
+			for (j in 0 until 3) {
+				val item = recipe.inputs[i + j * 3]
+				layouter.createItemSlot(point.x + 1 + i * 18,
+				                        point.y + 1 + j * 18,
+				                        SBItemStack(item),
+				                        RecipeLayouter.SlotKind.SMALL_INPUT)
+			}
+		}
+		layouter.createItemSlot(
+			point.x + 95, point.y + 19,
+			SBItemStack(recipe.output),
+			RecipeLayouter.SlotKind.BIG_OUTPUT
+		)
+	}
+
+	override fun getInputs(recipe: NEUCraftingRecipe): Collection<SBItemStack> {
+		return recipe.allInputs.mapNotNull { SBItemStack(it) }
+	}
+
+	override fun getOutputs(recipe: NEUCraftingRecipe): Collection<SBItemStack> {
+		return SBItemStack(recipe.output)?.let(::listOf) ?: emptyList()
+	}
+
+	override fun findAllRecipes(neuRepository: NEURepository): Iterable<NEUCraftingRecipe> {
+		return neuRepository.items.items.values.flatMap { it.recipes }.filterIsInstance<NEUCraftingRecipe>()
+	}
+
+	override val icon: ItemStack = ItemStack(Blocks.CRAFTING_TABLE)
+	override val title: Text = tr("firmament.category.crafting", "SkyBlock Crafting")
+	override val identifier: Identifier = Firmament.identifier("crafting_recipe")
+}