13
0
geforkt von Mirrors/Paper

#719: Add Player Profile API

Slight changes may occur as this API is stabilized.

This PR is based on work previously done by DerFrZocker in #663.

By: blablubbabc <lukas@wirsindwir.de>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2022-02-03 09:25:35 +11:00
Ursprung e6392d1992
Commit 7c667b37d9
7 geänderte Dateien mit 362 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -44,6 +44,7 @@ import org.bukkit.permissions.Permissible;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.ServicesManager; import org.bukkit.plugin.ServicesManager;
import org.bukkit.plugin.messaging.Messenger; import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.profile.PlayerProfile;
import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.scoreboard.ScoreboardManager;
import org.bukkit.structure.StructureManager; import org.bukkit.structure.StructureManager;
@ -1048,6 +1049,45 @@ public final class Bukkit {
return server.getOfflinePlayer(id); return server.getOfflinePlayer(id);
} }
/**
* Creates a new {@link PlayerProfile}.
*
* @param uniqueId the unique id
* @param name the name
* @return the new PlayerProfile
* @throws IllegalArgumentException if both the unique id is
* <code>null</code> and the name is <code>null</code> or blank
*/
@NotNull
public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
return server.createPlayerProfile(uniqueId, name);
}
/**
* Creates a new {@link PlayerProfile}.
*
* @param uniqueId the unique id
* @return the new PlayerProfile
* @throws IllegalArgumentException if the unique id is <code>null</code>
*/
@NotNull
public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
return server.createPlayerProfile(uniqueId);
}
/**
* Creates a new {@link PlayerProfile}.
*
* @param name the name
* @return the new PlayerProfile
* @throws IllegalArgumentException if the name is <code>null</code> or
* blank
*/
@NotNull
public static PlayerProfile createPlayerProfile(@NotNull String name) {
return server.createPlayerProfile(name);
}
/** /**
* Gets a set containing all current IPs that are banned. * Gets a set containing all current IPs that are banned.
* *

Datei anzeigen

@ -6,6 +6,7 @@ import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.ServerOperator; import org.bukkit.permissions.ServerOperator;
import org.bukkit.profile.PlayerProfile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -39,6 +40,18 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@NotNull @NotNull
public UUID getUniqueId(); public UUID getUniqueId();
/**
* Gets a copy of the player's profile.
* <p>
* If the player is online, the returned profile will be complete.
* Otherwise, only the unique id is guaranteed to be present. You can use
* {@link PlayerProfile#update()} to complete the returned profile.
*
* @return the player's profile
*/
@NotNull
PlayerProfile getPlayerProfile();
/** /**
* Checks if this player is banned or not * Checks if this player is banned or not
* *

Datei anzeigen

@ -45,6 +45,7 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.ServicesManager; import org.bukkit.plugin.ServicesManager;
import org.bukkit.plugin.messaging.Messenger; import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.plugin.messaging.PluginMessageRecipient; import org.bukkit.plugin.messaging.PluginMessageRecipient;
import org.bukkit.profile.PlayerProfile;
import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.scoreboard.ScoreboardManager;
import org.bukkit.structure.StructureManager; import org.bukkit.structure.StructureManager;
@ -880,6 +881,39 @@ public interface Server extends PluginMessageRecipient {
@NotNull @NotNull
public OfflinePlayer getOfflinePlayer(@NotNull UUID id); public OfflinePlayer getOfflinePlayer(@NotNull UUID id);
/**
* Creates a new {@link PlayerProfile}.
*
* @param uniqueId the unique id
* @param name the name
* @return the new PlayerProfile
* @throws IllegalArgumentException if both the unique id is
* <code>null</code> and the name is <code>null</code> or blank
*/
@NotNull
PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
/**
* Creates a new {@link PlayerProfile}.
*
* @param uniqueId the unique id
* @return the new PlayerProfile
* @throws IllegalArgumentException if the unique id is <code>null</code>
*/
@NotNull
PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
/**
* Creates a new {@link PlayerProfile}.
*
* @param name the name
* @return the new PlayerProfile
* @throws IllegalArgumentException if the name is <code>null</code> or
* blank
*/
@NotNull
PlayerProfile createPlayerProfile(@NotNull String name);
/** /**
* Gets a set containing all current IPs that are banned. * Gets a set containing all current IPs that are banned.
* *

Datei anzeigen

@ -4,6 +4,7 @@ import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.SkullType; import org.bukkit.SkullType;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.profile.PlayerProfile;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -61,6 +62,29 @@ public interface Skull extends TileState {
*/ */
public void setOwningPlayer(@NotNull OfflinePlayer player); public void setOwningPlayer(@NotNull OfflinePlayer player);
/**
* Gets the profile of the player who owns the skull. This player profile
* may appear as the texture depending on skull type.
*
* @return the profile of the owning player
*/
@Nullable
PlayerProfile getOwnerProfile();
/**
* Sets the profile of the player who owns the skull. This player profile
* may appear as the texture depending on skull type.
* <p>
* The profile must contain both a unique id and a skin texture. If either
* of these is missing, the profile must contain a name by which the server
* will then attempt to look up the unique id and skin texture.
*
* @param profile the profile of the owning player
* @throws IllegalArgumentException if the profile does not contain the
* necessary information
*/
void setOwnerProfile(@Nullable PlayerProfile profile);
/** /**
* Gets the rotation of the skull in the world (or facing direction if this * Gets the rotation of the skull in the world (or facing direction if this
* is a wall mounted skull). * is a wall mounted skull).

Datei anzeigen

@ -1,6 +1,7 @@
package org.bukkit.inventory.meta; package org.bukkit.inventory.meta;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.profile.PlayerProfile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -55,6 +56,29 @@ public interface SkullMeta extends ItemMeta {
*/ */
boolean setOwningPlayer(@Nullable OfflinePlayer owner); boolean setOwningPlayer(@Nullable OfflinePlayer owner);
/**
* Gets the profile of the player who owns the skull. This player profile
* may appear as the texture depending on skull type.
*
* @return the profile of the owning player
*/
@Nullable
PlayerProfile getOwnerProfile();
/**
* Sets the profile of the player who owns the skull. This player profile
* may appear as the texture depending on skull type.
* <p>
* The profile must contain both a unique id and a skin texture. If either
* of these is missing, the profile must contain a name by which the server
* will then attempt to look up the unique id and skin texture.
*
* @param profile the profile of the owning player
* @throws IllegalArgumentException if the profile does not contain the
* necessary information
*/
void setOwnerProfile(@Nullable PlayerProfile profile);
@Override @Override
@NotNull @NotNull
SkullMeta clone(); SkullMeta clone();

Datei anzeigen

@ -0,0 +1,100 @@
package org.bukkit.profile;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import org.bukkit.Server;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* A player profile.
* <p>
* A player profile always provides a unique id, a non-empty name, or both. Its
* unique id and name are immutable, but other properties (such as its textures)
* can be altered.
* <p>
* New profiles can be created via
* {@link Server#createPlayerProfile(UUID, String)}.
*/
public interface PlayerProfile extends Cloneable, ConfigurationSerializable {
/**
* Gets the player's unique id.
*
* @return the player's unique id, or <code>null</code> if not available
*/
@Nullable
UUID getUniqueId();
/**
* Gets the player name.
*
* @return the player name, or <code>null</code> if not available
*/
@Nullable
String getName();
/**
* Gets the {@link PlayerTextures} of this profile.
*
* @return the textures, not <code>null</code>
*/
@NotNull
PlayerTextures getTextures();
/**
* Copies the given textures.
*
* @param textures the textures to copy, or <code>null</code> to clear the
* textures
*/
void setTextures(@Nullable PlayerTextures textures);
/**
* Checks whether this profile is complete.
* <p>
* A profile is currently considered complete if it has a name, a unique id,
* and textures.
*
* @return <code>true</code> if this profile is complete
*/
boolean isComplete();
/**
* Produces an updated player profile based on this profile.
* <p>
* This tries to produce a completed profile by filling in missing
* properties (name, unique id, textures, etc.), and updates existing
* properties (e.g. name, textures, etc.) to their official and up-to-date
* values. This operation does not alter the current profile, but produces a
* new updated {@link PlayerProfile}.
* <p>
* If no player exists for the unique id or name of this profile, this
* operation yields a profile that is equal to the current profile, which
* might not be complete.
* <p>
* This is an asynchronous operation: Updating the profile can result in an
* outgoing connection in another thread in order to fetch the latest
* profile properties. The returned {@link CompletableFuture} will be
* completed once the updated profile is available. In order to not block
* the server's main thread, you should not wait for the result of the
* returned CompletableFuture on the server's main thread. Instead, if you
* want to do something with the updated player profile on the server's main
* thread once it is available, you could do something like this:
* <pre>
* profile.update().thenAcceptAsync(updatedProfile -> {
* // Do something with the updated profile:
* // ...
* }, runnable -> Bukkit.getScheduler().runTask(plugin, runnable));
* </pre>
*
* @return a completable future that gets completed with the updated
* PlayerProfile once it is available
*/
@NotNull
CompletableFuture<PlayerProfile> update();
@NotNull
PlayerProfile clone();
}

Datei anzeigen

@ -0,0 +1,127 @@
package org.bukkit.profile;
import java.net.URL;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* Provides access to the textures stored inside a {@link PlayerProfile}.
* <p>
* Modifying the textures immediately invalidates and clears any previously
* present attributes that are specific to official player profiles, such as the
* {@link #getTimestamp() timestamp} and {@link #isSigned() signature}.
*/
public interface PlayerTextures {
/**
* The different Minecraft skin models.
*/
enum SkinModel {
/**
* The classic Minecraft skin model.
*/
CLASSIC,
/**
* The slim model has slimmer arms than the classic model.
*/
SLIM;
}
/**
* Checks if the profile stores no textures.
*
* @return <code>true</code> if the profile stores no textures
*/
boolean isEmpty();
/**
* Clears the textures.
*/
void clear();
/**
* Gets the URL that points to the player's skin.
*
* @return the URL of the player's skin, or <code>null</code> if not set
*/
@Nullable
URL getSkin();
/**
* Sets the player's skin to the specified URL, and the skin model to
* {@link SkinModel#CLASSIC}.
* <p>
* The URL <b>must</b> point to the Minecraft texture server. Example URL:
* <pre>
* http://textures.minecraft.net/texture/b3fbd454b599df593f57101bfca34e67d292a8861213d2202bb575da7fd091ac
* </pre>
*
* @param skinUrl the URL of the player's skin, or <code>null</code> to
* unset it
*/
void setSkin(@Nullable URL skinUrl);
/**
* Sets the player's skin and {@link SkinModel}.
* <p>
* The URL <b>must</b> point to the Minecraft texture server. Example URL:
* <pre>
* http://textures.minecraft.net/texture/b3fbd454b599df593f57101bfca34e67d292a8861213d2202bb575da7fd091ac
* </pre>
* <p>
* A skin model of <code>null</code> results in {@link SkinModel#CLASSIC} to
* be used.
*
* @param skinUrl the URL of the player's skin, or <code>null</code> to
* unset it
* @param skinModel the skin model, ignored if the skin URL is
* <code>null</code>
*/
void setSkin(@Nullable URL skinUrl, @Nullable SkinModel skinModel);
/**
* Gets the model of the player's skin.
* <p>
* This returns {@link SkinModel#CLASSIC} if no skin is set.
*
* @return the model of the player's skin
*/
@NotNull
SkinModel getSkinModel();
/**
* Gets the URL that points to the player's cape.
*
* @return the URL of the player's cape, or <code>null</code> if not set
*/
@Nullable
URL getCape();
/**
* Sets the URL that points to the player's cape.
* <p>
* The URL <b>must</b> point to the Minecraft texture server. Example URL:
* <pre>
* http://textures.minecraft.net/texture/2340c0e03dd24a11b15a8b33c2a7e9e32abb2051b2481d0ba7defd635ca7a933
* </pre>
*
* @param capeUrl the URL of the player's cape, or <code>null</code> to
* unset it
*/
void setCape(@Nullable URL capeUrl);
/**
* Gets the timestamp at which the profile was last updated.
*
* @return the timestamp, or <code>0</code> if unknown
*/
long getTimestamp();
/**
* Checks if the textures are signed and the signature is valid.
*
* @return <code>true</code> if the textures are signed and the signature is
* valid
*/
boolean isSigned();
}