api: delete PlayerIdentified

KyoriPowered · Nov 22, 2022 · 9e1f50d · 9e1f50d
1 parent e4d89b9
commit 9e1f50d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 285 deletions.
diff --git a/api/src/main/java/net/kyori/adventure/audience/Audience.java b/api/src/main/java/net/kyori/adventure/audience/Audience.java
@@ -33,8 +33,6 @@
 import net.kyori.adventure.chat.SignedMessage;
 import net.kyori.adventure.identity.Identified;
 import net.kyori.adventure.identity.Identity;
-import net.kyori.adventure.identity.PlayerIdentified;
-import net.kyori.adventure.identity.PlayerIdentity;
 import net.kyori.adventure.inventory.Book;
 import net.kyori.adventure.pointer.Pointered;
 import net.kyori.adventure.sound.Sound;
@@ -281,7 +279,7 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen
    * @param message a message
    * @see Component
    * @since 4.0.0
-   * @deprecated since 4.12.0, the client errors on receiving and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendChatMessage(SignedMessage, PlayerIdentified)} instead
+   * @deprecated since 4.12.0, the client errors on receiving and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(SignedMessage, ChatType.Bound)} instead
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
@@ -296,7 +294,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon
    * @param message a message
    * @see Component
    * @since 4.0.0
-   * @deprecated since 4.12.0, the client errors on receiving and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendChatMessage(SignedMessage, PlayerIdentity)} instead
+   * @deprecated since 4.12.0, the client errors on receiving and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(SignedMessage, ChatType.Bound)} instead
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
@@ -376,34 +374,6 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen
   /* End: unsigned player messages */
 
   /* Start: disguised player messages */
-  /**
-   * Sends a chat message from the given {@link PlayerIdentified} to this {@link Audience} with the {@link ChatType#CHAT} chat type.
-   *
-   * @param component the component content
-   * @param source the source of the message
-   * @see #sendMessage(Component, ChatType.Bound)
-   * @since 4.12.0
-   * @sinceMinecraft 1.19
-   */
-  @ForwardingAudienceOverrideNotRequired
-  default void sendChatMessage(final @NotNull Component component, final @NotNull PlayerIdentified source) {
-    this.sendChatMessage(component, source.identity());
-  }
-
-  /**
-   * Sends a chat message from the given {@link PlayerIdentity} to this {@link Audience} with the {@link ChatType#CHAT} chat type.
-   *
-   * @param component the component content
-   * @param source the source of the message
-   * @see #sendMessage(Component, ChatType.Bound)
-   * @since 4.12.0
-   * @sinceMinecraft 1.19
-   */
-  @ForwardingAudienceOverrideNotRequired
-  default void sendChatMessage(final @NotNull Component component, final @NotNull PlayerIdentity source) {
-    this.sendMessage(component, ChatType.CHAT.bind(source.name()));
-  }
-
   /**
    * Sends a message to this {@link Audience} with the provided {@link ChatType.Bound bound chat type}.
    *
@@ -412,39 +382,11 @@ default void sendChatMessage(final @NotNull Component component, final @NotNull
    * @since 4.12.0
    * @sinceMinecraft 1.19
    */
-  default void sendMessage(final @NotNull Component message, final @NotNull ChatType.Bound boundChatType) {
+  default void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
   }
   /* End: disguised player messages
 
   /* Start: signed player messages */
-  /**
-   * Sends a signed player chat message from the given {@link PlayerIdentified} to this {@link Audience} with the {@link ChatType#CHAT} chat type.
-   *
-   * @param signedMessage the signed message data
-   * @param source the source of the message
-   * @see #sendMessage(SignedMessage, ChatType.Bound)
-   * @since 4.12.0
-   * @sinceMinecraft 1.19
-   */
-  @ForwardingAudienceOverrideNotRequired
-  default void sendChatMessage(final @NotNull SignedMessage signedMessage, final @NotNull PlayerIdentified source) {
-    this.sendChatMessage(signedMessage, source.identity());
-  }
-
-  /**
-   * Sends a signed player chat message from the player identified by the provided {@link PlayerIdentity} to this {@link Audience} with the {@link ChatType#CHAT} chat type.
-   *
-   * @param signedMessage the signed message data
-   * @param source the identity of the source of the message
-   * @see #sendMessage(SignedMessage, ChatType.Bound)
-   * @since 4.12.0
-   * @sinceMinecraft 1.19
-   */
-  @ForwardingAudienceOverrideNotRequired
-  default void sendChatMessage(final @NotNull SignedMessage signedMessage, final @NotNull PlayerIdentity source) {
-    this.sendMessage(signedMessage, ChatType.CHAT.bind(source.name()));
-  }
-
   /**
    * Sends a signed player message to this {@link Audience} with the provided {@link ChatType.Bound bound chat type}.
    *

diff --git a/api/src/main/java/net/kyori/adventure/identity/PlayerIdentified.java b/api/src/main/java/net/kyori/adventure/identity/PlayerIdentified.java
diff --git a/api/src/main/java/net/kyori/adventure/identity/PlayerIdentity.java b/api/src/main/java/net/kyori/adventure/identity/PlayerIdentity.java
diff --git a/api/src/main/java/net/kyori/adventure/identity/PlayerIdentityImpl.java b/api/src/main/java/net/kyori/adventure/identity/PlayerIdentityImpl.java