From 0cd23c1b65f0b6dfed0bc4dec6a73b322ec593dd Mon Sep 17 00:00:00 2001 From: Oaksworth <46974852+Oaksworth@users.noreply.github.com> Date: Wed, 23 Jan 2019 19:11:15 -0200 Subject: [PATCH] Update Fishing to alphabetical order --- .../commands/skills/FishingCommand.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index cf0a86ee9..745a716a6 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -122,7 +122,29 @@ public class FishingCommand extends SkillCommand { @Override protected List statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList(); + + if (canFishermansDiet) { + messages.add(getStatMessage(false, true, SubSkillType.FISHING_FISHERMANS_DIET, String.valueOf(fishermansDietRank))); + } + + if (canIceFish) { + messages.add(getStatMessage(SubSkillType.FISHING_ICE_FISHING, SubSkillType.FISHING_ICE_FISHING.getLocaleStatDescription())); + } + + if (canMagicHunt) { + messages.add(getStatMessage(SubSkillType.FISHING_MAGIC_HUNTER, magicChance)); + } + if (canMasterAngler) { + //TODO: Update this with more details + messages.add(getStatMessage(SubSkillType.FISHING_MASTER_ANGLER, biteChance)); + } + + if (canShake) { + messages.add(getStatMessage(SubSkillType.FISHING_SHAKE, shakeChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : "")); + } + if (canTreasureHunt) { messages.add(getStatMessage(false, true, SubSkillType.FISHING_TREASURE_HUNTER, String.valueOf(lootTier), String.valueOf(RankUtils.getHighestRank(SubSkillType.FISHING_TREASURE_HUNTER)))); messages.add(getStatMessage(true, true, SubSkillType.FISHING_TREASURE_HUNTER, @@ -135,28 +157,6 @@ public class FishingCommand extends SkillCommand { String.valueOf(recordTreasure))); } - if (canMagicHunt) { - messages.add(getStatMessage(SubSkillType.FISHING_MAGIC_HUNTER, magicChance)); - } - - if (canIceFish) { - messages.add(getStatMessage(SubSkillType.FISHING_ICE_FISHING, SubSkillType.FISHING_ICE_FISHING.getLocaleStatDescription())); - } - - if (canMasterAngler) { - //TODO: Update this with more details - messages.add(getStatMessage(SubSkillType.FISHING_MASTER_ANGLER, biteChance)); - } - - if (canShake) { - messages.add(getStatMessage(SubSkillType.FISHING_SHAKE, shakeChance) - + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : "")); - } - - if (canFishermansDiet) { - messages.add(getStatMessage(false, true, SubSkillType.FISHING_FISHERMANS_DIET, String.valueOf(fishermansDietRank))); - } - return messages; }