diff options
Diffstat (limited to 'me/Danker/commands')
| -rw-r--r-- | me/Danker/commands/DHelpCommand.java | 2 | ||||
| -rw-r--r-- | me/Danker/commands/DisplayCommand.java | 2 | ||||
| -rw-r--r-- | me/Danker/commands/ImportFishingCommand.java | 10 | ||||
| -rw-r--r-- | me/Danker/commands/LootCommand.java | 2 | ||||
| -rw-r--r-- | me/Danker/commands/ResetLootCommand.java | 1 |
5 files changed, 13 insertions, 4 deletions
diff --git a/me/Danker/commands/DHelpCommand.java b/me/Danker/commands/DHelpCommand.java index e36adb0..4958858 100644 --- a/me/Danker/commands/DHelpCommand.java +++ b/me/Danker/commands/DHelpCommand.java @@ -37,7 +37,7 @@ public class DHelpCommand extends CommandBase { EnumChatFormatting.GOLD + " /getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey.\n" + EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing> [winter/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/off> [winter/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead.\n" + - EnumChatFormatting.GOLD + "/resetloot <zombie/spider/wolf/fishing/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" + + EnumChatFormatting.GOLD + " /resetloot <zombie/spider/wolf/fishing/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" + EnumChatFormatting.GOLD + " /move <coords/display> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" + EnumChatFormatting.GOLD + " /slayer [player]" + EnumChatFormatting.AQUA + " - Uses API to get slayer xp of a person. If no name is provided, it checks yours.\n" + EnumChatFormatting.GOLD + " /skills [player]" + EnumChatFormatting.AQUA + " - Uses API to get skill levels of a person. If no name is provided, it checks yours.\n" + diff --git a/me/Danker/commands/DisplayCommand.java b/me/Danker/commands/DisplayCommand.java index 989edaf..916245e 100644 --- a/me/Danker/commands/DisplayCommand.java +++ b/me/Danker/commands/DisplayCommand.java @@ -81,7 +81,7 @@ public class DisplayCommand extends CommandBase { } else { display = "zombie"; } - } else if (arg1[0].equalsIgnoreCase("fishing")) { + } else if (arg1[0].equalsIgnoreCase("fishing")) { if (arg1.length > 1 && arg1[1].equalsIgnoreCase("winter")) { if (showSession) { display = "fishing_winter_session"; diff --git a/me/Danker/commands/ImportFishingCommand.java b/me/Danker/commands/ImportFishingCommand.java index 158b4a1..bbbcb9f 100644 --- a/me/Danker/commands/ImportFishingCommand.java +++ b/me/Danker/commands/ImportFishingCommand.java @@ -37,14 +37,14 @@ public class ImportFishingCommand extends CommandBase { ConfigHandler cf = new ConfigHandler(); EntityPlayer player = (EntityPlayer) arg0; - player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Importing your fishing stats...")); - // Check key String key = cf.getString("api", "APIKey"); if (key.equals("")) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey.")); } + player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Importing your fishing stats...")); + // Get UUID for Hypixel API requests String username = player.getName(); String uuid = player.getUniqueID().toString().replaceAll("[\\-]", ""); @@ -173,6 +173,11 @@ public class ImportFishingCommand extends CommandBase { } lc.seaCreatures += lc.seaEmperors; + lc.fishingMilestone = 0; + if (statsObject.has("pet_milestone_sea_creatures_killed")) { + lc.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt(); + } + lc.frozenSteves = 0; if (statsObject.has("kills_frozen_steve")) { lc.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt(); @@ -215,6 +220,7 @@ public class ImportFishingCommand extends CommandBase { cf.writeIntConfig("fishing", "deepSeaProtector", lc.deepSeaProtectors); cf.writeIntConfig("fishing", "hydra", lc.hydras); cf.writeIntConfig("fishing", "seaEmperor", lc.seaEmperors); + cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone); cf.writeIntConfig("fishing", "frozenSteve", lc.frozenSteves); cf.writeIntConfig("fishing", "snowman", lc.frostyTheSnowmans); cf.writeIntConfig("fishing", "grinch", lc.grinches); diff --git a/me/Danker/commands/LootCommand.java b/me/Danker/commands/LootCommand.java index 9478d8f..c3a0e9b 100644 --- a/me/Danker/commands/LootCommand.java +++ b/me/Danker/commands/LootCommand.java @@ -71,6 +71,7 @@ public class LootCommand extends CommandBase { public static int seaEmperors; public static double empTime; public static int empSCs; + public static int fishingMilestone; // Fishing Winter public static int frozenSteves; public static int frostyTheSnowmans; @@ -136,6 +137,7 @@ public class LootCommand extends CommandBase { public static int seaEmperorsSession = 0; public static double empTimeSession = -1; public static int empSCsSession = -1; + public static int fishingMilestoneSession = 0; // Fishing Winter public static int frozenStevesSession = 0; public static int frostyTheSnowmansSession = 0; diff --git a/me/Danker/commands/ResetLootCommand.java b/me/Danker/commands/ResetLootCommand.java index af58a8d..01e8b11 100644 --- a/me/Danker/commands/ResetLootCommand.java +++ b/me/Danker/commands/ResetLootCommand.java @@ -166,6 +166,7 @@ public class ResetLootCommand extends CommandBase { lc.seaEmperorsSession = 0; lc.empTimeSession = -1; lc.empSCsSession = -1; + lc.fishingMilestoneSession = 0; lc.frozenStevesSession = 0; lc.frostyTheSnowmansSession = 0; lc.grinchesSession = 0; |