diff --git a/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java b/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java index 77a1804..e9094a7 100644 --- a/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java +++ b/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java @@ -127,8 +127,7 @@ public String fetchPlayerGuildData(String uuid) { ); } - public PlayerProfile fetchPlayerProfileData(String uuid) - throws IOException { + public PlayerProfile fetchPlayerProfileData(String uuid) { String stjson = fetchPlayerData(uuid); String guild = fetchPlayerGuildData(uuid); if (stjson == null || stjson.isEmpty() || guild == null || guild.isEmpty()) { diff --git a/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java b/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java index 7622ca4..df1f7e4 100644 --- a/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java +++ b/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java @@ -64,7 +64,7 @@ public static PlayerProfile parsePlayerProfilePlayerData(String json, String gui JsonObject rootObject = new JsonParser().parse(json).getAsJsonObject(); JsonObject guildObject = new JsonParser().parse(guild).getAsJsonObject(); -// saveJsonObject(guildObject, "blank"); // debugging stuff +// saveJsonObject(rootObject, "blank"); // debugging stuff JsonObject profile; @@ -97,11 +97,13 @@ public static PlayerProfile parsePlayerProfilePlayerData(String json, String gui tag = tag.replaceAll("✧", "✧") .replaceAll("Θ", "Θ") .replaceAll("✌", "✌") - .replaceAll("â?¤", "❤") .replaceAll("✿", "✿") .replaceAll("✪", "✪") .replaceAll("➊", "➊") - .replaceAll("✖", "✖"); + .replaceAll("✖", "✖") + .replaceAll("â?¤", "❤") + .replaceAll("✓", "✓") + .replaceAll("[^a-zA-Z0-9✧θ✌✿✪➊✖❤✓]", ""); } String tagColor = guildObject.has("tagColor") @@ -223,7 +225,9 @@ else if (newPackageRank != null && newPackageRank.equals("MVP_PLUS") && rankPlus } else { return "§b[MVP" + color + "+" + "§b]"; } - } else if (newPackageRank != null && newPackageRank.equals("MVP_PLUS")) return "§b[MVP§c+§b]"; + } + else if (newPackageRank != null && newPackageRank.equals("MVP_PLUS") && monthlyPackageRank != null && monthlyPackageRank.equals("SUPERSTAR")) return "§6[MVP§c++§6]"; + else if (newPackageRank != null && newPackageRank.equals("MVP_PLUS")) return "§b[MVP§c+§b]"; else if (newPackageRank != null && newPackageRank.equals("MVP")) return "§b[MVP]"; else if (newPackageRank != null && newPackageRank.equals("VIP_PLUS")) return "§a[VIP§6+§a]"; else if (newPackageRank != null && newPackageRank.equals("VIP")) return "§a[VIP]";