Rework message path

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

@@ -60,23 +60,27 @@ public class Messages {
         cfg.addDefault("prefix", "&6•&e● MissileWars &8▎  &7");
 
         cfg.addDefault("not_in_arena", "&cYou are not in an arena right now");
+        
+        //TODO currently not used:
         cfg.addDefault("game_quit", "You lef this game");
+        
         cfg.addDefault("not_enter_arena", "&cYou may not enter this arena right now");
 
-        cfg.addDefault("game_starts_new_in", "Game starts new in &e%seconds% &7seconds");
-        cfg.addDefault("game_ends_in_minutes", "Game ends in &e%minutes% &7minutes");
-        cfg.addDefault("game_ends_in_seconds", "Game ends in &e%seconds% &7seconds");
-        cfg.addDefault("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("endgame_timer.game_starts_new_in", "Game starts new in &e%seconds% &7seconds");
+        
         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("fall_protection", "&cFall protection inactive in %seconds% seconds");
-        cfg.addDefault("fall_protection_inactive", "&cFall protection inactive");
-        cfg.addDefault("fall_protection_deactivated", "&cFall protection deactivated by sneaking");
+        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("money", "You received &e%money% &7coins");
         cfg.addDefault("kick_inactivity", "&cYou were inactive on MissileWars");
 
         cfg.addDefault("game_result.title_won", "&7%team%");
@@ -87,6 +91,7 @@ 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");
@@ -107,8 +112,9 @@ public class Messages {
         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("arena_leave", "&cYou are not allowed to leave the arena");
-        cfg.addDefault("missile_place_deny", "&cYou are not allowed to place a missile here");
+        
+        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%");

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

@@ -627,7 +627,7 @@ public class Game {
         boolean isOnlyBetweenSpawnPlaceable = this.arena.getMissileConfiguration().isOnlyBetweenSpawnPlaceable();
         if (isOnlyBetweenSpawnPlaceable) {
             if (!isInInnerGameArea(player.getLocation())) {
-                player.sendMessage(Messages.getMessage("missile_place_deny"));
+                player.sendMessage(Messages.getMessage("area.missile_place_deny"));
                 return;
             }
         }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/RespawnGoldBlock.java

@@ -124,7 +124,7 @@ public class RespawnGoldBlock implements Listener {
             BlockSetterProvider.getBlockDataSetter().setData(loc.getBlock(), map.get(loc).getValue());
         }
         map.clear();
-        player.sendMessage(Messages.getMessage("fall_protection_inactive"));
+        player.sendMessage(Messages.getMessage("fall_protection.end"));
         Bukkit.getScheduler().cancelTask(task);
         HandlerList.unregisterAll(this);
     }
@@ -136,7 +136,7 @@ public class RespawnGoldBlock implements Listener {
     private void sendFallProtectionMessage() {
         double seconds = (double) duration / 20;
         if ((seconds == Math.floor(seconds)) && !Double.isInfinite(seconds)) {
-            player.sendMessage(Messages.getMessage("fall_protection").replace("%seconds%", Integer.toString((int) seconds)));
+            player.sendMessage(Messages.getMessage("fall_protection.start").replace("%seconds%", Integer.toString((int) seconds)));
         }
     }
 
@@ -151,7 +151,7 @@ public class RespawnGoldBlock implements Listener {
             map.clear();
             Bukkit.getScheduler().cancelTask(task);
             HandlerList.unregisterAll(this);
-            eventPlayer.sendMessage(Messages.getMessage("fall_protection_deactivated"));
+            eventPlayer.sendMessage(Messages.getMessage("fall_protection.deactivated"));
         }
     }
 }

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

@@ -37,7 +37,7 @@ public class EndTimer extends Timer {
 
         switch(seconds) {
             case 15:
-                broadcast(Messages.getMessage("game_starts_new_in").replace("%seconds%", Integer.toString(seconds)));
+                broadcast(Messages.getMessage("endgame_timer.game_starts_new_in").replace("%seconds%", Integer.toString(seconds)));
                 break;
             case 0:
                 getGame().reset();

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

@@ -45,7 +45,7 @@ public class GameTimer extends Timer {
             case 600:
             case 300:
             case 180:
-                broadcast(Messages.getMessage("game_ends_in_minutes").replace("%minutes%", Integer.toString(seconds/60)));
+                broadcast(Messages.getMessage("game_timer.game_ends_in_minutes").replace("%minutes%", Integer.toString(seconds/60)));
                 break;
             case 60:
             case 30:
@@ -55,7 +55,7 @@ public class GameTimer extends Timer {
             case 3:
             case 2:
             case 1:
-                broadcast(Messages.getMessage("game_ends_in_seconds").replace("%seconds%", Integer.toString(seconds)));
+                broadcast(Messages.getMessage("game_timer.game_ends_in_seconds").replace("%seconds%", Integer.toString(seconds)));
                 break;
             case 0:
                 game.sendGameResult();

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

@@ -81,12 +81,12 @@ public class LobbyTimer extends Timer implements Runnable {
             case 3:
             case 2:
             case 1:
-                broadcast(Messages.getMessage("game_starts_in").replace("%seconds%", Integer.toString(seconds)));
+                broadcast(Messages.getMessage("game_timer.game_starts_in").replace("%seconds%", Integer.toString(seconds)));
                 playPling();
                 break;
             case 10:
                 checkVote();
-                broadcast(Messages.getMessage("game_starts_in").replace("%seconds%", Integer.toString(seconds)));
+                broadcast(Messages.getMessage("game_timer.game_starts_in").replace("%seconds%", Integer.toString(seconds)));
                 playPling();
                 break;
             case 0:

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

@@ -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("arena_leave"));
+            player.sendMessage(Messages.getMessage("area.arena_leave"));
         }
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/MoneyUtil.java

@@ -20,13 +20,14 @@ package de.butzlabben.missilewars.util;
 
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.configuration.Messages;
-import java.util.UUID;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
+import java.util.UUID;
+
 /**
  * @author Butzlabben
  * @since 13.08.2018
@@ -67,7 +68,7 @@ public class MoneyUtil {
             Logger.WARN.log("Message: " + r.errorMessage);
         } else {
             if (Bukkit.getPlayer(uuid) != null)
-                Bukkit.getPlayer(uuid).sendMessage(Messages.getMessage("money").replace("%money%", Integer.toString(money)));
+                Bukkit.getPlayer(uuid).sendMessage(Messages.getMessage("game_result.money").replace("%money%", Integer.toString(money)));
         }
     }
 }