aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt')
-rw-r--r--src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt37
1 files changed, 22 insertions, 15 deletions
diff --git a/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt b/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
index 582f701..82e151e 100644
--- a/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
+++ b/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
@@ -6,22 +6,29 @@ import net.minecraft.client.gui.screen.Screen
import moe.nea.firmament.Firmament
interface FirmamentConfigScreenProvider {
- val key: String
- val isEnabled: Boolean get() = true
+ val key: String
+ val isEnabled: Boolean get() = true
- fun open(parent: Screen?): Screen
+ fun open(parent: Screen?): Screen
- companion object {
- private val loader = ServiceLoader.load(FirmamentConfigScreenProvider::class.java)
+ companion object {
+ private val loader = ServiceLoader.load(FirmamentConfigScreenProvider::class.java)
- val providers by lazy {
- loader.stream().asSequence().mapNotNull { service ->
- kotlin.runCatching { service.get() }
- .getOrElse {
- Firmament.logger.warn("Could not load config provider ${service.type()}", it)
- null
- }
- }.filter { it.isEnabled }.toList()
- }
- }
+ val providers by lazy {
+ loader.stream().asSequence().mapNotNull { service ->
+ kotlin.runCatching { service.get() }
+ .getOrElse {
+ Firmament.logger.warn("Could not load config provider ${service.type()}", it)
+ null
+ }
+ }.filter { it.isEnabled }
+ .sortedWith(Comparator.comparing(
+ { it.key },
+ Comparator<String> { left, right ->
+ if (left == "builtin") return@Comparator -1
+ if (right == "builtin") return@Comparator 1
+ return@Comparator left.compareTo(right)
+ })).toList()
+ }
+ }
}