Merge pull request #124 from bowser0000/developmentHEADv1.8.7master

1.8.7

32 files changed, 3250 insertions, 903 deletions

diff --git a/src/main/java/me/Danker/commands/ArmourCommand.java b/src/main/java/me/Danker/commands/ArmourCommand.java
index 4597309..e9a20ee 100644
--- a/src/main/java/me/Danker/commands/ArmourCommand.java
+++ b/src/main/java/me/Danker/commands/ArmourCommand.java
@@ -67,6 +67,7 @@ public class ArmourCommand extends CommandBase {
 			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey."));
+				return;
 			}
 			
 			// Get UUID for Hypixel API requests
@@ -88,7 +89,7 @@ public class ArmourCommand extends CommandBase {
 
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = APIHandler.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL, true);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/BankCommand.java b/src/main/java/me/Danker/commands/BankCommand.java
index ddf9502..e4a8eee 100644
--- a/src/main/java/me/Danker/commands/BankCommand.java
+++ b/src/main/java/me/Danker/commands/BankCommand.java
@@ -62,6 +62,7 @@ public class BankCommand extends CommandBase {
 			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey."));
+				return;
 			}
 			
 			// Get UUID for Hypixel API requests
@@ -83,7 +84,7 @@ public class BankCommand extends CommandBase {
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = APIHandler.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL, true);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
new file mode 100644
index 0000000..37047c9
--- /dev/null
+++ b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
@@ -0,0 +1,111 @@
+package me.Danker.commands;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.features.BlockWrongSlayer;
+import me.Danker.handlers.ConfigHandler;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+
+import java.util.List;
+
+public class BlockSlayerCommand extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "onlyslayer";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender arg0) {
+        return "/" + getCommandName() + " <zombie/spider/wolf/enderman/blaze> <1/2/3/4/5>";
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new BlockSlayerCommand().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        if (args.length == 1) {
+            return getListOfStringsMatchingLastWord(args, "zombie", "spider", "wolf", "enderman", "blaze");
+        } else if (args.length == 2) {
+            return getListOfStringsMatchingLastWord(args, "1", "2", "3", "4", "5");
+        }
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+        final EntityPlayer player = (EntityPlayer)arg0;
+
+        if (arg1.length == 0 || (arg1.length == 1 && !arg1[0].equalsIgnoreCase("off"))) {
+            player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
+            return;
+        }
+
+        switch (arg1[0].toLowerCase()) {
+            case "zombie":
+                BlockWrongSlayer.onlySlayerName = "Revenant Horror";
+                break;
+            case "spider":
+                BlockWrongSlayer.onlySlayerName = "Tarantula Broodfather";
+                break;
+            case "wolf":
+                BlockWrongSlayer.onlySlayerName = "Sven Packmaster";
+                break;
+            case "enderman":
+                BlockWrongSlayer.onlySlayerName = "Voidgloom Seraph";
+                break;
+            case "blaze":
+                BlockWrongSlayer.onlySlayerName = "Inferno Demonlord";
+                break;
+            case "off":
+                BlockWrongSlayer.onlySlayerName = "";
+                BlockWrongSlayer.onlySlayerNumber = "";
+                ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking turned off."));
+                return;
+            default:
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
+                return;
+        }
+
+        int slayerNumber = Integer.parseInt(arg1[1]);
+        // Just manually set to roman numeral, I don't wanna put a whole converter in here
+        switch (slayerNumber) {
+            case 1:
+                BlockWrongSlayer.onlySlayerNumber = "I";
+                break;
+            case 2:
+                BlockWrongSlayer.onlySlayerNumber = "II";
+                break;
+            case 3:
+                BlockWrongSlayer.onlySlayerNumber = "III";
+                break;
+            case 4:
+                BlockWrongSlayer.onlySlayerNumber = "IV";
+                break;
+            case 5:
+                BlockWrongSlayer.onlySlayerNumber = "V";
+                break;
+            default:
+                BlockWrongSlayer.onlySlayerName = "";
+                BlockWrongSlayer.onlySlayerNumber = "";
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
+                return;
+        }
+
+        ConfigHandler.writeStringConfig("toggles", "BlockSlayer", BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber);
+        player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking set to " + DankersSkyblockMod.SECONDARY_COLOUR + BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber));
+    }
+
+}
diff --git a/src/main/java/me/Danker/commands/CrystalHollowWaypointCommand.java b/src/main/java/me/Danker/commands/CrystalHollowWaypointCommand.java
new file mode 100644
index 0000000..4eaf2d6
--- /dev/null
+++ b/src/main/java/me/Danker/commands/CrystalHollowWaypointCommand.java
@@ -0,0 +1,39 @@
+package me.Danker.commands;
+
+import me.Danker.features.CrystalHollowWaypoints;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+
+import java.util.Arrays;
+
+public class CrystalHollowWaypointCommand extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "dsmaddcrystalhollowwaypoints";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender arg0) {
+        return "/" + getCommandName() + " <formatted waypoint>";
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+        if (arg1.length == 0) return;
+
+        if (arg1.length > 4 && arg1[0].equals("st")) {
+            String name = String.join(" ", Arrays.copyOfRange(arg1, 4, arg1.length));
+            CrystalHollowWaypoints.addWaypoint(name, arg1[1], arg1[2], arg1[3]);
+        } else {
+            CrystalHollowWaypoints.addDSMWaypoints(String.join(" ", arg1), false);
+        }
+    }
+
+}
diff --git a/src/main/java/me/Danker/commands/CustomMusicCommand.java b/src/main/java/me/Danker/commands/CustomMusicCommand.java
index 0e80dd3..621a6f0 100644
--- a/src/main/java/me/Danker/commands/CustomMusicCommand.java
+++ b/src/main/java/me/Danker/commands/CustomMusicCommand.java
@@ -10,9 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
 
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.UnsupportedAudioFileException;
-import java.io.IOException;
 import java.util.List;
 
 public class CustomMusicCommand extends CommandBase {
@@ -24,7 +21,8 @@ public class CustomMusicCommand extends CommandBase {
 
     @Override
     public String getCommandUsage(ICommandSender arg0) {
-        return "/" + getCommandName() + " <stop/reload/volume> [dungeonboss/bloodroom/dungeon] [1-100]";
+        return "/" + getCommandName() + " <stop/reload/volume> [dungeonboss/bloodroom/dungeon/p2/p3/p4/p5/hub/island/dungeonhub/farmingislands/" +
+                                                                "goldmine/deepcaverns/dwarvenmines/crystalhollows/spidersden/crimsonisle/end/park] [1-100]";
     }
 
     public static String usage(ICommandSender arg0) {
@@ -41,7 +39,8 @@ public class CustomMusicCommand extends CommandBase {
         if (args.length == 1) {
             return getListOfStringsMatchingLastWord(args, "stop", "reload", "volume");
         } else if (args.length == 2) {
-            return getListOfStringsMatchingLastWord(args, "dungeonboss", "bloodroom", "dungeon");
+            return getListOfStringsMatchingLastWord(args, "dungeonboss", "bloodroom", "dungeon", "hub", "island", "dungeonhub", "farmingislands", "goldmine",
+                                                          "deepcaverns", "dwarvenmines", "crystalhollows", "spidersden", "crimsonisle", "end", "park");
         }
         return null;
     }
@@ -61,13 +60,8 @@ public class CustomMusicCommand extends CommandBase {
                 player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Stopped custom music."));
                 break;
             case "reload":
-                try {
-                    CustomMusic.init(DankersSkyblockMod.configDirectory);
-                    player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Reloaded custom music."));
-                } catch (IOException | LineUnavailableException | UnsupportedAudioFileException e) {
-                    player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "An error occurred while trying to reload music."));
-                    e.printStackTrace();
-                }
+                CustomMusic.init(DankersSkyblockMod.configDirectory);
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Reloaded custom music."));
                 break;
             case "volume":
                 if (arg1.length < 3) {
@@ -76,36 +70,122 @@ public class CustomMusicCommand extends CommandBase {
                 }
 
                 int volume = Integer.parseInt(arg1[2]);
-                boolean success;
 
                 switch (arg1[1].toLowerCase()) {
                     case "dungeonboss":
-                        success = CustomMusic.dungeonboss.setVolume(volume);
-                        if (!success) {
-                            return;
-                        }
+                        if (!CustomMusic.dungeonboss.setVolume(volume)) return;
 
                         CustomMusic.dungeonbossVolume = volume;
                         ConfigHandler.writeIntConfig("music", "DungeonBossVolume", volume);
                         break;
                     case "bloodroom":
-                        success = CustomMusic.bloodroom.setVolume(volume);
-                        if (!success) {
-                            return;
-                        }
+                        if (!CustomMusic.bloodroom.setVolume(volume)) return;
 
                         CustomMusic.bloodroomVolume = volume;
                         ConfigHandler.writeIntConfig("music", "BloodRoomVolume", volume);
                         break;
                     case "dungeon":
-                        success = CustomMusic.dungeon.setVolume(volume);
-                        if (!success) {
-                            return;
-                        }
+                        if (!CustomMusic.dungeon.setVolume(volume)) return;
 
                         CustomMusic.dungeonVolume = volume;
                         ConfigHandler.writeIntConfig("music", "DungeonVolume", volume);
                         break;
+                    case "p2":
+                        if (!CustomMusic.phase2.setVolume(volume)) return;
+
+                        CustomMusic.phase2Volume = volume;
+                        ConfigHandler.writeIntConfig("music", "Phase2Volume", volume);
+                        break;
+                    case "p3":
+                        if (!CustomMusic.phase3.setVolume(volume)) return;
+
+                        CustomMusic.phase3Volume = volume;
+                        ConfigHandler.writeIntConfig("music", "Phase3Volume", volume);
+                        break;
+                    case "p4":
+                        if (!CustomMusic.phase4.setVolume(volume)) return;
+
+                        CustomMusic.phase4Volume = volume;
+                        ConfigHandler.writeIntConfig("music", "Phase4Volume", volume);
+                        break;
+                    case "p5":
+                        if (!CustomMusic.phase5.setVolume(volume)) return;
+
+                        CustomMusic.phase5Volume = volume;
+                        ConfigHandler.writeIntConfig("music", "Phase5Volume", volume);
+                        break;
+                    case "hub":
+                        if (!CustomMusic.hub.setVolume(volume)) return;
+
+                        CustomMusic.hubVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "HubVolume", volume);
+                        break;
+                    case "island":
+                        if (!CustomMusic.island.setVolume(volume)) return;
+
+                        CustomMusic.islandVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "IslandVolume", volume);
+                        break;
+                    case "dungeonhub":
+                        if (!CustomMusic.dungeonHub.setVolume(volume)) return;
+
+                        CustomMusic.dungeonHubVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "DungeonHubVolume", volume);
+                        break;
+                    case "farmingislands":
+                        if (!CustomMusic.farmingIslands.setVolume(volume)) return;
+
+                        CustomMusic.farmingIslandsVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "FarmingIslandsVolume", volume);
+                        break;
+                    case "goldmine":
+                        if (!CustomMusic.goldMine.setVolume(volume)) return;
+
+                        CustomMusic.goldMineVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "GoldMineVolume", volume);
+                        break;
+                    case "deepcaverns":
+                        if (!CustomMusic.deepCaverns.setVolume(volume)) return;
+
+                        CustomMusic.deepCavernsVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "DeepCavernsVolume", volume);
+                        break;
+                    case "dwarvenmines":
+                        if (!CustomMusic.dwarvenMines.setVolume(volume)) return;
+
+                        CustomMusic.dwarvenMinesVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "DwarvenMinesVolume", volume);
+                        break;
+                    case "crystalhollows":
+                        if (!CustomMusic.crystalHollows.setVolume(volume)) return;
+
+                        CustomMusic.crystalHollowsVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "CrystalHollowsVolume", volume);
+                        break;
+                    case "spidersden":
+                        if (!CustomMusic.spidersDen.setVolume(volume)) return;
+
+                        CustomMusic.spidersDenVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "SpidersDenVolume", volume);
+                        break;
+                    case "crimsonisle":
+                        if (!CustomMusic.crimsonIsle.setVolume(volume)) return;
+
+                        CustomMusic.crimsonIsleVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "CrimsonIsleVolume", volume);
+                        break;
+                    case "end":
+                        if (!CustomMusic.end.setVolume(volume)) return;
+
+                        CustomMusic.endVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "EndVolume", volume);
+                        break;
+                    case "park":
+                        if (!CustomMusic.park.setVolume(volume)) return;
+
+                        CustomMusic.parkVolume = volume;
+                        ConfigHandler.writeIntConfig("music", "ParkVolume", volume);
+                        break;
                     default:
                         player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
                         return;
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index 8d47576..477d43b 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -50,12 +50,19 @@ public class DHelpCommand extends CommandBase {
 													EnumChatFormatting.GOLD + BankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + ArmourCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get armour of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + DungeonsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.\n" +
+													EnumChatFormatting.GOLD + WeightCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get weight of a person. If no name is provided, it checks yours. Adding lily uses lily's weight instead of Senither's.\n" +
 													EnumChatFormatting.GOLD + ImportFishingCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
 													EnumChatFormatting.GOLD + SkyblockPlayersCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
+													EnumChatFormatting.GOLD + BlockSlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Stops you from starting a slayer quest other than the one specified.\n" +
 													EnumChatFormatting.GOLD + SkillTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for skill xp/hour.\n" +
                           							EnumChatFormatting.GOLD + LobbyBankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find the average bank total of the lobby, as well the three players with the highest total money in the bank(and purse).\n" +
 													EnumChatFormatting.GOLD + RepartyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Disbands and reparties all members in the party.\n" +
 													EnumChatFormatting.GOLD + CustomMusicCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Stops or reloads the custom music.\n" +
+													EnumChatFormatting.GOLD + PlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find skills, slayers, coins and weight of a player.\n" +
+													EnumChatFormatting.GOLD + ReloadConfigCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod config.\n" +
+													EnumChatFormatting.GOLD + ReloadRepoCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod repository.\n" +
+													EnumChatFormatting.GOLD + FarmLengthCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Sets coords to be used for end of farm alert.\n" +
+													EnumChatFormatting.GOLD + HOTMCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find total powder and HotM tree of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GREEN + " Open Maddox Menu" + EnumChatFormatting.AQUA + " - M by default.\n" +
 													EnumChatFormatting.GREEN + " Start/Stop Skill Tracker" + EnumChatFormatting.AQUA + " - Numpad 5 by default.\n"));
 	}
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index 5076ef7..1c5ea53 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.EndOfFarmAlert;
 import me.Danker.features.SkillTracker;
 import me.Danker.features.loot.LootDisplay;
 import net.minecraft.client.Minecraft;
@@ -13,6 +14,8 @@ import net.minecraft.util.StringUtils;
 
 import java.awt.*;
 import java.awt.datatransfer.StringSelection;
+import java.util.Collections;
+import java.util.List;
 
 public class DankerGuiCommand extends CommandBase {
 
@@ -22,6 +25,11 @@ public class DankerGuiCommand extends CommandBase {
 	}
 
 	@Override
+	public List<String> getCommandAliases() {
+		return Collections.singletonList("dankersskyblockmod");
+	}
+
+	@Override
 	public String getCommandUsage(ICommandSender arg0) {
 		return "/" + getCommandName();
 	}
@@ -40,58 +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("[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("[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("[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("[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");
@@ -101,10 +57,18 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[caketimer][").append(MoveCommand.cakeTimerXY[0]).append(", ").append(MoveCommand.cakeTimerXY[1]).append("]\n");
 			debug.append("[skilltracker][").append(MoveCommand.skillTrackerXY[0]).append(", ").append(MoveCommand.skillTrackerXY[1]).append("]\n");
 			debug.append("[wateranswer][").append(MoveCommand.waterAnswerXY[0]).append(", ").append(MoveCommand.waterAnswerXY[1]).append("]\n");
+			debug.append("[bonzotimer][").append(MoveCommand.bonzoTimerXY[0]).append(", ").append(MoveCommand.bonzoTimerXY[1]).append("]\n");
+			debug.append("[golemtimer][").append(MoveCommand.golemTimerXY[0]).append(", ").append(MoveCommand.golemTimerXY[1]).append("]\n");
+			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("[firepillar][").append(MoveCommand.firePillarXY[0]).append(", ").append(MoveCommand.firePillarXY[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");
 			debug.append("[Skill Tracker Visible][").append(SkillTracker.showSkillTracker).append("]\n");
+			debug.append("[Farm Length][").append(EndOfFarmAlert.min).append(" to ").append(EndOfFarmAlert.max).append("]\n");
 			debug.append("# Problematic Mods\n");
 			debug.append("[LabyMod][").append(DankersSkyblockMod.usingLabymod).append("]\n");
 			debug.append("[OAM][").append(DankersSkyblockMod.usingOAM).append("]\n");
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index 990e9d1..c340ed8 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/fishing/catacombs/mythological/ghost/auto/off> [winter/festival/spooky/session/f(1-7)]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/blaze/fishing/catacombs/mythological/ghost/auto/off> [winter/festival/spooky/ch/lava/trophy/session/f(1-7)/mm]";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -36,11 +36,11 @@ public class DisplayCommand extends CommandBase {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {