Merge pull request #268 from NotEnoughUpdates/master

2.1 Continued

1 files changed, 874 insertions, 698 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
index 674f08af..4aeafb9e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package io.github.moulberry.notenoughupdates.profileviewer;
 
 import com.google.gson.JsonArray;
@@ -20,230 +39,419 @@ import net.minecraft.util.EnumChatFormatting;
 import javax.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class ProfileViewer {
-	private final NEUManager manager;
-
-	public ProfileViewer(NEUManager manager) {
-		this.manager = manager;
-	}
-
-	private static final HashMap<String, String> petRarityToNumMap = new HashMap<String, String>() {{
-		put("COMMON", "0");
-		put("UNCOMMON", "1");
-		put("RARE", "2");
-		put("EPIC", "3");
-		put("LEGENDARY", "4");
-		put("MYTHIC", "5");
-	}};
 
+	private static final HashMap<String, String> petRarityToNumMap = new HashMap<String, String>() {
+		{
+			put("COMMON", "0");
+			put("UNCOMMON", "1");
+			put("RARE", "2");
+			put("EPIC", "3");
+			put("LEGENDARY", "4");
+			put("MYTHIC", "5");
+		}
+	};
 	private static final LinkedHashMap<String, ItemStack> skillToSkillDisplayMap =
-		new LinkedHashMap<String, ItemStack>() {{
-			put("skill_taming", Utils.createItemStack(Items.spawn_egg, EnumChatFormatting.LIGHT_PURPLE + "Taming"));
-			put("skill_mining", Utils.createItemStack(Items.stone_pickaxe, EnumChatFormatting.GRAY + "Mining"));
-			put(
-				"skill_foraging",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.sapling), EnumChatFormatting.DARK_GREEN + "Foraging")
-			);
-			put(
-				"skill_enchanting",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.enchanting_table), EnumChatFormatting.GREEN + "Enchanting")
-			);
-			put(
-				"skill_carpentry",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.crafting_table), EnumChatFormatting.DARK_RED + "Carpentry")
-			);
-			put("skill_farming", Utils.createItemStack(Items.golden_hoe, EnumChatFormatting.YELLOW + "Farming"));
-			put("skill_combat", Utils.createItemStack(Items.stone_sword, EnumChatFormatting.RED + "Combat"));
-			put("skill_fishing", Utils.createItemStack(Items.fishing_rod, EnumChatFormatting.AQUA + "Fishing"));
-			put("skill_alchemy", Utils.createItemStack(Items.brewing_stand, EnumChatFormatting.BLUE + "Alchemy"));
-			put(
-				"skill_runecrafting",
-				Utils.createItemStack(Items.magma_cream, EnumChatFormatting.DARK_PURPLE + "Runecrafting")
-			);
-			// put("skill_catacombs", Utils.createItemStack(Item.getItemFromBlock(Blocks.deadbush), EnumChatFormatting.GOLD+"Catacombs"));
-			put("slayer_zombie", Utils.createItemStack(Items.rotten_flesh, EnumChatFormatting.GOLD + "Rev Slayer"));
-			put("slayer_spider", Utils.createItemStack(Items.spider_eye, EnumChatFormatting.GOLD + "Tara Slayer"));
-			put("slayer_wolf", Utils.createItemStack(Items.bone, EnumChatFormatting.GOLD + "Sven Slayer"));
-			put("slayer_enderman", Utils.createItemStack(Items.ender_pearl, EnumChatFormatting.GOLD + "Ender Slayer"));
-		}};
-
-	private static final ItemStack CAT_FARMING =
-		Utils.createItemStack(Items.golden_hoe, EnumChatFormatting.YELLOW + "Farming");
-	private static final ItemStack CAT_MINING =
-		Utils.createItemStack(Items.stone_pickaxe, EnumChatFormatting.GRAY + "Mining");
-	private static final ItemStack CAT_COMBAT =
-		Utils.createItemStack(Items.stone_sword, EnumChatFormatting.RED + "Combat");
-	private static final ItemStack CAT_FORAGING =
-		Utils.createItemStack(Item.getItemFromBlock(Blocks.sapling), EnumChatFormatting.DARK_GREEN + "Foraging");
-	private static final ItemStack CAT_FISHING =
-		Utils.createItemStack(Items.fishing_rod, EnumChatFormatting.AQUA + "Fishing");
-
+		new LinkedHashMap<String, ItemStack>() {
+			{
+				put("taming", Utils.createItemStack(Items.spawn_egg, EnumChatFormatting.LIGHT_PURPLE + "Taming"));
+				put("mining", Utils.createItemStack(Items.stone_pickaxe, EnumChatFormatting.GRAY + "Mining"));
+				put(
+					"foraging",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.sapling), EnumChatFormatting.DARK_GREEN + "Foraging")
+				);
+				put(
+					"enchanting",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.enchanting_table), EnumChatFormatting.GREEN + "Enchanting")
+				);
+				put(
+					"carpentry",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.crafting_table), EnumChatFormatting.DARK_RED + "Carpentry")
+				);
+				put("farming", Utils.createItemStack(Items.golden_hoe, EnumChatFormatting.YELLOW + "Farming"));
+				put("combat", Utils.createItemStack(Items.stone_sword, EnumChatFormatting.RED + "Combat"));
+				put("fishing", Utils.createItemStack(Items.fishing_rod, EnumChatFormatting.AQUA + "Fishing"));
+				put("alchemy", Utils.createItemStack(Items.brewing_stand, EnumChatFormatting.BLUE + "Alchemy"));
+				put("runecrafting", Utils.createItemStack(Items.magma_cream, EnumChatFormatting.DARK_PURPLE + "Runecrafting"));
+				put("social", Utils.createItemStack(Items.emerald, EnumChatFormatting.DARK_GREEN + "Social"));
+				// put("catacombs", Utils.createItemStack(Item.getItemFromBlock(Blocks.deadbush), EnumChatFormatting.GOLD+"Catacombs"));
+				put("zombie", Utils.createItemStack(Items.rotten_flesh, EnumChatFormatting.GOLD + "Rev Slayer"));
+				put("spider", Utils.createItemStack(Items.spider_eye, EnumChatFormatting.GOLD + "Tara Slayer"));
+				put("wolf", Utils.createItemStack(Items.bone, EnumChatFormatting.GOLD + "Sven Slayer"));
+				put("enderman", Utils.createItemStack(Items.ender_pearl, EnumChatFormatting.GOLD + "Ender Slayer"));
+				put("blaze", Utils.createItemStack(Items.blaze_rod, EnumChatFormatting.GOLD + "Blaze Slayer"));
+			}
+		};
+	private static final ItemStack CAT_FARMING = Utils.createItemStack(
+		Items.golden_hoe,
+		EnumChatFormatting.YELLOW + "Farming"
+	);
+	private static final ItemStack CAT_MINING = Utils.createItemStack(
+		Items.stone_pickaxe,
+		EnumChatFormatting.GRAY + "Mining"
+	);
+	private static final ItemStack CAT_COMBAT = Utils.createItemStack(
+		Items.stone_sword,
+		EnumChatFormatting.RED + "Combat"
+	);
+	private static final ItemStack CAT_FORAGING = Utils.createItemStack(
+		Item.getItemFromBlock(Blocks.sapling),
+		EnumChatFormatting.DARK_GREEN + "Foraging"
+	);
+	private static final ItemStack CAT_FISHING = Utils.createItemStack(
+		Items.fishing_rod,
+		EnumChatFormatting.AQUA + "Fishing"
+	);
 	private static final LinkedHashMap<ItemStack, List<String>> collectionCatToCollectionMap =
-		new LinkedHashMap<ItemStack, List<String>>() {{
-			put(CAT_FARMING, Utils.createList("WHEAT", "CARROT_ITEM", "POTATO_ITEM", "PUMPKIN", "MELON", "SEEDS",
-				"MUSHROOM_COLLECTION", "INK_SACK:3", "CACTUS", "SUGAR_CANE", "FEATHER", "LEATHER", "PORK", "RAW_CHICKEN",
-				"MUTTON", "RABBIT", "NETHER_STALK"
-			));
-			put(CAT_MINING, Utils.createList("COBBLESTONE", "COAL", "IRON_INGOT", "GOLD_INGOT", "DIAMOND", "INK_SACK:4",
-				"EMERALD", "REDSTONE", "QUARTZ", "OBSIDIAN", "GLOWSTONE_DUST", "GRAVEL", "ICE", "NETHERRACK", "SAND",
-				"ENDER_STONE", null, "MITHRIL_ORE", "HARD_STONE", "GEMSTONE_COLLECTION"
-			));
-			put(CAT_COMBAT, Utils.createList("ROTTEN_FLESH", "BONE", "STRING", "SPIDER_EYE", "SULPHUR", "ENDER_PEARL",
-				"GHAST_TEAR", "SLIME_BALL", "BLAZE_ROD", "MAGMA_CREAM", null, null, null
-			));
-			put(CAT_FORAGING, Utils.createList("LOG", "LOG:1", "LOG:2", "LOG_2:1", "LOG_2", "LOG:3", null));
-			put(CAT_FISHING, Utils.createList("RAW_FISH", "RAW_FISH:1", "RAW_FISH:2", "RAW_FISH:3", "PRISMARINE_SHARD",
-				"PRISMARINE_CRYSTALS", "CLAY_BALL", "WATER_LILY", "INK_SACK", "SPONGE"
-			));
-
-		}};
-
+		new LinkedHashMap<ItemStack, List<String>>() {
+			{
+				put(
+					CAT_FARMING,
+					Utils.createList(
+						"WHEAT",
+						"CARROT_ITEM",
+						"POTATO_ITEM",
+						"PUMPKIN",
+						"MELON",
+						"SEEDS",
+						"MUSHROOM_COLLECTION",
+						"INK_SACK:3",
+						"CACTUS",
+						"SUGAR_CANE",
+						"FEATHER",
+						"LEATHER",
+						"PORK",
+						"RAW_CHICKEN",
+						"MUTTON",
+						"RABBIT",
+						"NETHER_STALK"
+					)
+				);
+				put(
+					CAT_MINING,
+					Utils.createList(
+						"COBBLESTONE",
+						"COAL",
+						"IRON_INGOT",
+						"GOLD_INGOT",
+						"DIAMOND",
+						"INK_SACK:4",
+						"EMERALD",
+						"REDSTONE",
+						"QUARTZ",
+						"OBSIDIAN",
+						"GLOWSTONE_DUST",
+						"GRAVEL",
+						"ICE",
+						"NETHERRACK",
+						"SAND",
+						"ENDER_STONE",
+						null,
+						"MITHRIL_ORE",
+						"HARD_STONE",
+						"GEMSTONE_COLLECTION",
+						"MYCEL",
+						"SAND:1",
+						"SULPHUR_ORE"
+					)
+				);
+				put(
+					CAT_COMBAT,
+					Utils.createList(
+						"ROTTEN_FLESH",
+						"BONE",
+						"STRING",
+						"SPIDER_EYE",
+						"SULPHUR",
+						"ENDER_PEARL",
+						"GHAST_TEAR",
+						"SLIME_BALL",
+						"BLAZE_ROD",
+						"MAGMA_CREAM",
+						null,
+						null,
+						null,
+						null,
+						"CHILI_PEPPER"
+					)
+				);
+				put(CAT_FORAGING, Utils.createList("LOG", "LOG:1", "LOG:2", "LOG_2:1", "LOG_2", "LOG:3", null));
+				put(
+					CAT_FISHING,
+					Utils.createList(
+						"RAW_FISH",
+						"RAW_FISH:1",
+						"RAW_FISH:2",
+						"RAW_FISH:3",
+						"PRISMARINE_SHARD",
+						"PRISMARINE_CRYSTALS",
+						"CLAY_BALL",
+						"WATER_LILY",
+						"INK_SACK",
+						"SPONGE",
+						"MAGMA_FISH"
+					)
+				);
+			}
+		};
 	private static final LinkedHashMap<ItemStack, List<String>> collectionCatToMinionMap =
-		new LinkedHashMap<ItemStack, List<String>>() {{
-			put(CAT_FARMING, Utils.createList("WHEAT", "CARROT", "POTATO", "PUMPKIN", "MELON", null, "MUSHROOM",
-				"COCOA", "CACTUS", "SUGAR_CANE", "CHICKEN", "COW", "PIG", null, "SHEEP", "RABBIT", "NETHER_WARTS"
-			));
-			put(CAT_MINING, Utils.createList("COBBLESTONE", "COAL", "IRON", "GOLD", "DIAMOND", "LAPIS", "EMERALD",
-				"REDSTONE", "QUARTZ", "OBSIDIAN", "GLOWSTONE", "GRAVEL", "ICE", null, "SAND", "ENDER_STONE", "SNOW",
-				"MITHRIL", "HARD_STONE", null
-			));
-			put(CAT_COMBAT, Utils.createList("ZOMBIE", "SKELETON", "SPIDER", "CAVESPIDER", "CREEPER", "ENDERMAN",
-				"GHAST", "SLIME", "BLAZE", "MAGMA_CUBE", "REVENANT", "TARANTULA", "VOIDLING"
-			));
-			put(CAT_FORAGING, Utils.createList("OAK", "SPRUCE", "BIRCH", "DARK_OAK", "ACACIA", "JUNGLE", "FLOWER"));
-			put(CAT_FISHING, Utils.createList("FISHING", null, null, null, null, null, "CLAY", null, null, null));
-
-		}};
-
+		new LinkedHashMap<ItemStack, List<String>>() {
+			{
+				put(
+					CAT_FARMING,
+					Utils.createList(
+						"WHEAT",
+						"CARROT",
+						"POTATO",
+						"PUMPKIN",
+						"MELON",
+						null,
+						"MUSHROOM",
+						"COCOA",
+						"CACTUS",
+						"SUGAR_CANE",
+						"CHICKEN",
+						"COW",
+						"PIG",
+						null,
+						"SHEEP",
+						"RABBIT",
+						"NETHER_WARTS"
+					)
+				);
+				put(
+					CAT_MINING,
+					Utils.createList(
+						"COBBLESTONE",
+						"COAL",
+						"IRON",
+						"GOLD",
+						"DIAMOND",
+						"LAPIS",
+						"EMERALD",
+						"REDSTONE",
+						"QUARTZ",
+						"OBSIDIAN",
+						"GLOWSTONE",
+						"GRAVEL",
+						"ICE",
+						null,
+						"SAND",
+						"ENDER_STONE",
+						"SNOW",
+						"MITHRIL",
+						"HARD_STONE",
+						null,
+						"MYCELIUM",
+						"RED_SAND",
+						null
+					)
+				);
+				put(
+					CAT_COMBAT,
+					Utils.createList(
+						"ZOMBIE",
+						"SKELETON",
+						"SPIDER",
+						"CAVESPIDER",
+						"CREEPER",
+						"ENDERMAN",
+						"GHAST",
+						"SLIME",
+						"BLAZE",
+						"MAGMA_CUBE",
+						"REVENANT",
+						"TARANTULA",
+						"VOIDLING",
+						"INFERNO"
+					)
+				);
+				put(CAT_FORAGING, Utils.createList("OAK", "SPRUCE", "BIRCH", "DARK_OAK", "ACACIA", "JUNGLE", "FLOWER"));
+				put(CAT_FISHING, Utils.createList("FISHING", null, null, null, null, null, "CLAY", null, null, null));
+			}
+		};
 	private static final LinkedHashMap<String, ItemStack> collectionToCollectionDisplayMap =
-		new LinkedHashMap<String, ItemStack>() {{
-			/* FARMING COLLECTIONS */
-			put("WHEAT", Utils.createItemStack(Items.wheat, EnumChatFormatting.YELLOW + "Wheat"));
-			put("CARROT_ITEM", Utils.createItemStack(Items.carrot, EnumChatFormatting.YELLOW + "Carrot"));
-			put("POTATO_ITEM", Utils.createItemStack(Items.potato, EnumChatFormatting.YELLOW + "Potato"));
-			put(
-				"PUMPKIN",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.pumpkin), EnumChatFormatting.YELLOW + "Pumpkin")
-			);
-			put("MELON", Utils.createItemStack(Items.melon, EnumChatFormatting.YELLOW + "Melon"));
-			put("SEEDS", Utils.createItemStack(Items.wheat_seeds, EnumChatFormatting.YELLOW + "Seeds"));
-			put(
-				"MUSHROOM_COLLECTION",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.red_mushroom), EnumChatFormatting.YELLOW + "Mushroom")
-			);
-			put("INK_SACK:3", Utils.createItemStack(Items.dye, EnumChatFormatting.YELLOW + "Cocoa Beans", 3));
-			put("CACTUS", Utils.createItemStack(Item.getItemFromBlock(Blocks.cactus), EnumChatFormatting.YELLOW + "Cactus"));
-			put("SUGAR_CANE", Utils.createItemStack(Items.reeds, EnumChatFormatting.YELLOW + "Sugar Cane"));
-			put("FEATHER", Utils.createItemStack(Items.feather, EnumChatFormatting.YELLOW + "Feather"));
-			put("LEATHER", Utils.createItemStack(Items.leather, EnumChatFormatting.YELLOW + "Leather"));
-			put("PORK", Utils.createItemStack(Items.porkchop, EnumChatFormatting.YELLOW + "Porkchop"));
-			put("RAW_CHICKEN", Utils.createItemStack(Items.chicken, EnumChatFormatting.YELLOW + "Chicken"));
-			put("MUTTON", Utils.createItemStack(Items.mutton, EnumChatFormatting.YELLOW + "Mutton"));
-			put("RABBIT", Utils.createItemStack(Items.rabbit, EnumChatFormatting.YELLOW + "Rabbit"));
-			put("NETHER_STALK", Utils.createItemStack(Items.nether_wart, EnumChatFormatting.YELLOW + "Nether Wart"));
-
-			/* MINING COLLECTIONS */
-			put(
-				"COBBLESTONE",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.cobblestone), EnumChatFormatting.GRAY + "Cobblestone")
-			);
-			put("COAL", Utils.createItemStack(Items.coal, EnumChatFormatting.GRAY + "Coal"));
-			put("IRON_INGOT", Utils.createItemStack(Items.iron_ingot, EnumChatFormatting.GRAY + "Iron Ingot"));
-			put("GOLD_INGOT", Utils.createItemStack(Items.gold_ingot, EnumChatFormatting.GRAY + "Gold Ingot"));
-			put("DIAMOND", Utils.createItemStack(Items.diamond, EnumChatFormatting.GRAY + "Diamond"));
-			put("INK_SACK:4", Utils.createItemStack(Items.dye, EnumChatFormatting.GRAY + "Lapis Lazuli", 4));
-			put("EMERALD", Utils.createItemStack(Items.emerald, EnumChatFormatting.GRAY + "Emerald"));
-			put("REDSTONE", Utils.createItemStack(Items.redstone, EnumChatFormatting.GRAY + "Redstone"));
-			put("QUARTZ", Utils.createItemStack(Items.quartz, EnumChatFormatting.GRAY + "Nether Quartz"));
-			put(
-				"OBSIDIAN",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.obsidian), EnumChatFormatting.GRAY + "Obsidian")
-			);
-			put("GLOWSTONE_DUST", Utils.createItemStack(Items.glowstone_dust, EnumChatFormatting.GRAY + "Glowstone"));
-			put("GRAVEL", Utils.createItemStack(Item.getItemFromBlock(Blocks.gravel), EnumChatFormatting.GRAY + "Gravel"));
-			put("ICE", Utils.createItemStack(Item.getItemFromBlock(Blocks.ice), EnumChatFormatting.GRAY + "Ice"));
-			put(
-				"NETHERRACK",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.netherrack), EnumChatFormatting.GRAY + "Netherrack")
-			);
-			put("SAND", Utils.createItemStack(Item.getItemFromBlock(Blocks.sand), EnumChatFormatting.GRAY + "Sand"));
-			put(
-				"ENDER_STONE",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.end_stone), EnumChatFormatting.GRAY + "End Stone")
-			);
-			put("MITHRIL_ORE", Utils.createItemStack(Items.prismarine_crystals, EnumChatFormatting.GRAY + "Mithril"));
-			put(
-				"HARD_STONE",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.stone), EnumChatFormatting.GRAY + "Hard Stone")
-			);
-			put(
-				"GEMSTONE_COLLECTION",
-				Utils.createSkull(
-					EnumChatFormatting.GRAY + "Gemstone",
-					"e942eb66-a350-38e5-aafa-0dfc3e17b4ac",
-					"ewogICJ0aW1lc3RhbXAiIDogMTYxODA4Mzg4ODc3MSwKICAicHJvZmlsZUlkIiA6ICJjNTBhZmE4YWJlYjk0ZTQ1OTRiZjFiNDI1YTk4MGYwMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJUd29FQmFlIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FhYzE1ZjZmY2YyY2U5NjNlZjRjYTcxZjFhODY4NWFkYjk3ZWI3NjllMWQxMTE5NGNiYmQyZTk2NGE4ODk3OGMiCiAgICB9CiAgfQp9"
-				)
-			);
+		new LinkedHashMap<String, ItemStack>() {
+			{
+				/* FARMING COLLECTIONS */
+				put("WHEAT", Utils.createItemStack(Items.wheat, EnumChatFormatting.YELLOW + "Wheat"));
+				put("CARROT_ITEM", Utils.createItemStack(Items.carrot, EnumChatFormatting.YELLOW + "Carrot"));
+				put("POTATO_ITEM", Utils.createItemStack(Items.potato, EnumChatFormatting.YELLOW + "Potato"));
+				put(
+					"PUMPKIN",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.pumpkin), EnumChatFormatting.YELLOW + "Pumpkin")
+				);
+				put("MELON", Utils.createItemStack(Items.melon, EnumChatFormatting.YELLOW + "Melon"));
+				put("SEEDS", Utils.createItemStack(Items.wheat_seeds, EnumChatFormatting.YELLOW + "Seeds"));
+				put(
+					"MUSHROOM_COLLECTION",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.red_mushroom), EnumChatFormatting.YELLOW + "Mushroom")
+				);
+				put("INK_SACK:3", Utils.createItemStack(Items.dye, EnumChatFormatting.YELLOW + "Cocoa Beans", 3));
+				put(
+					"CACTUS",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.cactus), EnumChatFormatting.YELLOW + "Cactus")
+				);
+				put("SUGAR_CANE", Utils.createItemStack(Items.reeds, EnumChatFormatting.YELLOW + "Sugar Cane"));
+				put("FEATHER", Utils.createItemStack(Items.feather, EnumChatFormatting.YELLOW + "Feather"));
+				put("LEATHER", Utils.createItemStack(Items.leather, EnumChatFormatting.YELLOW + "Leather"));
+				put("PORK", Utils.createItemStack(Items.porkchop, EnumChatFormatting.YELLOW + "Raw Porkchop"));
+				put("RAW_CHICKEN", Utils.createItemStack(Items.chicken, EnumChatFormatting.YELLOW + "Raw Chicken"));
+				put("MUTTON", Utils.createItemStack(Items.mutton, EnumChatFormatting.YELLOW + "Mutton"));
+				put("RABBIT", Utils.createItemStack(Items.rabbit, EnumChatFormatting.YELLOW + "Raw Rabbit"));
+				put("NETHER_STALK", Utils.createItemStack(Items.nether_wart, EnumChatFormatting.YELLOW + "Nether Wart"));
+
+				/* MINING COLLECTIONS */
+				put(
+					"COBBLESTONE",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.cobblestone), EnumChatFormatting.GRAY + "Cobblestone")
+				);
+				put("COAL", Utils.createItemStack(Items.coal, EnumChatFormatting.GRAY + "Coal"));
+				put("IRON_INGOT", Utils.createItemStack(Items.iron_ingot, EnumChatFormatting.GRAY + "Iron Ingot"));
+				put("GOLD_INGOT", Utils.createItemStack(Items.gold_ingot, EnumChatFormatting.GRAY + "Gold Ingot"));
+				put("DIAMOND", Utils.createItemStack(Items.diamond, EnumChatFormatting.GRAY + "Diamond"));
+				put("INK_SACK:4", Utils.createItemStack(Items.dye, EnumChatFormatting.GRAY + "Lapis Lazuli", 4));
+				put("EMERALD", Utils.createItemStack(Items.emerald, EnumChatFormatting.GRAY + "Emerald"));
+				put("REDSTONE", Utils.createItemStack(Items.redstone, EnumChatFormatting.GRAY + "Redstone"));
+				put("QUARTZ", Utils.createItemStack(Items.quartz, EnumChatFormatting.GRAY + "Nether Quartz"));
+				put(
+					"OBSIDIAN",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.obsidian), EnumChatFormatting.GRAY + "Obsidian")
+				);
+				put("GLOWSTONE_DUST", Utils.createItemStack(Items.glowstone_dust, EnumChatFormatting.GRAY + "Glowstone Dust"));
+				put("GRAVEL", Utils.createItemStack(Item.getItemFromBlock(Blocks.gravel), EnumChatFormatting.GRAY + "Gravel"));
+				put("ICE", Utils.createItemStack(Item.getItemFromBlock(Blocks.ice), EnumChatFormatting.GRAY + "Ice"));
+				put(
+					"NETHERRACK",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.netherrack), EnumChatFormatting.GRAY + "Netherrack")
+				);
+				put("SAND", Utils.createItemStack(Item.getItemFromBlock(Blocks.sand), EnumChatFormatting.GRAY + "Sand"));
+				put(
+					"ENDER_STONE",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.end_stone), EnumChatFormatting.GRAY + "End Stone")
+				);
+				put("MITHRIL_ORE", Utils.createItemStack(Items.prismarine_crystals, EnumChatFormatting.GRAY + "Mithril"));
+				put(
+					"HARD_STONE",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.stone), EnumChatFormatting.GRAY + "Hard Stone")
+				);
+				put(
+					"GEMSTONE_COLLECTION",
+					Utils.createSkull(
+						EnumChatFormatting.GRAY + "Gemstone",
+						"e942eb66-a350-38e5-aafa-0dfc3e17b4ac",
+						"ewogICJ0aW1lc3RhbXAiIDogMTYxODA4Mzg4ODc3MSwKICAicHJvZmlsZUlkIiA6ICJjNTBhZmE4YWJlYjk0ZTQ1OTRiZjFiNDI1YTk4MGYwMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJUd29FQmFlIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FhYzE1ZjZmY2YyY2U5NjNlZjRjYTcxZjFhODY4NWFkYjk3ZWI3NjllMWQxMTE5NGNiYmQyZTk2NGE4ODk3OGMiCiAgICB9CiAgfQp9"
+					)
+				);
+				put(
+					"MYCEL",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.mycelium), EnumChatFormatting.GRAY + "Mycelium")
+				);
+				put(
+					"SAND:1",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.sand), EnumChatFormatting.GRAY + "Red Sand", 1)
+				);
+				put("SULPHUR_ORE", Utils.createItemStack(Items.glowstone_dust, EnumChatFormatting.GRAY + "Sulphur"));
+
+				/* COMBAT COLLECTIONS */
+				put("ROTTEN_FLESH", Utils.createItemStack(Items.rotten_flesh, EnumChatFormatting.RED + "Rotten Flesh"));
+				put("BONE", Utils.createItemStack(Items.bone, EnumChatFormatting.RED + "Bone"));
+				put("STRING", Utils.createItemStack(Items.string, EnumChatFormatting.RED + "String"));
+				put("SPIDER_EYE", Utils.createItemStack(Items.spider_eye, EnumChatFormatting.RED + "Spider Eye"));
+				put("SULPHUR", Utils.createItemStack(Items.gunpowder, EnumChatFormatting.RED + "Gunpowder"));
+				put("ENDER_PEARL", Utils.createItemStack(Items.ender_pearl, EnumChatFormatting.RED + "Ender Pearl"));
+				put("GHAST_TEAR", Utils.createItemStack(Items.ghast_tear, EnumChatFormatting.RED + "Ghast Tear"));
+				put("SLIME_BALL", Utils.createItemStack(Items.slime_ball, EnumChatFormatting.RED + "Slimeball"));
+				put("BLAZE_ROD", Utils.createItemStack(Items.blaze_rod, EnumChatFormatting.RED + "Blaze Rod"));
+				put("MAGMA_CREAM", Utils.createItemStack(Items.magma_cream, EnumChatFormatting.RED + "Magma Cream"));
+				put(
+					"CHILI_PEPPER",
+					Utils.createSkull(
+						EnumChatFormatting.RED + "Chili Pepper",
+						"3d47abaa-b40b-3826-b20c-d83a7f053bd9",
+						"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjg1OWM4ZGYxMTA5YzA4YTc1NjI3NWYxZDI4ODdjMjc0ODA0OWZlMzM4Nzc3NjlhN2I0MTVkNTZlZGE0NjlkOCJ9fX0"
+					)
+				);
 
-			/* COMBAT COLLECTIONS */
-			put("ROTTEN_FLESH", Utils.createItemStack(Items.rotten_flesh, EnumChatFormatting.RED + "Rotten Flesh"));
-			put("BONE", Utils.createItemStack(Items.bone, EnumChatFormatting.RED + "Bone"));
-			put("STRING", Utils.createItemStack(Items.string, EnumChatFormatting.RED + "String"));
-			put("SPIDER_EYE", Utils.createItemStack(Items.spider_eye, EnumChatFormatting.RED + "Spider Eye"));
-			put("SULPHUR", Utils.createItemStack(Items.gunpowder, EnumChatFormatting.RED + "Gunpowder"));
-			put("ENDER_PEARL", Utils.createItemStack(Items.ender_pearl, EnumChatFormatting.RED + "Ender Pearl"));
-			put("GHAST_TEAR", Utils.createItemStack(Items.ghast_tear, EnumChatFormatting.RED + "Ghast Tear"));
-			put("SLIME_BALL", Utils.createItemStack(Items.slime_ball, EnumChatFormatting.RED + "Slimeball"));
-			put("BLAZE_ROD", Utils.createItemStack(Items.blaze_rod, EnumChatFormatting.RED + "Blaze Rod"));
-			put("MAGMA_CREAM", Utils.createItemStack(Items.magma_cream, EnumChatFormatting.RED + "Magma Cream"));
-
-			/* FORAGING COLLECTIONS */
-			put("LOG", Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Oak"));
-			put(
-				"LOG:1",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Spruce", 1)
-			);
-			put(
-				"LOG:2",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Birch", 2)
-			);
-			put(
-				"LOG_2:1",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.log2), EnumChatFormatting.DARK_GREEN + "Dark Oak", 1)
-			);
-			put("LOG_2", Utils.createItemStack(Item.getItemFromBlock(Blocks.log2), EnumChatFormatting.DARK_GREEN + "Acacia"));
-			put(
-				"LOG:3",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Jungle", 3)
-			);
+				/* FORAGING COLLECTIONS */
+				put(
+					"LOG",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Oak Wood")
+				);
+				put(
+					"LOG:1",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Spruce Wood", 1)
+				);
+				put(
+					"LOG:2",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Birch Wood", 2)
+				);
+				put(
+					"LOG_2:1",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.log2), EnumChatFormatting.DARK_GREEN + "Dark Oak Wood", 1)
+				);
+				put(
+					"LOG_2",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.log2), EnumChatFormatting.DARK_GREEN + "Acacia Wood")
+				);
+				put(
+					"LOG:3",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.log), EnumChatFormatting.DARK_GREEN + "Jungle Wood", 3)
+				);
 
-			/* FISHING COLLECTIONS */
-			put("RAW_FISH", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Fish"));
-			put("RAW_FISH:1", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Salmon", 1));
-			put("RAW_FISH:2", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Clownfish", 2));
-			put("RAW_FISH:3", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Pufferfish", 3));
-			put(
-				"PRISMARINE_SHARD",
-				Utils.createItemStack(Items.prismarine_shard, EnumChatFormatting.AQUA + "Prismarine Shard")
-			);
-			put(
-				"PRISMARINE_CRYSTALS",
-				Utils.createItemStack(Items.prismarine_crystals, EnumChatFormatting.AQUA + "Prismarine Crystals")
-			);
-			put("CLAY_BALL", Utils.createItemStack(Items.clay_ball, EnumChatFormatting.AQUA + "Clay"));
-			put(
-				"WATER_LILY",
-				Utils.createItemStack(Item.getItemFromBlock(Blocks.waterlily), EnumChatFormatting.AQUA + "Lilypad")
-			);
-			put("INK_SACK", Utils.createItemStack(Items.dye, EnumChatFormatting.AQUA + "Ink Sack"));
-			put("SPONGE", Utils.createItemStack(Item.getItemFromBlock(Blocks.sponge), EnumChatFormatting.AQUA + "Sponge"));
-		}};
+				/* FISHING COLLECTIONS */
+				put("RAW_FISH", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Raw Fish"));
+				put("RAW_FISH:1", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Raw Salmon", 1));
+				put("RAW_FISH:2", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Clownfish", 2));
+				put("RAW_FISH:3", Utils.createItemStack(Items.fish, EnumChatFormatting.AQUA + "Pufferfish", 3));
+				put(
+					"PRISMARINE_SHARD",
+					Utils.createItemStack(Items.prismarine_shard, EnumChatFormatting.AQUA + "Prismarine Shard")
+				);
+				put(
+					"PRISMARINE_CRYSTALS",
+					Utils.createItemStack(Items.prismarine_crystals, EnumChatFormatting.AQUA + "Prismarine Crystals")
+				);
+				put("CLAY_BALL", Utils.createItemStack(Items.clay_ball, EnumChatFormatting.AQUA + "Clay"));
+				put(
+					"WATER_LILY",
+					Utils.createItemStack(Item.getItemFromBlock(Blocks.waterlily), EnumChatFormatting.AQUA + "Lily Pad")
+				);
+				put("INK_SACK", Utils.createItemStack(Items.dye, EnumChatFormatting.AQUA + "Ink Sac"));
+				put("SPONGE", Utils.createItemStack(Item.getItemFromBlock(Blocks.sponge), EnumChatFormatting.AQUA + "Sponge"));
+				put(
+					"MAGMA_FISH",
+					Utils.createSkull(
+						EnumChatFormatting.AQUA + "Magmafish",
+						"5c53195c-5b98-3476-9731-c32647b22723",
+						"ewogICJ0aW1lc3RhbXAiIDogMTY0MjQ4ODA3MDY2NiwKICAicHJvZmlsZUlkIiA6ICIzNDkxZjJiOTdjMDE0MWE2OTM2YjFjMjJhMmEwMGZiNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJKZXNzc3N1aGgiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjU2YjU5NTViMjk1NTIyYzk2ODk0ODE5NjBjMDFhOTkyY2ExYzc3NTRjZjRlZTMxM2M4ZGQwYzM1NmQzMzVmIgogICAgfQogIH0KfQ"
+					)
+				);
+			}
+		};
+	private static final AtomicBoolean updatingResourceCollection = new AtomicBoolean(false);
+	private static JsonObject resourceCollection = null;
+	private final NEUManager manager;
+	private final HashMap<String, JsonObject> uuidToHypixelProfile = new HashMap<>();
+	private final HashMap<String, Profile> uuidToProfileMap = new HashMap<>();
+	private final HashMap<String, String> nameToUuid = new HashMap<>();
+
+	public ProfileViewer(NEUManager manager) {
+		this.manager = manager;
+	}
 
 	public static LinkedHashMap<ItemStack, List<String>> getCollectionCatToMinionMap() {
 		return collectionCatToMinionMap;
@@ -261,105 +469,262 @@ public class ProfileViewer {
 		return Collections.unmodifiableMap(skillToSkillDisplayMap);
 	}
 
-	public static class Level {
-		public float level = 0;
-		public float maxXpForLevel = 0;
-		public boolean maxed = false;
-		public double totalXp;
-	}
-
 	public static Level getLevel(JsonArray levelingArray, float xp, int levelCap, boolean cumulative) {
 		Level levelObj = new Level();
+		levelObj.totalXp = xp;
+		levelObj.maxLevel = levelCap;
+
 		for (int level = 0; level < levelingArray.size(); level++) {
 			float levelXp = levelingArray.get(level).getAsFloat();
+
 			if (levelXp > xp) {
 				if (cumulative) {
-					float previous = 0;
-					if (level > 0) previous = levelingArray.get(level - 1).getAsFloat();
+					float previous = level > 0 ? levelingArray.get(level - 1).getAsFloat() : 0;
 					levelObj.maxXpForLevel = (levelXp - previous);
 					levelObj.level = 1 + level + (xp - levelXp) / levelObj.maxXpForLevel;
 				} else {
 					levelObj.maxXpForLevel = levelXp;
 					levelObj.level = level + xp / levelXp;
 				}
+
 				if (levelObj.level > levelCap) {
 					levelObj.level = levelCap;
 					levelObj.maxed = true;
 				}
+
 				return levelObj;
 			} else {
-				if (!cumulative) xp -= levelXp;
+				if (!cumulative) {
+					xp -= levelXp;
+				}
 			}
 		}
-		levelObj.level = levelingArray.size();
-		if (levelObj.level > levelCap) {
-			levelObj.level = levelCap;
-		}
+
+		levelObj.level = Math.min(levelingArray.size(), levelCap);
 		levelObj.maxed = true;
 		return levelObj;
 	}
 
-	public class Profile {
-		private final String uuid;
-		private String latestProfile = null;
+	public static JsonObject getResourceCollectionInformation() {
+		if (resourceCollection != null) return resourceCollection;
+		if (updatingResourceCollection.get()) return null;
 
-		private JsonArray playerInformation = null;
-		private JsonObject guildInformation = null;
-		private JsonObject basicInfo = null;
+		updatingResourceCollection.set(true);
+
+		NotEnoughUpdates.INSTANCE.manager.apiUtils
+			.newHypixelApiRequest("resources/skyblock/collections")
+			.requestJson()
+			.thenAccept(jsonObject -> {
+				updatingResourceCollection.set(false);
+				if (jsonObject != null && jsonObject.has("success") && jsonObject.get("success").getAsBoolean()) {
+					resourceCollection = jsonObject.get("collections").getAsJsonObject();
+				}
+			});
+		return null;
+	}
+
+	public void getHypixelProfile(String name, Consumer<JsonObject> callback) {
+		String nameF = name.toLowerCase();
+		manager.apiUtils
+			.newHypixelApiRequest("player")
+			.queryArgument("name", nameF)
+			.requestJson()
+			.thenAccept(jsonObject -> {
+					if (
+						jsonObject != null &&
+							jsonObject.has("success") &&
+							jsonObject.get("success").getAsBoolean() &&
+							jsonObject.get("player").isJsonObject()
+					) {
+						nameToUuid.put(nameF, jsonObject.get("player").getAsJsonObject().get("uuid").getAsString());
+						uuidToHypixelProfile.put(
+							jsonObject.get("player").getAsJsonObject().get("uuid").getAsString(),
+							jsonObject.get("player").getAsJsonObject()
+						);
+						if (callback != null) callback.accept(jsonObject);
+					} else {
+						if (callback != null) callback.accept(null);
+					}
+				}
+			);
+	}
+
+	public void putNameUuid(String name, String uuid) {
+		nameToUuid.put(name, uuid);
+	}
 
+	public void getPlayerUUID(String name, Consumer<String> uuidCallback) {
+		String nameF = name.toLowerCase();
+		if (nameToUuid.containsKey(nameF)) {
+			uuidCallback.accept(nameToUuid.get(nameF));
+			return;
+		}
+
+		manager.apiUtils
+			.request()
+			.url("https://api.mojang.com/users/profiles/minecraft/" + nameF)
+			.requestJson()
+			.thenAccept(jsonObject -> {
+				if (jsonObject.has("id") && jsonObject.get("id").isJsonPrimitive() &&
+					((JsonPrimitive) jsonObject.get("id")).isString()) {
+					String uuid = jsonObject.get("id").getAsString();
+					nameToUuid.put(nameF, uuid);
+					uuidCallback.accept(uuid);
+					return;
+				}
+				uuidCallback.accept(null);
+			});
+	}
+
+	public void getProfileByName(String name, Consumer<Profile> callback) {
+		String nameF = name.toLowerCase();
+
+		if (nameToUuid.containsKey(nameF) && nameToUuid.get(nameF) == null) {
+			callback.accept(null);
+			return;
+		}
+
+		getPlayerUUID(
+			nameF,
+			uuid -> {
+				if (uuid == null) {
+					getHypixelProfile(
+						nameF,
+						jsonObject -> {
+							if (jsonObject != null) {
+								callback.accept(getProfileReset(nameToUuid.get(nameF), ignored -> {}));
+							} else {
+								callback.accept(null);
+								nameToUuid.put(nameF, null);
+							}
+						}
+					);
+				} else {
+					if (!uuidToHypixelProfile.containsKey(uuid)) {
+						getHypixelProfile(nameF, jsonObject -> {});
+					}
+					callback.accept(getProfileReset(uuid, ignored -> {}));
+				}
+			}
+		);
+	}
+
+	public Profile getProfile(String uuid, Consumer<Profile> callback) {
+		Profile profile = uuidToProfileMap.computeIfAbsent(uuid, k -> new Profile(uuid));
+		if (profile.skyblockProfiles != null) {
+			callback.accept(profile);
+		} else {
+			profile.getSkyblockProfiles(() -> callback.accept(profile));
+		}
+		return profile;
+	}
+
+	public Profile getProfileReset(String uuid, Consumer<Profile> callback) {
+		if (uuidToProfileMap.containsKey(uuid)) uuidToProfileMap.get(uuid).resetCache();
+		return getProfile(uuid, callback);
+	}
+
+	public static class Level {
+
+		public float level = 0;
+		public float maxXpForLevel = 0;
+		public boolean maxed = false;
+		public int maxLevel;
+		public float totalXp;
+	}
+
+	public class Profile {
+
+		private final String uuid;
 		private final HashMap<String, JsonObject> profileMap = new HashMap<>();
 		private final HashMap<String, JsonObject> petsInfoMap = new HashMap<>();
 		private final HashMap<String, List<JsonObject>> coopProfileMap = new HashMap<>();
-		private final HashMap<String, JsonObject> skillInfoMap = new HashMap<>();
-		private final HashMap<String, JsonObject> inve