Add water puzzle solver, bug fixes

Update trivia solutions
Limit skills from achievement API to 50
Fix typo in puzzle solvers GUI

3 files changed, 18 insertions, 11 deletions

diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index abbc3c8..b3bdbbf 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -34,7 +34,7 @@ public class DHelpCommand extends CommandBase {
 													EnumChatFormatting.GOLD + " Commands, " + EnumChatFormatting.GREEN + " Keybinds.\n" +
 													EnumChatFormatting.GOLD + " /dhelp" + EnumChatFormatting.AQUA + " - Returns this message.\n" +
 													EnumChatFormatting.GOLD + " /dsm" + EnumChatFormatting.AQUA + " - Opens the GUI for Danker's Skyblock Mod.\n" +
-													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/threemanpuzzle/midasstaffmessages/healmessages/caketimer/lividsolver/oruopuzzle/blazepuzzle/creeperpuzzle/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
+													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/threemanpuzzle/midasstaffmessages/healmessages/caketimer/lividsolver/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
 													EnumChatFormatting.GOLD + " /setkey <key>" + EnumChatFormatting.AQUA + " - Sets API key.\n" +
 													EnumChatFormatting.GOLD + " /getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey and copies it to your clipboard.\n" +
 													EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
diff --git a/src/main/java/me/Danker/commands/SkillsCommand.java b/src/main/java/me/Danker/commands/SkillsCommand.java
index 7405a84..12bfd93 100644
--- a/src/main/java/me/Danker/commands/SkillsCommand.java
+++ b/src/main/java/me/Danker/commands/SkillsCommand.java
@@ -144,25 +144,25 @@ public class SkillsCommand extends CommandBase {
 					farmingLevel = achievementObject.get("skyblock_harvester").getAsInt();
 				}
 				if (achievementObject.has("skyblock_excavator")) {
-					miningLevel = achievementObject.get("skyblock_excavator").getAsInt();
+					miningLevel = Math.min(achievementObject.get("skyblock_excavator").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_combat")) {
-					combatLevel = achievementObject.get("skyblock_combat").getAsInt();
+					combatLevel = Math.min(achievementObject.get("skyblock_combat").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_gatherer")) {
-					foragingLevel = achievementObject.get("skyblock_gatherer").getAsInt();
+					foragingLevel = Math.min(achievementObject.get("skyblock_gatherer").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_angler")) {
-					fishingLevel = achievementObject.get("skyblock_angler").getAsInt();
+					fishingLevel = Math.min(achievementObject.get("skyblock_angler").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_augmentation")) {
-					enchantingLevel = achievementObject.get("skyblock_augmentation").getAsInt();
+					enchantingLevel = Math.min(achievementObject.get("skyblock_augmentation").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_concoctor")) {
-					alchemyLevel = achievementObject.get("skyblock_concoctor").getAsInt();
+					alchemyLevel = Math.min(achievementObject.get("skyblock_concoctor").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_domesticator")) {
-					tamingLevel = achievementObject.get("skyblock_domesticator").getAsInt();
+					tamingLevel = Math.min(achievementObject.get("skyblock_domesticator").getAsInt(), 50);
 				}
 			}
 
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 25b3ff3..df39af6 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -41,6 +41,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean oruoToggled;
 	public static boolean blazeToggled;
 	public static boolean creeperToggled;
+	public static boolean waterToggled;
 	
 	@Override
 	public String getCommandName() {
@@ -51,7 +52,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public String getCommandUsage(ICommandSender arg0) {
 		return "/" + getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalert/" + 
 										  "aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" + 
-										  "outlinetext/midasstaffmessages/healmessages/caketimer/lividsolver/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/list>";
+										  "outlinetext/midasstaffmessages/healmessages/caketimer/lividsolver/threemanpuzzle/oruopuzzle/" + 
+										  "blazepuzzle/creeperpuzzle/waterpuzzle/list>";
 	}
 
 	@Override
@@ -67,7 +69,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 														  "sceptremessages", "petcolors", "dungeontimer", "golemalerts",
 														  "expertiselore", "skill50display", "outlinetext", "midasstaffmessages",
 														  "healmessages", "caketimer", "lividsolver",  "threemanpuzzle", "oruopuzzle",
-														  "blazepuzzle", "creeperpuzzle", "list");
+														  "blazepuzzle", "creeperpuzzle", "waterpuzzle", "list");
 		}
 		return null;
 	}
@@ -182,6 +184,10 @@ public class ToggleCommand extends CommandBase implements ICommand {
 			creeperToggled = !creeperToggled;
 			cf.writeBooleanConfig("creeperpuzzle", "CreeperPuzzle", creeperToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Creeper puzzle solver has been set to " + TheMod.SECONDARY_COLOUR + creeperToggled + TheMod.MAIN_COLOUR + "."));
+		} else if (arg1[0].equalsIgnoreCase("waterpuzzle")) {
+			waterToggled = !waterToggled;
+			cf.writeBooleanConfig("waterpuzzle", "WaterPuzzle", waterToggled);
+			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Water puzzle solver has been set to " + TheMod.SECONDARY_COLOUR + waterToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("list")) {
 			player.addChatMessage(new ChatComponentText(TheMod.TYPE_COLOUR + "Guild party notifications: " + TheMod.VALUE_COLOUR + gpartyToggled + "\n" +
 														TheMod.TYPE_COLOUR + " Coord/Angle display: " + TheMod.VALUE_COLOUR + coordsToggled + "\n" +
@@ -207,7 +213,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 														TheMod.TYPE_COLOUR + " Three man puzzle solver: " + TheMod.VALUE_COLOUR + threeManToggled + "\n" +
 														TheMod.TYPE_COLOUR + " Oruo trivia solver: " + TheMod.VALUE_COLOUR + oruoToggled + "\n" +
 														TheMod.TYPE_COLOUR + " Blaze puzzle solver: " + TheMod.VALUE_COLOUR + blazeToggled + "\n" +
-														TheMod.TYPE_COLOUR + " Creeper puzzle solver: " + TheMod.VALUE_COLOUR + creeperToggled));
+														TheMod.TYPE_COLOUR + " Creeper puzzle solver: " + TheMod.VALUE_COLOUR + creeperToggled + "\n" +
+														TheMod.TYPE_COLOUR + " Water puzzle solver: " + TheMod.VALUE_COLOUR + waterToggled));
 		} else {
 			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 		}