Introduce a PlayerInfo class with the uuid and player name

Author: BlockyTheDev

common/src/main/java/io/github/communityradargg/forgemod/util/CommonHandler.java

@@ -16,6 +16,7 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -151,10 +152,11 @@ public void setOnGrieferGames(final boolean isLocal, final @Nullable SocketAddre
         }
 
         // Checking if there is a player with same name in the loaded world. If so, returning UUID from EntityPlayer.
-        final Optional<UUID> playerUuid = versionBridge.getPlayerUuidByNameFromWorld(playerName);
-        if (playerUuid.isPresent()) {
-            UUID_NAME_CACHE.put(playerName, playerUuid.get());
-            return CompletableFuture.completedFuture(playerUuid);
+        for (final PlayerInfo playerInfo : versionBridge.getWorldPlayers()) {
+            if (playerInfo.getPlayerName().equalsIgnoreCase(playerName) && playerInfo.getUuid() != null) {
+                UUID_NAME_CACHE.put(playerName, playerInfo.getUuid());
+                return CompletableFuture.completedFuture(Optional.of(playerInfo.getUuid()));
+            }
         }
 
         if (playerName.startsWith("!") || playerName.startsWith("~")) {
@@ -228,6 +230,15 @@ public void addMessageToChat(final @NotNull String message) {
         versionBridge.addMessageToChat(message);
     }
 
+    /**
+     * Gets the player info data for all players in the current world.
+     *
+     * @return Returns the player info data.
+     */
+    public @NotNull List<@NotNull PlayerInfo> getWorldPlayers() {
+        return versionBridge.getWorldPlayers();
+    }
+
     /**
      * Gets the list manager.
      *

common/src/main/java/io/github/communityradargg/forgemod/util/PlayerInfo.java

@@ -0,0 +1,42 @@
+package io.github.communityradargg.forgemod.util;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import java.util.UUID;
+
+/**
+ * Holds the general player info.
+ */
+public class PlayerInfo {
+    private final UUID uuid;
+    private final String playerName;
+
+    /**
+     * Constructs a {@link PlayerInfo}.
+     *
+     * @param uuid The uuid.
+     * @param playerName The player name.
+     */
+    public PlayerInfo(final @Nullable UUID uuid, final @NotNull String playerName) {
+        this.uuid = uuid;
+        this.playerName = playerName;
+    }
+
+    /**
+     * Gets the uuid.
+     *
+     * @return Returns the uuid.
+     */
+    public @Nullable UUID getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Gets the player name.
+     *
+     * @return Returns the player name.
+     */
+    public @NotNull String getPlayerName() {
+        return playerName;
+    }
+}

common/src/main/java/io/github/communityradargg/forgemod/util/VersionBridge.java

@@ -1,8 +1,7 @@
 package io.github.communityradargg.forgemod.util;
 
 import org.jetbrains.annotations.NotNull;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.List;
 
 public interface VersionBridge {
     @NotNull String getVersion();
@@ -11,5 +10,5 @@ public interface VersionBridge {
 
     boolean isNotInWorld();
 
-    Optional<UUID> getPlayerUuidByNameFromWorld(final @NotNull String playerName);
+    @NotNull List<@NotNull PlayerInfo> getWorldPlayers();
 }

versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/util/VersionBridgeImpl.java

@@ -1,16 +1,17 @@
 package io.github.communityradargg.forgemod.util;
 
+import com.mojang.authlib.GameProfile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class VersionBridgeImpl implements VersionBridge {
     private static final Logger LOGGER = LogManager.getLogger(VersionBridgeImpl.class);
@@ -41,17 +42,17 @@ public boolean isNotInWorld() {
     }
 
     @Override
-    public Optional<UUID> getPlayerUuidByNameFromWorld(final @NotNull String playerName) {
+    public @NotNull List<@NotNull PlayerInfo> getWorldPlayers() {
         final NetHandlerPlayClient connection = Minecraft.getMinecraft().getConnection();
         if (connection == null) {
-            return Optional.empty();
+            return Collections.emptyList();
         }
 
-        for (final NetworkPlayerInfo networkPlayerInfo : connection.getPlayerInfoMap()) {
-            if (networkPlayerInfo.getGameProfile().getName().equalsIgnoreCase(playerName)) {
-                return Optional.of(networkPlayerInfo.getGameProfile().getId());
-            }
-        }
-        return Optional.empty();
+        return connection.getPlayerInfoMap().stream()
+                .map(networkPlayerInfo -> {
+                    final GameProfile gameProfile = networkPlayerInfo.getGameProfile();
+                    return new PlayerInfo(gameProfile.getId(), gameProfile.getName());
+                })
+                .collect(Collectors.toList());
     }
 }

versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/util/VersionBridgeImpl.java

@@ -1,16 +1,17 @@
 package io.github.communityradargg.forgemod.util;
 
+import com.mojang.authlib.GameProfile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.util.ChatComponentText;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class VersionBridgeImpl implements VersionBridge {
     private static final Logger LOGGER = LogManager.getLogger(VersionBridgeImpl.class);
@@ -41,17 +42,17 @@ public boolean isNotInWorld() {
     }
 
     @Override
-    public Optional<UUID> getPlayerUuidByNameFromWorld(final @NotNull String playerName) {
+    public @NotNull List<@NotNull PlayerInfo> getWorldPlayers() {
         final NetHandlerPlayClient connection = Minecraft.getMinecraft().getNetHandler();
         if (connection == null) {
-            return Optional.empty();
+            return Collections.emptyList();
         }
 
-        for (final NetworkPlayerInfo networkPlayerInfo : connection.getPlayerInfoMap()) {
-            if (networkPlayerInfo.getGameProfile().getName().equalsIgnoreCase(playerName)) {
-                return Optional.of(networkPlayerInfo.getGameProfile().getId());
-            }
-        }
-        return Optional.empty();
+        return connection.getPlayerInfoMap().stream()
+                .map(networkPlayerInfo -> {
+                    final GameProfile gameProfile = networkPlayerInfo.getGameProfile();
+                    return new PlayerInfo(gameProfile.getId(), gameProfile.getName());
+                })
+                .collect(Collectors.toList());
     }
 }