Properly pass registry lookup to text (de)serialization

Fixed complex messages (eg. with item hover event)

Author: DrexHD

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

@@ -1,5 +1,6 @@
 package io.github.quiltservertools.blockbotapi.sender;
 
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -9,11 +10,13 @@ public class MessageSender {
     private final Text name;
     private final Text displayName;
     private final MessageType type;
+    private final RegistryWrapper.WrapperLookup wrapperLookup;
 
-    public MessageSender(Text name, Text displayName, @NotNull MessageType type) {
+    public MessageSender(Text name, Text displayName, @NotNull MessageType type, RegistryWrapper.WrapperLookup wrapperLookup) {
         this.name = name;
         this.displayName = displayName;
         this.type = type;
+        this.wrapperLookup = wrapperLookup;
     }
 
     public static MessageSender of(ServerCommandSource commandSource, MessageType type) {
@@ -28,7 +31,8 @@ public static MessageSender of(ServerCommandSource commandSource, MessageType ty
             sender = new MessageSender(
                 Text.literal(commandSource.getName()),
                 commandSource.getDisplayName(),
-                type
+                type,
+                commandSource.getRegistryManager()
             );
         }
         return sender;
@@ -47,6 +51,10 @@ public Text getDisplayName() {
         return displayName;
     }
 
+    public RegistryWrapper.WrapperLookup getWrapperLookup() {
+        return wrapperLookup;
+    }
+
     public enum MessageType {
         REGULAR,
         EMOTE,

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);
+        super(player.getName(), player.getDisplayName(), type, player.server.getRegistryManager());
         this.profile = player.getGameProfile();
         this.player = player;
     }

build.gradle.kts

@@ -88,7 +88,7 @@ allprojects {
 repositories {
     mavenCentral()
     maven("https://maven.nucleoid.xyz/")
-    maven("https://maven.kotlindiscord.com/repository/maven-public/")
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
 }
 
 dependencies {

src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/BlockBotApiExtension.kt

@@ -136,7 +136,7 @@ class BlockBotApiExtension : Extension(), Bot {
         val emojiString = EmojiParser.parseToAliases(message.content)
         var content: MutableText =
             if (config[ChatRelaySpec.convertMarkdown]) minecraftSerializer.serialize(emojiString)
-                .toNative() else emojiString.literal()
+                .toNative(server.registryManager) else emojiString.literal()
         content = convertEmojiToTranslatable(content)
         if (message.referencedMessage != null) {
             val reply = config.getReplyMsg(
@@ -285,7 +285,7 @@ class BlockBotApiExtension : Extension(), Bot {
 
     override fun onChatMessage(sender: MessageSender, message: Text) {
         BlockBotDiscord.launch {
-            var content = discordSerializer.serialize(message.toAdventure(), DiscordSerializerOptions(false, false, KeybindComponent::keybind, TranslatableComponent::key))
+            var content = discordSerializer.serialize(message.toAdventure(sender.wrapperLookup), DiscordSerializerOptions(false, false, KeybindComponent::keybind, TranslatableComponent::key))
             if (config[ChatRelaySpec.escapeIngameMarkdown]) {
                 content = MinecraftSerializer.INSTANCE.escapeMarkdown(content)
             }

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

@@ -8,6 +8,7 @@ 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
@@ -24,8 +25,8 @@ fun Message.summary(): String {
 
 fun GameProfile.getTextures() = Iterables.getFirst(this.properties.get("textures"), null)?.value
 
-fun Component.toNative(): MutableText = Text.Serialization.fromJson(GsonComponentSerializer.gson().serialize(this), DynamicRegistryManager.EMPTY)?: Text.empty()
+fun Component.toNative(wrapperLookup: RegistryWrapper.WrapperLookup): MutableText = Text.Serialization.fromJson(GsonComponentSerializer.gson().serialize(this), DynamicRegistryManager.EMPTY)?: Text.empty()
 
-fun Text.toAdventure() = GsonComponentSerializer.gson().deserialize(Text.Serialization.toJsonString(this, DynamicRegistryManager.EMPTY))
+fun Text.toAdventure(wrapperLookup: RegistryWrapper.WrapperLookup) = GsonComponentSerializer.gson().deserialize(Text.Serialization.toJsonString(this, wrapperLookup))
 
 fun ServerPlayerEntity.isVanished() = FabricLoader.getInstance().isModLoaded("melius-vanish") && VanishAPI.isVanished(this)