diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/light/LightC.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/light/LightC.kt index 851eb2875..2ef0f7841 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/light/LightC.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/light/LightC.kt @@ -22,5 +22,5 @@ class LightC { * In original minecraft this setting is called brightness * Must be non-negative and may not exceed 1 */ - var gamma by delegate(0.0f) { check(it in 0.0f..1.0f) { "Gamma must be non negative and < 1" } } + var gamma by delegate(0.0f) { check(it in 0.0f..1.0f) { "Gamma must be non-negative and <= 1" } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/UpdateServerDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/UpdateServerDialog.kt index 2da20f677..ff698e4c2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/UpdateServerDialog.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/UpdateServerDialog.kt @@ -15,7 +15,6 @@ package de.bixilon.minosoft.gui.eros.dialog import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX -import de.bixilon.minosoft.config.profile.profiles.audio.AudioProfileManager import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server import de.bixilon.minosoft.data.registries.ResourceLocation @@ -66,8 +65,7 @@ class UpdateServerDialog( private var profileSelectDialog: ProfileSelectDialog? = null - private var profiles = server?.profiles ?: mutableMapOf(AudioProfileManager.namespace to "Default") // ToDo - + private var profiles = server?.profiles ?: mutableMapOf() fun show() { JavaFXUtil.runLater { diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/profiles/ProfileSelectDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/profiles/ProfileSelectDialog.kt index 9de244355..558304608 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/profiles/ProfileSelectDialog.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/profiles/ProfileSelectDialog.kt @@ -178,6 +178,7 @@ class ProfileSelectDialog( tableView.refresh() } } + styleClass.add("table-row-cell") } override fun startEdit() { @@ -201,7 +202,6 @@ class ProfileSelectDialog( override fun update(entry: ProfileEntry) = updateItem(entry.resourceLocation) - override fun updateItem(item: ResourceLocation?) { label.ctext = item?.toString() ?: CLICK_ME_TO_ADD tableRow.item.resourceLocation = item @@ -223,6 +223,7 @@ class ProfileSelectDialog( comboBox.selectionModel.select(SelectSpecialOptions.NONE) } } + styleClass.add("table-row-cell") } override fun startEdit() { @@ -262,7 +263,7 @@ class ProfileSelectDialog( private enum class SelectSpecialOptions(override val translationKey: ResourceLocation?) : Translatable { - NONE("".toResourceLocation()), + NONE("minosoft:general.dialog.profile.select.none".toResourceLocation()), CREATE("minosoft:general.dialog.profile.select.add".toResourceLocation()), ; } diff --git a/src/main/resources/assets/minosoft/eros/dialog/profiles/select.fxml b/src/main/resources/assets/minosoft/eros/dialog/profiles/select.fxml index 43e3df831..fdd341749 100644 --- a/src/main/resources/assets/minosoft/eros/dialog/profiles/select.fxml +++ b/src/main/resources/assets/minosoft/eros/dialog/profiles/select.fxml @@ -25,8 +25,8 @@ - - + + diff --git a/src/main/resources/assets/minosoft/eros/style.css b/src/main/resources/assets/minosoft/eros/style.css index 3902771d9..8f0b0638a 100644 --- a/src/main/resources/assets/minosoft/eros/style.css +++ b/src/main/resources/assets/minosoft/eros/style.css @@ -287,16 +287,17 @@ .table-view { -fx-background-color: -secondary-color; + -fx-border-width: 1px; + -fx-border-color: -secondary-light-color; } -.table-view .table-column { +.table-view .column-header { -fx-background-color: -secondary-light-color; } -.table-view .placeholder { +.table-view .column-header .filler, +.table-view .column-header-background .filler { -fx-background-color: -secondary-color; - -fx-border-width: 1px; - -fx-border-color: -secondary-light-color; } .table-row-cell { @@ -319,3 +320,7 @@ .table-row-cell:empty { -fx-background-color: -secondary-color; } + +.table-row-cell:empty:selected { + -fx-background-color: -secondary-color; +}