From 7292245b554a49e2098d5517f9934d309ad3e14f Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Sun, 22 Sep 2019 14:41:30 -0500
Subject: [PATCH] Rename PlayerByUsername to NearbyPlayer

---
 .../{PlayerByUsername.java => NearbyPlayer.java}      | 11 ++++++++---
 .../utils/command/defaults/FollowCommand.java         |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename src/api/java/baritone/api/utils/command/datatypes/{PlayerByUsername.java => NearbyPlayer.java} (86%)

diff --git a/src/api/java/baritone/api/utils/command/datatypes/PlayerByUsername.java b/src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java
similarity index 86%
rename from src/api/java/baritone/api/utils/command/datatypes/PlayerByUsername.java
rename to src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java
index 0912c74d..b3411587 100644
--- a/src/api/java/baritone/api/utils/command/datatypes/PlayerByUsername.java
+++ b/src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java
@@ -18,6 +18,7 @@
 package baritone.api.utils.command.datatypes;
 
 import baritone.api.BaritoneAPI;
+import baritone.api.IBaritone;
 import baritone.api.utils.command.exception.CommandException;
 import baritone.api.utils.command.helpers.arguments.ArgConsumer;
 import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
@@ -26,17 +27,21 @@ import net.minecraft.entity.player.EntityPlayer;
 import java.util.List;
 import java.util.stream.Stream;
 
-public class PlayerByUsername implements IDatatypeFor<EntityPlayer> {
+/**
+ * An {@link IDatatype} used to resolve nearby players, those within
+ * render distance of the target {@link IBaritone} instance.
+ */
+public class NearbyPlayer implements IDatatypeFor<EntityPlayer> {
 
     private final List<EntityPlayer> players =
             BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext().world().playerEntities;
     public final EntityPlayer player;
 
-    public PlayerByUsername() {
+    public NearbyPlayer() {
         player = null;
     }
 
-    public PlayerByUsername(ArgConsumer consumer) throws CommandException {
+    public NearbyPlayer(ArgConsumer consumer) throws CommandException {
         String username = consumer.getString();
         player = players
                 .stream()
diff --git a/src/main/java/baritone/utils/command/defaults/FollowCommand.java b/src/main/java/baritone/utils/command/defaults/FollowCommand.java
index b22613b9..6f3dc0b6 100644
--- a/src/main/java/baritone/utils/command/defaults/FollowCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/FollowCommand.java
@@ -18,12 +18,11 @@
 package baritone.utils.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.Settings;
 import baritone.api.utils.command.Command;
 import baritone.api.utils.command.datatypes.EntityClassById;
 import baritone.api.utils.command.datatypes.IDatatype;
 import baritone.api.utils.command.datatypes.IDatatypeFor;
-import baritone.api.utils.command.datatypes.PlayerByUsername;
+import baritone.api.utils.command.datatypes.NearbyPlayer;
 import baritone.api.utils.command.exception.CommandException;
 import baritone.api.utils.command.helpers.arguments.ArgConsumer;
 import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
@@ -147,7 +146,7 @@ public class FollowCommand extends Command {
 
     private enum FollowList {
         ENTITY(EntityClassById.class),
-        PLAYER(PlayerByUsername.class);
+        PLAYER(NearbyPlayer.class);
         final Class<? extends IDatatypeFor> datatype;
 
         FollowList(Class<? extends IDatatypeFor> datatype) {