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

fix: Fixup some more porting errors

Browse Source
This commit is contained in:
Linnea Gräf
2025-05-04 14:38:42 +02:00
parent 443520c114
commit ad321627a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ExtraAttributesPredicate.kt
View File

@@ -205,7 +205,7 @@ fun interface NbtMatcher {
class MatchStringExact(val string: String) : NbtMatcher { class MatchStringExact(val string: String) : NbtMatcher {
override fun matches(nbt: NbtElement): Boolean { override fun matches(nbt: NbtElement): Boolean {
return nbt.asString() == string return nbt.asString().getOrNull() == string
} }
override fun toString(): String { override fun toString(): String {
@@ -215,7 +215,7 @@ fun interface NbtMatcher {
class MatchString(val string: StringMatcher) : NbtMatcher { class MatchString(val string: StringMatcher) : NbtMatcher {
override fun matches(nbt: NbtElement): Boolean { override fun matches(nbt: NbtElement): Boolean {
return nbt.asString().let(string::matches) return nbt.asString().map(string::matches).getOrDefault(false)
} }
override fun toString(): String { override fun toString(): String {
@@ -270,13 +270,13 @@ class NbtPrism(val path: List<String>) {
if (pathSegment != "*" && pathSegment.startsWith("*")) { if (pathSegment != "*" && pathSegment.startsWith("*")) {
if (pathSegment == "*json") { if (pathSegment == "*json") {
for (element in rootSet) { for (element in rootSet) {
val eString = element.asString() ?: continue val eString = element.asString().getOrNull() ?: continue
val element = Gson().fromJson(eString, JsonElement::class.java) val element = Gson().fromJson(eString, JsonElement::class.java)
switch.add(JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, element)) switch.add(JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, element))
} }
} else if (pathSegment == "*base64") { } else if (pathSegment == "*base64") {
for (element in rootSet) { for (element in rootSet) {
val string = element.asString() ?: continue val string = element.asString().getOrNull() ?: continue
switch.add(NbtString.of(Base64Util.decodeString(string))) switch.add(NbtString.of(Base64Util.decodeString(string)))
} }
} }