Add ability cooldown display

2 files changed, 26 insertions, 3 deletions

diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index f2d3bf3..7f407a6 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -23,9 +23,9 @@ import java.util.List;
 
 public class DankerGui extends GuiScreen {
 
-	private int page;
-	private List<GuiButton> allButtons = new ArrayList<>();
-	private List<GuiButton> foundButtons = new ArrayList<>();
+	private final int page;
+	private final List<GuiButton> allButtons = new ArrayList<>();
+	private final List<GuiButton> foundButtons = new ArrayList<>();
 	String initSearchText;
 	
 	private GuiButton closeGUI;
@@ -71,6 +71,7 @@ public class DankerGui extends GuiScreen {
 	private GuiButton endOfFarmAlert;
 	private GuiButton gemstoneLore;
 	private GuiButton autoAcceptReparty;
+	private GuiButton abilityCooldown;
 	// Chat Messages
 	private GuiButton sceptreMessages;
 	private GuiButton midasStaffMessages;
@@ -163,6 +164,7 @@ public class DankerGui extends GuiScreen {
 		endOfFarmAlert = new FeatureButton("Alert When Reaching End of Farm: " + Utils.getColouredBoolean(ToggleCommand.endOfFarmAlert), "Alerts when you go past coords set with /dsmfarmlength.");
 		gemstoneLore = new FeatureButton("Applied Gemstones in Lore: " + Utils.getColouredBoolean(ToggleCommand.gemstoneLore), "Adds applied gemstones to item tooltip.");
 		autoAcceptReparty = new FeatureButton("Auto Accept Reparty: " + Utils.getColouredBoolean(ToggleCommand.autoAcceptReparty), "Automatically rejoins parties when disbanded and invited.");
+		abilityCooldown = new FeatureButton("Ability Cooldowns: " + Utils.getColouredBoolean(ToggleCommand.abilityCooldowns), "Displays ability cooldowns.");
 
 		allButtons.clear();
 		allButtons.add(changeDisplay);
@@ -213,6 +215,7 @@ public class DankerGui extends GuiScreen {
 		allButtons.add(endOfFarmAlert);
 		allButtons.add(gemstoneLore);
 		allButtons.add(autoAcceptReparty);
+		allButtons.add(abilityCooldown);
 
 		search.setText(initSearchText);
 		search.setVisible(true);
@@ -473,6 +476,10 @@ public class DankerGui extends GuiScreen {
 			ToggleCommand.autoAcceptReparty = !ToggleCommand.autoAcceptReparty;
 			ConfigHandler.writeBooleanConfig("toggles", "AutoAcceptReparty", ToggleCommand.autoAcceptReparty);
 			autoAcceptReparty.displayString = "Auto Accept Reparty: " + Utils.getColouredBoolean(ToggleCommand.autoAcceptReparty);
+		} else if (button == abilityCooldown) {
+			ToggleCommand.abilityCooldowns = !ToggleCommand.abilityCooldowns;
+			ConfigHandler.writeBooleanConfig("toggles", "AbilityCooldowns", ToggleCommand.abilityCooldowns);
+			abilityCooldown.displayString = "Ability Cooldowns: " + Utils.getColouredBoolean(ToggleCommand.abilityCooldowns);
 		}
 	}
 
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index fed6ee9..e24de8b 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -31,6 +31,7 @@ public class EditLocationsGui extends GuiScreen {
 	private LocationButton golemTimer;
 	private LocationButton teammatesInRadius;
 	private LocationButton giantHP;
+	private LocationButton abilityCooldown;
 	
 	@Override
 	public boolean doesGuiPauseGame() {
@@ -99,6 +100,9 @@ public class EditLocationsGui extends GuiScreen {
 							 EnumChatFormatting.LIGHT_PURPLE + "Jolly Pink Giant " + EnumChatFormatting.GREEN + "25M" + EnumChatFormatting.RED + "❤\n" +
 							 EnumChatFormatting.DARK_AQUA + "The Diamond Giant " + EnumChatFormatting.GREEN + "25M" + EnumChatFormatting.RED + "❤";
 
+		String abilityCooldownText = EnumChatFormatting.GREEN + "Spirit Glide: " + EnumChatFormatting.YELLOW + "32.734s\n" +
+									 EnumChatFormatting.GREEN + "Parley: " + EnumChatFormatting.YELLOW + "2.652s\n" +
+									 EnumChatFormatting.GREEN + "Ice Spray: " + EnumChatFormatting.YELLOW + "1.429s";
 
 		display = new LocationButton(MoveCommand.displayXY[0], MoveCommand.displayXY[1], ScaleCommand.displayScale, displayText, displayNums, 110);
 		dungeonTimer = new LocationButton(MoveCommand.dungeonTimerXY[0], MoveCommand.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
@@ -112,6 +116,7 @@ public class EditLocationsGui extends GuiScreen {
 		golemTimer = new LocationButton(MoveCommand.golemTimerXY[0], MoveCommand.golemTimerXY[1] + 5, ScaleCommand.golemTimerScale, GolemSpawningAlert.GOLEM_COLOUR + "     20s", null, null);
 		teammatesInRadius = new LocationButton(MoveCommand.teammatesInRadiusXY[0], MoveCommand.teammatesInRadiusXY[1], ScaleCommand.teammatesInRadiusScale, teammatesInRadiusText, null, null);
 		giantHP = new LocationButton(MoveCommand.giantHPXY[0], MoveCommand.giantHPXY[1], ScaleCommand.giantHPScale, giantHPText, null, null);
+		abilityCooldown = new LocationButton(MoveCommand.abilityCooldownsXY[0], MoveCommand.abilityCooldownsXY[1], ScaleCommand.abilityCooldownsScale, abilityCooldownText, null, null);
 
 		this.buttonList.add(coords);
 		this.buttonList.add(dungeonTimer);
@@ -125,6 +130,7 @@ public class EditLocationsGui extends GuiScreen {
 		this.buttonList.add(golemTimer);
 		this.buttonList.add(teammatesInRadius);
 		this.buttonList.add(giantHP);
+		this.buttonList.add(abilityCooldown);
 	}
 	
 	@Override
@@ -234,6 +240,12 @@ public class EditLocationsGui extends GuiScreen {
 					giantHP.xPosition = MoveCommand.giantHPXY[0];
 					giantHP.yPosition = MoveCommand.giantHPXY[1];
 					break;
+				case "abilityCooldown":
+					MoveCommand.abilityCooldownsXY[0] += xMoved;
+					MoveCommand.abilityCooldownsXY[1] += yMoved;
+					abilityCooldown.xPosition = MoveCommand.abilityCooldownsXY[0];
+					abilityCooldown.yPosition = MoveCommand.abilityCooldownsXY[1];
+					break;
 			}
 			this.buttonList.clear();
 			initGui();
@@ -270,6 +282,8 @@ public class EditLocationsGui extends GuiScreen {
 				moving = "teammatesInRadius";
 			} else if (button == giantHP) {
 				moving = "giantHP";
+			} else if (button == abilityCooldown) {
+				moving = "abilityCooldown";
 			}
 		}
 	}
@@ -302,6 +316,8 @@ public class EditLocationsGui extends GuiScreen {
 		ConfigHandler.writeIntConfig("locations", "teammatesInRadiusY", MoveCommand.teammatesInRadiusXY[1]);
 		ConfigHandler.writeIntConfig("locations", "giantHPX", MoveCommand.giantHPXY[0]);
 		ConfigHandler.writeIntConfig("locations", "giantHPY", MoveCommand.giantHPXY[1]);
+		ConfigHandler.writeIntConfig("locations", "abilityCooldownsX", MoveCommand.abilityCooldownsXY[0]);
+		ConfigHandler.writeIntConfig("locations", "abilityCooldownsY", MoveCommand.abilityCooldownsXY[1]);
 	}
 	
 }