2018-03-23 02:56:18 +01:00
|
|
|
From c30fb3bacce33d5d61ce16d4c9a81790a4a0c90b Mon Sep 17 00:00:00 2001
|
2018-01-16 04:13:17 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 15 Jan 2018 22:11:48 -0500
|
|
|
|
Subject: [PATCH] Basic PlayerProfile API
|
|
|
|
|
|
|
|
|
2018-01-19 06:03:09 +01:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
2018-01-16 04:13:17 +01:00
|
|
|
new file mode 100644
|
2018-03-23 02:56:18 +01:00
|
|
|
index 000000000..63782747c
|
2018-01-16 04:13:17 +01:00
|
|
|
--- /dev/null
|
2018-01-19 06:03:09 +01:00
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
2018-03-23 02:56:18 +01:00
|
|
|
@@ -0,0 +1,257 @@
|
2018-01-16 04:13:17 +01:00
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
2018-03-22 06:28:22 +01:00
|
|
|
+import com.destroystokyo.paper.PaperConfig;
|
|
|
|
+import com.google.common.base.Charsets;
|
2018-01-16 04:13:17 +01:00
|
|
|
+import com.mojang.authlib.GameProfile;
|
|
|
|
+import com.mojang.authlib.properties.Property;
|
|
|
|
+import com.mojang.authlib.properties.PropertyMap;
|
2018-03-18 16:31:32 +01:00
|
|
|
+import net.minecraft.server.MinecraftServer;
|
2018-03-22 06:28:22 +01:00
|
|
|
+import org.bukkit.craftbukkit.entity.CraftPlayer;
|
|
|
|
+import org.spigotmc.SpigotConfig;
|
2018-01-16 04:13:17 +01:00
|
|
|
+
|
|
|
|
+import javax.annotation.Nonnull;
|
|
|
|
+import javax.annotation.Nullable;
|
2018-01-21 20:09:09 +01:00
|
|
|
+import java.util.AbstractSet;
|
2018-01-16 04:13:17 +01:00
|
|
|
+import java.util.Collection;
|
2018-01-21 20:09:09 +01:00
|
|
|
+import java.util.Iterator;
|
2018-03-23 02:56:18 +01:00
|
|
|
+import java.util.Objects;
|
2018-01-16 04:13:17 +01:00
|
|
|
+import java.util.Set;
|
|
|
|
+import java.util.UUID;
|
|
|
|
+
|
2018-01-19 06:03:09 +01:00
|
|
|
+public class CraftPlayerProfile implements PlayerProfile {
|
2018-01-16 04:13:17 +01:00
|
|
|
+
|
2018-03-18 16:31:32 +01:00
|
|
|
+ private GameProfile profile;
|
2018-03-23 02:40:57 +01:00
|
|
|
+ private final PropertySet properties = new PropertySet();
|
2018-01-16 04:13:17 +01:00
|
|
|
+
|
2018-03-22 06:28:22 +01:00
|
|
|
+ public CraftPlayerProfile(CraftPlayer player) {
|
2018-03-23 02:40:57 +01:00
|
|
|
+ this.profile = player.getHandle().getProfile();
|
|
|
|
+ }
|
|
|
|
+
|
2018-01-19 06:03:09 +01:00
|
|
|
+ public CraftPlayerProfile(UUID id, String name) {
|
2018-03-23 02:40:57 +01:00
|
|
|
+ this.profile = createGameProfile(id, name);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public CraftPlayerProfile(GameProfile profile) {
|
|
|
|
+ this.profile = profile;
|
2018-03-22 06:28:22 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static GameProfile createGameProfile(UUID id, String name) {
|
|
|
|
+ new GameProfile(id, name); // Validate that both are not null
|
2018-03-23 02:40:57 +01:00
|
|
|
+ GameProfile profile;
|
2018-03-22 06:28:22 +01:00
|
|
|
+
|
2018-03-23 02:40:57 +01:00
|
|
|
+ if (id == null) {
|
|
|
|
+ profile = getProfileByName(name);
|
|
|
|
+ } else {
|
2018-03-23 02:56:18 +01:00
|
|
|
+ profile = MinecraftServer.getServer().getUserCache().getProfile(id);
|
2018-03-22 06:28:22 +01:00
|
|
|
+ }
|
|
|
|
+
|
2018-03-23 02:56:18 +01:00
|
|
|
+ if (profile == null) {
|
|
|
|
+ profile = new GameProfile(id, name);
|
2018-03-22 06:28:22 +01:00
|
|
|
+ }
|
2018-03-23 02:56:18 +01:00
|
|
|
+ return profile;
|
2018-03-22 06:28:22 +01:00
|
|
|
+ }
|
|
|
|
+
|
2018-03-23 02:40:57 +01:00
|
|
|
+ private static GameProfile getProfileByName(String name) {
|
|
|
|
+ final GameProfile profile;
|
|
|
|
+ final MinecraftServer server = MinecraftServer.getServer();
|
|
|
|
+ boolean isOnlineMode = server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode);
|
|
|
|
+ if (isOnlineMode) {
|
|
|
|
+ profile = server.getUserCache().getProfile(name);
|
|
|
|
+ } else {
|
|
|
|
+ // Make an OfflinePlayer using an offline mode UUID since the name has no profile
|
|
|
|
+ profile = new GameProfile(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)), name);
|
|
|
|
+ }
|
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
2018-03-22 06:28:22 +01:00
|
|
|
+ private static void copyProfileProperties(GameProfile source, GameProfile target) {
|
|
|
|
+ PropertyMap properties = target.getProperties();
|
|
|
|
+ properties.clear();
|
|
|
|
+ for (Property property : source.getProperties().values()) {
|
|
|
|
+ properties.put(property.getName(), property);
|
|
|
|
+ }
|
2018-01-16 04:13:17 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2018-03-23 02:40:57 +01:00
|
|
|
+ public boolean hasProperty(String property) {
|
|
|
|
+ return profile.getProperties().containsKey(property);
|
2018-01-19 06:38:49 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2018-01-16 04:13:17 +01:00
|
|
|
+ public void setProperty(ProfileProperty property) {
|
|
|
|
+ String name = property.getName();
|
|
|
|
+ PropertyMap properties = profile.getProperties();
|
|
|
|
+ properties.removeAll(name);
|
|
|
|
+ properties.put(name, new Property(name, property.getValue(), property.getSignature()));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setProperties(Collection<ProfileProperty> properties) {
|
|
|
|
+ properties.forEach(this::setProperty);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean removeProperty(String property) {
|
|
|
|
+ return !profile.getProperties().removeAll(property).isEmpty();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void clearProperties() {
|
|
|
|
+ profile.getProperties().clear();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isComplete() {
|
|
|
|
+ return profile.isComplete();
|
|
|
|
+ }
|
|
|
|
+
|
2018-03-23 02:40:57 +01:00
|
|
|
+ public boolean complete(boolean textures) {
|
|
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
|
|
+ String name = profile.getName();
|
|
|
|
+ if (profile.getId() == null) {
|
2018-03-23 02:56:18 +01:00
|
|
|
+ GameProfile profile = getProfileByName(name);
|
2018-03-23 02:40:57 +01:00
|
|
|
+ if (profile == null) {
|
|
|
|
+ throw new NullPointerException("Could not get UUID for Player " + name);
|
|
|
|
+ }
|
2018-03-23 02:56:18 +01:00
|
|
|
+ this.profile = profile;
|
2018-03-23 02:40:57 +01:00
|
|
|
+ }
|
|
|
|
+ if (!profile.isComplete() || (textures && !hasTextures())) {
|
|
|
|
+ GameProfile result = server.getSessionService().fillProfileProperties(profile, true);
|
2018-03-22 06:28:22 +01:00
|
|
|
+ if (result != null) {
|
|
|
|
+ this.profile = result;
|
|
|
|
+ }
|
2018-03-22 00:12:02 +01:00
|
|
|
+ }
|
2018-03-23 02:40:57 +01:00
|
|
|
+ return profile.isComplete() && (!textures || hasTextures());
|
2018-03-18 16:31:32 +01:00
|
|
|
+ }
|
|
|
|
+
|
2018-01-19 06:03:09 +01:00
|
|
|
+ private static ProfileProperty toBukkit(Property property) {
|
2018-01-16 04:13:17 +01:00
|
|
|
+ return new ProfileProperty(property.getName(), property.getValue(), property.getSignature());
|
|
|
|
+ }
|
2018-01-19 06:03:09 +01:00
|
|
|
+
|
2018-01-19 06:38:49 +01:00
|
|
|
+ public static PlayerProfile asBukkitCopy(GameProfile gameProfile) {
|
2018-03-22 06:28:22 +01:00
|
|
|
+ CraftPlayerProfile profile = new CraftPlayerProfile(gameProfile.getId(), gameProfile.getName());
|
|
|
|
+ copyProfileProperties(gameProfile, profile.profile);
|
2018-01-19 06:03:09 +01:00
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
2018-01-19 06:38:49 +01:00
|
|
|
+ public static PlayerProfile asBukkitMirror(GameProfile profile) {
|
|
|
|
+ return new CraftPlayerProfile(profile);
|
|
|
|
+ }
|
|
|
|
+
|
2018-01-19 06:03:09 +01:00
|
|
|
+ public static Property asAuthlib(ProfileProperty property) {
|
|
|
|
+ return new Property(property.getName(), property.getValue(), property.getSignature());
|
|
|
|
+ }
|
2018-01-19 06:38:49 +01:00
|
|
|
+ public static GameProfile asAuthlibCopy(PlayerProfile profile) {
|
|
|
|
+ CraftPlayerProfile craft = ((CraftPlayerProfile) profile);
|
|
|
|
+ return asAuthlib(craft.clone());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static GameProfile asAuthlib(PlayerProfile profile) {
|
|
|
|
+ CraftPlayerProfile craft = ((CraftPlayerProfile) profile);
|
|
|
|
+ return craft.getGameProfile();
|
|
|
|
+ }
|
2018-01-21 20:09:09 +01:00
|
|
|
+
|
2018-03-23 02:40:57 +01:00
|
|
|
+
|
|
|
|
+ public GameProfile getGameProfile() {
|
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public UUID getId() {
|
|
|
|
+ return profile.getId();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nonnull
|
|
|
|
+ @Override
|
|
|
|
+ public Set<ProfileProperty> getProperties() {
|
|
|
|
+ return properties;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public String getName() {
|
|
|
|
+ return profile.getName();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean equals(Object o) {
|
2018-03-23 02:56:18 +01:00
|
|
|
+ if (this == o) return true;
|
|
|
|
+ if (o == null || getClass() != o.getClass()) return false;
|
|
|
|
+ CraftPlayerProfile that = (CraftPlayerProfile) o;
|
|
|
|
+ return Objects.equals(profile, that.profile);
|
2018-03-23 02:40:57 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int hashCode() {
|
|
|
|
+ return profile.hashCode();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String toString() {
|
|
|
|
+ return profile.toString();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public CraftPlayerProfile clone() {
|
|
|
|
+ CraftPlayerProfile clone = new CraftPlayerProfile(this.getId(), this.getName());
|
|
|
|
+ clone.setProperties(getProperties());
|
|
|
|
+ return clone;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
2018-01-21 20:09:09 +01:00
|
|
|
+ private class PropertySet extends AbstractSet<ProfileProperty> {
|
|
|
|
+
|
|
|
|
+ @Override
|
2018-03-08 03:03:01 +01:00
|
|
|
+ @Nonnull
|
2018-01-21 20:09:09 +01:00
|
|
|
+ public Iterator<ProfileProperty> iterator() {
|
2018-03-08 03:03:01 +01:00
|
|
|
+ return new ProfilePropertyIterator(profile.getProperties().values().iterator());
|
2018-01-21 20:09:09 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int size() {
|
|
|
|
+ return profile.getProperties().size();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean add(ProfileProperty property) {
|
|
|
|
+ setProperty(property);
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean addAll(Collection<? extends ProfileProperty> c) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ setProperties((Collection<ProfileProperty>) c);
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean contains(Object o) {
|
|
|
|
+ return o instanceof ProfileProperty && profile.getProperties().containsKey(((ProfileProperty) o).getName());
|
|
|
|
+ }
|
2018-03-08 03:03:01 +01:00
|
|
|
+
|
|
|
|
+ private class ProfilePropertyIterator implements Iterator<ProfileProperty> {
|
|
|
|
+ private final Iterator<Property> iterator;
|
|
|
|
+
|
|
|
|
+ ProfilePropertyIterator(Iterator<Property> iterator) {
|
|
|
|
+ this.iterator = iterator;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean hasNext() {
|
|
|
|
+ return iterator.hasNext();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public ProfileProperty next() {
|
|
|
|
+ return toBukkit(iterator.next());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void remove() {
|
|
|
|
+ iterator.remove();
|
|
|
|
+ }
|
|
|
|
+ }
|
2018-01-21 20:09:09 +01:00
|
|
|
+ }
|
2018-01-16 04:13:17 +01:00
|
|
|
+}
|
2018-01-19 06:12:03 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
|
2018-01-19 06:38:49 +01:00
|
|
|
index 02940d697..4539b5601 100644
|
2018-01-19 06:12:03 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
|
|
|
@@ -1,6 +1,9 @@
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
+import com.destroystokyo.paper.profile.CraftPlayerProfile;
|
|
|
|
+import com.destroystokyo.paper.profile.PlayerProfile;
|
|
|
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
|
|
|
+import com.mojang.authlib.GameProfile;
|
|
|
|
import org.apache.commons.lang.exception.ExceptionUtils;
|
|
|
|
import org.bukkit.Location;
|
|
|
|
import org.bukkit.craftbukkit.CraftWorld;
|
|
|
|
@@ -66,6 +69,10 @@ public final class MCUtil {
|
|
|
|
return run.get();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public static PlayerProfile toBukkit(GameProfile profile) {
|
2018-01-19 06:38:49 +01:00
|
|
|
+ return CraftPlayerProfile.asBukkitMirror(profile);
|
2018-01-19 06:12:03 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Calculates distance between 2 entities
|
|
|
|
* @param e1
|
2018-03-18 16:31:32 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
index e8bddc171..3b01ebd96 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
@@ -1538,6 +1538,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
|
|
|
this.H = i;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public MinecraftSessionService getSessionService() { return az(); } // Paper - OBFHELPER
|
|
|
|
public MinecraftSessionService az() {
|
|
|
|
return this.W;
|
|
|
|
}
|
2018-01-16 04:13:17 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2018-03-22 06:28:22 +01:00
|
|
|
index 77c16fe2c..2dd7ed96a 100644
|
2018-01-16 04:13:17 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
@@ -135,6 +135,10 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
|
|
|
|
import org.bukkit.event.server.TabCompleteEvent;
|
|
|
|
import net.md_5.bungee.api.chat.BaseComponent;
|
|
|
|
|
|
|
|
+import javax.annotation.Nullable; // Paper
|
|
|
|
+import javax.annotation.Nonnull; // Paper
|
|
|
|
+
|
|
|
|
+
|
|
|
|
public final class CraftServer implements Server {
|
|
|
|
private final String serverName = "Paper";
|
|
|
|
private final String serverVersion;
|
2018-03-22 06:28:22 +01:00
|
|
|
@@ -1923,5 +1927,21 @@ public final class CraftServer implements Server {
|
2018-01-16 04:13:17 +01:00
|
|
|
public boolean suggestPlayerNamesWhenNullTabCompletions() {
|
|
|
|
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
|
|
|
|
+ return createProfile(uuid, null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull String name) {
|
|
|
|
+ return createProfile(null, name);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
|
2018-03-22 06:28:22 +01:00
|
|
|
+ Player player = uuid != null ? Bukkit.getPlayer(uuid) : (name != null ? Bukkit.getPlayerExact(name) : null);
|
|
|
|
+ if (player != null) {
|
|
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile((CraftPlayer)player);
|
|
|
|
+ }
|
2018-01-19 06:03:09 +01:00
|
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
|
2018-01-16 04:13:17 +01:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
2018-03-08 03:03:01 +01:00
|
|
|
2.16.2
|
2018-01-16 04:13:17 +01:00
|
|
|
|