2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 15 Jan 2018 22:11:48 -0500
|
|
|
|
Subject: [PATCH] Basic PlayerProfile API
|
|
|
|
|
|
|
|
Establishes base extension of profile systems for future edits too
|
|
|
|
|
2022-11-20 00:53:20 +01:00
|
|
|
== AT ==
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftProfileProperty
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftPlayerTextures
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftPlayerTextures copyFrom(Lorg/bukkit/profile/PlayerTextures;)V
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftPlayerTextures rebuildPropertyIfDirty()V
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftPlayerProfile toString(Lcom/mojang/authlib/properties/PropertyMap;)Ljava/lang/String;
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftPlayerProfile getProperty(Ljava/lang/String;)Lcom/mojang/authlib/properties/Property;
|
|
|
|
public org.bukkit.craftbukkit.profile.CraftPlayerProfile setProperty(Ljava/lang/String;Lcom/mojang/authlib/properties/Property;)V
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
|
|
|
new file mode 100644
|
2024-03-20 22:47:50 +01:00
|
|
|
index 0000000000000000000000000000000000000000..68c99e29450e318d2b6eb83099e3e4012b6f0c01
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
2024-03-20 22:47:50 +01:00
|
|
|
@@ -0,0 +1,412 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
2023-09-22 19:43:52 +02:00
|
|
|
+import com.mojang.authlib.yggdrasil.ProfileResult;
|
2022-06-09 10:51:45 +02:00
|
|
|
+import io.papermc.paper.configuration.GlobalConfiguration;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import com.google.common.base.Charsets;
|
2022-02-12 14:20:33 +01:00
|
|
|
+import com.google.common.collect.Iterables;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import com.mojang.authlib.GameProfile;
|
|
|
|
+import com.mojang.authlib.properties.Property;
|
|
|
|
+import com.mojang.authlib.properties.PropertyMap;
|
2022-02-12 14:20:33 +01:00
|
|
|
+import net.minecraft.Util;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import net.minecraft.server.MinecraftServer;
|
|
|
|
+import net.minecraft.server.players.GameProfileCache;
|
2023-09-22 19:43:52 +02:00
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import org.apache.commons.lang3.Validate;
|
2022-02-12 19:29:41 +01:00
|
|
|
+import org.bukkit.configuration.serialization.SerializableAs;
|
|
|
|
+import org.bukkit.craftbukkit.configuration.ConfigSerializationUtil;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import org.bukkit.craftbukkit.entity.CraftPlayer;
|
2022-02-12 14:20:33 +01:00
|
|
|
+import org.bukkit.craftbukkit.profile.CraftPlayerTextures;
|
|
|
|
+import org.bukkit.craftbukkit.profile.CraftProfileProperty;
|
|
|
|
+import org.bukkit.profile.PlayerTextures;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+import javax.annotation.Nonnull;
|
|
|
|
+import javax.annotation.Nullable;
|
2022-02-12 14:20:33 +01:00
|
|
|
+import java.util.*;
|
|
|
|
+import java.util.concurrent.CompletableFuture;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2022-02-12 19:29:41 +01:00
|
|
|
+@SerializableAs("PlayerProfile")
|
2022-02-12 14:20:33 +01:00
|
|
|
+public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ private GameProfile profile;
|
|
|
|
+ private final PropertySet properties = new PropertySet();
|
|
|
|
+
|
|
|
|
+ public CraftPlayerProfile(CraftPlayer player) {
|
|
|
|
+ this.profile = player.getHandle().getGameProfile();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public CraftPlayerProfile(UUID id, String name) {
|
2023-10-12 03:20:25 +02:00
|
|
|
+ this.profile = createAuthLibProfile(id, name);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public CraftPlayerProfile(GameProfile profile) {
|
|
|
|
+ Validate.notNull(profile, "GameProfile cannot be null!");
|
|
|
|
+ this.profile = profile;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean hasProperty(String property) {
|
|
|
|
+ return profile.getProperties().containsKey(property);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ 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()));
|
|
|
|
+ }
|
|
|
|
+
|
2022-02-12 14:20:33 +01:00
|
|
|
+ @Override
|
|
|
|
+ public CraftPlayerTextures getTextures() {
|
|
|
|
+ return new CraftPlayerTextures(this);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setTextures(@Nullable PlayerTextures textures) {
|
|
|
|
+ if (textures == null) {
|
|
|
|
+ this.removeProperty("textures");
|
|
|
|
+ } else {
|
|
|
|
+ CraftPlayerTextures craftPlayerTextures = new CraftPlayerTextures(this);
|
|
|
|
+ craftPlayerTextures.copyFrom(textures);
|
|
|
|
+ craftPlayerTextures.rebuildPropertyIfDirty();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public GameProfile getGameProfile() {
|
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public UUID getId() {
|
2023-10-05 07:31:24 +02:00
|
|
|
+ return profile.getId().equals(Util.NIL_UUID) ? null : profile.getId();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2022-02-12 19:29:41 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public UUID setId(@Nullable UUID uuid) {
|
2023-10-05 07:31:24 +02:00
|
|
|
+ final GameProfile previousProfile = this.profile;
|
|
|
|
+ final UUID previousId = this.getId();
|
2023-10-12 03:20:25 +02:00
|
|
|
+ this.profile = createAuthLibProfile(uuid, previousProfile.getName());
|
2023-10-05 07:31:24 +02:00
|
|
|
+ copyProfileProperties(previousProfile, this.profile);
|
|
|
|
+ return previousId;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
2022-02-12 14:20:33 +01:00
|
|
|
+ @Override
|
|
|
|
+ public UUID getUniqueId() {
|
|
|
|
+ return getId();
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public String getName() {
|
|
|
|
+ return profile.getName();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2022-02-12 19:29:41 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public String setName(@Nullable String name) {
|
|
|
|
+ GameProfile prev = this.profile;
|
2023-10-12 03:20:25 +02:00
|
|
|
+ this.profile = createAuthLibProfile(prev.getId(), name);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ copyProfileProperties(prev, this.profile);
|
|
|
|
+ return prev.getName();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nonnull
|
|
|
|
+ @Override
|
|
|
|
+ public Set<ProfileProperty> getProperties() {
|
|
|
|
+ return properties;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setProperties(Collection<ProfileProperty> properties) {
|
|
|
|
+ properties.forEach(this::setProperty);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void clearProperties() {
|
|
|
|
+ profile.getProperties().clear();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean removeProperty(String property) {
|
|
|
|
+ return !profile.getProperties().removeAll(property).isEmpty();
|
|
|
|
+ }
|
|
|
|
+
|
2022-02-12 14:20:33 +01:00
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public Property getProperty(String property) {
|
|
|
|
+ return Iterables.getFirst(this.profile.getProperties().get(property), null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public void setProperty(@NotNull String propertyName, @Nullable Property property) {
|
|
|
|
+ PropertyMap properties = profile.getProperties();
|
|
|
|
+ properties.removeAll(propertyName);
|
|
|
|
+ if (property != null) {
|
|
|
|
+ properties.put(propertyName, property);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @NotNull GameProfile buildGameProfile() {
|
|
|
|
+ GameProfile profile = new GameProfile(this.profile.getId(), this.profile.getName());
|
|
|
|
+ profile.getProperties().putAll(this.profile.getProperties());
|
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Override
|
|
|
|
+ public CraftPlayerProfile clone() {
|
|
|
|
+ CraftPlayerProfile clone = new CraftPlayerProfile(this.getId(), this.getName());
|
|
|
|
+ clone.setProperties(getProperties());
|
|
|
|
+ return clone;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isComplete() {
|
2023-09-22 19:43:52 +02:00
|
|
|
+ return this.getId() != null && StringUtils.isNotBlank(this.getName());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2022-07-19 08:06:59 +02:00
|
|
|
+ public @NotNull CompletableFuture<PlayerProfile> update() {
|
2022-02-12 14:20:33 +01:00
|
|
|
+ return CompletableFuture.supplyAsync(() -> {
|
|
|
|
+ final CraftPlayerProfile clone = clone();
|
|
|
|
+ clone.complete(true);
|
|
|
|
+ return clone;
|
2022-07-03 23:55:56 +02:00
|
|
|
+ }, Util.PROFILE_EXECUTOR);
|
2022-02-12 14:20:33 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public boolean completeFromCache() {
|
2022-06-09 10:51:45 +02:00
|
|
|
+ return completeFromCache(false, GlobalConfiguration.get().proxies.isProxyOnlineMode());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean completeFromCache(boolean onlineMode) {
|
|
|
|
+ return completeFromCache(false, onlineMode);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean completeFromCache(boolean lookupUUID, boolean onlineMode) {
|
|
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
|
|
+ String name = profile.getName();
|
|
|
|
+ GameProfileCache userCache = server.getProfileCache();
|
2023-10-05 07:31:24 +02:00
|
|
|
+ if (this.getId() == null) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ final GameProfile profile;
|
|
|
|
+ if (onlineMode) {
|
2021-07-07 08:52:40 +02:00
|
|
|
+ profile = lookupUUID ? userCache.get(name).orElse(null) : userCache.getProfileIfCached(name);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } 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);
|
|
|
|
+ }
|
|
|
|
+ if (profile != null) {
|
|
|
|
+ // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
|
|
|
|
+ copyProfileProperties(this.profile, profile);
|
|
|
|
+ this.profile = profile;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2023-10-05 07:31:24 +02:00
|
|
|
+ if ((profile.getName().isEmpty() || !hasTextures()) && this.getId() != null) {
|
2021-07-07 08:52:40 +02:00
|
|
|
+ Optional<GameProfile> optProfile = userCache.get(this.profile.getId());
|
|
|
|
+ if (optProfile.isPresent()) {
|
|
|
|
+ GameProfile profile = optProfile.get();
|
2023-10-05 07:31:24 +02:00
|
|
|
+ if (this.profile.getName().isEmpty()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
|
|
|
|
+ copyProfileProperties(this.profile, profile);
|
|
|
|
+ this.profile = profile;
|
2024-03-20 22:47:50 +01:00
|
|
|
+ } else if (profile != this.profile) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ copyProfileProperties(profile, this.profile);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
2023-09-22 19:43:52 +02:00
|
|
|
+ return this.isComplete();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean complete(boolean textures) {
|
2022-06-09 10:51:45 +02:00
|
|
|
+ return complete(textures, GlobalConfiguration.get().proxies.isProxyOnlineMode());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ public boolean complete(boolean textures, boolean onlineMode) {
|
|
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
|
|
+ boolean isCompleteFromCache = this.completeFromCache(true, onlineMode);
|
|
|
|
+ if (onlineMode && (!isCompleteFromCache || textures && !hasTextures())) {
|
2023-09-22 19:43:52 +02:00
|
|
|
+ ProfileResult result = server.getSessionService().fetchProfile(this.getId(), true);
|
|
|
|
+ if (result != null && result.profile() != null) {
|
|
|
|
+ copyProfileProperties(result.profile(), this.profile, true);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2023-09-22 19:43:52 +02:00
|
|
|
+ if (this.isComplete()) {
|
2021-06-12 13:18:01 +02:00
|
|
|
+ server.getProfileCache().add(this.profile);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
2023-09-22 19:43:52 +02:00
|
|
|
+ return this.isComplete() && (!onlineMode || !textures || hasTextures());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static void copyProfileProperties(GameProfile source, GameProfile target) {
|
|
|
|
+ copyProfileProperties(source, target, false);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static void copyProfileProperties(GameProfile source, GameProfile target, boolean clearTarget) {
|
2024-03-20 22:47:50 +01:00
|
|
|
+ if (source == target) {
|
|
|
|
+ throw new IllegalArgumentException("Source and target profiles are the same (" + source + ")");
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ PropertyMap sourceProperties = source.getProperties();
|
|
|
|
+ PropertyMap targetProperties = target.getProperties();
|
|
|
|
+ if (clearTarget) targetProperties.clear();
|
|
|
|
+ if (sourceProperties.isEmpty()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (Property property : sourceProperties.values()) {
|
2023-09-22 19:43:52 +02:00
|
|
|
+ targetProperties.removeAll(property.name());
|
|
|
|
+ targetProperties.put(property.name(), property);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2023-10-12 03:20:25 +02:00
|
|
|
+ private static GameProfile createAuthLibProfile(UUID uniqueId, String name) {
|
|
|
|
+ return new GameProfile(
|
|
|
|
+ uniqueId != null ? uniqueId : Util.NIL_UUID,
|
|
|
|
+ name != null ? name : ""
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ private static ProfileProperty toBukkit(Property property) {
|
2023-09-22 19:43:52 +02:00
|
|
|
+ return new ProfileProperty(property.name(), property.value(), property.signature());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static PlayerProfile asBukkitCopy(GameProfile gameProfile) {
|
|
|
|
+ CraftPlayerProfile profile = new CraftPlayerProfile(gameProfile.getId(), gameProfile.getName());
|
|
|
|
+ copyProfileProperties(gameProfile, profile.profile);
|
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static PlayerProfile asBukkitMirror(GameProfile profile) {
|
|
|
|
+ return new CraftPlayerProfile(profile);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static Property asAuthlib(ProfileProperty property) {
|
|
|
|
+ return new Property(property.getName(), property.getValue(), property.getSignature());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ 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();
|
|
|
|
+ }
|
|
|
|
+
|
2022-02-12 14:20:33 +01:00
|
|
|
+ @Override
|
|
|
|
+ public @NotNull Map<String, Object> serialize() {
|
|
|
|
+ Map<String, Object> map = new LinkedHashMap<>();
|
|
|
|
+ if (this.getId() != null) {
|
|
|
|
+ map.put("uniqueId", this.getId().toString());
|
|
|
|
+ }
|
2023-10-05 07:31:24 +02:00
|
|
|
+ if (!this.getName().isEmpty()) {
|
2022-02-12 14:20:33 +01:00
|
|
|
+ map.put("name", getName());
|
|
|
|
+ }
|
|
|
|
+ if (!this.properties.isEmpty()) {
|
|
|
|
+ List<Object> propertiesData = new ArrayList<>();
|
|
|
|
+ for (ProfileProperty property : properties) {
|
|
|
|
+ propertiesData.add(CraftProfileProperty.serialize(new Property(property.getName(), property.getValue(), property.getSignature())));
|
|
|
|
+ }
|
|
|
|
+ map.put("properties", propertiesData);
|
|
|
|
+ }
|
|
|
|
+ return map;
|
|
|
|
+ }
|
|
|
|
+
|
2022-02-12 19:29:41 +01:00
|
|
|
+ public static CraftPlayerProfile deserialize(Map<String, Object> map) {
|
|
|
|
+ UUID uniqueId = ConfigSerializationUtil.getUuid(map, "uniqueId", true);
|
|
|
|
+ String name = ConfigSerializationUtil.getString(map, "name", true);
|
|
|
|
+
|
|
|
|
+ // This also validates the deserialized unique id and name (ensures that not both are null):
|
|
|
|
+ CraftPlayerProfile profile = new CraftPlayerProfile(uniqueId, name);
|
|
|
|
+
|
|
|
|
+ if (map.containsKey("properties")) {
|
|
|
|
+ for (Object propertyData : (List<?>) map.get("properties")) {
|
|
|
|
+ if (!(propertyData instanceof Map)) {
|
|
|
|
+ throw new IllegalArgumentException("Property data (" + propertyData + ") is not a valid Map");
|
|
|
|
+ }
|
|
|
|
+ Property property = CraftProfileProperty.deserialize((Map<?, ?>) propertyData);
|
2023-09-22 19:43:52 +02:00
|
|
|
+ profile.profile.getProperties().put(property.name(), property);
|
2022-02-12 19:29:41 +01:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return profile;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean equals(Object obj) {
|
|
|
|
+ if (this == obj) return true;
|
|
|
|
+ if (!(obj instanceof CraftPlayerProfile otherProfile)) return false;
|
|
|
|
+ return Objects.equals(this.profile, otherProfile.profile);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String toString() {
|
|
|
|
+ return "CraftPlayerProfile [uniqueId=" + getId() +
|
|
|
|
+ ", name=" + getName() +
|
|
|
|
+ ", properties=" + org.bukkit.craftbukkit.profile.CraftPlayerProfile.toString(this.profile.getProperties()) +
|
|
|
|
+ "]";
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int hashCode() {
|
|
|
|
+ return this.profile.hashCode();
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ private class PropertySet extends AbstractSet<ProfileProperty> {
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ @Nonnull
|
|
|
|
+ public Iterator<ProfileProperty> iterator() {
|
|
|
|
+ return new ProfilePropertyIterator(profile.getProperties().values().iterator());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ 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();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
|
|
|
|
new file mode 100644
|
2023-09-22 19:31:02 +02:00
|
|
|
index 0000000000000000000000000000000000000000..48e774677edf17d4a99ae9ed23d1b371dab41abb
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
|
2023-09-22 04:31:59 +02:00
|
|
|
@@ -0,0 +1,30 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
2023-09-22 04:31:59 +02:00
|
|
|
+import com.mojang.authlib.Environment;
|
|
|
|
+import com.mojang.authlib.EnvironmentParser;
|
|
|
|
+import com.mojang.authlib.GameProfileRepository;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
|
|
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
|
|
+import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
|
|
|
|
+
|
|
|
|
+import java.net.Proxy;
|
|
|
|
+
|
|
|
|
+public class PaperAuthenticationService extends YggdrasilAuthenticationService {
|
2023-09-22 04:31:59 +02:00
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ private final Environment environment;
|
2023-09-22 04:31:59 +02:00
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public PaperAuthenticationService(Proxy proxy) {
|
|
|
|
+ super(proxy);
|
2021-11-23 15:03:50 +01:00
|
|
|
+ this.environment = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public MinecraftSessionService createMinecraftSessionService() {
|
2023-09-22 19:31:02 +02:00
|
|
|
+ return new PaperMinecraftSessionService(this.getServicesKeySet(), this.getProxy(), this.environment);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public GameProfileRepository createProfileRepository() {
|
2023-09-22 04:31:59 +02:00
|
|
|
+ return new PaperGameProfileRepository(this.getProxy(), this.environment);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
|
|
|
|
new file mode 100644
|
2023-09-22 04:31:59 +02:00
|
|
|
index 0000000000000000000000000000000000000000..7b9e797b42c88b17d6a7c590a423f4e85d99a59d
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
|
2023-09-22 04:31:59 +02:00
|
|
|
@@ -0,0 +1,17 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
|
|
|
+import com.mojang.authlib.Environment;
|
|
|
|
+import com.mojang.authlib.ProfileLookupCallback;
|
|
|
|
+import com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository;
|
2023-09-22 04:31:59 +02:00
|
|
|
+import java.net.Proxy;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+public class PaperGameProfileRepository extends YggdrasilGameProfileRepository {
|
2023-09-22 04:31:59 +02:00
|
|
|
+ public PaperGameProfileRepository(Proxy proxy, Environment environment) {
|
|
|
|
+ super(proxy, environment);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2023-09-22 04:31:59 +02:00
|
|
|
+ public void findProfilesByNames(String[] names, ProfileLookupCallback callback) {
|
|
|
|
+ super.findProfilesByNames(names, callback);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
|
|
|
|
new file mode 100644
|
2023-12-06 20:10:59 +01:00
|
|
|
index 0000000000000000000000000000000000000000..985e6fc43a0946943847e0c283426242ef594a26
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
|
2023-12-06 20:10:59 +01:00
|
|
|
@@ -0,0 +1,22 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
|
|
|
+import com.mojang.authlib.Environment;
|
2023-09-22 04:31:59 +02:00
|
|
|
+import com.mojang.authlib.yggdrasil.ProfileResult;
|
|
|
|
+import com.mojang.authlib.yggdrasil.ServicesKeySet;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
|
|
|
|
+
|
2023-09-22 04:31:59 +02:00
|
|
|
+import java.net.Proxy;
|
|
|
|
+import java.util.UUID;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionService {
|
2023-09-22 04:31:59 +02:00
|
|
|
+
|
|
|
|
+ protected PaperMinecraftSessionService(ServicesKeySet servicesKeySet, Proxy proxy, Environment environment) {
|
|
|
|
+ super(servicesKeySet, proxy, environment);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2023-09-22 04:31:59 +02:00
|
|
|
+ public @Nullable ProfileResult fetchProfile(final UUID profileId, final boolean requireSecure) {
|
|
|
|
+ return super.fetchProfile(profileId, requireSecure);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
2022-02-12 14:20:33 +01:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/SharedPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/SharedPlayerProfile.java
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000000000000000000000000000000000000..7ac27392a8647ef7d0dc78efe78703e993885017
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/SharedPlayerProfile.java
|
|
|
|
@@ -0,0 +1,23 @@
|
|
|
|
+package com.destroystokyo.paper.profile;
|
|
|
|
+
|
|
|
|
+import com.mojang.authlib.GameProfile;
|
|
|
|
+import com.mojang.authlib.properties.Property;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
|
|
|
+
|
|
|
|
+import java.util.UUID;
|
|
|
|
+
|
|
|
|
+public interface SharedPlayerProfile {
|
|
|
|
+
|
|
|
|
+ @Nullable UUID getUniqueId();
|
|
|
|
+
|
|
|
|
+ @Nullable String getName();
|
|
|
|
+
|
|
|
|
+ boolean removeProperty(@NotNull String property);
|
|
|
|
+
|
|
|
|
+ @Nullable Property getProperty(@NotNull String propertyName);
|
|
|
|
+
|
|
|
|
+ @Nullable void setProperty(@NotNull String propertyName, @Nullable Property property);
|
|
|
|
+
|
|
|
|
+ @NotNull GameProfile buildGameProfile();
|
|
|
|
+}
|
2022-10-24 21:43:46 +02:00
|
|
|
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
|
2024-03-03 22:40:18 +01:00
|
|
|
index 722dcae9ab65bcacb9fb89dfaa63715d87816476..c57e8b6458800fe9bb27050eecc42bd3e5cf5a15 100644
|
2022-10-24 21:43:46 +02:00
|
|
|
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
|
|
|
|
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
|
2021-06-12 13:18:01 +02:00
|
|
|
@@ -1,5 +1,7 @@
|
2022-10-24 21:43:46 +02:00
|
|
|
package io.papermc.paper.util;
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
+import com.destroystokyo.paper.profile.CraftPlayerProfile;
|
|
|
|
+import com.destroystokyo.paper.profile.PlayerProfile;
|
2024-03-03 22:40:18 +01:00
|
|
|
import com.google.common.collect.ImmutableList;
|
2021-06-11 14:02:28 +02:00
|
|
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
2023-08-16 09:58:07 +02:00
|
|
|
import io.papermc.paper.math.BlockPosition;
|
2024-03-03 22:40:18 +01:00
|
|
|
@@ -18,6 +20,7 @@ import net.minecraft.world.level.ClipContext;
|
2024-01-24 13:07:40 +01:00
|
|
|
import net.minecraft.world.level.Level;
|
2023-08-16 09:58:07 +02:00
|
|
|
import net.minecraft.world.phys.Vec3;
|
2021-06-11 14:02:28 +02:00
|
|
|
import org.apache.commons.lang.exception.ExceptionUtils;
|
|
|
|
+import com.mojang.authlib.GameProfile;
|
|
|
|
import org.bukkit.Location;
|
|
|
|
import org.bukkit.block.BlockFace;
|
|
|
|
import org.bukkit.craftbukkit.CraftWorld;
|
2024-03-03 22:40:18 +01:00
|
|
|
@@ -363,6 +366,10 @@ public final class MCUtil {
|
2021-06-11 14:02:28 +02:00
|
|
|
return run.get();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public static PlayerProfile toBukkit(GameProfile profile) {
|
|
|
|
+ return CraftPlayerProfile.asBukkitMirror(profile);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Calculates distance between 2 entities
|
|
|
|
* @param e1
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
2024-01-24 13:07:40 +01:00
|
|
|
index ba58580f4c60205d1c7a7b7dfcdc22c4fafc9bc6..5374a6b70a9780cfe9f62207b290b9a3ab82c7e9 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -176,7 +176,7 @@ public class Main {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
File file = (File) optionset.valueOf("universe"); // CraftBukkit
|
2024-01-13 21:31:02 +01:00
|
|
|
- Services services = Services.create(new YggdrasilAuthenticationService(Proxy.NO_PROXY), file, optionset); // Paper - pass OptionSet to load paper config files
|
|
|
|
+ Services services = Services.create(new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY), file, optionset); // Paper - pass OptionSet to load paper config files; override authentication service
|
2022-06-07 22:12:48 +02:00
|
|
|
// CraftBukkit start
|
|
|
|
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
|
|
|
|
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2024-01-23 15:43:48 +01:00
|
|
|
index adb472c175cc6f6ced7075a37423d6c898fd5ccb..1ec0f3a7148c2f412421772f6e1dff0bb92a51bc 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2023-12-28 21:47:57 +01:00
|
|
|
@@ -126,6 +126,17 @@ public class GameProfileCache {
|
2021-07-07 08:52:40 +02:00
|
|
|
return this.operationCount.incrementAndGet();
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
2022-03-18 04:53:36 +01:00
|
|
|
+ public @Nullable GameProfile getProfileIfCached(String name) {
|
2021-06-12 13:18:01 +02:00
|
|
|
+ GameProfileCache.GameProfileInfo entry = this.profilesByName.get(name.toLowerCase(Locale.ROOT));
|
2022-03-18 03:44:45 +01:00
|
|
|
+ if (entry == null) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ entry.setLastAccess(this.getNextOperation());
|
|
|
|
+ return entry.getProfile();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2022-03-18 04:53:36 +01:00
|
|
|
public Optional<GameProfile> get(String name) {
|
2021-07-07 08:52:40 +02:00
|
|
|
String s1 = name.toLowerCase(Locale.ROOT);
|
|
|
|
GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index f7d937c6a11e24afe767411428210f3c042a6f78..eb3bb76cf141991acd6a384bf461719de8392754 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -262,6 +262,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
|
|
|
|
|
|
|
|
+import javax.annotation.Nullable; // Paper
|
|
|
|
+import javax.annotation.Nonnull; // Paper
|
|
|
|
+
|
|
|
|
public final class CraftServer implements Server {
|
|
|
|
private final String serverName = "Paper"; // Paper
|
|
|
|
private final String serverVersion;
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -305,6 +308,7 @@ public final class CraftServer implements Server {
|
2022-02-12 19:29:41 +01:00
|
|
|
static {
|
|
|
|
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
|
|
|
|
ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
|
|
|
|
+ ConfigurationSerialization.registerClass(com.destroystokyo.paper.profile.CraftPlayerProfile.class); // Paper
|
|
|
|
CraftItemFactory.instance();
|
|
|
|
}
|
|
|
|
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -2782,5 +2786,42 @@ public final class CraftServer implements Server {
|
2021-06-11 14:02:28 +02:00
|
|
|
public boolean suggestPlayerNamesWhenNullTabCompletions() {
|
2022-06-09 10:51:45 +02:00
|
|
|
return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
|
|
|
|
+ return createProfile(uuid, null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull String name) {
|
|
|
|
+ return createProfile(null, name);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
|
|
|
|
+ Player player = uuid != null ? Bukkit.getPlayer(uuid) : (name != null ? Bukkit.getPlayerExact(name) : null);
|
2022-04-22 20:54:08 +02:00
|
|
|
+ if (player != null) return new com.destroystokyo.paper.profile.CraftPlayerProfile((CraftPlayer) player);
|
|
|
|
+
|
|
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
|
|
|
|
+ Player player = uuid != null ? Bukkit.getPlayer(uuid) : (name != null ? Bukkit.getPlayerExact(name) : null);
|
2023-10-05 07:31:24 +02:00
|
|
|
+ if (player == null) {
|
|
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
|
|
|
|
+ }
|
2022-03-19 14:39:38 +01:00
|
|
|
+
|
2023-03-14 23:13:41 +01:00
|
|
|
+ if (java.util.Objects.equals(uuid, player.getUniqueId()) && java.util.Objects.equals(name, player.getName())) {
|
2022-03-19 14:39:38 +01:00
|
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile((CraftPlayer) player);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2022-03-19 14:39:38 +01:00
|
|
|
+
|
2023-10-05 07:31:24 +02:00
|
|
|
+ final com.mojang.authlib.GameProfile profile = new com.mojang.authlib.GameProfile(
|
|
|
|
+ uuid != null ? uuid : net.minecraft.Util.NIL_UUID,
|
|
|
|
+ name != null ? name : ""
|
|
|
|
+ );
|
|
|
|
+ profile.getProperties().putAll(((CraftPlayer) player).getHandle().getGameProfile().getProperties());
|
2022-03-19 14:39:38 +01:00
|
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
2022-02-12 14:20:33 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
|
2024-01-23 15:43:48 +01:00
|
|
|
index edd340c66ea8cec1c76ba29f1deab14c4784a7e5..6f779c6f4422c5b5dc22f66e3e702c714d0e052b 100644
|
2022-02-12 14:20:33 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -28,7 +28,7 @@ import org.bukkit.profile.PlayerProfile;
|
2022-02-12 14:20:33 +01:00
|
|
|
import org.bukkit.profile.PlayerTextures;
|
|
|
|
|
|
|
|
@SerializableAs("PlayerProfile")
|
|
|
|
-public final class CraftPlayerProfile implements PlayerProfile {
|
|
|
|
+public final class CraftPlayerProfile implements PlayerProfile, com.destroystokyo.paper.profile.SharedPlayerProfile { // Paper
|
|
|
|
|
|
|
|
@Nonnull
|
|
|
|
public static GameProfile validateSkullProfile(@Nonnull GameProfile gameProfile) {
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -93,8 +93,10 @@ public final class CraftPlayerProfile implements PlayerProfile {
|
2022-02-12 14:20:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- void removeProperty(String propertyName) {
|
|
|
|
- this.properties.removeAll(propertyName);
|
|
|
|
+ // Paper start - change return value for shared interface
|
|
|
|
+ public boolean removeProperty(String propertyName) {
|
|
|
|
+ return !this.properties.removeAll(propertyName).isEmpty();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
2022-02-12 14:20:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void rebuildDirtyProperties() {
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -237,6 +239,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
|
2022-02-12 19:29:41 +01:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Map<String, Object> serialize() {
|
|
|
|
+ // Paper - diff on change
|
|
|
|
Map<String, Object> map = new LinkedHashMap<>();
|
2023-09-23 04:06:03 +02:00
|
|
|
if (this.getUniqueId() != null) {
|
|
|
|
map.put("uniqueId", this.getUniqueId().toString());
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -252,10 +255,12 @@ public final class CraftPlayerProfile implements PlayerProfile {
|
2022-02-12 19:29:41 +01:00
|
|
|
});
|
|
|
|
map.put("properties", propertiesData);
|
|
|
|
}
|
|
|
|
+ // Paper - diff on change
|
|
|
|
return map;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static CraftPlayerProfile deserialize(Map<String, Object> map) {
|
|
|
|
+ // Paper - diff on change
|
|
|
|
UUID uniqueId = ConfigSerializationUtil.getUuid(map, "uniqueId", true);
|
|
|
|
String name = ConfigSerializationUtil.getString(map, "name", true);
|
|
|
|
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -269,7 +274,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
|
2023-09-21 22:35:39 +02:00
|
|
|
profile.properties.put(property.name(), property);
|
2022-02-12 19:29:41 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+ // Paper - diff on change
|
|
|
|
return profile;
|
|
|
|
}
|
|
|
|
}
|
2022-02-12 14:20:33 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerTextures.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerTextures.java
|
2023-11-11 21:25:45 +01:00
|
|
|
index 78e47fec27f4dd955632d03f7181682af0429961..0dce455fb47b3f5a2eb2b15a1cdbc4c6a54b7b69 100644
|
2022-02-12 14:20:33 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerTextures.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerTextures.java
|
2022-02-18 18:30:37 +01:00
|
|
|
@@ -48,7 +48,7 @@ public final class CraftPlayerTextures implements PlayerTextures {
|
2022-02-12 14:20:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- private final CraftPlayerProfile profile;
|
|
|
|
+ private final com.destroystokyo.paper.profile.SharedPlayerProfile profile; // Paper
|
|
|
|
|
|
|
|
// The textures data is loaded lazily:
|
|
|
|
private boolean loaded = false;
|
2022-02-18 18:30:37 +01:00
|
|
|
@@ -67,7 +67,7 @@ public final class CraftPlayerTextures implements PlayerTextures {
|
2022-02-12 14:20:33 +01:00
|
|
|
// GameProfiles (even if these modifications are later reverted).
|
|
|
|
private boolean dirty = false;
|
|
|
|
|
|
|
|
- CraftPlayerTextures(@Nonnull CraftPlayerProfile profile) {
|
|
|
|
+ public CraftPlayerTextures(@Nonnull com.destroystokyo.paper.profile.SharedPlayerProfile profile) { // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
this.profile = profile;
|
|
|
|
}
|
2022-02-12 14:20:33 +01:00
|
|
|
|