Fixing styling on Fishing

Changelog.txt

@@ -37,6 +37,7 @@ Version 2.1.0
  + (Skills) Tool alerts now are sent to the Action Bar
  + (Skills) Super Ability activation alerts are now sent to the Action Bar
  + (Skills) Certain Skill messages are now sent to the Action Bar
+ + (Skills) Added some missing information to skill stats
  + (Config) Skill Rank requirements are now defined in skillranks.yml you cannot add or remove ranks from this file
  + (Config) Added option to use SSL for MySQL in config.yml
  + (Config) Added option to disable the new URL links to config.yml

src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

@@ -155,28 +155,37 @@ public class FishingCommand extends SkillCommand {
         List<String> messages = new ArrayList<String>();
 
         if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.Rank", lootTier, RankUtils.getHighestRank(SubSkillType.FISHING_TREASURE_HUNTER)));
-            messages.add(LocaleLoader.getString("Fishing.Ability.TH.DropRate", trapTreasure, commonTreasure, uncommonTreasure, rareTreasure, epicTreasure, legendaryTreasure, recordTreasure));
+            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,
+                    String.valueOf(trapTreasure),
+                    String.valueOf(commonTreasure),
+                    String.valueOf(uncommonTreasure),
+                    String.valueOf(rareTreasure),
+                    String.valueOf(epicTreasure),
+                    String.valueOf(legendaryTreasure),
+                    String.valueOf(recordTreasure)));
         }
 
         if (canMagicHunt) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.TH.MagicRate", magicChance));
+            messages.add(getStatMessage(SubSkillType.FISHING_MAGIC_HUNTER, magicChance));
         }
 
         if (canIceFish) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.IceFishing"));
+            messages.add(getStatMessage(SubSkillType.FISHING_ICE_FISHING, SubSkillType.FISHING_ICE_FISHING.getLocaleStatDescription()));
         }
 
         if (canMasterAngler) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
+            //TODO: Update this with more details
+            messages.add(getStatMessage(SubSkillType.FISHING_MASTER_ANGLER, biteChance));
         }
 
         if (canShake) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+            messages.add(getStatMessage(SubSkillType.FISHING_SHAKE, shakeChance)
+            + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
         }
 
         if (canFishermansDiet) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
+            messages.add(getStatMessage(false, true, SubSkillType.FISHING_FISHERMANS_DIET, String.valueOf(fishermansDietRank)));
         }
 
         return messages;

src/main/resources/locale/locale_en_US.properties

@@ -146,8 +146,8 @@ Alchemy.SubSkill.Catalysis.Description=Increases potion brewing speed
 Alchemy.SubSkill.Catalysis.Stat=Brewing Speed
 Alchemy.SubSkill.Concoctions.Name=Concoctions
 Alchemy.SubSkill.Concoctions.Description=Brew potions with more ingredients
-Alchemy.SubSkill.Concoctions.Stat=Concoctions Rank: [[YELLOW]]{0}/{1}
-Alchemy.SubSkill.Concoctions.Stat.Extra=Ingredients [[[YELLOW]]{0}[[DARK_AQUA]]]: [[YELLOW]]{1}
+Alchemy.SubSkill.Concoctions.Stat=Concoctions Rank: [[GREEN]]{0}[[DARK_AQUA]]/[[GREEN]]{1}
+Alchemy.SubSkill.Concoctions.Stat.Extra=Ingredients [[[GREEN]]{0}[[DARK_AQUA]]]: [[GREEN]]{1}
 Alchemy.Listener=Alchemy:
 Alchemy.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (CATALYSIS)
 Alchemy.SkillName=ALCHEMY
@@ -215,29 +215,29 @@ Excavation.Skills.GigaDrillBreaker.Refresh=[[GREEN]]Your [[YELLOW]]Giga Drill Br
 Excavation.Skills.GigaDrillBreaker.Other.Off=Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Excavation.Skills.GigaDrillBreaker.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Giga Drill Breaker!
 #FISHING
-Fishing.Ability.Chance=Bite Chance: [[YELLOW]]{0}
 Fishing.Ability.Info=Magic Hunter: [[GRAY]] **Improves With Treasure Hunter Rank**
 Fishing.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (SHAKE)
 Fishing.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (ICE FISHING)
 Fishing.Ability.Locked.2=LOCKED UNTIL {0}+ SKILL (MASTER ANGLER)
-Fishing.Ability.Rank=Treasure Hunter Rank: [[YELLOW]]{0}/{1}
-Fishing.Ability.TH.DropRate= Drop Rate: [[DARK_RED]]Trap: [[YELLOW]]{0} [[GRAY]]Common: [[YELLOW]]{1} [[GREEN]]Uncommon: [[YELLOW]]{2}\n[[BLUE]]Rare: [[YELLOW]]{3} [[LIGHT_PURPLE]]Epic: [[YELLOW]]{4} [[GOLD]]Legendary: [[YELLOW]]{5} [[AQUA]]Record: [[YELLOW]]{6}
-Fishing.Ability.TH.MagicRate=Magic Hunter Chance: [[YELLOW]]{0}
-Fishing.Ability.Shake=Shake Chance: [[YELLOW]]{0}
-Fishing.Ability.IceFishing=Ice Fishing: Go fishing in ice
-Fishing.Ability.FD=Fisherman''s Diet: [[YELLOW]]Rank {0}
 Fishing.SubSkill.TreasureHunter.Name=Treasure Hunter
 Fishing.SubSkill.TreasureHunter.Description=Fish up misc. objects
+Fishing.SubSkill.TreasureHunter.Stat=Treasure Hunter Rank: [[GREEN]]{0}[[DARK_AQUA]]/[[GREEN]]{1}
+Fishing.SubSkill.TreasureHunter.Stat.Extra=Drop Rate: [[DARK_RED]]Trap: [[YELLOW]]{0} [[GRAY]]Common: [[YELLOW]]{1} [[GREEN]]Uncommon: [[YELLOW]]{2}\n[[BLUE]]Rare: [[YELLOW]]{3} [[LIGHT_PURPLE]]Epic: [[YELLOW]]{4} [[GOLD]]Legendary: [[YELLOW]]{5} [[AQUA]]Record: [[YELLOW]]{6}
 Fishing.SubSkill.MagicHunter.Name=Magic Hunter
 Fishing.SubSkill.MagicHunter.Description=Find Enchanted Items
+Fishing.SubSkill.MagicHunter.Stat=Magic Hunter Chance
 Fishing.SubSkill.Shake.Name=Shake
-Fishing.SubSkill.Shake.Description=Shake items off of mobs w/ fishing pole
+Fishing.SubSkill.Shake.Description=Shake items off of mobs or players w/ fishing pole
+Fishing.SubSkill.Shake.Stat=Shake Chance
 Fishing.SubSkill.FishermansDiet.Name=Fisherman's Diet
 Fishing.SubSkill.FishermansDiet.Description=Improves hunger restored from fished foods
+Fishing.SubSkill.FishermansDiet.Stat=Fisherman's Diet:[[GREEN]] Rank {0}
 Fishing.SubSkill.MasterAngler.Name=Master Angler
 Fishing.SubSkill.MasterAngler.Description=Improves chance of getting a bite while fishing
+Fishing.SubSkill.MasterAngler.Stat=Bite Chance at your current location
 Fishing.SubSkill.IceFishing.Name=Ice Fishing
 Fishing.SubSkill.IceFishing.Description=Allows you to fish in icy biomes
+Fishing.SubSkill.IceFishing.Stat=Ice Fishing
 Fishing.Chance.Raining=[[BLUE]] Rain Bonus
 Fishing.Listener=Fishing:
 Fishing.Ability.TH.MagicFound=[[GRAY]]You feel a touch of magic with this catch...