Trophy Fishing Tab (#163)

* trophy fishing

cool stuff

Co-Authored-By: jani270 <69345714+jani270@users.noreply.github.com>

* noob

* yep

bugs:
- not uploading when swapping profiles
- while hovering over lowest slot, left skulls have light issue

Co-Authored-By: jani270 <69345714+jani270@users.noreply.github.com>

* change when switching profiles

* things

lighting bugs
add trophy page to pageLayout on startup
disable dungeon map on startup

* map message

* 🤡 but ok

Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>

* i hate you iron

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: Lulonaut <lulonaut@tutanota.de>
Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>

1 files changed, 16 insertions, 6 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
index ba3b97f8..e4014ca3 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
@@ -29,6 +29,7 @@ import com.mojang.authlib.GameProfile;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.cosmetics.ShaderManager;
 import io.github.moulberry.notenoughupdates.itemeditor.GuiElementTextField;
+import io.github.moulberry.notenoughupdates.profileviewer.trophy.TrophyFishingPage;
 import io.github.moulberry.notenoughupdates.util.Constants;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
 import io.github.moulberry.notenoughupdates.util.Utils;
@@ -199,7 +200,7 @@ public class GuiProfileViewer extends GuiScreen {
 			"personal_vault_contents",
 			Utils.editItemStackInfo(NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager
 				.getItemInformation()
-				.get("IRON_CHEST")), EnumChatFormatting.GRAY + "Personal vault", true)
+				.get("IRON_CHEST")), EnumChatFormatting.GRAY + "Personal Vault", true)
 		);
 		put("talisman_bag", Utils.createItemStack(Items.golden_apple, EnumChatFormatting.GRAY + "Accessory Bag"));
 		put("wardrobe_contents", Utils.createItemStack(Items.leather_chestplate, EnumChatFormatting.GRAY + "Wardrobe"));
@@ -223,7 +224,7 @@ public class GuiProfileViewer extends GuiScreen {
 	private static int floorTime = 7;
 	private static int guiLeft;
 	private static int guiTop;
-	private static ProfileViewer.Profile profile = null;
+	private static ProfileViewer.Profile profile;
 	private final GuiElementTextField playerNameTextField;
 	private final HashMap<String, ProfileViewer.Level> levelObjCatas = new HashMap<>();
 	private final HashMap<String, ProfileViewer.Level> levelObjhotms = new HashMap<>();
@@ -251,7 +252,7 @@ public class GuiProfileViewer extends GuiScreen {
 	private long lastTime = 0;
 	private long startTime = 0;
 	private List<String> tooltipToDisplay = null;
-	private String profileId = null;
+	private static String profileId = null;
 	private boolean profileDropdownSelected = false;
 	private ItemStack selectedCollectionCategory = null;
 	private int floorLevelTo = -1;
@@ -282,9 +283,10 @@ public class GuiProfileViewer extends GuiScreen {
 	private boolean showBingoPage;
 
 	public GuiProfileViewer(ProfileViewer.Profile profile) {
-		this.profile = profile;
+		GuiProfileViewer.profile = profile;
+		GuiProfileViewer.profileId = profile.getLatestProfile();
 		String name = "";
-		if (profile != null && profile.getHypixelProfile() != null) {
+		if (profile.getHypixelProfile() != null) {
 			name = profile.getHypixelProfile().get("displayname").getAsString();
 		}
 		playerNameTextField = new GuiElementTextField(
@@ -466,6 +468,10 @@ public class GuiProfileViewer extends GuiScreen {
 		return profile;
 	}
 
+	public static String getProfileId() {
+		return profileId;
+	}
+
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 		currentTime = System.currentTimeMillis();
@@ -708,6 +714,9 @@ public class GuiProfileViewer extends GuiScreen {
 			case BINGO:
 				BingoPage.renderPage(mouseX, mouseY);
 				break;
+			case TROPHY_FISH:
+				TrophyFishingPage.renderPage(mouseX, mouseY);
+				break;
 			case LOADING:
 				String str = EnumChatFormatting.YELLOW + "Loading player profiles.";
 				long currentTimeMod = System.currentTimeMillis() % 1000;
@@ -5354,7 +5363,8 @@ public class GuiProfileViewer extends GuiScreen {
 		COLLECTIONS(4, Items.painting, "Collections"),
 		PETS(5, Items.bone, "Pets"),
 		MINING(6, Items.iron_pickaxe, "Heart of the Mountain"),
-		BINGO(7, Items.filled_map, "Bingo");
+		BINGO(7, Items.filled_map, "Bingo"),
+		TROPHY_FISH(8, Items.fishing_rod, "Trophy Fish");
 
 		public final ItemStack stack;
 		public final int id;