aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md4
-rw-r--r--src/main/java/me/Danker/TheMod.java98
-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.java68
-rw-r--r--src/main/java/me/Danker/commands/ResetLootCommand.java12
-rw-r--r--src/main/java/me/Danker/gui/DisplayGui.java17
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java26
8 files changed, 225 insertions, 14 deletions
diff --git a/README.md b/README.md
index ab69c1e..7a5369b 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,8 @@ Discord Server: https://discord.gg/QsEkNQS
- /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/midasstaffmessages/healmessages/caketimer/lividsolver/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/list> - Toggles features. /toggle list returns values of every toggle.
- /setkey <key> - Sets API key.
- /getkey - Returns key set with /setkey and copies it to your clipboard.
-- /loot <zombie/spider/wolf/fishing/catacombs> [winter/spooky/f(1-6)/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.
-- /display <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/spooky/f(1-6)/session] - 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.
+- /loot <zombie/spider/wolf/fishing/catacombs> [winter/spooky/f(1-7)/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.
+- /display <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/spooky/f(1-7)/session] - 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.
- /resetloot <zombie/spider/wolf/fishing/catacombs/confirm/cancel> - - Resets loot for trackers. /resetloot confirm confirms the reset.
- /move <coords/display/dungeontimer/skill50/lividhp/caketimer> <x> <y> - Moves text display to specified X and Y coordinates.
- /scale <coords/display/dungeontimer/skill50/lividhp/caketimer> <scale (0.1 - 10)> - Scales text display to a specified multipler between 0.1x and 10x.
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 8cb1203..9478d6c 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -814,6 +814,10 @@ public class TheMod
LootCommand.f6TimeSpent = Math.floor(LootCommand.f6TimeSpent + timeToAdd);
LootCommand.f6TimeSpentSession = Math.floor(LootCommand.f6TimeSpentSession + timeToAdd);
ConfigHandler.writeDoubleConfig("catacombs", "floorSixTime", LootCommand.f6TimeSpent);
+ } else if (sCleaned.contains("F7")) {
+ LootCommand.f7TimeSpent = Math.floor(LootCommand.f7TimeSpent + timeToAdd);
+ LootCommand.f7TimeSpentSession = Math.floor(LootCommand.f7TimeSpentSession + timeToAdd);
+ ConfigHandler.writeDoubleConfig("catacombs", "floorSevenTime", LootCommand.f7TimeSpent);
}
} else if (sCleaned.contains("Time Elapsed:")) {
// Get floor time
@@ -981,6 +985,36 @@ public class TheMod
LootCommand.necroSwords++;
LootCommand.necroSwordsSession++;
ConfigHandler.writeIntConfig("catacombs", "necroSword", LootCommand.necroSwords);
+ } else if (message.contains("Wither Blood")) { // F7
+ LootCommand.witherBloods++;
+ LootCommand.witherBloodsSession++;
+ } else if (message.contains("Wither Cloak")) {
+ LootCommand.witherCloaks++;
+ LootCommand.witherCloaksSession++;
+ } else if (message.contains("Implosion")) {
+ LootCommand.implosions++;
+ LootCommand.implosionsSession++;
+ } else if (message.contains("Wither Shield")) {
+ LootCommand.witherShields++;
+ LootCommand.witherShieldsSession++;
+ } else if (message.contains("Shadow Warp")) {
+ LootCommand.shadowWarps++;
+ LootCommand.shadowWarpsSession++;
+ } else if (message.contains("Auto Recombobulator")) {
+ LootCommand.autoRecombs++;
+ LootCommand.autoRecombsSession++;
+ } else if (message.contains("Wither Helmet")) {
+ LootCommand.witherHelms++;
+ LootCommand.witherHelmsSession++;
+ } else if (message.contains("Wither Chestplate")) {
+ LootCommand.witherChests++;
+ LootCommand.witherChestsSession++;
+ } else if (message.contains("Wither Leggings")) {
+ LootCommand.witherLegs++;
+ LootCommand.witherLegsSession++;
+ } else if (message.contains("Wither Boots")) {
+ LootCommand.witherBoots++;
+ LootCommand.witherBootsSession++;
}
}
@@ -1808,6 +1842,64 @@ public class TheMod
EnumChatFormatting.GOLD + nf.format(LootCommand.necroSwordsSession) + "\n" +
EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f6CoinsSpentSession) + "\n" +
EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f6TimeSpentSession);
+ } else if (DisplayCommand.display.equals("catacombs_floor_seven")) {
+ dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Wither Bloods:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Wither Cloaks:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Implosions:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Wither Shields:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Shadow Warps:\n" +
+ EnumChatFormatting.GOLD + "Auto Recombobs:\n" +
+ EnumChatFormatting.GOLD + "Wither Helmets:\n" +
+ EnumChatFormatting.GOLD + "Wither Chests:\n" +
+ EnumChatFormatting.GOLD + "Wither Leggings:\n" +
+ EnumChatFormatting.GOLD + "Wither Boots:\n" +
+ EnumChatFormatting.AQUA + "Coins Spent:\n" +
+ EnumChatFormatting.AQUA + "Time Spent:";
+ countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.witherBloods) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.witherCloaks) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.implosions) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.witherShields) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowWarps) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.autoRecombs) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherHelms) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherChests) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherLegs) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherBoots) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f7CoinsSpent) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f7TimeSpent);
+ } else if (DisplayCommand.display.equals("catacombs_floor_seven_session")) {
+ dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Wither Bloods:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Wither Cloaks:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Implosions:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Wither Shields:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Shadow Warps:\n" +
+ EnumChatFormatting.GOLD + "Auto Recombobulators:\n" +
+ EnumChatFormatting.GOLD + "Wither Helmets:\n" +
+ EnumChatFormatting.GOLD + "Wither Chests:\n" +
+ EnumChatFormatting.GOLD + "Wither Leggings:\n" +
+ EnumChatFormatting.GOLD + "Wither Boots:\n" +
+ EnumChatFormatting.AQUA + "Coins Spent:\n" +
+ EnumChatFormatting.AQUA + "Time Spent:";
+ countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.witherBloodsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.witherCloaksSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.implosionsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.witherShieldsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowWarpsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.autoRecombsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherHelmsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherChestsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherLegsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(LootCommand.witherBootsSession) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f7CoinsSpentSession) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f7TimeSpentSession);
} else {
System.out.println("Display was an unknown value, turning off.");
DisplayCommand.display = "off";
@@ -1948,6 +2040,8 @@ public class TheMod
DisplayCommand.display = "catacombs_floor_five";
} else if (sCleaned.contains("F6")) {
DisplayCommand.display = "catacombs_floor_six";
+ } else if (sCleaned.contains("F7")) {
+ DisplayCommand.display = "catacombs_floor_seven";
}
found = true;
}
@@ -2295,6 +2389,10 @@ public class TheMod
LootCommand.f6CoinsSpent += coinsSpent;
LootCommand.f6CoinsSpentSession += coinsSpent;
ConfigHandler.writeDoubleConfig("catacombs", "floorSixCoins", LootCommand.f6CoinsSpent);
+ } else if (sCleaned.contains("F7")) {
+ LootCommand.f7CoinsSpent += coinsSpent;
+ LootCommand.f7CoinsSpentSession += coinsSpent;
+ ConfigHandler.writeDoubleConfig("catacombs", "floorSevenCoins", LootCommand.f7CoinsSpent);
}
break;
}
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index b3bdbbf..4fadb54 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/healmessages/caketimer/lividsolver/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/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/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 + " /loot <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-7)/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-7)/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/caketimer> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer/skill50/lividhp/caketimer> <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 2af402e..8ee18ec 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/spooky/session/f(1-6)]";
+ return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/festival/spooky/session/f(1-7)]";
}
@Override
@@ -37,7 +37,7 @@ public class DisplayCommand extends CommandBase {
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
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");
+ return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7");
} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) {
return getListOfStringsMatchingLastWord(args, "session");
}
@@ -142,6 +142,12 @@ public class DisplayCommand extends CommandBase {
} else {
display = "catacombs_floor_six";
}
+ } else if (arg1[1].equalsIgnoreCase("f7") || arg1[1].equalsIgnoreCase("floor7")) {
+ if (showSession) {
+ display = "catacombs_floor_seven_session";
+ } else {
+ display = "catacombs_floor_seven";
+ }
} else {
player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: /display catacombs <f1/f2/f3/f4/f5/f6>"));
return;
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index a7c7ced..867139f 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -147,6 +147,19 @@ public class LootCommand extends CommandBase {
public static int necroSwords;
public static double f6CoinsSpent;
public static double f6TimeSpent;
+ // F7
+ public static int witherBloods;
+ public static int witherCloaks;
+ public static int implosions;
+ public static int witherShields;
+ public static int shadowWarps;
+ public static int autoRecombs;
+ public static int witherHelms;
+ public static int witherChests;
+ public static int witherLegs;
+ public static int witherBoots;
+ public static double f7CoinsSpent;
+ public static double f7TimeSpent;
// Single sessions (No config saves)
// Wolf
@@ -281,6 +294,19 @@ public class LootCommand extends CommandBase {
public static int necroSwordsSession = 0;
public static double f6CoinsSpentSession = 0;
public static double f6TimeSpentSession = 0;
+ // F7
+ public static int witherBloodsSession = 0;
+ public static int witherCloaksSession = 0;
+ public static int implosionsSession = 0;
+ public static int witherShieldsSession = 0;
+ public static int shadowWarpsSession = 0;
+ public static int autoRecombsSession = 0;
+ public static int witherHelmsSession = 0;
+ public static int witherChestsSession = 0;
+ public static int witherLegsSession = 0;
+ public static int witherBootsSession = 0;
+ public static double f7CoinsSpentSession = 0;
+ public static double f7TimeSpentSession = 0;
@Override
public String getCommandName() {
@@ -289,7 +315,7 @@ public class LootCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-6)/session]";
+ return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-7)/session]";
}
@Override
@@ -304,7 +330,7 @@ public class LootCommand extends CommandBase {
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
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");
+ return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7");
} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) {
return getListOfStringsMatchingLastWord(args, "session");
}
@@ -860,6 +886,44 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f6CoinsSpent) + "\n" +
EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f6TimeSpent) + "\n" +
EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+ } else if (arg1[1].equalsIgnoreCase("f7") || arg1[1].equalsIgnoreCase("floor7")) {
+ if (showSession) {
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+ EnumChatFormatting.RED + EnumChatFormatting.BOLD + " Catacombs F7 Summary (Current Session):\n" +
+ EnumChatFormatting.GOLD + " Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Wither Bloods: " + nf.format(witherBloodsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Wither Cloaks: " + nf.format(witherCloaksSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Implosions: " + nf.format(implosionsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Wither Shields: " + nf.format(witherShieldsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Shadow Warps: " + nf.format(shadowWarpsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Auto Recombobulator: " + nf.format(autoRecombsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Helmets: " + nf.format(witherHelmsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Chesplates: " + nf.format(witherChestsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Leggings: " + nf.format(witherLegsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Boots: " + nf.format(witherBootsSession) + "\n" +
+ EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f7CoinsSpentSession) + "\n" +
+ EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f7TimeSpentSession) + "\n" +
+ EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+ return;
+ }
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+ EnumChatFormatting.RED + EnumChatFormatting.BOLD + " Catacombs F7 Summary:\n" +
+ EnumChatFormatting.GOLD + " Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Wither Bloods: " + nf.format(witherBloods) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Wither Cloaks: " + nf.format(witherCloaks) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Implosions: " + nf.format(implosions) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Wither Shields: " + nf.format(witherShields) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Shadow Warps: " + nf.format(shadowWarps) + "\n" +
+ EnumChatFormatting.GOLD + " Auto Recombobulator: " + nf.format(autoRecombs) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Helmets: " + nf.format(witherHelms) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Chesplates: " + nf.format(witherChests) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Leggings: " + nf.format(witherLegs) + "\n" +
+ EnumChatFormatting.GOLD + " Wither Boots: " + nf.format(witherBoots) + "\n" +
+ EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f7CoinsSpent) + "\n" +
+ EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f7TimeSpent) + "\n" +
+ EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
} else {
player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: /loot catacombs <f1/f2/f3/f4/f5/f6>"));
}
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index f99b5ae..6e92c20 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -224,6 +224,18 @@ public class ResetLootCommand extends CommandBase {
LootCommand.necroSwordsSession = 0;
LootCommand.f6CoinsSpentSession = 0;
LootCommand.f6TimeSpentSession = 0;
+ LootCommand.witherBloodsSession = 0;
+ LootCommand.witherCloaksSession = 0;
+ LootCommand.implosionsSession = 0;
+ LootCommand.witherShieldsSession = 0;
+ LootCommand.shadowWarpsSession = 0;
+ LootCommand.autoRecombsSession = 0;
+ LootCommand.witherHelmsSession = 0;
+ LootCommand.witherChestsSession = 0;
+ LootCommand.witherLegsSession = 0;
+ LootCommand.witherBootsSession = 0;
+ LootCommand.f7CoinsSpentSession = 0;
+ LootCommand.f7TimeSpentSession = 0;
ConfigHandler.deleteCategory("catacombs");
ConfigHandler.reloadConfig();
}
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index b944a2f..21bb05e 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -32,6 +32,7 @@ public class DisplayGui extends GuiScreen {
private GuiButton catacombsF4;
private GuiButton catacombsF5;
private GuiButton catacombsF6;
+ private GuiButton catacombsF7;
@Override
public boolean doesGuiPauseGame() {
@@ -58,12 +59,13 @@ public class DisplayGui extends GuiScreen {
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");
fishingSpooky = new GuiButton(0, width / 2 + 130, (int) (height * 0.4), 100, 20, "Fishing Spooky");
- 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");
- catacombsF4 = new GuiButton(0, width / 2 + 35, (int) (height * 0.55), 50, 20, "F4");
- catacombsF5 = new GuiButton(0, width / 2 + 95, (int) (height * 0.55), 50, 20, "F5");
- catacombsF6 = new GuiButton(0, width / 2 - 145, (int) (height * 0.63), 50, 20, "F6");
+ catacombsF1 = new GuiButton(0, width / 2 - 205, (int) (height * 0.55), 50, 20, "F1");
+ catacombsF2 = new GuiButton(0, width / 2 - 145, (int) (height * 0.55), 50, 20, "F2");
+ catacombsF3 = new GuiButton(0, width / 2 - 85, (int) (height * 0.55), 50, 20, "F3");
+ catacombsF4 = new GuiButton(0, width / 2 - 25, (int) (height * 0.55), 50, 20, "F4");
+ catacombsF5 = new GuiButton(0, width / 2 + 35, (int) (height * 0.55), 50, 20, "F5");
+ catacombsF6 = new GuiButton(0, width / 2 + 95, (int) (height * 0.55), 50, 20, "F6");
+ catacombsF7 = new GuiButton(0, width / 2 + 155, (int) (height * 0.55), 50, 20, "F7");
this.buttonList.add(showSession);
this.buttonList.add(off);
@@ -81,6 +83,7 @@ public class DisplayGui extends GuiScreen {
this.buttonList.add(catacombsF4);
this.buttonList.add(catacombsF5);
this.buttonList.add(catacombsF6);
+ this.buttonList.add(catacombsF7);
this.buttonList.add(editLocations);
this.buttonList.add(goBack);
}
@@ -146,6 +149,8 @@ public class DisplayGui extends GuiScreen {
setDisplay("catacombs_floor_five", false);
} else if (button == catacombsF6) {
setDisplay("catacombs_floor_six", false);
+ } else if (button == catacombsF7) {
+ setDisplay("catacombs_floor_seven", false);
}
}
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 08a78c4..6318abb 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -335,6 +335,19 @@ public class ConfigHandler {
if (!hasKey("catacombs", "necroSword")) writeIntConfig("catacombs", "necroSword", 0);
if (!hasKey("catacombs", "floorSixCoins")) writeDoubleConfig("catacombs", "floorSixCoins", 0);
if (!hasKey("catacombs", "floorSixTime")) writeDoubleConfig("catacombs", "floorSixTime", 0);
+ // F7
+ if (!hasKey("catacombs", "witherBlood")) writeIntConfig("catacombs", "witherBlood", 0);
+ if (!hasKey("catacombs", "witherCloak")) writeIntConfig("catacombs", "witherCloak", 0);
+ if (!hasKey("catacombs", "implosion")) writeIntConfig("catacombs", "implosion", 0);
+ if (!hasKey("catacombs", "witherShield")) writeIntConfig("catacombs", "witherShield", 0);
+ if (!hasKey("catacombs", "shadowWarp")) writeIntConfig("catacombs", "shadowWarp", 0);
+ if (!hasKey("catacombs", "autoRecomb")) writeIntConfig("catacombs", "autoRecomb", 0);
+ if (!hasKey("catacombs", "witherHelm")) writeIntConfig("catacombs", "witherHelm", 0);
+ if (!hasKey("catacombs", "witherChest")) writeIntConfig("catacombs", "witherChest", 0);
+ if (!hasKey("catacombs", "witherLegging")) writeIntConfig("catacombs", "witherLegging", 0);
+ if (!hasKey("catacombs", "witherBoot")) writeIntConfig("catacombs", "witherBoot", 0);
+ if (!hasKey("catacombs", "floorSevenCoins")) writeDoubleConfig("catacombs", "floorSevenCoins", 0);
+ if (!hasKey("catacombs", "floorSevenTime")) writeDoubleConfig("catacombs", "floorSevenTime", 0);
if (!hasKey("misc", "display")) writeStringConfig("misc", "display", "off");
if (!hasKey("misc", "autoDisplay")) writeBooleanConfig("misc", "autoDisplay", false);
@@ -540,6 +553,19 @@ public class ConfigHandler {
LootCommand.necroSwords = getInt("catacombs", "necroSword");
LootCommand.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
LootCommand.f6TimeSpent = getDouble("catacombs", "floorSixTime");
+ // F7
+ LootCommand.witherBloods = getInt("catacombs", "witherBlood");
+ LootCommand.witherCloaks = getInt("catacombs", "witherCloak");
+ LootCommand.implosions = getInt("catacombs", "implosion");
+ LootCommand.witherShields = getInt("catacombs", "witherShield");
+ LootCommand.shadowWarps = getInt("catacombs", "shadowWarp");
+ LootCommand.autoRecombs = getInt("catacombs", "autoRecomb");
+ LootCommand.witherHelms = getInt("catacombs", "witherHelm");
+ LootCommand.witherChests = getInt("catacombs", "witherChest");
+ LootCommand.witherLegs = getInt("catacombs", "witherLegging");
+ LootCommand.witherBoots = getInt("catacombs", "witherBoot");
+ LootCommand.f7CoinsSpent = getDouble("catacombs", "floorSevenCoins");
+ LootCommand.f7TimeSpent = getDouble("catacombs", "floorSevenTime");
// Misc
DisplayCommand.display = getString("misc", "display");
generated by cgit (git 2.46.0) at 2024-12-01 12:22:48 +0000