1 files changed, 50 insertions, 26 deletions

diff --git a/src/main/kotlin/repo/RepoManager.kt b/src/main/kotlin/repo/RepoManager.kt
index 6d9ba14..c3d1c52 100644
--- a/src/main/kotlin/repo/RepoManager.kt
+++ b/src/main/kotlin/repo/RepoManager.kt
@@ -7,10 +7,13 @@ import io.github.moulberry.repo.data.NEURecipe
 import io.github.moulberry.repo.data.Rarity
 import java.nio.file.Path
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.minecraft.client.MinecraftClient
 import net.minecraft.network.packet.s2c.play.SynchronizeRecipesS2CPacket
 import net.minecraft.recipe.display.CuttingRecipeDisplay
+import net.minecraft.util.StringIdentifiable
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.Firmament.logger
 import moe.nea.firmament.events.ReloadRegistrationEvent
@@ -34,11 +37,13 @@ object RepoManager {
 			branch = "master"
 			save()
 		}
-
+		val enableREI by toggle("enable-rei") { true }
 		val disableItemGroups by toggle("disable-item-groups") { true }
 		val reload by button("reload") {
 			save()
-			RepoManager.reload()
+			Firmament.coroutineScope.launch {
+				RepoManager.reload()
+			}
 		}
 		val redownload by button("redownload") {
 			save()
@@ -46,6 +51,19 @@ object RepoManager {
 		}
 		val alwaysSuperCraft by toggle("enable-super-craft") { true }
 		var warnForMissingItemListMod by toggle("warn-for-missing-item-list-mod") { true }
+		val perfectRenders by choice("perfect-renders") { PerfectRender.RENDER }
+	}
+
+	enum class PerfectRender(val label: String) : StringIdentifiable {
+		NOTHING("nothing"),
+		RENDER("render"),
+		RENDER_AND_TEXT("text"),
+		;
+
+		fun rendersPerfectText() = this == RENDER_AND_TEXT
+		fun rendersPerfectVisuals() = this == RENDER || this == RENDER_AND_TEXT
+
+		override fun asString(): String? = label
 	}
 
 	val currentDownloadedSha by RepoDownloadManager::latestSavedVersionHash
@@ -54,15 +72,20 @@ object RepoManager {
 
 	val essenceRecipeProvider = EssenceRecipeProvider()
 	val recipeCache = BetterRepoRecipeCache(essenceRecipeProvider, ReforgeStore)
+	val miningData = MiningRepoData()
+	val overlayData = ModernOverlaysData()
 
 	fun makeNEURepository(path: Path): NEURepository {
 		return NEURepository.of(path).apply {
+			registerReloadListener(overlayData)
 			registerReloadListener(ItemCache)
 			registerReloadListener(RepoItemTypeCache)
 			registerReloadListener(ExpLadders)
 			registerReloadListener(ItemNameLookup)
 			registerReloadListener(ReforgeStore)
 			registerReloadListener(essenceRecipeProvider)
+			registerReloadListener(recipeCache)
+			registerReloadListener(miningData)
 			ReloadRegistrationEvent.publish(ReloadRegistrationEvent(this))
 			registerReloadListener {
 				if (TestUtil.isInTest) return@registerReloadListener
@@ -73,7 +96,6 @@ object RepoManager {
 					}
 				}
 			}
-			registerReloadListener(recipeCache)
 		}
 	}
 
@@ -100,47 +122,45 @@ object RepoManager {
 
 	fun getNEUItem(skyblockId: SkyblockId): NEUItem? = neuRepo.items.getItemBySkyblockId(skyblockId.neuItem)
 
+	fun downloadOverridenBranch(branch: String) {
+		Firmament.coroutineScope.launch {
+			RepoDownloadManager.downloadUpdate(true, branch)
+			reload()
+		}
+	}
+
 	fun launchAsyncUpdate(force: Boolean = false) {
 		Firmament.coroutineScope.launch {
-			ItemCache.ReloadProgressHud.reportProgress("Downloading", 0, -1) // TODO: replace with a proper bouncy bar
-			ItemCache.ReloadProgressHud.isEnabled = true
-			try {
-				RepoDownloadManager.downloadUpdate(force)
-				ItemCache.ReloadProgressHud.reportProgress("Download complete", 1, 1)
-			} finally {
-				ItemCache.ReloadProgressHud.isEnabled = false
-			}
+			RepoDownloadManager.downloadUpdate(force)
 			reload()
 		}
 	}
 
 	fun reloadForTest(from: Path) {
 		neuRepo = makeNEURepository(from)
-		reload()
+		reloadSync()
 	}
 
-	fun reload() {
-		if (!TestUtil.isInTest && !MC.instance.isOnThread) {
-			MC.instance.send {
-				reload()
-			}
-			return
+
+	suspend fun reload() {
+		withContext(Dispatchers.IO) {
+			reloadSync()
 		}
+	}
+
+	fun reloadSync() {
 		try {
-			ItemCache.ReloadProgressHud.reportProgress("Reloading from Disk",
-			                                           0,
-			                                           -1) // TODO: replace with a proper bouncy bar
-			ItemCache.ReloadProgressHud.isEnabled = true
 			logger.info("Repo reload started.")
 			neuRepo.reload()
 			logger.info("Repo reload completed.")
 		} catch (exc: NEURepositoryException) {
 			ErrorUtil.softError("Failed to reload repository", exc)
 			MC.sendChat(
-				tr("firmament.repo.reloadfail",
-				   "Failed to reload repository. This will result in some mod features not working.")
+				tr(
+					"firmament.repo.reloadfail",
+					"Failed to reload repository. This will result in some mod features not working."
+				)
 			)
-			ItemCache.ReloadProgressHud.isEnabled = false
 		}
 	}
 
@@ -156,7 +176,9 @@ object RepoManager {
 		if (Config.autoUpdate) {
 			launchAsyncUpdate()
 		} else {
-			reload()
+			Firmament.coroutineScope.launch {
+				reload()
+			}
 		}
 	}
 
@@ -184,4 +206,6 @@ object RepoManager {
 	fun getRepoRef(): String {
 		return "${Config.username}/${Config.reponame}#${Config.branch}"
 	}
+
+	fun shouldLoadREI(): Boolean = Config.enableREI
 }