From c6ef053aac7cc8fa86f2ee691dbced271e457352 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 08:36:24 -0500 Subject: [PATCH] Fixed a couple of our locale strings getting screwed up due to refactoring. --- .../nossr50/skills/mining/RemoteDetonationEventHandler.java | 2 +- src/main/java/com/gmail/nossr50/skills/repair/Repair.java | 2 +- .../java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java | 4 ++-- src/main/java/com/gmail/nossr50/util/ChimaeraWing.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java b/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java index d41dc9e61..a994ebb3f 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java @@ -44,7 +44,7 @@ public class RemoteDetonationEventHandler { protected boolean cooldownOver() { if (!SkillTools.cooldownOver(profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR, AbilityType.BLAST_MINING.getCooldown(), player)) { - player.sendMessage(LocaleLoader.getString("SkillTools.TooTired", new Object[] { SkillTools.calculateTimeLeft(profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR, AbilityType.BLAST_MINING.getCooldown(), player) })); + player.sendMessage(LocaleLoader.getString("Skills.TooTired", new Object[] { SkillTools.calculateTimeLeft(profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR, AbilityType.BLAST_MINING.getCooldown(), player) })); return false; } diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index df57094eb..05d3b8363 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -246,7 +246,7 @@ public class Repair { int activationChance = Misc.calculateActivationChance(Permissions.luckyRepair(player)); if (chance > Misc.getRandom().nextInt(activationChance) && Permissions.repairBonus(player)) { - player.sendMessage(LocaleLoader.getString("Repair.SkillTools.FeltEasy")); + player.sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy")); return true; } return false; diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java index 101a2f4ca..af43f17a8 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java @@ -43,13 +43,13 @@ public final class TreeFeller { if (treeFellerReachedThreshold) { treeFellerReachedThreshold = false; - player.sendMessage(LocaleLoader.getString("Woodcutting.SkillTools.TreeFellerThreshold")); + player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFellerThreshold")); return; } // If the tool can't sustain the durability loss if (!handleDurabilityLoss(treeFellerBlocks, player)) { - player.sendMessage(LocaleLoader.getString("Woodcutting.SkillTools.TreeFeller.Splinter")); + player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFeller.Splinter")); int health = player.getHealth(); diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java index c377467e4..24f099414 100644 --- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java +++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java @@ -55,7 +55,7 @@ public final class ChimaeraWing { player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", new Object[] {SkillTools.calculateTimeLeft(recentlyHurt, 60, player)})); } else if (amount <= Config.getInstance().getChimaeraCost()) { - player.sendMessage(LocaleLoader.getString("SkillTools.NeedMore", new Object[] { Misc.prettyItemString(Config.getInstance().getChimaeraItemId()) })); + player.sendMessage(LocaleLoader.getString("Skills.NeedMore", new Object[] { Misc.prettyItemString(Config.getInstance().getChimaeraItemId()) })); } } }