diff --git a/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt b/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt index 52fe9dbcd..3ce863671 100644 --- a/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt @@ -18,6 +18,7 @@ import de.bixilon.minosoft.assets.util.FileAssetsUtil import de.bixilon.minosoft.assets.util.FileAssetsUtil.toAssetName import de.bixilon.minosoft.assets.util.FileUtil import de.bixilon.minosoft.assets.util.FileUtil.readJsonObject +import de.bixilon.minosoft.config.StaticConfiguration import de.bixilon.minosoft.config.profile.profiles.resources.ResourcesProfile import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition @@ -121,6 +122,9 @@ class IndexAssetsManager( this.assets[name] = AssetsProperty(type, hash, size) tasks.dec() assetsLatch.dec() + if (StaticConfiguration.DEBUG_SLOW_LOADING) { + Thread.sleep(30L) + } } } assetsLatch.await() diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt index f240f6ed9..d42cb7249 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt @@ -36,13 +36,14 @@ class ConnectingDialog( fun show() { JavaFXUtil.runLater { - JavaFXUtil.openModal("TODO", LAYOUT, this) + JavaFXUtil.openModal(TITLE, LAYOUT, this) update(connection.state) } } override fun init() { + headerFX.text = HEADER connection.registerEvent(JavaFXEventInvoker.of { update(it.state) }) // ToDo: This creates a memory leak... } @@ -68,6 +69,9 @@ class ConnectingDialog( companion object { private val LAYOUT = "minosoft:eros/dialog/connection/connecting.fxml".toResourceLocation() + private val TITLE = "minosoft:connection.dialog.connecting.title".toResourceLocation() + private val HEADER = "minosoft:connection.dialog.connecting.header".toResourceLocation() + private const val PROGRESS_STEPS = 7 private val PlayConnectionStates.step: Int get() = when (this) { diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/VerifyAssetsDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/VerifyAssetsDialog.kt index 5d1027bc9..7b1038449 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/VerifyAssetsDialog.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/VerifyAssetsDialog.kt @@ -34,7 +34,7 @@ class VerifyAssetsDialog( fun show() { JavaFXUtil.runLater { - JavaFXUtil.openModal("TODO", LAYOUT, this) + JavaFXUtil.openModal(TITLE, LAYOUT, this) update() stage.show() } @@ -42,6 +42,8 @@ class VerifyAssetsDialog( override fun init() { + headerFX.text = HEADER + cancelButtonFX.isDisable = true latch += { JavaFXUtil.runLater { update() @@ -57,7 +59,7 @@ class VerifyAssetsDialog( return } countTextFX.text = "${total - count}/${total}" - mibTextFX.text = "?/? Mib" + mibTextFX.text = "No clue how much MiB :)" val progress = if (total <= 0) { 0.0 } else { @@ -73,5 +75,8 @@ class VerifyAssetsDialog( companion object { private val LAYOUT = "minosoft:eros/dialog/connection/verify_assets.fxml".toResourceLocation() + + private val TITLE = "minosoft:connection.dialog.verify_assets.title".toResourceLocation() + private val HEADER = "minosoft:connection.dialog.verify_assets.header".toResourceLocation() } } diff --git a/src/main/resources/assets/minosoft/eros/dialog/connection/connecting.fxml b/src/main/resources/assets/minosoft/eros/dialog/connection/connecting.fxml index 1de40562f..9a6251731 100644 --- a/src/main/resources/assets/minosoft/eros/dialog/connection/connecting.fxml +++ b/src/main/resources/assets/minosoft/eros/dialog/connection/connecting.fxml @@ -23,6 +23,9 @@ + + + diff --git a/src/main/resources/assets/minosoft/eros/dialog/connection/verify_assets.fxml b/src/main/resources/assets/minosoft/eros/dialog/connection/verify_assets.fxml index a23e2695f..2451c1deb 100644 --- a/src/main/resources/assets/minosoft/eros/dialog/connection/verify_assets.fxml +++ b/src/main/resources/assets/minosoft/eros/dialog/connection/verify_assets.fxml @@ -1,6 +1,5 @@ - @@ -23,6 +22,9 @@ + + + diff --git a/src/main/resources/assets/minosoft/eros/style.css b/src/main/resources/assets/minosoft/eros/style.css index 8f0b0638a..8c4fa7196 100644 --- a/src/main/resources/assets/minosoft/eros/style.css +++ b/src/main/resources/assets/minosoft/eros/style.css @@ -324,3 +324,21 @@ .table-row-cell:empty:selected { -fx-background-color: -secondary-color; } + + +/* Progress bar */ +.progress-bar { + -fx-background-color: -secondary-color; + -fx-border-color: -primary-color; + -fx-background-radius: 2px; + -fx-border-radius: 2px; + -fx-border-width: 1px; +} + +.progress-bar .bar { + -fx-background-color: -primary-color; +} + +.progress-bar > .track { + -fx-background-color: -secondary-color; +} diff --git a/src/main/resources/assets/minosoft/language/en_us.lang b/src/main/resources/assets/minosoft/language/en_us.lang index 9272a6fa5..871711374 100644 --- a/src/main/resources/assets/minosoft/language/en_us.lang +++ b/src/main/resources/assets/minosoft/language/en_us.lang @@ -22,9 +22,12 @@ minosoft:server_info.ping=Latency minosoft:server_info.delete.dialog.description=Do you really want to delete the server %1$s (%2$s)? -minosoft:connection.verify_assets.header=Verifying and downloading missing assets. This might take a while... +minosoft:connection.dialog.verify_assets.title=Verifying assets... - Minosoft +minosoft:connection.dialog.verify_assets.header=Verifying and downloading missing assets. This might take a while... +minosoft:connection.dialog.connecting.title=Connecting... - Minosoft minosoft:connection.dialog.connecting.header=Connecting... + minosoft:connection.play.state.waiting=Waiting for connection... minosoft:connection.play.state.loading_assets=Loading assets... minosoft:connection.play.state.loading=Loading...