Merged pull request #8.v5.2.0

55 files changed, 372 insertions, 78 deletions

diff --git a/src/com/redstoner/annotations/AutoRegisterListener.java b/src/main/java/com/redstoner/annotations/AutoRegisterListener.java
index fabdb5f..fabdb5f 100644
--- a/src/com/redstoner/annotations/AutoRegisterListener.java
+++ b/src/main/java/com/redstoner/annotations/AutoRegisterListener.java
diff --git a/src/com/redstoner/annotations/Commands.java b/src/main/java/com/redstoner/annotations/Commands.java
index 537bff0..537bff0 100644
--- a/src/com/redstoner/annotations/Commands.java
+++ b/src/main/java/com/redstoner/annotations/Commands.java
diff --git a/src/com/redstoner/annotations/Version.java b/src/main/java/com/redstoner/annotations/Version.java
index 52d5145..52d5145 100644
--- a/src/com/redstoner/annotations/Version.java
+++ b/src/main/java/com/redstoner/annotations/Version.java
diff --git a/src/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd
index eadeeb7..4e06bd0 100644
--- a/src/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd
+++ b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd
@@ -9,16 +9,6 @@ command modules {
 		perm moduleloader.modules.list; 
 		run list;
     }
-    -v {
-        help Lists all modules. Color indicates status: §aENABLED §cDISABLED;
-		perm moduleloader.modules.list; 
-		run listv;
-    }
-    list -v {
-		help Lists all modules. Color indicates status: §aENABLED §cDISABLED;
-		perm moduleloader.modules.list; 
-		run listv;
-    }
     load [string:name...] {
         help (Re)-Loads a module. WARNING: Handle with care! This has direct affect on code being executed. This command will temporarily halt the main thread until the class loading operation was completed.;
         perm moduleloader.modules.admin;
diff --git a/src/com/redstoner/coremods/moduleLoader/ModuleLoader.java b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java
index b4fbbe4..3886dd1 100644
--- a/src/com/redstoner/coremods/moduleLoader/ModuleLoader.java
+++ b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java
@@ -1,14 +1,15 @@
 package com.redstoner.coremods.moduleLoader;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -18,6 +19,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import com.nemez.cmdmgr.Command;
 import com.nemez.cmdmgr.Command.AsyncType;
@@ -25,8 +27,9 @@ import com.nemez.cmdmgr.CommandManager;
 import com.redstoner.annotations.AutoRegisterListener;
 import com.redstoner.annotations.Commands;
 import com.redstoner.annotations.Version;
-import com.redstoner.exceptions.MissingVersionException;
+import com.redstoner.logging.PrivateLogManager;
 import com.redstoner.misc.Main;
+import com.redstoner.misc.ModuleInfo;
 import com.redstoner.misc.VersionHelper;
 import com.redstoner.modules.CoreModule;
 import com.redstoner.modules.Module;
@@ -37,11 +40,13 @@ import net.nemez.chatapi.click.Message;
 /** The module loader, mother of all modules. Responsible for loading and taking care of all modules.
  * 
  * @author Pepich */
-@Version(major = 4, minor = 0, revision = 1, compatible = 4)
+@Version(major = 5, minor = 2, revision = 0, compatible = 5)
 public final class ModuleLoader implements CoreModule
 {
 	private static ModuleLoader instance;
 	private static final HashMap<Module, Boolean> modules = new HashMap<>();
+	private static HashMap<Module, ModuleInfo> moduleInfos = new HashMap<>();
+	private static HashMap<String, List<Module>> categorizes = new HashMap<>();
 	private static URL[] urls;
 	private static URLClassLoader mainLoader;
 	private static HashMap<Module, URLClassLoader> loaders = new HashMap<>();
@@ -70,7 +75,9 @@ public final class ModuleLoader implements CoreModule
 	{
 		if (instance == null)
 			instance = new ModuleLoader();
-		loggers.put(instance, new ModuleLogger("ModuleLoader"));
+		ModuleInfo info = new ModuleInfo(ModuleLoader.class.getResourceAsStream("module.info"), instance);
+		moduleInfos.put(instance, info);
+		loggers.put(instance, new ModuleLogger(info.getDisplayName()));
 		CommandManager.registerCommand(ModuleLoader.class.getResourceAsStream("ModuleLoader.cmd"), instance,
 				Main.plugin);
 	}
@@ -233,7 +240,35 @@ public final class ModuleLoader implements CoreModule
 	{
 		try
 		{
-			loggers.put(module, new ModuleLogger(module.getClass().getSimpleName()));
+			InputStream infoFile = null;
+			
+			if (VersionHelper.isCompatible(VersionHelper.create(5, 0, 0, 5), module.getClass())) {
+				String basePath = "plugins/ModuleLoader/classes/" + module.getClass().getName().replace(".", "/"); 
+			
+				try {
+					infoFile = new FileInputStream(
+							new File(basePath.substring(0, basePath.lastIndexOf('/')+1) + "module.info"));
+				}
+				catch(Exception e) {
+					infoFile = null;
+				}
+			}
+			ModuleInfo info = new ModuleInfo(infoFile, module);
+			
+			moduleInfos.put(module, info);
+			
+			String category = info.getCategory();
+			if (!categorizes.containsKey(category)) 
+				categorizes.put(category, new ArrayList<>(Arrays.asList(module)));
+			else {
+				List<Module> modsInCat = categorizes.get(category);
+				modsInCat.add(module);
+				categorizes.put(category, modsInCat);
+			}
+				
+				loggers.put(module, new ModuleLogger(info.getDisplayName()));
+				
+			
 			if (module.onEnable())
 			{
 				modules.put(module, true);
@@ -241,9 +276,9 @@ public final class ModuleLoader implements CoreModule
 					module.firstLoad();
 				else if (!VersionHelper.getVersion(module.getClass()).equals(VersionHelper.getString(oldVersion)))
 					module.migrate(oldVersion);
-				if (VersionHelper.isCompatible(VersionHelper.create(4, 0, 0, 3), module.getClass()))
+				if (VersionHelper.isCompatible(VersionHelper.create(5, 0, 0, 3), module.getClass()))
 					module.postEnable();
-				if (VersionHelper.isCompatible(VersionHelper.create(4, 0, 0, 4), module.getClass()))
+				if (VersionHelper.isCompatible(VersionHelper.create(5, 0, 0, 4), module.getClass()))
 				{
 					Commands ann = module.getClass().getAnnotation(Commands.class);
 					if (ann != null)
@@ -288,50 +323,31 @@ public final class ModuleLoader implements CoreModule
 	@Command(hook = "list", async = AsyncType.ALWAYS)
 	public boolean listModulesCommand(CommandSender sender)
 	{
-		Message m = new Message(sender, null);
-		m.appendText(getLogger().getHeader());
-		m.appendText("§2Modules:\n&e");
-		Module[] modules = ModuleLoader.modules.keySet().toArray(new Module[] {});
-		for (int i = 0; i < modules.length; i++)
-		{
-			Module module = modules[i];
-			String[] classPath = module.getClass().getName().split("\\.");
-			String classname = classPath[classPath.length - 1];
-			m.appendText((ModuleLoader.modules.get(module) ? "§a" : "§c") + classname);
-			if (i + 1 < modules.length)
-				m.appendText("§7, ");
-		}
-		m.send();
-		return true;
-	}
-	
-	/** This method lists all modules to the specified CommandSender. The modules will be color coded correspondingly to their enabled status.
-	 * 
-	 * @param sender The person to send the info to, usually the issuer of the command or the console sender.
-	 * @return true. */
-	@Command(hook = "listv", async = AsyncType.ALWAYS)
-	public boolean listModulesCommandVersion(CommandSender sender)
-	{
-		Message m = new Message(sender, null);
-		m.appendText(getLogger().getHeader());
-		m.appendText("§2Modules:\n&e");
-		Module[] modules = ModuleLoader.modules.keySet().toArray(new Module[] {});
-		for (int i = 0; i < modules.length; i++)
-		{
-			Module module = modules[i];
-			String[] classPath = module.getClass().getName().split("\\.");
-			String classname = classPath[classPath.length - 1];
-			try
-			{
-				m.appendText((ModuleLoader.modules.get(module) ? "§a" : "§c") + classname + "§e("
-						+ VersionHelper.getVersion(module.getClass()) + ")");
-			}
-			catch (MissingVersionException e)
-			{
-				m.appendText((ModuleLoader.modules.get(module) ? "§a" : "§c") + classname + "§c" + "(Unknown Version)");
-			}
-			if (i + 1 < modules.length)
-				m.appendText("§7, ");
+		boolean hasCategorys = hasCategories();
+		Message m = new Message(sender, null);	
+		ModuleInfo ml_info = moduleInfos.get(instance);
+		
+		m.appendText("§2--=[ ")
+		 .appendTextHover("§2" + ml_info.getDisplayName(), ml_info.getModuleInfoHover())
+		 .appendText("§2 ]=--\nModules:\n");
+		
+		for (String cat: categorizes.keySet()) {
+			if (hasCategorys)
+				m.appendText("\n&7" + cat + ":\n");
+			
+			int curModule = 1;
+			List<Module> mods = categorizes.get(cat);
+			for (Module mod : mods) {
+				
+				ModuleInfo info = moduleInfos.get(mod);				
+				m.appendTextHover((modules.get(mod) ? "§a" : "§c") + info.getDisplayName(), info.getModuleInfoHover());
+				
+				if (curModule != mods.size())
+					m.appendText("&7, ");
+				curModule++;
+			}
+			m.appendText("\n");
+			
 		}
 		m.send();
 		return true;
@@ -354,8 +370,8 @@ public final class ModuleLoader implements CoreModule
 			{
 				HandlerList.unregisterAll((Listener) module);
 			}
-			String[] commands = getAllHooks(module).toArray(new String[] {});
-			CommandManager.unregisterAll(commands);
+			CommandManager.unregisterAllWithFallback(module.getClass().getSimpleName());
+			PrivateLogManager.unregister(module);
 			try
 			{
 				URLClassLoader loader = loaders.get(module);
@@ -371,19 +387,6 @@ public final class ModuleLoader implements CoreModule
 		}
 	}
 	
-	private static ArrayList<String> getAllHooks(Module module)
-	{
-		ArrayList<String> commands = new ArrayList<>();
-		for (Method m : module.getClass().getMethods())
-		{
-			Command cmd = m.getDeclaredAnnotation(Command.class);
-			if (cmd == null)
-				continue;
-			commands.add(cmd.hook());
-		}
-		return commands;
-	}
-	
 	@Command(hook = "load")
 	public boolean loadModule(CommandSender sender, String name)
 	{
@@ -523,6 +526,9 @@ public final class ModuleLoader implements CoreModule
 				disableModule(m);
 				instance.getLogger().info("Disabled module, overriding the implementation");
 				modules.remove(m);
+				categorizes.get(moduleInfos.get(m).getCategory()).remove(m);
+				moduleInfos.remove(m);
+				
 				try
 				{
 					if (loaders.containsKey(m))
@@ -614,6 +620,8 @@ public final class ModuleLoader implements CoreModule
 				instance.getLogger().info("Attempting to disable module properly:");
 				disableModule(m);
 				modules.remove(m);
+				categorizes.get(moduleInfos.get(m).getCategory()).remove(m);
+				moduleInfos.remove(m);
 				instance.getLogger().info("Disabled module.");
 				return true;
 			}
@@ -733,4 +741,12 @@ public final class ModuleLoader implements CoreModule
 			e.printStackTrace();
 		}
 	}
+	
+	public static JavaPlugin getPlugin() {
+		return Main.plugin;
+	}
+	
+	public static boolean hasCategories() {
+		return !(categorizes.size() == 1 && categorizes.containsKey("Other"));
+	}
 }
diff --git a/src/com/redstoner/exceptions/MissingVersionException.java b/src/main/java/com/redstoner/exceptions/MissingVersionException.java
index 62032b6..62032b6 100644
--- a/src/com/redstoner/exceptions/MissingVersionException.java
+++ b/src/main/java/com/redstoner/exceptions/MissingVersionException.java
diff --git a/src/com/redstoner/exceptions/NonSaveableConfigException.java b/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java
index df33bff..df33bff 100644
--- a/src/com/redstoner/exceptions/NonSaveableConfigException.java
+++ b/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java
diff --git a/src/main/java/com/redstoner/logging/Log4JFilter.java b/src/main/java/com/redstoner/logging/Log4JFilter.java
new file mode 100644
index 0000000..1ebed09
--- /dev/null
+++ b/src/main/java/com/redstoner/logging/Log4JFilter.java
@@ -0,0 +1,54 @@
+package com.redstoner.logging;
+    
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
+import org.apache.logging.log4j.message.Message;
+
+public class Log4JFilter extends AbstractFilter {
+
+    private static final long serialVersionUID = -5594073755007974254L;
+
+    private static Result validateMessage(Message message) {
+        if (message == null) {
+            return Result.NEUTRAL;
+        }
+        return validateMessage(message.getFormattedMessage());
+    }
+
+    private static Result validateMessage(String message) {
+        return PrivateLogManager.isHidden(message)
+            ? Result.DENY
+            : Result.NEUTRAL;
+    }
+
+    @Override
+    public Result filter(LogEvent event) {
+        Message candidate = null;
+        if (event != null) {
+            candidate = event.getMessage();
+        }
+        return validateMessage(candidate);
+    }
+
+    @Override
+    public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) {
+        return validateMessage(msg);
+    }
+
+    @Override
+    public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) {
+        return validateMessage(msg);
+    }
+
+    @Override
+    public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) {
+        String candidate = null;
+        if (msg != null) {
+            candidate = msg.toString();
+        }
+        return validateMessage(candidate);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/redstoner/logging/PrivateLogManager.java b/src/main/java/com/redstoner/logging/PrivateLogManager.java
new file mode 100644
index 0000000..e8451e0
--- /dev/null
+++ b/src/main/java/com/redstoner/logging/PrivateLogManager.java
@@ -0,0 +1,89 @@
+package com.redstoner.logging;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+
+import com.redstoner.misc.Utils;
+import com.redstoner.modules.Module;
+import com.redstoner.modules.ModuleLogger;
+
+public class PrivateLogManager {
+
+	private static Map<String, Module> registrar = new HashMap<>();
+	private static Map<String, String> commands = new HashMap<>();
+	
+	private static final String ISSUED_COMMAND_TEXT = "issued server command: /";
+	private static final int ISSUED_COMMAND_TEXT_LENGTH = ISSUED_COMMAND_TEXT.length();
+	
+	private static ModuleLogger logger;
+	
+	public static void initialize() {
+		org.apache.logging.log4j.core.Logger logger;
+        logger = (org.apache.logging.log4j.core.Logger) LogManager.getRootLogger();
+        logger.addFilter(new Log4JFilter());
+        PrivateLogManager.logger = new ModuleLogger("PrivateLogManager");
+	}
+	
+	public static void register(Module module, String command, String replacement) {
+		command = command.toLowerCase();
+		registrar.put(command, module);
+		commands.put(command, replacement);
+		logger.info(module.getClass().getSimpleName() + " registered &e/" + command
+				 + (replacement.equals("")? "&7. Command will not be logged!"
+				  		                  : "&7, using replacement, &e" + replacement + "&7."));
+	}
+	
+	public static void unregister(Module module) {
+		String unregestered = "";
+		Iterator<Map.Entry<String, Module>> i = registrar.entrySet().iterator();
+		while (i.hasNext()) {
+			Map.Entry<String, Module> entry = i.next();
+			if (entry.getValue() == module) {
+				i.remove();
+				commands.remove(entry.getKey());
+				unregestered += "&e" + entry.getKey() + "&7, ";
+			}
+		}
+		if (!unregestered.equals(""))
+			logger.info("Unregistered " + unregestered.substring(0, unregestered.length() - 2) + "&7 for module, " + module.getClass().getSimpleName() + ".");
+	}
+	
+	public static void unregister(Module module, String... toRemove) {
+		String unregestered = "";
+		for (int i = 0; i < toRemove.length; i++) {
+			String command = toRemove[i].toLowerCase();
+			registrar.remove(command);
+			if (commands.remove(command) != null)
+				unregestered += "&e" + command + "&7, ";
+		}
+		if (!unregestered.equals(""))
+			logger.info(module.getClass().getSimpleName() + " unregistered " + unregestered.substring(0, unregestered.length() - 2) + "&7.");
+	}
+	
+	public static boolean isHidden(String message) {
+        if (message == null)
+            return false;
+        
+    	int index = message.indexOf(ISSUED_COMMAND_TEXT);
+    	if (index == -1)
+    		return false;
+    	
+    	String command = message.substring(index + ISSUED_COMMAND_TEXT_LENGTH);
+    		
+    	int spaceIndex = command.indexOf(" ");
+    	command = spaceIndex == -1? command.toLowerCase() : command.substring(0, spaceIndex).toLowerCase();
+    	
+    	String replacement = commands.get(command);
+    	if (replacement == null)
+    		return false;
+    	if (replacement.equals(""))
+    		return true;
+    	
+    	String player = message.substring(0, message.indexOf(" "));
+		Utils.run(() -> System.out.println(replacement.replace("$s", player)));
+		return true;
+	}
+}
diff --git a/src/com/redstoner/misc/BroadcastFilter.java b/src/main/java/com/redstoner/misc/BroadcastFilter.java
index 1f0ce04..1f0ce04 100644
--- a/src/com/redstoner/misc/BroadcastFilter.java
+++ b/src/main/java/com/redstoner/misc/BroadcastFilter.java
diff --git a/src/com/redstoner/misc/CommandHolderType.java b/src/main/java/com/redstoner/misc/CommandHolderType.java
index 7c4383e..7c4383e 100644
--- a/src/com/redstoner/misc/CommandHolderType.java
+++ b/src/main/java/com/redstoner/misc/CommandHolderType.java
diff --git a/src/com/redstoner/misc/JsonManager.java b/src/main/java/com/redstoner/misc/JsonManager.java
index 13b51b6..13b51b6 100644
--- a/src/com/redstoner/misc/JsonManager.java
+++ b/src/main/java/com/redstoner/misc/JsonManager.java
diff --git a/src/com/redstoner/misc/Main.java b/src/main/java/com/redstoner/misc/Main.java
index b24e532..40894ee 100644
--- a/src/com/redstoner/misc/Main.java
+++ b/src/main/java/com/redstoner/misc/Main.java
@@ -4,6 +4,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import com.redstoner.annotations.Version;
 import com.redstoner.coremods.moduleLoader.ModuleLoader;
+import com.redstoner.logging.PrivateLogManager;
 import com.redstoner.misc.mysql.MysqlHandler;
 
 import net.nemez.chatapi.ChatAPI;
@@ -11,7 +12,7 @@ import net.nemez.chatapi.ChatAPI;
 /** Main class. Duh.
  * 
  * @author Pepich */
-@Version(major = 4, minor = 0, revision = 0, compatible = -1)
+@Version(major = 5, minor = 1, revision = 0, compatible = -1)
 public class Main extends JavaPlugin
 {
 	public static JavaPlugin plugin;
@@ -20,6 +21,9 @@ public class Main extends JavaPlugin
 	public void onEnable()
 	{
 		plugin = this;
+		
+		PrivateLogManager.initialize();
+		
 		ChatAPI.initialize(this);
 		// Configger.init();
 		MysqlHandler.init();
diff --git a/src/main/java/com/redstoner/misc/ModuleInfo.java b/src/main/java/com/redstoner/misc/ModuleInfo.java
new file mode 100644
index 0000000..e96e813
--- /dev/null
+++ b/src/main/java/com/redstoner/misc/ModuleInfo.java
@@ -0,0 +1,81 @@
+package com.redstoner.misc;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.redstoner.coremods.moduleLoader.ModuleLoader;
+import com.redstoner.exceptions.MissingVersionException;
+import com.redstoner.modules.Module;
+
+public class ModuleInfo {
+
+	private String simpleName;
+	private String displayName;
+	private String category;
+	private String description;
+	private String version;
+	
+	private String warning;
+	
+	public ModuleInfo(InputStream descriptor, Module module) {
+		try {
+			InputStreamReader reader = new InputStreamReader(descriptor);
+			FileConfiguration config = YamlConfiguration.loadConfiguration(reader);
+		
+			displayName = config.getString("displayName");
+			category = config.getString("category");
+			description = config.getString("description");
+		}
+		catch (Exception e) {
+			warning = "Descriptor file could not be loaded, using the class's name.";
+		}
+		
+		simpleName = module.getClass().getSimpleName();
+		
+		if (displayName == null)
+			displayName = simpleName;
+		
+		if (category == null)
+			category = "Other";
+		
+		try {
+			version = VersionHelper.getVersion(module.getClass());
+		} catch (MissingVersionException e) {}
+	}
+
+	public String getSimpleName() {
+		return simpleName;
+	}
+	
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public String getWarning() {
+		return warning;
+	}
+	
+	public String getVersion() {
+		return version;
+	}
+	
+	public String getModuleInfoHover() {
+		return "&8&o" + getSimpleName() + "\n"
+			 + "&r&e" + (getVersion() == null? "&cVersion Missing" : getVersion())
+             + "&r&9" + (ModuleLoader.hasCategories()? "\n" + getCategory() : "")
+             + "&r&7" + (getDescription() == null? "" : "\n\n" + getDescription());
+	}
+	
+	
+}
diff --git a/src/com/redstoner/misc/Utils.java b/src/main/java/com/redstoner/misc/Utils.java
index 8186bcb..e3fd68c 100644
--- a/src/com/redstoner/misc/Utils.java
+++ b/src/main/java/com/redstoner/misc/Utils.java
@@ -11,6 +11,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.redstoner.annotations.Version;
+import com.redstoner.coremods.moduleLoader.ModuleLoader;
+
+import net.nemez.chatapi.ChatAPI;
+import net.nemez.chatapi.click.Message;
 
 /** The utils class containing utility functions. Those include but are not limited to sending formatted messages, broadcasts and more.
  * 
@@ -69,6 +73,45 @@ public final class Utils
 		}
 	}
 	
+	/** This method broadcasts a message to all players and console that are allowed by the filter. Set the filter to NULL to broadcast to everyone.</br>
+	 * If you want to, you can set a message that will be logged to console. Set to null to not log anything.</br>
+	 * You can still allow console in the filter to log the original message.
+	 * 
+	 * @param prefix The prefix for the message. Set to NULL to let it auto generate.
+	 * @param message the message to be sent around
+	 * @param filter the BroadcastFilter to be applied.</br>
+	 *        Write a class implementing the interface and pass it to this method, the "sendTo()" method will be called for each recipient.
+	 * @param logmessage the log message to appear in console. Set to null to not log this (you can still log the original message by returning true in the filter).
+	 */
+	public static int broadcast(String prefix, Message message, BroadcastFilter filter)
+	{
+		if (prefix == null)
+			prefix = "§8[§2" + getCaller() + "§8]: ";
+		if (filter == null)
+		{
+			for (Player p : Bukkit.getOnlinePlayers())
+				ChatAPI.createMessage(p).appendText(prefix).appendMessage(message).send();
+			Bukkit.getConsoleSender().sendMessage(prefix + message.getRawMessage());
+			return Bukkit.getOnlinePlayers().size() + 1;
+		}
+		else
+		{
+			int count = 0;
+			for (Player p : Bukkit.getOnlinePlayers())
+				if (filter.sendTo(p))
+				{
+					ChatAPI.createMessage(p).appendText(prefix).appendMessage(message).send();
+					count++;
+				}
+			if (filter.sendTo(Bukkit.getConsoleSender()))
+			{
+				Bukkit.getConsoleSender().sendMessage(prefix + message.getRawMessage());
+				count++;
+			}
+			return count;
+		}
+	}
+	
 	/** This method will find the next parent caller and return their class name, omitting package names.
 	 * 
 	 * @return the Name of the calling class. */
@@ -146,4 +189,15 @@ public final class Utils
 	{
 	    return UUID_pattern.matcher(toCheck).matches();
 	}
+	
+	public static void run(Runnable r) {
+		run(r, 0);
+	}
+	
+	public static void run(Runnable r, int delay) {
+		Bukkit.getScheduler().scheduleSyncDelayedTask(ModuleLoader.getPlugin(), r, delay);
+	}
+	
+	
+	
 }
diff --git a/src/com/redstoner/misc/VersionHelper.java b/src/main/java/com/redstoner/misc/VersionHelper.java
index e4a9403..e4a9403 100644
--- a/src/com/redstoner/misc/VersionHelper.java
+++ b/src/main/java/com/redstoner/misc/VersionHelper.java
diff --git a/src/com/redstoner/misc/mysql/Config.java b/src/main/java/com/redstoner/misc/mysql/Config.java
index 519b20a..519b20a 100644
--- a/src/com/redstoner/misc/mysql/Config.java
+++ b/src/main/java/com/redstoner/misc/mysql/Config.java
diff --git a/src/com/redstoner/misc/mysql/JSONManager.java b/src/main/java/com/redstoner/misc/mysql/JSONManager.java
index ae248d5..ae248d5 100644
--- a/src/com/redstoner/misc/mysql/JSONManager.java
+++ b/src/main/java/com/redstoner/misc/mysql/JSONManager.java
diff --git a/src/com/redstoner/misc/mysql/MysqlHandler.java b/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java
index 909d276..909d276 100644
--- a/src/com/redstoner/misc/mysql/MysqlHandler.java
+++ b/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java
diff --git a/src/com/redstoner/misc/mysql/MysqlQueryHandler.java b/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java
index f89a08a..f89a08a 100644
--- a/src/com/redstoner/misc/mysql/MysqlQueryHandler.java
+++ b/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java
diff --git a/src/com/redstoner/misc/mysql/elements/ConstraintOperator.java b/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java
index 45cb33c..45cb33c 100644
--- a/src/com/redstoner/misc/mysql/elements/ConstraintOperator.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java
diff --git a/src/com/redstoner/misc/mysql/elements/MysqlConstraint.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java
index d651344..d651344 100644
--- a/src/com/redstoner/misc/mysql/elements/MysqlConstraint.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java
diff --git a/src/com/redstoner/misc/mysql/elements/MysqlDatabase.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java
index 91c0fe4..91c0fe4 100644
--- a/src/com/redstoner/misc/mysql/elements/MysqlDatabase.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java
diff --git a/src/com/redstoner/misc/mysql/elements/MysqlField.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java
index 61cba2e..61cba2e 100644
--- a/src/com/redstoner/misc/mysql/elements/MysqlField.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java
diff --git a/src/com/redstoner/misc/mysql/elements/MysqlResult.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java
index 6db0769..6db0769 100644
--- a/src/com/redstoner/misc/mysql/elements/MysqlResult.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java
diff --git a/src/com/redstoner/misc/mysql/elements/MysqlTable.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java
index 6656fcd..6656fcd 100644
--- a/src/com/redstoner/misc/mysql/elements/MysqlTable.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java
diff --git a/src/com/redstoner/misc/mysql/types/MysqlType.java b/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java
index 86413f9..86413f9 100644
--- a/src/com/redstoner/misc/mysql/types/MysqlType.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java
diff --git a/src/com/redstoner/misc/mysql/types/date/Date.java b/src/main/java/com/redstoner/misc/mysql/types/date/Date.java
index 9943333..9943333 100644
--- a/src/com/redstoner/misc/mysql/types/date/Date.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/Date.java
diff --git a/src/com/redstoner/misc/mysql/types/date/DateTime.java b/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java
index b4d9623..b4d9623 100644
--- a/src/com/redstoner/misc/mysql/types/date/DateTime.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java
diff --git a/src/com/redstoner/misc/mysql/types/date/Time.java b/src/main/java/com/redstoner/misc/mysql/types/date/Time.java
index 4ead72c..4ead72c 100644
--- a/src/com/redstoner/misc/mysql/types/date/Time.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/Time.java
diff --git a/src/com/redstoner/misc/mysql/types/date/TimeStamp.java b/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java
index 56205af..56205af 100644
--- a/src/com/redstoner/misc/mysql/types/date/TimeStamp.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java
diff --git a/src/com/redstoner/misc/mysql/types/date/Year.java b/src/main/java/com/redstoner/misc/mysql/types/date/Year.java
index 4c2ce1a..4c2ce1a 100644
--- a/src/com/redstoner/misc/mysql/types/date/Year.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/Year.java
diff --git a/src/com/redstoner/misc/mysql/types/number/BigInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java
index 71086fd..71086fd 100644
--- a/src/com/redstoner/misc/mysql/types/number/BigInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java
diff --git a/src/com/redstoner/misc/mysql/types/number/Decimal.java b/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java
index 4e4dbb6..4e4dbb6 100644
--- a/src/com/redstoner/misc/mysql/types/number/Decimal.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java
diff --git a/src/com/redstoner/misc/mysql/types/number/Double.java b/src/main/java/com/redstoner/misc/mysql/types/number/Double.java
index b4b1dda..b4b1dda 100644
--- a/src/com/redstoner/misc/mysql/types/number/Double.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Double.java
diff --git a/src/com/redstoner/misc/mysql/types/number/Float.java b/src/main/java/com/redstoner/misc/mysql/types/number/Float.java
index ea3047e..ea3047e 100644
--- a/src/com/redstoner/misc/mysql/types/number/Float.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Float.java
diff --git a/src/com/redstoner/misc/mysql/types/number/Int.java b/src/main/java/com/redstoner/misc/mysql/types/number/Int.java
index 4256f7b..4256f7b 100644
--- a/src/com/redstoner/misc/mysql/types/number/Int.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Int.java
diff --git a/src/com/redstoner/misc/mysql/types/number/MediumInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java
index fbcb0f4..fbcb0f4 100644
--- a/src/com/redstoner/misc/mysql/types/number/MediumInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java
diff --git a/src/com/redstoner/misc/mysql/types/number/SmallInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java
index 01bf97d..01bf97d 100644
--- a/src/com/redstoner/misc/mysql/types/number/SmallInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java
diff --git a/src/com/redstoner/misc/mysql/types/number/TinyInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java
index 63ad700..63ad700 100644
--- a/src/com/redstoner/misc/mysql/types/number/TinyInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java
diff --git a/src/com/redstoner/misc/mysql/types/text/Blob.java b/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java
index d56ee45..d56ee45 100644
--- a/src/com/redstoner/misc/mysql/types/text/Blob.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java
diff --git a/src/com/redstoner/misc/mysql/types/text/Char.java b/src/main/java/com/redstoner/misc/mysql/types/text/Char.java
index ece068c..ece068c 100644
--- a/src/com/redstoner/misc/mysql/types/text/Char.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Char.java
diff --git a/src/com/redstoner/misc/mysql/types/text/Enum.java b/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java
index e68476d..e68476d 100644
--- a/src/com/redstoner/misc/mysql/types/text/Enum.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java
diff --git a/src/com/redstoner/misc/mysql/types/text/LongBlob.java b/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java
index 802caed..802caed 100644
--- a/src/com/redstoner/misc/mysql/types/text/LongBlob.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java
diff --git a/src/com/redstoner/misc/mysql/types/text/LongText.java b/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java
index 5149ed2..5149ed2 100644
--- a/src/com/redstoner/misc/mysql/types/text/LongText.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java
diff --git a/src/com/redstoner/misc/mysql/types/text/MediumBlob.java b/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java
index 6ae25a7..6ae25a7 100644
--- a/src/com/redstoner/misc/mysql/types/text/MediumBlob.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java
diff --git a/src/com/redstoner/misc/mysql/types/text/MediumText.java b/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java
index a0f6525..a0f6525 100644
--- a/src/com/redstoner/misc/mysql/types/text/MediumText.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java
diff --git a/src/com/redstoner/misc/mysql/types/text/Set.java b/src/main/java/com/redstoner/misc/mysql/types/text/Set.java
index 4e12ce6..4e12ce6 100644
--- a/src/com/redstoner/misc/mysql/types/text/Set.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Set.java
diff --git a/src/com/redstoner/misc/mysql/types/text/Text.java b/src/main/java/com/redstoner/misc/mysql/types/text/Text.java
index 7d1a38c..7d1a38c 100644
--- a/src/com/redstoner/misc/mysql/types/text/Text.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Text.java
diff --git a/src/com/redstoner/misc/mysql/types/text/TinyText.java b/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java
index e78160c..e78160c 100644
--- a/src/com/redstoner/misc/mysql/types/text/TinyText.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java
diff --git a/src/com/redstoner/misc/mysql/types/text/VarChar.java b/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java
index cb28ad1..cb28ad1 100644
--- a/src/com/redstoner/misc/mysql/types/text/VarChar.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java
diff --git a/src/com/redstoner/modules/CoreModule.java b/src/main/java/com/redstoner/modules/CoreModule.java
index 9f71557..9f71557 100644
--- a/src/com/redstoner/modules/CoreModule.java
+++ b/src/main/java/com/redstoner/modules/CoreModule.java
diff --git a/src/com/redstoner/modules/Module.java b/src/main/java/com/redstoner/modules/Module.java
index 1c89e15..1c89e15 100644
--- a/src/com/redstoner/modules/Module.java
+++ b/src/main/java/com/redstoner/modules/Module.java
diff --git a/src/com/redstoner/modules/ModuleLogger.java b/src/main/java/com/redstoner/modules/ModuleLogger.java
index 8141976..11d71b6 100644
--- a/src/com/redstoner/modules/ModuleLogger.java
+++ b/src/main/java/com/redstoner/modules/ModuleLogger.java
@@ -13,6 +13,7 @@ public class ModuleLogger
 {
 	public static final String PREFIX_WARN = "§8[§eWARN§8]:§7 ";
 	public static final String PREFIX_ERROR = "§8[§cERROR§8]:§7 ";
+	public static final String PREFIX_INFO = "§8[§fINFO§8]:§7 ";
 	
 	private String name;
 	
@@ -23,7 +24,7 @@ public class ModuleLogger
 	
 	public void info(final String message)
 	{
-		Bukkit.getConsoleSender().sendMessage(getPrefix() + ChatAPI.colorify(null, message));
+		Bukkit.getConsoleSender().sendMessage(PREFIX_INFO + getPrefix() + ChatAPI.colorify(null, message));
 	}
 	
 	public void warn(final String message)
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
new file mode 100644
index 0000000..5a3ff61
--- /dev/null
+++ b/src/main/resources/plugin.yml
@@ -0,0 +1,5 @@
+name: ModuleLoader

+version: 4.0.0

+authors: [pepich1851]

+main: com.redstoner.misc.Main

+softdepend: [Vault]
\ No newline at end of file