Add CH fishing tracker

Organized change display GUI
Add method to make centered text rendering easier

4 files changed, 120 insertions, 41 deletions

diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index d335a8a..3db6853 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -21,7 +21,7 @@ public class DisplayCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological/ghost/auto/off> [winter/festival/spooky/session/f(1-7)/mm]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological/ghost/auto/off> [winter/festival/spooky/ch/session/f(1-7)/mm]";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -38,7 +38,7 @@ public class DisplayCommand extends CommandBase {
 		if (args.length == 1) {
 			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "enderman", "fishing", "catacombs", "mythological", "ghost", "auto", "off");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
-			return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session");
+			return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "ch", "session");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
 			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7", "mm", "master");
 		} else if (args.length > 1) {
@@ -113,6 +113,13 @@ public class DisplayCommand extends CommandBase {
 							LootDisplay.display = "fishing_spooky";
 						}
 						break;
+					case "ch":
+						if (showSession) {
+							LootDisplay.display = "fishing_ch";
+						} else {
+							LootDisplay.display = "fishing_ch_session";
+						}
+						break;
 					default:
 						if (showSession) {
 							LootDisplay.display = "fishing_session";
diff --git a/src/main/java/me/Danker/commands/ImportFishingCommand.java b/src/main/java/me/Danker/commands/ImportFishingCommand.java
index 3ee5ebd..bdd3281 100644
--- a/src/main/java/me/Danker/commands/ImportFishingCommand.java
+++ b/src/main/java/me/Danker/commands/ImportFishingCommand.java
@@ -37,22 +37,22 @@ public class ImportFishingCommand extends CommandBase {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
 			EntityPlayer player = (EntityPlayer) arg0;
-			
+
 			// Check key
 			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 				return;
 			}
-						
+
 			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Importing your fishing stats..."));
-			
+
 			// Get UUID for Hypixel API requests
 			String uuid = player.getUniqueID().toString().replaceAll("[\\-]", "");
-			
+
 			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
-			
+
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
 			JsonObject profileResponse = APIHandler.getResponse(profileURL, true);
@@ -61,10 +61,10 @@ public class ImportFishingCommand extends CommandBase {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
 				return;
 			}
-			
+
 			System.out.println("Fetching fishing stats...");
 			JsonObject statsObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("stats").getAsJsonObject();
-			
+
 			FishingTracker.greatCatches = 0;
 			FishingTracker.goodCatches = 0;
 			if (statsObject.has("items_fished_treasure")) {
@@ -75,44 +75,44 @@ public class ImportFishingCommand extends CommandBase {
 					FishingTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
 				}
 			}
-			
+
 			FishingTracker.seaCreatures = 0;
 			FishingTracker.squids = 0;
 			if (statsObject.has("kills_pond_squid")) {
 				FishingTracker.squids = statsObject.get("kills_pond_squid").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.squids;
-			
+
 			FishingTracker.seaWalkers = 0;
 			if (statsObject.has("kills_sea_walker")) {
 				FishingTracker.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.seaWalkers;
-			
+
 			FishingTracker.nightSquids = 0;
 			if (statsObject.has("kills_night_squid")) {
 				FishingTracker.nightSquids = statsObject.get("kills_night_squid").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.nightSquids;
-			
+
 			FishingTracker.seaGuardians = 0;
 			if (statsObject.has("kills_sea_guardian")) {
 				FishingTracker.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.seaGuardians;
-				
+
 			FishingTracker.seaWitches = 0;
 			if (statsObject.has("kills_sea_witch")) {
 				FishingTracker.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.seaWitches;
-			
+
 			FishingTracker.seaArchers = 0;
 			if (statsObject.has("kills_sea_archer")) {
 				FishingTracker.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.seaArchers;
-			
+
 			FishingTracker.monsterOfTheDeeps = 0;
 			if (statsObject.has("kills_zombie_deep")) {
 				if (statsObject.has("kills_chicken_deep")) {
@@ -124,44 +124,44 @@ public class ImportFishingCommand extends CommandBase {
 				FishingTracker.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.monsterOfTheDeeps;
-			
+
 			FishingTracker.catfishes = 0;
 			if (statsObject.has("kills_catfish")) {
 				FishingTracker.catfishes = statsObject.get("kills_catfish").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.catfishes;
-			
+
 			FishingTracker.carrotKings = 0;
 			if (statsObject.has("kills_carrot_king")) {
 				FishingTracker.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.carrotKings;
-			
+
 			FishingTracker.seaLeeches = 0;
 			if (statsObject.has("kills_sea_leech")) {
 				FishingTracker.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.seaLeeches;
-			
+
 			FishingTracker.guardianDefenders = 0;
 			if (statsObject.has("kills_guardian_defender")) {
 				FishingTracker.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.guardianDefenders;
-			
+
 			FishingTracker.deepSeaProtectors = 0;
 			if (statsObject.has("kills_deep_sea_protector")) {
 				FishingTracker.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.deepSeaProtectors;
-			
+
 			FishingTracker.hydras = 0;
 			if (statsObject.has("kills_water_hydra")) {
 				// Hydra splits
 				FishingTracker.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
 			}
 			FishingTracker.seaCreatures += FishingTracker.hydras;
-			
+
 			FishingTracker.seaEmperors = 0;
 			if (statsObject.has("kills_skeleton_emperor")) {
 				if (statsObject.has("kills_guardian_emperor")) {
@@ -173,90 +173,126 @@ public class ImportFishingCommand extends CommandBase {
 				FishingTracker.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.seaEmperors;
-			
+
 			FishingTracker.fishingMilestone = 0;
 			if (statsObject.has("pet_milestone_sea_creatures_killed")) {
 				FishingTracker.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
 			}
-			
+
 			FishingTracker.frozenSteves = 0;
 			if (statsObject.has("kills_frozen_steve")) {
 				FishingTracker.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.frozenSteves;
-			
+
 			FishingTracker.frostyTheSnowmans = 0;
 			if (statsObject.has("kills_frosty_the_snowman")) {
 				FishingTracker.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.frostyTheSnowmans;
-			
+
 			FishingTracker.grinches = 0;
 			if (statsObject.has("kills_grinch")) {
 				FishingTracker.grinches = statsObject.get("kills_grinch").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.grinches;
-			
+
 			FishingTracker.yetis = 0;
 			if (statsObject.has("kills_yeti")) {
 				FishingTracker.yetis = statsObject.get("kills_yeti").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.yetis;
-			
+
 			FishingTracker.nurseSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
 				FishingTracker.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.nurseSharks;
-			
+
 			FishingTracker.blueSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
 				FishingTracker.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.blueSharks;
-			
+
 			FishingTracker.tigerSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
 				FishingTracker.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.tigerSharks;
-			
+
 			FishingTracker.greatWhiteSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
 				FishingTracker.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.greatWhiteSharks;
-			
+
 			FishingTracker.scarecrows = 0;
 			if (statsObject.has("kills_scarecrow")) {
 				FishingTracker.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.scarecrows;
-			
+
 			FishingTracker.nightmares = 0;
 			if (statsObject.has("kills_nightmare")) {
 				FishingTracker.nightmares = statsObject.get("kills_nightmare").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.nightmares;
-			
+
 			FishingTracker.werewolfs = 0;
 			if (statsObject.has("kills_werewolf")) {
 				FishingTracker.werewolfs = statsObject.get("kills_werewolf").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.werewolfs;
-			
+
 			FishingTracker.phantomFishers = 0;
 			if (statsObject.has("kills_phantom_fisherman")) {
 				FishingTracker.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.phantomFishers;
-			
+
 			FishingTracker.grimReapers = 0;
 			if (statsObject.has("kills_grim_reaper")) {
 				FishingTracker.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
 			}
 			FishingTracker.seaCreatures += FishingTracker.grimReapers;
-			
+
+			FishingTracker.waterWorms = 0;
+			if (statsObject.has("kills_water_worm")) {
+				FishingTracker.waterWorms = statsObject.get("kills_water_worm").getAsInt();
+			}
+			FishingTracker.seaCreatures += FishingTracker.waterWorms;
+
+			FishingTracker.poisonedWaterWorms = 0;
+			if (statsObject.has("kills_poisoned_water_worm")) {
+				FishingTracker.poisonedWaterWorms = statsObject.get("kills_poisoned_water_worm").getAsInt();
+			}
+			FishingTracker.seaCreatures += FishingTracker.poisonedWaterWorms;
+
+			FishingTracker.flamingWorms = 0;
+			if (statsObject.has("kills_flaming_worm")) {
+				FishingTracker.flamingWorms = statsObject.get("kills_flaming_worm").getAsInt();
+			}
+			FishingTracker.seaCreatures += FishingTracker.flamingWorms;
+
+			FishingTracker.lavaBlazes = 0;
+			if (statsObject.has("kills_lava_blaze")) {
+				FishingTracker.lavaBlazes = statsObject.get("kills_lava_blaze").getAsInt();
+			}
+			FishingTracker.seaCreatures += FishingTracker.lavaBlazes;
+
+			FishingTracker.lavaPigmen = 0;
+			if (statsObject.has("kills_lava_pigman")) {
+				FishingTracker.lavaPigmen = statsObject.get("kills_lava_pigman").getAsInt();
+			}
+			FishingTracker.seaCreatures += FishingTracker.lavaPigmen;
+
+			FishingTracker.zombieMiners = 0;
+			if (statsObject.has("kills_zombie_miner")) {
+				FishingTracker.zombieMiners = statsObject.get("kills_zombie_miner").getAsInt();
+			}
+			FishingTracker.seaCreatures += FishingTracker.zombieMiners;
+
 			System.out.println("Writing to config...");
 			ConfigHandler.writeIntConfig("fishing", "goodCatch", FishingTracker.goodCatches);
 			ConfigHandler.writeIntConfig("fishing", "greatCatch", FishingTracker.greatCatches);
@@ -289,7 +325,13 @@ public class ImportFishingCommand extends CommandBase {
 			ConfigHandler.writeIntConfig("fishing", "werewolf", FishingTracker.werewolfs);
 			ConfigHandler.writeIntConfig("fishing", "phantomFisher", FishingTracker.phantomFishers);
 			ConfigHandler.writeIntConfig("fishing", "grimReaper", FishingTracker.grimReapers);
-			
+			ConfigHandler.writeIntConfig("fishing", "waterWorm", FishingTracker.waterWorms);
+			ConfigHandler.writeIntConfig("fishing", "poisonedWaterWorm", FishingTracker.poisonedWaterWorms);
+			ConfigHandler.writeIntConfig("fishing", "flamingWorm", FishingTracker.flamingWorms);
+			ConfigHandler.writeIntConfig("fishing", "lavaBlaze", FishingTracker.lavaBlazes);
+			ConfigHandler.writeIntConfig("fishing", "lavaPigman", FishingTracker.lavaPigmen);
+			ConfigHandler.writeIntConfig("fishing", "zombieMiner", FishingTracker.zombieMiners);
+
 			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Fishing stats imported."));
 		}).start();
 	}
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 1437b36..2a647c6 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -24,7 +24,7 @@ public class LootCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological> [winter/festival/spooky/f(1-7)/mm/session]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological> [winter/festival/spooky/ch/f(1-7)/mm/session]";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -41,7 +41,7 @@ public class LootCommand extends CommandBase {
 		if (args.length == 1) {
 			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "enderman", "fishing", "catacombs", "mythological");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
-			return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session");
+			return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "ch", "session");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
 			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7", "mm", "master");
 		} else if (args.length > 1) {
@@ -451,6 +451,30 @@ public class LootCommand extends CommandBase {
 																	EnumChatFormatting.GOLD + "    Phantom Fishers: " + nf.format(FishingTracker.phantomFishers) + "\n" +
 																	EnumChatFormatting.GOLD + "    Grim Reapers: " + nf.format(FishingTracker.grimReapers) + "\n" +
 																	EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
+					} else if (arg1[1].equalsIgnoreCase("ch")) {
+						if (showSession) {
+							player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																		EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + " Crystal Hollows Fishing Summary:\n" +
+																		EnumChatFormatting.BLUE + "    Water Worms: " + nf.format(FishingTracker.waterWormsSession) + "\n" +
+																		EnumChatFormatting.GREEN + "    Poisoned Water Worms: " + nf.format(FishingTracker.poisonedWaterWormsSession) + "\n" +
+																		EnumChatFormatting.RED + "    Flaming Worms: " + nf.format(FishingTracker.flamingWormsSession) + "\n" +
+																		EnumChatFormatting.LIGHT_PURPLE + "    Lava Blazes: " + nf.format(FishingTracker.lavaBlazesSession) + "\n" +
+																		EnumChatFormatting.LIGHT_PURPLE + "    Lava Pigmen: " + nf.format(FishingTracker.lavaPigmenSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Zombie Miners: " + nf.format(FishingTracker.zombieMinersSession) + "\n" +
+																		EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
+
+							return;
+						}
+
+						player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																	EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + " Crystal Hollows Fishing Summary:\n" +
+																	EnumChatFormatting.BLUE + "    Water Worms: " + nf.format(FishingTracker.waterWorms) + "\n" +
+																	EnumChatFormatting.GREEN + "    Poisoned Water Worms: " + nf.format(FishingTracker.poisonedWaterWorms) + "\n" +
+																	EnumChatFormatting.RED + "    Flaming Worms: " + nf.format(FishingTracker.flamingWorms) + "\n" +
+																	EnumChatFormatting.LIGHT_PURPLE + "    Lava Blazes: " + nf.format(FishingTracker.lavaBlazes) + "\n" +
+																	EnumChatFormatting.LIGHT_PURPLE + "    Lava Pigmen: " + nf.format(FishingTracker.lavaPigmen) + "\n" +
+																	EnumChatFormatting.GOLD + "    Zombie Miners: " + nf.format(FishingTracker.zombieMiners) + "\n" +
+																	EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
 					}
 				}
 
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 2c5c947..cca7dda 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -238,6 +238,12 @@ public class ResetLootCommand extends CommandBase {
 		FishingTracker.werewolfsSession = 0;
 		FishingTracker.phantomFishersSession = 0;
 		FishingTracker.grimReapersSession = 0;
+		FishingTracker.waterWorms = 0;
+		FishingTracker.poisonedWaterWorms = 0;
+		FishingTracker.flamingWorms = 0;
+		FishingTracker.lavaBlazes = 0;
+		FishingTracker.lavaPigmen = 0;
+		FishingTracker.zombieMiners = 0;
 		ConfigHandler.deleteCategory("fishing");
 		ConfigHandler.reloadConfig();
 	}