Skip to content

Commit bc887db

Browse files
committed
feat: Remove repo reload HUD
1 parent 44fa3b0 commit bc887db

File tree

2 files changed

+2
-49
lines changed

2 files changed

+2
-49
lines changed

src/main/kotlin/repo/ItemCache.kt

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -184,31 +184,6 @@ object ItemCache : IReloadable {
184184

185185
var job: Job? = null
186186

187-
object ReloadProgressHud : MoulConfigHud(
188-
"repo_reload", HudMeta(HudPosition(0.0, 0.0, 1F), Text.literal("Repo Reload"), 180, 18)) {
189-
190-
191-
var isEnabled = false
192-
override fun shouldRender(): Boolean {
193-
return isEnabled
194-
}
195-
196-
@get:Bind("current")
197-
var current: Double = 0.0
198-
199-
@get:Bind("label")
200-
var label: String = ""
201-
202-
@get:Bind("max")
203-
var max: Double = 0.0
204-
205-
fun reportProgress(label: String, current: Int, max: Int) {
206-
this.label = label
207-
this.current = current.toDouble()
208-
this.max = max.toDouble()
209-
}
210-
}
211-
212187
override fun reload(repository: NEURepository) {
213188
val j = job
214189
if (j != null && j.isActive) {
@@ -218,20 +193,10 @@ object ItemCache : IReloadable {
218193
isFlawless = true
219194
if (TestUtil.isInTest) return
220195
job = Firmament.coroutineScope.launch {
221-
val items = repository.items?.items
222-
if (items == null) {
223-
ReloadProgressHud.isEnabled = false
224-
return@launch
225-
}
226-
val recacheItems = I18n.translate("firmament.repo.cache")
227-
ReloadProgressHud.reportProgress(recacheItems, 0, items.size)
228-
ReloadProgressHud.isEnabled = true
229-
var i = 0
196+
val items = repository.items?.items ?: return@launch
230197
items.values.forEach {
231198
it.asItemStack() // Rebuild cache
232-
ReloadProgressHud.reportProgress(recacheItems, i++, items.size)
233199
}
234-
ReloadProgressHud.isEnabled = false
235200
}
236201
}
237202

src/main/kotlin/repo/RepoManager.kt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,7 @@ object RepoManager {
102102

103103
fun launchAsyncUpdate(force: Boolean = false) {
104104
Firmament.coroutineScope.launch {
105-
ItemCache.ReloadProgressHud.reportProgress("Downloading", 0, -1) // TODO: replace with a proper bouncy bar
106-
ItemCache.ReloadProgressHud.isEnabled = true
107-
try {
108-
RepoDownloadManager.downloadUpdate(force)
109-
ItemCache.ReloadProgressHud.reportProgress("Download complete", 1, 1)
110-
} finally {
111-
ItemCache.ReloadProgressHud.isEnabled = false
112-
}
105+
RepoDownloadManager.downloadUpdate(force)
113106
reload()
114107
}
115108
}
@@ -127,10 +120,6 @@ object RepoManager {
127120
return
128121
}
129122
try {
130-
ItemCache.ReloadProgressHud.reportProgress("Reloading from Disk",
131-
0,
132-
-1) // TODO: replace with a proper bouncy bar
133-
ItemCache.ReloadProgressHud.isEnabled = true
134123
logger.info("Repo reload started.")
135124
neuRepo.reload()
136125
logger.info("Repo reload completed.")
@@ -140,7 +129,6 @@ object RepoManager {
140129
tr("firmament.repo.reloadfail",
141130
"Failed to reload repository. This will result in some mod features not working.")
142131
)
143-
ItemCache.ReloadProgressHud.isEnabled = false
144132
}
145133
}
146134

0 commit comments

Comments
 (0)