From c93a04a001b0f66b2724d46b04b6d1ed49a08d07 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Mon, 17 Nov 2025 19:55:02 +0100 Subject: refactor: port to mojmaps --- .../java/moe/nea/firmament/features/texturepack/StringMatcher.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt') diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt index 446bf07..52800bd 100644 --- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt +++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt @@ -12,8 +12,8 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -import net.minecraft.nbt.NbtString -import net.minecraft.text.Text +import net.minecraft.nbt.StringTag +import net.minecraft.network.chat.Component import moe.nea.firmament.util.json.intoGson import moe.nea.firmament.util.json.intoKotlinJson import moe.nea.firmament.util.removeColorCodes @@ -21,7 +21,7 @@ import moe.nea.firmament.util.removeColorCodes @Serializable(with = StringMatcher.Serializer::class) interface StringMatcher { fun matches(string: String): Boolean - fun matches(text: Text): Boolean { + fun matches(text: Component): Boolean { return matches(text.string) } @@ -29,7 +29,7 @@ interface StringMatcher { fun matchWithGroups(string: String): MatchNamedGroupCollection? - fun matches(nbt: NbtString): Boolean { + fun matches(nbt: StringTag): Boolean { val string = nbt.value val jsonStart = string.indexOf('{') val stringStart = string.indexOf('"') -- cgit