diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command')
11 files changed, 87 insertions, 75 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java index 3ad24b8..9e77381 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java @@ -1,5 +1,7 @@ package net.tylermurphy.hideAndSeek.command; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; + import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; @@ -9,36 +11,35 @@ import org.bukkit.entity.Player; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.util.Util; - -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class Join implements ICommand { public void execute(CommandSender sender, String[] args) { if(!Util.isSetup()) { - sender.sendMessage(errorPrefix + "Game is not setup. Run /hs setup to see what you needed to do"); + sender.sendMessage(errorPrefix + message("GAME_SETUP")); return; } Player player = Bukkit.getServer().getPlayer(sender.getName()); if(player == null) { - sender.sendMessage(errorPrefix + "An internal error has occured"); + sender.sendMessage(errorPrefix + message("COMMAND_ERROR")); return; } if(Main.plugin.board.isPlayer(player)){ - sender.sendMessage(errorPrefix + "You are already in the lobby/game"); + sender.sendMessage(errorPrefix + message("GAME_INGAME")); return; } if(Main.plugin.status.equals("Standby")) { Main.plugin.board.addHider(player); - if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has joined the HideAndSeek lobby"); - else Util.broadcastMessage(messagePrefix + sender.getName() + " has joined the HideAndSeek lobby"); + if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player)); + else Util.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player)); player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); player.setGameMode(GameMode.ADVENTURE); Main.plugin.board.reloadLobbyBoards(); } else { Main.plugin.board.addSeeker(player); - player.sendMessage(messagePrefix + "You have joined mid game and became a spectator"); + player.sendMessage(messagePrefix + message("GAME_JOIN_SPECTATOR")); player.setGameMode(GameMode.SPECTATOR); player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java index 4144da7..73dafbd 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java @@ -1,5 +1,7 @@ package net.tylermurphy.hideAndSeek.command; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; + import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.CommandSender; @@ -7,27 +9,26 @@ import org.bukkit.entity.Player; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.util.Util; - -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class Leave implements ICommand { public void execute(CommandSender sender, String[] args) { if(!Util.isSetup()) { - sender.sendMessage(errorPrefix + "Game is not setup. Run /hs setup to see what you needed to do"); + sender.sendMessage(errorPrefix + message("GAME_SETUP")); return; } Player player = Bukkit.getServer().getPlayer(sender.getName()); if(player == null) { - sender.sendMessage(errorPrefix + "An internal error has occured"); + sender.sendMessage(errorPrefix + message("COMMAND_ERROR")); return; } if(!Main.plugin.board.isPlayer(player)) { - sender.sendMessage(errorPrefix + "You are currently not in the lobby"); + sender.sendMessage(errorPrefix + message("GAME_NOT_INGAME")); return; } - if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby"); - else Util.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby"); + if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player)); + else Util.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player)); Main.plugin.board.removeBoard(player); Main.plugin.board.remove(player); player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java index 55147d6..cf580c9 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java @@ -1,22 +1,26 @@ package net.tylermurphy.hideAndSeek.command; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; + import org.bukkit.command.CommandSender; import net.tylermurphy.hideAndSeek.Main; -import net.tylermurphy.hideAndSeek.Config; +import net.tylermurphy.hideAndSeek.configuration.Config; +import net.tylermurphy.hideAndSeek.configuration.Localization; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class Reload implements ICommand { public void execute(CommandSender sender, String[] args) { if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } Config.loadConfig(); - sender.sendMessage(messagePrefix + "Reloaded the config"); + Localization.init(); + sender.sendMessage(messagePrefix + message("CONFIG_RELOAD")); } public String getLabel() { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SaveMap.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SaveMap.java index f6fe228..a2554d1 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SaveMap.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SaveMap.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.command; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.io.File; import java.io.FileInputStream; @@ -16,6 +16,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.scheduler.BukkitRunnable; import net.tylermurphy.hideAndSeek.Main; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SaveMap implements ICommand { @@ -23,15 +24,15 @@ public class SaveMap implements ICommand { public void execute(CommandSender sender, String[] args) { if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } if(spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) { - sender.sendMessage(errorPrefix + "Please set spawn location first"); + sender.sendMessage(errorPrefix + message("ERROR_GAME_SPAWN")); return; } - sender.sendMessage(messagePrefix + "Starting map save"); - sender.sendMessage(warningPrefix + "All commands will be disabled when the save is in progress. Do not turn off the server."); + sender.sendMessage(messagePrefix + message("MAPSAVE_START")); + sender.sendMessage(warningPrefix + message("MAPSAVE_WARNING")); Bukkit.getServer().getWorld(spawnWorld).save(); BukkitRunnable runnable = new BukkitRunnable() { public void run() { @@ -45,10 +46,10 @@ public class SaveMap implements ICommand { destenation.mkdir(); } temp_destenation.renameTo(destenation); - sender.sendMessage(messagePrefix + "Map save complete"); + sender.sendMessage(messagePrefix + message("MAPSAVE_END")); runningBackup = false; } else { - sender.sendMessage(errorPrefix + "Coudnt find current map"); + sender.sendMessage(errorPrefix + message("MAPSAVE_ERROR")); } } }; diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java index d453871..25e0a87 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.command; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.util.HashMap; import java.util.Map; @@ -11,16 +11,17 @@ import org.bukkit.util.Vector; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.events.Worldborder; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetBorder implements ICommand { public void execute(CommandSender sender, String[] args) { if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } if(spawnPosition == null) { - sender.sendMessage(errorPrefix + "Please set spawn position first"); + sender.sendMessage(errorPrefix + message("ERROR_GAME_SPAWN")); return; } if(args.length < 2) { @@ -29,21 +30,21 @@ public class SetBorder implements ICommand { temp.put("enabled", false); addToSection("worldBorder",temp); saveConfig(); - sender.sendMessage(messagePrefix + "Disabled worldborder."); + sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE")); Worldborder.resetWorldborder(spawnWorld); return; } int num,delay; try { num = Integer.parseInt(args[0]); } catch (Exception e) { - sender.sendMessage(errorPrefix + "Invalid integer: "+args[0]); + sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(args[0])); return; } try { delay = Integer.parseInt(args[1]); } catch (Exception e) { - sender.sendMessage(errorPrefix + "Invalid integer: "+args[1]); + sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(args[1])); return; } if(num < 100) { - sender.sendMessage(errorPrefix + "Worldborder cannot be smaller than 100 blocks."); + sender.sendMessage(errorPrefix + message("WORLDBORDER_MIN_SIZE")); return; } Vector newWorldborderPosition = new Vector(); @@ -52,7 +53,7 @@ public class SetBorder implements ICommand { newWorldborderPosition.setY(0); newWorldborderPosition.setZ(player.getLocation().getBlockZ()); if(spawnPosition.distance(newWorldborderPosition) > 100) { - sender.sendMessage(errorPrefix + "Spawn position must be 100 from worldborder center"); + sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION")); return; } worldborderPosition = newWorldborderPosition; @@ -66,7 +67,7 @@ public class SetBorder implements ICommand { temp.put("size", worldborderSize); temp.put("enabled", true); addToSection("worldBorder",temp); - sender.sendMessage(messagePrefix + "Set border center to current location, size to "+num+", and delay to "+delay); + sender.sendMessage(messagePrefix + message("WORLDBORDER_ENABLE").addAmount(num).addAmount(delay)); saveConfig(); Worldborder.resetWorldborder(spawnWorld); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java index 2808948..e82d0e4 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.command; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.util.HashMap; import java.util.Map; @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import net.tylermurphy.hideAndSeek.Main; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetExitLocation implements ICommand { @@ -20,11 +21,11 @@ public class SetExitLocation implements ICommand { newExitPosition.setY(player.getLocation().getBlockY()); newExitPosition.setZ(player.getLocation().getBlockZ()); if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } exitPosition = newExitPosition; - sender.sendMessage(messagePrefix + "Set exit position to current location"); + sender.sendMessage(messagePrefix + message("EXIT_SPAWN")); Map<String, Object> temp = new HashMap<String,Object>(); temp.put("x", exitPosition.getX()); temp.put("y", exitPosition.getY()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java index 75de0e5..31cad53 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.command; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.util.HashMap; import java.util.Map; @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import net.tylermurphy.hideAndSeek.Main; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetLobbyLocation implements ICommand { @@ -20,11 +21,11 @@ public class SetLobbyLocation implements ICommand { newLobbyPosition.setY(player.getLocation().getBlockY()); newLobbyPosition.setZ(player.getLocation().getBlockZ()); if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } lobbyPosition = newLobbyPosition; - sender.sendMessage(messagePrefix + "Set lobby position to current location"); + sender.sendMessage(messagePrefix + message("LOBBY_SPAWN")); Map<String, Object> temp = new HashMap<String,Object>(); temp.put("x", lobbyPosition.getX()); temp.put("y", lobbyPosition.getY()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java index a940ac3..45ee758 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.command; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.util.HashMap; import java.util.Map; @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import net.tylermurphy.hideAndSeek.Main; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetSpawnLocation implements ICommand { @@ -20,15 +21,15 @@ public class SetSpawnLocation implements ICommand { newSpawnPosition.setY(player.getLocation().getBlockY()); newSpawnPosition.setZ(player.getLocation().getBlockZ()); if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } if(worldborderEnabled && spawnPosition.distance(worldborderPosition) > 100) { - sender.sendMessage(errorPrefix + "Spawn position must be 100 from worldborder center"); + sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION")); return; } spawnPosition = newSpawnPosition; - sender.sendMessage(messagePrefix + "Set spawn position to current location"); + sender.sendMessage(messagePrefix + message("GAME_SPAWN")); Map<String, Object> temp = new HashMap<String,Object>(); temp.put("x", spawnPosition.getX()); temp.put("y", spawnPosition.getY()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Setup.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Setup.java index 1580f3f..8be0141 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Setup.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Setup.java @@ -2,42 +2,41 @@ package net.tylermurphy.hideAndSeek.command; import org.bukkit.command.CommandSender; -import net.md_5.bungee.api.ChatColor; import net.tylermurphy.hideAndSeek.Main; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.io.File; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class Setup implements ICommand { public void execute(CommandSender sender, String[] args) { - String message = String.format("%s%sThe following is needed for setup...", ChatColor.WHITE, ChatColor.BOLD); + String msg = message("SETUP").toString(); int count = 0; if(spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) { - message = String.format("%s\n%s%s-%s%s", message, ChatColor.RED, ChatColor.BOLD, ChatColor.WHITE, "Game spawn isnt set, /hs setspawn"); + msg = msg + "\n" + message("SETUP_GAME").toString(); count++; } if(lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0) { - message = String.format("%s\n%s%s-%s%s", message, ChatColor.RED, ChatColor.BOLD, ChatColor.WHITE, "Lobby spawn isnt set, /hs setlobby"); - sender.sendMessage(errorPrefix + "Please set lobby location first"); + msg = msg + "\n" + message("SETUP_LOBBY").toString(); count++; } if(exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0) { - message = String.format("%s\n%s%s-%s%s", message, ChatColor.RED, ChatColor.BOLD, ChatColor.WHITE, "Quit/exit teleport location isnt set, /hs setexit"); + msg = msg + "\n" + message("SETUP_EXIT").toString(); count++; } File destenation = new File(Main.root+File.separator+"hideandseek_"+spawnWorld); if(!destenation.exists()) { - message = String.format("%s\n%s%s-%s%s", message, ChatColor.RED, ChatColor.BOLD, ChatColor.WHITE, "Hide and seek map isnt saved, /hs savemap (after /hs setspawn)"); + msg = msg + "\n" + message("SETUP_MAPSAVE").toString(); count++; } if(count < 1) { - sender.sendMessage(messagePrefix + "Everything is setup and ready to go!"); + sender.sendMessage(messagePrefix + message("SETUP_COMPLETE")); } else { - sender.sendMessage(message); + sender.sendMessage(msg); } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java index 9d75401..89cbc09 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java @@ -1,4 +1,5 @@ package net.tylermurphy.hideAndSeek.command; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -22,7 +23,7 @@ import net.tylermurphy.hideAndSeek.events.Taunt; import net.tylermurphy.hideAndSeek.events.Worldborder; import net.tylermurphy.hideAndSeek.util.Util; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import java.util.ArrayList; import java.util.List; @@ -32,19 +33,19 @@ public class Start implements ICommand { public void execute(CommandSender sender, String[] args) { if(!Util.isSetup()) { - sender.sendMessage(errorPrefix + "Game is not setup. Run /hs setup to see what you needed to do"); + sender.sendMessage(errorPrefix + message("GAME_SETUP")); return; } if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is already in session"); + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; } if(!Main.plugin.board.isPlayer(sender)) { - sender.sendMessage(errorPrefix + "You are not in the lobby"); + sender.sendMessage(errorPrefix + message("GAME_NOT_INGAME")); return; } if(Main.plugin.board.size() < minPlayers) { - sender.sendMessage(errorPrefix + "You must have at least "+minPlayers+" players to start"); + sender.sendMessage(errorPrefix + message("START_MIN_PLAYERS").addAmount(minPlayers)); return; } if(Bukkit.getServer().getWorld("hideandseek_"+spawnWorld) != null) { @@ -60,7 +61,7 @@ public class Start implements ICommand { } Player seeker = Main.plugin.board.getPlayer(seekerName); if(seeker == null) { - sender.sendMessage(errorPrefix + "Invalid player: " + seekerName); + sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(seekerName)); return; } Main.plugin.board.reload(); @@ -82,27 +83,27 @@ public class Start implements ICommand { for(Player player : Main.plugin.board.getSeekers()) { player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS,1000000,127,false,false)); player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW,1000000,127,false,false)); - player.sendTitle(ChatColor.RED + "" + ChatColor.BOLD + "SEEKER", ChatColor.WHITE + "Eliminate all hiders", 10, 70, 20); + player.sendTitle(ChatColor.RED + "" + ChatColor.BOLD + "SEEKER", ChatColor.WHITE + message("SEEKERS_SUBTITLE").toString(), 10, 70, 20); } for(Player player : Main.plugin.board.getHiders()) { player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,1000000,5,false,false)); - player.sendTitle(ChatColor.GOLD + "" + ChatColor.BOLD + "HIDER", ChatColor.WHITE + "Hide away from the seekers", 10, 70, 20); + player.sendTitle(ChatColor.GOLD + "" + ChatColor.BOLD + "HIDER", ChatColor.WHITE + message("HIDERS_SUBTITLE").toString(), 10, 70, 20); } Worldborder.resetWorldborder("hideandseek_"+spawnWorld); Main.plugin.board.reloadGameBoards(); Main.plugin.status = "Starting"; int temp = Main.plugin.gameId; - Util.broadcastMessage(messagePrefix + "Hiders have 30 seconds to hide!"); - Util.sendDelayedMessage(messagePrefix + "Hiders have 20 seconds to hide!", Main.plugin.gameId, 20 * 10); - Util.sendDelayedMessage(messagePrefix + "Hiders have 10 seconds to hide!", Main.plugin.gameId, 20 * 20); - Util.sendDelayedMessage(messagePrefix + "Hiders have 5 seconds to hide!", Main.plugin.gameId, 20 * 25); - Util.sendDelayedMessage(messagePrefix + "Hiders have 3 seconds to hide!", Main.plugin.gameId, 20 * 27); - Util.sendDelayedMessage(messagePrefix + "Hiders have 2 seconds to hide!", Main.plugin.gameId, 20 * 28); - Util.sendDelayedMessage(messagePrefix + "Hiders have 1 seconds to hide!", Main.plugin.gameId, 20 * 29); + Util.broadcastMessage(messagePrefix + message("START_COUNTDOWN").addAmount(30)); + Util.sendDelayedMessage(messagePrefix + message("START_COUNTDOWN").addAmount(20), Main.plugin.gameId, 20 * 10); + Util.sendDelayedMessage(messagePrefix + message("START_COUNTDOWN").addAmount(10), Main.plugin.gameId, 20 * 20); + Util.sendDelayedMessage(messagePrefix + message("START_COUNTDOWN").addAmount(5), Main.plugin.gameId, 20 * 25); + Util.sendDelayedMessage(messagePrefix + message("START_COUNTDOWN").addAmount(3), Main.plugin.gameId, 20 * 27); + Util.sendDelayedMessage(messagePrefix + message("START_COUNTDOWN").addAmount(2), Main.plugin.gameId, 20 * 28); + Util.sendDelayedMessage(messagePrefix + message("START_COUNTDOWN").addAmount(1), Main.plugin.gameId, 20 * 29); Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() { public void run() { if(temp != Main.plugin.gameId) return; - Util.broadcastMessage(messagePrefix + "Attetion SEEKERS, its time to find the hiders!"); + Util.broadcastMessage(messagePrefix + message("START")); Main.plugin.status = "Playing"; for(Player player : Main.plugin.board.getPlayers()) { resetPlayer(player); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java index e2cb563..810c071 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.command; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -14,6 +14,7 @@ import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.events.Worldborder; import net.tylermurphy.hideAndSeek.util.Packet; import net.tylermurphy.hideAndSeek.util.Util; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class Stop implements ICommand { @@ -23,12 +24,12 @@ public class Stop implements ICommand { return; } if(Main.plugin.status.equals("Starting") || Main.plugin.status.equals("Playing")) { - if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + "Game has been force stopped."); - else Util.broadcastMessage(abortPrefix + "Game has been force stopped."); + if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + message("STOP")); + else Util.broadcastMessage(abortPrefix + message("STOP")); onStop(); } else { - sender.sendMessage(errorPrefix + "There is no game in progress"); + sender.sendMessage(errorPrefix + message("GAME_NOT_INPROGRESS")); return; } } |