From 7ac205db0ecf96fa76b4fcb3c6a748692260c8c6 Mon Sep 17 00:00:00 2001 From: nea Date: Fri, 21 Jul 2023 22:10:40 +0200 Subject: Add jarvis --- .../moe/nea/firmament/gui/config/ManagedConfig.kt | 10 ++++-- .../moe/nea/firmament/jarvis/JarvisIntegration.kt | 37 ++++++++++++++++++++++ src/main/resources/fabric.mod.json | 3 ++ 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 src/main/kotlin/moe/nea/firmament/jarvis/JarvisIntegration.kt (limited to 'src') diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfig.kt b/src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfig.kt index 2115fb0..0204448 100644 --- a/src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfig.kt +++ b/src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfig.kt @@ -173,7 +173,7 @@ abstract class ManagedConfig(val name: String) { latestGuiAppender?.reloadables?.forEach {it() } } - fun showConfigEditor(parent: Screen? = null) { + fun getConfigEditor(parent: Screen? = null): CottonClientScreen { val lwgd = LightweightGuiDescription() val guiapp = GuiAppender(20) latestGuiAppender = guiapp @@ -181,12 +181,16 @@ abstract class ManagedConfig(val name: String) { sortedOptions.forEach { it.appendToGui(guiapp) } guiapp.reloadables.forEach { it() } lwgd.setRootPanel(guiapp.panel) - setScreenLater(object : CottonClientScreen(lwgd) { + return object : CottonClientScreen(lwgd) { override fun close() { latestGuiAppender = null MC.screen = parent } - }) + } + } + + fun showConfigEditor(parent: Screen? = null) { + setScreenLater(getConfigEditor(parent)) } } diff --git a/src/main/kotlin/moe/nea/firmament/jarvis/JarvisIntegration.kt b/src/main/kotlin/moe/nea/firmament/jarvis/JarvisIntegration.kt new file mode 100644 index 0000000..3dfb7d0 --- /dev/null +++ b/src/main/kotlin/moe/nea/firmament/jarvis/JarvisIntegration.kt @@ -0,0 +1,37 @@ +package moe.nea.firmament.jarvis + +import moe.nea.jarvis.api.JarvisConfigOption +import moe.nea.jarvis.api.JarvisPlugin +import net.minecraft.client.gui.screen.Screen +import net.minecraft.text.Text +import moe.nea.firmament.Firmament +import moe.nea.firmament.features.FeatureManager +import moe.nea.firmament.repo.RepoManager + +class JarvisIntegration : JarvisPlugin { + override fun getModId(): String = + Firmament.MOD_ID + + override fun getAllConfigOptions(): List { + val configs = listOf( + RepoManager.Config + ) + FeatureManager.allFeatures.mapNotNull { it.config } + return configs.flatMap { config -> + config.sortedOptions.map { + object : JarvisConfigOption { + override fun title(): Text { + return it.labelText + } + + override fun description(): List { + return emptyList() + } + + override fun jumpTo(parentScreen: Screen?): Screen { + return config.getConfigEditor(parentScreen) + } + } + } + } + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c227e49..16daa92 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,6 +31,9 @@ ], "modmenu": [ "moe.nea.firmament.modmenu.FirmamentModMenuPlugin" + ], + "jarvis": [ + "moe.nea.firmament.jarvis.JarvisIntegration" ] }, "mixins": [ -- cgit