aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--src/main/java/me/Danker/commands/BlockSlayerCommand.java7
-rw-r--r--src/main/java/me/Danker/commands/DHelpCommand.java2
-rw-r--r--src/main/java/me/Danker/commands/LootCommand.java4
-rw-r--r--src/main/java/me/Danker/features/loot/LootDisplay.java8
-rw-r--r--src/main/java/me/Danker/features/loot/LootTracker.java22
-rw-r--r--src/main/java/me/Danker/gui/OnlySlayerGui.java25
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java2
8 files changed, 60 insertions, 12 deletions
diff --git a/README.md b/README.md
index 0207b42..b9abb21 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Discord Server: https://discord.gg/QsEkNQS
- /dungeons [player] - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.
- /importfishing - Imports your fishing stats from your latest profile to your fishing tracker using the API.
- /sbplayers - Uses API to find how many players are on each Skyblock island.
-- /onlyslayer <zombie/spider/wolf> <1/2/3/4> - Stops you from starting a slayer quest other than the one specified.
+- /onlyslayer <zombie/spider/wolf> <1/2/3/4/5> - Stops you from starting a slayer quest other than the one specified.
- /skilltracker <start/stop/reset> - Text display for skill xp/hour.
- /reparty - Disbands and reparties all members in the party
diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
index c0beb42..09da5d6 100644
--- a/src/main/java/me/Danker/commands/BlockSlayerCommand.java
+++ b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
@@ -21,7 +21,7 @@ public class BlockSlayerCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <zombie/spider/wolf> <1/2/3/4>";
+ return "/" + getCommandName() + " <zombie/spider/wolf> <1/2/3/4/5>";
}
@Override
@@ -34,7 +34,7 @@ public class BlockSlayerCommand extends CommandBase {
if (args.length == 1) {
return getListOfStringsMatchingLastWord(args, "zombie", "spider", "wolf");
} else if (args.length == 2) {
- return getListOfStringsMatchingLastWord(args, "1", "2", "3", "4");
+ return getListOfStringsMatchingLastWord(args, "1", "2", "3", "4", "5");
}
return null;
}
@@ -84,6 +84,9 @@ public class BlockSlayerCommand extends CommandBase {
case 4:
BlockWrongSlayer.onlySlayerNumber = "IV";
break;
+ case 5:
+ BlockWrongSlayer.onlySlayerNumber = "V";
+ break;
default:
BlockWrongSlayer.onlySlayerName = "";
BlockWrongSlayer.onlySlayerNumber = "";
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index 841d0b5..c431123 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -52,7 +52,7 @@ public class DHelpCommand extends CommandBase {
EnumChatFormatting.GOLD + " /dungeons [player] " + EnumChatFormatting.AQUA + " - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + " /importfishing" + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
EnumChatFormatting.GOLD + " /sbplayers" + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
- EnumChatFormatting.GOLD + " /onlyslayer <zombie/spider/wolf> <1/2/3/4>" + EnumChatFormatting.AQUA + " - Stops you from starting a slayer quest other than the one specified.\n" +
+ EnumChatFormatting.GOLD + " /onlyslayer <zombie/spider/wolf> <1/2/3/4/5>" + EnumChatFormatting.AQUA + " - Stops you from starting a slayer quest other than the one specified.\n" +
EnumChatFormatting.GOLD + " /skilltracker <start/stop/reset>" + EnumChatFormatting.AQUA + " - Text display for skill xp/hour.\n" +
EnumChatFormatting.GOLD + " /reparty " + EnumChatFormatting.AQUA + " - Disbands and reparties all members in the party.\n" +
EnumChatFormatting.GREEN + " Open Maddox Menu" + EnumChatFormatting.AQUA + " - M by default.\n" +
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 3dba27d..5502068 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -227,6 +227,8 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.RED + " Revenant Catalysts: " + LootTracker.zombieRevCatasSession + "\n" +
EnumChatFormatting.DARK_GREEN + " Snake Runes: " + LootTracker.zombieSnakesSession + "\n" +
EnumChatFormatting.GOLD + " Scythe Blades: " + LootTracker.zombieScythesSession + "\n" +
+ EnumChatFormatting.RED + " Shard of the Shreddeds: " + LootTracker.zombieShardsSession + "\n" +
+ EnumChatFormatting.RED + " Warden Hearts: " + LootTracker.zombieWardenHeartsSession + "\n" +
EnumChatFormatting.AQUA + " Time Since RNG: " + timeBetween + "\n" +
EnumChatFormatting.AQUA + " Bosses Since RNG: " + bossesBetween + "\n" +
EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
@@ -261,6 +263,8 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.RED + " Revenant Catalysts: " + LootTracker.zombieRevCatas + "\n" +
EnumChatFormatting.DARK_GREEN + " Snake Runes: " + LootTracker.zombieSnakes + "\n" +
EnumChatFormatting.GOLD + " Scythe Blades: " + LootTracker.zombieScythes + "\n" +
+ EnumChatFormatting.RED + " Shard of the Shreddeds: " + LootTracker.zombieShards + "\n" +
+ EnumChatFormatting.RED + " Warden Hearts: " + LootTracker.zombieWardenHearts + "\n" +
EnumChatFormatting.AQUA + " Time Since RNG: " + timeBetween + "\n" +
EnumChatFormatting.AQUA + " Bosses Since RNG: " + bossesBetween + "\n" +
EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index 363b70c..f51157b 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -221,6 +221,8 @@ public class LootDisplay {
EnumChatFormatting.RED + "Revenant Catalysts:\n" +
EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
EnumChatFormatting.GOLD + "Scythe Blades:\n" +
+ EnumChatFormatting.RED + "Shard of Shreddeds:\n" +
+ EnumChatFormatting.RED + "Warden Hearts:\n" +
EnumChatFormatting.AQUA + "Time Since RNG:\n" +
EnumChatFormatting.AQUA + "Bosses Since RNG:";
countText = EnumChatFormatting.GOLD + nf.format(LootTracker.zombieRevs) + "\n" +
@@ -233,6 +235,8 @@ public class LootDisplay {
EnumChatFormatting.RED + LootTracker.zombieRevCatas + "\n" +
EnumChatFormatting.DARK_GREEN + LootTracker.zombieSnakes + "\n" +
EnumChatFormatting.GOLD + LootTracker.zombieScythes + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieShards + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieWardenHearts + "\n" +
EnumChatFormatting.AQUA + timeBetween + "\n" +
EnumChatFormatting.AQUA + bossesBetween;
break;
@@ -263,6 +267,8 @@ public class LootDisplay {
EnumChatFormatting.RED + "Revenant Catalysts:\n" +
EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
EnumChatFormatting.GOLD + "Scythe Blades:\n" +
+ EnumChatFormatting.RED + "Shard of Shreddeds:\n" +
+ EnumChatFormatting.RED + "Warden Hearts:\n" +
EnumChatFormatting.AQUA + "Time Since RNG:\n" +
EnumChatFormatting.AQUA + "Bosses Since RNG:";
countText = EnumChatFormatting.GOLD + nf.format(LootTracker.zombieRevsSession) + "\n" +
@@ -275,6 +281,8 @@ public class LootDisplay {
EnumChatFormatting.RED + LootTracker.zombieRevCatasSession + "\n" +
EnumChatFormatting.DARK_GREEN + LootTracker.zombieSnakesSession + "\n" +
EnumChatFormatting.GOLD + LootTracker.zombieScythes + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieShardsSession + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieWardenHeartsSession + "\n" +
EnumChatFormatting.AQUA + timeBetween + "\n" +
EnumChatFormatting.AQUA + bossesBetween;
break;
diff --git a/src/main/java/me/Danker/features/loot/LootTracker.java b/src/main/java/me/Danker/features/loot/LootTracker.java
index f7f7044..68cd8b0 100644
--- a/src/main/java/me/Danker/features/loot/LootTracker.java
+++ b/src/main/java/me/Danker/features/loot/LootTracker.java
@@ -56,6 +56,8 @@ public class LootTracker {
public static int zombieRevCatas;
public static int zombieSnakes;
public static int zombieScythes;
+ public static int zombieShards;
+ public static int zombieWardenHearts;
public static double zombieTime;
public static int zombieBosses;
@@ -216,6 +218,8 @@ public class LootTracker {
public static int zombieRevCatasSession = 0;
public static int zombieSnakesSession = 0;
public static int zombieScythesSession = 0;
+ public static int zombieShardsSession = 0;
+ public static int zombieWardenHeartsSession = 0;
public static double zombieTimeSession = -1;
public static int zombieBossesSession = -1;
@@ -373,7 +377,7 @@ public class LootTracker {
}
// Wolf
- if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
+ if (message.contains(" Wolf Slayer LVL ")) {
wolfSvens++;
wolfSvensSession++;
if (wolfBosses != -1) {
@@ -416,7 +420,7 @@ public class LootTracker {
wolfFluxesSession++;
ConfigHandler.writeIntConfig("wolf", "flux", wolfFluxes);
if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
- } else if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) { // Spider
+ } else if (message.contains(" Spider Slayer LVL ")) { // Spider
spiderTarantulas++;
spiderTarantulasSession++;
if (spiderBosses != -1) {
@@ -457,7 +461,7 @@ public class LootTracker {
spiderMosquitosSession++;
ConfigHandler.writeIntConfig("spider", "mosquito", spiderMosquitos);
if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
- } else if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) { // Zombie
+ } else if (message.contains(" Zombie Slayer LVL ")) { // Zombie
zombieRevs++;
zombieRevsSession++;
if (zombieBosses != -1) {
@@ -502,6 +506,18 @@ public class LootTracker {
zombieScythesSession++;
ConfigHandler.writeIntConfig("zombie", "scythe", zombieScythes);
if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
+ } else if (message.contains("INSANE DROP! (Shard of the Shredded)")) {
+ zombieRNG = true;
+ zombieShards++;
+ zombieShardsSession++;
+ ConfigHandler.writeIntConfig("zombie", "shard", zombieShards);
+ if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "SHARD OF THE SHREDDED!", 5);
+ } else if (message.contains("INSANE DROP! (Warden Heart)")) {
+ zombieRNG = true;
+ zombieWardenHearts++;
+ zombieWardenHeartsSession++;
+ ConfigHandler.writeIntConfig("zombie", "heart", zombieWardenHearts);
+ if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "WARDEN HEART!", 5);
}
if (wolfRNG) {
diff --git a/src/main/java/me/Danker/gui/OnlySlayerGui.java b/src/main/java/me/Danker/gui/OnlySlayerGui.java
index 552a354..6ae1490 100644
--- a/src/main/java/me/Danker/gui/OnlySlayerGui.java
+++ b/src/main/java/me/Danker/gui/OnlySlayerGui.java
@@ -23,6 +23,7 @@ public class OnlySlayerGui extends GuiScreen {
private GuiButton two;
private GuiButton three;
private GuiButton four;
+ private GuiButton five;
@Override
public boolean doesGuiPauseGame() {
@@ -48,9 +49,14 @@ public class OnlySlayerGui extends GuiScreen {
case "III":
onlyNumberInt = 3;
break;
- default:
+ case "IV":
onlyNumberInt = 4;
break;
+ case "V":
+ onlyNumberInt = 5;
+ break;
+ default:
+ return;
}
goBack = new GuiButton(0, 2, height - 30, 100, 20, "Go Back");
@@ -58,10 +64,11 @@ public class OnlySlayerGui extends GuiScreen {
zombie = new GuiButton(0, width / 2 - 200, (int) (height * 0.4), 120, 20, "Zombie");
spider = new GuiButton(0, width / 2 - 60, (int) (height * 0.4), 120, 20, "Spider");
wolf = new GuiButton(0, width / 2 + 80, (int) (height * 0.4), 120, 20, "Wolf");
- one = new GuiButton(0, width / 2 - 190, (int) (height * 0.6), 85, 20, "I");
- two = new GuiButton(0, width / 2 - 95, (int) (height * 0.6), 85, 20, "II");
- three = new GuiButton(0, width / 2 + 10, (int) (height * 0.6), 85, 20, "III");
- four = new GuiButton(0, width / 2 + 115, (int) (height * 0.6), 85, 20, "IV");
+ one = new GuiButton(0, width / 2 - 190, (int) (height * 0.6), 60, 20, "I");
+ two = new GuiButton(0, width / 2 - 110, (int) (height * 0.6), 60, 20, "II");
+ three = new GuiButton(0, width / 2 - 30, (int) (height * 0.6), 60, 20, "III");
+ four = new GuiButton(0, width / 2 + 50, (int) (height * 0.6), 60, 20, "IV");
+ five = new GuiButton(0, width / 2 + 130, (int) (height * 0.6), 60, 20, "V");
this.buttonList.add(off);
this.buttonList.add(zombie);
@@ -71,6 +78,7 @@ public class OnlySlayerGui extends GuiScreen {
this.buttonList.add(two);
this.buttonList.add(three);
this.buttonList.add(four);
+ this.buttonList.add(five);
this.buttonList.add(goBack);
}
@@ -115,6 +123,8 @@ public class OnlySlayerGui extends GuiScreen {
onlyNumberInt = 3;
} else if (button == four) {
onlyNumberInt = 4;
+ } else if (button == five) {
+ onlyNumberInt = 5;
}
String onlyNumber;
@@ -129,6 +139,11 @@ public class OnlySlayerGui extends GuiScreen {
onlyNumber = "III";
break;
case 4:
+ onlyNumber = "IV";
+ break;
+ case 5:
+ onlyNumber = "V";
+ break;
default:
onlyNumber = "IV";
}
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 19edeff..cb04daa 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -315,6 +315,8 @@ public class ConfigHandler {
LootTracker.zombieRevCatas = initInt("zombie", "revCatalyst", 0);
LootTracker.zombieSnakes = initInt("zombie", "snake", 0);
LootTracker.zombieScythes = initInt("zombie", "scythe", 0);
+ LootTracker.zombieShards = initInt("zombie", "shard", 0);
+ LootTracker.zombieWardenHearts = initInt("zombie", "heart", 0);
LootTracker.zombieTime = initDouble("zombie", "timeRNG", -1);
LootTracker.zombieBosses = initInt("zombie", "bossRNG", -1);
generated by cgit (git 2.46.0) at 2024-11-22 16:52:54 +0000