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 6c2c625dad..d1c3eede01 100644 --- a/api/src/main/java/net/kyori/adventure/audience/Audience.java +++ b/api/src/main/java/net/kyori/adventure/audience/Audience.java @@ -426,9 +426,6 @@ default void deleteMessage(final @NotNull SignedMessage signedMessage) { default void deleteMessage(final SignedMessage.@NotNull Signature signature) { } - // todo, the delete message packet also supports an int identifier that has something - // to do with the message chain, unsure if that should be exposed - /** * Sends the signed message's header to this audience. * 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 16d19a8d11..7515b3dbc2 100644 --- a/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java @@ -77,10 +77,12 @@ public void sendMessage(final @NotNull Component message) { } @Override + @Deprecated public void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { } @Override + @Deprecated public void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { } 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 d488726ffb..dd49b86ac0 100644 --- a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java @@ -123,12 +123,14 @@ default void sendMessageHeader(final @NotNull SignedMessage signedMessage) { } @Override - default void sendMessage(@NotNull Identified source, @NotNull Component message, @NotNull MessageType type) { + @Deprecated + default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { for (final Audience audience : this.audiences()) audience.sendMessage(source, message, type); } @Override - default void sendMessage(@NotNull Identity source, @NotNull Component message, @NotNull MessageType type) { + @Deprecated + default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { for (final Audience audience : this.audiences()) audience.sendMessage(source, message, type); } @@ -289,11 +291,13 @@ default void sendMessageHeader(final @NotNull SignedMessage signedMessage) { } @Override + @Deprecated default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { this.audience().sendMessage(source, message, type); } @Override + @Deprecated default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { this.audience().sendMessage(source, message, type); } diff --git a/api/src/main/java/net/kyori/adventure/chat/ChatType.java b/api/src/main/java/net/kyori/adventure/chat/ChatType.java index 3e2a25dea5..5db37733c3 100644 --- a/api/src/main/java/net/kyori/adventure/chat/ChatType.java +++ b/api/src/main/java/net/kyori/adventure/chat/ChatType.java @@ -179,8 +179,7 @@ interface Bound extends Examinable { @Nullable Component target(); @Override - @NotNull - default Stream examinableProperties() { + default @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("type", this.type()), ExaminableProperty.of("name", this.name()), 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 2d54093de2..978d7f6fb2 100644 --- a/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java +++ b/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java @@ -185,8 +185,7 @@ interface Signature extends Examinable { byte[] bytes(); @Override - @NotNull - default Stream examinableProperties() { + default @NotNull Stream examinableProperties() { return Stream.of(ExaminableProperty.of("bytes", this.bytes())); } }