Upstream
/
UltraChat
mirror of https://github.com/ryandw11/UltraChat.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19 from SoRadGaming/master 

Added more Lang Options
This commit is contained in:
Ryandw11 2021-01-18 19:10:48 -07:00 committed by GitHub
parent ba1106ca83 8da82e577e
commit 0d8168f16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang.yml
View File

@ -34,4 +34,7 @@ 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.'
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 !"

8
src/me/ryandw11/ultrachat/api/Lang.java
View File

@ -40,9 +40,13 @@ 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."),
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 def;
private static YamlConfiguration LANG;

10
src/me/ryandw11/ultrachat/commands/ChannelCmd.java
View File

@ -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,19 @@ 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_CHANNEL.toString());
}
}
return false;