AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 08:58:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

profiles: properly store and load forced version

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-23 21:32:02 +01:00
parent 70d736a289
commit c6ccd9b4bc
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/config/profile/profiles/account/AccountProfile.kt
View File

@ -69,7 +69,7 @@ class AccountProfile(
init { init {
this::selected.observe(this) { _selected = it?.id } this::selected.observe(this) { _selected = it?.id }
this::_selected.observe(this) { selected = entries[it] } this::_selected.observe(this, true) { selected = entries[it] }
} }
override fun toString(): String { override fun toString(): String {

2
src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/ErosServer.kt
View File

@ -74,7 +74,7 @@ class ErosServer(
init { init {
this::forcedVersion.observe(this) { _forcedVersion = it?.name } this::forcedVersion.observe(this) { _forcedVersion = it?.name }
this::_forcedVersion.observe(this) { this.forcedVersion = Versions[it] } this::_forcedVersion.observe(this, true) { this.forcedVersion = Versions[it] }
} }
@get:JsonInclude(JsonInclude.Include.NON_DEFAULT) @get:JsonInclude(JsonInclude.Include.NON_DEFAULT)

2
src/main/java/de/bixilon/minosoft/main/MinosoftBoot.kt
View File

@ -37,7 +37,7 @@ object MinosoftBoot {
fun register(worker: TaskWorker) { fun register(worker: TaskWorker) {
worker += WorkerTask(identifier = BootTasks.VERSIONS, priority = ThreadPool.HIGHER, executor = VersionLoader::load) worker += WorkerTask(identifier = BootTasks.VERSIONS, priority = ThreadPool.HIGHER, executor = VersionLoader::load)
worker += WorkerTask(identifier = BootTasks.PROFILES, priority = ThreadPool.HIGHEST, executor = ProfileManagers::load) worker += WorkerTask(identifier = BootTasks.PROFILES, dependencies = arrayOf(BootTasks.VERSIONS), priority = ThreadPool.HIGHEST, executor = ProfileManagers::load) // servers might have a version set
worker += WorkerTask(identifier = BootTasks.ASSETS_PROPERTIES, dependencies = arrayOf(BootTasks.VERSIONS), executor = AssetsVersionProperties::load) worker += WorkerTask(identifier = BootTasks.ASSETS_PROPERTIES, dependencies = arrayOf(BootTasks.VERSIONS), executor = AssetsVersionProperties::load)
worker += WorkerTask(identifier = BootTasks.DEFAULT_REGISTRIES, dependencies = arrayOf(BootTasks.VERSIONS), executor = { MinosoftMeta.load(); FallbackTags.load(); FallbackRegistries.load(); EntityEvents.load() }) worker += WorkerTask(identifier = BootTasks.DEFAULT_REGISTRIES, dependencies = arrayOf(BootTasks.VERSIONS), executor = { MinosoftMeta.load(); FallbackTags.load(); FallbackRegistries.load(); EntityEvents.load() })