EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 16:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Fixing the styling on /smelting

Browse Source
This commit is contained in:
nossr50 2019-01-28 00:56:15 -08:00
parent ddf953b3b7
commit 67ed9d324e
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
View File

@ -25,7 +25,7 @@ public class SmeltingCommand extends SkillCommand {
private boolean canFuelEfficiency; private boolean canFuelEfficiency;
private boolean canSecondSmelt; private boolean canSecondSmelt;
private boolean canFluxMine; private boolean canFluxMine;
private boolean canVanillaXPBoost; private boolean canUnderstandTheArt;
public SmeltingCommand() { public SmeltingCommand() {
super(PrimarySkillType.SMELTING); super(PrimarySkillType.SMELTING);
@ -58,7 +58,7 @@ public class SmeltingCommand extends SkillCommand {
canFuelEfficiency = canUseSubskill(player, SubSkillType.SMELTING_FUEL_EFFICIENCY); canFuelEfficiency = canUseSubskill(player, SubSkillType.SMELTING_FUEL_EFFICIENCY);
canSecondSmelt = canUseSubskill(player, SubSkillType.SMELTING_SECOND_SMELT); canSecondSmelt = canUseSubskill(player, SubSkillType.SMELTING_SECOND_SMELT);
canFluxMine = canUseSubskill(player, SubSkillType.SMELTING_FLUX_MINING); 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 @Override
@ -66,19 +66,23 @@ public class SmeltingCommand extends SkillCommand {
List<String> messages = new ArrayList<String>(); List<String> messages = new ArrayList<String>();
if (canFluxMine) { 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) { if (canFuelEfficiency) {
messages.add(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier)); messages.add(getStatMessage(false, true, SubSkillType.SMELTING_FUEL_EFFICIENCY, burnTimeModifier));
} }
if (canSecondSmelt) { 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) { if (canUnderstandTheArt) {
messages.add(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier())); messages.add(getStatMessage(false, true, SubSkillType.SMELTING_UNDERSTANDING_THE_ART,
String.valueOf(UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier())));
} }
return messages; return messages;

2
src/main/java/com/gmail/nossr50/listeners/BlockListener.java
View File

@ -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"); player.sendMessage("[mcMMO DEBUG] World Guard main flag is DENIED for this player in this region");
if(WorldGuardManager.getInstance().hasXPFlag(player)) 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 else
player.sendMessage("[mcMMO DEBUG] World Guard xp flag is not permitted for this player in this region"); player.sendMessage("[mcMMO DEBUG] World Guard xp flag is not permitted for this player in this region");
} }

8
src/main/resources/locale/locale_en_US.properties
View File

@ -982,22 +982,22 @@ MOTD.PerksPrefix=[[GOLD]][mcMMO Perks]
MOTD.Version=[[GOLD]][mcMMO] Running version [[DARK_AQUA]]{0} MOTD.Version=[[GOLD]][mcMMO] Running version [[DARK_AQUA]]{0}
MOTD.Website=[[GOLD]][mcMMO] [[GREEN]]{0}[[YELLOW]] - mcMMO Website MOTD.Website=[[GOLD]][mcMMO] [[GREEN]]{0}[[YELLOW]] - mcMMO Website
#SMELTING #SMELTING
Smelting.Ability.FluxMining=Flux Mining Chance: [[YELLOW]]{0}
Smelting.SubSkill.UnderstandingTheArt.Name=Understanding The Art 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.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.0=LOCKED UNTIL {0}+ SKILL (VANILLA XP BOOST)
Smelting.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (FLUX MINING) 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.Name=Fuel Efficiency
Smelting.SubSkill.FuelEfficiency.Description=Increase the burn time of fuel used in furnaces when smelting 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.Name=Second Smelt
Smelting.SubSkill.SecondSmelt.Description=Double the resources gained from smelting 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.4=Vanilla XP Boost
Smelting.Effect.5=Increase vanilla XP gained while smelting Smelting.Effect.5=Increase vanilla XP gained while smelting
Smelting.SubSkill.FluxMining.Name=Flux Mining Smelting.SubSkill.FluxMining.Name=Flux Mining
Smelting.SubSkill.FluxMining.Description=Chance for ores to be instantly smelted while 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.Listener=Smelting:
Smelting.SkillName=SMELTING Smelting.SkillName=SMELTING
#COMMAND DESCRIPTIONS #COMMAND DESCRIPTIONS