Removed name parameter from modules, using classnames instead

src/com/redstoner/coremods/ModuleLoader/ModuleLoader.java

@@ -1,8 +1,16 @@
 package com.redstoner.coremods.ModuleLoader;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 
+import org.bukkit.command.CommandSender;
+
+import com.nemez.cmdmgr.Command;
+import com.nemez.cmdmgr.Command.AsyncType;
+import com.nemez.cmdmgr.CommandManager;
+import com.redstoner.annotations.Debugable;
 import com.redstoner.annotations.Version;
+import com.redstoner.coremods.debugger.Debugger;
+import com.redstoner.misc.Main;
 import com.redstoner.misc.Utils;
 import com.redstoner.modules.CoreModule;
 import com.redstoner.modules.Module;
@@ -14,7 +22,7 @@ import com.redstoner.modules.Module;
 public final class ModuleLoader implements CoreModule
 {
 	private static ModuleLoader instance;
-	private static final HashMap<Module, String> modules = new HashMap<Module, String>();
+	private static final ArrayList<Module> modules = new ArrayList<Module>();
 	
 	static
 	{
@@ -22,54 +30,110 @@ public final class ModuleLoader implements CoreModule
 	}
 	
 	private ModuleLoader()
-	{}
-	
-	public static final void addModule(Class<? extends Module> clazz, String name)
 	{
-		try
+		CommandManager.registerCommand(getCommandString(), instance, Main.plugin);
-		{
-			modules.put(clazz.newInstance(), name);
-		}
-		catch (InstantiationException | IllegalAccessException e)
-		{
-			Utils.error("Could not add " + name + " to the list, constructor not accessible.");
-		}
-	}
-	
-	public static final void enableModules()
-	{
-		for (Module m : modules.keySet())
-		{
-			m.onEnable();
-			if (m.enabled())
-				Utils.log("Loaded module " + modules.get(m));
-		}
-	}
-	
-	public static final boolean enableModule(Class<? extends Module> clazz, String name)
-	{
-		try
-		{
-			Module m = clazz.newInstance();
-			modules.put(m, name);
-			m.onEnable();
-			if (m.enabled())
-				Utils.log("Loaded module " + modules.get(m));
-			return m.enabled();
-		}
-		catch (InstantiationException | IllegalAccessException e)
-		{
-			Utils.error("Could not add " + name + " to the list, constructor not accessible.");
-			return false;
-		}
-	}
-	
-	@Override
-	public final String getCommandString()
-	{
-		return "";
 	}
 	
 	public static void init()
 	{}
+	
+	/** This method will add a module to the module list, without enabling it
+	 * 
+	 * @param clazz The class of the module to be added. */
+	@Debugable
+	public static final void addModule(Class<? extends Module> clazz)
+	{
+		Debugger.notifyMethod(clazz);
+		try
+		{
+			modules.add(clazz.newInstance());
+		}
+		catch (InstantiationException | IllegalAccessException e)
+		{
+			Utils.error("Could not add " + clazz.getName() + " to the list, constructor not accessible.");
+		}
+	}
+	
+	/** Call this to enable all not-yet enabled modules that are known to the loader. */
+	@Debugable
+	public static final void enableModules()
+	{
+		Debugger.notifyMethod();
+		for (Module m : modules)
+		{
+			if (m.enabled())
+				continue;
+			m.onEnable();
+			if (m.enabled())
+				Utils.log("Loaded module " + m.getClass().getName());
+			else
+				Utils.error("Failed to load module " + m.getClass().getName());
+		}
+	}
+	
+	/** This method enables a specific module. If no module with that name is known to the loader yet it will be added to the list.
+	 * 
+	 * @param clazz The class of the module to be enabled.
+	 * @return true, when the module was successfully enabled. */
+	@Debugable
+	public static final boolean enableModule(Class<? extends Module> clazz)
+	{
+		Debugger.notifyMethod(clazz);
+		for (Module m : modules)
+		{
+			if (m.getClass().equals(clazz))
+			{
+				return m.enable();
+			}
+		}
+		try
+		{
+			Module m = clazz.newInstance();
+			modules.add(m);
+			m.onEnable();
+			if (m.enabled())
+				Utils.log("Loaded module " + m.getClass().getName());
+			return m.enabled();
+		}
+		catch (InstantiationException | IllegalAccessException e)
+		{
+			Utils.error("Could not add " + clazz.getName() + " to the list, constructor not accessible.");
+			return false;
+		}
+	}
+	
+	// @noformat
+	@Override
+	public String getCommandString()
+	{
+		return "command modules {\n" + 
+				"	list{\n" + 
+				"		help Lists all modules. Color indicates status: §aENABLED §cDISABLED;\n" + 
+				"		perm jutils.admin;\n" + 
+				"		run list;\n" + 
+				"	}\n" + 
+				"}";
+	}
+	// @format
+	
+	/** 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 = "list", async = AsyncType.ALWAYS)
+	public boolean listModulesCommand(CommandSender sender)
+	{
+		Utils.sendModuleHeader(sender);
+		StringBuilder sb = new StringBuilder("Modules:\n");
+		for (Module m : modules)
+		{
+			sb.append(m.enabled() ? "&a" : "&c");
+			sb.append(m.getClass().getName());
+			sb.append(", ");
+		}
+		sb.delete(sb.length() - 2, sb.length());
+		Utils.sendMessage(sender, " §e", sb.toString(), '&');
+		Utils.sendMessage(sender, " §7", "For more detailed information, consult the debugger.");
+		return true;
+	}
 }