diff --git a/api/src/main/java/net/kyori/adventure/audience/Audience.java b/api/src/main/java/net/kyori/adventure/audience/Audience.java index d1c3eede0..52b3ba861 100644 --- a/api/src/main/java/net/kyori/adventure/audience/Audience.java +++ b/api/src/main/java/net/kyori/adventure/audience/Audience.java @@ -349,9 +349,7 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0") @Deprecated default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { - if (source.identity() == Identity.nil()) { - this.sendMessage(message); - } + this.sendMessage(message); } /** @@ -367,9 +365,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0") @Deprecated default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { - if (source == Identity.nil()) { - this.sendMessage(message); - } + this.sendMessage(message); } /* End: unsigned player messages */ @@ -395,7 +391,7 @@ default void sendMessage(final @NotNull Component message, final ChatType.@NotNu * @since 4.12.0 * @sinceMinecraft 1.19 */ - default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.Bound boundChatType) { + default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) { if (signedMessage.isSystem()) { this.sendMessage(signedMessage.unsignedContent() != null ? signedMessage.unsignedContent() : Component.text(signedMessage.message()), boundChatType); } @@ -425,17 +421,6 @@ default void deleteMessage(final @NotNull SignedMessage signedMessage) { */ default void deleteMessage(final SignedMessage.@NotNull Signature signature) { } - - /** - * Sends the signed message's header to this audience. - * - * @param signedMessage the signed message - * @see SignedMessage#canSendAsHeader() - * @since 4.12.0 - * @sinceMinecraft 1.19 - */ - default void sendMessageHeader(final @NotNull SignedMessage signedMessage) { - } /* End: signed player messages */ /** diff --git a/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java b/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java index 7515b3dbc..921e8fa46 100644 --- a/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java @@ -91,17 +91,13 @@ public void sendMessage(final @NotNull Component message, final ChatType.@NotNul } @Override - public void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.Bound boundChatType) { + public void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) { } @Override public void deleteMessage(final SignedMessage.@NotNull Signature signature) { } - @Override - public void sendMessageHeader(final @NotNull SignedMessage signedMessage) { - } - @Override public void sendActionBar(final @NotNull ComponentLike message) { } diff --git a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java index dd49b86ac..a728ebc1d 100644 --- a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java @@ -108,7 +108,7 @@ default void sendMessage(final @NotNull Component message, final ChatType.@NotNu } @Override - default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.Bound boundChatType) { + default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) { for (final Audience audience : this.audiences()) audience.sendMessage(signedMessage, boundChatType); } @@ -117,11 +117,6 @@ default void deleteMessage(final SignedMessage.@NotNull Signature signature) { for (final Audience audience : this.audiences()) audience.deleteMessage(signature); } - @Override - default void sendMessageHeader(final @NotNull SignedMessage signedMessage) { - for (final Audience audience : this.audiences()) audience.sendMessageHeader(signedMessage); - } - @Override @Deprecated default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { @@ -276,7 +271,7 @@ default void sendMessage(final @NotNull Component message, final ChatType.@NotNu } @Override - default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.Bound boundChatType) { + default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) { this.audience().sendMessage(signedMessage, boundChatType); } @@ -285,11 +280,6 @@ default void deleteMessage(final SignedMessage.@NotNull Signature signature) { this.audience().deleteMessage(signature); } - @Override - default void sendMessageHeader(final @NotNull SignedMessage signedMessage) { - this.audience().sendMessageHeader(signedMessage); - } - @Override @Deprecated default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { diff --git a/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java b/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java index 978d7f6fb..d44600000 100644 --- a/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java +++ b/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java @@ -145,16 +145,6 @@ default boolean canDelete() { return this.signature() != null; } - /** - * Checks if this message can be sent as a header via {@link net.kyori.adventure.audience.Audience#sendMessageHeader(SignedMessage)}. - * - * @return true if supports sending as a header - * @since 4.12.0 - * @sinceMinecraft 1.19 - */ - @Contract(pure = true) - boolean canSendAsHeader(); - @Override default @NotNull Stream examinableProperties() { return Stream.of( diff --git a/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java b/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java index c7af1befb..1869175a9 100644 --- a/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java +++ b/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java @@ -71,11 +71,6 @@ public Signature signature() { return this.message; } - @Override - public boolean canSendAsHeader() { - return false; - } - @Override public @NotNull Identity identity() { return Identity.nil();