feat: Remove repo reload HUD
This commit is contained in:
@@ -184,31 +184,6 @@ object ItemCache : IReloadable {
|
|||||||
|
|
||||||
var job: Job? = null
|
var job: Job? = null
|
||||||
|
|
||||||
object ReloadProgressHud : MoulConfigHud(
|
|
||||||
"repo_reload", HudMeta(HudPosition(0.0, 0.0, 1F), Text.literal("Repo Reload"), 180, 18)) {
|
|
||||||
|
|
||||||
|
|
||||||
var isEnabled = false
|
|
||||||
override fun shouldRender(): Boolean {
|
|
||||||
return isEnabled
|
|
||||||
}
|
|
||||||
|
|
||||||
@get:Bind("current")
|
|
||||||
var current: Double = 0.0
|
|
||||||
|
|
||||||
@get:Bind("label")
|
|
||||||
var label: String = ""
|
|
||||||
|
|
||||||
@get:Bind("max")
|
|
||||||
var max: Double = 0.0
|
|
||||||
|
|
||||||
fun reportProgress(label: String, current: Int, max: Int) {
|
|
||||||
this.label = label
|
|
||||||
this.current = current.toDouble()
|
|
||||||
this.max = max.toDouble()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun reload(repository: NEURepository) {
|
override fun reload(repository: NEURepository) {
|
||||||
val j = job
|
val j = job
|
||||||
if (j != null && j.isActive) {
|
if (j != null && j.isActive) {
|
||||||
@@ -218,20 +193,10 @@ object ItemCache : IReloadable {
|
|||||||
isFlawless = true
|
isFlawless = true
|
||||||
if (TestUtil.isInTest) return
|
if (TestUtil.isInTest) return
|
||||||
job = Firmament.coroutineScope.launch {
|
job = Firmament.coroutineScope.launch {
|
||||||
val items = repository.items?.items
|
val items = repository.items?.items ?: return@launch
|
||||||
if (items == null) {
|
|
||||||
ReloadProgressHud.isEnabled = false
|
|
||||||
return@launch
|
|
||||||
}
|
|
||||||
val recacheItems = I18n.translate("firmament.repo.cache")
|
|
||||||
ReloadProgressHud.reportProgress(recacheItems, 0, items.size)
|
|
||||||
ReloadProgressHud.isEnabled = true
|
|
||||||
var i = 0
|
|
||||||
items.values.forEach {
|
items.values.forEach {
|
||||||
it.asItemStack() // Rebuild cache
|
it.asItemStack() // Rebuild cache
|
||||||
ReloadProgressHud.reportProgress(recacheItems, i++, items.size)
|
|
||||||
}
|
}
|
||||||
ReloadProgressHud.isEnabled = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -102,14 +102,7 @@ object RepoManager {
|
|||||||
|
|
||||||
fun launchAsyncUpdate(force: Boolean = false) {
|
fun launchAsyncUpdate(force: Boolean = false) {
|
||||||
Firmament.coroutineScope.launch {
|
Firmament.coroutineScope.launch {
|
||||||
ItemCache.ReloadProgressHud.reportProgress("Downloading", 0, -1) // TODO: replace with a proper bouncy bar
|
RepoDownloadManager.downloadUpdate(force)
|
||||||
ItemCache.ReloadProgressHud.isEnabled = true
|
|
||||||
try {
|
|
||||||
RepoDownloadManager.downloadUpdate(force)
|
|
||||||
ItemCache.ReloadProgressHud.reportProgress("Download complete", 1, 1)
|
|
||||||
} finally {
|
|
||||||
ItemCache.ReloadProgressHud.isEnabled = false
|
|
||||||
}
|
|
||||||
reload()
|
reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,10 +120,6 @@ object RepoManager {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
try {
|
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.")
|
logger.info("Repo reload started.")
|
||||||
neuRepo.reload()
|
neuRepo.reload()
|
||||||
logger.info("Repo reload completed.")
|
logger.info("Repo reload completed.")
|
||||||
@@ -140,7 +129,6 @@ object RepoManager {
|
|||||||
tr("firmament.repo.reloadfail",
|
tr("firmament.repo.reloadfail",
|
||||||
"Failed to reload repository. This will result in some mod features not working.")
|
"Failed to reload repository. This will result in some mod features not working.")
|
||||||
)
|
)
|
||||||
ItemCache.ReloadProgressHud.isEnabled = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user