AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 20:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

network: fix json chat component reading

Browse Source
This commit is contained in:
Bixilon 2021-07-27 20:34:48 +02:00
parent c8ef47f56a
commit 0f93956c5e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
View File

@ -12,6 +12,7 @@
*/ */
package de.bixilon.minosoft.data.text package de.bixilon.minosoft.data.text
import com.squareup.moshi.JsonEncodingException
import de.bixilon.minosoft.data.language.Translator import de.bixilon.minosoft.data.language.Translator
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.text import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.text
import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.RenderWindow
@ -98,8 +99,8 @@ interface ChatComponent {
} }
if (!ignoreJson && string.startsWith('{')) { if (!ignoreJson && string.startsWith('{')) {
try { try {
return BaseComponent(translator, parent, JSONSerializer.MAP_ADAPTER.fromJson(string)) return BaseComponent(translator, parent, JSONSerializer.MAP_ADAPTER.fromJson(string)!!)
} catch (ignored: RuntimeException) { } catch (ignored: JsonEncodingException) {
} }
} }

3
src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt
View File

@ -22,7 +22,6 @@ import de.bixilon.minosoft.data.registries.particle.data.ItemParticleData
import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.registries.particle.data.ParticleData
import de.bixilon.minosoft.data.registries.recipes.Ingredient import de.bixilon.minosoft.data.registries.recipes.Ingredient
import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.ChatComponent
import de.bixilon.minosoft.data.text.ChatComponent.Companion.of
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.* import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.*
import de.bixilon.minosoft.util.nbt.tag.NBTUtil.compoundCast import de.bixilon.minosoft.util.nbt.tag.NBTUtil.compoundCast
@ -70,7 +69,7 @@ class PlayInByteBuffer : InByteBuffer {
} }
override fun readChatComponent(): ChatComponent { override fun readChatComponent(): ChatComponent {
return of(readString(), connection.version.language, null) return ChatComponent.of(readString(), connection.version.language, null)
} }
fun readParticle(): ParticleData { fun readParticle(): ParticleData {