From bb02aa6ddd8f1bafee35a6bf247abfee2195d485 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Tue, 1 Apr 2025 01:37:55 +0200 Subject: WIP: Port some 1.21.5 things --- .../features/texturepack/predicates/ExtraAttributesPredicate.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates') 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 bcf2eaf..2dddff3 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 @@ -1,3 +1,4 @@ + package moe.nea.firmament.features.texturepack.predicates import com.google.gson.Gson @@ -5,8 +6,9 @@ import com.google.gson.JsonArray import com.google.gson.JsonElement import com.google.gson.JsonObject import com.google.gson.JsonPrimitive -import com.mojang.serialization.JsonOps import kotlin.jvm.optionals.getOrDefault +import kotlin.jvm.optionals.getOrNull +import com.mojang.serialization.JsonOps import moe.nea.firmament.features.texturepack.FirmamentModelPredicate import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser import moe.nea.firmament.features.texturepack.StringMatcher -- cgit