diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-07-01 14:38:08 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-07-01 14:38:08 +0200 |
| commit | 3518f881c2590053c66ea93e212fcf3bada58366 (patch) | |
| tree | a37c6f4d8053c10e3b077ec0ae854aa82994cdcf | |
| parent | 6980170dbd8c133cdf991c6f2852e9db0bbbd1be (diff) | |
| download | Firmament-3518f881c2590053c66ea93e212fcf3bada58366.tar.gz Firmament-3518f881c2590053c66ea93e212fcf3bada58366.tar.bz2 Firmament-3518f881c2590053c66ea93e212fcf3bada58366.zip | |
feat: Add wide moulconfig mode
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | src/compat/moulconfig/java/MCConfigEditorIntegration.kt | 2 | ||||
| -rw-r--r-- | src/main/kotlin/gui/config/AllConfigsGui.kt | 1 | ||||
| -rw-r--r-- | translations/en_us.json | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9062f7b..5450cb5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -71,7 +71,7 @@ jarvis = "1.1.4" nealisp = "1.1.0" # Update from https://github.com/NotEnoughUpdates/MoulConfig/tags -moulconfig = "3.8.0" +moulconfig = "3.11.0" # Update from https://repo.nea.moe/#/releases/moe/nea/mc-auto-translations/moe.nea.mc-auto-translations.gradle.plugin mcAutoTranslations = "0.3.0" diff --git a/src/compat/moulconfig/java/MCConfigEditorIntegration.kt b/src/compat/moulconfig/java/MCConfigEditorIntegration.kt index ad35ca1..2d71aa0 100644 --- a/src/compat/moulconfig/java/MCConfigEditorIntegration.kt +++ b/src/compat/moulconfig/java/MCConfigEditorIntegration.kt @@ -35,6 +35,7 @@ import net.minecraft.util.Identifier import net.minecraft.util.StringIdentifiable import net.minecraft.util.Util import moe.nea.firmament.Firmament +import moe.nea.firmament.gui.config.AllConfigsGui import moe.nea.firmament.gui.config.BooleanHandler import moe.nea.firmament.gui.config.ChoiceHandler import moe.nea.firmament.gui.config.ClickHandler @@ -407,6 +408,7 @@ class MCConfigEditorIntegration : FirmamentConfigScreenProvider { val editor = MoulConfigEditor(ProcessedCategory.collect(categories), configObject) if (search != null) editor.search(search) + editor.setWide(AllConfigsGui.ConfigConfig.enableWideMC) return GuiElementWrapper(editor) // TODO : add parent support } diff --git a/src/main/kotlin/gui/config/AllConfigsGui.kt b/src/main/kotlin/gui/config/AllConfigsGui.kt index 096e371..f9ffd2d 100644 --- a/src/main/kotlin/gui/config/AllConfigsGui.kt +++ b/src/main/kotlin/gui/config/AllConfigsGui.kt @@ -24,6 +24,7 @@ object AllConfigsGui { object ConfigConfig : ManagedConfig("configconfig", Category.META) { val enableYacl by toggle("enable-yacl") { false } val enableMoulConfig by toggle("enable-moulconfig") { true } + val enableWideMC by toggle("wide-moulconfig") { false } } fun <T> List<T>.toObservableList(): ObservableList<T> = ObservableList(this) diff --git a/translations/en_us.json b/translations/en_us.json index c628824..c474d23 100644 --- a/translations/en_us.json +++ b/translations/en_us.json @@ -79,6 +79,8 @@ "firmament.config.configconfig.enable-moulconfig.description": "Uses the MoulConfig config UI. Turn off to fall back to the built in config.", "firmament.config.configconfig.enable-yacl": "Use YACL Config", "firmament.config.configconfig.enable-yacl.description": "Uses the YACL config UI. Turn off to fall back to the built in config. Needs YACL to be installed separately.", + "firmament.config.configconfig.wide-moulconfig": "Wide MoulConfig", + "firmament.config.configconfig.wide-moulconfig.description": "Use a wider editor for MoulConfig", "firmament.config.copy-chat": "Copy Chat", "firmament.config.copy-chat.copy-chat": "Copy Chat", "firmament.config.copy-chat.copy-chat.description": "Right click a message to copy", |