Skip to content

Commit

Permalink
feat: Remove repo reload HUD
Browse files Browse the repository at this point in the history
  • Loading branch information
nea89o committed Feb 17, 2025
1 parent 44fa3b0 commit bc887db
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 49 deletions.
37 changes: 1 addition & 36 deletions src/main/kotlin/repo/ItemCache.kt
Original file line number Diff line number Diff line change
Expand Up @@ -184,31 +184,6 @@ object ItemCache : IReloadable {

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) {
val j = job
if (j != null && j.isActive) {
Expand All @@ -218,20 +193,10 @@ object ItemCache : IReloadable {
isFlawless = true
if (TestUtil.isInTest) return
job = Firmament.coroutineScope.launch {
val items = repository.items?.items
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
val items = repository.items?.items ?: return@launch
items.values.forEach {
it.asItemStack() // Rebuild cache
ReloadProgressHud.reportProgress(recacheItems, i++, items.size)
}
ReloadProgressHud.isEnabled = false
}
}

Expand Down
14 changes: 1 addition & 13 deletions src/main/kotlin/repo/RepoManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,7 @@ object RepoManager {

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()
}
}
Expand All @@ -127,10 +120,6 @@ object RepoManager {
return
}
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.")
Expand All @@ -140,7 +129,6 @@ object RepoManager {
tr("firmament.repo.reloadfail",
"Failed to reload repository. This will result in some mod features not working.")
)
ItemCache.ReloadProgressHud.isEnabled = false
}
}

Expand Down

0 comments on commit bc887db

Please sign in to comment.