Added locale file messages.yml for translation

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>no.vestlandetmc.bfc</groupId>
 	<artifactId>BanFromClaim</artifactId>
-	<version>1.0</version>
+	<version>1.1</version>
 	<packaging>jar</packaging>
 
 	<name>BanFromClaim</name>

src/main/java/no/vestlandetmc/BanFromClaim/BfcPlugin.java

@@ -14,6 +14,7 @@
 import no.vestlandetmc.BanFromClaim.commands.BfclistCommand;
 import no.vestlandetmc.BanFromClaim.commands.UnbfcCommand;
 import no.vestlandetmc.BanFromClaim.config.ClaimData;
+import no.vestlandetmc.BanFromClaim.config.Messages;
 import no.vestlandetmc.BanFromClaim.handler.MessageHandler;
 import no.vestlandetmc.BanFromClaim.handler.UpdateNotification;
 import no.vestlandetmc.BanFromClaim.listener.BfcListener;
@@ -55,6 +56,7 @@ public void onEnable() {
 		this.getServer().getPluginManager().registerEvents(new BfcListener(), this);
 
 		createDatafile();
+		Messages.initialize();
 		ClaimData.createSection();
 
 		new BukkitRunnable() {
@@ -70,8 +72,8 @@ public void run() {
 			@Override
 			public void onUpdateAvailable() {
 				MessageHandler.sendConsole("&c-----------------------");
-				MessageHandler.sendConsole("&6[" + getDescription().getPrefix() + "] &7Version " + getLatestVersion() + " is now available!");
-				MessageHandler.sendConsole("&6[" + getDescription().getPrefix() + "] &7Download the update at https://www.spigotmc.org/resources/" + getProjectId());
+				MessageHandler.sendConsole("&2[" + getDescription().getPrefix() + "] &7Version " + getLatestVersion() + " is now available!");
+				MessageHandler.sendConsole("&2[" + getDescription().getPrefix() + "] &7Download the update at https://www.spigotmc.org/resources/" + getProjectId());
 				MessageHandler.sendConsole("&c-----------------------");
 			}
 		}.runTaskAsynchronously(this);

src/main/java/no/vestlandetmc/BanFromClaim/commands/BfcCommand.java

@@ -10,6 +10,7 @@
 import me.ryanhamshire.GriefPrevention.Claim;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import no.vestlandetmc.BanFromClaim.config.ClaimData;
+import no.vestlandetmc.BanFromClaim.config.Messages;
 import no.vestlandetmc.BanFromClaim.handler.MessageHandler;
 
 public class BfcCommand implements CommandExecutor {
@@ -26,12 +27,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		final Claim claim = GriefPrevention.instance.dataStore.getClaimAt(loc, true, null);
 
 		if(args.length == 0) {
-			MessageHandler.sendMessage(player, "&cYou have to type in a player name.");
+			MessageHandler.sendMessage(player, Messages.NO_ARGUMENTS);
 			return true;
 		}
 
 		if(claim == null) {
-			MessageHandler.sendMessage(player, "&cPlease make sure you are standing inside your claim.");
+			MessageHandler.sendMessage(player, Messages.OUTSIDE_CLAIM);
 			return true;
 		}
 
@@ -43,22 +44,22 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		if(player.hasPermission("bfc.admin")) { allowBan = true; }
 
 		if(bannedPlayer == null) {
-			MessageHandler.sendMessage(player, "&cMust enter a valid player name or the player is offline.");
+			MessageHandler.sendMessage(player, Messages.placeholders(Messages.UNVALID_PLAYERNAME, args[0], player.getDisplayName(), null));
 			return true;
 		} else {
 			if(bannedPlayer == player) {
-				MessageHandler.sendMessage(player, "&cYou can not banish yourself.");
+				MessageHandler.sendMessage(player, Messages.BAN_SELF);
 				return true;
 			}
 		}
 
 		if(bannedPlayer.hasPermission("bfc.bypass")) {
-			MessageHandler.sendMessage(player, "&4" + bannedPlayer.getName() + " &cis protected and can not be banned from your claim.");
+			MessageHandler.sendMessage(player, Messages.placeholders(Messages.PROTECTED, bannedPlayer.getDisplayName(), null, null));
 			return true;
 		}
 
 		if(!allowBan) {
-			MessageHandler.sendMessage(player, "&cThis is not your claim or you do not have PermissionTrust.");
+			MessageHandler.sendMessage(player, Messages.NO_ACCESS);
 			return true;
 		} else {
 			final String claimOwner = claim.getOwnerName();
@@ -69,10 +70,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 						GriefPrevention.instance.ejectPlayer(bannedPlayer);
 					}
 				}
-				MessageHandler.sendMessage(player, "&6" + bannedPlayer.getName() + " &ehas been banish from your claim!");
-				MessageHandler.sendMessage(bannedPlayer, "&cYou have been banned from &4" + claimOwner + "'s &cclaim by &4" + player.getName() + "&c.");
+				MessageHandler.sendMessage(player, Messages.placeholders(Messages.BANNED, bannedPlayer.getDisplayName(), null, null));
+				MessageHandler.sendMessage(bannedPlayer, Messages.placeholders(Messages.BANNED_TARGET, bannedPlayer.getDisplayName(), player.getDisplayName(), claimOwner));
 			} else {
-				MessageHandler.sendMessage(player, "&cThis player is already banned from your claim.");
+				MessageHandler.sendMessage(player, Messages.ALREADY_BANNED);
 			}
 
 		}

src/main/java/no/vestlandetmc/BanFromClaim/commands/BfclistCommand.java

@@ -14,6 +14,7 @@
 import me.ryanhamshire.GriefPrevention.Claim;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import no.vestlandetmc.BanFromClaim.config.ClaimData;
+import no.vestlandetmc.BanFromClaim.config.Messages;
 import no.vestlandetmc.BanFromClaim.handler.MessageHandler;
 
 public class BfclistCommand implements CommandExecutor {
@@ -40,13 +41,13 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				this.countFrom = (5 * number) - 5;
 			}
 			else {
-				MessageHandler.sendMessage(player, "&cType a valid number.");
+				MessageHandler.sendMessage(player, Messages.UNVALID_NUMBER);
 				return true;
 			}
 		}
 
 		if(claim == null) {
-			MessageHandler.sendMessage(player, "&cPlease make sure you are standing inside your claim.");
+			MessageHandler.sendMessage(player, Messages.OUTSIDE_CLAIM);
 			return true;
 		}
 
@@ -59,13 +60,13 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		int totalPage = 1;
 
 		if(!allowBan) {
-			MessageHandler.sendMessage(player, "&cThis is not your claim or you do not have PermissionTrust.");
+			MessageHandler.sendMessage(player, Messages.NO_ACCESS);
 			return true;
 
 		} else {
-			MessageHandler.sendMessage(player, "&e---- ===== [ &6Banned Players &e] ===== ----");
+			MessageHandler.sendMessage(player, Messages.placeholders(Messages.LIST_HEADER, null, player.getDisplayName(), claim.getOwnerName()));
 			if(listPlayers(claim.getID().toString()) == null) {
-				MessageHandler.sendMessage(player, "&cThere are no banned players in this claim.");
+				MessageHandler.sendMessage(player, Messages.placeholders(Messages.LIST_EMPTY, null, player.getDisplayName(), claim.getOwnerName()));
 				return true;
 			} else {
 				totalPage = (listPlayers(claim.getID().toString()).size() / 5) + 1;

src/main/java/no/vestlandetmc/BanFromClaim/commands/UnbfcCommand.java

@@ -14,6 +14,7 @@
 import me.ryanhamshire.GriefPrevention.Claim;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import no.vestlandetmc.BanFromClaim.config.ClaimData;
+import no.vestlandetmc.BanFromClaim.config.Messages;
 import no.vestlandetmc.BanFromClaim.handler.MessageHandler;
 
 public class UnbfcCommand implements CommandExecutor {
@@ -30,12 +31,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		final Claim claim = GriefPrevention.instance.dataStore.getClaimAt(loc, true, null);
 
 		if(args.length == 0) {
-			MessageHandler.sendMessage(player, "&cYou have to type in a player name.");
+			MessageHandler.sendMessage(player, Messages.NO_ARGUMENTS);
 			return true;
 		}
 
 		if(claim == null) {
-			MessageHandler.sendMessage(player, "&cPlease make sure you are standing inside your claim.");
+			MessageHandler.sendMessage(player, Messages.OUTSIDE_CLAIM);
 			return true;
 		}
 
@@ -48,7 +49,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		OfflinePlayer bPlayer = null;
 
 		if(!allowBan) {
-			MessageHandler.sendMessage(player, "&cThis is not your claim or you do not have PermissionTrust.");
+			MessageHandler.sendMessage(player, Messages.NO_ACCESS);
 			return true;
 
 		} else {
@@ -61,9 +62,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 					if(bannedPlayer.getName().equalsIgnoreCase(args[0])) {
 						bPlayer = bannedPlayer;
 						if(setClaimData(player, claimID, bp, false)) {
-							MessageHandler.sendMessage(player, "&6" + bannedPlayer.getName() + " &ehas been unbanned from your claim!");
+							MessageHandler.sendMessage(player, Messages.placeholders(Messages.UNBANNED, bannedPlayer.getName(), player.getDisplayName(), claimOwner));
 							if(bannedPlayer.isOnline()) {
-								MessageHandler.sendMessage(bannedPlayer.getPlayer(), "&eYou have been unbanned from &6" + claimOwner + "'s &eclaim by &6" + player.getName() + "&e.");
+								MessageHandler.sendMessage(bannedPlayer.getPlayer(), Messages.placeholders(Messages.UNBANNED_TARGET, bannedPlayer.getName(), player.getDisplayName(), claimOwner));
 							}
 							return true;
 						}
@@ -72,7 +73,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			}
 		}
 
-		if(bPlayer == null) { MessageHandler.sendMessage(player, "&4" + args[0] + " &cis not a valid player name or not banned at your claim."); }
+		if(bPlayer == null) { MessageHandler.sendMessage(player, Messages.placeholders(Messages.NOT_BANNED, args[0], player.getDisplayName(), null)); }
 
 		return true;
 	}

src/main/java/no/vestlandetmc/BanFromClaim/config/ClaimData.java

@@ -137,9 +137,10 @@ public static void cleanDatafile() {
 				}
 			}
 
-			saveDatafile();
-
-			if(clean) { MessageHandler.sendConsole("&2[" + prefix + "] &eData storage has been cleared of old removed claims..."); }
+			if(clean) {
+				saveDatafile();
+				MessageHandler.sendConsole("&2[" + prefix + "] &eData storage has been cleared of old removed claims...");
+			}
 		}
 	}
 }

src/main/java/no/vestlandetmc/BanFromClaim/listener/BfcListener.java

@@ -4,6 +4,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
@@ -12,6 +13,7 @@
 import no.vestlandetmc.BanFromClaim.BfcPlugin;
 import no.vestlandetmc.BanFromClaim.config.ClaimData;
 import no.vestlandetmc.BanFromClaim.handler.MessageHandler;
+import no.vestlandetmc.BanFromClaim.handler.UpdateNotification;
 
 public class BfcListener implements Listener {
 
@@ -45,6 +47,19 @@ public void run() {
 		}
 	}
 
+	@EventHandler
+	public void playerJoin(PlayerJoinEvent p) {
+		final Player player = p.getPlayer();
+
+		if(player.isOp()) {
+			if(UpdateNotification.isUpdateAvailable()) {
+				MessageHandler.sendMessage(player, "&2" + BfcPlugin.getInstance().getDescription().getName() + " &ais outdated. Update is available!");
+				MessageHandler.sendMessage(player, "&aYour version is &2" + UpdateNotification.getCurrentVersion() + " &aand can be updated to version &2" + UpdateNotification.getLatestVersion());
+				MessageHandler.sendMessage(player, "&aGet the new update at &2https://www.spigotmc.org/resources/" + UpdateNotification.getProjectId());
+			}
+		}
+	}
+
 	private boolean playerBanned(Player player, Claim claim, String claimID) {
 		final ClaimData claimData = new ClaimData();
 		if(claimData.checkClaim(claimID)) {