Add some rift stuff to PV (#749)

7 files changed, 48 insertions, 6 deletions

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 d5c0afba..331d2ad3 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
@@ -587,7 +587,7 @@ public class BasicPage extends GuiProfileViewerPage {
 		// sb lvl
 
 		int sbLevelX = guiLeft + 162;
-		int sbLevelY = guiTop + 90;
+		int sbLevelY = guiTop + 74;
 
 		double skyblockLevel = profile.getProfile(profileName).getSkyblockLevel();
 		EnumChatFormatting skyblockLevelColour = profile.getProfile(profileName).getSkyblockLevelColour();
@@ -609,7 +609,7 @@ public class BasicPage extends GuiProfileViewerPage {
 		);
 
 		if (mouseX >= guiLeft + 128 && mouseX <= guiLeft + 216) {
-			if (mouseY >= guiTop + 69 && mouseY <= guiTop + 131) {
+			if (mouseY >= guiTop + 49 && mouseY <= guiTop + 113) {
 				if (Mouse.isButtonDown(0)) onSecondPage = true;
 			}
 		}
@@ -633,6 +633,12 @@ public class BasicPage extends GuiProfileViewerPage {
 				int x = guiLeft + 237 + 86 * xPosition;
 				int y = guiTop + 24 + 21 * yPosition;
 
+				if (entry.getKey().equals("social")) {
+					position--;
+					x = guiLeft + 132;
+					y = guiTop + 124;
+				}
+
 				Utils.renderAlignedString(skillName, EnumChatFormatting.WHITE.toString() + levelFloored, x + 14, y - 4, 60);
 
 				if (level.maxed) {
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 da90843a..2d4e7250 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/CollectionsPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/CollectionsPage.java
@@ -402,6 +402,9 @@ public class CollectionsPage extends GuiProfileViewerPage {
 		ItemStack stack = null;
 		Iterator<ItemStack> items = ProfileViewer.getCollectionCatToCollectionMap().keySet().iterator();
 		switch (keyCode) {
+			case Keyboard.KEY_6:
+			case Keyboard.KEY_NUMPAD6:
+				items.next();
 			case Keyboard.KEY_5:
 			case Keyboard.KEY_NUMPAD5:
 				items.next();
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 edf106d5..a81956f2 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
@@ -63,12 +63,12 @@ public class ProfileViewer {
 				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"));
+				put("vampire", Utils.createItemStack(Items.redstone, EnumChatFormatting.GOLD + "Vampire Slayer"));
 			}
 		};
 	private static final ItemStack CAT_FARMING = Utils.createItemStack(
@@ -91,6 +91,10 @@ public class ProfileViewer {
 		Items.fishing_rod,
 		EnumChatFormatting.AQUA + "Fishing"
 	);
+	private static final ItemStack CAT_RIFT = Utils.createItemStack(
+		Blocks.mycelium,
+		EnumChatFormatting.DARK_PURPLE + "Rift"
+	);
 	@Getter
 	private static final LinkedHashMap<ItemStack, List<String>> collectionCatToCollectionMap =
 		new LinkedHashMap<ItemStack, List<String>>() {
@@ -182,6 +186,16 @@ public class ProfileViewer {
 						"MAGMA_FISH"
 					)
 				);
+				put(CAT_RIFT,
+					Utils.createList(
+						"AGARICUS_CAP",
+						"CADUCOUS_STEM",
+						"HALF_EATEN_CARROT",
+						"HEMOVIBE",
+						"METAL_HEART",
+						"WILTED_BERBERIS"
+					)
+				);
 			}
 		};
 	@Getter
@@ -259,6 +273,7 @@ public class ProfileViewer {
 				);
 				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));
+				put(CAT_RIFT, Utils.createList(null, null, null, "VAMPIRE"));
 			}
 		};
 	@Getter
@@ -419,6 +434,24 @@ public class ProfileViewer {
 						"ewogICJ0aW1lc3RhbXAiIDogMTY0MjQ4ODA3MDY2NiwKICAicHJvZmlsZUlkIiA6ICIzNDkxZjJiOTdjMDE0MWE2OTM2YjFjMjJhMmEwMGZiNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJKZXNzc3N1aGgiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjU2YjU5NTViMjk1NTIyYzk2ODk0ODE5NjBjMDFhOTkyY2ExYzc3NTRjZjRlZTMxM2M4ZGQwYzM1NmQzMzVmIgogICAgfQogIH0KfQ"
 					)
 				);
+				/* RIFT COLLECTIONS */
+				put("AGARICUS_CAP",
+					Utils.createSkull(
+						EnumChatFormatting.DARK_PURPLE + "Agaricus Cap",
+						"43e884b2-633e-3c87-b601-62d18c11683f",
+						"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGNlMGEyMzBhY2Q2NDM2YWJjODZmMTNiZTcyZTliYTk0NTM3ZWU1NGYwMzI1YmI4NjI1NzdhMWUwNjJmMzcifX19"
+					));
+				put("CADUCOUS_STEM", Utils.createItemStack(Item.getItemFromBlock(Blocks.double_plant),
+					EnumChatFormatting.DARK_PURPLE + "Caducous Stem", 4));
+				put("HALF_EATEN_CARROT", Utils.createItemStack(Items.carrot, EnumChatFormatting.DARK_PURPLE + "Half-Eaten Carrot"));
+				put("HEMOVIBE", Utils.createItemStack(Item.getItemFromBlock(Blocks.redstone_ore), EnumChatFormatting.DARK_PURPLE + "Hemovibe"));
+				put("METAL_HEART",
+					Utils.createSkull(
+						EnumChatFormatting.DARK_PURPLE + "Living Metal Heart",
+						"c678b8cc-c130-31d1-baf3-14660f8ef742",
+						"ewogICJ0aW1lc3RhbXAiIDogMTY3NjQ3NjQ1NjcyNywKICAicHJvZmlsZUlkIiA6ICI5MGQ1NDY0OGEzNWE0YmExYTI2Yjg1YTg4NTU4OGJlOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJFdW4wbWlhIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2YwMjc4ZWU1M2E1M2I3NzMzYzdiODQ1MmZjZjc5NGRmYmZiYzNiMDMyZTc1MGE2OTkzNTczYjViZDAyOTkxMzUiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ"
+					));
+				put("WILTED_BERBERIS", Utils.createItemStack(Item.getItemFromBlock(Blocks.deadbush), EnumChatFormatting.DARK_PURPLE + "Wilted Berberis"));
 			}
 		};
 	private static final AtomicBoolean updatingResourceCollection = new AtomicBoolean(false);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java
index 814db2ce..1d8def80 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/SkyblockProfiles.java
@@ -757,7 +757,7 @@ public class SkyblockProfiles {
 					ProfileViewerUtils.getLevel(
 						Utils.getElement(leveling, "slayer_xp." + slayerName).getAsJsonArray(),
 						slayerExperience,
-						9,
+						slayerName.equals("vampire") ? 5 : 9,
 						true
 					)
 				);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/senither/SenitherSlayerWeight.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/senither/SenitherSlayerWeight.java
index e9fd5b41..583d9f34 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/senither/SenitherSlayerWeight.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/senither/SenitherSlayerWeight.java
@@ -35,7 +35,7 @@ public class SenitherSlayerWeight extends SlayerWeight {
 	}
 
 	public void getSlayerWeight(String slayerName) {
-		if (slayerName.equals("blaze")) {
+		if (slayerName.equals("blaze") || slayerName.equals("vampire")) {
 			return;
 		}
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/weight/Weight.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/weight/Weight.java
index 83095e96..c13c4a7b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/weight/Weight.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/weight/Weight.java
@@ -34,7 +34,7 @@ public abstract class Weight {
 		"fishing",
 		"alchemy"
 	);
-	public static final List<String> SLAYER_NAMES = Arrays.asList("wolf", "zombie", "spider", "enderman", "blaze");
+	public static final List<String> SLAYER_NAMES = Arrays.asList("wolf", "zombie", "spider", "enderman", "blaze", "vampire");
 	public static final List<String> DUNGEON_CLASS_NAMES = Arrays.asList("healer", "mage", "berserk", "archer", "tank");
 	protected final SlayerWeight slayerWeight;
 	protected final SkillsWeight skillsWeight;
diff --git a/src/main/resources/assets/notenoughupdates/pv_basic.png b/src/main/resources/assets/notenoughupdates/pv_basic.png
index de254644..99d56946 100644
--- a/src/main/resources/assets/notenoughupdates/pv_basic.png
+++ b/src/main/resources/assets/notenoughupdates/pv_basic.png