Rework message path, Reworking join/leave msg

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommands.java

@@ -132,7 +132,7 @@ public class MWCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 1) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -189,7 +189,7 @@ public class MWCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 1) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -223,7 +223,7 @@ public class MWCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 1) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -256,7 +256,7 @@ public class MWCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 0) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -275,7 +275,7 @@ public class MWCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 0) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -297,7 +297,7 @@ public class MWCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 0) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/UserCommands.java

@@ -50,7 +50,7 @@ public class UserCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 0) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -93,9 +93,14 @@ public class UserCommands extends BaseCommand {
 
         if (!MWCommands.senderIsPlayer(sender)) return;
         Player player = (Player) sender;
+        
+        if (args.length < 1) {
+            player.sendMessage(Messages.getPrefix() + "§cNumber needed.");
+            return;
+        }
 
-        if (args.length > 0) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+        if (args.length > 1) {
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 
@@ -104,7 +109,7 @@ public class UserCommands extends BaseCommand {
             player.sendMessage(Messages.getMessage("game.not_in_game_area"));
             return;
         }
-
+        
         if (game.getState() != GameState.LOBBY) {
             player.sendMessage(Messages.getPrefix() + "§cThe game is not in the right state to change your team right now");
             return;
@@ -140,7 +145,7 @@ public class UserCommands extends BaseCommand {
         Player player = (Player) sender;
 
         if (args.length > 0) {
-            player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
+            player.sendMessage(Messages.getMessage("command.to_many_arguments"));
             return;
         }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Messages.java

@@ -57,14 +57,16 @@ public class Messages {
 
     private static void addDefaults() {
 
-        cfg.addDefault("prefix", "&6•&e● MissileWars &8▎  &7");
+        cfg.addDefault("prefix", "&6•&e● MissileWars &8▎ &7");
 
         cfg.addDefault("server.restart_after_game", "&7The server will restart after this game.");
 
-        cfg.addDefault("invalid_missile", "&cThe mentioned missile was not found.");
-        
+        cfg.addDefault("command.to_many_arguments", "§cToo many arguments.");
+        cfg.addDefault("command.invalid_missile", "&cThe mentioned missile was not found.");
+
+        cfg.addDefault("game.player_joined", "&e%player% &7joined the game (%team%&7).");
+        cfg.addDefault("game.player_left", "&e%player% &7left the game (%team%&7).");
         cfg.addDefault("game.not_in_game_area", "&cYou are not in an arena right now.");
-        cfg.addDefault("game.player_left", "%player% &7left the game.");
         cfg.addDefault("game.not_enter_arena", "&cYou may not enter this arena right now.");
         
         cfg.addDefault("lobby_timer.game_starts_in", "Game starts in &e%seconds% &7seconds.");
@@ -74,7 +76,8 @@ public class Messages {
 
         cfg.addDefault("endgame_timer.game_starts_new_in", "Game starts new in &e%seconds% &7seconds.");
 
-        cfg.addDefault("lobby.player_joined", "&e%player% &7joined &8(&7%players%&8/&7%max_players%&8)");
+        cfg.addDefault("lobby.player_joined", "&e%player% &7joined the game &8(&7%players%&8/&7%max_players%&8)");
+        cfg.addDefault("lobby.player_left", "&e%player% &7left the game &8(&7%players%&8/&7%max_players%&8)");
         cfg.addDefault("lobby.not_enough_players", "&cThere are not enough players online.");
         cfg.addDefault("lobby.teams_unequal", "&cThe teams are unequal distributed.");
         cfg.addDefault("lobby.game_starts", "&aThe game starts.");
@@ -116,7 +119,7 @@ public class Messages {
         cfg.addDefault("sign.0", "•● MissileWars ●•");
         cfg.addDefault("sign.1", "%state%");
         cfg.addDefault("sign.2", "%arena%");
-        cfg.addDefault("sign.3", "%players%/%max_players%");
+        cfg.addDefault("sign.3", "&7%players%&8/&7%max_players%");
         cfg.addDefault("sign.state.lobby", "&aLobby");
         cfg.addDefault("sign.state.ingame", "&bIngame");
         cfg.addDefault("sign.state.ended", "&cRestarting...");

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -333,11 +333,21 @@ public class Game {
             Team team = getNextTeam();
             team.addMember(mwPlayer);
             player.sendMessage(Messages.getMessage("team.team_assigned").replace("%team%", team.getFullname()));
-
-            broadcast(Messages.getMessage("lobby.player_joined")
-                    .replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
-                    .replace("%players%", Integer.toString(getPlayers().values().size()))
-                    .replace("%player%", player.getName()));
+            
+            if (state == GameState.LOBBY) {
+                broadcast(Messages.getMessage("lobby.player_joined")
+                        .replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
+                        .replace("%players%", Integer.toString(getPlayers().values().size()))
+                        .replace("%player%", player.getName())
+                        .replace("%team%", team.getFullname()));
+            } else if (state == GameState.INGAME) {
+                broadcast(Messages.getMessage("game.player_joined")
+                        .replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
+                        .replace("%players%", Integer.toString(getPlayers().values().size()))
+                        .replace("%player%", player.getName())
+                        .replace("%team%", team.getFullname()));
+            }
+            
         }
 
         player.setScoreboard(getScoreboard());
@@ -369,17 +379,28 @@ public class Game {
         Player player = mwPlayer.getPlayer();
         Team team = mwPlayer.getTeam();
 
-        if (state == GameState.INGAME) {
+        if (state == GameState.LOBBY) {
+            if (team != null) {
+                broadcast(Messages.getMessage("lobby.player_left")
+                        .replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
+                        .replace("%players%", Integer.toString(getPlayers().values().size()))
+                        .replace("%player%", player.getName())
+                        .replace("%team%", team.getFullname()));
+            }
+            
+        } else if (state == GameState.INGAME) {
             BukkitTask task = getPlayerTasks().get(mwPlayer.getUuid());
             if (task != null) task.cancel();
 
             if (team != null) {
                 broadcast(Messages.getMessage("game.player_left")
-                        .replace("%team%", team.getFullname())
-                        .replace("%player%", player.getName()));
+                        .replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
+                        .replace("%players%", Integer.toString(getPlayers().values().size()))
+                        .replace("%player%", player.getName())
+                        .replace("%team%", team.getFullname()));
             }
         }
-
+        
         PlayerDataProvider.getInstance().loadInventory(player);
 
         if (team != null) {
@@ -634,7 +655,7 @@ public class Game {
 
         Missile missile = this.arena.getMissileConfiguration().getMissileFromName(itemStack.getItemMeta().getDisplayName());
         if (missile == null) {
-            player.sendMessage(Messages.getMessage("invalid_missile"));
+            player.sendMessage(Messages.getMessage("command.invalid_missile"));
             return;
         }
         itemStack.setAmount(itemStack.getAmount() - 1);