feat: show more data on NPCStats

Author: ArikSquad

commons/src/main/java/net/swofty/commons/bedwars/BedwarsLevelUtil.java

@@ -1,7 +1,19 @@
 package net.swofty.commons.bedwars;
 
+import java.text.DecimalFormat;
+
 public class BedwarsLevelUtil {
 
+    private static final DecimalFormat FORMAT = new DecimalFormat("#,###.#");
+
+    public static String suffix(double value) {
+        if (value < 1000) {
+            return FORMAT.format(value);
+        } else {
+            return FORMAT.format(value / 1000) + "k";
+        }
+    }
+
     public static int calculateMaxExperienceFromLevel(int level) {
         int multiplier = level % 100;
         if (multiplier > 5) {

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/BedWarsLobbyScoreboard.java

@@ -6,25 +6,24 @@
 import net.minestom.server.scoreboard.Sidebar;
 import net.minestom.server.timer.Scheduler;
 import net.minestom.server.timer.TaskSchedule;
-import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
-import net.swofty.type.generic.data.handlers.BedWarsDataHandler;
 import net.swofty.commons.bedwars.BedwarsLevelColor;
 import net.swofty.commons.bedwars.BedwarsLevelUtil;
 import net.swofty.type.generic.HypixelConst;
 import net.swofty.type.generic.HypixelGenericLoader;
 import net.swofty.type.generic.data.HypixelDataHandler;
-import net.swofty.type.generic.data.datapoints.DatapointLong;
+import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
+import net.swofty.type.generic.data.handlers.BedWarsDataHandler;
 import net.swofty.type.generic.user.HypixelPlayer;
 
-import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import static net.swofty.commons.bedwars.BedwarsLevelUtil.suffix;
+
 public class BedWarsLobbyScoreboard {
-	private static final DecimalFormat FORMAT = new DecimalFormat("#,###.#");
 	private static final Map<UUID, Sidebar> sidebarCache = new HashMap<>();
 	private static Integer prototypeName = 0;
 
@@ -72,7 +71,7 @@ public static void start() {
 				addLine("§7 ", sidebar);
 				addLine("§fLevel: §7" + BedwarsLevelColor.constructLevelString(BedwarsLevelUtil.calculateLevel(experience)), sidebar);
 				addLine("§7 ", sidebar);
-				addLine("§fProgress: §b" + suffix(progress) + "§7/" + suffix(maxExperience), sidebar);
+				addLine("§fProgress: §b" + suffix(progress) + "§7/§a" + suffix(maxExperience), sidebar);
 				addLine(progressBar.toString(), sidebar);
 				addLine("§7 ", sidebar);
 				addLine("§fTokens: §2" + bwDataHandler.get(BedWarsDataHandler.Data.TOKENS, DatapointLeaderboardLong.class).getValue(), sidebar);
@@ -122,12 +121,4 @@ private static String getSidebarName(int counter) {
 		}
 	}
 
-	private static String suffix(double value) {
-		if (value < 1000) {
-			return FORMAT.format(value);
-		} else {
-			return FORMAT.format(value / 1000) + "k";
-		}
-	}
-
 }

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/events/ActionPlayerChat.java

@@ -2,13 +2,13 @@
 
 import net.minestom.server.event.player.PlayerChatEvent;
 import net.swofty.commons.StringUtility;
-import net.swofty.type.generic.data.handlers.BedWarsDataHandler;
 import net.swofty.commons.bedwars.BedwarsLevelColor;
 import net.swofty.commons.bedwars.BedwarsLevelUtil;
 import net.swofty.type.generic.HypixelGenericLoader;
 import net.swofty.type.generic.data.HypixelDataHandler;
 import net.swofty.type.generic.data.datapoints.DatapointChatType;
-import net.swofty.type.generic.data.datapoints.DatapointLong;
+import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
+import net.swofty.type.generic.data.handlers.BedWarsDataHandler;
 import net.swofty.type.generic.event.EventNodes;
 import net.swofty.type.generic.event.HypixelEvent;
 import net.swofty.type.generic.event.HypixelEventClass;
@@ -58,7 +58,7 @@ public void run(PlayerChatEvent event) {
         List<HypixelPlayer> receivers = HypixelGenericLoader.getLoadedPlayers();
 
         String levelPrefix = BedwarsLevelColor.constructLevelBrackets(
-                BedwarsLevelUtil.calculateLevel(bedWarsDataHandler.get(BedWarsDataHandler.Data.EXPERIENCE, DatapointLong.class).getValue())
+                BedwarsLevelUtil.calculateLevel(bedWarsDataHandler.get(BedWarsDataHandler.Data.EXPERIENCE, DatapointLeaderboardLong.class).getValue())
         ) + " ";
 
         receivers.forEach(onlinePlayer -> {

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCStats.java

@@ -3,23 +3,40 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
+import net.swofty.commons.bedwars.BedwarsLevelColor;
+import net.swofty.commons.bedwars.BedwarsLevelUtil;
+import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
+import net.swofty.type.generic.data.handlers.BedWarsDataHandler;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
 import net.swofty.type.generic.user.HypixelPlayer;
 
+import static net.swofty.commons.bedwars.BedwarsLevelUtil.suffix;
+
 public class NPCStats extends HypixelNPC {
 
 	public NPCStats() {
 		super(new HumanConfiguration() {
 			@Override
 			public String[] holograms(HypixelPlayer player) {
+				BedWarsDataHandler handler = BedWarsDataHandler.getUser(player);
+				int level = 0;
+				int progress = 0;
+				int maxExperience = 0;
+				long experience = 0;
+				if (handler != null) {
+					experience = handler.get(BedWarsDataHandler.Data.EXPERIENCE, DatapointLeaderboardLong.class).getValue();
+					level = BedwarsLevelUtil.calculateLevel(experience);
+					progress = BedwarsLevelUtil.calculateExperienceSinceLastLevel(experience);
+					maxExperience = BedwarsLevelUtil.calculateMaxExperienceFromExperience(experience);
+				}
 				return new String[]{
 						"§6§lBed Wars Profile",
-						"§fYour Level: ",
-						"§fProgress: ",
-						"§fAchievements: ",
-						"§fTotal Wins: ",
-						"§fCurrent Winstreak: §a0",
+						"§fYour Level: " + BedwarsLevelColor.constructLevelBrackets(level),
+						"§fProgress: §b" + suffix(progress) + "§7/§a" + suffix(maxExperience),
+						"§fAchievements: §e" + 0 + "§a/" + 0,
+						"§fTotal Wins: §a" + 0,
+						"§fCurrent Winstreak: §a" + 0,
 						"§e§lCLICK FOR STATS",
 				};
 			}