EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Change getString to use varargs

Browse Source
This commit is contained in:
NuclearW
2013-02-02 02:55:49 -05:00
parent c43e8f8f19
commit ebca9fc2da
53 changed files with 332 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/spout/SpoutListener.java
View File

@ -34,7 +34,7 @@ public class SpoutListener implements Listener {
//TODO: Add custom titles based on skills
if (SpoutTools.showPowerLevel) {
spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", new Object[] {spoutPlayer.getName(), mcMMOPlayer.getPowerLevel()}));
spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", spoutPlayer.getName(), mcMMOPlayer.getPowerLevel()));
}
profile.setSpoutHud(new SpoutHud(mcMMOPlayer)); //Setup Party HUD stuff

2
src/main/java/com/gmail/nossr50/spout/SpoutTools.java
View File

@ -552,7 +552,7 @@ public class SpoutTools {
break;
}
spoutPlayer.sendNotification(LocaleLoader.getString("Spout.LevelUp.1"), LocaleLoader.getString("Spout.LevelUp.2", new Object[] {SkillTools.localizeSkillName(skillType), profile.getSkillLevel(skillType)} ), mat);
spoutPlayer.sendNotification(LocaleLoader.getString("Spout.LevelUp.1"), LocaleLoader.getString("Spout.LevelUp.2", SkillTools.localizeSkillName(skillType), profile.getSkillLevel(skillType)), mat);
SpoutSounds.playLevelUpNoise(spoutPlayer, plugin);
}

2
src/main/java/com/gmail/nossr50/spout/commands/MchudCommand.java
View File

@ -17,7 +17,7 @@ import com.gmail.nossr50.util.Users;
public class MchudCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mchud", "<DISABLED | STANDARD | SMALL | RETRO>"});
String usage = LocaleLoader.getString("Commands.Usage.1", "mchud", "<DISABLED | STANDARD | SMALL | RETRO>");
String invalid = LocaleLoader.getString("Commands.mchud.Invalid");
if (CommandHelper.noConsoleUsage(sender)) {

6
src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java
View File

@ -20,7 +20,7 @@ import com.gmail.nossr50.util.Users;
public class XplockCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"xplock", "[skill]"});
String usage = LocaleLoader.getString("Commands.Usage.1", "xplock", "[skill]");
if (CommandHelper.noConsoleUsage(sender)) {
return true;
@ -53,7 +53,7 @@ public class XplockCommand implements CommandExecutor {
if (lastGained != null) {
spoutHud.toggleXpBarLocked();
spoutHud.setSkillLock(lastGained);
player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", Misc.getCapitalized(lastGained.toString())));
}
else {
player.sendMessage(usage);
@ -68,7 +68,7 @@ public class XplockCommand implements CommandExecutor {
spoutHud.setSkillLock(SkillTools.getSkillType(args[0]));
spoutHud.updateXpBar();
player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(args[0]) }));
player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", Misc.getCapitalized(args[0])));
}
else {
player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));

2
src/main/java/com/gmail/nossr50/spout/popups/Menu.java
View File

@ -35,7 +35,7 @@ public class Menu extends GenericPopup {
escapeLabel.setX(titleLabel.getX() - 15);
escapeLabel.setY(titleLabel.getY() + 10);
hudButton = new McmmoButton(LocaleLoader.getString("Spout.Menu.HudButton.1", new Object[] {playerProfile.getHudType().toString()}), LocaleLoader.getString("Spout.Menu.HudButton.2"));
hudButton = new McmmoButton(LocaleLoader.getString("Spout.Menu.HudButton.1", playerProfile.getHudType().toString()), LocaleLoader.getString("Spout.Menu.HudButton.2"));
hudButton.setWidth(120);
hudButton.setHeight(20);
hudButton.setX(centerX - (hudButton.getWidth() / 2));