aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCow <cow@volloeko.de>2020-11-23 22:17:26 +0100
committerCow <cow@volloeko.de>2020-11-23 22:17:26 +0100
commita5469082c9feafa5512c1b0e81dec371db785042 (patch)
treeb5bbf01062901b6071904a2ee70b0f0d25ca25d4
parent0a731e512f1556ca22006419b409110338a7d4ed (diff)
downloadCowlection-a5469082c9feafa5512c1b0e81dec371db785042.tar.gz
Cowlection-a5469082c9feafa5512c1b0e81dec371db785042.tar.bz2
Cowlection-a5469082c9feafa5512c1b0e81dec371db785042.zip
What year is it?
- Adapt to Creeper minion skin fix (Creeper Minion V + VI had the same skin for over 100 SkyBlock years)
-rw-r--r--CHANGELOG.md2
-rw-r--r--src/main/java/de/cowtipper/cowlection/command/MooCommand.java5
-rw-r--r--src/main/java/de/cowtipper/cowlection/data/DataHelper.java2
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b97d9b..128d492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
- SkyBlock Dungeons Party: new command `/moo dungeon party`
- short alias: `/m dp`):
- - displays current `/party` members' armor and dungeons floor completions
+ - displays current `/party` members' selected class, armor and dungeons floor completions
### Changed
- Completely re-done the config gui (`/moo config`)
diff --git a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
index a2a3c0a..0e14a01 100644
--- a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
+++ b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
@@ -114,6 +114,9 @@ public class MooCommand extends CommandBase {
main.getChatHelper().sendShrug(buildString(args, 1));
} else if (args[0].equalsIgnoreCase("apikey")) {
handleApiKey(args);
+ } else if (args[0].equalsIgnoreCase("whatyearisit") || args[0].equalsIgnoreCase("year")) {
+ long year = ((System.currentTimeMillis() - 1560275700000L) / (TimeUnit.HOURS.toMillis(124))) + 1;
+ main.getChatHelper().sendMessage(EnumChatFormatting.YELLOW, "It is SkyBlock year " + EnumChatFormatting.GOLD + year + EnumChatFormatting.YELLOW + ".");
}
//endregion
//region sub-commands: update mod
@@ -824,7 +827,7 @@ public class MooCommand extends CommandBase {
/* miscellaneous */ "config", "search", "guiscale", "rr", "shrug", "apikey",
/* update mod */ "update", "updateHelp", "version", "directory",
/* help */ "help",
- /* rarely used aliases */ "askPolitelyWhereTheyAre", "askPolitelyAboutTheirSkyBlockProgress");
+ /* rarely used aliases */ "askPolitelyWhereTheyAre", "askPolitelyAboutTheirSkyBlockProgress", "year", "whatyearisit");
} else if (args.length == 2 && args[0].equalsIgnoreCase("remove")) {
return getListOfStringsMatchingLastWord(args, main.getFriendsHandler().getBestFriends());
} else if (args.length == 2 && args[0].equalsIgnoreCase("dungeon")) {
diff --git a/src/main/java/de/cowtipper/cowlection/data/DataHelper.java b/src/main/java/de/cowtipper/cowlection/data/DataHelper.java
index ceae06f..95c2133 100644
--- a/src/main/java/de/cowtipper/cowlection/data/DataHelper.java
+++ b/src/main/java/de/cowtipper/cowlection/data/DataHelper.java
@@ -516,7 +516,7 @@ public final class DataHelper {
minions.put("488b4089a835e276838bba45c79d1146f0c2341971170a6163e6493890fd1b83", "Creeper III");
minions.put("ac2d5f8dcfc9f35897f8b0a42ff0c19e483bdc745e7e64bf0aaf1054a6e67dd", "Creeper IV");
minions.put("654bde9a26e35094e3438540c225cffa7690c1d4456251da30cc990ff921cc36", "Creeper V");
- minions.put("654bde9a26e35094e3438540c225cffa7690c1d4456251da30cc990ff921cc36", "Creeper VI");
+ minions.put("b5f07bbd87cffad76aeb5337e74726e7fcbd96c2bd0dcb083f5fca5aec2e12a", "Creeper VI");
minions.put("f6f95998dd76a3bd9ffe949e7a4fe993b4baa2e981f49bf7113417f51003b193", "Creeper VII");
minions.put("8c0abba2be5c9a93362a7da3231aeea824c5c590bfaaaec78888f1b3d9d32adc", "Creeper VIII");
minions.put("21abd529c1898f6ec7e01d9943419c6358de93e0d6cdd2d90c8d63e7036db60d", "Creeper IX");