Fix sendResourcePack

SpongePowered · Oct 14, 2023 · 5d5cbb6 · 5d5cbb6
1 parent 7ab397a
commit 5d5cbb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerPlayerMixin_API.java b/...java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerPlayerMixin_API.java
@@ -270,7 +270,7 @@ public void stopMusicDisc(final Vector3i position) {
 
     @Override
     public void sendResourcePack(final ResourcePack pack) {
-        this.connection.send(new ClientboundResourcePackPacket(((SpongeResourcePack) Objects.requireNonNull(pack, "pack")).getUrlString(), pack.hash().orElse(""), false, (net.minecraft.network.chat.Component) pack.prompt()));
+        this.connection.send(new ClientboundResourcePackPacket(((SpongeResourcePack) Objects.requireNonNull(pack, "pack")).getUrlString(), pack.hash().orElse(""), false, SpongeAdventure.asVanilla(pack.prompt())));
     }
 
     @Override

diff --git a/...gepowered/common/mixin/core/network/protocol/game/ClientboundResourcePackPacketMixin.java b/...gepowered/common/mixin/core/network/protocol/game/ClientboundResourcePackPacketMixin.java
@@ -32,6 +32,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.common.adventure.SpongeAdventure;
 import org.spongepowered.common.bridge.network.protocol.game.ClientboundResourcePackPacketBridge;
 import org.spongepowered.common.resourcepack.SpongeResourcePack;
 
@@ -48,7 +49,7 @@ public abstract class ClientboundResourcePackPacketMixin implements ClientboundR
     @Inject(method = "<init>(Ljava/lang/String;Ljava/lang/String;ZLnet/minecraft/network/chat/Component;)V", at = @At("RETURN") , remap = false)
     private void impl$setResourcePackOrThrowException(final String url, final String hash, final boolean required, final Component prompt, final CallbackInfo ci) {
         try {
-            this.impl$pack = SpongeResourcePack.create(url, hash, (net.kyori.adventure.text.Component) prompt);
+            this.impl$pack = SpongeResourcePack.create(url, hash, SpongeAdventure.asAdventure(prompt));
         } catch (final URISyntaxException e) {
             throw new IllegalArgumentException(e);
         }