From 259142f703a4ed9266509a7a071c1496cdf7c43b Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 18:16:43 +0500 Subject: [PATCH 1/6] Add rainbow commands --- .../command/Command_rainbownick.java | 60 +++++++++++++++++++ .../command/Command_rainbowtag.java | 44 ++++++++++++++ .../totalfreedommod/util/FUtil.java | 37 +++++++++--- 3 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java new file mode 100644 index 000000000..09c46db14 --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java @@ -0,0 +1,60 @@ +package me.totalfreedom.totalfreedommod.command; + +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.apache.commons.lang3.StringUtils; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) +@CommandParameters(description = "Essentials Interface Command - Rainbowify your nickname.", usage = "/ ") +public class Command_rainbownick extends FreedomCommand +{ + + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length != 1) + { + return false; + } + + final String nickPlain = ChatColor.stripColor(FUtil.colorize(args[0].trim())); + + if (!nickPlain.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$")) + { + msg("That nickname contains invalid characters."); + return true; + } + + if (nickPlain.length() < 4 || nickPlain.length() > 30) + { + msg("Your nickname must be between 4 and 30 characters long."); + return true; + } + + for (Player player : Bukkit.getOnlinePlayers()) + { + if (player == playerSender) + { + continue; + } + if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).trim().equalsIgnoreCase(nickPlain)) + { + msg("That nickname is already in use."); + return true; + } + } + + final String newNick = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(nickPlain))); + + plugin.esb.setNickname(sender.getName(), newNick); + + msg("Your nickname is now: " + newNick); + + return true; + } +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java new file mode 100644 index 000000000..c389eaab8 --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -0,0 +1,44 @@ +package me.totalfreedom.totalfreedommod.command; + +import java.util.Iterator; +import static me.totalfreedom.totalfreedommod.command.Command_tag.FORBIDDEN_WORDS; +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.apache.commons.lang3.StringUtils; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) +@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ", aliases = "tn") +public class Command_rainbowtag extends FreedomCommand +{ + + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length < 1) + { + return false; + } + + final String tag = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")))); + + for (String word : FORBIDDEN_WORDS) + { + if (tag.contains(word)) + { + msg("That tag contains a forbidden word."); + return true; + } + } + + plugin.pl.getPlayer(playerSender).setTag(tag); + + msg("Set tag to " + tag); + + return true; + } +} + \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index 5a3272978..583501667 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -40,18 +41,19 @@ public class FUtil public static String DATE_STORAGE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z"; public static final Map CHAT_COLOR_NAMES = new HashMap<>(); public static final List CHAT_COLOR_POOL = Arrays.asList( - ChatColor.DARK_BLUE, - ChatColor.DARK_GREEN, - ChatColor.DARK_AQUA, ChatColor.DARK_RED, - ChatColor.DARK_PURPLE, + ChatColor.RED, ChatColor.GOLD, - ChatColor.BLUE, + ChatColor.YELLOW, ChatColor.GREEN, + ChatColor.DARK_GREEN, ChatColor.AQUA, - ChatColor.RED, - ChatColor.LIGHT_PURPLE, - ChatColor.YELLOW); + ChatColor.DARK_AQUA, + ChatColor.BLUE, + ChatColor.DARK_BLUE, + ChatColor.DARK_PURPLE, + ChatColor.LIGHT_PURPLE); + private static Iterator CHAT_COLOR_ITERATOR; static { @@ -368,6 +370,25 @@ public static ChatColor randomChatColor() { return CHAT_COLOR_POOL.get(RANDOM.nextInt(CHAT_COLOR_POOL.size())); } + + public static String rainbowify(String string) + { + CHAT_COLOR_ITERATOR = CHAT_COLOR_POOL.iterator(); + + final StringBuilder newString = new StringBuilder(); + final char[] chars = string.toCharArray(); + + for (char c : chars) + { + if (!CHAT_COLOR_ITERATOR.hasNext()) + { + CHAT_COLOR_ITERATOR = CHAT_COLOR_POOL.iterator(); //Restart from first colour if there are no more colours in iterator. + } + newString.append(FUtil.CHAT_COLOR_ITERATOR.next()).append(c); + } + + return newString.toString(); + } public static String colorize(String string) { From ef14c66f76deb195d861628b4ee498d0a269159e Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 18:48:08 +0500 Subject: [PATCH 2/6] Create Command_rainbowtag.java --- .../totalfreedommod/command/Command_rainbowtag.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index c389eaab8..12a0d81c1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ", aliases = "tn") +@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ") public class Command_rainbowtag extends FreedomCommand { @@ -41,4 +41,4 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin return true; } } - \ No newline at end of file + From 2ff09d50439e5917ac968b49e315d9590e7a5c58 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 18:49:16 +0500 Subject: [PATCH 3/6] don't import as static --- .../totalfreedommod/command/Command_rainbowtag.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index 12a0d81c1..a29c9a015 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.command; import java.util.Iterator; -import static me.totalfreedom.totalfreedommod.command.Command_tag.FORBIDDEN_WORDS; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang3.StringUtils; @@ -25,7 +24,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin final String tag = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")))); - for (String word : FORBIDDEN_WORDS) + for (String word : Command_tag.FORBIDDEN_WORDS) { if (tag.contains(word)) { From 54cf41f5a0c9086e858dd1962cad46d919510fc9 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 19:06:25 +0500 Subject: [PATCH 4/6] This is FUtil. --- src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index 583501667..f69727b32 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -384,7 +384,7 @@ public static String rainbowify(String string) { CHAT_COLOR_ITERATOR = CHAT_COLOR_POOL.iterator(); //Restart from first colour if there are no more colours in iterator. } - newString.append(FUtil.CHAT_COLOR_ITERATOR.next()).append(c); + newString.append(CHAT_COLOR_ITERATOR.next()).append(c); } return newString.toString(); From 0a9b9f8d5b1812bf0415063fadd55baf6f3108b1 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 14 Aug 2017 09:46:23 +0500 Subject: [PATCH 5/6] Add character limit. --- .../totalfreedommod/command/Command_rainbowtag.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index a29c9a015..b46c81738 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -21,8 +21,14 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin { return false; } - - final String tag = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")))); + + final String tag = ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " "))); + + if(tag.length() > 20) + { + msg("That tag is too long (Max is 20 characters).); + return true; + } for (String word : Command_tag.FORBIDDEN_WORDS) { @@ -33,7 +39,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin } } - plugin.pl.getPlayer(playerSender).setTag(tag); + plugin.pl.getPlayer(playerSender).setTag(FUtil.rainbowify(tag)); msg("Set tag to " + tag); From e6598aaba33c04378e2fc8ae4b4ced2c99c2a0c1 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 14 Aug 2017 10:47:37 +0500 Subject: [PATCH 6/6] add double quote mark --- .../totalfreedommod/command/Command_rainbowtag.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index b46c81738..38c8e2fe5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -26,7 +26,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin if(tag.length() > 20) { - msg("That tag is too long (Max is 20 characters).); + msg("That tag is too long (Max is 20 characters)."); return true; }