Merge pull request #49 from Sychic/development

Features: Old Animations Warning, cooldown messages, mana messages, and secrets found

9 files changed, 442 insertions, 131 deletions

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 85d312c..53b42af 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -1,5 +1,6 @@
 package me.Danker;
 
+import akka.event.Logging;
 import com.google.gson.JsonObject;
 import me.Danker.commands.*;
 import me.Danker.gui.*;
@@ -10,12 +11,11 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiChat;
-import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.gui.*;
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.command.ICommand;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraft.entity.item.EntityItemFrame;
@@ -69,6 +69,7 @@ import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
+import java.net.URLDecoder;
 import java.text.NumberFormat;
 import java.util.List;
 import java.util.*;
@@ -78,7 +79,7 @@ import java.util.regex.Pattern;
 @Mod(modid = DankersSkyblockMod.MODID, version = DankersSkyblockMod.VERSION, clientSideOnly = true)
 public class DankersSkyblockMod {
     public static final String MODID = "Danker's Skyblock Mod";
-    public static final String VERSION = "1.8.5-beta7";
+    public static final String VERSION = "1.8.5-beta8";
     static double checkItemsNow = 0;
     static double itemsChecked = 0;
     public static Map<String, String> t6Enchants = new HashMap<>();
@@ -97,6 +98,8 @@ public class DankersSkyblockMod {
     static double lastMaddoxTime = 0;
     static KeyBinding[] keyBindings = new KeyBinding[3];
     static boolean usingLabymod = false;
+    static boolean usingOAM = false;
+    static boolean OAMWarning = false;
     public static String guiToOpen = null;
     static boolean foundLivid = false;
     static Entity livid = null;
@@ -306,15 +309,43 @@ public class DankersSkyblockMod {
     	ClientCommandHandler.instance.registerCommand(new LobbySkillsCommand());
     	ClientCommandHandler.instance.registerCommand(new DankerGuiCommand());
 		ClientCommandHandler.instance.registerCommand(new SkillTrackerCommand());
-		ClientCommandHandler.instance.registerCommand(new RepartyCommand());
     }
 
     @EventHandler
     public void postInit(final FMLPostInitializationEvent event) {
-        usingLabymod = Loader.isModLoaded("labymod");
-        System.out.println("LabyMod detection: " + usingLabymod);
+		Package[] packages = Package.getPackages();
+		for(Package p : packages){
+			if(p.getName().startsWith("com.spiderfrog.gadgets") || p.getName().startsWith("com.spiderfrog.oldanimations")){
+				usingOAM = true;
+			}
+		}
+		System.out.println("OAM detection: " + usingOAM);
+
+    	usingLabymod = Loader.isModLoaded("labymod");
+    	System.out.println("LabyMod detection: " + usingLabymod);
+    	
+        if(!ClientCommandHandler.instance.getCommands().containsKey("reparty")) {
+            ClientCommandHandler.instance.registerCommand(new RepartyCommand());
+        } else if (ConfigHandler.getBoolean("commands", "reparty")) {
+            for(Map.Entry<String, ICommand> entry : ClientCommandHandler.instance.getCommands().entrySet()) {
+                if (entry.getKey().equals("reparty") || entry.getKey().equals("rp")) {
+                    entry.setValue(new RepartyCommand());
+                }
+            }
+        }
+
     }
 
+    @SubscribeEvent
+	public void onGuiOpenEvent(GuiOpenEvent event){
+		if(event.gui instanceof GuiMainMenu && usingOAM && !OAMWarning){
+			if(!(event.gui instanceof WarningGui)){
+				event.gui = new WarningGuiRedirect(new WarningGui());
+				OAMWarning = true;
+			}
+		}
+	}
+
     // Update checker
     @SubscribeEvent
     public void onJoin(EntityJoinWorldEvent event) {
@@ -400,38 +431,127 @@ public class DankersSkyblockMod {
         }
 
 		// Reparty command
-		if (System.currentTimeMillis() / 1000 - RepartyCommand.callTime <= 5) {
-			if (!(message.contains("----") || message.contains("disbanded") || message.contains("seconds to accept") || message.contains("●") || message.contains("Party Members") || message.contains("Couldn't find a player") || message.contains("cannot invite that player") || message.length() == 0)) {
-				return;
-			}
-			
-			EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
-			
-			Pattern party_start_pattern = Pattern.compile("^Party Members \\((\\d+)\\)$");
-            Pattern leader_pattern = Pattern.compile("^Party Leader: (?:\\[.+?] )?(\\w+) ●$");
-			Pattern members_pattern = Pattern.compile(" (?:\\[.+?] )?(\\w+) ●");
-            Matcher party_start = party_start_pattern.matcher(message);
-            Matcher leader = leader_pattern.matcher(message);
-            Matcher members = members_pattern.matcher(message);
-			
-			if (party_start.matches() && Integer.parseInt(party_start.group(1)) == 1) {
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "You cannot reparty yourself."));
-			}
-            else if (leader.matches() && !(leader.group(1).equals(player.getName()))) {
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "You are not party leader."));
-			}
-			else if (message.contains("Couldn't find a player") || message.contains("You cannot invite that player")) {
-				RepartyCommand.repartyFailList.add(RepartyCommand.currentMember);
-			}
-			else {
-				while (members.find()) {
-					String partyMember = members.group(1);
-					if (!partyMember.equals(player.getName())) {
-						RepartyCommand.party.add(partyMember);
-					}
-				}
-			}
-			event.setCanceled(true);
+        // Getting party
+        if (RepartyCommand.gettingParty) {
+            if (message.contains("-----")) {
+                switch(RepartyCommand.Delimiter) {
+                    case 0:
+                        System.out.println("Get Party Delimiter Cancelled");
+                        RepartyCommand.Delimiter++;
+                        event.setCanceled(true);
+                        return;
+                    case 1:
+                        System.out.println("Done querying party");
+                        RepartyCommand.gettingParty = false;
+                        RepartyCommand.Delimiter = 0;
+                        event.setCanceled(true);
+                        return;
+                }
+            }else if (message.startsWith("Party M") || message.startsWith("Party Leader")){
+                EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
+
+                Pattern party_start_pattern = Pattern.compile("^Party Members \\((\\d+)\\)$");
+                Pattern leader_pattern = Pattern.compile("^Party Leader: (?:\\[.+?] )?(\\w+) ●$");
+                Pattern members_pattern = Pattern.compile(" (?:\\[.+?] )?(\\w+) ●");
+                Matcher party_start = party_start_pattern.matcher(message);
+                Matcher leader = leader_pattern.matcher(message);
+                Matcher members = members_pattern.matcher(message);
+
+                if (party_start.matches() && Integer.parseInt(party_start.group(1)) == 1) {
+                    player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "You cannot reparty yourself."));
+                    RepartyCommand.partyThread.interrupt();
+                } else if (leader.matches() && !(leader.group(1).equals(player.getName()))) {
+                    player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "You are not party leader."));
+                    RepartyCommand.partyThread.interrupt();
+                } else {
+                    while (members.find()) {
+                        String partyMember = members.group(1);
+                        if (!partyMember.equals(player.getName())) {
+                            RepartyCommand.party.add(partyMember);
+                            System.out.println(partyMember);
+                        }
+                    }
+                }
+                event.setCanceled(true);
+                return;
+            }
+        }
+        // Disbanding party
+        if (RepartyCommand.disbanding) {
+            if (message.contains("-----")) {
+                switch (RepartyCommand.Delimiter) {
+                    case 0:
+                        System.out.println("Disband Delimiter Cancelled");
+                        RepartyCommand.Delimiter++;
+                        event.setCanceled(true);
+                        return;
+                    case 1:
+                        System.out.println("Done disbanding");
+                        RepartyCommand.disbanding = false;
+                        RepartyCommand.Delimiter = 0;
+                        event.setCanceled(true);
+                        return;
+                }
+            } else if (message.endsWith("has disbanded the party!")) {
+                event.setCanceled(true);
+                return;
+            }
+        }
+        // Inviting
+        if (RepartyCommand.inviting) {
+            if (message.contains("-----")) {
+                switch (RepartyCommand.Delimiter) {
+                    case 1:
+                        event.setCanceled(true);
+                        RepartyCommand.Delimiter = 0;
+                        System.out.println("Player Invited!");
+                        RepartyCommand.inviting = false;
+                        return;
+                    case 0:
+                        RepartyCommand.Delimiter++;
+                        event.setCanceled(true);
+                        return;
+                }
+            } else if (message.endsWith(" to the party! They have 60 seconds to accept.")) {
+                Pattern invitePattern = Pattern.compile("(?:(?:\\[.+?] )?(?:\\w+) invited )(?:\\[.+?] )?(\\w+)");
+                Matcher invitee = invitePattern.matcher(message);
+                if (invitee.find()) {
+                    System.out.println("" + invitee.group(1) + ": " + RepartyCommand.repartyFailList.remove(invitee.group(1)));
+                }
+                event.setCanceled(true);
+                return;
+            } else if (message.contains("Couldn't find a player") || message.contains("You cannot invite that player")) {
+                event.setCanceled(true);
+                return;
+            }
+        }
+        // Fail Inviting
+        if (RepartyCommand.failInviting) {
+            if (message.contains("-----")) {
+                switch (RepartyCommand.Delimiter) {
+                    case 1:
+                        event.setCanceled(true);
+                        RepartyCommand.Delimiter = 0;
+                        System.out.println("Player Invited!");
+                        RepartyCommand.inviting = false;
+                        return;
+                    case 0:
+                        RepartyCommand.Delimiter++;
+                        event.setCanceled(true);
+                        return;
+                }
+            } else if (message.endsWith(" to the party! They have 60 seconds to accept.")) {
+                Pattern invitePattern = Pattern.compile("(?:(?:\\[.+?] )?(?:\\w+) invited )(?:\\[.+?] )?(\\w+)");
+                Matcher invitee = invitePattern.matcher(message);
+                if (invitee.find()) {
+                    System.out.println("" + invitee.group(1) + ": " + RepartyCommand.repartyFailList.remove(invitee.group(1)));
+                }
+                event.setCanceled(true);
+                return;
+            } else if (message.contains("Couldn't find a player") || message.contains("You cannot invite that player")) {
+                event.setCanceled(true);
+                return;
+            }
         }
 
     	if (!Utils.inSkyblock) return;
@@ -646,6 +766,16 @@ public class DankersSkyblockMod {
             event.setCanceled(true);
             return;
         }
+        // Ability Cooldown
+        if (!ToggleCommand.cooldownMessages && message.contains("This ability is currently on cooldown for") && message.contains("more second")) {
+          event.setCanceled(true);
+          return;
+        }
+        // Out of mana messages
+        if (!ToggleCommand.manaMessages && message.contains("You do not have enough mana to do this!")) {
+          event.setCanceled(true);
+          return;
+        }
         // Implosion
         if (!ToggleCommand.implosionMessages) {
             if (message.contains("Your Implosion hit ") || message.contains("There are blocks in the way")) {
@@ -653,7 +783,7 @@ public class DankersSkyblockMod {
                 return;
             }
         }
-
+  
         if (ToggleCommand.oruoToggled && Utils.inDungeons) {
         	if (message.contains("What SkyBlock year is it?")) {
                 double currentTime = System.currentTimeMillis() /1000L;
diff --git a/src/main/java/me/Danker/commands/DungeonsCommand.java b/src/main/java/me/Danker/commands/DungeonsCommand.java
index 8b14bf7..f9ad93e 100644
--- a/src/main/java/me/Danker/commands/DungeonsCommand.java
+++ b/src/main/java/me/Danker/commands/DungeonsCommand.java
@@ -78,6 +78,14 @@ public class DungeonsCommand extends CommandBase {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
 				return;
 			}
+
+			String playerURL = "https://api.hypixel.net/player?uuid=" + uuid + "&key=" + key;
+			System.out.println("Fetching player data...");
+			JsonObject playerResponse = APIHandler.getResponse(playerURL);
+			if(!playerResponse.get("success").getAsBoolean()){
+				String reason = playerResponse.get("cause").getAsString();
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "This player has not played on Hypixel."));
+			}
 			
 			System.out.println("Fetching dungeon stats...");
 			JsonObject dungeonsObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("dungeons").getAsJsonObject();
@@ -94,6 +102,7 @@ public class DungeonsCommand extends CommandBase {
 			double archer = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("archer").getAsJsonObject().get("experience").getAsDouble());
 			double tank = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("tank").getAsJsonObject().get("experience").getAsDouble());
 			String selectedClass = Utils.capitalizeString(dungeonsObject.get("selected_dungeon_class").getAsString());
+			int secrets = playerResponse.get("player").getAsJsonObject().get("achievements").getAsJsonObject().get("skyblock_treasure_hunter").getAsInt();
 
 			int highestFloor = catacombsObject.get("highest_tier_completed").getAsInt();
 			JsonObject completionObj = catacombsObject.get("tier_completions").getAsJsonObject();
@@ -107,7 +116,8 @@ public class DungeonsCommand extends CommandBase {
 						 EnumChatFormatting.LIGHT_PURPLE + " Mage Level: " + mage + "\n" +
 						 EnumChatFormatting.RED + " Berserk Level: " + berserk + "\n" +
 						 EnumChatFormatting.GREEN + " Archer Level: " + archer + "\n" +
-						 EnumChatFormatting.BLUE + " Tank Level: " + tank + "\n\n");
+						 EnumChatFormatting.BLUE + " Tank Level: " + tank + "\n\n" +
+						 EnumChatFormatting.WHITE + " Secrets Found: " + secrets + "\n\n");
 
 			StringBuilder completionsHoverString = new StringBuilder();
 
@@ -135,5 +145,4 @@ public class DungeonsCommand extends CommandBase {
 				);
 		}).start();
 	}
-
 }
diff --git a/src/main/java/me/Danker/commands/RepartyCommand.java b/src/main/java/me/Danker/commands/RepartyCommand.java
index d3bf9e4..623ebf7 100644
--- a/src/main/java/me/Danker/commands/RepartyCommand.java
+++ b/src/main/java/me/Danker/commands/RepartyCommand.java
@@ -1,34 +1,29 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
-import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.*;
 import net.minecraft.util.ChatComponentText;
-import net.minecraftforge.client.event.*;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.util.*;
-import java.text.NumberFormat;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 public class RepartyCommand extends CommandBase implements ICommand {
-    public static double callTime = 0;
-    public static boolean inviteFailed = false;
-    public static String currentMember;
+    public static boolean gettingParty = false;
+    public static int Delimiter = 0;
+    public static boolean disbanding = false;
+    public static boolean inviting = false;
+    public static boolean failInviting = false;
     public static List<String> party = new ArrayList<>();
     public static List<String> repartyFailList = new ArrayList<>();
+    public static Thread partyThread = null;
 
     @Override
     public String getCommandName() { 
@@ -52,47 +47,89 @@ public class RepartyCommand extends CommandBase implements ICommand {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (args.length > 0 && (args[0].startsWith("fail") || args[0].equals("f"))) {
+            partyThread = new Thread(() -> {
+                EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
+                GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI();
+
+
+                try {
+                    player.sendChatMessage("/p " + String.join(" ", repartyFailList));
+                    String members = String.join(EnumChatFormatting.WHITE + "\n- " + EnumChatFormatting.YELLOW, repartyFailList);
+                    player.addChatMessage(new ChatComponentText(DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------\n" +
+                            DankersSkyblockMod.MAIN_COLOUR + "Partying:" + EnumChatFormatting.WHITE + "\n- " +
+                            EnumChatFormatting.YELLOW + members + "\n" +
+                            DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------"));
+                    failInviting = true;
+                    while (failInviting) {
+                        Thread.sleep(10);
+                    }
+                    if (repartyFailList.size() > 0) {
+                        String repartyFails = String.join("\n- " + EnumChatFormatting.RED, repartyFailList);
+                        player.addChatMessage(new ChatComponentText(DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------\n" +
+                                DankersSkyblockMod.MAIN_COLOUR + "Failed to invite:" + EnumChatFormatting.WHITE + "\n- " +
+                                EnumChatFormatting.RED + repartyFails + "\n" +
+                                DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------"));
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+
+            partyThread.start();
+
+            return;
+        }
+
         party.clear();
         repartyFailList.clear();
 
         // MULTI THREAD DRIFTING
-		new Thread(() -> {
+        partyThread = new Thread(() -> {
             EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
-            RepartyCommand.callTime = (double) System.currentTimeMillis() / 1000;
-            
+
+
             try {
-                Thread.sleep(210);
-                player.sendChatMessage("/p list");
-                System.out.println("Grabbing the party members...");
-                Thread.sleep(550);
-                if (RepartyCommand.party.size() == 0) return;
-                
+                player.sendChatMessage("/pl");
+                gettingParty = true;
+                while (gettingParty) {
+                    Thread.sleep(10);
+                }
+                if (party.size() == 0) return;
                 player.sendChatMessage("/p disband");
-                Thread.sleep(210);
-                
-                String members = String.join(EnumChatFormatting.WHITE + "\n- " + EnumChatFormatting.GOLD, RepartyCommand.party);
+                disbanding = true;
+                while (disbanding) {
+                    Thread.sleep(10);
+                }
+                String members = String.join(EnumChatFormatting.WHITE + "\n- " + EnumChatFormatting.YELLOW, RepartyCommand.party);
                 player.addChatMessage(new ChatComponentText(DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------\n" +
-                                                            DankersSkyblockMod.MAIN_COLOUR + "Repartying:" + EnumChatFormatting.WHITE + "\n- " +
-                                                            EnumChatFormatting.GOLD + members + "\n" +
-                                                            DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------\n"));
-
-                for (int i = 0; i < RepartyCommand.party.size(); i++) {
-                    RepartyCommand.currentMember = RepartyCommand.party.get(i);
-                    player.sendChatMessage("/p " + RepartyCommand.currentMember);
-                    Thread.sleep(400);
+                        DankersSkyblockMod.MAIN_COLOUR + "Repartying:" + EnumChatFormatting.WHITE + "\n- " +
+                        EnumChatFormatting.YELLOW + members + "\n" +
+                        DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------"));
+                repartyFailList = new ArrayList<>(party);
+                for (String invitee : party) {
+                    player.sendChatMessage("/p " + invitee);
+                    inviting = true;
+                    while (inviting) {
+                        Thread.sleep(10);
+                    }
+                    Thread.sleep(100);
                 }
-
-                if (RepartyCommand.repartyFailList.size() > 0) {
-                    Thread.sleep(300);
-                    String failedMembers = String.join(EnumChatFormatting.WHITE + "\n- " + EnumChatFormatting.GOLD, RepartyCommand.repartyFailList);
+                while (inviting) {
+                    Thread.sleep(10);
+                }
+                if (repartyFailList.size() > 0) {
+                    String repartyFails = String.join("\n- " + EnumChatFormatting.RED, repartyFailList);
                     player.addChatMessage(new ChatComponentText(DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------\n" +
-                                                                DankersSkyblockMod.ERROR_COLOUR + "Unable to Invite:" + EnumChatFormatting.WHITE + "\n- " +
-                                                                EnumChatFormatting.GOLD + failedMembers + "\n" +
-                                                                DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------\n"));
+                            DankersSkyblockMod.MAIN_COLOUR + "Failed to invite:" + EnumChatFormatting.WHITE + "\n- " +
+                            EnumChatFormatting.RED + repartyFails + "\n" +
+                            DankersSkyblockMod.DELIMITER_COLOUR + "-----------------------------"));
                 }
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-        }).start();
+        });
+
+		partyThread.start();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/Danker/commands/SetkeyCommand.java b/src/main/java/me/Danker/commands/SetkeyCommand.java
index db5fb9a..ee4b5a5 100644
--- a/src/main/java/me/Danker/commands/SetkeyCommand.java
+++ b/src/main/java/me/Danker/commands/SetkeyCommand.java
@@ -38,5 +38,4 @@ public class SetkeyCommand extends CommandBase implements ICommand {
 		ConfigHandler.writeStringConfig("api", "APIKey", arg1[0]);
 		player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Set API key to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[0]));
 	}
-
 }
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index ce507e1..0aafe1b 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -23,17 +23,21 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean spiritBearAlerts;
 	public static boolean aotdToggled;
 	public static boolean lividDaggerToggled;
-	public static boolean sceptreMessages;
 	public static boolean petColoursToggled;
 	public static boolean dungeonTimerToggled;
 	public static boolean golemAlertToggled;
 	public static boolean expertiseLoreToggled;
 	public static boolean skill50DisplayToggled;
 	public static boolean outlineTextToggled;
+	public static boolean cakeTimerToggled;
+	// Chat Messages
+	public static boolean sceptreMessages;
 	public static boolean midasStaffMessages;
 	public static boolean implosionMessages;
 	public static boolean healMessages;
-	public static boolean cakeTimerToggled;
+	public static boolean cooldownMessages;
+	public static boolean manaMessages;
+	// Dungeons Messages
 	public static boolean lowHealthNotifyToggled;
 	public static boolean lividSolverToggled;
 	public static boolean stopSalvageStarredToggled;
@@ -71,9 +75,10 @@ public class ToggleCommand extends CommandBase implements ICommand {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
+
 		return "/" + getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalert/" + 
 										  "aotd/lividdagger/flowerweapons/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" +
-										  "outlinetext/midasstaffmessages/implosionmessages/healmessages/caketimer/lowhealthnotify/autoskilltracker/" +
+										  "outlinetext/midasstaffmessages/implosionmessages/healmessages/cooldownmessages/manamessages/caketimer/lowhealthnotify/" +
 										  "lividsolver/stopsalvagestarred/notifyslayerslain/necronnotifications/bonzotimer/blockbreakingfarms/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/" +
 										  "watchermessage/startswithterminal/selectallterminal/clickinorderterminal/blockwrongterminalclicks/" +
 										  "itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/list>";
@@ -83,7 +88,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public int getRequiredPermissionLevel() {
 		return 0;
 	}
-	
+
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
@@ -91,7 +96,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 														  "splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "lividdagger",
 														  "flowerweapons", "sceptremessages", "petcolors", "dungeontimer", "golemalerts",
 														  "expertiselore", "skill50display", "outlinetext", "midasstaffmessages",
-														  "implosionmessages", "healmessages", "caketimer", "lowhealthnotify", "autoskilltracker",
+														  "implosionmessages", "healmessages", "cooldownmessages", "manamessages", "caketimer", "lowhealthnotify", "autoskilltracker",
 														  "lividsolver", "stopsalvagestarred", "notifyslayerslain", "necronnotifications",
 														  "bonzotimer", "blockbreakingfarms", "threemanpuzzle", "oruopuzzle", "blazepuzzle",
 														  "creeperpuzzle", "waterpuzzle", "tictactoepuzzle", "watchermessage", "startswithterminal",
@@ -186,6 +191,16 @@ public class ToggleCommand extends CommandBase implements ICommand {
 				ConfigHandler.writeBooleanConfig("toggles", "HealMessages", healMessages);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Heal messages have been set to " + DankersSkyblockMod.SECONDARY_COLOUR + healMessages + DankersSkyblockMod.MAIN_COLOUR + "."));
 				break;
+			case "cooldownmessages":
+				cooldownMessages = !cooldownMessages;
+				ConfigHandler.writeBooleanConfig("toggles", "CooldownMessages", cooldownMessages);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Ability cooldown messages has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + cooldownMessages + DankersSkyblockMod.MAIN_COLOUR + "."));
+				break;
+			case "manamessages":
+				manaMessages = !manaMessages;
+				ConfigHandler.writeBooleanConfig("toggles", "ManaMessages", manaMessages);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Out of mana messages has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + manaMessages + DankersSkyblockMod.MAIN_COLOUR + "."));
+				break;
 			case "petcolors":
 			case "petcolours":
 				petColoursToggled = !petColoursToggled;
@@ -362,6 +377,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 															DankersSkyblockMod.TYPE_COLOUR + " Midas Staff messages: " + DankersSkyblockMod.VALUE_COLOUR + midasStaffMessages + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Implosion messages: " + DankersSkyblockMod.VALUE_COLOUR + implosionMessages + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Heal messages: " + DankersSkyblockMod.VALUE_COLOUR + healMessages + "\n" +
+															DankersSkyblockMod.TYPE_COLOUR + " Ability cooldown messages: " + DankersSkyblockMod.VALUE_COLOUR + cooldownMessages + "\n" +
+															DankersSkyblockMod.TYPE_COLOUR + " Out of mana messages: " + DankersSkyblockMod.VALUE_COLOUR + manaMessages + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Pet colours: " + DankersSkyblockMod.VALUE_COLOUR + petColoursToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Dungeon timer: " + DankersSkyblockMod.VALUE_COLOUR + dungeonTimerToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Golem spawn alerts: " + DankersSkyblockMod.VALUE_COLOUR + golemAlertToggled + "\n" +
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index d5dd59d..57d0292 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -40,18 +40,22 @@ public class DankerGui extends GuiScreen {
 	private GuiButton chatMaddox;
 	private GuiButton spiritBearAlert;
 	private GuiButton aotd;
-	private GuiButton lividDagger;
-	private GuiButton sceptreMessages;
-	private GuiButton midasStaffMessages;
-	private GuiButton implosionMessages;
-	private GuiButton healMessages;
 	private GuiButton petColours;
-	private GuiButton dungeonTimer;
 	private GuiButton golemAlerts;
 	private GuiButton expertiseLore;
 	private GuiButton skill50Display;
 	private GuiButton outlineText;
 	private GuiButton cakeTimer;
+	// Chat Messages
+	private GuiButton lividDagger;
+	private GuiButton sceptreMessages;
+	private GuiButton midasStaffMessages;
+	private GuiButton implosionMessages;
+	private GuiButton healMessages;
+	private GuiButton cooldownMessages;
+	private GuiButton manaMessages;
+	//Dungeons
+	private GuiButton dungeonTimer;
 	private GuiButton lowHealthNotify;
 	private GuiButton lividSolver;
 	private GuiButton stopSalvageStarred;
@@ -99,39 +103,41 @@ public class DankerGui extends GuiScreen {
 		pickBlock = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Auto-Swap to Pick Block: " + Utils.getColouredBoolean(ToggleCommand.swapToPickBlockToggled));
 		// Page 2
 		coords = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Coordinate/Angle Display: " + Utils.getColouredBoolean(ToggleCommand.coordsToggled));
-		dungeonTimer = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Display Dungeon Timers: " + Utils.getColouredBoolean(ToggleCommand.dungeonTimerToggled));
+		chatMaddox = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Click On-Screen to Open Maddox: " + Utils.getColouredBoolean(ToggleCommand.chatMaddoxToggled));
 		cakeTimer = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Cake Timer: " + Utils.getColouredBoolean(ToggleCommand.cakeTimerToggled));
 		skill50Display = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Display Progress To Skill Level 50: " + Utils.getColouredBoolean(ToggleCommand.skill50DisplayToggled));
 		slayerCount = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Count Total 20% Drops: " + Utils.getColouredBoolean(ToggleCommand.slayerCountTotal));
 		aotd = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Disable AOTD Ability: " + Utils.getColouredBoolean(ToggleCommand.aotdToggled));
 		lividDagger = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Disable Livid Dagger Ability: " + Utils.getColouredBoolean(ToggleCommand.lividDaggerToggled));
 		// Page 3
-		chatMaddox = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Click On-Screen to Open Maddox: " + Utils.getColouredBoolean(ToggleCommand.chatMaddoxToggled));
-		gparty = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Guild Party Notifications: " + Utils.getColouredBoolean(ToggleCommand.gpartyToggled));
-		spiritBearAlert = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Spirit Bear Spawn Alerts: " + Utils.getColouredBoolean(ToggleCommand.spiritBearAlerts));
-		sceptreMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Spirit Sceptre Messages: " + Utils.getColouredBoolean(ToggleCommand.sceptreMessages));
-		midasStaffMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Midas Staff Messages: " + Utils.getColouredBoolean(ToggleCommand.midasStaffMessages));
-		implosionMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Implosion Messages: " + Utils.getColouredBoolean(ToggleCommand.implosionMessages));
-		healMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Heal Messages: " + Utils.getColouredBoolean(ToggleCommand.healMessages));
+		spiritBearAlert = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Spirit Bear Spawn Alerts: " + Utils.getColouredBoolean(ToggleCommand.spiritBearAlerts));
+		sceptreMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Spirit Sceptre Messages: " + Utils.getColouredBoolean(ToggleCommand.sceptreMessages));
+		midasStaffMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Midas Staff Messages: " + Utils.getColouredBoolean(ToggleCommand.midasStaffMessages));
+		implosionMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Implosion Messages: " + Utils.getColouredBoolean(ToggleCommand.implosionMessages));
+		healMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Heal Messages: " + Utils.getColouredBoolean(ToggleCommand.healMessages));
+		cooldownMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Cooldown Messages: " + Utils.getColouredBoolean(ToggleCommand.cooldownMessages));
+		manaMessages = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Mana Messages: " + Utils.getColouredBoolean((ToggleCommand.manaMessages)));
 		// Page 4
 		goldenEnch = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Golden T10/T6/T4 Enchantments: " + Utils.getColouredBoolean(ToggleCommand.goldenToggled));
 		petColours = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Colour Pet Backgrounds: " + Utils.getColouredBoolean(ToggleCommand.petColoursToggled));
 		expertiseLore = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Expertise Kills In Lore: " + Utils.getColouredBoolean(ToggleCommand.expertiseLoreToggled));
-		lividSolver = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Find Correct Livid: " + Utils.getColouredBoolean(ToggleCommand.lividSolverToggled));
+		gparty = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Guild Party Notifications: " + Utils.getColouredBoolean(ToggleCommand.gpartyToggled));
 		golemAlerts = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Alert When Golem Spawns: " + Utils.getColouredBoolean(ToggleCommand.golemAlertToggled));
 		rngesusAlert = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "RNGesus Alerts: " + Utils.getColouredBoolean(ToggleCommand.rngesusAlerts));
-		lowHealthNotify = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Low Health Notifications: " + Utils.getColouredBoolean(ToggleCommand.lowHealthNotifyToggled));
+		splitFishing = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Split Fishing Display: " + Utils.getColouredBoolean(ToggleCommand.splitFishing));
 		// Page 5
-		stopSalvageStarred = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Stop Salvaging Starred Items: " + Utils.getColouredBoolean(ToggleCommand.stopSalvageStarredToggled));
-		watcherReadyMessage = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Display Watcher Ready Message: " + Utils.getColouredBoolean(ToggleCommand.watcherReadyToggled));
-		splitFishing = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Split Fishing Display: " + Utils.getColouredBoolean(ToggleCommand.splitFishing));
-		notifySlayerSlain = new GuiButton(0, wid