1 files changed, 22 insertions, 10 deletions
diff --git a/src/main/kotlin/repo/RepoManager.kt b/src/main/kotlin/repo/RepoManager.kt
index df89092..c3d1c52 100644
--- a/src/main/kotlin/repo/RepoManager.kt
+++ b/src/main/kotlin/repo/RepoManager.kt
@@ -7,7 +7,9 @@ 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
@@ -35,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()
@@ -56,6 +60,9 @@ object RepoManager {
 		RENDER_AND_TEXT("text"),
 		;
 
+		fun rendersPerfectText() = this == RENDER_AND_TEXT
+		fun rendersPerfectVisuals() = this == RENDER || this == RENDER_AND_TEXT
+
 		override fun asString(): String? = label
 	}
 
@@ -131,16 +138,17 @@ object RepoManager {
 
 	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 {
 			logger.info("Repo reload started.")
 			neuRepo.reload()
@@ -168,7 +176,9 @@ object RepoManager {
 		if (Config.autoUpdate) {
 			launchAsyncUpdate()
 		} else {
-			reload()
+			Firmament.coroutineScope.launch {
+				reload()
+			}
 		}
 	}
 
@@ -196,4 +206,6 @@ object RepoManager {
 	fun getRepoRef(): String {
 		return "${Config.username}/${Config.reponame}#${Config.branch}"
 	}
+
+	fun shouldLoadREI(): Boolean = Config.enableREI
 }