2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-01-16 11:13:17 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 15 Jan 2018 21:46:46 -0500
|
|
|
|
Subject: [PATCH] Basic PlayerProfile API
|
|
|
|
|
|
|
|
Provides basic elements of a PlayerProfile to be used by future API/events
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
|
|
|
|
new file mode 100644
|
2020-06-23 16:53:02 +08:00
|
|
|
index 0000000000000000000000000000000000000000..2ef9a7bd55e2c9cf8cb20d5f77282676ae11181f
|
2018-01-16 11:13:17 +08:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
|
2020-06-23 16:53:02 +08:00
|
|
|
@@ -0,0 +1,177 @@
|
2018-01-16 11:13:17 +08:00
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
|
|
|
+import java.util.Collection;
|
|
|
|
+import java.util.Set;
|
|
|
|
+import java.util.UUID;
|
2019-03-20 08:28:15 +08:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents a players profile for the game, such as UUID, Name, and textures.
|
|
|
|
+ */
|
|
|
|
+public interface PlayerProfile {
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return The players name, if set
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @Nullable
|
|
|
|
+ String getName();
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
2018-03-26 09:50:46 +08:00
|
|
|
+ * Sets this profiles Name
|
|
|
|
+ *
|
|
|
|
+ * @param name The new Name
|
|
|
|
+ * @return The previous Name
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-03-26 09:50:46 +08:00
|
|
|
+ String setName(@Nullable String name);
|
|
|
|
+
|
|
|
|
+ /**
|
2018-01-16 11:13:17 +08:00
|
|
|
+ * @return The players unique identifier, if set
|
|
|
|
+ */
|
|
|
|
+ @Nullable UUID getId();
|
|
|
|
+
|
|
|
|
+ /**
|
2018-03-26 09:50:46 +08:00
|
|
|
+ * Sets this profiles UUID
|
|
|
|
+ *
|
|
|
|
+ * @param uuid The new UUID
|
|
|
|
+ * @return The previous UUID
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @Nullable
|
2018-03-26 09:50:46 +08:00
|
|
|
+ UUID setId(@Nullable UUID uuid);
|
|
|
|
+
|
|
|
|
+ /**
|
2018-01-22 03:09:09 +08:00
|
|
|
+ * @return A Mutable set of this players properties, such as textures.
|
2018-01-16 11:13:17 +08:00
|
|
|
+ * Values specified here are subject to implementation details.
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull Set<ProfileProperty> getProperties();
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
2018-03-23 09:40:57 +08:00
|
|
|
+ * Check if the Profile has the specified property
|
|
|
|
+ * @param property Property name to check
|
|
|
|
+ * @return If the property is set
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ boolean hasProperty(@Nullable String property);
|
2018-03-23 09:40:57 +08:00
|
|
|
+
|
|
|
|
+ /**
|
2018-01-16 11:13:17 +08:00
|
|
|
+ * Sets a property. If the property already exists, the previous one will be replaced
|
|
|
|
+ * @param property Property to set.
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ void setProperty(@NotNull ProfileProperty property);
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets multiple properties. If any of the set properties already exist, it will be replaced
|
|
|
|
+ * @param properties The properties to set
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ void setProperties(@NotNull Collection<ProfileProperty> properties);
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Removes a specific property from this profile
|
|
|
|
+ * @param property The property to remove
|
|
|
|
+ * @return If a property was removed
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ boolean removeProperty(@Nullable String property);
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Removes a specific property from this profile
|
|
|
|
+ * @param property The property to remove
|
|
|
|
+ * @return If a property was removed
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ default boolean removeProperty(@NotNull ProfileProperty property) {
|
2018-01-16 11:13:17 +08:00
|
|
|
+ return removeProperty(property.getName());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Removes all properties in the collection
|
|
|
|
+ * @param properties The properties to remove
|
|
|
|
+ * @return If any property was removed
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ default boolean removeProperties(@NotNull Collection<ProfileProperty> properties) {
|
2018-01-16 11:13:17 +08:00
|
|
|
+ boolean removed = false;
|
|
|
|
+ for (ProfileProperty property : properties) {
|
|
|
|
+ if (removeProperty(property)) {
|
|
|
|
+ removed = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return removed;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Clears all properties on this profile
|
|
|
|
+ */
|
|
|
|
+ void clearProperties();
|
|
|
|
+
|
|
|
|
+ /**
|
2018-03-26 09:50:46 +08:00
|
|
|
+ * @return If the profile is now complete (has UUID and Name)
|
2018-01-16 11:13:17 +08:00
|
|
|
+ */
|
|
|
|
+ boolean isComplete();
|
2018-01-19 13:03:09 +08:00
|
|
|
+
|
|
|
|
+ /**
|
2018-03-26 09:50:46 +08:00
|
|
|
+ * Like {@link #complete(boolean)} but will try only from cache, and not make network calls
|
|
|
|
+ * Does not account for textures.
|
|
|
|
+ *
|
|
|
|
+ * @return If the profile is now complete (has UUID and Name)
|
|
|
|
+ */
|
|
|
|
+ boolean completeFromCache();
|
|
|
|
+
|
|
|
|
+ /**
|
2020-06-23 16:53:02 +08:00
|
|
|
+ * Like {@link #complete(boolean)} but will try only from cache, and not make network calls
|
|
|
|
+ * Does not account for textures.
|
|
|
|
+ *
|
|
|
|
+ * @param onlineMode Treat this as online mode or not
|
|
|
|
+ * @return If the profile is now complete (has UUID and Name)
|
|
|
|
+ */
|
|
|
|
+ boolean completeFromCache(boolean onlineMode);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Like {@link #complete(boolean)} but will try only from cache, and not make network calls
|
|
|
|
+ * Does not account for textures.
|
|
|
|
+ *
|
|
|
|
+ * @param lookupUUID If only name is supplied, should we do a UUID lookup
|
|
|
|
+ * @param onlineMode Treat this as online mode or not
|
|
|
|
+ * @return If the profile is now complete (has UUID and Name)
|
|
|
|
+ */
|
|
|
|
+ boolean completeFromCache(boolean lookupUUID, boolean onlineMode);
|
|
|
|
+
|
|
|
|
+ /**
|
2018-03-18 23:31:32 +08:00
|
|
|
+ * If this profile is not complete, then make the API call to complete it.
|
|
|
|
+ * This is a blocking operation and should be done asynchronously.
|
2018-03-23 09:40:57 +08:00
|
|
|
+ *
|
|
|
|
+ * This will also complete textures. If you do not want to load textures, use {{@link #complete(boolean)}}
|
2018-03-26 09:50:46 +08:00
|
|
|
+ * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
|
2018-03-18 23:31:32 +08:00
|
|
|
+ */
|
2018-03-23 09:40:57 +08:00
|
|
|
+ default boolean complete() {
|
|
|
|
+ return complete(true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * If this profile is not complete, then make the API call to complete it.
|
|
|
|
+ * This is a blocking operation and should be done asynchronously.
|
|
|
|
+ *
|
|
|
|
+ * Optionally will also fill textures.
|
2020-06-23 16:53:02 +08:00
|
|
|
+ *
|
|
|
|
+ * Online mode will be automatically determined
|
2018-08-16 19:20:58 +08:00
|
|
|
+ * @param textures controls if we should fill the profile with texture properties
|
2018-03-26 09:50:46 +08:00
|
|
|
+ * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
|
2018-03-23 09:40:57 +08:00
|
|
|
+ */
|
|
|
|
+ boolean complete(boolean textures);
|
|
|
|
+
|
|
|
|
+ /**
|
2020-06-23 16:53:02 +08:00
|
|
|
+ * If this profile is not complete, then make the API call to complete it.
|
|
|
|
+ * This is a blocking operation and should be done asynchronously.
|
|
|
|
+ *
|
|
|
|
+ * Optionally will also fill textures.
|
|
|
|
+ * @param textures controls if we should fill the profile with texture properties
|
|
|
|
+ * @param onlineMode Treat this server as online mode or not
|
|
|
|
+ * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
|
|
|
|
+ */
|
|
|
|
+ boolean complete(boolean textures, boolean onlineMode);
|
|
|
|
+
|
|
|
|
+ /**
|
2018-03-23 09:40:57 +08:00
|
|
|
+ * Whether or not this Profile has textures associated to it
|
|
|
|
+ * @return If has a textures property
|
|
|
|
+ */
|
|
|
|
+ default boolean hasTextures() {
|
|
|
|
+ return hasProperty("textures");
|
|
|
|
+ }
|
2018-01-16 11:13:17 +08:00
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
|
|
|
|
new file mode 100644
|
2020-05-06 17:48:49 +08:00
|
|
|
index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6b0e0faee
|
2018-01-16 11:13:17 +08:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
|
|
|
|
@@ -0,0 +1,72 @@
|
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
|
|
|
+import com.google.common.base.Preconditions;
|
|
|
|
+
|
|
|
|
+import java.util.Objects;
|
2019-03-20 08:28:15 +08:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents a property on a {@link PlayerProfile}
|
|
|
|
+ */
|
|
|
|
+public class ProfileProperty {
|
|
|
|
+ private final String name;
|
|
|
|
+ private final String value;
|
|
|
|
+ private final String signature;
|
|
|
|
+
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public ProfileProperty(@NotNull String name, @NotNull String value) {
|
2018-01-16 11:13:17 +08:00
|
|
|
+ this(name, value, null);
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public ProfileProperty(@NotNull String name, @NotNull String value, @Nullable String signature) {
|
2018-01-16 11:13:17 +08:00
|
|
|
+ this.name = Preconditions.checkNotNull(name, "ProfileProperty name can not be null");
|
|
|
|
+ this.value = Preconditions.checkNotNull(value, "ProfileProperty value can not be null");
|
|
|
|
+ this.signature = signature;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return The property name, ie "textures"
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-01-16 11:13:17 +08:00
|
|
|
+ public String getName() {
|
|
|
|
+ return name;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return The property value, likely to be base64 encoded
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-01-16 11:13:17 +08:00
|
|
|
+ public String getValue() {
|
|
|
|
+ return value;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return A signature from Mojang for signed properties
|
|
|
|
+ */
|
|
|
|
+ @Nullable
|
|
|
|
+ public String getSignature() {
|
|
|
|
+ return signature;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return If this property has a signature or not
|
|
|
|
+ */
|
|
|
|
+ public boolean isSigned() {
|
|
|
|
+ return this.signature != null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean equals(Object o) {
|
|
|
|
+ if (this == o) return true;
|
|
|
|
+ if (o == null || getClass() != o.getClass()) return false;
|
|
|
|
+ ProfileProperty that = (ProfileProperty) o;
|
|
|
|
+ return Objects.equals(name, that.name) &&
|
|
|
|
+ Objects.equals(value, that.value) &&
|
|
|
|
+ Objects.equals(signature, that.signature);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int hashCode() {
|
|
|
|
+ return Objects.hash(name);
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2020-12-13 08:42:05 +08:00
|
|
|
index 777352a820b21bc013b671b62f89ae4c6418e3cb..c7019397923f9f9349bb5fdd15455f2dbf99bfd5 100644
|
2018-01-16 11:13:17 +08:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2020-12-13 08:42:05 +08:00
|
|
|
@@ -1652,6 +1652,40 @@ public final class Bukkit {
|
2018-01-16 11:13:17 +08:00
|
|
|
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
|
|
|
|
return server.suggestPlayerNamesWhenNullTabCompletions();
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates a PlayerProfile for the specified uuid, with name as null
|
|
|
|
+ * @param uuid UUID to create profile for
|
|
|
|
+ * @return A PlayerProfile object
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
|
|
|
+ public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull UUID uuid) {
|
2018-01-16 11:13:17 +08:00
|
|
|
+ return server.createProfile(uuid);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates a PlayerProfile for the specified name, with UUID as null
|
|
|
|
+ * @param name Name to create profile for
|
|
|
|
+ * @return A PlayerProfile object
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
|
|
|
+ public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name) {
|
2018-01-16 11:13:17 +08:00
|
|
|
+ return server.createProfile(name);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates a PlayerProfile for the specified name/uuid
|
|
|
|
+ *
|
|
|
|
+ * Both UUID and Name can not be null at same time. One must be supplied.
|
|
|
|
+ *
|
|
|
|
+ * @param uuid UUID to create profile for
|
|
|
|
+ * @param name Name to create profile for
|
|
|
|
+ * @return A PlayerProfile object
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-01-16 11:13:17 +08:00
|
|
|
+ public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
|
|
|
|
+ return server.createProfile(uuid, name);
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
2019-03-20 08:28:15 +08:00
|
|
|
@NotNull
|
2018-01-16 11:13:17 +08:00
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2020-12-13 08:42:05 +08:00
|
|
|
index 02c1d054744cb0564c6593938af278e6388adfb4..66d0a3c6de2ea3c0a2fe3cd160a52f0cabe58ef3 100644
|
2018-01-16 11:13:17 +08:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2020-12-13 08:42:05 +08:00
|
|
|
@@ -1445,5 +1445,33 @@ public interface Server extends PluginMessageRecipient {
|
2018-01-16 11:13:17 +08:00
|
|
|
* @return true if player names should be suggested
|
|
|
|
*/
|
|
|
|
boolean suggestPlayerNamesWhenNullTabCompletions();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates a PlayerProfile for the specified uuid, with name as null
|
|
|
|
+ * @param uuid UUID to create profile for
|
|
|
|
+ * @return A PlayerProfile object
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
|
|
|
+ com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull UUID uuid);
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates a PlayerProfile for the specified name, with UUID as null
|
|
|
|
+ * @param name Name to create profile for
|
|
|
|
+ * @return A PlayerProfile object
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
|
|
|
+ com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name);
|
2018-01-16 11:13:17 +08:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates a PlayerProfile for the specified name/uuid
|
|
|
|
+ *
|
|
|
|
+ * Both UUID and Name can not be null at same time. One must be supplied.
|
|
|
|
+ *
|
|
|
|
+ * @param uuid UUID to create profile for
|
|
|
|
+ * @param name Name to create profile for
|
|
|
|
+ * @return A PlayerProfile object
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-01-16 11:13:17 +08:00
|
|
|
+ com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
|
|
|
|
// Paper end
|
|
|
|
}
|