Add essence upgrade recipes

4 files changed, 117 insertions, 15 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/repo/BetterRepoRecipeCache.kt b/src/main/kotlin/moe/nea/firmament/repo/BetterRepoRecipeCache.kt
new file mode 100644
index 0000000..9ccf72d
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/repo/BetterRepoRecipeCache.kt
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.repo
+
+import io.github.moulberry.repo.IReloadable
+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()
+
+    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
+    }
+}
diff --git a/src/main/kotlin/moe/nea/firmament/repo/EssenceRecipeProvider.kt b/src/main/kotlin/moe/nea/firmament/repo/EssenceRecipeProvider.kt
new file mode 100644
index 0000000..09bc49c
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/repo/EssenceRecipeProvider.kt
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.repo
+
+import io.github.moulberry.repo.IReloadable
+import io.github.moulberry.repo.NEURepository
+import io.github.moulberry.repo.data.NEUIngredient
+import io.github.moulberry.repo.data.NEURecipe
+import moe.nea.firmament.util.SkyblockId
+
+class EssenceRecipeProvider : IReloadable {
+    data class EssenceUpgradeRecipe(
+        val itemId: SkyblockId,
+        val starCountAfter: Int,
+        val essenceCost: Int,
+        val essenceType: String, // TODO: replace with proper type
+        val extraItems: List<NEUIngredient>,
+    ) : NEURecipe {
+        val essenceIngredient= NEUIngredient.fromString("${essenceType}:$essenceCost")
+        val allUpgradeComponents = listOf(essenceIngredient) + extraItems
+
+        override fun getAllInputs(): Collection<NEUIngredient> {
+            return listOf(NEUIngredient.fromString(itemId.neuItem + ":1")) + allUpgradeComponents
+        }
+
+        override fun getAllOutputs(): Collection<NEUIngredient> {
+            return listOf(NEUIngredient.fromString(itemId.neuItem + ":1"))
+        }
+    }
+
+    var recipes = listOf<EssenceUpgradeRecipe>()
+        private set
+
+    override fun reload(repository: NEURepository) {
+        val recipes = mutableListOf<EssenceUpgradeRecipe>()
+        for ((neuId, costs) in repository.constants.essenceCost.costs) {
+            for ((starCountAfter, essenceCost) in costs.essenceCosts.entries) {
+                val items = costs.itemCosts[starCountAfter] ?: emptyList()
+                recipes.add(
+                    EssenceUpgradeRecipe(
+                        SkyblockId(neuId),
+                        starCountAfter,
+                        essenceCost,
+                        "ESSENCE_" + costs.type.uppercase(), // how flimsy
+                        items.map { NEUIngredient.fromString(it) }))
+            }
+        }
+        this.recipes = recipes
+    }
+}
diff --git a/src/main/kotlin/moe/nea/firmament/repo/RepoDownloadManager.kt b/src/main/kotlin/moe/nea/firmament/repo/RepoDownloadManager.kt
index 1c27a97..afd9b9f 100644
--- a/src/main/kotlin/moe/nea/firmament/repo/RepoDownloadManager.kt
+++ b/src/main/kotlin/moe/nea/firmament/repo/RepoDownloadManager.kt
@@ -1,28 +1,34 @@
 /*
  * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe>
+ * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
  *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 package moe.nea.firmament.repo
 
-import io.ktor.client.call.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.utils.io.jvm.nio.*
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsChannel
+import io.ktor.utils.io.jvm.nio.copyTo
+import java.io.IOException
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.StandardOpenOption
+import java.util.zip.ZipInputStream
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
+import kotlin.io.path.createDirectories
+import kotlin.io.path.exists
+import kotlin.io.path.inputStream
+import kotlin.io.path.outputStream
+import kotlin.io.path.readText
+import kotlin.io.path.writeText
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.Firmament.logger
 import moe.nea.firmament.util.iterate
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.StandardOpenOption
-import java.util.zip.ZipInputStream
-import kotlin.io.path.*
 
 
 object RepoDownloadManager {
@@ -55,6 +61,9 @@ object RepoDownloadManager {
     private class GithubCommitsResponse(val sha: String)
 
     private suspend fun requestLatestGithubSha(): String? {
+        if (RepoManager.Config.branch == "prerelease") {
+            RepoManager.Config.branch = "master"
+        }
         val response =
             Firmament.httpClient.get("https://api.github.com/repos/${RepoManager.Config.username}/${RepoManager.Config.reponame}/commits/${RepoManager.Config.branch}")
         if (response.status.value != 200) {
diff --git a/src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt b/src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt
index f556a8b..179b720 100644
--- a/src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt
+++ b/src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt
@@ -1,5 +1,6 @@
 /*
  * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe>
+ * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
  *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -28,12 +29,12 @@ object RepoManager {
     object Config : ManagedConfig("repo") {
         var username by string("username") { "NotEnoughUpdates" }
         var reponame by string("reponame") { "NotEnoughUpdates-REPO" }
-        var branch by string("branch") { "prerelease" }
+        var branch by string("branch") { "master" }
         val autoUpdate by toggle("autoUpdate") { true }
         val reset by button("reset") {
             username = "NotEnoughUpdates"
             reponame = "NotEnoughUpdates-REPO"
-            branch = "prerelease"
+            branch = "master"
             save()
         }
 
@@ -66,12 +67,17 @@ object RepoManager {
         }
     }
 
-    private val recipeCache = NEURecipeCache.forRepo(neuRepo)
+    val essenceRecipeProvider = EssenceRecipeProvider()
+    val recipeCache = BetterRepoRecipeCache(essenceRecipeProvider)
+    init {
+    	neuRepo.registerReloadListener(essenceRecipeProvider)
+    	neuRepo.registerReloadListener(recipeCache)
+    }
 
     fun getAllRecipes() = neuRepo.items.items.values.asSequence().flatMap { it.recipes }
 
-    fun getRecipesFor(skyblockId: SkyblockId): Set<NEURecipe> = recipeCache.recipes[skyblockId.neuItem] ?: setOf()
-    fun getUsagesFor(skyblockId: SkyblockId): Set<NEURecipe> = recipeCache.usages[skyblockId.neuItem] ?: setOf()
+    fun getRecipesFor(skyblockId: SkyblockId): Set<NEURecipe> = recipeCache.recipes[skyblockId] ?: setOf()
+    fun getUsagesFor(skyblockId: SkyblockId): Set<NEURecipe> = recipeCache.usages[skyblockId] ?: setOf()
 
     private fun trySendClientboundUpdateRecipesPacket(): Boolean {
         return MinecraftClient.getInstance().world != null && MinecraftClient.getInstance().networkHandler?.onSynchronizeRecipes(