From 7ca30596227d5b91c4f65970dc7ee6c467816a0e Mon Sep 17 00:00:00 2001
From: SoRadGaming <47128515+SoRadGaming@users.noreply.github.com>
Date: Tue, 19 Jan 2021 11:58:26 +1100
Subject: [PATCH] Added Lang Options

---
 src/lang.yml                                       |  6 +++++-
 src/me/ryandw11/ultrachat/api/Lang.java            | 11 ++++++++---
 src/me/ryandw11/ultrachat/commands/ChannelCmd.java | 11 ++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/lang.yml b/src/lang.yml
index 826af88..cba4130 100644
--- a/src/lang.yml
+++ b/src/lang.yml
@@ -34,4 +34,8 @@ sjoin-other-show: '&b%p Join/Leave message will now be shown!'
 sjoin-other-hide: '&b%p Join/Leave message will no longer be shown!'
 help-page-error: '&cThere are only two help pages!'
 chat-color-change: 'Your chat color has been changed!'
-
+no-perm-channel: '&cYou do not have permission for this command.'
+no-perm-join: "You do not have permission to join that channel."
+channel-null: "That channel does not exist!"
+error-channel-in: "Error: you are currently in the channel"
+channel-change: "You are now in the channel %s !"
\ No newline at end of file
diff --git a/src/me/ryandw11/ultrachat/api/Lang.java b/src/me/ryandw11/ultrachat/api/Lang.java
index 2895da1..fb5a3db 100644
--- a/src/me/ryandw11/ultrachat/api/Lang.java
+++ b/src/me/ryandw11/ultrachat/api/Lang.java
@@ -40,10 +40,15 @@ public enum Lang {
 	SJOIN_OTHER_SHOW("sjoin-other-show", "&b%p Join/Leave message will now be shown!"),
 	SJOIN_OTHER_HIDE("sjoin-other-hide", "&b%p Join/Leave message will no longer be shown!"),
 	HELP_PAGE_ERROR("help-page-error", "&cThere are only two help pages!"),
-	CHAT_COLOR_CHANGE("chat-color-change", "Your chat color has been changed!");
+	CHAT_COLOR_CHANGE("chat-color-change", "Your chat color has been changed!"),
+	NO_PERM_CHANNEL("no-perm-channel", "&cYou do not have permission for this command."),
+	NO_PERM_JOIN("no-perm-join", "You do not have permission to join that channel." ),
+	CHANNEL_NULL("channel-null", "That channel does not exist!"),
+	ERROR_CHANNEL_IN("error-channel-in", "&cError: you are currently in the channel"),
+	CHANNEL_CHANGE("channel-change", "You are now in the channel %s !");
 
-	
-	 private String path;
+
+	private String path;
 	 private String def;
 	 private static YamlConfiguration LANG;
 	 
diff --git a/src/me/ryandw11/ultrachat/commands/ChannelCmd.java b/src/me/ryandw11/ultrachat/commands/ChannelCmd.java
index 4971cdf..5630988 100644
--- a/src/me/ryandw11/ultrachat/commands/ChannelCmd.java
+++ b/src/me/ryandw11/ultrachat/commands/ChannelCmd.java
@@ -26,7 +26,7 @@ public class ChannelCmd implements CommandExecutor {
 		plugin = UltraChat.plugin;
 	}
 	@Override
-	public boolean onCommand(CommandSender sender, Command cmd, String s, String[] args) {
+	public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String s, @NotNull String[] args) {
 
 
 		Player p = (Player) sender;
@@ -66,19 +66,20 @@ public class ChannelCmd implements CommandExecutor {
 		}
 		else{
 			if(!plugin.channel.contains(args[0])){
-				p.sendMessage(ChatColor.RED + "That channel does not exsist!");
+				p.sendMessage(Lang.CHANNEL_NULL.toString());
 				return true;
 			}
 			if(plugin.data.getString(p.getUniqueId() + ".channel").equalsIgnoreCase(args[0])){
-				p.sendMessage(ChatColor.RED + "Error: you are currently in the channel");
+				p.sendMessage(Lang.ERROR_CHANNEL_IN.toString());
 			}
 			else if(p.hasPermission(plugin.channel.getString(args[0] + ".permission")) || plugin.channel.getString(args[0] + ".permission").equalsIgnoreCase("none")){
 				plugin.data.set(p.getUniqueId() + ".channel", args[0]);
 				plugin.saveFile();
-				p.sendMessage(ChatColor.BLUE + "You are now in the channel " + args[0] + "!");
+				p.sendMessage(Lang.CHANNEL_CHANGE.toString().replace("%s", args[0]));
 			}
 			else{
-				p.sendMessage(ChatColor.RED + "You do not have permission to join that channel.");
+				p.sendMessage(Lang.NO_PERM_JOIN.toString());
+				p.sendMessage(Lang.NO_PERM_CHANNEL.toString());
 			}
 		}
 		return false;