Add dungeon and blood room custom music

4 files changed, 58 insertions, 32 deletions

diff --git a/src/main/java/me/Danker/commands/CustomMusicCommand.java b/src/main/java/me/Danker/commands/CustomMusicCommand.java
index 8e389ac..6412474 100644
--- a/src/main/java/me/Danker/commands/CustomMusicCommand.java
+++ b/src/main/java/me/Danker/commands/CustomMusicCommand.java
@@ -10,8 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
 
-import javax.sound.sampled.Clip;
-import javax.sound.sampled.FloatControl;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.UnsupportedAudioFileException;
 import java.io.IOException;
@@ -26,7 +24,7 @@ public class CustomMusicCommand extends CommandBase {
 
     @Override
     public String getCommandUsage(ICommandSender arg0) {
-        return "/" + getCommandName() + " <stop/reload/volume> [dungeonboss] [#]";
+        return "/" + getCommandName() + " <stop/reload/volume> [dungeonboss/bloodroom/dungeon] [#]";
     }
 
     public static String usage(ICommandSender arg0) {
@@ -43,7 +41,7 @@ public class CustomMusicCommand extends CommandBase {
         if (args.length == 1) {
             return getListOfStringsMatchingLastWord(args, "stop", "reload", "volume");
         } else if (args.length == 2) {
-            return getListOfStringsMatchingLastWord(args, "dungeonboss");
+            return getListOfStringsMatchingLastWord(args, "dungeonboss", "bloodroom", "dungeon");
         }
         return null;
     }
@@ -59,7 +57,7 @@ public class CustomMusicCommand extends CommandBase {
 
         switch (arg1[0].toLowerCase()) {
             case "stop":
-                if (CustomMusic.dungeonboss != null) CustomMusic.dungeonboss.stop();
+                CustomMusic.reset();
                 player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Stopped custom music."));
                 break;
             case "reload":
@@ -77,28 +75,43 @@ public class CustomMusicCommand extends CommandBase {
                     return;
                 }
 
+                float volume = Float.parseFloat(arg1[2]);
+                boolean success;
+
                 switch (arg1[1].toLowerCase()) {
                     case "dungeonboss":
-                        try {
-                            float volume = Float.parseFloat(arg1[2]);
-
-                            FloatControl bounds = (FloatControl) CustomMusic.dungeonboss.getControl(FloatControl.Type.MASTER_GAIN);
-                            if (volume <= bounds.getMinimum() || volume >= bounds.getMaximum()) {
-                                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Volume can only be set between " + bounds.getMinimum() + " and " + bounds.getMaximum() + "."));
-                                return;
-                            }
-
-                            CustomMusic.dungeonbossDecibels = volume;
-                            ConfigHandler.writeIntConfig("music", "DungeonBossDecibels", (int) volume);
-                            CustomMusic.init(DankersSkyblockMod.configDirectory);
-                        } catch (IOException | LineUnavailableException | UnsupportedAudioFileException e) {
-                            player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "An error occurred while trying to reload music."));
-                            e.printStackTrace();
+                        success = CustomMusic.dungeonboss.setVolume(volume);
+                        if (!success) {
+                            return;
                         }
+
+                        CustomMusic.dungeonbossDecibels = volume;
+                        ConfigHandler.writeIntConfig("music", "DungeonBossDecibels", (int) volume);
+                        break;
+                    case "bloodroom":
+                        success = CustomMusic.bloodroom.setVolume(volume);
+                        if (!success) {
+                            return;
+                        }
+
+                        CustomMusic.bloodroomDecibels = volume;
+                        ConfigHandler.writeIntConfig("music", "BloodRoomDecibels", (int) volume);
+                        break;
+                    case "dungeon":
+                        success = CustomMusic.dungeon.setVolume(volume);
+                        if (!success) {
+                            return;
+                        }
+
+                        CustomMusic.dungeonDecibels = volume;
+                        ConfigHandler.writeIntConfig("music", "DungeonDecibels", (int) volume);
                         break;
                     default:
                         player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
+                        return;
                 }
+
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + DankersSkyblockMod.MAIN_COLOUR + " was set to " + DankersSkyblockMod.SECONDARY_COLOUR + volume + "db"));
                 break;
             default:
                 player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index 97af0df..40fcb0a 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -97,6 +97,8 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[specialhoe][").append(ToggleCommand.specialHoeRightClick).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");
diff --git a/src/main/java/me/Danker/commands/LobbyBankCommand.java b/src/main/java/me/Danker/commands/LobbyBankCommand.java
index 77dce2a..886077c 100644
--- a/src/main/java/me/Danker/commands/LobbyBankCommand.java
+++ b/src/main/java/me/Danker/commands/LobbyBankCommand.java
@@ -5,7 +5,6 @@ import com.google.gson.JsonObject;
 import me.Danker.DankersSkyblockMod;
 import me.Danker.handlers.APIHandler;
 import me.Danker.handlers.ConfigHandler;
-import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.command.CommandBase;
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index b8b5845..73011ad 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -80,6 +80,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean melodyTooltips;
 	// Custom Music
 	public static boolean dungeonBossMusic;
+	public static boolean bloodRoomMusic;
+	public static boolean dungeonMusic;
 
 	@Override
 	public String getCommandName() {
@@ -96,8 +98,9 @@ public class ToggleCommand extends CommandBase implements ICommand {
 										  "notifyslayerslain/necronnotifications/bonzotimer/threemanpuzzle/oruopuzzle/blazepuzzle/" +
 										  "creeperpuzzle/waterpuzzle/tictactoepuzzle/boulderpuzzle/silverfishpuzzle/icewalkpuzzle/watchermessage/" +
 										  "startswithterminal/selectallterminal/clickinorderterminal/blockwrongterminalclicks/" +
-										  "itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/ " +
-										  "/specialhoe/melodytooltips/highlightslayers/highlightArachne/dungeonbossmusic/list>";
+										  "itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/" +
+										  "specialhoe/melodytooltips/highlightslayers/highlightarachne/dungeonbossmusic/bloodroommusic/" +
+										  "dungeonmusic/list>";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -124,7 +127,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 														  "silverfishpuzzle", "icewalkpuzzle", "watchermessage", "startswithterminal",
 														  "selectallterminal", "clickinorderterminal", "blockwrongterminalclicks",
 														  "itemframeonsealanterns", "ultrasequencer", "chronomatron", "superpairs",
-														  "hidetooltipsinaddons", "pickblock", "specialhoe", "melodytooltips", "highlightslayers", "dungeonbossmusic", "list");
+														  "hidetooltipsinaddons", "pickblock", "specialhoe", "melodytooltips", "highlightslayers",
+														  "dungeonbossmusic", "bloodroommusic", "dungeonmusic", "list");
 		}
 		return null;
 	}
@@ -436,16 +440,22 @@ public class ToggleCommand extends CommandBase implements ICommand {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Highlight Arachne " + DankersSkyblockMod.SECONDARY_COLOUR + highlightArachne + DankersSkyblockMod.MAIN_COLOUR + "."));
 			case "dungeonbossmusic":
 				dungeonBossMusic = !dungeonBossMusic;
-				if (CustomMusic.dungeonboss != null) {
-					if (dungeonBossMusic) {
-						CustomMusic.start();
-					} else {
-						CustomMusic.dungeonboss.stop();
-					}
-				}
+				CustomMusic.dungeonboss.stop();
 				ConfigHandler.writeBooleanConfig("toggles", "DungeonBossMusic", dungeonBossMusic);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Custom dungeon boss music has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + dungeonBossMusic + DankersSkyblockMod.MAIN_COLOUR + "."));
 				break;
+			case "bloodroommusic":
+				bloodRoomMusic = !bloodRoomMusic;
+				CustomMusic.bloodroom.stop();
+				ConfigHandler.writeBooleanConfig("toggles", "BloodRoomMusic", bloodRoomMusic);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Custom blood room music has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + bloodRoomMusic + DankersSkyblockMod.MAIN_COLOUR + "."));
+				break;
+			case "dungeonmusic":
+				dungeonMusic = !dungeonMusic;
+				CustomMusic.dungeon.stop();
+				ConfigHandler.writeBooleanConfig("toggles", "DungeonMusic", dungeonMusic);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Custom dungeon music has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + dungeonMusic + 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" +
@@ -496,7 +506,9 @@ public class ToggleCommand extends CommandBase implements ICommand {
 															DankersSkyblockMod.TYPE_COLOUR + " Hide tooltips in Melody's Harp " + DankersSkyblockMod.VALUE_COLOUR + melodyTooltips + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Highlight Slayer Bosses " + DankersSkyblockMod.VALUE_COLOUR + highlightSlayers + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Highlight Arachne Boss " + DankersSkyblockMod.VALUE_COLOUR + highlightArachne + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Custom dungeon boss music: " + DankersSkyblockMod.VALUE_COLOUR + dungeonBossMusic
+															DankersSkyblockMod.TYPE_COLOUR + " Custom dungeon boss music: " + DankersSkyblockMod.VALUE_COLOUR + dungeonBossMusic + "\n" +
+															DankersSkyblockMod.TYPE_COLOUR + " Custom blood room music: " + DankersSkyblockMod.VALUE_COLOUR + bloodRoomMusic + "\n" +
+															DankersSkyblockMod.TYPE_COLOUR + " Custom dungeon music: " + DankersSkyblockMod.VALUE_COLOUR + dungeonMusic
 				));
 				break;
 			default: