AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 03:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

1.19: fix chat message type reading

Browse Source
This commit is contained in:
Bixilon 2022-11-23 14:43:21 +01:00
parent 9cce1cbf61
commit fa475eebb5
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/data/registries/chat/ChatMessageType.kt
View File

@ -20,6 +20,7 @@ import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.registries.Registries import de.bixilon.minosoft.data.registries.registries.Registries
import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec
import de.bixilon.minosoft.data.text.formatting.color.ChatColors
class ChatMessageType( class ChatMessageType(
override val resourceLocation: ResourceLocation, override val resourceLocation: ResourceLocation,
@ -33,11 +34,12 @@ class ChatMessageType(
} }
companion object : ResourceLocationCodec<ChatMessageType> { companion object : ResourceLocationCodec<ChatMessageType> {
private val DEFAULT_PROPERTIES = TypeProperties("[%s] %s", listOf(ChatParameter.SENDER, ChatParameter.SENDER), mapOf("color" to ChatColors.GRAY))
override fun deserialize(registries: Registries?, resourceLocation: ResourceLocation, data: JsonObject): ChatMessageType { override fun deserialize(registries: Registries?, resourceLocation: ResourceLocation, data: JsonObject): ChatMessageType {
return ChatMessageType( return ChatMessageType(
resourceLocation = resourceLocation, resourceLocation = resourceLocation,
chat = data["chat"].asJsonObject().let { TypeProperties.deserialize(it) }, chat = data["chat"]?.asJsonObject()?.let { TypeProperties.deserialize(it) } ?: DEFAULT_PROPERTIES,
narration = data["narration"]?.asJsonObject()?.let { TypeProperties.deserialize(it) }, narration = data["narration"]?.asJsonObject()?.let { TypeProperties.deserialize(it) },
position = data["position"]?.let { ChatTextPositions[it] } ?: ChatTextPositions.CHAT, position = data["position"]?.let { ChatTextPositions[it] } ?: ChatTextPositions.CHAT,
) )

7
src/main/java/de/bixilon/minosoft/data/registries/chat/ChatParameter.kt
View File

@ -25,5 +25,12 @@ enum class ChatParameter {
companion object : ValuesEnum<ChatParameter> { companion object : ValuesEnum<ChatParameter> {
override val VALUES = values() override val VALUES = values()
override val NAME_MAP: Map<String, ChatParameter> = EnumUtil.getEnumValues(VALUES) override val NAME_MAP: Map<String, ChatParameter> = EnumUtil.getEnumValues(VALUES)
override fun get(name: String): ChatParameter {
return when (name.lowercase()) {
"team_name" -> TARGET
else -> super.get(name)
}
}
} }
} }