Remove constructor from CraftIRC.java

Animosity · Feb 21, 2011 · 4b75c32 · 4b75c32
1 parent 9b14ad9
commit 4b75c32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 32 deletions.
diff --git a/org/bukkit/animosity/craftirc/CraftIRC.java b/org/bukkit/animosity/craftirc/CraftIRC.java
@@ -28,24 +28,17 @@ public class CraftIRC extends JavaPlugin {
 	private final ConsoleCommandSender console = new ConsoleCommandSender();
 	protected static final Logger log = Logger.getLogger("Minecraft");
 
-	public CraftIRC(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin,
-			ClassLoader cLoader) {
-		super(pluginLoader, instance, desc, folder, plugin, cLoader);
-		initialize();
-		VERSION = desc.getVersion();
-	}
-
 	public void onEnable() {
+	    PluginDescriptionFile desc = this.getDescription();
+        VERSION = desc.getVersion();
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_JOIN, listener, Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_QUIT, listener, Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, listener, Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_CHAT, listener, Priority.Monitor, this);
 		log.info(NAME + " Enabled.");
 		// instantiate bot w/ settings
 		bot = Minebot.getInstance(this);
 		bot.init();
-
-		/*etc.getInstance().addCommand("/irc [msg]", "Sends message to " + bot.irc_channel);
-		if (bot.optn_notify_admins_cmd != null) {
-			etc.getInstance().addCommand(bot.optn_notify_admins_cmd + " [msg]",
-					"Sends your message to the admins on IRC");
-		}*/
 	}
 
 	public void onDisable() {
@@ -60,25 +53,6 @@ public void recover() {
 		bot.init();
 	}
 
-	public void initialize() {
-		getServer().getPluginManager().registerEvent(Event.Type.PLAYER_JOIN, listener, Priority.Monitor, this);
-		getServer().getPluginManager().registerEvent(Event.Type.PLAYER_QUIT, listener, Priority.Monitor, this);
-		getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, listener, Priority.Monitor, this);
-		getServer().getPluginManager().registerEvent(Event.Type.PLAYER_CHAT, listener, Priority.Monitor, this);
-		//getServer().getPluginManager().registerEvent(Event.Type.CONSOLE_COMMAND, consoleListener, Priority.Normal, this);
-
-		/*  hMod
-			etc.getLoader().addListener(PluginLoader.Hook.SERVERCOMMAND, listener, this, PluginListener.Priority.HIGH);
-			etc.getLoader().addListener(PluginLoader.Hook.COMMAND, listener, this, PluginListener.Priority.MEDIUM);
-			etc.getLoader().addListener(PluginLoader.Hook.LOGIN, listener, this, PluginListener.Priority.MEDIUM);
-			etc.getLoader().addListener(PluginLoader.Hook.DISCONNECT, listener, this, PluginListener.Priority.MEDIUM);
-			etc.getLoader().addListener(PluginLoader.Hook.CHAT, listener, this, PluginListener.Priority.MEDIUM);
-			etc.getLoader().addListener(PluginLoader.Hook.KICK, listener, this, PluginListener.Priority.MEDIUM);
-			etc.getLoader().addListener(PluginLoader.Hook.BAN, listener, this, PluginListener.Priority.MEDIUM);
-			etc.getLoader().addListener(PluginLoader.Hook.IPBAN, listener, this, PluginListener.Priority.MEDIUM);
-		 */
-	}
-
 	public static void setDebug(boolean d) {
 		log.info(NAME + " DEBUG [" + (d ? "ON" : "OFF") + "]");
 		debug = d;

diff --git a/plugin.yml b/plugin.yml
@@ -0,0 +1,3 @@
+name: CraftIRC
+main: org.bukkit.animosity.craftirc.CraftIRC
+version: 1.70c BETA