diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java index 2ddc7637..1f391824 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java @@ -3,7 +3,6 @@ package com.onarandombox.MultiverseCore.commands; import java.util.ArrayList; import java.util.List; -import java.util.regex.Pattern; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -90,9 +89,7 @@ public class HelpCommand extends MultiverseCommand { private List getFilteredCommands(List availableCommands, String filter) { List filtered = new ArrayList(); - Pattern regex = Pattern.compile("regex", Pattern.CASE_INSENSITIVE); - - + for (Command c : availableCommands) { if (stitchThisString(c.getKeys()).matches("(?i).*" + filter + ".*")) { filtered.add(c); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java index 70fd01f9..8f2ed96e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java @@ -65,7 +65,7 @@ public class ModifyAddCommand extends MultiverseCommand { } if (world.addToList(property, value)) { - sender.sendMessage(value + " was added to " + property); + sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property); } else { sender.sendMessage(value + " could not be added to " + property); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java index df88bdea..7af16160 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java @@ -60,8 +60,9 @@ public class ModifyClearCommand extends MultiverseCommand { } if (world.clearList(property)) { sender.sendMessage(property + " was cleared. It contains 0 values now."); + sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was " + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now."); } else { - sender.sendMessage(property + " was NOT cleared."); + sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared."); } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java index c0bd44f8..4cab766e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java @@ -65,9 +65,9 @@ public class ModifyRemoveCommand extends MultiverseCommand { return; } if (world.removeFromList(property, value)) { - sender.sendMessage(value + " was removed from " + property); + sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property); } else { - sender.sendMessage(value + " could not be removed from " + property); + sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property); } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java index 454c2ba0..56beac6d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java @@ -63,7 +63,7 @@ public class ModifySetCommand extends MultiverseCommand { if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) { sender.sendMessage(value + " is not a valid color. Please see our Github Wiki for the complete color list."); } else if (world.setVariable(property, value)) { - sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + "Property " + ChatColor.AQUA + property + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value); + sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value); } else { sender.sendMessage(ChatColor.RED + "There was an error setting " + ChatColor.GRAY + property); }