diff --git a/paper-api/src/main/java/org/bukkit/Bukkit.java b/paper-api/src/main/java/org/bukkit/Bukkit.java index c351fb49a8..c50b69ace8 100644 --- a/paper-api/src/main/java/org/bukkit/Bukkit.java +++ b/paper-api/src/main/java/org/bukkit/Bukkit.java @@ -1380,8 +1380,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank + * @deprecated use {@link #createProfile(UUID, String)} */ @NotNull + @Deprecated(since = "1.18.1") // Paper public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) { return server.createPlayerProfile(uniqueId, name); } @@ -1392,8 +1394,10 @@ public final class Bukkit { * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null + * @deprecated use {@link #createProfile(UUID)} */ @NotNull + @Deprecated(since = "1.18.1") // Paper public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) { return server.createPlayerProfile(uniqueId); } @@ -1405,8 +1409,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank + * @deprecated use {@link #createProfile(String)} */ @NotNull + @Deprecated(since = "1.18.1") // Paper public static PlayerProfile createPlayerProfile(@NotNull String name) { return server.createPlayerProfile(name); } diff --git a/paper-api/src/main/java/org/bukkit/OfflinePlayer.java b/paper-api/src/main/java/org/bukkit/OfflinePlayer.java index 9f599e44c9..2f404c6cef 100644 --- a/paper-api/src/main/java/org/bukkit/OfflinePlayer.java +++ b/paper-api/src/main/java/org/bukkit/OfflinePlayer.java @@ -59,7 +59,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio * @return the player's profile */ @NotNull - PlayerProfile getPlayerProfile(); + com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile(); // Paper /** * Checks if this player has had their profile banned. diff --git a/paper-api/src/main/java/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java index 51bed70fdc..4c10cc9524 100644 --- a/paper-api/src/main/java/org/bukkit/Server.java +++ b/paper-api/src/main/java/org/bukkit/Server.java @@ -1167,8 +1167,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank + * @deprecated use {@link #createProfile(UUID, String)} */ @NotNull + @Deprecated(since = "1.18.1") // Paper PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name); /** @@ -1177,8 +1179,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null + * @deprecated use {@link #createProfile(UUID)} */ @NotNull + @Deprecated(since = "1.18.1") // Paper PlayerProfile createPlayerProfile(@NotNull UUID uniqueId); /** @@ -1188,8 +1192,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank + * @deprecated use {@link #createProfile(String)} */ @NotNull + @Deprecated(since = "1.18.1") // Paper PlayerProfile createPlayerProfile(@NotNull String name); /** diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java index fcb83800bc..3611ef03ab 100644 --- a/paper-api/src/main/java/org/bukkit/entity/Player.java +++ b/paper-api/src/main/java/org/bukkit/entity/Player.java @@ -3154,6 +3154,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM } // Paper end + // Paper start - Player Profile API + /** + * Gets a copy of this players profile + * + * @return The players profile object + */ + com.destroystokyo.paper.profile.@NotNull PlayerProfile getPlayerProfile(); + + /** + * Changes the PlayerProfile for this player. This will cause this player + * to be re-registered to all clients that can currently see this player. + *

+ * After executing this method, the player {@link java.util.UUID} won't + * be swapped, only their name and profile properties. + * + * @param profile The new profile to use + */ + void setPlayerProfile(com.destroystokyo.paper.profile.@NotNull PlayerProfile profile); + // Paper end - Player Profile API + // Spigot start public class Spigot extends Entity.Spigot { diff --git a/paper-api/src/main/java/org/bukkit/profile/PlayerProfile.java b/paper-api/src/main/java/org/bukkit/profile/PlayerProfile.java index fc46add38b..f4ab961647 100644 --- a/paper-api/src/main/java/org/bukkit/profile/PlayerProfile.java +++ b/paper-api/src/main/java/org/bukkit/profile/PlayerProfile.java @@ -16,7 +16,9 @@ import org.jetbrains.annotations.Nullable; *

* New profiles can be created via * {@link Server#createPlayerProfile(UUID, String)}. + * @deprecated see {@link com.destroystokyo.paper.profile.PlayerProfile} */ +@Deprecated(since = "1.18.1") // Paper public interface PlayerProfile extends Cloneable, ConfigurationSerializable { /** @@ -25,6 +27,7 @@ public interface PlayerProfile extends Cloneable, ConfigurationSerializable { * @return the player's unique id, or null if not available */ @Nullable + @Deprecated(since = "1.18.1") // Paper UUID getUniqueId(); /**