diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-08-10 01:20:16 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-08-10 01:51:29 +0200 |
| commit | 5d3b57fbb76c4a38094c3c1f559e314d1360d5be (patch) | |
| tree | 0f44930d2cd95b6ed88d5dfbe2e225ebdb5f29bb /src/main | |
| parent | a8ded42b5a8266cfc88f8486b3c4a559178edeb6 (diff) | |
| download | Firmament-5d3b57fbb76c4a38094c3c1f559e314d1360d5be.tar.gz Firmament-5d3b57fbb76c4a38094c3c1f559e314d1360d5be.tar.bz2 Firmament-5d3b57fbb76c4a38094c3c1f559e314d1360d5be.zip | |
feat: Add text replacements
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java | 2 | ||||
| -rw-r--r-- | src/main/kotlin/Firmament.kt | 1 | ||||
| -rw-r--r-- | src/main/kotlin/util/textutil.kt | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java b/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java index a9db7f9..07e4549 100644 --- a/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java +++ b/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java @@ -27,6 +27,8 @@ public class AutoDiscoveryPlugin { return mixins.stream().map(it -> defaultName + "." + it).toList(); } + // TODO: remove println + private static final List<AutoDiscoveryPlugin> mixinPlugins = new ArrayList<>(); public static List<AutoDiscoveryPlugin> getMixinPlugins() { diff --git a/src/main/kotlin/Firmament.kt b/src/main/kotlin/Firmament.kt index b00546a..218d304 100644 --- a/src/main/kotlin/Firmament.kt +++ b/src/main/kotlin/Firmament.kt @@ -74,6 +74,7 @@ object Firmament { prettyPrint = DEBUG isLenient = true allowTrailingComma = true + allowComments = true ignoreUnknownKeys = true encodeDefaults = true prettyPrintIndent = if (prettyPrint) "\t" else DEFAULT_JSON_INDENT diff --git a/src/main/kotlin/util/textutil.kt b/src/main/kotlin/util/textutil.kt index cfda2e9..177b0af 100644 --- a/src/main/kotlin/util/textutil.kt +++ b/src/main/kotlin/util/textutil.kt @@ -179,10 +179,11 @@ fun Text.transformEachRecursively(function: (Text) -> Text): Text { val c = this.content if (c is TranslatableTextContent) { return Text.translatableWithFallback(c.key, c.fallback, *c.args.map { - (if (it is Text) it else Text.literal(it.toString())).transformEachRecursively(function) + (it as? Text ?: Text.literal(it.toString())).transformEachRecursively(function) }.toTypedArray()).also { new -> new.style = this.style new.siblings.clear() + val new = function(new) this.siblings.forEach { child -> new.siblings.add(child.transformEachRecursively(function)) } |