aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2020-08-25 00:25:15 -0400
committerbowser0000 <bowser0000@gmail.com>2020-08-25 00:25:15 -0400
commit09462affe26d0b9d6d460d062f7dfe9c9d09df4b (patch)
treee636710a65e6c4c482d5877ee50bdfe83e054cd4 /src/main
parentece7f3de65618ee89f86513e4d8307a97c20f012 (diff)
downloadSkyblockMod-09462affe26d0b9d6d460d062f7dfe9c9d09df4b.tar.gz
SkyblockMod-09462affe26d0b9d6d460d062f7dfe9c9d09df4b.tar.bz2
SkyblockMod-09462affe26d0b9d6d460d062f7dfe9c9d09df4b.zip
Fix spirit pet counting, fix tab complete of display
Add catacombs to /display tab complete
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/me/Danker/TheMod.java9
-rw-r--r--src/main/java/me/Danker/commands/DisplayCommand.java2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 7fc7d92..454cb9c 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -728,7 +728,7 @@ public class TheMod
cf.writeIntConfig("catacombs", "spiritWing", lc.spiritWings);
}
// TODO
- // Fix strings for Spirit Bone, Spirit Boots, Spirit Pet
+ // Fix strings for Spirit Bone, Spirit Boots
if (message.contains(" ") && message.contains("Spirit Bone")) {
lc.spiritBones++;
lc.spiritBonesSession++;
@@ -739,13 +739,14 @@ public class TheMod
lc.spiritBootsSession++;
cf.writeIntConfig("catacombs", "spiritBoot", lc.spiritBoots);
}
- if (message.contains(" ") && message.contains("Spirit Pet")) {
+ if (message.contains(" [Lvl 1] Spirit")) {
String formattedMessage = event.message.getFormattedText();
- if (formattedMessage.contains("§5Spirit Pet")) {
+ // Unicode colour code messes up here, just gonna remove the symbols
+ if (formattedMessage.contains("5Spirit")) {
lc.epicSpiritPets++;
lc.epicSpiritPetsSession++;
cf.writeIntConfig("catacombs", "spiritPetEpic", lc.epicSpiritPets);
- } else if (formattedMessage.contains("§6Spirit Pet")) {
+ } else if (formattedMessage.contains("6Spirit")) {
lc.legSpiritPets++;
lc.legSpiritPetsSession++;
cf.writeIntConfig("catacombs", "spiritPetLeg", lc.legSpiritPets);
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index 7707442..2f7690d 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -32,7 +32,7 @@ public class DisplayCommand extends CommandBase {
@Override
public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
if (args.length == 1) {
- return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "off");
+ return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs", "off");
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
return getListOfStringsMatchingLastWord(args, "winter", "session");
} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {