diff --git a/src/main/java/com/gmail/nossr50/locale/mcLocale.java b/src/main/java/com/gmail/nossr50/locale/mcLocale.java index 79bd5ae48..8c89e28e8 100644 --- a/src/main/java/com/gmail/nossr50/locale/mcLocale.java +++ b/src/main/java/com/gmail/nossr50/locale/mcLocale.java @@ -4,7 +4,6 @@ import java.text.MessageFormat; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import java.util.logging.Logger; import org.bukkit.ChatColor; @@ -30,13 +29,16 @@ public class mcLocale { if (RESOURCE_BUNDLE == null) { Locale.setDefault(new Locale("en", "US")); String[] myLocale = LoadProperties.locale.split("[-_ ]"); - + Locale locale = null; - if (myLocale.length == 1) - locale = new Locale(myLocale[0]); - else if (myLocale.length >= 2) - locale = new Locale(myLocale[0], myLocale[1]); - + + if (myLocale.length == 1) { + locale = new Locale(myLocale[0]); + } + else if (myLocale.length >= 2) { + locale = new Locale(myLocale[0], myLocale[1]); + } + RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME, locale); } diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 6bc5b7267..1637d08c5 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -116,16 +116,6 @@ Fishing.SkillName=FISHING Fishing.Skillup=[[YELLOW]]Fishing skill increased by {0}. Total ({1}) #HERBALISM -Herbalism.Ability.0=Green Terra (ABILITY) -Herbalism.Ability.1=Spread the Terra, 3x Drops -Herbalism.Ability.2=Green Thumb (Wheat) -Herbalism.Ability.3=Auto-Plants wheat when harvesting -Herbalism.Ability.4=Green Thumb (Cobble/Stone Brick) -Herbalism.Ability.5=Cobblestone/Stone Brick -> Mossy w/ Seeds -Herbalism.Ability.6=Farmer's Diet -Herbalism.Ability.7=Improves hunger restored from farmed foods -Herbalism.Ability.8=Double Drops (All Herbs) -Herbalism.Ability.9=Double the normal loot Herbalism.Ability.DoubleDropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}% Herbalism.Ability.FD=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} Herbalism.Ability.GTe.Length=[[RED]]Green Terra Length: [[YELLOW]]{0}s @@ -135,6 +125,16 @@ Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Wheat grows in Herbalism.Ability.GTh=[[GREEN]]**GREEN THUMB** Herbalism.Ability.Lower=[[GRAY]]**YOU LOWER YOUR HOE** Herbalism.Ability.Ready=[[GREEN]]**YOU READY YOUR HOE** +Herbalism.Effect.0=Green Terra (ABILITY) +Herbalism.Effect.1=Spread the Terra, 3x Drops +Herbalism.Effect.2=Green Thumb (Wheat) +Herbalism.Effect.3=Auto-Plants wheat when harvesting +Herbalism.Effect.4=Green Thumb (Cobble/Stone Brick) +Herbalism.Effect.5=Cobblestone/Stone Brick -> Mossy w/ Seeds +Herbalism.Effect.6=Farmer's Diet +Herbalism.Effect.7=Improves hunger restored from farmed foods +Herbalism.Effect.8=Double Drops (All Herbs) +Herbalism.Effect.9=Double the normal loot Herbalism.Listener=Herbalism: Herbalism.SkillName=HERBALISM Herbalism.Skills.GTe.Off=[[RED]]**Green Terra has worn off** @@ -145,16 +145,16 @@ Herbalism.Skills.GTe.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Green T Herbalism.Skillup=[[YELLOW]]Herbalism skill increased by {0}. Total ({1}) #MINING -Mining.Ability.0=Super Breaker (ABILITY) -Mining.Ability.1=Speed+, Triple Drop Chance -Mining.Ability.2=Double Drops -Mining.Ability.3=Double the normal loot -Mining.Ability.4=Blast Mining -Mining.Ability.5=Bonuses to mining with TNT -Mining.Ability.6=Bigger Bombs -Mining.Ability.7=Increases TNT explosion radius -Mining.Ability.8=Demolitions Expertise -Mining.Ability.9=Decreases damage from TNT explosions +Mining.Effect.0=Super Breaker (ABILITY) +Mining.Effect.1=Speed+, Triple Drop Chance +Mining.Effect.2=Double Drops +Mining.Effect.3=Double the normal loot +Mining.Effect.4=Blast Mining +Mining.Effect.5=Bonuses to mining with TNT +Mining.Effect.6=Bigger Bombs +Mining.Effect.7=Increases TNT explosion radius +Mining.Effect.8=Demolitions Expertise +Mining.Effect.9=Decreases damage from TNT explosions Mining.Ability.Length=[[RED]]Super Breaker Length: [[YELLOW]]{0}s Mining.Ability.Locked.0=LOCKED UNTIL 125+ SKILL (BLAST MINING) Mining.Ability.Locked.1=LOCKED UNTIL 250+ SKILL (BIGGER BOMBS)