aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/Danker/features
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/Danker/features')
-rw-r--r--src/main/java/me/Danker/features/ArachneESP.java11
-rw-r--r--src/main/java/me/Danker/features/CustomMusic.java7
2 files changed, 8 insertions, 10 deletions
diff --git a/src/main/java/me/Danker/features/ArachneESP.java b/src/main/java/me/Danker/features/ArachneESP.java
index 7e39a8f..1848a9b 100644
--- a/src/main/java/me/Danker/features/ArachneESP.java
+++ b/src/main/java/me/Danker/features/ArachneESP.java
@@ -30,19 +30,10 @@ public class ArachneESP {
arachne = null;
}
- public boolean inSpidersDen(List<String> scoreboard) {
- for (String s : scoreboard) {
- if (ScoreboardHandler.cleanSB(s).contains("Spider's Den")) {
- return true;
- }
- }
- return false;
- }
-
@SubscribeEvent
public void onChat(ClientChatReceivedEvent event) {
if (!Utils.inSkyblock) return;
- if (!inSpidersDen(ScoreboardHandler.getSidebarLines())) return;
+ if (!Utils.tabLocation.equals("Spider's Den")) return;
String message = StringUtils.stripControlCodes(event.message.getUnformattedText());
if (message.contains("Something is awakening")){
arachneActive = true;
diff --git a/src/main/java/me/Danker/features/CustomMusic.java b/src/main/java/me/Danker/features/CustomMusic.java
index 16fef34..4891fe3 100644
--- a/src/main/java/me/Danker/features/CustomMusic.java
+++ b/src/main/java/me/Danker/features/CustomMusic.java
@@ -49,6 +49,8 @@ public class CustomMusic {
public static int dwarvenMinesVolume;
public static Song crystalHollows;
public static int crystalHollowsVolume;
+ public static Song spidersDen;
+ public static int spidersDenVolume;
public static Song blazingFortress;
public static int blazingFortressVolume;
public static Song end;
@@ -114,6 +116,9 @@ public class CustomMusic {
case "Crystal Hollows":
if (ToggleCommand.crystalHollowsMusic) crystalHollows.start();
break;
+ case "Spider's Den":
+ if (ToggleCommand.spidersDenMusic) spidersDen.start();
+ break;
case "Blazing Fortress":
if (ToggleCommand.blazingFortressMusic) blazingFortress.start();
break;
@@ -178,6 +183,7 @@ public class CustomMusic {
deepCaverns = new Song(directory, "deepcaverns", deepCavernsVolume);
dwarvenMines = new Song(directory, "dwarvenmines", dwarvenMinesVolume);
crystalHollows = new Song(directory, "crystalhollows", crystalHollowsVolume);
+ spidersDen = new Song(directory, "spidersden", spidersDenVolume);
blazingFortress = new Song(directory, "blazingfortress", blazingFortressVolume);
end = new Song(directory, "end", endVolume);
park = new Song(directory, "park", parkVolume);
@@ -195,6 +201,7 @@ public class CustomMusic {
if (deepCaverns != null) deepCaverns.stop();
if (dwarvenMines != null) dwarvenMines.stop();
if (crystalHollows != null) crystalHollows.stop();
+ if (spidersDen != null) spidersDen.stop();
if (blazingFortress != null) blazingFortress.stop();
if (end != null) end.stop();
if (park != null) park.stop();