diff options
author | Linnea Gräf <nea@nea.moe> | 2025-05-04 14:38:42 +0200 |
---|---|---|
committer | Linnea Gräf <nea@nea.moe> | 2025-05-05 00:17:10 +0200 |
commit | ad321627a95c1a6960d12143d506031debac5606 (patch) | |
tree | 9922a812c073da0bff27dc08c1a444a65536c280 /src | |
parent | 443520c114ab016f5e99bcf8e91c99688ba28718 (diff) | |
download | Firmament-ad321627a95c1a6960d12143d506031debac5606.tar.gz Firmament-ad321627a95c1a6960d12143d506031debac5606.tar.bz2 Firmament-ad321627a95c1a6960d12143d506031debac5606.zip |
fix: Fixup some more porting errors
Diffstat (limited to 'src')
-rw-r--r-- | src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ExtraAttributesPredicate.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ExtraAttributesPredicate.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ExtraAttributesPredicate.kt index 2dddff3..6384287 100644 --- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ExtraAttributesPredicate.kt +++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ExtraAttributesPredicate.kt @@ -205,7 +205,7 @@ fun interface NbtMatcher { class MatchStringExact(val string: String) : NbtMatcher { override fun matches(nbt: NbtElement): Boolean { - return nbt.asString() == string + return nbt.asString().getOrNull() == string } override fun toString(): String { @@ -215,7 +215,7 @@ fun interface NbtMatcher { class MatchString(val string: StringMatcher) : NbtMatcher { override fun matches(nbt: NbtElement): Boolean { - return nbt.asString().let(string::matches) + return nbt.asString().map(string::matches).getOrDefault(false) } override fun toString(): String { @@ -270,13 +270,13 @@ class NbtPrism(val path: List<String>) { if (pathSegment != "*" && pathSegment.startsWith("*")) { if (pathSegment == "*json") { for (element in rootSet) { - val eString = element.asString() ?: continue + val eString = element.asString().getOrNull() ?: continue val element = Gson().fromJson(eString, JsonElement::class.java) switch.add(JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, element)) } } else if (pathSegment == "*base64") { for (element in rootSet) { - val string = element.asString() ?: continue + val string = element.asString().getOrNull() ?: continue switch.add(NbtString.of(Base64Util.decodeString(string))) } } |