aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md34
-rw-r--r--src/main/java/me/Danker/TheMod.java1741
-rw-r--r--src/main/java/me/Danker/commands/BlockSlayerCommand.java34
-rw-r--r--src/main/java/me/Danker/commands/DHelpCommand.java6
-rw-r--r--src/main/java/me/Danker/commands/DisplayCommand.java190
-rw-r--r--src/main/java/me/Danker/commands/LootCommand.java1066
-rw-r--r--src/main/java/me/Danker/commands/MoveCommand.java96
-rw-r--r--src/main/java/me/Danker/commands/ResetLootCommand.java104
-rw-r--r--src/main/java/me/Danker/commands/ScaleCommand.java70
-rw-r--r--src/main/java/me/Danker/commands/ToggleCommand.java294
-rw-r--r--src/main/java/me/Danker/gui/DisplayGui.java21
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java24
12 files changed, 2023 insertions, 1657 deletions
diff --git a/README.md b/README.md
index c0ab188..ca46bc2 100644
--- a/README.md
+++ b/README.md
@@ -9,28 +9,30 @@ Discord Server: https://discord.gg/QsEkNQS
- LabyMod + Sidebar Mod Revamp - Displays don't show
## Current features
-- Guild party desktop notifications (toggleable)
-- Coordinate and angle display (toggleable, graphic display) (scalable)
-- Golden T10/T6/T4 enchant display (toggleable)
-- Block AOTD ability (toggleable)
-- Disable Spirit Sceptre messages (toggleable)
-- Disable Midas Staff messages (toggleable)
-- Disable heal messages (toggleable)
-- Slayer item tracker (with graphic display) (scalable)
-- RNGesus drop alerts (toggleable)
-- Click anywhere on-screen to open Maddox (toggleable)
-- Maddox Menu keybind
+- Guild party desktop notifications
+- Coordinate and angle display
+- Golden T10/T6/T4 enchant display
+- Block AOTD ability
+- Block Livid Dagger ability
+- Disable Spirit Sceptre messages
+- Disable Midas Staff messages
+- Disable heal messages
+- Slayer item tracker
+- RNGesus drop alerts
+- Click anywhere on-screen to open Maddox
+- Maddox menu keybind
- Block starting other slayer quests
-- Fishing tracker (with graphic display) (scalable)
+- Fishing, jerry fishing, fishing festival, spooky fishing trackers
- Expertise kills in fishing rod lore
-- Dungeons tracker (with graphic display) (scalable)
-- Dungeons puzzle solver (Riddle, trivia, blaze, creeper) (toggleable)
-- Find correct Livid (with graphic display of HP) (toggleable)
+- Catacombs trackers
+- Dungeons puzzle solver (Riddle, trivia, blaze, creeper, water)
+- Find correct Livid (with graphic display of HP)
- Pet background colors based on level
-- Golem spawning alerts (toggleable)
+- Golem spawning alerts
- Skill xp/hour tracker
- Show total skill xp instead of progress to next level
- Show time until century cakes run out
+- Mythological event (Diana) tracker
- API commands
- Update checker
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 5c992ae..fbe9633 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -265,9 +265,11 @@ public class TheMod
triviaSolutions.put("What is the name of the lady of the Nether?", new String[]{"Elle"});
triviaSolutions.put("Which villager in the Village gives you a Rogue Sword?", new String[]{"Jamie"});
triviaSolutions.put("How many unique minions are there?", new String[]{"52 Minions"});
- triviaSolutions.put("Which of these enemies does not spawn in the Spider's Den?", new String[]{"Zombie Spider", "Cave Spider", "Wither Skeleton", "Dashing Spooder", "Broodfather", "Night Spider"});
+ triviaSolutions.put("Which of these enemies does not spawn in the Spider's Den?", new String[]{"Zombie Spider", "Cave Spider", "Wither Skeleton",
+ "Dashing Spooder", "Broodfather", "Night Spider"});
triviaSolutions.put("Which of these monsters only spawns at night?", new String[]{"Zombie Villager", "Ghast"});
- triviaSolutions.put("Which of these is not a dragon in The End?", new String[]{"Zoomer Dragon", "Weak Dragon", "Stonk Dragon", "Holy Dragon", "Boomer Dragon", "Booger Dragon", "Older Dragon", "Elder Dragon"});
+ triviaSolutions.put("Which of these is not a dragon in The End?", new String[]{"Zoomer Dragon", "Weak Dragon", "Stonk Dragon", "Holy Dragon", "Boomer Dragon",
+ "Booger Dragon", "Older Dragon", "Elder Dragon", "Stable Dragon", "Professor Dragon"});
String patternString = "(" + String.join("|", t6Enchants.keySet()) + ")";
pattern = Pattern.compile(patternString);
@@ -954,6 +956,52 @@ public class TheMod
ConfigHandler.writeIntConfig("zombie", "bossRNG", 0);
}
+ // Mythological Tracker
+ if (message.contains("You dug out")) {
+ if (message.contains(" coins!")) {
+ double coinsEarned = Double.parseDouble(message.replaceAll("[^\\d]", ""));
+ LootCommand.mythCoins += coinsEarned;
+ LootCommand.mythCoinsSession += coinsEarned;
+ ConfigHandler.writeDoubleConfig("mythological", "coins", LootCommand.mythCoins);
+ } else if (message.contains("a Griffin Feather!")) {
+ LootCommand.griffinFeathers++;
+ LootCommand.griffinFeathersSession++;
+ ConfigHandler.writeIntConfig("mythological", "griffinFeather", LootCommand.griffinFeathers);
+ } else if (message.contains("a Crown of Greed!")) {
+ LootCommand.crownOfGreeds++;
+ LootCommand.crownOfGreedsSession++;
+ ConfigHandler.writeIntConfig("mythological", "crownOfGreed", LootCommand.crownOfGreeds);
+ } else if (message.contains("a Washed-up Souvenir!")) {
+ LootCommand.washedUpSouvenirs++;
+ LootCommand.washedUpSouvenirsSession++;
+ ConfigHandler.writeIntConfig("mythological", "washedUpSouvenir", LootCommand.washedUpSouvenirs);
+ } else if (message.contains("a Minos Hunter!")) {
+ LootCommand.minosHunters++;
+ LootCommand.minosHuntersSession++;
+ ConfigHandler.writeIntConfig("mythological", "minosHunter", LootCommand.minosHunters);
+ } else if (message.contains("Siamese Lynxes!!")) {
+ LootCommand.siameseLynxes++;
+ LootCommand.siameseLynxesSession++;
+ ConfigHandler.writeIntConfig("mythological", "siameseLynx", LootCommand.siameseLynxes);
+ } else if (message.contains("a Minotaur!")) {
+ LootCommand.minotaurs++;
+ LootCommand.minotaursSession++;
+ ConfigHandler.writeIntConfig("mythological", "minotaur", LootCommand.minotaurs);
+ } else if (message.contains("a Gaia Construct!")) {
+ LootCommand.gaiaConstructs++;
+ LootCommand.gaiaConstructsSession++;
+ ConfigHandler.writeIntConfig("mythological", "gaiaConstruct", LootCommand.gaiaConstructs);
+ } else if (message.contains("a Minos Champion!")) {
+ LootCommand.minosChampions++;
+ LootCommand.minosChampionsSession++;
+ ConfigHandler.writeIntConfig("mythological", "minosChampion", LootCommand.minosChampions);
+ } else if (message.contains("a Minos Inquisitor!")) {
+ LootCommand.minosInquisitors++;
+ LootCommand.minosInquisitorsSession++;
+ ConfigHandler.writeIntConfig("mythological", "minosInquisitor", LootCommand.minosInquisitors);
+ }
+ }
+
// Dungeons Trackers
if (message.contains(" ")) {
if (message.contains("Recombobulator 3000")) {
@@ -1264,806 +1312,881 @@ public class TheMod
if (!DisplayCommand.display.equals("off")) {
String dropsText = "";
String countText = "";
+ String dropsTextTwo = "";
+ String countTextTwo = "";
String timeBetween = "Never";
String bossesBetween = "Never";
String drop20;
double timeNow = System.currentTimeMillis() / 1000;
NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
- if (DisplayCommand.display.equals("wolf")) {
- if (LootCommand.wolfTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.wolfTime, timeNow);
- }
- if (LootCommand.wolfBosses == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.wolfBosses);
- }
- if (ToggleCommand.slayerCountTotal) {
- drop20 = nf.format(LootCommand.wolfWheels);
- } else {
- drop20 = nf.format(LootCommand.wolfWheelsDrops) + " times";
- }
-
- dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
- EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
- EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
- EnumChatFormatting.AQUA + "Spirit Runes:\n" +
- EnumChatFormatting.WHITE + "Critical VI Books:\n" +
- EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
- EnumChatFormatting.GOLD + "Couture Runes:\n" +
- EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
- EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:";
- countText = EnumChatFormatting.GOLD + nf.format(LootCommand.wolfSvens) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.wolfTeeth) + "\n" +
- EnumChatFormatting.BLUE + drop20 + "\n" +
- EnumChatFormatting.AQUA + LootCommand.wolfSpirits + "\n" +
- EnumChatFormatting.WHITE + LootCommand.wolfBooks + "\n" +
- EnumChatFormatting.DARK_RED + LootCommand.wolfEggs + "\n" +
- EnumChatFormatting.GOLD + LootCommand.wolfCoutures + "\n" +
- EnumChatFormatting.AQUA + LootCommand.wolfBaits + "\n" +
- EnumChatFormatting.DARK_PURPLE + LootCommand.wolfFluxes + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("wolf_session")) {
- if (LootCommand.wolfTimeSession == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.wolfTimeSession, timeNow);
- }
- if (LootCommand.wolfBossesSession == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.wolfBossesSession);
- }
- if (ToggleCommand.slayerCountTotal) {
- drop20 = nf.format(LootCommand.wolfWheelsSession);
- } else {
- drop20 = nf.format(LootCommand.wolfWheelsDropsSession) + " times";
- }
-
- dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
- EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
- EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
- EnumChatFormatting.AQUA + "Spirit Runes:\n" +
- EnumChatFormatting.WHITE + "Critical VI Books:\n" +
- EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
- EnumChatFormatting.GOLD + "Couture Runes:\n" +
- EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
- EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:";
- countText = EnumChatFormatting.GOLD + nf.format(LootCommand.wolfSvensSession) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.wolfTeethSession) + "\n" +
- EnumChatFormatting.BLUE + drop20 + "\n" +
- EnumChatFormatting.AQUA + LootCommand.wolfSpiritsSession + "\n" +
- EnumChatFormatting.WHITE + LootCommand.wolfBooksSession + "\n" +
- EnumChatFormatting.DARK_RED + LootCommand.wolfEggsSession + "\n" +
- EnumChatFormatting.GOLD + LootCommand.wolfCouturesSession + "\n" +
- EnumChatFormatting.AQUA + LootCommand.wolfBaitsSession + "\n" +
- EnumChatFormatting.DARK_PURPLE + LootCommand.wolfFluxesSession + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("spider")) {
- if (LootCommand.spiderTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.spiderTime, timeNow);
- }
- if (LootCommand.spiderBosses == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.spiderBosses);
- }
- if (ToggleCommand.slayerCountTotal) {
- drop20 = nf.format(LootCommand.spiderTAP);
- } else {
- drop20 = nf.format(LootCommand.spiderTAPDrops) + " times";
- }
-
- dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
- EnumChatFormatting.GREEN + "Tarantula Webs:\n" +
- EnumChatFormatting.DARK_GREEN + "Arrow Poison:\n" +
- EnumChatFormatting.DARK_GRAY + "Bite Runes:\n" +
- EnumChatFormatting.WHITE + "Bane VI Books:\n" +
- EnumChatFormatting.AQUA + "Spider Catalysts:\n" +
- EnumChatFormatting.DARK_PURPLE + "Tarantula Talismans:\n" +
- EnumChatFormatting.LIGHT_PURPLE + "Fly Swatters:\n" +
- EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:";
- countText = EnumChatFormatting.GOLD + nf.format(LootCommand.spiderTarantulas) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.spiderWebs) + "\n" +
- EnumChatFormatting.DARK_GREEN + drop20 + "\n" +
- EnumChatFormatting.DARK_GRAY + LootCommand.spiderBites + "\n" +
- EnumChatFormatting.WHITE + LootCommand.spiderBooks + "\n" +
- EnumChatFormatting.AQUA + LootCommand.spiderCatalysts + "\n" +
- EnumChatFormatting.DARK_PURPLE + LootCommand.spiderTalismans + "\n" +
- EnumChatFormatting.LIGHT_PURPLE + LootCommand.spiderSwatters + "\n" +
- EnumChatFormatting.GOLD + LootCommand.spiderMosquitos + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("spider_session")) {
- if (LootCommand.spiderTimeSession == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.spiderTimeSession, timeNow);
- }
- if (LootCommand.spiderBossesSession == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.spiderBossesSession);
- }
- if (ToggleCommand.slayerCountTotal) {
- drop20 = nf.format(LootCommand.spiderTAPSession);
- } else {
- drop20 = nf.format(LootCommand.spiderTAPDropsSession) + " times";
- }
-
- dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
- EnumChatFormatting.GREEN + "Tarantula Webs:\n" +
- EnumChatFormatting.DARK_GREEN + "Arrow Poison:\n" +
- EnumChatFormatting.DARK_GRAY + "Bite Runes:\n" +
- EnumChatFormatting.WHITE + "Bane VI Books:\n" +
- EnumChatFormatting.AQUA + "Spider Catalysts:\n" +
- EnumChatFormatting.DARK_PURPLE + "Tarantula Talismans:\n" +
- EnumChatFormatting.LIGHT_PURPLE + "Fly Swatters:\n" +
- EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:";
- countText = EnumChatFormatting.GOLD + nf.format(LootCommand.spiderTarantulasSession) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.spiderWebsSession) + "\n" +
- EnumChatFormatting.DARK_GREEN + drop20 + "\n" +
- EnumChatFormatting.DARK_GRAY + LootCommand.spiderBitesSession + "\n" +
- EnumChatFormatting.WHITE + LootCommand.spiderBooksSession + "\n" +
- EnumChatFormatting.AQUA + LootCommand.spiderCatalystsSession + "\n" +
- EnumChatFormatting.DARK_PURPLE + LootCommand.spiderTalismansSession + "\n" +
- EnumChatFormatting.LIGHT_PURPLE + LootCommand.spiderSwattersSession + "\n" +
- EnumChatFormatting.GOLD + LootCommand.spiderMosquitosSession + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("zombie")) {
- if (LootCommand.zombieTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.zombieTime, timeNow);
- }
- if (LootCommand.zombieBosses == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.zombieBosses);
- }
- if (ToggleCommand.slayerCountTotal) {
- drop20 = nf.format(LootCommand.zombieFoulFlesh);
- } else {
- drop20 = nf.format(LootCommand.zombieFoulFleshDrops) + " times";
- }
-
- dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
- EnumChatFormatting.GREEN + "Revenant Flesh:\n" +
- EnumChatFormatting.BLUE + "Foul Flesh:\n" +
- EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
- EnumChatFormatting.WHITE + "Smite VI Books:\n" +
- EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
- EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
- EnumChatFormatting.RED + "Revenant Catalysts:\n" +
- EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
- EnumChatFormatting.GOLD + "Scythe Blades:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:";
- countText = EnumChatFormatting.GOLD + nf.format(LootCommand.zombieRevs) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.zombieRevFlesh) + "\n" +
- EnumChatFormatting.BLUE + drop20 + "\n" +
- EnumChatFormatting.DARK_GREEN + LootCommand.zombiePestilences + "\n" +
- EnumChatFormatting.WHITE + LootCommand.zombieBooks + "\n" +
- EnumChatFormatting.AQUA + LootCommand.zombieUndeadCatas + "\n" +
- EnumChatFormatting.DARK_PURPLE + LootCommand.zombieBeheadeds + "\n" +
- EnumChatFormatting.RED + LootCommand.zombieRevCatas + "\n" +
- EnumChatFormatting.DARK_GREEN + LootCommand.zombieSnakes + "\n" +
- EnumChatFormatting.GOLD + LootCommand.zombieScythes + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("zombie_session")) {
- if (LootCommand.zombieTimeSession == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.zombieTimeSession, timeNow);
- }
- if (LootCommand.zombieBossesSession == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.zombieBossesSession);
- }
- if (ToggleCommand.slayerCountTotal) {
- drop20 = nf.format(LootCommand.zombieFoulFleshSession);
- } else {
- drop20 = nf.format(LootCommand.zombieFoulFleshDropsSession) + " times";
- }
-
- dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
- EnumChatFormatting.GREEN + "Revenant Flesh:\n" +
- EnumChatFormatting.BLUE + "Foul Flesh:\n" +
- EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
- EnumChatFormatting.WHITE + "Smite VI Books:\n" +
- EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
- EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
- EnumChatFormatting.RED + "Revenant Catalysts:\n" +
- EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
- EnumChatFormatting.GOLD + "Scythe Blades:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:";
- countText = EnumChatFormatting.GOLD + nf.format(LootCommand.zombieRevsSession) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.zombieRevFleshSession) + "\n" +
- EnumChatFormatting.BLUE + drop20 + "\n" +
- EnumChatFormatting.DARK_GREEN + LootCommand.zombiePestilencesSession + "\n" +
- EnumChatFormatting.WHITE + LootCommand.zombieBooksSession + "\n" +
- EnumChatFormatting.AQUA + LootCommand.zombieUndeadCatasSession + "\n" +
- EnumChatFormatting.DARK_PURPLE + LootCommand.zombieBeheadedsSession + "\n" +
- EnumChatFormatting.RED + LootCommand.zombieRevCatasSession + "\n" +
- EnumChatFormatting.DARK_GREEN + LootCommand.zombieSnakesSession + "\n" +
- EnumChatFormatting.GOLD + LootCommand.zombieScythes + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("fishing")) {
- if (LootCommand.empTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.empTime, timeNow);
- }
- if (LootCommand.empSCs == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.empSCs);
- }
-
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.GRAY + "Squids:\n" +
- EnumChatFormatting.GREEN + "Sea Walkers:\n" +
- EnumChatFormatting.DARK_GRAY + "Night Squids:\n" +
- EnumChatFormatting.DARK_AQUA + "Sea Guardians:\n" +
- EnumChatFormatting.BLUE + "Sea Witches:\n" +
- EnumChatFormatting.GREEN + "Sea Archers:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
- EnumChatFormatting.GRAY + nf.format(LootCommand.squids) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.seaWalkers) + "\n" +
- EnumChatFormatting.DARK_GRAY + nf.format(LootCommand.nightSquids) + "\n" +
- EnumChatFormatting.DARK_AQUA + nf.format(LootCommand.seaGuardians) + "\n" +
- EnumChatFormatting.BLUE + nf.format(LootCommand.seaWitches) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.seaArchers);
- // Seperated to save vertical space
- String dropsTextTwo = EnumChatFormatting.GREEN + "Monster of Deeps:\n" +
- EnumChatFormatting.YELLOW + "Catfishes:\n" +
- EnumChatFormatting.GOLD + "Carrot Kings:\n" +
- EnumChatFormatting.GRAY + "Sea Leeches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Guardian Defenders:\n" +
- EnumChatFormatting.DARK_PURPLE + "Deep Sea Protectors:\n" +
- EnumChatFormatting.GOLD + "Hydras:\n" +
- EnumChatFormatting.GOLD + "Sea Emperors:\n" +
- EnumChatFormatting.AQUA + "Time Since Emp:\n" +
- EnumChatFormatting.AQUA + "Creatures Since Emp:";
- String countTextTwo = EnumChatFormatting.GREEN + nf.format(LootCommand.monsterOfTheDeeps) + "\n" +
- EnumChatFormatting.YELLOW + nf.format(LootCommand.catfishes) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.carrotKings) + "\n" +
- EnumChatFormatting.GRAY + nf.format(LootCommand.seaLeeches) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.guardianDefenders) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.deepSeaProtectors) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.hydras) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.seaEmperors) + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
-
- if (ToggleCommand.splitFishing) {
- new TextRenderer(mc, dropsTextTwo, (int) (MoveCommand.displayXY[0] + (160 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
- new TextRenderer(mc, countTextTwo, (int) (MoveCommand.displayXY[0] + (270 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
- } else {
- dropsText += "\n" + dropsTextTwo;
- countText += "\n" + countTextTwo;
- }
- } else if (DisplayCommand.display.equals("fishing_session")) {
- if (LootCommand.empTimeSession == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.empTimeSession, timeNow);
- }
- if (LootCommand.empSCsSession == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.empSCsSession);
- }
-
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.GRAY + "Squids:\n" +
- EnumChatFormatting.GREEN + "Sea Walkers:\n" +
- EnumChatFormatting.DARK_GRAY + "Night Squids:\n" +
- EnumChatFormatting.DARK_AQUA + "Sea Guardians:\n" +
- EnumChatFormatting.BLUE + "Sea Witches:\n" +
- EnumChatFormatting.GREEN + "Sea Archers:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
- EnumChatFormatting.GRAY + nf.format(LootCommand.squidsSession) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.seaWalkersSession) + "\n" +
- EnumChatFormatting.DARK_GRAY + nf.format(LootCommand.nightSquidsSession) + "\n" +
- EnumChatFormatting.DARK_AQUA + nf.format(LootCommand.seaGuardiansSession) + "\n" +
- EnumChatFormatting.BLUE + nf.format(LootCommand.seaWitchesSession) + "\n" +
- EnumChatFormatting.GREEN + nf.format(LootCommand.seaArchersSession);
- // Seperated to save vertical space
- String dropsTextTwo = EnumChatFormatting.GREEN + "Monster of Deeps:\n" +
- EnumChatFormatting.YELLOW + "Catfishes:\n" +
- EnumChatFormatting.GOLD + "Carrot Kings:\n" +
- EnumChatFormatting.GRAY + "Sea Leeches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Guardian Defenders:\n" +
- EnumChatFormatting.DARK_PURPLE + "Deep Sea Protectors:\n" +
- EnumChatFormatting.GOLD + "Hydras:\n" +
- EnumChatFormatting.GOLD + "Sea Emperors:\n" +
- EnumChatFormatting.AQUA + "Time Since Emp:\n" +
- EnumChatFormatting.AQUA + "Creatures Since Emp:";
- String countTextTwo = EnumChatFormatting.GREEN + nf.format(LootCommand.monsterOfTheDeepsSession) + "\n" +
- EnumChatFormatting.YELLOW + nf.format(LootCommand.catfishesSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.carrotKingsSession) + "\n" +
- EnumChatFormatting.GRAY + nf.format(LootCommand.seaLeechesSession) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.guardianDefendersSession) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.deepSeaProtectorsSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.hydrasSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.seaEmperorsSession) + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
-
- if (ToggleCommand.splitFishing) {
- new TextRenderer(mc, dropsTextTwo, (int) (MoveCommand.displayXY[0] + (160 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
- new TextRenderer(mc, countTextTwo, (int) (MoveCommand.displayXY[0] + (270 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
- } else {
- dropsText += "\n" + dropsTextTwo;
- countText += "\n" + countTextTwo;
- }
- } else if (DisplayCommand.display.equals("fishing_winter")) {
- if (LootCommand.yetiTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.yetiTime, timeNow);
- }
- if (LootCommand.yetiSCs == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.yetiSCs);
- }
-
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.AQUA + "Frozen Steves:\n" +
- EnumChatFormatting.WHITE + "Snowmans:\n" +
- EnumChatFormatting.DARK_GREEN + "Grinches:\n" +
- EnumChatFormatting.GOLD + "Yetis:\n" +
- EnumChatFormatting.AQUA + "Time Since Yeti:\n" +
- EnumChatFormatting.AQUA + "Creatures Since Yeti:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.frozenSteves) + "\n" +
- EnumChatFormatting.WHITE + nf.format(LootCommand.frostyTheSnowmans) + "\n" +
- EnumChatFormatting.DARK_GREEN + nf.format(LootCommand.grinches) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.yetis) + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("fishing_winter_session")) {
- if (LootCommand.yetiTimeSession == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = Utils.getTimeBetween(LootCommand.yetiTimeSession, timeNow);
- }
- if (LootCommand.yetiSCsSession == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = nf.format(LootCommand.yetiSCsSession);
- }
-
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.AQUA + "Frozen Steves:\n" +
- EnumChatFormatting.WHITE + "Snowmans:\n" +
- EnumChatFormatting.DARK_GREEN + "Grinches:\n" +
- EnumChatFormatting.GOLD + "Yetis:\n" +
- EnumChatFormatting.AQUA + "Time Since Yeti:\n" +
- EnumChatFormatting.AQUA + "Creatures Since Yeti:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.frozenStevesSession) + "\n" +
- EnumChatFormatting.WHITE + nf.format(LootCommand.frostyTheSnowmansSession) + "\n" +
- EnumChatFormatting.DARK_GREEN + nf.format(LootCommand.grinchesSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.yetisSession) + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
+ switch (DisplayCommand.display) {
+ case "wolf":
+ if (LootCommand.wolfTime == -1) {
+ timeBetween = "Never";
+ } else {
+ timeBetween = Utils.getTimeBetween(LootCommand.wolfTime, timeNow);
+ }
+ if (LootCommand.wolfBosses == -1) {
+ bossesBetween = "Never";
+ } else {
+ bossesBetween = nf.format(LootCommand.wolfBosses);
+ }
+ if (ToggleCommand.slayerCountTotal) {
+ drop20 = nf.format(LootCommand.wolfWheels);
+ } else {
+ drop20 = nf.format(LootCommand.wolfWheelsDrops) + " times";
+ }
+
+ dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
+ EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
+ EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
+ EnumChatFormatting.AQUA + "Spirit Runes:\n" +
+ EnumChatFormatting.WHITE + "Critical VI Books:\n" +
+ EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
+ EnumChatFormatting.GOLD + "Couture Runes:\n" +
+ EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
+ EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+ EnumChatFormatting.AQUA + "Bosses Since RNG:";
+ countText = EnumChatFormatting.GOLD + nf.format(LootCommand.wolfSvens) + "\n" +
+ EnumChatFormatting.GREEN + nf.format(LootCommand.wolfTeeth) + "\n" +
+ EnumChatFormatting.BLUE + drop20 + "\n" +
+ EnumChatFormatting.AQUA + LootCommand.wolfSpirits + "\n" +
+ EnumChatFormatting.WHITE + LootCommand.wolfBooks + "\n" +
+ EnumChatFormatting.DARK_RED + LootCommand.wolfEggs + "\n" +
+ EnumChatFormatting.GOLD + LootCommand.wolfCoutures + "\n" +
+ EnumChatFormatting.AQUA + LootCommand.wolfBaits + "\n" +
+ EnumChatFormatting.DARK_PURPLE + LootCommand.wolfFluxes + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
+ EnumChatFormatting.AQUA + bossesBetween;
+ break;
+ case "wolf_session":
+ if (LootCommand.wolfTimeSession == -1) {
+ timeBetween = "Never";
+ } else {
+ timeBetween = Utils.getTimeBetween(LootCommand.wolfTimeSession, timeNow);
+ }
+ if (LootCommand.wolfBossesSession == -1) {
+ bossesBetween = "Never";
+ } else {
+ bossesBetween = nf.format(LootCommand.wolfBossesSession);
+ }
+ if (ToggleCommand.slayerCountTotal) {
+ drop20 = nf.format(LootCommand.wolfWheelsSession);
+ } else {
+ drop20 = nf.format(LootCommand.wolfWheelsDropsSession) + " times";
+ }
+
+ dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
+ EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
+ EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
+ EnumChatFormatting.AQUA + "Spirit Runes:\n" +
+ EnumChatFormatting.WHITE + "Critical VI Books:\n" +
+ EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
+ EnumChatFormatting.GOLD + "Couture Runes:\n" +
+ EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
+ EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+ EnumChatFormatting.AQUA + "Bosses Since RNG:";
+ countText = EnumChatFormatting.GOLD + nf.format(LootCommand.wolfSvensSession) + "\n" +
+ EnumChatFormatting.GREEN + nf.format(LootCommand.wolfTeethSession) + "\n" +
+ EnumChatFormatting.BLUE + drop20 + "\n" +
+ EnumChatFormatting.AQUA + LootCommand.wolfSpiritsSession + "\n" +
+ EnumChatFormatting.WHITE + LootCommand.wolfBooksSession + "\n" +
+ EnumChatFormatting.DARK_RED + LootCommand.wolfEggsSession + "\n" +
+ EnumChatFormatting.GOLD + LootCommand.wolfCouturesSession + "\n" +
+ EnumChatFormatting.AQUA + LootCommand.wolfBaitsSession + "\n" +
+ EnumChatFormatting.DARK_PURPLE + LootCommand.wolfFluxesSession + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
EnumChatFormatting.AQUA + bossesBetween;
- } else if (DisplayCommand.display.equals("fishing_festival")) {
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.LIGHT_PURPLE + "Nurse Sharks:\n" +
- EnumChatFormatting.BLUE + "Blue Sharks:\n" +
- EnumChatFormatting.GOLD + "Tiger Sharks:\n" +
- EnumChatFormatting.WHITE + "Great White Sharks:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
- EnumChatFormatting.LIGHT_PURPLE + nf.format(LootCommand.nurseSharks) + "\n" +
- EnumChatFormatting.BLUE + nf.format(LootCommand.blueSharks) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.tigerSharks) + "\n" +
- EnumChatFormatting.WHITE + nf.format(LootCommand.greatWhiteSharks);
- } else if (DisplayCommand.display.equals("fishing_festival_session")) {
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.LIGHT_PURPLE + "Nurse Sharks:\n" +
- EnumChatFormatting.BLUE + "Blue Sharks:\n" +
- EnumChatFormatting.GOLD + "Tiger Sharks:\n" +
- EnumChatFormatting.WHITE + "Great White Sharks:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
- EnumChatFormatting.LIGHT_PURPLE + nf.format(LootCommand.nurseSharksSession) + "\n" +
- EnumChatFormatting.BLUE + nf.format(LootCommand.blueSharksSession) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.tigerSharksSession) + "\n" +
- EnumChatFormatting.WHITE + nf.format(LootCommand.greatWhiteSharksSession);
- } else if (DisplayCommand.display.equals("fishing_spooky")) {
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.BLUE + "Scarecrows:\n" +
- EnumChatFormatting.GRAY + "Nightmares:\n" +
- EnumChatFormatting.DARK_PURPLE + "Werewolves:\n" +
- EnumChatFormatting.GOLD + "Phantom Fishers:\n" +
- EnumChatFormatting.GOLD + "Grim Reapers:";
- countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
- EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
- EnumChatFormatting.BLUE + nf.format(LootCommand.scarecrows) + "\n" +
- EnumChatFormatting.GRAY + nf.format(LootCommand.nightmares) + "\n" +
- EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.werewolfs) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.phantomFishers) + "\n" +
- EnumChatFormatting.GOLD + nf.format(LootCommand.grimReapers);
- } else if (DisplayCommand.display.equals("fishing_spooky_session")) {
- dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
- EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
- EnumChatFormatting.GOLD + "Good Catches:\n" +
- EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
- EnumChatFormatting.BLUE + "Scarecrows:\n" +
- EnumChatFormatting.GRAY + "Nightmares:\n" +
- EnumChatFormatting.DARK_PURPLE + "Werewolves:\n" +
- EnumChatFormatti