f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
63 lines
3.0 KiB
Diff
63 lines
3.0 KiB
Diff
--- a/net/minecraft/network/chat/PlayerChatMessage.java
|
|
+++ b/net/minecraft/network/chat/PlayerChatMessage.java
|
|
@@ -18,6 +_,43 @@
|
|
public record PlayerChatMessage(
|
|
SignedMessageLink link, @Nullable MessageSignature signature, SignedMessageBody signedBody, @Nullable Component unsignedContent, FilterMask filterMask
|
|
) {
|
|
+ // Paper start - adventure; support signed messages
|
|
+ public final class AdventureView implements net.kyori.adventure.chat.SignedMessage {
|
|
+ private AdventureView() {
|
|
+ }
|
|
+ @Override
|
|
+ public @org.jetbrains.annotations.NotNull Instant timestamp() {
|
|
+ return PlayerChatMessage.this.timeStamp();
|
|
+ }
|
|
+ @Override
|
|
+ public long salt() {
|
|
+ return PlayerChatMessage.this.salt();
|
|
+ }
|
|
+ @Override
|
|
+ public @org.jetbrains.annotations.Nullable Signature signature() {
|
|
+ return PlayerChatMessage.this.signature == null ? null : PlayerChatMessage.this.signature.adventure();
|
|
+ }
|
|
+ @Override
|
|
+ public net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component unsignedContent() {
|
|
+ return PlayerChatMessage.this.unsignedContent() == null ? null : io.papermc.paper.adventure.PaperAdventure.asAdventure(PlayerChatMessage.this.unsignedContent());
|
|
+ }
|
|
+ @Override
|
|
+ public @org.jetbrains.annotations.NotNull String message() {
|
|
+ return PlayerChatMessage.this.signedContent();
|
|
+ }
|
|
+ @Override
|
|
+ public @org.jetbrains.annotations.NotNull net.kyori.adventure.identity.Identity identity() {
|
|
+ return net.kyori.adventure.identity.Identity.identity(PlayerChatMessage.this.sender());
|
|
+ }
|
|
+ public PlayerChatMessage playerChatMessage() {
|
|
+ return PlayerChatMessage.this;
|
|
+ }
|
|
+ }
|
|
+ public AdventureView adventureView() {
|
|
+ return new AdventureView();
|
|
+ }
|
|
+ // Paper end - adventure; support signed messages
|
|
+
|
|
public static final MapCodec<PlayerChatMessage> MAP_CODEC = RecordCodecBuilder.mapCodec(
|
|
instance -> instance.group(
|
|
SignedMessageLink.CODEC.fieldOf("link").forGetter(PlayerChatMessage::link),
|
|
@@ -48,7 +_,14 @@
|
|
}
|
|
|
|
public PlayerChatMessage withUnsignedContent(Component message) {
|
|
- Component component = !message.equals(Component.literal(this.signedContent())) ? message : null;
|
|
+ // Paper start - adventure
|
|
+ final Component component;
|
|
+ if (message instanceof io.papermc.paper.adventure.AdventureComponent advComponent) {
|
|
+ component = this.signedContent().equals(io.papermc.paper.adventure.AdventureCodecs.tryCollapseToString(advComponent.adventure$component())) ? null : message;
|
|
+ } else {
|
|
+ component = !message.equals(Component.literal(this.signedContent())) ? message : null;
|
|
+ }
|
|
+ // Paper end - adventure
|
|
return new PlayerChatMessage(this.link, this.signature, this.signedBody, component, this.filterMask);
|
|
}
|
|
|