more cleanup and resource pack api fixes

patches/api/Player.setPlayerProfile-API.patch

@@ -97,30 +97,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
-      */
-     boolean hasResourcePack();
-+
+     }
+     // Paper end
+ 
++    // Paper start - Player Profile API
 +    /**
 +     * Gets a copy of this players profile
++     *
 +     * @return The players profile object
 +     */
-+    @NotNull
-+    com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile();
++    com.destroystokyo.paper.profile.@NotNull PlayerProfile getPlayerProfile();
 +
 +    /**
 +     * Changes the PlayerProfile for this player. This will cause this player
-+     * to be reregistered to all clients that can currently see this player.
-+     *
++     * to be re-registered to all clients that can currently see this player.
++     * <p>
 +     * After executing this method, the player {@link java.util.UUID} won't
-+     * be swapped, only their name and gameprofile properties.
++     * be swapped, only their name and profile properties.
 +     *
 +     * @param profile The new profile to use
 +     */
-+    void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
-     // Paper end
- 
++    void setPlayerProfile(com.destroystokyo.paper.profile.@NotNull PlayerProfile profile);
++    // Paper end - Player Profile API
++
      // Spigot start
+     public class Spigot extends Entity.Spigot {
+ 
 diff --git a/src/main/java/org/bukkit/profile/PlayerProfile.java b/src/main/java/org/bukkit/profile/PlayerProfile.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/profile/PlayerProfile.java