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/AutoDisplay.java6
-rw-r--r--src/main/java/me/Danker/features/loot/FishingTracker.java96
-rw-r--r--src/main/java/me/Danker/features/loot/LootDisplay.java86
3 files changed, 181 insertions, 7 deletions
diff --git a/src/main/java/me/Danker/features/AutoDisplay.java b/src/main/java/me/Danker/features/AutoDisplay.java
index 63b66d5..7f86035 100644
--- a/src/main/java/me/Danker/features/AutoDisplay.java
+++ b/src/main/java/me/Danker/features/AutoDisplay.java
@@ -95,7 +95,11 @@ public class AutoDisplay {
List<String> lore = hotbarItem.getTooltip(player, mc.gameSettings.advancedItemTooltips);
for (int j = lore.size() - 1; j >= 0; j--) { // reverse
if (lore.get(j).contains("FISHING ROD")) {
- LootDisplay.display = "fishing";
+ if (Utils.tabLocation.equals("Crimson Isle")) {
+ LootDisplay.display = "fishing_lava";
+ } else {
+ LootDisplay.display = "fishing";
+ }
found = true;
break;
}
diff --git a/src/main/java/me/Danker/features/loot/FishingTracker.java b/src/main/java/me/Danker/features/loot/FishingTracker.java
index cf329aa..95a9040 100644
--- a/src/main/java/me/Danker/features/loot/FishingTracker.java
+++ b/src/main/java/me/Danker/features/loot/FishingTracker.java
@@ -54,6 +54,18 @@ public class FishingTracker {
public static int lavaBlazes;
public static int lavaPigmen;
public static int zombieMiners;
+ // Lava fishing
+ public static int magmaSlugs;
+ public static int moogmas;
+ public static int lavaLeeches;
+ public static int pyroclasticWorms;
+ public static int lavaFlames;
+ public static int fireEels;
+ public static int tauruses;
+ public static int thunders;
+ public static int lordJawbuses;
+ public static double jawbusTime;
+ public static int jawbusSCs;
// Fishing
public static int seaCreaturesSession = 0;
@@ -101,6 +113,18 @@ public class FishingTracker {
public static int lavaBlazesSession = 0;
public static int lavaPigmenSession = 0;
public static int zombieMinersSession = 0;
+ // Lava fishing
+ public static int magmaSlugsSession = 0;
+ public static int moogmasSession = 0;
+ public static int lavaLeechesSession = 0;
+ public static int pyroclasticWormsSession = 0;
+ public static int lavaFlamesSession = 0;
+ public static int fireEelsSession = 0;
+ public static int taurusesSession = 0;
+ public static int thundersSession = 0;
+ public static int lordJawbusesSession = 0;
+ public static double jawbusTimeSession = 0;
+ public static int jawbusSCsSession = 0;
@SubscribeEvent
public void onChat(ClientChatReceivedEvent event) {
@@ -296,16 +320,61 @@ public class FishingTracker {
zombieMinersSession++;
ConfigHandler.writeIntConfig("fishing", "zombieMiner", zombieMiners);
increaseSeaCreatures();
+ } else if (message.contains("From Beneath the lava appears a Magma Slug")) {
+ magmaSlugs++;
+ magmaSlugsSession++;
+ ConfigHandler.writeIntConfig("fishing", "magmaSlug", magmaSlugs);
+ increaseSeaCreatures();
+ } else if (message.contains("You hear a faint Moo from the lava... A Moogma appears")) {
+ moogmas++;
+ moogmasSession++;
+ ConfigHandler.writeIntConfig("fishing", "moogma", moogmas);
+ increaseSeaCreatures();
+ } else if (message.contains("A small but fearsome Lava Leech emerges")) {
+ lavaLeeches++;
+ lavaLeechesSession++;
+ ConfigHandler.writeIntConfig("fishing", "lavaLeech", lavaLeeches);
+ increaseSeaCreatures();
+ } else if (message.contains("You feel the heat radiating as a Pyroclastic Worm surfaces")) {
+ pyroclasticWorms++;
+ pyroclasticWormsSession++;
+ ConfigHandler.writeIntConfig("fishing", "pyroclasticWorm", pyroclasticWorms);
+ increaseSeaCreatures();
+ } else if (message.contains("A Lava Flame flies out from beneath the lava")) {
+ lavaFlames++;
+ lavaFlamesSession++;
+ ConfigHandler.writeIntConfig("fishing", "lavaFlame", lavaFlames);
+ increaseSeaCreatures();
+ } else if (message.contains("A Fire Eel slithers out from the depths")) {
+ fireEels++;
+ fireEelsSession++;
+ ConfigHandler.writeIntConfig("fishing", "fireEel", fireEels);
+ increaseSeaCreatures();
+ } else if (message.contains("Taurus and his steed emerge")) {
+ tauruses++;
+ taurusesSession++;
+ ConfigHandler.writeIntConfig("fishing", "taurus", tauruses);
+ increaseSeaCreatures();
+ } else if (message.contains("You hear a massive rumble as Thunder emerges")) {
+ thunders++;
+ thundersSession++;
+ ConfigHandler.writeIntConfig("fishing", "thunder", thunders);
+ increaseSeaCreatures();
+ } else if (message.contains("You have angered a legendary creature... Lord Jawbus has arrived")) {
+ lordJawbuses++;
+ jawbusTime = System.currentTimeMillis() / 1000;
+ jawbusSCs = 0;
+ lordJawbusesSession++;
+ jawbusTimeSession = System.currentTimeMillis() / 1000;
+ jawbusSCsSession = 0;
+ ConfigHandler.writeIntConfig("fishing", "lordJawbus", lordJawbuses);
+ ConfigHandler.writeDoubleConfig("fishing", "jawbusTime", jawbusTime);
+ ConfigHandler.writeIntConfig("fishing", "jawbusSC", jawbusSCs);
+ increaseSeaCreatures();
}
}
public void increaseSeaCreatures() {
- if (empSCs != -1) {
- empSCs++;
- }
- if (empSCsSession != -1) {
- empSCsSession++;
- }
// Only increment Yetis when in Jerry's Workshop
if (Utils.isInScoreboard("Jerry's Workshop") || Utils.isInScoreboard("Jerry Pond")) {
if (yetiSCs != -1) {
@@ -314,6 +383,20 @@ public class FishingTracker {
if (yetiSCsSession != -1) {
yetiSCsSession++;
}
+ } else if (Utils.tabLocation.equals("Crimson Isle")) {
+ if (jawbusSCs != -1) {
+ jawbusSCs++;
+ }
+ if (jawbusSCsSession != -1) {
+ jawbusSCsSession++;
+ }
+ } else {
+ if (empSCs != -1) {
+ empSCs++;
+ }
+ if (empSCsSession != -1) {
+ empSCsSession++;
+ }
}
seaCreatures++;
@@ -324,6 +407,7 @@ public class FishingTracker {
ConfigHandler.writeIntConfig("fishing", "milestone", fishingMilestone);
ConfigHandler.writeIntConfig("fishing", "empSC", empSCs);
ConfigHandler.writeIntConfig("fishing", "yetiSC", yetiSCs);
+ ConfigHandler.writeIntConfig("fishing", "jawbusSC", jawbusSCs);
}
}
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index 9436ec6..e1ddcb0 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -848,6 +848,92 @@ public class LootDisplay {
EnumChatFormatting.DARK_PURPLE + nf.format(FishingTracker.lavaPigmenSession) + "\n" +
EnumChatFormatting.GOLD + nf.format(FishingTracker.zombieMinersSession);
break;
+ case "fishing_lava":
+ if (FishingTracker.jawbusTime == -1) {
+ timeBetween = "Never";
+ } else {
+ timeBetween = Utils.getTimeBetween(FishingTracker.jawbusTime, timeNow);
+ }
+ if (FishingTracker.jawbusSCs == -1) {
+ bossesBetween = "Never";
+ } else {
+ bossesBetween = nf.format(FishingTracker.jawbusSCs);
+ }
+
+ dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
+ EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
+ EnumChatFormatting.GOLD + "Good Catches:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
+ EnumChatFormatting.DARK_RED + "Magma Slugs:\n" +
+ EnumChatFormatting.RED + "Moogmas:\n" +
+ EnumChatFormatting.RED + "Lava Leeches:\n" +
+ EnumChatFormatting.RED + "Pyroclastic Worms:\n" +
+ EnumChatFormatting.DARK_RED + "Lava Flames:\n" +
+ EnumChatFormatting.RED + "Fire Eels:\n" +
+ EnumChatFormatting.GOLD + "Tauruses:\n" +
+ EnumChatFormatting.LIGHT_PURPLE + "Thunders:\n" +
+ EnumChatFormatting.LIGHT_PURPLE + "Lord Jawbuses:\n" +
+ EnumChatFormatting.AQUA + "Time Since Jawbus:\n" +
+ EnumChatFormatting.AQUA + "SC Since Jawbus:";
+ countText = EnumChatFormatting.AQUA + nf.format(FishingTracker.seaCreatures) + "\n" +
+ EnumChatFormatting.AQUA + nf.format(FishingTracker.fishingMilestone) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(FishingTracker.goodCatches) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(FishingTracker.greatCatches) + "\n" +
+ EnumChatFormatting.DARK_RED + nf.format(FishingTracker.magmaSlugs) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.moogmas) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.lavaLeeches) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.pyroclasticWorms) + "\n" +
+ EnumChatFormatting.DARK_RED + nf.format(FishingTracker.lavaFlames) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.fireEels) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(FishingTracker.tauruses) + "\n" +
+ EnumChatFormatting.LIGHT_PURPLE + nf.format(FishingTracker.thunders) + "\n" +
+ EnumChatFormatting.LIGHT_PURPLE + nf.format(FishingTracker.lordJawbuses) + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
+ EnumChatFormatting.AQUA + bossesBetween;
+ break;
+ case "fishing_lava_session":
+ if (FishingTracker.jawbusTimeSession == -1) {
+ timeBetween = "Never";
+ } else {
+ timeBetween = Utils.getTimeBetween(FishingTracker.jawbusTimeSession, timeNow);
+ }
+ if (FishingTracker.jawbusSCsSession == -1) {
+ bossesBetween = "Never";
+ } else {
+ bossesBetween = nf.format(FishingTracker.jawbusSCsSession);
+ }
+
+ dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
+ EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
+ EnumChatFormatting.GOLD + "Good Catches:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
+ EnumChatFormatting.DARK_RED + "Magma Slugs:\n" +
+ EnumChatFormatting.RED + "Moogmas:\n" +
+ EnumChatFormatting.RED + "Lava Leeches:\n" +
+ EnumChatFormatting.RED + "Pyroclastic Worms:\n" +
+ EnumChatFormatting.DARK_RED + "Lava Flames:\n" +
+ EnumChatFormatting.RED + "Fire Eels:\n" +
+ EnumChatFormatting.GOLD + "Tauruses:\n" +
+ EnumChatFormatting.LIGHT_PURPLE + "Thunders:\n" +
+ EnumChatFormatting.LIGHT_PURPLE + "Lord Jawbuses:\n" +
+ EnumChatFormatting.AQUA + "Time Since Jawbus:\n" +
+ EnumChatFormatting.AQUA + "SC Since Jawbus:";
+ countText = EnumChatFormatting.AQUA + nf.format(FishingTracker.seaCreaturesSession) + "\n" +
+ EnumChatFormatting.AQUA + nf.format(FishingTracker.fishingMilestoneSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(FishingTracker.goodCatchesSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(FishingTracker.greatCatchesSession) + "\n" +
+ EnumChatFormatting.DARK_RED + nf.format(FishingTracker.magmaSlugsSession) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.moogmasSession) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.lavaLeechesSession) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.pyroclasticWormsSession) + "\n" +
+ EnumChatFormatting.DARK_RED + nf.format(FishingTracker.lavaFlamesSession) + "\n" +
+ EnumChatFormatting.RED + nf.format(FishingTracker.fireEelsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(FishingTracker.taurusesSession) + "\n" +
+ EnumChatFormatting.LIGHT_PURPLE + nf.format(FishingTracker.thundersSession) + "\n" +
+ EnumChatFormatting.LIGHT_PURPLE + nf.format(FishingTracker.lordJawbusesSession) + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
+ EnumChatFormatting.AQUA + bossesBetween;
+ break;
case "mythological":
dropsText = EnumChatFormatting.GOLD + "Coins:\n" +
EnumChatFormatting.WHITE + "Griffin Feathers:\n" +
generated by cgit (git 2.46.0) at 2024-11-22 18:04:55 +0000