Add dungeon score display

4 files changed, 29 insertions, 75 deletions

diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index 0bf82f9..14041d1 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -48,75 +48,6 @@ public class DankerGuiCommand extends CommandBase {
 		if (arg1.length > 0 && arg1[0].equalsIgnoreCase("debug")) {
 			StringBuilder debug = new StringBuilder();
 			debug.append("```md\n");
-			debug.append("# Toggles\n");
-			debug.append("[gparty][").append(ToggleCommand.gpartyToggled).append("]\n");
-			debug.append("[coords][").append(ToggleCommand.coordsToggled).append("]\n");
-			debug.append("[golden][").append(ToggleCommand.goldenToggled).append("]\n");
-			debug.append("[slayercount][").append(ToggleCommand.slayerCountTotal).append("]\n");
-			debug.append("[rngesusalerts][").append(ToggleCommand.rngesusAlerts).append("]\n");
-			debug.append("[splitfishing][").append(ToggleCommand.splitFishing).append("]\n");
-			debug.append("[chatmaddox][").append(ToggleCommand.chatMaddoxToggled).append("]\n");
-			debug.append("[spiritbearalerts][").append(ToggleCommand.spiritBearAlerts).append("]\n");
-			debug.append("[flowerweapons][").append(ToggleCommand.flowerWeaponsToggled).append("]\n");
-			debug.append("[sceptremessages][").append(ToggleCommand.sceptreMessages).append("]\n");
-			debug.append("[petcolors][").append(ToggleCommand.petColoursToggled).append("]\n");
-			debug.append("[dungeontimer][").append(ToggleCommand.dungeonTimerToggled).append("]\n");
-			debug.append("[golemalerts][").append(ToggleCommand.golemAlertToggled).append("]\n");
-			debug.append("[expertiselore][").append(ToggleCommand.expertiseLoreToggled).append("]\n");
-			debug.append("[skill50display][").append(ToggleCommand.skill50DisplayToggled).append("]\n");
-			debug.append("[outlinetext][").append(ToggleCommand.outlineTextToggled).append("]\n");
-			debug.append("[midasstaffmessages][").append(ToggleCommand.midasStaffMessages).append("]\n");
-			debug.append("[implosionmessages][").append(ToggleCommand.implosionMessages).append("]\n");
-			debug.append("[healmessages][").append(ToggleCommand.healMessages).append("]\n");
-			debug.append("[cooldownmessages][").append(ToggleCommand.cooldownMessages).append("]\n");
-			debug.append("[manamessages][").append(ToggleCommand.manaMessages).append("]\n");
-			debug.append("[killcombomessages][").append(ToggleCommand.killComboMessages).append("]\n");
-			debug.append("[caketimer][").append(ToggleCommand.cakeTimerToggled).append("]\n");
-			debug.append("[lowhealthnotify][").append(ToggleCommand.lowHealthNotifyToggled).append("]\n");
-			debug.append("[lividsolver][").append(ToggleCommand.lividSolverToggled).append("]\n");
-			debug.append("[stopsalvagestarred][").append(ToggleCommand.stopSalvageStarredToggled).append("]\n");
-			debug.append("[notifyslayerslain][").append(ToggleCommand.notifySlayerSlainToggled).append("]\n");
-			debug.append("[necronnotifications][").append(ToggleCommand.necronNotificationsToggled).append("]\n");
-			debug.append("[bonzotimer][").append(ToggleCommand.bonzoTimerToggled).append("]\n");
-			debug.append("[autoskilltracker][").append(ToggleCommand.autoSkillTrackerToggled).append("]\n");
-			debug.append("[threemanpuzzle][").append(ToggleCommand.threeManToggled).append("]\n");
-			debug.append("[oruopuzzle][").append(ToggleCommand.oruoToggled).append("]\n");
-			debug.append("[blazepuzzle][").append(ToggleCommand.blazeToggled).append("]\n");
-			debug.append("[creeperpuzzle][").append(ToggleCommand.creeperToggled).append("]\n");
-			debug.append("[creeperlines][").append(ToggleCommand.creeperLinesToggled).append("]\n");
-			debug.append("[waterpuzzle][").append(ToggleCommand.waterToggled).append("]\n");
-			debug.append("[tictactoepuzzle][").append(ToggleCommand.ticTacToeToggled).append("]\n");
-			debug.append("[boulderpuzzle][").append(ToggleCommand.boulderToggled).append("]\n");
-			debug.append("[silverfishpuzzle][").append(ToggleCommand.silverfishToggled).append("]\n");
-			debug.append("[icewalkpuzzle][").append(ToggleCommand.iceWalkToggled).append("]\n");
-			debug.append("[watchermessage][").append(ToggleCommand.watcherReadyToggled).append("]\n");
-			debug.append("[startswithterminal][").append(ToggleCommand.startsWithToggled).append("]\n");
-			debug.append("[selectallterminal][").append(ToggleCommand.selectAllToggled).append("]\n");
-			debug.append("[clickinorderterminal][").append(ToggleCommand.clickInOrderToggled).append("]\n");
-			debug.append("[blockwrongterminalclicks][").append(ToggleCommand.blockWrongTerminalClicksToggled).append("]\n");
-			debug.append("[itemframeonsealanterns][").append(ToggleCommand.itemFrameOnSeaLanternsToggled).append("]\n");
-			debug.append("[ultrasequencer][").append(ToggleCommand.ultrasequencerToggled).append("]\n");
-			debug.append("[chronomatron][").append(ToggleCommand.chronomatronToggled).append("]\n");
-			debug.append("[superpairs][").append(ToggleCommand.superpairsToggled).append("]\n");
-			debug.append("[hidetooltipsinaddons][").append(ToggleCommand.hideTooltipsInExperimentAddonsToggled).append("]\n");
-			debug.append("[pickblock][").append(ToggleCommand.swapToPickBlockToggled).append("]\n");
-			debug.append("[melodytooltips][").append(ToggleCommand.melodyTooltips).append("]\n");
-			debug.append("[highlightslayers][").append(ToggleCommand.highlightSlayers).append("]\n");
-			debug.append("[highlightarachne][").append(ToggleCommand.highlightArachne).append("]\n");
-			debug.append("[highlightskeletonmasters][").append(ToggleCommand.highlightSkeletonMasters).append("]\n");
-			debug.append("[teammatesinradius][").append(ToggleCommand.teammatesInRadius).append("]\n");
-			debug.append("[gianthp][").append(ToggleCommand.giantHP).append("]\n");
-			debug.append("[hidepetcandy][").append(ToggleCommand.hidePetCandy).append("]\n");
-			debug.append("[customcolourednames][").append(ToggleCommand.customColouredNames).append("]\n");
-			debug.append("[endoffarmalert][").append(ToggleCommand.endOfFarmAlert).append("]\n");
-			debug.append("[gemstonelore][").append(ToggleCommand.gemstoneLore).append("]\n");
-			debug.append("[crystalhollowwaypoints][").append(ToggleCommand.crystalHollowWaypoints).append("]\n");
-			debug.append("[crystalautowaypoints][").append(ToggleCommand.crystalAutoWaypoints).append("]\n");
-			debug.append("[autoacceptreparty][").append(ToggleCommand.autoAcceptReparty).append("]\n");
-			debug.append("[abilitycooldowns][").append(ToggleCommand.abilityCooldowns).append("]\n");
-			debug.append("[dungeonbossmusic][").append(ToggleCommand.dungeonBossMusic).append("]\n");
-			debug.append("[bloodroommusic][").append(ToggleCommand.bloodRoomMusic).append("]\n");
-			debug.append("[dungeonmusic][").append(ToggleCommand.dungeonMusic).append("]\n");
 			debug.append("# Locations\n");
 			debug.append("[coords][").append(MoveCommand.coordsXY[0]).append(", ").append(MoveCommand.coordsXY[1]).append("]\n");
 			debug.append("[display][").append(MoveCommand.displayXY[0]).append(", ").append(MoveCommand.displayXY[1]).append("]\n");
@@ -131,6 +62,7 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[teammatesinradius][").append(MoveCommand.teammatesInRadiusXY[0]).append(", ").append(MoveCommand.teammatesInRadiusXY[1]).append("]\n");
 			debug.append("[gianthp][").append(MoveCommand.giantHPXY[0]).append(", ").append(MoveCommand.giantHPXY[1]).append("]\n");
 			debug.append("[abilitycooldowns][").append(MoveCommand.abilityCooldownsXY[0]).append(", ").append(MoveCommand.abilityCooldownsXY[1]).append("]\n");
+			debug.append("[dungeonscore][").append(MoveCommand.dungeonScoreXY[0]).append(", ").append(MoveCommand.dungeonScoreXY[1]).append("]\n");
 			debug.append("# Other Settings\n");
 			debug.append("[Current Display][").append(LootDisplay.display).append("]\n");
 			debug.append("[Auto Display][").append(LootDisplay.auto).append("]\n");
diff --git a/src/main/java/me/Danker/commands/MoveCommand.java b/src/main/java/me/Danker/commands/MoveCommand.java
index a43d09b..5a6c6a2 100644
--- a/src/main/java/me/Danker/commands/MoveCommand.java
+++ b/src/main/java/me/Danker/commands/MoveCommand.java
@@ -26,6 +26,7 @@ public class MoveCommand extends CommandBase {
 	public static int[] teammatesInRadiusXY = {0, 0};
 	public static int[] giantHPXY = {0, 0};
 	public static int[] abilityCooldownsXY = {0, 0};
+	public static int[] dungeonScoreXY = {0, 0};
 
 	@Override
 	public String getCommandName() {
@@ -35,7 +36,8 @@ public class MoveCommand extends CommandBase {
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
 		return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/" +
-										"wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldowns> <x> <y>";
+										"wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/" +
+										"abilitycooldowns/dungeonscore> <x> <y>";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -52,7 +54,7 @@ public class MoveCommand extends CommandBase {
 		if (args.length == 1) {
 			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer",
 														  "skilltracker", "wateranswer", "bonzotimer", "golemtimer", "teammatesinradius",
-														  "gianthp", "abilitycooldowns");
+														  "gianthp", "abilitycooldowns", "dungeonscore");
 		}
 		return null;
 	}
@@ -158,6 +160,13 @@ public class MoveCommand extends CommandBase {
 				ConfigHandler.writeIntConfig("locations", "abilityCooldownsY", abilityCooldownsXY[1]);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Ability cooldowns has been moved to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 				break;
+			case "dungeonscore":
+				dungeonScoreXY[0] = Integer.parseInt(arg1[1]);
+				dungeonScoreXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "dungeonScoreX", dungeonScoreXY[0]);
+				ConfigHandler.writeIntConfig("locations", "dungeonScoreY", dungeonScoreXY[1]);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Dungeon score has been moved to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
 			default:
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 		}
diff --git a/src/main/java/me/Danker/commands/ScaleCommand.java b/src/main/java/me/Danker/commands/ScaleCommand.java
index b38d57e..9bb1f08 100644
--- a/src/main/java/me/Danker/commands/ScaleCommand.java
+++ b/src/main/java/me/Danker/commands/ScaleCommand.java
@@ -26,6 +26,7 @@ public class ScaleCommand extends CommandBase {
 	public static double teammatesInRadiusScale;
 	public static double giantHPScale;
 	public static double abilityCooldownsScale;
+	public static double dungeonScoreScale;
 	
 	@Override
 	public String getCommandName() {
@@ -35,7 +36,7 @@ public class ScaleCommand extends CommandBase {
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
 		return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/" +
-										"bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldown> <size (0.1 - 10)>";
+										"bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldown/dungeonscore> <size (0.1 - 10)>";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -52,7 +53,7 @@ public class ScaleCommand extends CommandBase {
 		if (args.length == 1) {
 			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer",
 														  "skilltracker", "wateranswer", "bonzotimer", "golemtimer", "teammatesinradius",
-														  "gianthp", "abilitycooldowns");
+														  "gianthp", "abilitycooldowns", "dungeonscore");
 		}
 		return null;
 	}
@@ -138,6 +139,11 @@ public class ScaleCommand extends CommandBase {
 				ConfigHandler.writeDoubleConfig("scales", "abilityCooldownsScale", abilityCooldownsScale);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Ability cooldowns has been scaled to " + DankersSkyblockMod.SECONDARY_COLOUR + abilityCooldownsScale + "x"));
 				break;
+			case "dungeonscore":
+				dungeonScoreScale = scaleAmount;
+				ConfigHandler.writeDoubleConfig("scales", "dungeonScoreScale", dungeonScoreScale);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Dungeon score has been scaled to " + DankersSkyblockMod.SECONDARY_COLOUR + dungeonScoreScale + "x"));
+				break;
 			default:
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 		}	
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index d9ef9b3..94425c0 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -47,6 +47,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean autoAcceptReparty;
 	public static boolean abilityCooldowns;
 	public static boolean alerts;
+	public static boolean dungeonScore;
 	// Chat Messages
 	public static boolean sceptreMessages;
 	public static boolean midasStaffMessages;
@@ -145,7 +146,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 														  "gemstonelore", "crystalhollowwaypoints", "crystalautowaypoints", "autoacceptreparty",
 														  "itemcooldowns", "hubmusic", "islandmusic", "dungeonhubmusic", "farmingislandsmusic", "goldminemusic",
 														  "deepcavernsmusic", "dwarvenminesmusic", "crystalhollowsmusic", "spidersdenmusic", "blazingfortressmusic",
-														  "endmusic", "parkmusic", "alerts", "list");
+														  "endmusic", "parkmusic", "alerts", "dungeonscore", "list");
 		}
 		return null;
 	}
@@ -592,6 +593,11 @@ public class ToggleCommand extends CommandBase implements ICommand {
 				ConfigHandler.writeBooleanConfig("toggles", "Alerts", alerts);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Alerts has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + alerts + DankersSkyblockMod.MAIN_COLOUR + "."));
 				break;
+			case "dungeonscore":
+				dungeonScore = !dungeonScore;
+				ConfigHandler.writeBooleanConfig("toggles", "DungeonScore", dungeonScore);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Dungeon score has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + dungeonScore + DankersSkyblockMod.MAIN_COLOUR + "."));
+				break;
 			case "list":
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.TYPE_COLOUR + "Guild party notifications: " + DankersSkyblockMod.VALUE_COLOUR + gpartyToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Coord/Angle display: " + DankersSkyblockMod.VALUE_COLOUR + coordsToggled + "\n" +
@@ -666,7 +672,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 															DankersSkyblockMod.TYPE_COLOUR + " Custom blazing fortress music: " + DankersSkyblockMod.VALUE_COLOUR + blazingFortressMusic + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Custom end music: " + DankersSkyblockMod.VALUE_COLOUR + endMusic + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Custom park music: " + DankersSkyblockMod.VALUE_COLOUR + parkMusic + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Alerts: " + DankersSkyblockMod.VALUE_COLOUR + alerts
+															DankersSkyblockMod.TYPE_COLOUR + " Alerts: " + DankersSkyblockMod.VALUE_COLOUR + alerts + "\n" +
+															DankersSkyblockMod.TYPE_COLOUR + " Dungeon score: " + DankersSkyblockMod.VALUE_COLOUR + dungeonScore
 				));
 				break;
 			default: