aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md4
-rw-r--r--src/main/java/me/Danker/commands/CustomMusicCommand.java12
-rw-r--r--src/main/java/me/Danker/commands/ToggleCommand.java12
-rw-r--r--src/main/java/me/Danker/features/CustomMusic.java12
-rw-r--r--src/main/java/me/Danker/gui/CustomMusicGui.java16
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java4
6 files changed, 30 insertions, 30 deletions
diff --git a/README.md b/README.md
index 2a740c7..e3b7ee8 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ Discord Server: https://discord.gg/QsEkNQS
- /reparty - Disbands and reparties all members in the party
- /fairysouls - Check the fairysouls of a player
- /lobbybank - 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).
-- /dsmmusic <stop/reload/volume> [dungeonboss/bloodroom/dungeon/hub/island/dungeonhub/farmingislands/goldmine/deepcaverns/dwarvenmines/crystalhollows/spidersden/blazingfortress/end/park] [1-100] - Stops, reloads or changes the volume of custom music.
+- /dsmmusic <stop/reload/volume> [dungeonboss/bloodroom/dungeon/hub/island/dungeonhub/farmingislands/goldmine/deepcaverns/dwarvenmines/crystalhollows/spidersden/crimsonisle/end/park] [1-100] - Stops, reloads or changes the volume of custom music.
- /player [player] - Uses API to find skills, slayers, coins and weight of a player.
- /reloadconfig - Reloads Danker's Skyblock Mod config.
- /reloaddsmrepo - Reloads Danker's Skyblock Mod repository.
@@ -119,7 +119,7 @@ Discord Server: https://discord.gg/QsEkNQS
- Dwarven Mines: `dwarvenmines.wav`
- Crystal Hollows: `crystalhollows.wav`
- Spider's Den: `spidersden.wav`
- - Blazing Fortress: `blazingfortress.wav`
+ - Crimson Isle: `crimsonisle.wav`
- The End: `end.wav`
- The Park: `park.wav`
2. Either run `/dsmmusic reload` or restart your game.
diff --git a/src/main/java/me/Danker/commands/CustomMusicCommand.java b/src/main/java/me/Danker/commands/CustomMusicCommand.java
index 283b748..f0634fc 100644
--- a/src/main/java/me/Danker/commands/CustomMusicCommand.java
+++ b/src/main/java/me/Danker/commands/CustomMusicCommand.java
@@ -22,7 +22,7 @@ public class CustomMusicCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
return "/" + getCommandName() + " <stop/reload/volume> [dungeonboss/bloodroom/dungeon/hub/island/dungeonhub/farmingislands/" +
- "goldmine/deepcaverns/dwarvenmines/crystalhollows/spidersden/blazingfortress/end/park] [1-100]";
+ "goldmine/deepcaverns/dwarvenmines/crystalhollows/spidersden/crimsonisle/end/park] [1-100]";
}
public static String usage(ICommandSender arg0) {
@@ -40,7 +40,7 @@ public class CustomMusicCommand extends CommandBase {
return getListOfStringsMatchingLastWord(args, "stop", "reload", "volume");
} else if (args.length == 2) {
return getListOfStringsMatchingLastWord(args, "dungeonboss", "bloodroom", "dungeon", "hub", "island", "dungeonhub", "farmingislands", "goldmine",
- "deepcaverns", "dwarvenmines", "crystalhollows", "spidersden", "blazingfortress", "end", "park");
+ "deepcaverns", "dwarvenmines", "crystalhollows", "spidersden", "crimsonisle", "end", "park");
}
return null;
}
@@ -144,11 +144,11 @@ public class CustomMusicCommand extends CommandBase {
CustomMusic.spidersDenVolume = volume;
ConfigHandler.writeIntConfig("music", "SpidersDenVolume", volume);
break;
- case "blazingfortress":
- if (!CustomMusic.blazingFortress.setVolume(volume)) return;
+ case "crimsonisle":
+ if (!CustomMusic.crimsonIsle.setVolume(volume)) return;
- CustomMusic.blazingFortressVolume = volume;
- ConfigHandler.writeIntConfig("music", "BlazingFortressVolume", volume);
+ CustomMusic.crimsonIsleVolume = volume;
+ ConfigHandler.writeIntConfig("music", "CrimsonIsleVolume", volume);
break;
case "end":
if (!CustomMusic.end.setVolume(volume)) return;
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index c8f37d6..3536bd7 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -106,7 +106,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean dwarvenMinesMusic;
public static boolean crystalHollowsMusic;
public static boolean spidersDenMusic;
- public static boolean blazingFortressMusic;
+ public static boolean crimsonIsleMusic;
public static boolean endMusic;
public static boolean parkMusic;
@@ -576,10 +576,10 @@ public class ToggleCommand extends CommandBase implements ICommand {
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Custom spider's den music has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + spidersDenMusic + DankersSkyblockMod.MAIN_COLOUR + "."));
break;
case "blazingfortressmusic":
- blazingFortressMusic = !blazingFortressMusic;
- CustomMusic.blazingFortress.stop();
- ConfigHandler.writeBooleanConfig("toggles", "BlazingFortressMusic", blazingFortressMusic);
- player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Custom blazing fortress music has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + blazingFortressMusic + DankersSkyblockMod.MAIN_COLOUR + "."));
+ crimsonIsleMusic = !crimsonIsleMusic;
+ CustomMusic.crimsonIsle.stop();
+ ConfigHandler.writeBooleanConfig("toggles", "CrimsonIsleMusic", crimsonIsleMusic);
+ player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Custom crimson isle music has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + crimsonIsleMusic + DankersSkyblockMod.MAIN_COLOUR + "."));
break;
case "endmusic":
endMusic = !endMusic;
@@ -674,7 +674,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
DankersSkyblockMod.TYPE_COLOUR + " Custom dwarven mines music: " + DankersSkyblockMod.VALUE_COLOUR + dwarvenMinesMusic + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Custom crystal hollows music: " + DankersSkyblockMod.VALUE_COLOUR + crystalHollowsMusic + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Custom spider's den music: " + DankersSkyblockMod.VALUE_COLOUR + spidersDenMusic + "\n" +
- DankersSkyblockMod.TYPE_COLOUR + " Custom blazing fortress music: " + DankersSkyblockMod.VALUE_COLOUR + blazingFortressMusic + "\n" +
+ DankersSkyblockMod.TYPE_COLOUR + " Custom blazing fortress music: " + DankersSkyblockMod.VALUE_COLOUR + crimsonIsleMusic + "\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 + "\n" +
diff --git a/src/main/java/me/Danker/features/CustomMusic.java b/src/main/java/me/Danker/features/CustomMusic.java
index 5153f91..a31e40a 100644
--- a/src/main/java/me/Danker/features/CustomMusic.java
+++ b/src/main/java/me/Danker/features/CustomMusic.java
@@ -51,8 +51,8 @@ public class CustomMusic {
public static int crystalHollowsVolume;
public static Song spidersDen;
public static int spidersDenVolume;
- public static Song blazingFortress;
- public static int blazingFortressVolume;
+ public static Song crimsonIsle;
+ public static int crimsonIsleVolume;
public static Song end;
public static int endVolume;
public static Song park;
@@ -119,8 +119,8 @@ public class CustomMusic {
case "Spider's Den":
if (ToggleCommand.spidersDenMusic) spidersDen.start();
break;
- case "Blazing Fortress":
- if (ToggleCommand.blazingFortressMusic) blazingFortress.start();
+ case "Crimson Isle":
+ if (ToggleCommand.crimsonIsleMusic) crimsonIsle.start();
break;
case "The End":
if (ToggleCommand.endMusic) end.start();
@@ -184,7 +184,7 @@ public class CustomMusic {
dwarvenMines = new Song(directory, "dwarvenmines", dwarvenMinesVolume);
crystalHollows = new Song(directory, "crystalhollows", crystalHollowsVolume);
spidersDen = new Song(directory, "spidersden", spidersDenVolume);
- blazingFortress = new Song(directory, "blazingfortress", blazingFortressVolume);
+ crimsonIsle = new Song(directory, "crimsonisle", crimsonIsleVolume);
end = new Song(directory, "end", endVolume);
park = new Song(directory, "park", parkVolume);
}
@@ -202,7 +202,7 @@ public class CustomMusic {
if (dwarvenMines != null) dwarvenMines.stop();
if (crystalHollows != null) crystalHollows.stop();
if (spidersDen != null) spidersDen.stop();
- if (blazingFortress != null) blazingFortress.stop();
+ if (crimsonIsle != null) crimsonIsle.stop();
if (end != null) end.stop();
if (park != null) park.stop();
}
diff --git a/src/main/java/me/Danker/gui/CustomMusicGui.java b/src/main/java/me/Danker/gui/CustomMusicGui.java
index 4d5dcc9..98210f5 100644
--- a/src/main/java/me/Danker/gui/CustomMusicGui.java
+++ b/src/main/java/me/Danker/gui/CustomMusicGui.java
@@ -29,7 +29,7 @@ public class CustomMusicGui extends GuiScreen {
private GuiButton dwarvenMinesMusic;
private GuiButton crystalHollowsMusic;
private GuiButton spidersDenMusic;
- private GuiButton blazingFortressMusic;
+ private GuiButton crimsonIsleMusic;
private GuiButton endMusic;
private GuiButton parkMusic;
@@ -66,7 +66,7 @@ public class CustomMusicGui extends GuiScreen {
dwarvenMinesMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Custom Dwarven Mines Music: " + Utils.getColouredBoolean(ToggleCommand.dwarvenMinesMusic));
crystalHollowsMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Custom Crystal Hollows Music: " + Utils.getColouredBoolean(ToggleCommand.crystalHollowsMusic));
spidersDenMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Custom Spider's Den Music: " + Utils.getColouredBoolean(ToggleCommand.spidersDenMusic));
- blazingFortressMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Custom Blazing Fortress Music: " + Utils.getColouredBoolean(ToggleCommand.blazingFortressMusic));
+ crimsonIsleMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Custom Crimson Isle Music: " + Utils.getColouredBoolean(ToggleCommand.crimsonIsleMusic));
endMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Custom End Music: " + Utils.getColouredBoolean(ToggleCommand.endMusic));
parkMusic = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Custom Park Music: " + Utils.getColouredBoolean(ToggleCommand.parkMusic));
@@ -87,7 +87,7 @@ public class CustomMusicGui extends GuiScreen {
this.buttonList.add(dwarvenMinesMusic);
this.buttonList.add(crystalHollowsMusic);
this.buttonList.add(spidersDenMusic);
- this.buttonList.add(blazingFortressMusic);
+ this.buttonList.add(crimsonIsleMusic);
this.buttonList.add(endMusic);
this.buttonList.add(nextPage);
this.buttonList.add(backPage);
@@ -175,11 +175,11 @@ public class CustomMusicGui extends GuiScreen {
CustomMusic.spidersDen.stop();
ConfigHandler.writeBooleanConfig("toggles", "SpidersDenMusic", ToggleCommand.spidersDenMusic);
spidersDenMusic.displayString = "Custom Spider's Den Music: " + Utils.getColouredBoolean(ToggleCommand.spidersDenMusic);
- } else if (button == blazingFortressMusic) {
- ToggleCommand.blazingFortressMusic = !ToggleCommand.blazingFortressMusic;
- CustomMusic.blazingFortress.stop();
- ConfigHandler.writeBooleanConfig("toggles", "BlazingFortressMusic", ToggleCommand.blazingFortressMusic);
- blazingFortressMusic.displayString = "Custom Blazing Fortress Music: " + Utils.getColouredBoolean(ToggleCommand.blazingFortressMusic);
+ } else if (button == crimsonIsleMusic) {
+ ToggleCommand.crimsonIsleMusic = !ToggleCommand.crimsonIsleMusic;
+ CustomMusic.crimsonIsle.stop();
+ ConfigHandler.writeBooleanConfig("toggles", "BlazingFortressMusic", ToggleCommand.crimsonIsleMusic);
+ crimsonIsleMusic.displayString = "Custom Crimson Isle Music: " + Utils.getColouredBoolean(ToggleCommand.crimsonIsleMusic);
} else if (button == endMusic) {
ToggleCommand.endMusic = !ToggleCommand.endMusic;
CustomMusic.end.stop();
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 4298c2a..3ecb2cc 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -287,7 +287,7 @@ public class ConfigHandler {
ToggleCommand.dwarvenMinesMusic = initBoolean("toggles", "DwarvenMinesMusic", false);
ToggleCommand.crystalHollowsMusic = initBoolean("toggles", "CrystalHollowsMusic", false);
ToggleCommand.spidersDenMusic = initBoolean("toggles", "SpidersDenMusic", false);
- ToggleCommand.blazingFortressMusic = initBoolean("toggles", "BlazingFortressMusic", false);
+ ToggleCommand.crimsonIsleMusic = initBoolean("toggles", "CrimsonIsleMusic", false);
ToggleCommand.endMusic = initBoolean("toggles", "Music", false);
ToggleCommand.parkMusic = initBoolean("toggles", "Music", false);
// Music Volume
@@ -303,7 +303,7 @@ public class ConfigHandler {
CustomMusic.dwarvenMinesVolume = initInt("music", "DwarvenMinesVolume", 50);
CustomMusic.crystalHollowsVolume = initInt("music", "CrystalHollowsVolume", 50);
CustomMusic.spidersDenVolume = initInt("music", "SpidersDenVolume", 50);
- CustomMusic.blazingFortressVolume = initInt("music", "BlazingFortressVolume", 50);
+ CustomMusic.crimsonIsleVolume = initInt("music", "CrimsonIsleVolume", 50);
CustomMusic.endVolume = initInt("music", "EndVolume", 50);
CustomMusic.parkVolume = initInt("music", "ParkVolume", 50);
generated by cgit (git 2.46.0) at 2024-11-22 08:05:32 +0000