diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | src/main/java/me/Danker/TheMod.java | 4 | ||||
| -rw-r--r-- | src/main/java/me/Danker/commands/ResetLootCommand.java | 8 |
3 files changed, 14 insertions, 4 deletions
@@ -21,14 +21,14 @@ Discord Server: https://discord.gg/QsEkNQS ## Commands - /dhelp - Returns this message in-game. -- /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/list> - Toggles features. /toggle list returns values of every toggle. +- /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/sceptremessages/petcolors/dungeontimer/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/f(1-4)/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead. - /display <zombie/spider/wolf/fishing/catacombs> [winter/f(1-4)/session] - Text display for trackers. /display fishing winter displays winter sea creatures instead. - /resetloot <zombie/spider/wolf/fishing/catacombs/confirm/cancel> - - Resets loot for trackers. /resetloot confirm confirms the reset. -- /move <coords/display> <x> <y> - Moves text display to specified X and Y coordinates. -- /scale <coords/display> <scale (0.1 - 10)> - Scales text display to a specified multipler between 0.1x and 10x. +- /move <coords/display/dungeontimer> <x> <y> - Moves text display to specified X and Y coordinates. +- /scale <coords/display/dungeontimer> <scale (0.1 - 10)> - Scales text display to a specified multipler between 0.1x and 10x. - /slayer [player] - Uses API to get slayer xp of a person. If no name is provided, it checks yours. - /skills [player] - Uses API to get skill levels of a person. If no name is provided, it checks yours. - /guildof [player] - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours. diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java index ac3de48..29eed1e 100644 --- a/src/main/java/me/Danker/TheMod.java +++ b/src/main/java/me/Danker/TheMod.java @@ -1652,7 +1652,9 @@ public class TheMod for (Slot slot : invSlots) { ItemStack item = slot.getStack(); if (item == null) continue; - if (item.getDisplayName().contains("[Lvl ")) { + String name = item.getDisplayName(); + if (name.contains("[Lvl ")) { + if (name.endsWith("aHealer") || name.endsWith("aMage") || name.endsWith("aBerserk") || name.endsWith("aArcher") || name.endsWith("aTank")) continue; int colour; int petLevel = Integer.parseInt(item.getDisplayName().substring(item.getDisplayName().indexOf(" ") + 1, item.getDisplayName().indexOf("]"))); if (petLevel == 100) { diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java index fa80ad5..dd540d6 100644 --- a/src/main/java/me/Danker/commands/ResetLootCommand.java +++ b/src/main/java/me/Danker/commands/ResetLootCommand.java @@ -188,17 +188,25 @@ public class ResetLootCommand extends CommandBase { lc.recombobulatorsSession = 0; lc.fumingPotatoBooksSession = 0; lc.bonzoStaffsSession = 0; + lc.f1CoinsSpentSession = 0; + lc.f1TimeSpentSession = 0; lc.scarfStudiesSession = 0; + lc.f2CoinsSpentSession = 0; + lc.f2TimeSpentSession = 0; lc.adaptiveHelmsSession = 0; lc.adaptiveChestsSession = 0; lc.adaptiveLegsSession = 0; lc.adaptiveBootsSession = 0; lc.adaptiveSwordsSession = 0; + lc.f3CoinsSpentSession = 0; + lc.f3TimeSpentSession = 0; lc.spiritWingsSession = 0; lc.spiritBonesSession = 0; lc.spiritBootsSession = 0; lc.spiritSwordsSession = 0; lc.epicSpiritPetsSession = 0; + lc.f4CoinsSpentSession = 0; + lc.f4TimeSpentSession = 0; cf.deleteCategory("catacombs"); cf.reloadConfig(); } |