Rework message path, Small typo

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

@@ -109,7 +109,7 @@ public class MWCommands extends BaseCommand {
 
         Game game = GameManager.getInstance().getGame(player.getLocation());
         if (game == null) {
-            player.sendMessage(Messages.getMessage("not_in_arena"));
+            player.sendMessage(Messages.getMessage("game.not_in_game_area"));
             return;
         }
 
@@ -147,7 +147,7 @@ public class MWCommands extends BaseCommand {
         } else {
             game = GameManager.getInstance().getGame(player.getLocation());
             if (game == null) {
-                player.sendMessage(Messages.getMessage("not_in_arena"));
+                player.sendMessage(Messages.getMessage("game.not_in_game_area"));
                 return;
             }
         }
@@ -204,7 +204,7 @@ public class MWCommands extends BaseCommand {
         } else {
             game = GameManager.getInstance().getGame(player.getLocation());
             if (game == null) {
-                player.sendMessage(Messages.getMessage("not_in_arena"));
+                player.sendMessage(Messages.getMessage("game.not_in_game_area"));
                 return;
             }
         }
@@ -238,13 +238,13 @@ public class MWCommands extends BaseCommand {
         } else {
             game = GameManager.getInstance().getGame(player.getLocation());
             if (game == null) {
-                player.sendMessage(Messages.getMessage("not_in_arena"));
+                player.sendMessage(Messages.getMessage("game.not_in_game_area"));
                 return;
             }
         }
 
         GameManager.getInstance().getGames().values().forEach(Game::appendRestart);
-        sender.sendMessage(Messages.getMessage("restart_after_game"));
+        sender.sendMessage(Messages.getMessage("server.restart_after_game"));
     }
 
     @Subcommand("reload")

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

@@ -357,7 +357,7 @@ public class SetupCommands extends BaseCommand {
         } else {
             game = GameManager.getInstance().getGame(player.getLocation());
             if (game == null) {
-                player.sendMessage(Messages.getMessage("not_in_arena"));
+                player.sendMessage(Messages.getMessage("game.not_in_game_area"));
                 return false;
             }
         }

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

@@ -56,7 +56,7 @@ public class UserCommands extends BaseCommand {
 
         Game game = GameManager.getInstance().getGame(player.getLocation());
         if (game == null) {
-            player.sendMessage(Messages.getMessage("not_in_arena"));
+            player.sendMessage(Messages.getMessage("game.not_in_game_area"));
             return;
         }
 
@@ -101,7 +101,7 @@ public class UserCommands extends BaseCommand {
 
         Game game = GameManager.getInstance().getGame(player.getLocation());
         if (game == null) {
-            player.sendMessage(Messages.getMessage("not_in_arena"));
+            player.sendMessage(Messages.getMessage("game.not_in_game_area"));
             return;
         }
 
@@ -118,14 +118,14 @@ public class UserCommands extends BaseCommand {
             int toCount = to.getMembers().size() + 1;
             int diff = toCount - otherCount;
             if (diff > 1) {
-                player.sendMessage(Messages.getMessage("cannot_change_difference"));
+                player.sendMessage(Messages.getMessage("team.cannot_change_difference"));
                 return;
             }
 
             // Remove the player from the old team and add him to the new team
             to.addMember(mwPlayer);
 
-            player.sendMessage(Messages.getMessage("team_changed").replace("%team%", to.getFullname()));
+            player.sendMessage(Messages.getMessage("team.team_changed").replace("%team%", to.getFullname()));
         } catch (NumberFormatException exception) {
             player.sendMessage(Messages.getPrefix() + "§c/mw change <1|2>");
         }
@@ -146,7 +146,7 @@ public class UserCommands extends BaseCommand {
 
         Game game = GameManager.getInstance().getGame(player.getLocation());
         if (game == null) {
-            player.sendMessage(Messages.getMessage("not_in_arena"));
+            player.sendMessage(Messages.getMessage("game.not_in_game_area"));
             return;
         }
 

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

@@ -59,29 +59,49 @@ public class Messages {
 
         cfg.addDefault("prefix", "&6•&e● MissileWars &8▎  &7");
 
-        cfg.addDefault("not_in_arena", "&cYou are not in an arena right now");
+        cfg.addDefault("server.restart_after_game", "&7The server will restart after this game.");
+
+        cfg.addDefault("invalid_missile", "&cThe mentioned missile was not found.");
         
-        //TODO currently not used:
-        cfg.addDefault("game_quit", "You lef this game");
+        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("not_enter_arena", "&cYou may not enter this arena right now");
+        cfg.addDefault("lobby_timer.game_starts_in", "Game starts in &e%seconds% &7seconds.");
 
-        cfg.addDefault("game_timer.game_starts_in", "Game starts in &e%seconds% &7seconds");
+        cfg.addDefault("game_timer.game_ends_in_minutes", "Game ends in &e%minutes% &7minutes.");
+        cfg.addDefault("game_timer.game_ends_in_seconds", "Game ends in &e%seconds% &7seconds.");
 
-        cfg.addDefault("game_timer.game_ends_in_minutes", "Game ends in &e%minutes% &7minutes");
-        cfg.addDefault("game_timer.game_ends_in_seconds", "Game ends in &e%seconds% &7seconds");
+        cfg.addDefault("endgame_timer.game_starts_new_in", "Game starts new in &e%seconds% &7seconds.");
 
-        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.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.");
         
-        cfg.addDefault("not_enough_players", "&cThere are not enough players online");
-        cfg.addDefault("teams_unequal", "&cThe teams are unequal distributed");
-        cfg.addDefault("game_starts", "&aThe game starts");
+        cfg.addDefault("team.change_team_not_now", "&cNow you cannot change your team anymore.");
+        //TODO currently not used:
+        cfg.addDefault("team.already_in_team", "&cYou are already in this team.");
+        cfg.addDefault("team.cannot_change_difference", "&cYou cannot change your team.");
+        cfg.addDefault("team.team_changed", "You are now in %team%&7.");
+        cfg.addDefault("team.team_assigned", "You have been assigned to %team%&7.");
+        cfg.addDefault("team.all_teammates_offline", "Everyone from %team% &7is offline.");
+        cfg.addDefault("team.team_buffed", "%team% &7was buffed as one player left the team.");
+        cfg.addDefault("team.team_nerved", "%team% &7was nerved as one player joined the team.");
+        cfg.addDefault("team.hurt_teammates", "&cYou must not hurt your teammates.");
+        
+        cfg.addDefault("arena.spectator", "&7You are now a spectator.");
+        cfg.addDefault("arena.arena_leave", "&cYou are not allowed to leave the arena.");
+        cfg.addDefault("arena.missile_place_deny", "&cYou are not allowed to place a missile here.");
+        cfg.addDefault("arena.not_higher", "&cYou can not go higher.");
+        cfg.addDefault("arena.kick_inactivity", "&cYou were inactive on MissileWars.");
 
-        cfg.addDefault("fall_protection.start", "&cFall protection inactive in %seconds% seconds");
-        cfg.addDefault("fall_protection.end", "&cFall protection inactive");
-        cfg.addDefault("fall_protection.deactivated", "&cFall protection deactivated by sneaking");
+        cfg.addDefault("died.normal", "%player% &7died.");
+        cfg.addDefault("died.explosion", "%player% &7was blown up.");
 
-        cfg.addDefault("kick_inactivity", "&cYou were inactive on MissileWars");
+        cfg.addDefault("fall_protection.start", "&cFall protection inactive in %seconds% seconds.");
+        cfg.addDefault("fall_protection.end", "&cFall protection inactive.");
+        cfg.addDefault("fall_protection.deactivated", "&cFall protection deactivated by sneaking.");
 
         cfg.addDefault("game_result.title_won", "&7%team%");
         cfg.addDefault("game_result.subtitle_won", "&6has won the game!");
@@ -91,31 +111,8 @@ public class Messages {
         cfg.addDefault("game_result.subtitle_loser", "&chas lost!");
         cfg.addDefault("game_result.title_draw", "&7Draw!");
         cfg.addDefault("game_result.subtitle_draw", "");
-        cfg.addDefault("game_result.money", "You received &e%money% &7coins");
-
-        cfg.addDefault("spectator", "&7You are now a spectator");
-        cfg.addDefault("change_team_not_now", "&cNow you cannot change your team anymore");
-        cfg.addDefault("already_in_team", "&cYou are already in this team");
-        cfg.addDefault("cannot_change_difference", "&cYou cannot change your team");
-        cfg.addDefault("team_changed", "You are now in %team%");
-        cfg.addDefault("team_assigned", "You have been assigned to %team%");
-        cfg.addDefault("lobby_joined", "&e%player% &7joined &8(&7%players%&8/&7%max_players%&8)");
-        cfg.addDefault("not_higher", "&cYou can not go higher");
-        cfg.addDefault("invalid_missile", "&cInvalid missile");
-        cfg.addDefault("hurt_teammates", "&cYou must not hurt your teammates");
-        cfg.addDefault("died", "%player% &7died");
-        cfg.addDefault("died_explosion", "%player% &7was blown up");
-        cfg.addDefault("player_left", "%player% &7left the game");
-
-        cfg.addDefault("team_offline", "Everyone from %team% &7is offline");
-        cfg.addDefault("team_buffed", "%team% &7was buffed as one player left the team");
-        cfg.addDefault("team_nerved", "%team% &7was nerved as one player joined the team");
-
-        cfg.addDefault("restart_after_game", "&7The server will restart after this game");
+        cfg.addDefault("game_result.money", "You received &e%money% &7coins.");
         
-        cfg.addDefault("area.arena_leave", "&cYou are not allowed to leave the arena");
-        cfg.addDefault("area.missile_place_deny", "&cYou are not allowed to place a missile here");
-
         cfg.addDefault("sign.0", "•● MissileWars ●•");
         cfg.addDefault("sign.1", "%state%");
         cfg.addDefault("sign.2", "%arena%");
@@ -125,8 +122,8 @@ public class Messages {
         cfg.addDefault("sign.state.ended", "&cRestarting...");
         cfg.addDefault("sign.state.error", "&cError...");
 
-        cfg.addDefault("vote.success", "You successfully voted for the map %map%");
-        cfg.addDefault("vote.finished", "The map %map% &7was elected");
+        cfg.addDefault("vote.success", "You successfully voted for the map %map%.");
+        cfg.addDefault("vote.finished", "The map %map% &7was elected.");
         cfg.addDefault("vote.gui", "Vote for a map");
 
     }

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

@@ -322,7 +322,7 @@ public class Game {
             Bukkit.getScheduler().runTaskLater(MissileWars.getInstance(), () -> teleportToArenaSpectatorSpawn(player), 2);
             Bukkit.getScheduler().runTaskLater(MissileWars.getInstance(), () -> player.setGameMode(GameMode.SPECTATOR), 35);
 
-            player.sendMessage(Messages.getMessage("spectator"));
+            player.sendMessage(Messages.getMessage("arena.spectator"));
             player.setDisplayName("§7" + player.getName() + "§r");
 
         } else {
@@ -332,9 +332,9 @@ public class Game {
 
             Team team = getNextTeam();
             team.addMember(mwPlayer);
-            player.sendMessage(Messages.getMessage("team_assigned").replace("%team%", team.getFullname()));
+            player.sendMessage(Messages.getMessage("team.team_assigned").replace("%team%", team.getFullname()));
 
-            broadcast(Messages.getMessage("lobby_joined")
+            broadcast(Messages.getMessage("lobby.player_joined")
                     .replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
                     .replace("%players%", Integer.toString(getPlayers().values().size()))
                     .replace("%player%", player.getName()));
@@ -374,7 +374,7 @@ public class Game {
             if (task != null) task.cancel();
 
             if (team != null) {
-                broadcast(Messages.getMessage("player_left")
+                broadcast(Messages.getMessage("game.player_left")
                         .replace("%team%", team.getFullname())
                         .replace("%player%", player.getName()));
             }
@@ -411,7 +411,7 @@ public class Game {
                 sendGameResult();
                 stopGame();
             });
-            broadcast(Messages.getMessage("team_offline").replace("%team%", team.getFullname()));
+            broadcast(Messages.getMessage("team.all_teammates_offline").replace("%team%", team.getFullname()));
         }
     }
 

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

@@ -231,10 +231,10 @@ public class Team {
     // TODO Add new team buffer
     public void updateIntervals(int newInterval) {
         if (newInterval < currentInterval && currentInterval != 0) {
-            getGame().broadcast(Messages.getMessage("team_buffed").replace("%team%", getFullname()));
+            getGame().broadcast(Messages.getMessage("team.team_buffed").replace("%team%", getFullname()));
         }
         if (newInterval > currentInterval && currentInterval != 0) {
-            getGame().broadcast(Messages.getMessage("team_nerved").replace("%team%", getFullname()));
+            getGame().broadcast(Messages.getMessage("team.team_nerved").replace("%team%", getFullname()));
         }
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/timer/LobbyTimer.java

@@ -67,7 +67,7 @@ public class LobbyTimer extends Timer implements Runnable {
             if (size1 + size2 < getGame().getLobby().getMinSize()) {
                 seconds = startTime;
                 remaining = 90;
-                broadcast(Messages.getMessage("not_enough_players"));
+                broadcast(Messages.getMessage("lobby.not_enough_players"));
                 return;
             }
         }
@@ -81,22 +81,22 @@ public class LobbyTimer extends Timer implements Runnable {
             case 3:
             case 2:
             case 1:
-                broadcast(Messages.getMessage("game_timer.game_starts_in").replace("%seconds%", Integer.toString(seconds)));
+                broadcast(Messages.getMessage("lobby_timer.game_starts_in").replace("%seconds%", Integer.toString(seconds)));
                 playPling();
                 break;
             case 10:
                 checkVote();
-                broadcast(Messages.getMessage("game_timer.game_starts_in").replace("%seconds%", Integer.toString(seconds)));
+                broadcast(Messages.getMessage("lobby_timer.game_starts_in").replace("%seconds%", Integer.toString(seconds)));
                 playPling();
                 break;
             case 0:
                 int diff = size1 - size2;
                 if (diff >= 2 || diff <= -2) {
-                    broadcast(Messages.getMessage("teams_unequal"));
+                    broadcast(Messages.getMessage("lobby.teams_unequal"));
                     seconds = startTime;
                     return;
                 }
-                broadcast(Messages.getMessage("game_starts"));
+                broadcast(Messages.getMessage("lobby.game_starts"));
                 playPling();
                 getGame().startGame();
                 return;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/EndListener.java

@@ -74,7 +74,7 @@ public class EndListener extends GameBoundListener {
 
         if (getGame().isSpectatorsMax()) {
             event.setCancelled(true);
-            event.getPlayer().sendMessage(Messages.getMessage("not_enter_arena"));
+            event.getPlayer().sendMessage(Messages.getMessage("game.not_enter_arena"));
             return;
         }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/GameListener.java

@@ -169,7 +169,7 @@ public class GameListener extends GameBoundListener {
 
         // same team
         if (team == getGame().getPlayer(player).getTeam()) {
-            shooter.sendMessage(Messages.getMessage("hurt_teammates"));
+            shooter.sendMessage(Messages.getMessage("team.hurt_teammates"));
             event.setCancelled(true);
         }
     }
@@ -212,9 +212,9 @@ public class GameListener extends GameBoundListener {
             EntityDamageEvent.DamageCause damageCause = player.getLastDamageCause().getCause();
 
             if (damageCause == EntityDamageEvent.DamageCause.BLOCK_EXPLOSION || damageCause == EntityDamageEvent.DamageCause.ENTITY_EXPLOSION) {
-                deathBroadcast = Messages.getNativeMessage("died_explosion").replace("%player%", player.getDisplayName());
+                deathBroadcast = Messages.getNativeMessage("died.explosion").replace("%player%", player.getDisplayName());
             } else {
-                deathBroadcast = Messages.getNativeMessage("died").replace("%player%", player.getDisplayName());
+                deathBroadcast = Messages.getNativeMessage("died.normal").replace("%player%", player.getDisplayName());
             }
 
             getGame().broadcast(deathBroadcast);
@@ -254,7 +254,7 @@ public class GameListener extends GameBoundListener {
         int toY = event.getTo().getBlockY();
         if (toY > getGame().getArena().getMaxHeight()) {
             player.teleport(event.getFrom());
-            player.sendMessage(Messages.getMessage("not_higher"));
+            player.sendMessage(Messages.getMessage("arena.not_higher"));
         } else if (toY < getGame().getArena().getDeathHeight()) {
             player.setLastDamageCause(new EntityDamageEvent(player, EntityDamageEvent.DamageCause.FALL, 20));
             player.damage(20.0D);
@@ -265,7 +265,7 @@ public class GameListener extends GameBoundListener {
 
         if (!getGame().isInGameArea(event.getTo())) {
             if (to != null) Game.knockbackEffect(player, from, to);
-            player.sendMessage(Messages.getMessage("area.arena_leave"));
+            player.sendMessage(Messages.getMessage("arena.arena_leave"));
         }
     }
 
@@ -278,7 +278,7 @@ public class GameListener extends GameBoundListener {
         if ((!getGame().getLobby().isJoinOngoingGame()) || (getGame().isPlayersMax())) {
             if (getGame().isSpectatorsMax()) {
                 event.setCancelled(true);
-                event.getPlayer().sendMessage(Messages.getMessage("not_enter_arena"));
+                event.getPlayer().sendMessage(Messages.getMessage("game.not_enter_arena"));
                 return;
             }
             getGame().playerJoinInGame(player, true);

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/LobbyListener.java

@@ -70,7 +70,7 @@ public class LobbyListener extends GameBoundListener {
 
             // too late for team change:
             if (getGame().getTimer().getSeconds() < 10) {
-                player.sendMessage(Messages.getMessage("change_team_not_now"));
+                player.sendMessage(Messages.getMessage("team.change_team_not_now"));
                 return;
             }
 
@@ -121,7 +121,7 @@ public class LobbyListener extends GameBoundListener {
 
         if (getGame().isPlayersMax()) {
             event.setCancelled(true);
-            event.getPlayer().sendMessage(Messages.getMessage("not_enter_arena"));
+            event.getPlayer().sendMessage(Messages.getMessage("game.not_enter_arena"));
             return;
         }