aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2022-04-28 03:27:42 -0400
committerbowser0000 <bowser0000@gmail.com>2022-04-28 03:27:42 -0400
commita8ce0e5ef0ef4727b45b945c32d4d5e28cb5adbb (patch)
tree10799d8c474abeb6897231afbeb94e303797f4d3
parente20025121af75e505aa154f304339fab7beddf6e (diff)
downloadSkyblockMod-a8ce0e5ef0ef4727b45b945c32d4d5e28cb5adbb.tar.gz
SkyblockMod-a8ce0e5ef0ef4727b45b945c32d4d5e28cb5adbb.tar.bz2
SkyblockMod-a8ce0e5ef0ef4727b45b945c32d4d5e28cb5adbb.zip
Add plhlegblasts to lava fishing tracker
-rw-r--r--src/main/java/me/Danker/commands/ImportFishingCommand.java2
-rw-r--r--src/main/java/me/Danker/commands/LootCommand.java2
-rw-r--r--src/main/java/me/Danker/commands/ResetLootCommand.java1
-rw-r--r--src/main/java/me/Danker/features/loot/FishingTracker.java7
-rw-r--r--src/main/java/me/Danker/features/loot/LootDisplay.java4
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java1
6 files changed, 17 insertions, 0 deletions
diff --git a/src/main/java/me/Danker/commands/ImportFishingCommand.java b/src/main/java/me/Danker/commands/ImportFishingCommand.java
index 16fecf5..46d9906 100644
--- a/src/main/java/me/Danker/commands/ImportFishingCommand.java
+++ b/src/main/java/me/Danker/commands/ImportFishingCommand.java
@@ -112,6 +112,7 @@ public class ImportFishingCommand extends CommandBase {
FishingTracker.lavaBlazes = getSCFromApi(statsObject, "kills_lava_blaze");
FishingTracker.lavaPigmen = getSCFromApi(statsObject, "kills_lava_pigman");
FishingTracker.zombieMiners = getSCFromApi(statsObject, "kills_zombie_miner");
+ FishingTracker.plhlegblasts = getSCFromApi(statsObject, "kills_plhlegblast");
FishingTracker.magmaSlugs = getSCFromApi(statsObject, "kills_magma_slug");
FishingTracker.moogmas = getSCFromApi(statsObject, "kills_moogma");
FishingTracker.lavaLeeches = getSCFromApi(statsObject, "kills_lava_leech");
@@ -160,6 +161,7 @@ public class ImportFishingCommand extends CommandBase {
ConfigHandler.writeIntConfig("fishing", "lavaBlaze", FishingTracker.lavaBlazes);
ConfigHandler.writeIntConfig("fishing", "lavaPigman", FishingTracker.lavaPigmen);
ConfigHandler.writeIntConfig("fishing", "zombieMiner", FishingTracker.zombieMiners);
+ ConfigHandler.writeIntConfig("fishing", "plhlegblast", FishingTracker.plhlegblasts);
ConfigHandler.writeIntConfig("fishing", "magmaSlug", FishingTracker.magmaSlugs);
ConfigHandler.writeIntConfig("fishing", "moogma", FishingTracker.moogmas);
ConfigHandler.writeIntConfig("fishing", "lavaLeech", FishingTracker.lavaLeeches);
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 0d86668..af5479e 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -578,6 +578,7 @@ public class LootCommand extends CommandBase {
player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
EnumChatFormatting.RED + EnumChatFormatting.BOLD + " Lava Fishing Summary (Current Session):\n" +
+ EnumChatFormatting.BLUE + " Plhlegblasts: " + nf.format(FishingTracker.plhlegblastsSession) + "\n" +
EnumChatFormatting.DARK_RED + " Magma Slugs: " + nf.format(FishingTracker.magmaSlugsSession) + "\n" +
EnumChatFormatting.RED + " Moogmas: " + nf.format(FishingTracker.moogmasSession) + "\n" +
EnumChatFormatting.RED + " Lava Leeches: " + nf.format(FishingTracker.lavaLeechesSession) + "\n" +
@@ -606,6 +607,7 @@ public class LootCommand extends CommandBase {
player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
EnumChatFormatting.RED + EnumChatFormatting.BOLD + " Lava Fishing Summary:\n" +
+ EnumChatFormatting.BLUE + " Plhlegblasts: " + nf.format(FishingTracker.plhlegblasts) + "\n" +
EnumChatFormatting.DARK_RED + " Magma Slugs: " + nf.format(FishingTracker.magmaSlugs) + "\n" +
EnumChatFormatting.RED + " Moogmas: " + nf.format(FishingTracker.moogmas) + "\n" +
EnumChatFormatting.RED + " Lava Leeches: " + nf.format(FishingTracker.lavaLeeches) + "\n" +
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 48cdb26..9256394 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -279,6 +279,7 @@ public class ResetLootCommand extends CommandBase {
FishingTracker.lavaBlazesSession = 0;
FishingTracker.lavaPigmenSession = 0;
FishingTracker.zombieMinersSession = 0;
+ FishingTracker.plhlegblastsSession = 0;
FishingTracker.magmaSlugsSession = 0;
FishingTracker.moogmasSession = 0;
FishingTracker.lavaLeechesSession = 0;
diff --git a/src/main/java/me/Danker/features/loot/FishingTracker.java b/src/main/java/me/Danker/features/loot/FishingTracker.java
index bb7daba..f8adfa2 100644
--- a/src/main/java/me/Danker/features/loot/FishingTracker.java
+++ b/src/main/java/me/Danker/features/loot/FishingTracker.java
@@ -55,6 +55,7 @@ public class FishingTracker {
public static int lavaPigmen;
public static int zombieMiners;
// Lava fishing
+ public static int plhlegblasts;
public static int magmaSlugs;
public static int moogmas;
public static int lavaLeeches;
@@ -114,6 +115,7 @@ public class FishingTracker {
public static int lavaPigmenSession = 0;
public static int zombieMinersSession = 0;
// Lava fishing
+ public static int plhlegblastsSession = 0;
public static int magmaSlugsSession = 0;
public static int moogmasSession = 0;
public static int lavaLeechesSession = 0;
@@ -320,6 +322,11 @@ public class FishingTracker {
zombieMinersSession++;
ConfigHandler.writeIntConfig("fishing", "zombieMiner", zombieMiners);
increaseSeaCreatures();
+ } else if (message.contains("WOAH! A Plhlegblast appeared")) {
+ plhlegblasts++;
+ plhlegblastsSession++;
+ ConfigHandler.writeIntConfig("fishing", "plhlegblast", plhlegblasts);
+ increaseSeaCreatures();
} else if (message.contains("From beneath the lava appears a Magma Slug")) {
magmaSlugs++;
magmaSlugsSession++;
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index f2f86b0..7832362 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -872,6 +872,7 @@ public class LootDisplay {
EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
EnumChatFormatting.GOLD + "Good Catches:\n" +
EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
+ EnumChatFormatting.BLUE + "Plhlegblasts:\n" +
EnumChatFormatting.DARK_RED + "Magma Slugs:\n" +
EnumChatFormatting.RED + "Moogmas:\n" +
EnumChatFormatting.RED + "Lava Leeches:\n" +
@@ -887,6 +888,7 @@ public class LootDisplay {
EnumChatFormatting.AQUA + nf.format(FishingTracker.fishingMilestone) + "\n" +
EnumChatFormatting.GOLD + nf.format(FishingTracker.goodCatches) + "\n" +
EnumChatFormatting.DARK_PURPLE + nf.format(FishingTracker.greatCatches) + "\n" +
+ EnumChatFormatting.BLUE + nf.format(FishingTracker.plhlegblasts) + "\n" +
EnumChatFormatting.DARK_RED + nf.format(FishingTracker.magmaSlugs) + "\n" +
EnumChatFormatting.RED + nf.format(FishingTracker.moogmas) + "\n" +
EnumChatFormatting.RED + nf.format(FishingTracker.lavaLeeches) + "\n" +
@@ -915,6 +917,7 @@ public class LootDisplay {
EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
EnumChatFormatting.GOLD + "Good Catches:\n" +
EnumChatFormatting.DARK_PURPLE + "Great Catches:\n" +
+ EnumChatFormatting.BLUE + "Plhlegblasts:\n" +
EnumChatFormatting.DARK_RED + "Magma Slugs:\n" +
EnumChatFormatting.RED + "Moogmas:\n" +
EnumChatFormatting.RED + "Lava Leeches:\n" +
@@ -930,6 +933,7 @@ public class LootDisplay {
EnumChatFormatting.AQUA + nf.format(FishingTracker.fishingMilestoneSession) + "\n" +
EnumChatFormatting.GOLD + nf.format(FishingTracker.goodCatchesSession) + "\n" +
EnumChatFormatting.DARK_PURPLE + nf.format(FishingTracker.greatCatchesSession) + "\n" +
+ EnumChatFormatting.BLUE + nf.format(FishingTracker.plhlegblastsSession) + "\n" +
EnumChatFormatting.DARK_RED + nf.format(FishingTracker.magmaSlugsSession) + "\n" +
EnumChatFormatting.RED + nf.format(FishingTracker.moogmasSession) + "\n" +
EnumChatFormatting.RED + nf.format(FishingTracker.lavaLeechesSession) + "\n" +
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index fd3d391..a35a2d4 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -461,6 +461,7 @@ public class ConfigHandler {
FishingTracker.lavaPigmen = initInt("fishing", "lavaPigman", 0);
FishingTracker.zombieMiners = initInt("fishing", "zombieMiner", 0);
// Lava Fishing
+ FishingTracker.plhlegblasts = initInt("fishing", "plhlegblast", 0);
FishingTracker.magmaSlugs = initInt("fishing", "magmaSlug", 0);
FishingTracker.moogmas = initInt("fishing", "moogma", 0);
FishingTracker.lavaLeeches = initInt("fishing", "lavaLeech", 0);