Merge remote-tracking branch 'upstream/development' into development

1 files changed, 81 insertions, 25 deletions

diff --git a/src/main/java/me/Danker/commands/CustomMusicCommand.java b/src/main/java/me/Danker/commands/CustomMusicCommand.java
index 0e80dd3..f0634fc 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/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,98 @@ 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 "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;