Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add wide moulconfig mode

Browse Source
This commit is contained in:
Linnea Gräf
2025-07-01 14:38:08 +02:00
parent 6980170dbd
commit 3518f881c2
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@@ -71,7 +71,7 @@ jarvis = "1.1.4"
nealisp = "1.1.0" nealisp = "1.1.0"
# Update from https://github.com/NotEnoughUpdates/MoulConfig/tags # 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 # Update from https://repo.nea.moe/#/releases/moe/nea/mc-auto-translations/moe.nea.mc-auto-translations.gradle.plugin
mcAutoTranslations = "0.3.0" mcAutoTranslations = "0.3.0"

2
src/compat/moulconfig/java/MCConfigEditorIntegration.kt
View File

@@ -35,6 +35,7 @@ import net.minecraft.util.Identifier
import net.minecraft.util.StringIdentifiable import net.minecraft.util.StringIdentifiable
import net.minecraft.util.Util import net.minecraft.util.Util
import moe.nea.firmament.Firmament 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.BooleanHandler
import moe.nea.firmament.gui.config.ChoiceHandler import moe.nea.firmament.gui.config.ChoiceHandler
import moe.nea.firmament.gui.config.ClickHandler import moe.nea.firmament.gui.config.ClickHandler
@@ -407,6 +408,7 @@ class MCConfigEditorIntegration : FirmamentConfigScreenProvider {
val editor = MoulConfigEditor(ProcessedCategory.collect(categories), configObject) val editor = MoulConfigEditor(ProcessedCategory.collect(categories), configObject)
if (search != null) if (search != null)
editor.search(search) editor.search(search)
editor.setWide(AllConfigsGui.ConfigConfig.enableWideMC)
return GuiElementWrapper(editor) // TODO : add parent support return GuiElementWrapper(editor) // TODO : add parent support
} }

1
src/main/kotlin/gui/config/AllConfigsGui.kt
View File

@@ -24,6 +24,7 @@ object AllConfigsGui {
object ConfigConfig : ManagedConfig("configconfig", Category.META) { object ConfigConfig : ManagedConfig("configconfig", Category.META) {
val enableYacl by toggle("enable-yacl") { false } val enableYacl by toggle("enable-yacl") { false }
val enableMoulConfig by toggle("enable-moulconfig") { true } val enableMoulConfig by toggle("enable-moulconfig") { true }
val enableWideMC by toggle("wide-moulconfig") { false }
} }
fun <T> List<T>.toObservableList(): ObservableList<T> = ObservableList(this) fun <T> List<T>.toObservableList(): ObservableList<T> = ObservableList(this)

2
translations/en_us.json
View File

@@ -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-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": "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.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",
"firmament.config.copy-chat.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", "firmament.config.copy-chat.copy-chat.description": "Right click a message to copy",