Optimize GameProfile and add Identifiable interface

api/src/main/java/com/velocitypowered/api/proxy/Player.java

@@ -7,6 +7,7 @@ import com.velocitypowered.api.proxy.player.PlayerSettings;
 import com.velocitypowered.api.proxy.player.TabList;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.util.GameProfile;
+import com.velocitypowered.api.util.Identifiable;
 import com.velocitypowered.api.util.MessagePosition;
 import com.velocitypowered.api.util.ModInfo;
 import com.velocitypowered.api.util.title.Title;
@@ -19,7 +20,7 @@ import net.kyori.text.Component;
  * Represents a player who is connected to the proxy.
  */
 public interface Player extends CommandSource, InboundConnection, ChannelMessageSource,
-    ChannelMessageSink {
+    ChannelMessageSink, Identifiable {
 
   /**
    * Returns the player's current username.
@@ -28,13 +29,6 @@ public interface Player extends CommandSource, InboundConnection, ChannelMessage
    */
   String getUsername();
 
-  /**
-   * Returns the player's UUID.
-   *
-   * @return the UUID
-   */
-  UUID getUniqueId();
-
   /**
    * Returns the server that the player is currently connected to.
    *

api/src/main/java/com/velocitypowered/api/util/GameProfile.java

@@ -8,24 +8,36 @@ import java.util.UUID;
 /**
  * Represents a Mojang game profile. This class is immutable.
  */
-public final class GameProfile {
+public final class GameProfile implements Identifiable {
 
-  private final String id;
-  private final String name;
+  private final UUID id;
+  private final String undashedId, name;
   private final List<Property> properties;
 
-  public GameProfile(String id, String name, List<Property> properties) {
-    this.id = Preconditions.checkNotNull(id, "id");
-    this.name = Preconditions.checkNotNull(name, "name");
-    this.properties = ImmutableList.copyOf(properties);
+  public GameProfile(UUID id, String name, List<Property> properties) {
+    this(Preconditions.checkNotNull(id, "id"), UuidUtils.toUndashed(id),
+        Preconditions.checkNotNull(name, "name"), ImmutableList.copyOf(properties));
   }
 
-  public String getId() {
-    return id;
+  public GameProfile(String undashedId, String name, List<Property> properties) {
+    this(UuidUtils.fromUndashed(Preconditions.checkNotNull(undashedId, "undashedId")), undashedId,
+        Preconditions.checkNotNull(name, "name"), ImmutableList.copyOf(properties));
   }
 
-  public UUID idAsUuid() {
-    return UuidUtils.fromUndashed(id);
+  private GameProfile(UUID id, String undashedId, String name, List<Property> properties) {
+    this.id = id;
+    this.undashedId = undashedId;
+    this.name = name;
+    this.properties = properties;
+  }
+
+  @Override
+  public UUID getUniqueId() {
+    return this.id;
+  }
+
+  public String getUndashedId() {
+    return this.undashedId;
   }
 
   public String getName() {
@@ -36,6 +48,36 @@ public final class GameProfile {
     return properties;
   }
 
+  public GameProfile setUniqueId(UUID id) {
+    return new GameProfile(Preconditions.checkNotNull(id, "id"), UuidUtils.toUndashed(id),
+        this.name, this.properties);
+  }
+
+  public GameProfile setUndashedId(String undashedId) {
+    return new GameProfile(
+        UuidUtils.fromUndashed(Preconditions.checkNotNull(undashedId, "undashedId")), undashedId,
+        this.name, this.properties);
+  }
+
+  public GameProfile setName(String name) {
+    return new GameProfile(this.id, this.undashedId, Preconditions.checkNotNull(name, "name"),
+        this.properties);
+  }
+
+  public GameProfile setProperties(List<Property> properties) {
+    return new GameProfile(this.id, this.undashedId, this.name, ImmutableList.copyOf(properties));
+  }
+
+  public GameProfile addProperties(Iterable<Property> properties) {
+    return new GameProfile(this.id, this.undashedId, this.name,
+        ImmutableList.<Property>builder().addAll(this.properties).addAll(properties).build());
+  }
+
+  public GameProfile addProperty(Property property) {
+    return new GameProfile(this.id, this.undashedId, this.name,
+        ImmutableList.<Property>builder().addAll(this.properties).add(property).build());
+  }
+
   /**
    * Creates a game profile suitable for use in offline-mode.
    *
@@ -44,8 +86,8 @@ public final class GameProfile {
    */
   public static GameProfile forOfflinePlayer(String username) {
     Preconditions.checkNotNull(username, "username");
-    String id = UuidUtils.toUndashed(UuidUtils.generateOfflinePlayerUuid(username));
-    return new GameProfile(id, username, ImmutableList.of());
+    return new GameProfile(UuidUtils.generateOfflinePlayerUuid(username), username,
+        ImmutableList.of());
   }
 
   @Override

api/src/main/java/com/velocitypowered/api/util/Identifiable.java

@@ -0,0 +1,11 @@
+package com.velocitypowered.api.util;
+
+import java.util.UUID;
+
+/**
+ * Represents an object that can be identified by its UUID
+ */
+public interface Identifiable {
+
+	UUID getUniqueId();
+}