Levels page in Profile Viewer (#562)

* ughidontwannafigureouthowtousethis

* not finished

hgdt<

* Make use of new collections api in collectionspage

* final commit HOPEFULLY

* fix infer v1

* fix mithril powder going over cap

my beloved

* Formatting :thumbsup:

* More Formatting :thumbsup:

important

* ea sports

its in the game

* maybe fix cache

* change location of weight and networth and config option for weght

requested by alea

* Fix jump at CAP powder

* Code formatting and deleted unused variables.

* Used KUUDRA_TIERS array from CrimsonIslePage in SlayingTaskLevel.

* Used SLAYERS array from PROFILEVIEWER in SlayingTaskLevel.

* Intellij Code Cleanup.

* revert fun things

Please efe put formatting in another PR.

* fix issues

idk

* Import fixes and formatting. And an unnecessary empty space in 2.1.1 for jani.

* fix nea issue

---------

Co-authored-by: nea <nea@nea.moe>
Co-authored-by: jani270 <jani270@gmx.de>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

23 files changed, 2314 insertions, 874 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
index cf266dca..0d882358 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
@@ -19,6 +19,9 @@
 
 package io.github.moulberry.notenoughupdates.commands.dev;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.BuildFlags;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
@@ -34,6 +37,7 @@ import io.github.moulberry.notenoughupdates.util.PronounDB;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
 import io.github.moulberry.notenoughupdates.util.TabListUtils;
 import io.github.moulberry.notenoughupdates.util.Utils;
+import io.github.moulberry.notenoughupdates.util.hypixelapi.ProfileCollectionInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.command.CommandException;
@@ -122,6 +126,32 @@ public class DevTestCommand extends ClientCommandBase {
 			Utils.addChatMessage(EnumChatFormatting.RED + DEV_FAIL_STRINGS[devFailIndex++]);
 			return;
 		}
+		if (args.length == 1 && args[0].equalsIgnoreCase("testprofile")) {
+			NotEnoughUpdates.INSTANCE.manager.apiUtils.newHypixelApiRequest("skyblock/profiles")
+																								.queryArgument(
+																									"uuid",
+																									"" + Minecraft.getMinecraft().thePlayer.getUniqueID()
+																								)
+																								.requestJson()
+																								.thenApply(jsonObject -> {
+																									JsonArray profiles = jsonObject.get("profiles").getAsJsonArray();
+																									JsonObject cp = null;
+																									for (JsonElement profile : profiles) {
+																										JsonObject asJsonObject = profile.getAsJsonObject();
+																										if ((asJsonObject.has("selected") &&
+																											asJsonObject.get("selected").getAsBoolean()) || cp == null) {
+																											cp = asJsonObject;
+																										}
+																									}
+																									return cp;
+																								})
+																								.thenCompose(obj -> ProfileCollectionInfo.getCollectionData(
+																									obj,
+																									Minecraft.getMinecraft().thePlayer.getUniqueID().toString()
+																								))
+																								.thenAccept(it ->
+																									Utils.addChatMessage("Response: " + it));
+		}
 		if (args.length >= 1 && args[0].equalsIgnoreCase("profileinfo")) {
 			String currentProfile = SBInfo.getInstance().currentProfile;
 			SBInfo.Gamemode gamemode = SBInfo.getInstance().getGamemodeForProfile(currentProfile);
@@ -146,7 +176,8 @@ public class DevTestCommand extends ClientCommandBase {
 					Arrays.copyOfRange(args, 1, args.length)
 				);
 			}
-			Utils.addChatMessage("§e[NEU] §fYour external editor is: §Z" + NotEnoughUpdates.INSTANCE.config.hidden.externalEditor);
+			Utils.addChatMessage(
+				"§e[NEU] §fYour external editor is: §Z" + NotEnoughUpdates.INSTANCE.config.hidden.externalEditor);
 			return;
 		}
 		if (args.length >= 1 && args[0].equalsIgnoreCase("pricetest")) {
@@ -181,7 +212,8 @@ public class DevTestCommand extends ClientCommandBase {
 		}
 		if (args.length == 1 && args[0].equalsIgnoreCase("dev")) {
 			NotEnoughUpdates.INSTANCE.config.hidden.dev = !NotEnoughUpdates.INSTANCE.config.hidden.dev;
-			Utils.addChatMessage("§e[NEU] Dev mode " + (NotEnoughUpdates.INSTANCE.config.hidden.dev ? "§aenabled": "§cdisabled"));
+			Utils.addChatMessage(
+				"§e[NEU] Dev mode " + (NotEnoughUpdates.INSTANCE.config.hidden.dev ? "§aenabled" : "§cdisabled"));
 			return;
 		}
 		if (args.length == 1 && args[0].equalsIgnoreCase("saveconfig")) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java
index c19c4826..c7c118bb 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java
@@ -24,6 +24,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 
 import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Set;
@@ -71,7 +72,17 @@ public class StringUtils {
 		return shortNumberFormat(n, 0);
 	}
 
-	private static final char[] c = new char[] { 'k', 'm', 'b', 't' };
+	private static final char[] sizeSuffix = new char[]{'k', 'm', 'b', 't'};
+
+	public static String shortNumberFormat(BigInteger bigInteger) {
+		BigInteger THOUSAND = BigInteger.valueOf(1000);
+		int i = -1;
+		while (bigInteger.compareTo(THOUSAND) > 0 && i < sizeSuffix.length) {
+			bigInteger = bigInteger.divide(THOUSAND);
+			i++;
+		}
+		return bigInteger.toString() + (i == -1 ? "" : sizeSuffix[i]);
+	}
 
 	public static String shortNumberFormat(double n, int iteration) {
 		if (n < 1000) {
@@ -84,7 +95,7 @@ public class StringUtils {
 
 		double d = ((long) n / 100) / 10.0;
 		boolean isRound = (d * 10) % 10 == 0;
-		return d < 1000 ? (isRound || d > 9.99 ? (int) d * 10 / 10 : d + "") + "" + c[iteration] : shortNumberFormat(d, iteration + 1);
+		return d < 1000 ? (isRound || d > 9.99 ? (int) d * 10 / 10 : d + "") + "" + sizeSuffix[iteration] : shortNumberFormat(d, iteration + 1);
 	}
 
 	public static String urlEncode(String something) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java
index 30915daa..42a52639 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java
@@ -103,4 +103,12 @@ public class ProfileViewer {
 	)
 	@ConfigEditorBoolean
 	public boolean useSoopyNetworth = true;
+
+	@Expose
+	@ConfigOption(
+		name = "Display Weight",
+		desc = "Display Lily and Senither Weight in the Basic PV page"
+	)
+	@ConfigEditorBoolean
+	public boolean displayWeight = true;
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
index 47df3c6e..8a48dd2c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
@@ -19,13 +19,13 @@
 
 package io.github.moulberry.notenoughupdates.profileviewer;
 
-import com.google.common.base.Splitter;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.mojang.authlib.GameProfile;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.util.StringUtils;
+import io.github.moulberry.notenoughupdates.profileviewer.level.LevelPage;
 import io.github.moulberry.notenoughupdates.profileviewer.weight.lily.LilyWeight;
 import io.github.moulberry.notenoughupdates.profileviewer.weight.senither.SenitherWeight;
 import io.github.moulberry.notenoughupdates.util.Constants;
@@ -53,11 +53,12 @@ import org.apache.commons.lang3.text.WordUtils;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL14;
 
 import java.awt.*;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -72,6 +73,34 @@ import static io.github.moulberry.notenoughupdates.util.Utils.roundToNearestInt;
 public class BasicPage extends GuiProfileViewerPage {
 
 	private static final ResourceLocation pv_basic = new ResourceLocation("notenoughupdates:pv_basic.png");
+
+	public static final ItemStack skull = Utils.createSkull(
+		"egirlefe",
+		"152de44a-43a3-46e1-badc-66cca2793471",
+		"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODdkODg1YjMyYjBkZDJkNmI3ZjFiNTgyYTM0MTg2ZjhhNTM3M2M0NjU4OWEyNzM0MjMxMzJiNDQ4YjgwMzQ2MiJ9fX0="
+	);
+
+	private static final LinkedHashMap<String, ItemStack> dungeonsModeIcons = new LinkedHashMap<String, ItemStack>() {
+		{
+			put(
+				"first_page",
+				Utils.editItemStackInfo(
+					new ItemStack(Items.paper),
+					EnumChatFormatting.GRAY + "Front Page",
+					true
+				)
+			);
+			put(
+				"second_page",
+				Utils.editItemStackInfo(
+					skull,
+					EnumChatFormatting.GRAY + "Level Page",
+					true
+				)
+			);
+		}
+	};
+
 	private static final ExecutorService profileLoader = Executors.newFixedThreadPool(1);
 	public EntityOtherPlayerMP entityPlayer = null;
 	private ResourceLocation playerLocationSkin = null;
@@ -88,9 +117,14 @@ public class BasicPage extends GuiProfileViewerPage {
 
 	private int backgroundClickedX = -1;
 
+	private boolean onSecondPage;
+
+	private final LevelPage levelPage;
+
 	public BasicPage(GuiProfileViewer instance) {
 		super(instance);
 		this.guiProfileViewer = instance;
+		this.levelPage = new LevelPage(guiProfileViewer, this);
 	}
 
 	@Override
@@ -101,6 +135,11 @@ public class BasicPage extends GuiProfileViewerPage {
 		int guiLeft = GuiProfileViewer.getGuiLeft();
 		int guiTop = GuiProfileViewer.getGuiTop();
 
+		if (onSecondPage) {
+			levelPage.drawPage(mouseX, mouseY);
+			return;
+		}
+
 		String location = null;
 		JsonObject status = profile.getPlayerStatus();
 		if (status != null && status.has("mode")) {
@@ -280,7 +319,7 @@ public class BasicPage extends GuiProfileViewerPage {
 				EnumChatFormatting.GREEN + "Net Worth: " + EnumChatFormatting.GOLD +
 					GuiProfileViewer.numberFormat.format(networth),
 				fr,
-				guiLeft + 63,
+				guiLeft + 165,
 				guiTop + 38,
 				true,
 				0
@@ -297,11 +336,10 @@ public class BasicPage extends GuiProfileViewerPage {
 					);
 				String networthIRLMoney = GuiProfileViewer.numberFormat.format(Math.round(
 					((networthInCookies * 325) / 675) * 4.99));
-				if (
-					mouseX > guiLeft + 8 &&
-						mouseX < guiLeft + 8 + fr.getStringWidth("Net Worth: " + GuiProfileViewer.numberFormat.format(networth))
-				) {
-					if (mouseY > guiTop + 32 && mouseY < guiTop + 32 + fr.FONT_HEIGHT) {
+
+				int fontWidth = fr.getStringWidth("Net Worth: " + GuiProfileViewer.numberFormat.format(networth));
+				if (mouseX > guiLeft + 165 - fontWidth / 2 && mouseX < guiLeft + 165 + fontWidth / 2) {
+					if (mouseY > guiTop + 32 && mouseY < guiTop + 38 + fr.FONT_HEIGHT) {
 						getInstance().tooltipToDisplay = new ArrayList<>();
 						getInstance()
 							.tooltipToDisplay.add(
@@ -349,7 +387,7 @@ public class BasicPage extends GuiProfileViewerPage {
 			Utils.drawStringCentered(
 				EnumChatFormatting.GREEN + "Net Worth: " + stateStr,
 				fr,
-				guiLeft + 63,
+				guiLeft + 165,
 				guiTop + 38,
 				true,
 				0
@@ -534,116 +572,29 @@ public class BasicPage extends GuiProfileViewerPage {
 			);
 		}
 
-		PlayerStats.Stats stats = profile.getStats(profileId);
+		// sb lvlL
 
-		if (stats != null) {
-			Splitter splitter = Splitter.on(" ").omitEmptyStrings().limit(2);
-			for (int i = 0; i < PlayerStats.defaultStatNames.length; i++) {
-				String statName = PlayerStats.defaultStatNames[i];
-				//if (statName.equals("mining_fortune") || statName.equals("mining_speed")) continue;
-				String statNamePretty = PlayerStats.defaultStatNamesPretty[i];
+		int sbLevelX = guiLeft + 162;
+		int sbLevelY = guiTop + 90;
 
-				int val = Math.round(stats.get(statName));
+		double skyblockLevel = profile.getSkyblockLevel(profileId);
+		EnumChatFormatting skyblockLevelColour = profile.getSkyblockLevelColour(profileId);
 
-				GlStateManager.color(1, 1, 1, 1);
-				GlStateManager.enableBlend();
-				GL14.glBlendFuncSeparate(
-					GL11.GL_SRC_ALPHA,
-					GL11.GL_ONE_MINUS_SRC_ALPHA,
-					GL11.GL_ONE,
-					GL11.GL_ONE_MINUS_SRC_ALPHA
-				);
-				Utils.renderAlignedString(
-					statNamePretty,
-					EnumChatFormatting.WHITE.toString() + val,
-					guiLeft + 132,
-					guiTop + 21 + 11f * i,
-					80
-				);
+		GlStateManager.pushMatrix();
+		GlStateManager.translate(sbLevelX, sbLevelY, 0);
+		GlStateManager.scale(1.5f, 1.5f, 1);
+		Utils.drawItemStack(skull, 0, 0);
+		GlStateManager.popMatrix();
+		Utils.drawStringScaled(skyblockLevelColour.toString() + (int) skyblockLevel, fr,
+			sbLevelX - 2, sbLevelY - 15, true, 0, 1.5f
+		);
 
-				if (mouseX > guiLeft + 132 && mouseX < guiLeft + 212) {
-					if (mouseY > guiTop + 21 + 11f * i && mouseY < guiTop + 37 + 11f * i) {
-						List<String> split = splitter.splitToList(statNamePretty);
-						PlayerStats.Stats baseStats = PlayerStats.getBaseStats();
-						getInstance().tooltipToDisplay = new ArrayList<>();
-						getInstance().tooltipToDisplay.add(statNamePretty);
-						int base = Math.round(baseStats.get(statName));
-						getInstance()
-							.tooltipToDisplay.add(
-								EnumChatFormatting.GRAY +
-									"Base " +
-									split.get(1) +
-									": " +
-									EnumChatFormatting.GREEN +
-									base +
-									" " +
-									split.get(0)
-							);
-						int passive = Math.round(profile.getPassiveStats(profileId).get(statName) - baseStats.get(statName));
-						getInstance()
-							.tooltipToDisplay.add(
-								EnumChatFormatting.GRAY +
-									"Passive " +
-									split.get(1) +
-									" Bonus: +" +
-									EnumChatFormatting.YELLOW +
-									passive +
-									" " +
-									split.get(0)
-							);
-						int itemBonus = Math.round(stats.get(statName) - profile.getPassiveStats(profileId).get(statName));
-						getInstance()
-							.tooltipToDisplay.add(
-								EnumChatFormatting.GRAY +
-									"Item " +
-									split.get(1) +
-									" Bonus: +" +
-									EnumChatFormatting.DARK_PURPLE +
-									itemBonus +
-									" " +
-									split.get(0)
-							);
-						int finalStat = Math.round(stats.get(statName));
-						getInstance()
-							.tooltipToDisplay.add(
-								EnumChatFormatting.GRAY +
-									"Final " +
-									split.get(1) +
-									": +" +
-									EnumChatFormatting.RED +
-									finalStat +
-									" " +
-									split.get(0)
-							);
-					}
-				}
-			}
-		} else {
-			Utils.drawStringCentered(
-				EnumChatFormatting.RED + "Skill/Inv/Coll",
-				Minecraft.getMinecraft().fontRendererObj,
-				guiLeft + 172,
-				guiTop + 101 - 10,
-				true,
-				0
-			);
-			Utils.drawStringCentered(
-				EnumChatFormatting.RED + "APIs not",
-				Minecraft.getMinecraft().fontRendererObj,
-				guiLeft + 172,
-				guiTop + 101,
-				true,
-				0
-			);
-			Utils.drawStringCentered(
-				EnumChatFormatting.RED + "enabled!",
-				Minecraft.getMinecraft().fontRendererObj,
-				guiLeft + 172,
-				guiTop + 101 + 10,
-				true,
-				0
-			);
-		}
+		float progress = (float) (skyblockLevel - (long) skyblockLevel);
+		getInstance().renderBar(sbLevelX - 30, sbLevelY + 30, 80, progress);
+
+		Utils.drawStringScaled(EnumChatFormatting.YELLOW.toString() + (int) (progress * 100) + "/100", fr,
+			sbLevelX - 30, sbLevelY + 20, true, 0, 0.9f
+		);
 
 		if (skyblockInfo != null) {
 			int position = 0;
@@ -672,6 +623,12 @@ public class BasicPage extends GuiProfileViewerPage {
 					getInstance().renderBar(x, y + 6, 80, level.level % 1);
 				}
 
+				if (mouseX >= guiLeft + 128 && mouseX <= guiLeft + 216) {
+					if (mouseY >= guiTop + 69 && mouseY <= guiTop + 131) {
+						if (Mouse.isButtonDown(0)) onSecondPage = true;
+					}
+				}
+
 				if (mouseX > x && mouseX < x + 80) {
 					if (mouseY > y - 4 && mouseY < y + 13) {
 						getInstance().tooltipToDisplay = new ArrayList<>();
@@ -759,7 +716,8 @@ public class BasicPage extends GuiProfileViewerPage {
 			);
 		}
 
-		renderWeight(mouseX, mouseY, skyblockInfo, profileInfo);
+		drawSideButtons();
+		if (NotEnoughUpdates.INSTANCE.config.profileViewer.displayWeight) renderWeight(mouseX, mouseY, skyblockInfo, profileInfo);
 	}
 
 	private String getIcon(String gameModeType) {
@@ -830,14 +788,13 @@ public class BasicPage extends GuiProfileViewerPage {
 			weight = profile.getSoopyWeightLeaderboardPosition();
 		}
 
-
 		Utils.drawStringCentered(
 			EnumChatFormatting.GREEN +
 				"Senither Weight: " +
 				EnumChatFormatting.GOLD +
 				GuiProfileViewer.numberFormat.format(roundToNearestInt(senitherWeight.getTotalWeight().getRaw())),
 			fr,
-			guiLeft + 63,
+			guiLeft + 165,
 			guiTop + 18,
 			true,
 			0
@@ -847,7 +804,7 @@ public class BasicPage extends GuiProfileViewerPage {
 			"Senither Weight: " +
 				GuiProfileViewer.numberFormat.format(roundToNearestInt(senitherWeight.getTotalWeight().getRaw()))
 		);
-		if (mouseX > guiLeft + 63 - textWidth / 2 && mouseX < guiLeft + 63 + textWidth / 2) {
+		if (mouseX > guiLeft + 165 - textWidth / 2 && mouseX < guiLeft + 165 + textWidth / 2) {
 			if (mouseY > guiTop + 12 && mouseY < guiTop + 12 + fr.FONT_HEIGHT) {
 				getInstance().tooltipToDisplay = new ArrayList<>();
 				getInstance()
@@ -905,7 +862,7 @@ public class BasicPage extends GuiProfileViewerPage {
 				EnumChatFormatting.GOLD +
 				GuiProfileViewer.numberFormat.format(roundToNearestInt(lilyWeight.getTotalWeight().getRaw())),
 			fr,
-			guiLeft + 63,
+			guiLeft + 165,
 			guiTop + 28,
 			true,
 			0
@@ -914,7 +871,7 @@ public class BasicPage extends GuiProfileViewerPage {
 		int fontWidth = fr.getStringWidth(
 			"Lily Weight: " + GuiProfileViewer.numberFormat.format(roundToNearestInt(lilyWeight.getTotalWeight().getRaw()))
 		);
-		if (mouseX > guiLeft + 63 - fontWidth / 2 && mouseX < guiLeft + 63 + fontWidth / 2) {
+		if (mouseX > guiLeft + 165 - fontWidth / 2 && mouseX < guiLeft + 165 + fontWidth / 2) {
 			if (mouseY > guiTop + 22 && mouseY < guiTop + 22 + fr.FONT_HEIGHT) {
 				getInstance().tooltipToDisplay = new ArrayList<>();
 				getInstance()
@@ -992,10 +949,62 @@ public class BasicPage extends GuiProfileViewerPage {
 		GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
 	}
 
+	@Override
+	public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+		super.mouseClicked(mouseX, mouseY, mouseButton);
+		int guiLeft = GuiProfileViewer.getGuiLeft();
+		int guiTop = GuiProfileViewer.getGuiTop();
+
+		int i = onSlotToChangePage(mouseX, mouseY, guiLeft, guiTop);
+		switch (i) {
+			case 1:
+				onSecondPage = false;
+				break;
+			case 2:
+				onSecondPage = true;
+				break;
+
+			default:
+				break;
+		}
+
+		return false;
+	}
+
+	public int onSlotToChangePage(int mouseX, int mouseY, int guiLeft, int guiTop) {
+		if (mouseX >= guiLeft - 29 && mouseX <= guiLeft) {
+			if (mouseY >= guiTop && mouseY <= guiTop + 28) {
+				return 1;
+			} else if (mouseY + 28 >= guiTop && mouseY <= guiTop + 28 * 2) {
+				return 2;
+			}
+		}
+		return 0;
+	}
+
 	public String getGameModeType(JsonObject profileInfo) {
 		if (profileInfo != null && profileInfo.has("game_mode")) {
 			return profileInfo.get("game_mode").getAsString();
 		}
 		return "";
 	}
+
+	public void drawSideButtons() {
+		GlStateManager.enableDepth();
+		GlStateManager.translate(0, 0, 5);
+		if (onSecondPage) {
+			Utils.drawPvSideButton(1, dungeonsModeIcons.get("second_page"), true, guiProfileViewer);
+		} else {
+			Utils.drawPvSideButton(0, dungeonsModeIcons.get("first_page"), true, guiProfileViewer);
+		}
+		GlStateManager.translate(0, 0, -3);
+
+		GlStateManager.translate(0, 0, -2);
+		if (!onSecondPage) {
+			Utils.drawPvSideButton(1, dungeonsModeIcons.get("second_page"), false, guiProfileViewer);
+		} else {
+			Utils.drawPvSideButton(0, dungeonsModeIcons.get("first_page"), false, guiProfileViewer);
+		}
+		GlStateManager.disableDepth();
+	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/CollectionsPage.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/CollectionsPage.java
index 554e204c..45d9370b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/CollectionsPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/CollectionsPage.java
@@ -24,6 +24,7 @@ import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.util.StringUtils;
 import io.github.moulberry.notenoughupdates.util.Constants;
 import io.github.moulberry.notenoughupdates.util.Utils;
+import io.github.moulberry.notenoughupdates.util.hypixelapi.ProfileCollectionInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
@@ -35,6 +36,9 @@ import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -87,7 +91,8 @@ public class CollectionsPage extends GuiProfileViewerPage {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(pv_cols);
 		Utils.drawTexturedRect(guiLeft, guiTop, getInstance().sizeX, getInstance().sizeY, GL11.GL_NEAREST);
 
-		JsonObject collectionInfo = GuiProfileViewer.getProfile().getCollectionInfo(GuiProfileViewer.getProfileId());
+		ProfileCollectionInfo collectionInfo =
+			GuiProfileViewer.getProfile().getCollectionInfo(GuiProfileViewer.getProfileId());
 		if (collectionInfo == null) {
 			Utils.drawStringCentered(
 				EnumChatFormatting.RED + "Collection API not enabled!",
@@ -197,110 +202,114 @@ public class CollectionsPage extends GuiProfileViewerPage {
 			4210752
 		);
 
-		JsonObject minionTiers = collectionInfo.get("minion_tiers").getAsJsonObject();
-		JsonObject collectionTiers = collectionInfo.get("collection_tiers").getAsJsonObject();
-		JsonObject maxAmounts = collectionInfo.get("max_amounts").getAsJsonObject();
-		JsonObject totalAmounts = collectionInfo.get("total_amounts").getAsJsonObject();
-		JsonObject personalAmounts = collectionInfo.get("personal_amounts").getAsJsonObject();
-
 		if (collections != null) {
 			for (int i = page * 20, j = 0; i < Math.min((page + 1) * 20, collections.size()); i++, j++) {
 				String collection = collections.get(i);
-				if (collection != null) {
-					ItemStack collectionItem = ProfileViewer.getCollectionToCollectionDisplayMap().get(collection);
-					if (collectionItem != null) {
-						int xIndex = j % COLLS_XCOUNT;
-						int yIndex = j / COLLS_XCOUNT;
-
-						float x = 39 + COLLS_XPADDING + (COLLS_XPADDING + 20) * xIndex;
-						float y = 7 + COLLS_YPADDING + (COLLS_YPADDING + 20) * yIndex;
-
-						String tierString;
-						int tier = (int) Utils.getElementAsFloat(collectionTiers.get(collection), 0);
-						if (tier > 20 || tier < 0) {
-							tierString = String.valueOf(tier);
-						} else {
-							tierString = romans[tier];
-						}
-						float amount = Utils.getElementAsFloat(totalAmounts.get(collection), 0);
-						float maxAmount = Utils.getElementAsFloat(maxAmounts.get(collection), 0);
-						Color color = new Color(128, 128, 128, 255);
-						int tierStringColour = color.getRGB();
-						float completedness = 0;
-						if (maxAmount > 0) {
-							completedness = amount / maxAmount;
-						}
-						completedness = Math.min(1, completedness);
-						if (maxAmounts.has(collection) && completedness >= 1) {
-							tierStringColour = new Color(255, 215, 0).getRGB();
-						}
-
-						GlStateManager.color(1, 1, 1, 1);
-						Minecraft.getMinecraft().getTextureManager().bindTexture(pv_elements);
-						Utils.drawTexturedRect(
-							guiLeft + x,
-							guiTop + y,
-							20,