Skip to content
Merged

Beta #33

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/me/waffles/additional/util/HypixelAPIUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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]";
Expand Down
Loading