aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/me/Danker/TheMod.java221
-rw-r--r--src/main/java/me/Danker/commands/DHelpCommand.java4
-rw-r--r--src/main/java/me/Danker/commands/DisplayCommand.java10
-rw-r--r--src/main/java/me/Danker/commands/LootCommand.java37
-rw-r--r--src/main/java/me/Danker/commands/ResetLootCommand.java5
-rw-r--r--src/main/java/me/Danker/gui/DisplayGui.java11
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java12
7 files changed, 151 insertions, 149 deletions
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index ca52372..2dbd836 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -222,7 +222,7 @@ public class TheMod
triviaSolutions.put("What is the name of the lady of the Nether?", "Elle");
triviaSolutions.put("Which villager in the Village gives you a Rogue Sword?", "Jamie");
triviaSolutions.put("How many unique minions are there?", "52 Minions");
- triviaSolutions.put("Which of these enemies does not spawn in the Spider's Den?", "Zombie Spider OR Cave Spider OR Broodfather");
+ triviaSolutions.put("Which of these enemies does not spawn in the Spider's Den?", "Zombie Spider OR Cave Spider OR Broodfather OR Wither Skeleton");
triviaSolutions.put("Which of these monsters only spawns at night?", "Zombie Villager OR Ghast");
triviaSolutions.put("Which of these is not a dragon in The End?", "Zoomer Dragon OR Weak Dragon OR Stonk Dragon OR Holy Dragon OR Boomer Dragon");
@@ -562,257 +562,154 @@ public class TheMod
lc.greatCatches++;
lc.greatCatchesSession++;
cf.writeIntConfig("fishing", "greatCatch", lc.greatCatches);
- } else if (message.contains("You caught a lowly Squid")) {
+ } else if (message.contains("A Squid appeared")) {
lc.squids++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.squidsSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "squid", lc.squids);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
- } else if (message.contains("From the depths of the waters, you've reeled in a Sea Walker")) {
+ } else if (message.contains("You caught a Sea Walker")) {
lc.seaWalkers++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.seaWalkersSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "seaWalker", lc.seaWalkers);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
- } else if (message.contains("Pitch darkness reveals you've caught a")) {
+ } else if (message.contains("Pitch darkness reveals a Night Squid")) {
lc.nightSquids++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.nightSquidsSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "nightSquid", lc.nightSquids);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
- } else if (message.contains("You've stumbled upon a patrolling Sea Guardian")) {
+ } else if (message.contains("You stumbled upon a Sea Guardian")) {
lc.seaGuardians++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.seaGuardiansSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "seaGuardian", lc.seaGuardians);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("It looks like you've disrupted the Sea Witch's brewing session. Watch out, she's furious")) {
lc.seaWitches++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.seaWitchesSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "seaWitch", lc.seaWitches);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
- } else if (message.contains("From the depths of the waters, you've reeled in a Sea Archer")) {
+ } else if (message.contains("You reeled in a Sea Archer")) {
lc.seaArchers++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.seaArchersSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "seaArcher", lc.seaArchers);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
- } else if (message.contains("The Monster of the Deep emerges from the dark depths")) {
+ } else if (message.contains("The Monster of the Deep has emerged")) {
lc.monsterOfTheDeeps++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.monsterOfTheDeepsSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "monsterOfDeep", lc.monsterOfTheDeeps);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
- } else if (message.contains("You have found a Catfish, don't let it steal your catches")) {
+ } else if (message.contains("Huh? A Catfish")) {
lc.catfishes++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.catfishesSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "catfish", lc.catfishes);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("Is this even a fish? It's the Carrot King")) {
lc.carrotKings++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.carrotKingsSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "carrotKing", lc.carrotKings);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("Gross! A Sea Leech")) {
lc.seaLeeches++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.seaLeechesSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "seaLeech", lc.seaLeeches);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("You've discovered a Guardian Defender of the sea")) {
lc.guardianDefenders++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.guardianDefendersSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "guardianDefender", lc.guardianDefenders);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("You have awoken the Deep Sea Protector, prepare for a battle")) {
lc.deepSeaProtectors++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.deepSeaProtectorsSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "deepSeaProtector", lc.deepSeaProtectors);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("The Water Hydra has come to test your strength")) {
lc.hydras++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.hydrasSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "hydra", lc.hydras);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("The Sea Emperor arises from the depths")) {
+ increaseSeaCreatures();
+
lc.seaEmperors++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.empTime = System.currentTimeMillis() / 1000;
lc.empSCs = 0;
lc.seaEmperorsSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
lc.empTimeSession = System.currentTimeMillis() / 1000;
lc.empSCsSession = 0;
cf.writeIntConfig("fishing", "seaEmperor", lc.seaEmperors);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
cf.writeDoubleConfig("fishing", "empTime", lc.empTime);
cf.writeIntConfig("fishing", "empSC", lc.empSCs);
} else if (message.contains("Frozen Steve fell into the pond long ago")) { // Fishing Winter
lc.frozenSteves++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.frozenStevesSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "frozenSteve", lc.frozenSteves);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("It's a snowman! He looks harmless")) {
lc.frostyTheSnowmans++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.frostyTheSnowmansSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "snowman", lc.frostyTheSnowmans);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("stole Jerry's Gifts...get them back")) {
lc.grinches++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.grinchesSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "grinch", lc.grinches);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("What is this creature")) {
+ increaseSeaCreatures();
+
lc.yetis++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.yetiTime = System.currentTimeMillis() / 1000;
lc.yetiSCs = 0;
lc.yetisSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
lc.yetiTimeSession = System.currentTimeMillis() / 1000;
lc.yetiSCsSession = 0;
cf.writeIntConfig("fishing", "yeti", lc.yetis);
cf.writeDoubleConfig("fishing", "yetiTime", lc.yetiTime);
cf.writeIntConfig("fishing", "yetiSC", lc.yetiSCs);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
} else if (message.contains("A tiny fin emerges from the water, you've caught a Nurse Shark")) { // Fishing Festival
lc.nurseSharks++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.nurseSharksSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "nurseShark", lc.nurseSharks);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("You spot a fin as blue as the water it came from, it's a Blue Shark")) {
lc.blueSharks++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.blueSharksSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "blueShark", lc.blueSharks);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("A striped beast bounds from the depths, the wild Tiger Shark")) {
lc.tigerSharks++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.tigerSharksSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "tigerShark", lc.tigerSharks);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
increaseSeaCreatures();
} else if (message.contains("Hide no longer, a Great White Shark has tracked your scent and thirsts for your blood")) {
lc.greatWhiteSharks++;
- lc.seaCreatures++;
- lc.fishingMilestone++;
lc.greatWhiteSharksSession++;
- lc.seaCreaturesSession++;
- lc.fishingMilestoneSession++;
cf.writeIntConfig("fishing", "greatWhiteShark", lc.greatWhiteSharks);
- cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
- cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
+ increaseSeaCreatures();
+ } else if (message.contains("Phew! It's only a Scarecrow")) {
+ lc.scarecrows++;
+ lc.scarecrowsSession++;
+ cf.writeIntConfig("fishing", "scarecrow", lc.werewolfs);
+ increaseSeaCreatures();
+ } else if (message.contains("You hear trotting from beneath the waves, you caught a Nightmare")) {
+ lc.nightmares++;
+ lc.nightmaresSession++;
+ cf.writeIntConfig("fishing", "nightmare", lc.werewolfs);
+ increaseSeaCreatures();
+ } else if (message.contains("It must be a full moon, a Werewolf appears")) {
+ lc.werewolfs++;
+ lc.werewolfsSession++;
+ cf.writeIntConfig("fishing", "werewolf", lc.werewolfs);
+ increaseSeaCreatures();
+ } else if (message.contains("The spirit of a long lost Phantom Fisher has come to haunt you")) {
+ lc.phantomFishers++;
+ lc.phantomFishersSession++;
+ cf.writeIntConfig("fishing", "phantomFisher", lc.werewolfs);
+ increaseSeaCreatures();
+ } else if (message.contains("This can't be! The manifestation of death himself")) {
+ lc.grimReapers++;
+ lc.grimReapersSession++;
+ cf.writeIntConfig("fishing", "grimReaper", lc.werewolfs);
increaseSeaCreatures();
} else if (message.contains("Dungeon starts in 1 second.")) { // Dungeons Stuff
dungeonStartTime = System.currentTimeMillis() / 1000 + 1;
@@ -1580,6 +1477,44 @@ public class TheMod
EnumChatFormatting.BLUE + nf.format(lc.blueSharksSession) + "\n" +
EnumChatFormatting.GOLD + nf.format(lc.tigerSharksSession) + "\n" +
EnumChatFormatting.WHITE + nf.format(lc.greatWhiteSharksSession);
+ } else if (ds.display.equals("spooky_fishing")) {
+ 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(lc.seaCreatures) + "\n" +
+ EnumChatFormatting.AQUA + nf.format(lc.fishingMilestone) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.goodCatches) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatches) + "\n" +
+ EnumChatFormatting.BLUE + nf.format(lc.scarecrows) + "\n" +
+ EnumChatFormatting.GRAY + nf.format(lc.nightmares) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(lc.werewolfs) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.phantomFishers) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.grimReapers);
+ } else if (ds.display.equals("spooky_fishing_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" +
+ EnumChatFormatting.GOLD + "Phantom Fishers:\n" +
+ EnumChatFormatting.GOLD + "Grim Reapers:";
+ countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreaturesSession) + "\n" +
+ EnumChatFormatting.AQUA + nf.format(lc.fishingMilestoneSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.goodCatchesSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatchesSession) + "\n" +
+ EnumChatFormatting.BLUE + nf.format(lc.scarecrowsSession) + "\n" +
+ EnumChatFormatting.GRAY + nf.format(lc.nightmaresSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(lc.werewolfsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.phantomFishersSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.grimReapersSession);
} else if (ds.display.equals("catacombs_floor_one")) {
dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
@@ -2301,6 +2236,12 @@ public class TheMod
}
}
+ lc.seaCreatures++;
+ lc.fishingMilestone++;
+ lc.seaCreaturesSession++;
+ lc.fishingMilestoneSession++;
+ cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
+ cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
cf.writeIntConfig("fishing", "empSC", lc.empSCs);
cf.writeIntConfig("fishing", "yetiSC", lc.yetiSCs);
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index aaffa96..c4fd618 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -37,8 +37,8 @@ public class DHelpCommand extends CommandBase {
EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/threemanpuzzle/midasstaffmessages/lividsolver/oruopuzzle/blazepuzzle/creeperpuzzle/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
EnumChatFormatting.GOLD + " /setkey <key>" + EnumChatFormatting.AQUA + " - Sets API key.\n" +
EnumChatFormatting.GOLD + " /getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey and copies it to your clipboard.\n" +
- EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing/catacombs> [winter/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
- EnumChatFormatting.GOLD + " /display <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead. /display auto automatically displays the loot for the slayer quest you have active.\n" +
+ EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
+ EnumChatFormatting.GOLD + " /display <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/festival/spooky/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead. /display auto automatically displays the loot for the slayer quest you have active.\n" +
EnumChatFormatting.GOLD + " /resetloot <zombie/spider/wolf/fishing/catacombs/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
EnumChatFormatting.GOLD + " /move <coords/display/dungeontimer/skill50/lividhp> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer/skill50/lividhp> <scale (0.1 - 10)>" + EnumChatFormatting.AQUA + " - Scales text display to a specified multipler between 0.1x and 10x.\n" +
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index b96ab2b..ee4422f 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -22,7 +22,7 @@ public class DisplayCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/festival/session/f(1-6)]";
+ return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/festival/spooky/session/f(1-6)]";
}
@Override
@@ -35,7 +35,7 @@ public class DisplayCommand extends CommandBase {
if (args.length == 1) {
return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs", "auto", "off");
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
- return getListOfStringsMatchingLastWord(args, "winter", "festival", "session");
+ return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session");
} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6");
} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) {
@@ -89,6 +89,12 @@ public class DisplayCommand extends CommandBase {
} else {
display = "fishing_festival";
}
+ } else if (arg1.length > 1 && arg1[1].equalsIgnoreCase("spooky")) {
+ if (showSession) {
+ display = "spooky_fishing_session";
+ } else {
+ display = "spooky_fishing";
+ }
} else {
if (showSession) {
display = "fishing_session";
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index bbe4f73..65f8031 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -88,6 +88,12 @@ public class LootCommand extends CommandBase {
public static int blueSharks;
public static int tigerSharks;
public static int greatWhiteSharks;
+ // Spooky Fishing
+ public static int scarecrows;
+ public static int nightmares;
+ public static int werewolfs;
+ public static int phantomFishers;
+ public static int grimReapers;
// Catacombs Dungeons
public static int recombobulators;
@@ -215,6 +221,12 @@ public class LootCommand extends CommandBase {
public static int blueSharksSession = 0;
public static int tigerSharksSession = 0;
public static int greatWhiteSharksSession = 0;
+ // Spooky Fishing
+ public static int scarecrowsSession = 0;
+ public static int nightmaresSession = 0;
+ public static int werewolfsSession = 0;
+ public static int phantomFishersSession = 0;
+ public static int grimReapersSession = 0;
// Catacombs Dungeons
public static int recombobulatorsSession = 0;
@@ -274,7 +286,7 @@ public class LootCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/f(1-6)/session]";
+ return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-6)/session]";
}
@Override
@@ -287,7 +299,7 @@ public class LootCommand extends CommandBase {
if (args.length == 1) {
return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs");
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
- return getListOfStringsMatchingLastWord(args, "winter", "festival", "session");
+ return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session");
} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6");
} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) {
@@ -578,6 +590,27 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.GOLD + " Tiger Sharks: " + nf.format(tigerSharks) + "\n" +
EnumChatFormatting.WHITE + " Great White Sharks: " + nf.format(greatWhiteSharks) + "\n" +
EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
+ } else if (arg1[1].equalsIgnoreCase("spooky")) {
+ if (showSession) {
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+ EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + " Spooky Fishing Summary (Current Session):\n" +
+ EnumChatFormatting.BLUE + " Scarecrows: " + nf.format(scarecrowsSession) + "\n" +
+ EnumChatFormatting.GRAY + " Nightmares: " + nf.format(nightmaresSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Werewolves: " + nf.format(werewolfsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Phantom Fishers: " + nf.format(phantomFishersSession) + "\n" +
+ EnumChatFormatting.GOLD + " Grim Reapers: " + nf.format(grimReapersSession) + "\n" +
+ EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
+ return;
+ }
+
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+ EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + " Spooky Fishing Summary:\n" +
+ EnumChatFormatting.BLUE + " Scarecrows: " + nf.format(scarecrows) + "\n" +
+ EnumChatFormatting.GRAY + " Nightmares: " + nf.format(nightmares) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Werewolves: " + nf.format(werewolfs) + "\n" +
+ EnumChatFormatting.GOLD + " Phantom Fishers: " + nf.format(phantomFishers) + "\n" +
+ EnumChatFormatting.GOLD + " Grim Reapers: " + nf.format(grimReapers) + "\n" +
+ EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
}
}
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index a4eee3a..678f486 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -182,6 +182,11 @@ public class ResetLootCommand extends CommandBase {
lc.blueSharksSession = 0;
lc.tigerSharksSession = 0;
lc.greatWhiteSharksSession = 0;
+ lc.scarecrowsSession = 0;
+ lc.nightmaresSession = 0;
+ lc.werewolfsSession = 0;
+ lc.phantomFishersSession = 0;
+ lc.grimReapersSession = 0;
cf.deleteCategory("fishing");
cf.reloadConfig();
}
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index 243bedb..9f00ed3 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -25,6 +25,7 @@ public class DisplayGui extends GuiScreen {
private GuiButton fishing;
private GuiButton fishingWinter;
private GuiButton fishingFestival;
+ private GuiButton spookyFishing;
private GuiButton catacombsF1;
private GuiButton catacombsF2;
private GuiButton catacombsF3;
@@ -53,9 +54,10 @@ public class DisplayGui extends GuiScreen {
zombie = new GuiButton(0, width / 2 - 190, (int) (height * 0.3), 110, 20, "Zombie");
spider = new GuiButton(0, width / 2 - 55, (int) (height * 0.3), 110, 20, "Spider");
wolf = new GuiButton(0, width / 2 + 75, (int) (height * 0.3), 110, 20, "Wolf");
- fishing = new GuiButton(0, width / 2 - 190, (int) (height * 0.4), 110, 20, "Fishing");
- fishingWinter = new GuiButton(0, width / 2 - 55, (int) (height * 0.4), 110, 20, "Fishing Winter");
- fishingFestival = new GuiButton(0, width / 2 + 75, (int) (height * 0.4), 110, 20, "Fishing Festival");
+ fishing = new GuiButton(0, width / 2 - 230, (int) (height * 0.4), 100, 20, "Fishing");
+ fishingWinter = new GuiButton(0, width / 2 - 110, (int) (height * 0.4), 100, 20, "Fishing Winter");
+ fishingFestival = new GuiButton(0, width / 2 + 10, (int) (height * 0.4), 100, 20, "Fishing Festival");
+ spookyFishing = new GuiButton(0, width / 2 + 130, (int) (height * 0.4), 100, 20, "Spooky Fishing");
catacombsF1 = new GuiButton(0, width / 2 - 145, (int) (height * 0.55), 50, 20, "F1");
catacombsF2 = new GuiButton(0, width / 2 - 85, (int) (height * 0.55), 50, 20, "F2");
catacombsF3 = new GuiButton(0, width / 2 - 25, (int) (height * 0.55), 50, 20, "F3");
@@ -72,6 +74,7 @@ public class DisplayGui extends GuiScreen {
this.buttonList.add(fishing);
this.buttonList.add(fishingWinter);
this.buttonList.add(fishingFestival);
+ this.buttonList.add(spookyFishing);
this.buttonList.add(catacombsF1);
this.buttonList.add(catacombsF2);
this.buttonList.add(catacombsF3);
@@ -129,6 +132,8 @@ public class DisplayGui extends GuiScreen {
setDisplay("fishing_winter", false);
} else if (button == fishingFestival) {
setDisplay("fishing_festival", false);
+ } else if (button == spookyFishing) {
+ setDisplay("spooky_fishing", false);
} else if (button == catacombsF1) {
setDisplay("catacombs_floor_one", false);
} else if (button == catacombsF2) {
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 86d2ccd..2b6c0f7 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -273,6 +273,12 @@ public class ConfigHandler {
if (!hasKey("fishing", "blueShark")) writeIntConfig("fishing", "blueShark", 0);
if (!hasKey("fishing", "tigerShark")) writeIntConfig("fishing", "tigerShark", 0);
if (!hasKey("fishing", "greatWhiteShark")) writeIntConfig("fishing", "greatWhiteShark", 0);
+ // Spooky Fishing
+ if (!hasKey("fishing", "scarecrow")) writeIntConfig("fishing", "scarecrow", 0);
+ if (!hasKey("fishing", "nightmare")) writeIntConfig("fishing", "nightmare", 0);
+ if (!hasKey("fishing", "werewolf")) writeIntConfig("fishing", "werewolf", 0);
+ if (!hasKey("fishing", "phantomFisher")) writeIntConfig("fishing", "phantomFisher", 0);
+ if (!hasKey("fishing", "grimReaper")) writeIntConfig("fishing", "grimReaper", 0);
// Dungeons
if (!hasKey("catacombs", "recombobulator")) writeIntConfig("catacombs", "recombobulator", 0);
@@ -455,6 +461,12 @@ public class ConfigHandler {
lc.blueSharks = getInt("fishing", "blueShark");
lc.tigerSharks = getInt("fishing", "tigerShark");
lc.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
+ // Spooky Fishing
+ lc.scarecrows = getInt("fishing", "scarecrow");
+ lc.nightmares = getInt("fishing", "nightmare");
+ lc.werewolfs = getInt("fishing", "nightmare");
+ lc.phantomFishers = getInt("fishing", "phantomFisher");
+ lc.grimReapers = getInt("fishing", "grimReaper");
// Dungeons
lc.recombobulators = getInt("catacombs", "recombobulator");
generated by cgit (git 2.46.0) at 2024-12-03 20:31:43 +0000