Move baltop up to work with null player

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.extendedclip.papi.expansion.essentials</groupId>
   <artifactId>essentials-expansion</artifactId>
-  <version>1.5.1</version>
+  <version>1.5.0</version>
   <name>PAPI-Expansion-Essentials</name>
   <description>PlaceholderAPI expansion for Essentials placeholders</description>
     

src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java

@@ -25,7 +25,6 @@ import com.earth2me.essentials.Kit;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.DescParseTickFormat;
-
 import com.google.common.primitives.Ints;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -41,9 +40,10 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
-
-import java.util.concurrent.TimeUnit;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.StreamSupport;
 
 public class EssentialsExpansion extends PlaceholderExpansion {
@@ -102,8 +102,8 @@ public class EssentialsExpansion extends PlaceholderExpansion {
         final String papiTrue = PlaceholderAPIPlugin.booleanTrue();
         final String papiFalse = PlaceholderAPIPlugin.booleanFalse();
 
-        // Put this before the null check as most of it is not required
         if (identifier.startsWith("baltop_")) {
+            BalanceTop baltop = essentials.getBalanceTop();
             Map<UUID, BalanceTop.Entry> baltopCache = baltop.getBalanceTopCache();
             identifier = identifier.substring(7);
 
@@ -170,13 +170,6 @@ public class EssentialsExpansion extends PlaceholderExpansion {
             if (identifier.startsWith("player_")) {
                 identifier = identifier.substring(7);
 
-                boolean stripped = false;
-
-                if (identifier.startsWith("stripped_")) {
-                    identifier = identifier.substring(9);
-                    stripped = true;
-                }
-
                 Integer id = Ints.tryParse(identifier);
                 if (id == null) {
                     return "Invalid ID";
@@ -186,48 +179,16 @@ public class EssentialsExpansion extends PlaceholderExpansion {
                 if (id >= entries.length) {
                     return "0";
                 }
-
-                if (stripped) {
-                    User user = essentials.getUser(entries[id].getUuid());
-                    if (user != null) {
-                        return user.getName();
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return entries[id].getDisplayName();
-                }
-            }
-
-            if (identifier.equals("rank")) {
-                // Another null check because it is above the normal one
-                if (player == null) return "";
-
-                if (!baltopCache.containsKey(player.getUniqueId())) {
-                    return "";
-                }
-
-                return String.valueOf(new ArrayList<>(baltopCache.keySet()).indexOf(player.getUniqueId()) + 1);
+                return entries[id].getDisplayName();
             }
 
             return null;
         }
 
+
+
         if (player == null) return "";
 
-        if (identifier.equals("tp_cooldown")) {
-            final double cooldown = essentials.getSettings().getTeleportCooldown();
-
-            final long d1 = System.currentTimeMillis();
-            final long d2 = essentials.getUser(player.getUniqueId()).getLastTeleportTimestamp();
-
-            long diff = TimeUnit.MILLISECONDS.toSeconds(d1 - d2);
-
-            if(diff < cooldown) return String.valueOf((int) (cooldown - diff));
-
-            return "0";
-        }
-
         if (identifier.startsWith("kit_last_use_")) {
             String kitName = identifier.split("kit_last_use_")[1].toLowerCase();
             Kit kit;
@@ -329,10 +290,10 @@ public class EssentialsExpansion extends PlaceholderExpansion {
             if (homeNumber >= user.getHomes().size() || homeNumber < 0) return "";
 
             // checks if the identifier matches the pattern home_%d
-            if (identifier.matches("(\\w+_)(\\d+)")) return user.getHomes().get(homeNumber);
+            if (identifier.matches("(\\w+_)(\\d)")) return user.getHomes().get(homeNumber);
 
             //checks if the identifier matches the pattern home_%d_(x/y/z)
-            if (identifier.matches("(\\w+_)(\\d+)(_\\w)")) {
+            if (identifier.matches("(\\w+_)(\\d)(_\\w)")) {
 
                 try {
                     final Location home = user.getHome(user.getHomes().get(homeNumber));
@@ -340,13 +301,13 @@ public class EssentialsExpansion extends PlaceholderExpansion {
 
                     switch (identifier.charAt(identifier.length() - 1)) {
                         case 'x':
-                            stringBuilder.append(home.getX());
+                            stringBuilder.append(home.getX()).append(".5");
                             break;
                         case 'y':
                             stringBuilder.append((int) home.getY());
                             break;
                         case 'z':
-                            stringBuilder.append(home.getZ());
+                            stringBuilder.append(home.getZ()).append(".5");
                             break;
                     }