diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java index 4ca46c922..10b1e8a6c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java @@ -25,7 +25,7 @@ public class SmeltingCommand extends SkillCommand { private boolean canFuelEfficiency; private boolean canSecondSmelt; private boolean canFluxMine; - private boolean canVanillaXPBoost; + private boolean canUnderstandTheArt; public SmeltingCommand() { super(PrimarySkillType.SMELTING); @@ -58,7 +58,7 @@ public class SmeltingCommand extends SkillCommand { canFuelEfficiency = canUseSubskill(player, SubSkillType.SMELTING_FUEL_EFFICIENCY); canSecondSmelt = canUseSubskill(player, SubSkillType.SMELTING_SECOND_SMELT); canFluxMine = canUseSubskill(player, SubSkillType.SMELTING_FLUX_MINING); - canVanillaXPBoost = Permissions.vanillaXpBoost(player, skill) && RankUtils.hasUnlockedSubskill(player, SubSkillType.SMELTING_UNDERSTANDING_THE_ART); + canUnderstandTheArt = Permissions.vanillaXpBoost(player, skill) && RankUtils.hasUnlockedSubskill(player, SubSkillType.SMELTING_UNDERSTANDING_THE_ART); } @Override @@ -66,19 +66,23 @@ public class SmeltingCommand extends SkillCommand { List messages = new ArrayList(); if (canFluxMine) { - messages.add(LocaleLoader.getString("Smelting.Ability.FluxMining", str_fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_fluxMiningChanceLucky) : "")); + messages.add(getStatMessage(SubSkillType.SMELTING_FLUX_MINING, str_fluxMiningChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_fluxMiningChanceLucky) : "")); + //messages.add(LocaleLoader.getString("Smelting.Ability.FluxMining", str_fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_fluxMiningChanceLucky) : "")); } if (canFuelEfficiency) { - messages.add(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier)); + messages.add(getStatMessage(false, true, SubSkillType.SMELTING_FUEL_EFFICIENCY, burnTimeModifier)); } if (canSecondSmelt) { - messages.add(LocaleLoader.getString("Smelting.Ability.SecondSmelt", str_secondSmeltChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_secondSmeltChanceLucky) : "")); + messages.add(getStatMessage(SubSkillType.SMELTING_SECOND_SMELT, str_fluxMiningChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_secondSmeltChanceLucky) : "")); } - if (canVanillaXPBoost) { - messages.add(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier())); + if (canUnderstandTheArt) { + messages.add(getStatMessage(false, true, SubSkillType.SMELTING_UNDERSTANDING_THE_ART, + String.valueOf(UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier()))); } return messages; diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 50d1f7971..8e4d54df4 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -553,7 +553,7 @@ public class BlockListener implements Listener { player.sendMessage("[mcMMO DEBUG] World Guard main flag is DENIED for this player in this region"); if(WorldGuardManager.getInstance().hasXPFlag(player)) - player.sendMessage("[mcMMO DEBUG] World Guard xp flag is permitted for this in this region"); + player.sendMessage("[mcMMO DEBUG] World Guard xp flag is permitted for this player in this region"); else player.sendMessage("[mcMMO DEBUG] World Guard xp flag is not permitted for this player in this region"); } diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index bc355fcbf..8095d9609 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -982,22 +982,22 @@ MOTD.PerksPrefix=[[GOLD]][mcMMO Perks] MOTD.Version=[[GOLD]][mcMMO] Running version [[DARK_AQUA]]{0} MOTD.Website=[[GOLD]][mcMMO] [[GREEN]]{0}[[YELLOW]] - mcMMO Website #SMELTING -Smelting.Ability.FluxMining=Flux Mining Chance: [[YELLOW]]{0} Smelting.SubSkill.UnderstandingTheArt.Name=Understanding The Art Smelting.SubSkill.UnderstandingTheArt.Description=Maybe you're spending a bit too much time smelting in the caves.\nPowers up various properties of Smelting. -Smelting.Ability.FuelEfficiency=Fuel Efficiency Multiplier: [[YELLOW]]{0}x +Smelting.SubSkill.UnderstandingTheArt.Stat=Vanilla XP Multiplier: [[YELLOW]]{0}x Smelting.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (VANILLA XP BOOST) Smelting.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (FLUX MINING) -Smelting.Ability.SecondSmelt=Second Smelt Chance: [[YELLOW]]{0} -Smelting.Ability.VanillaXPBoost=Vanilla XP Multiplier: [[YELLOW]]{0}x Smelting.SubSkill.FuelEfficiency.Name=Fuel Efficiency Smelting.SubSkill.FuelEfficiency.Description=Increase the burn time of fuel used in furnaces when smelting +Smelting.SubSkill.FuelEfficiency.Stat=Fuel Efficiency Multiplier: [[YELLOW]]{0}x Smelting.SubSkill.SecondSmelt.Name=Second Smelt Smelting.SubSkill.SecondSmelt.Description=Double the resources gained from smelting +Smelting.SubSkill.SecondSmelt.Stat=Second Smelt Chance: Smelting.Effect.4=Vanilla XP Boost Smelting.Effect.5=Increase vanilla XP gained while smelting Smelting.SubSkill.FluxMining.Name=Flux Mining Smelting.SubSkill.FluxMining.Description=Chance for ores to be instantly smelted while mining +Smelting.SubSkill.FluxMining.Stat=Flux Mining Chance Smelting.Listener=Smelting: Smelting.SkillName=SMELTING #COMMAND DESCRIPTIONS