Return UUID instead of String in Player#getUUID()

Author: MrSlimeDiamond

lib/src/main/java/org/galliumpowered/database/Database.java

@@ -76,7 +76,7 @@ public void open() throws SQLException {
      */
     public void insertPlayer(Player player) {
         try {
-            insertPlayer.setString(1, player.getUUID());
+            insertPlayer.setString(1, player.getUUID().toString());
             insertPlayer.execute();
         } catch (SQLException e) {
             throw new GalliumDatabaseException(e);
@@ -103,7 +103,7 @@ public void insertGroup(Group group) {
      */
 
     public boolean playerExists(Player player) throws SQLException {
-        getPlayer.setString(1, player.getUUID());
+        getPlayer.setString(1, player.getUUID().toString());
         ResultSet rs = getPlayer.executeQuery();
         return rs.next();
     }
@@ -120,7 +120,7 @@ public void setPlayerGroup(Player player, @Nullable Group group) throws SQLExcep
         } else {
             setGroup.setString(1, group.getName());
         }
-        setGroup.setString(2, player.getUUID());
+        setGroup.setString(2, player.getUUID().toString());
         setGroup.execute();
     }
 
@@ -132,7 +132,7 @@ public void setPlayerGroup(Player player, @Nullable Group group) throws SQLExcep
     public Optional<Group> getPlayerGroup(Player player) {
         log.debug("getting player group");
         try {
-            getPlayerGroup.setString(1, player.getUUID());
+            getPlayerGroup.setString(1, player.getUUID().toString());
             ResultSet rs = getPlayerGroup.executeQuery();
             if (rs.next()) {
                 log.debug("a");
@@ -149,7 +149,7 @@ public Optional<Group> getPlayerGroup(Player player) {
     public ArrayList<String> getPlayerPermissions(Player player) {
         try {
             ArrayList<String> permissions = new ArrayList();
-            getPlayerPermisions.setString(1, player.getUUID());
+            getPlayerPermisions.setString(1, player.getUUID().toString());
             ResultSet rs = getPlayerPermisions.executeQuery();
             while (rs.next()) {
                 permissions.add(rs.getString("node"));
@@ -200,7 +200,7 @@ public void setGroupPrefix(Group group, String prefix) throws SQLException {
     // FIXME
     public String getPlayerPrefix(Player player) {
         try {
-            getPlayerPrefix.setString(1, player.getUUID());
+            getPlayerPrefix.setString(1, player.getUUID().toString());
             ResultSet rs = getPlayerPrefix.executeQuery();
             if (rs.next()) {
                 // Get from player
@@ -229,7 +229,7 @@ public String getPlayerPrefix(Player player) {
      */
     public void setPlayerPrefix(Player player, String prefix) throws SQLException {
         setPlayerPrefix.setString(2, prefix);
-        setPlayerPrefix.setString(1, player.getUUID());
+        setPlayerPrefix.setString(1, player.getUUID().toString());
         setPlayerPrefix.execute();
     }
 
@@ -267,7 +267,7 @@ public void removePermission(String permission, PermissionHolder owner) throws S
     public boolean playerHasPermission(String permission, Player player) throws SQLException {
         log.debug("called playerHasPermission (Database)");
         hasPermission.setString(1, permission);
-        hasPermission.setString(2, player.getUUID());
+        hasPermission.setString(2, player.getUUID().toString());
         ResultSet rs = hasPermission.executeQuery();
         return rs.next();
     }

lib/src/main/java/org/galliumpowered/world/entity/Player.java

@@ -14,13 +14,14 @@
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.UUID;
 
 public interface Player extends Entity, CommandCaller, PermissionHolder, PaginationListAudience {
     /**
      * Get the player's UUID
      * @return the uuid
      */
-    String getUUID();
+    UUID getUUID();
 
     /**
      * Whether the player has a permission

server/src/main/java/org/galliumpowered/world/entity/PlayerImpl.java

@@ -15,7 +15,6 @@
 import org.galliumpowered.util.TextTransformer;
 
 import javax.annotation.Nullable;
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -29,8 +28,8 @@ public PlayerImpl(ServerPlayer serverPlayer) {
     }
 
     @Override
-    public String getUUID() {
-        return serverPlayer.getUUID().toString().strip();
+    public UUID getUUID() {
+        return serverPlayer.getUUID();
     }
 
     @Override
@@ -86,7 +85,7 @@ public World getWorld() {
     @Override
     public boolean isOnline() {
         return Mod.getMinecraftServer().getPlayerList().getPlayers().stream()
-                .anyMatch(player -> player.getUUID().equals(UUID.fromString(getUUID())));
+                .anyMatch(player -> player.getUUID().equals(getUUID()));
     }
 
     @Override
@@ -119,6 +118,6 @@ public int getMaxChatLines() {
 
     @Override
     public String getPaginationIdentifier() {
-        return getUUID();
+        return getUUID().toString();
     }
 }