Work on lang file

lang.yml

@@ -0,0 +1,34 @@
+msg:
+    gameJoin:"Joined game \"%s\""
+    gameLeave:"Left game \"%s\""
+    playerJoin:"§a%s joined the abba game"
+    playerLeave:"§a%s left the abba game"
+    
+error:
+    noPermission:"§cYou don't have permission to use this command!"
+    mustBeInGame:"§cYou must be ingame to use this command!"
+    gameNotFound:"§cGame %s not found!"
+    noGames:"§cNo Games found!"
+    
+    gameFull:"§cThis game is full!"
+    gameClosed:"§cThis game is closed!"
+    noChest:"§cThere aren't enough chests!"
+    notWhitelisted:"§cYou aren't whitelisted for this game!"
+    blacklisted:"§cYou are blacklisted for this game!"
+    
+help:
+    join:"§aabba join [game]§f: Joins the Abba Match"
+    leave:"§aabba leave§f: Leaves current Abba Game"
+    info:"§aabba info [game]§f: Displays info about an Abba Match"
+    list:"§aabba list§f: Lists all Abba Matches"
+    calc:"§aabba calc§f: Calculates the score of your current inventory"
+    
+    create:"§aabba create [game]§f: Creates an Abba Game"
+    remove:"§aabba remove <game>§f: Removes an Abba Game"
+    open:"§aabba open [game]§f: Allows players to join an Abba Game"
+    close:"§aabba close [game]§f: Prevents players from joining an Abba Game"
+    start:"§aabba start [game]§f: Starts an Abba Game"
+    calcscores:"§aabba calcscores§f: Use to calculate the scores and determine a winner at the end of a Match"
+    reload:"§aabba config <game> <timer|addchest> ...§f: Configures an Abba Game"
+    config:"§aabba reload§f: Reloads the config"
+    

src/me/lennartVH01/AbbaAdminCommand.java

@@ -31,7 +31,6 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String cmdLabel, String[] args){
 		if(args.length == 0){
-			sender.sendMessage(Messages.adminHelpMessage);
 			return false;
 		}
 		switch(args[0].toLowerCase()){
@@ -99,7 +98,7 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 					sender.sendMessage("Successfully removed game \"" + args[1] + "\"");
 					return true;
 				}else{
-					sender.sendMessage(String.format(Messages.gameNotFoundError, args[1]));
+					sender.sendMessage(String.format(Messages.errorGameNotFound, args[1]));
 					return false;
 				}
 			}else{
@@ -112,7 +111,7 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 			if(args.length >= 2){
 				game = AbbaTools.getAbbaGame(args[1]);
 				if(game == null){
-					sender.sendMessage(String.format(Messages.gameNotFoundError, args[1]));
+					sender.sendMessage(String.format(Messages.errorGameNotFound, args[1]));
 					return false;
 				}
 			}else{
@@ -130,7 +129,7 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 			if(args.length >= 2){
 				aGame = AbbaTools.getAbbaGame(args[1]);
 				if(aGame == null){
-					sender.sendMessage(String.format(Messages.gameNotFoundError, args[1]));
+					sender.sendMessage(String.format(Messages.errorGameNotFound, args[1]));
 					return false;
 				}
 			}else{
@@ -149,7 +148,7 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 			if(args.length >= 2){
 				abbaGame = AbbaTools.getAbbaGame(args[1]);
 				if(abbaGame == null){
-					sender.sendMessage(String.format(Messages.gameNotFoundError, args[1]));
+					sender.sendMessage(String.format(Messages.errorGameNotFound, args[1]));
 					return false;
 				}
 			}else{
@@ -211,7 +210,7 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 				if(args.length >= 3){
 					AbbaGame abGame = AbbaTools.getAbbaGame(args[1]);
 					if(abGame == null){
-						sender.sendMessage(Messages.gameNotFoundError);
+						sender.sendMessage(Messages.errorGameNotFound);
 					}
 					switch(args[2].toLowerCase()){
 					case "timer":
@@ -276,16 +275,12 @@ public class AbbaAdminCommand implements CommandExecutor, TabCompleter{
 					return false;
 				}
 			}else{
-				sender.sendMessage(Messages.mustSpecifyGameError);
+				sender.sendMessage(Messages.helpConfig);
 				return false;
 			}
 			
-			
-			
-		default:
-			sender.sendMessage(Messages.adminHelpMessage);
-			return false;
 		}
+		return false;
 	}
 	
 	@Override

src/me/lennartVH01/AbbaCommand.java

@@ -17,7 +17,6 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String cmdLabel, String[] args){
 		if(args.length == 0){
-			sender.sendMessage(Messages.basicHelpMessage);
 			return false;
 		}
 		
@@ -47,27 +46,28 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 				case SUCCESS:
 					break;
 				case FAIL_CLOSED:
-					sender.sendMessage(Messages.gameClosedError);
+					sender.sendMessage(Messages.errorGameClosed);
 					return false;
 				case FAIL_FULL:
-					sender.sendMessage(Messages.gameFullError);
+					sender.sendMessage(Messages.errorGameFull);
 					return false;
 				case FAIL_NOCHEST:
-					sender.sendMessage(Messages.gameNoChestError);
+					sender.sendMessage(Messages.errorNoChest);
 					return false;
 				case FAIL_WHITELIST:
-					sender.sendMessage(Messages.gameNotWhiteListedError);
+					sender.sendMessage(Messages.errorNotWhitelisted);
 					return false;
 				case FAIL_CONTRABAND:
 					return false;
 				}
-				p.sendMessage("Joined game \"" + game.getName() + "\"");
+				p.sendMessage(String.format(Messages.gameJoinMessage, game.getName()));
+				game.messageAll(String.format(Messages.playerJoinMessage, p.getName()));
 				
 				p.teleport(game.getSpawn());
 				p.setGameMode(GameMode.SURVIVAL);
 				return true;
 			}else{
-				sender.sendMessage(Messages.mustBeInGameError);
+				sender.sendMessage(Messages.errorMustBeInGame);
 				return false;
 			}
 			
@@ -78,14 +78,15 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 				Player p = (Player) sender;
 				AbbaGame game = AbbaTools.leave(p.getUniqueId());
 				if(game != null){
-					p.sendMessage("Left game \"" + game.getName() + "\"");
+					p.sendMessage(String.format(Messages.gameLeaveMessage, game.getName()));
+					game.messageAll(String.format(Messages.playerLeaveMessage, p.getName()));
 					return true;
 				}else{
 					p.sendMessage("§cYou aren't in a game right now!");
 					return false;
 				}
 			}else{
-				sender.sendMessage(Messages.mustBeInGameError);
+				sender.sendMessage(Messages.errorMustBeInGame);
 				return false;
 			}
 			
@@ -104,7 +105,7 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 			if(args.length >= 2){
 				game = AbbaTools.getAbbaGame(args[1]);
 				if(game == null){
-					sender.sendMessage(String.format(Messages.gameNotFoundError, args[1]));
+					sender.sendMessage(String.format(Messages.errorGameNotFound, args[1]));
 					return false;
 				}
 			}else{
@@ -115,7 +116,7 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 					game = AbbaTools.getAbbaGame();
 				}
 				if(game == null){
-					sender.sendMessage("§cNo Games found!");
+					sender.sendMessage(Messages.errorNoGames);
 					return false;
 				}
 			}
@@ -127,7 +128,7 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 			if(sender instanceof Player){
 				calcPlayer = (Player) sender;
 			}else{
-				sender.sendMessage("usage: /abba calc");
+				sender.sendMessage(Messages.helpCalc);
 				return false;
 			}
 			
@@ -138,10 +139,8 @@ public class AbbaCommand implements CommandExecutor, TabCompleter{
 			}
 			sender.sendMessage("§aTotal Score: " + score.total);
 			return true;
-		default:
-			sender.sendMessage(Messages.basicHelpMessage);
-			return false;
 		}
+		return false;
 	}
 	
 	@Override

src/me/lennartVH01/AbbaGame.java

@@ -102,15 +102,15 @@ public class AbbaGame implements ConfigurationSerializable{
 	
 	public List<String> start() {
 		
-		List<String> badPlayeNames = new ArrayList<String>();
+		List<String> contrabandHolders = new ArrayList<String>();
 		for(UUID id:players){
 			Player p = plugin.getServer().getPlayer(id);
 			if(AbbaTools.hasContraband(p.getInventory())){
-				badPlayeNames.add(p.getName());
+				contrabandHolders.add(p.getName());
 			}
 		}
-		if(badPlayeNames.size() != 0){
-			return badPlayeNames;
+		if(contrabandHolders.size() != 0){
+			return contrabandHolders;
 		}
 		// TODO Add stuff like tp people to cave if neccecary
 		if(state == GameState.WAITING){
@@ -133,7 +133,7 @@ public class AbbaGame implements ConfigurationSerializable{
 		
 		startClock(20);
 		
-		return badPlayeNames; //should be empty
+		return contrabandHolders; //should be empty
 	}
 	public void pause(){
 		//TODO Implement pausing
@@ -370,7 +370,11 @@ public class AbbaGame implements ConfigurationSerializable{
 		aChest.getSign().setLine(1, "");
 		aChest.getSign().update();
 	}
-	
+	public void messageAll(String msg){
+		for(UUID id:players){
+			plugin.getServer().getPlayer(id).sendMessage(msg);
+		}
+	}
 
 	public GameState getState(){
 		return state;

src/me/lennartVH01/Main.java

@@ -38,6 +38,8 @@ public class Main extends JavaPlugin{
 	
 	@Override
 	public void onEnable(){
+		saveResource("lang.yml", false);
+		Messages.reload(YamlConfiguration.loadConfiguration(new File(getDataFolder(), "lang.yml")));
 		AbbaCommand abbaCmd = new AbbaCommand();
 		this.getCommand("abba").setExecutor((CommandExecutor) abbaCmd);
 		this.getCommand("abba").setTabCompleter((TabCompleter) abbaCmd);

src/me/lennartVH01/Messages.java

@@ -1,19 +1,86 @@
 package me.lennartVH01;
 
+import org.bukkit.configuration.file.FileConfiguration;
+
 public class Messages {
-	public static final String noPermissionError = "§cYou don't have permission to use this command!";
-	public static final String mustBeInGameError = "§cYou must be ingame to use this command!";
-	public static final String gameNotFoundError = "§cGame %s not found!";
-	public static final String mustSpecifyGameError = "§cYou must specify a game!";
+	/*public static String errorNoPermission = "§cYou don't have permission to use this command!";
+	public static String errorMustBeInGame = "§cYou must be ingame to use this command!";
+	public static String errorGameNotFound = "§cGame %s not found!";
+	*/
+	//public static String basicHelpMessage = "Usage:\n - §aabba join§f: Joins the Abba Match\n - §aabba leave§f: Leaves current Abba Game\n - §aabba info§f: Displays info about an Abba Match\n - §aabba list§f: Lists all Abba Matches\n - §aabba calc§f: Calculates the score of your current inventory";
+	//public static String adminHelpMessage = "Usage:\n - §aabbaadmin create [game]§f: Creates an Abba Game\n - §aabbaadmin remove <game>§f: Removes an Abba Game\n - §aabbaadmin open [game]§f: Allows players to join an Abba Game\n - §aabbaadmin close [game]§f: Prevents players from joining an Abba Game\n - §aabbaadmin start [game]§f: Starts an Abba Game\n - §aabbaadmin calcscores§f: Use to calculate the scores and determine a winner at the end of a Match\n - §aabbaadmin config <game> <timer|addchest> ...§f: Configures an Abba Game\n - §aabbaadmin reload§f: Reloads the config";
+	/*
+	public static String errorGameFull = "§cThis game is full!";
+	public static String errorGameClosed = "§cThis game is closed!";
+	public static String errorNoChest = "§cThere aren't enough chests!";
+	public static String errorNotWhitelisted = "§cYou aren't whitelisted for this game!";
+	public static String errorBlacklisted = "§cYou are blacklisted for this game!";
+	*/
+	public static String gameJoinMessage;
+	public static String gameLeaveMessage;
+	public static String playerJoinMessage;
+	public static String playerLeaveMessage;
+	
+	public static String errorNoGames;
+	public static String errorNoPermission;
+	public static String errorMustBeInGame;
+	public static String errorGameNotFound;
 	
+	public static String errorGameFull;
+	public static String errorGameClosed;
+	public static String errorNoChest;
+	public static String errorNotWhitelisted;
+	public static String errorBlacklisted;
 	
-	public static final String basicHelpMessage = "Usage:\n - §aabba join§f: Joins the Abba Match\n - §aabba leave§f: Leaves current Abba Game\n - §aabba info§f: Displays info about an Abba Match\n - §aabba list§f: Lists all Abba Matches\n - §aabba calc§f: Calculates the score of your current inventory";
-	public static final String adminHelpMessage = "Usage:\n - §aabbaadmin create [game]§f: Creates an Abba Game\n - §aabbaadmin remove <game>§f: Removes an Abba Game\n - §aabbaadmin open [game]§f: Allows players to join an Abba Game\n - §aabbaadmin close [game]§f: Prevents players from joining an Abba Game\n - §aabbaadmin start [game]§f: Starts an Abba Game\n - §aabbaadmin calcscores§f: Use to calculate the scores and determine a winner at the end of a Match\n - §aabbaadmin config <game> <timer|addchest> ...§f: Configures an Abba Game\n - §aabbaadmin reload§f: Reloads the config";
+	public static String helpJoin;
+	public static String helpLeave;
+	public static String helpInfo;
+	public static String helpList;
+	public static String helpCalc;
 	
-	public static final String gameFullError = "§cThis game is full!";
-	public static final String gameClosedError = "§cThis game is closed!";
-	public static final String gameNoChestError = "§cThere aren't enough chests!";
-	public static final String gameNotWhiteListedError = "§cYou aren't whitelisted for this game!";
-	public static final String gameBlackListedError = "§cYou are blacklisted for this game!";
+	//admin cmds
+	public static String helpCreate;
+	public static String helpRemove;
+	public static String helpOpen;
+	public static String helpClose;
+	public static String helpStart;
+	public static String helpCalcScores;
+	public static String helpReload;
+	public static String helpConfig;
 	
+	public static void reload(FileConfiguration langFile){
+		gameJoinMessage = langFile.getString("msg.gameJoin");
+		gameLeaveMessage = langFile.getString("msg.gameLeave");
+		playerJoinMessage = langFile.getString("msg.playerJoin");
+		playerLeaveMessage = langFile.getString("msg.playerLeave");
+		
+		
+		errorNoPermission = langFile.getString("error.noPermission");
+		errorMustBeInGame = langFile.getString("error.mustBeInGame");
+		errorGameNotFound = langFile.getString("error.mustBeInGame");
+		errorNoGames = langFile.getString("error.noGames");
+		
+		errorGameFull = langFile.getString("error.gameFull");
+		errorGameClosed = langFile.getString("error.gameClosed");
+		errorNoChest = langFile.getString("error.noChest");
+		errorNotWhitelisted = langFile.getString("error.notWhitelisted");
+		errorBlacklisted = langFile.getString("error.blacklisted");
+		
+		helpJoin = langFile.getString("help.join");
+		helpLeave = langFile.getString("help.leave");
+		helpInfo = langFile.getString("help.info");
+		helpList = langFile.getString("help.list");
+		helpCalc = langFile.getString("help.calc");
+		
+		helpCreate = langFile.getString("help.create");
+		helpRemove = langFile.getString("help.remove");
+		helpOpen = langFile.getString("help.open");
+		helpClose = langFile.getString("help.close");
+		helpStart = langFile.getString("help.start");
+		helpCalcScores = langFile.getString("help.calcscores");
+		helpReload = langFile.getString("help.reload");
+		helpConfig = langFile.getString("help.config");
+		
+		//TODO
+	}
 }