Close recipe list after clicking on highlighter

5 files changed, 169 insertions, 5 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
index 7f7110f..b39dafa 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
@@ -25,8 +25,8 @@ import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import moe.nea.firmament.events.HandledScreenPushREIEvent
 import moe.nea.firmament.features.inventory.CraftingOverlay
-import moe.nea.firmament.recipes.SBCraftingRecipe
-import moe.nea.firmament.recipes.SBForgeRecipe
+import moe.nea.firmament.rei.recipes.SBCraftingRecipe
+import moe.nea.firmament.rei.recipes.SBForgeRecipe
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.SkyblockId
 import moe.nea.firmament.util.skyblockId
@@ -52,7 +52,7 @@ class FirmamentReiPlugin : REIClientPlugin {
             }
             if (context.isActuallyCrafting)
                 CraftingOverlay.setOverlay(screen, display)
-            return@TransferHandler TransferHandler.Result.createSuccessful()
+            return@TransferHandler TransferHandler.Result.createSuccessful().blocksFurtherHandling(true)
         })
     }
 
diff --git a/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt b/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt
index c6b20c1..0a4f32d 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt
@@ -15,8 +15,8 @@ import me.shedaniel.rei.api.client.registry.display.DynamicDisplayGenerator
 import me.shedaniel.rei.api.client.view.ViewSearchBuilder
 import me.shedaniel.rei.api.common.display.Display
 import me.shedaniel.rei.api.common.entry.EntryStack
-import moe.nea.firmament.recipes.SBCraftingRecipe
-import moe.nea.firmament.recipes.SBForgeRecipe
+import moe.nea.firmament.rei.recipes.SBCraftingRecipe
+import moe.nea.firmament.rei.recipes.SBForgeRecipe
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.skyblockId
 
diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt
new file mode 100644
index 0000000..b53f874
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt
@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.rei.recipes
+
+import io.github.moulberry.repo.data.NEUCraftingRecipe
+import io.github.moulberry.repo.data.NEUIngredient
+import me.shedaniel.math.Point
+import me.shedaniel.math.Rectangle
+import me.shedaniel.rei.api.client.gui.Renderer
+import me.shedaniel.rei.api.client.gui.widgets.Widget
+import me.shedaniel.rei.api.client.gui.widgets.Widgets
+import me.shedaniel.rei.api.client.registry.display.DisplayCategory
+import me.shedaniel.rei.api.common.category.CategoryIdentifier
+import me.shedaniel.rei.api.common.util.EntryStacks
+import net.minecraft.block.Blocks
+import net.minecraft.text.Text
+import moe.nea.firmament.Firmament
+import moe.nea.firmament.rei.SBItemEntryDefinition
+
+class SBCraftingRecipe(override val neuRecipe: NEUCraftingRecipe) : SBRecipe() {
+    override fun getCategoryIdentifier(): CategoryIdentifier<*> = Category.catIdentifier
+
+    object Category : DisplayCategory<SBCraftingRecipe> {
+        val catIdentifier = CategoryIdentifier.of<SBCraftingRecipe>(Firmament.MOD_ID, "crafing_recipe")
+        override fun getCategoryIdentifier(): CategoryIdentifier<out SBCraftingRecipe> = catIdentifier
+
+        override fun getTitle(): Text = Text.literal("SkyBlock Crafting")
+
+        override fun getIcon(): Renderer = EntryStacks.of(Blocks.CRAFTING_TABLE)
+        override fun setupDisplay(display: SBCraftingRecipe, bounds: Rectangle): List<Widget> {
+            val point = Point(bounds.centerX - 58, bounds.centerY - 27)
+            return buildList {
+                add(Widgets.createRecipeBase(bounds))
+                add(Widgets.createArrow(Point(point.x + 60, point.y + 18)))
+                add(Widgets.createResultSlotBackground(Point(point.x + 95, point.y + 19)))
+                for (i in 0 until 3) {
+                    for (j in 0 until 3) {
+                        val slot = Widgets.createSlot(Point(point.x + 1 + i * 18, point.y + 1 + j * 18)).markInput()
+                        add(slot)
+                        val item = display.neuRecipe.inputs[i + j * 3]
+                        if (item == NEUIngredient.SENTINEL_EMPTY) continue
+                        slot.entry(SBItemEntryDefinition.getEntry(item)) // TODO: make use of stackable item entries
+                    }
+                }
+                add(
+                    Widgets.createSlot(Point(point.x + 95, point.y + 19))
+                        .entry(SBItemEntryDefinition.getEntry(display.neuRecipe.output))
+                        .disableBackground().markOutput()
+                )
+            }
+        }
+
+    }
+
+}
diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt
new file mode 100644
index 0000000..3960728
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt
@@ -0,0 +1,75 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.rei.recipes
+
+import io.github.moulberry.repo.data.NEUForgeRecipe
+import me.shedaniel.math.Point
+import me.shedaniel.math.Rectangle
+import me.shedaniel.rei.api.client.gui.Renderer
+import me.shedaniel.rei.api.client.gui.widgets.Widget
+import me.shedaniel.rei.api.client.gui.widgets.Widgets
+import me.shedaniel.rei.api.client.registry.display.DisplayCategory
+import me.shedaniel.rei.api.common.category.CategoryIdentifier
+import me.shedaniel.rei.api.common.util.EntryStacks
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.time.Duration.Companion.seconds
+import net.minecraft.block.Blocks
+import net.minecraft.text.Text
+import moe.nea.firmament.Firmament
+import moe.nea.firmament.rei.SBItemEntryDefinition
+import moe.nea.firmament.rei.plus
+
+class SBForgeRecipe(override val neuRecipe: NEUForgeRecipe) : SBRecipe() {
+    override fun getCategoryIdentifier(): CategoryIdentifier<*> = Category.categoryIdentifier
+
+    object Category : DisplayCategory<SBForgeRecipe> {
+        override fun getCategoryIdentifier(): CategoryIdentifier<SBForgeRecipe> =
+            CategoryIdentifier.of(Firmament.MOD_ID, "forge_recipe")
+
+        override fun getTitle(): Text = Text.literal("Forge Recipes")
+        override fun getDisplayHeight(): Int {
+            return 104
+        }
+
+        override fun getIcon(): Renderer = EntryStacks.of(Blocks.ANVIL)
+        override fun setupDisplay(display: SBForgeRecipe, bounds: Rectangle): List<Widget> {
+            return buildList {
+                add(Widgets.createRecipeBase(bounds))
+                add(Widgets.createResultSlotBackground(Point(bounds.minX + 124, bounds.minY + 46)))
+                val arrow = Widgets.createArrow(Point(bounds.minX + 90, bounds.minY + 54 - 18 / 2))
+                add(arrow)
+                add(Widgets.createTooltip(arrow.bounds, Text.translatable("firmament.recipe.forge.time", display.neuRecipe.duration.seconds)))
+                val ingredientsCenter = Point(bounds.minX + 49 - 8, bounds.minY + 54 - 8)
+                val count = display.neuRecipe.inputs.size
+                if (count == 1) {
+                    add(
+                        Widgets.createSlot(Point(ingredientsCenter.x, ingredientsCenter.y)).markInput()
+                            .entry(SBItemEntryDefinition.getEntry(display.neuRecipe.inputs.single()))
+                    )
+                } else {
+                    display.neuRecipe.inputs.forEachIndexed { idx, ingredient ->
+                        val rad = Math.PI * 2 * idx / count
+                        add(
+                            Widgets.createSlot(
+                                Point(
+                                    cos(rad) * 30,
+                                    sin(rad) * 30,
+                                ) + ingredientsCenter
+                            ).markInput().entry(SBItemEntryDefinition.getEntry(ingredient))
+                        )
+                    }
+                }
+                add(
+                    Widgets.createSlot(Point(bounds.minX + 124, bounds.minY + 46)).markOutput().disableBackground()
+                        .entry(SBItemEntryDefinition.getEntry(display.neuRecipe.outputStack))
+                )
+            }
+        }
+    }
+
+}
diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt
new file mode 100644
index 0000000..9a64857
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt
@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.rei.recipes
+
+import io.github.moulberry.repo.data.NEURecipe
+import me.shedaniel.rei.api.common.display.Display
+import me.shedaniel.rei.api.common.entry.EntryIngredient
+import moe.nea.firmament.rei.SBItemEntryDefinition
+import moe.nea.firmament.util.SkyblockId
+
+abstract class SBRecipe() : Display {
+    abstract val neuRecipe: NEURecipe
+    override fun getInputEntries(): List<EntryIngredient> {
+        return neuRecipe.allInputs.map {
+            val entryStack = SBItemEntryDefinition.getEntry(SkyblockId(it.itemId))
+            EntryIngredient.of(entryStack)
+        }
+    }
+
+    override fun getOutputEntries(): List<EntryIngredient> {
+        return neuRecipe.allOutputs.map {
+            val entryStack = SBItemEntryDefinition.getEntry(SkyblockId(it.itemId))
+            EntryIngredient.of(entryStack)
+        }
+    }
+}