Update to 1.21.6

Author: DrexHD

blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/sender/PlayerMessageSender.java

@@ -8,7 +8,7 @@ public class PlayerMessageSender extends MessageSender {
     private final ServerPlayerEntity player;
 
     public PlayerMessageSender(ServerPlayerEntity player, MessageType type) {
-        super(player.getName(), player.getDisplayName(), type, player.server.getRegistryManager());
+        super(player.getName(), player.getDisplayName(), type, player.getServer().getRegistryManager());
         this.profile = player.getGameProfile();
         this.player = player;
     }

libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-minecraft = "1.21.5"
-curseforge-minecraft="1.21.5"
-fabric-loader = "0.16.13"
-yarn-mappings = "1.21.5+build.1"
+minecraft = "1.21.6"
+curseforge-minecraft="1.21.6"
+fabric-loader = "0.16.14"
+yarn-mappings = "1.21.6+build.1"
 
-fabric-api = "0.120.0+1.21.5"
+fabric-api = "0.127.1+1.21.6"
 
 # Kotlin
 fabric-kotlin = "1.13.1+kotlin.2.1.10"
@@ -13,11 +13,11 @@ fabric-kotlin = "1.13.1+kotlin.2.1.10"
 kord-extensions = "2.3.1-SNAPSHOT"
 mc-discord-reserializer = "4.3.0"
 emoji-java = "5.1.1"
-adventure-gson = "4.19.0"
+adventure-gson = "4.23.0"
 
-placeholder-api = "2.6.2+1.21.5"
-permission-api = "0.3.3"
-vanish-api = "1.5.11+1.21.4"
+placeholder-api = "2.7.0+1.21.6"
+permission-api = "0.4.0"
+vanish-api = "1.5.18+1.21.6-rc1"
 konf = "1.1.2"
 
 [libraries]

src/main/kotlin/io/github/quiltservertools/blockbotdiscord/utility/Extensions.kt

@@ -1,17 +1,23 @@
 package io.github.quiltservertools.blockbotdiscord.utility
 
 import com.google.common.collect.Iterables
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonElement
 import com.mojang.authlib.GameProfile
+import com.mojang.serialization.JsonOps
 import dev.kord.core.entity.Message
 import me.drex.vanish.api.VanishAPI
 import net.fabricmc.loader.api.FabricLoader
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
-import net.minecraft.registry.DynamicRegistryManager
 import net.minecraft.registry.RegistryWrapper
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.text.MutableText
 import net.minecraft.text.Text
+import net.minecraft.text.TextCodecs
+
+val GSON: Gson = GsonBuilder().create()
 
 fun String.literal(): MutableText = Text.literal(this)
 
@@ -25,8 +31,17 @@ fun Message.summary(): String {
 
 fun GameProfile.getTextures() = Iterables.getFirst(this.properties.get("textures"), null)?.value
 
-fun Component.toNative(wrapperLookup: RegistryWrapper.WrapperLookup): MutableText = Text.Serialization.fromJson(GsonComponentSerializer.gson().serialize(this), wrapperLookup)?: Text.empty()
+fun Component.toNative(wrapperLookup: RegistryWrapper.WrapperLookup): MutableText {
+    val json = GSON.fromJson(GsonComponentSerializer.gson().serialize(this), JsonElement::class.java)
+    return TextCodecs.CODEC.decode(wrapperLookup.getOps(JsonOps.INSTANCE), json)
+        .result().map { it.first }.orElse(Text.empty()).copy()
+}
 
-fun Text.toAdventure(wrapperLookup: RegistryWrapper.WrapperLookup) = GsonComponentSerializer.gson().deserialize(Text.Serialization.toJsonString(this, wrapperLookup))
+fun Text.toAdventure(wrapperLookup: RegistryWrapper.WrapperLookup): Component {
+    return TextCodecs.CODEC.encodeStart(wrapperLookup.getOps(JsonOps.INSTANCE), this).result()
+        .map { json -> GsonComponentSerializer.gson().deserialize(json.toString()) }
+        .orElseGet { Component.empty() }
+}
 
-fun ServerPlayerEntity.isVanished() = FabricLoader.getInstance().isModLoaded("melius-vanish") && VanishAPI.isVanished(this)
+fun ServerPlayerEntity.isVanished() =
+    FabricLoader.getInstance().isModLoaded("melius-vanish") && VanishAPI.isVanished(this)