Removed some unused classes, modified some methods to work with a (fa…

…iled) attempt to add some form of HeroChat support.

src/de/johannes13/minecraft/bukkit/chat/inspircd/Ircd.java

@@ -261,9 +261,13 @@ private void parseCommands(String line) throws IOException {
 						}
 					}
 				} else if (data[2].startsWith("#")) {
-					ChannelMetadata ch = chmap.get(data[2]);
-					if (ch != null)
-						ch.sendMessage(uid2meta.get(data[0]).nick, data[3]);
+                                        if (data[2].substring(1).equalsIgnoreCase("game")) {
+                                                plugin.sendIrcMessage(uid2meta.get(data[0]).nick, "Global", data[3]);
+                                        } else {
+                                                ChannelMetadata ch = chmap.get(data[2]);
+                                                if (ch != null)
+                                                        ch.sendMessage(uid2meta.get(data[0]).nick, data[3]);
+                                        }
 				} else {
 					PlayerMetadata pm = uid2player.get(data[2]);
 					if (pm != null)
@@ -399,6 +403,17 @@ public void sendMessage(PlayerMetadata metadata, String channel, String message)
 		this.println(":" + metadata.getUid() + " PRIVMSG " + channel + " :" + message);
 	}
 
+        public void sendMessage(String nick, String channel, String message) {
+//                ListIterator<PlayerMetadata> pmIt = plugin.getChannel(channel).getPlayers().listIterator();
+//                PlayerMetadata metadata = pmIt.next();
+//                while (pmIt.hasNext() && (!metadata.getPlayer().getName().equalsIgnoreCase(nick))) {
+//                        metadata = pmIt.next();
+//                        //rest of the code block removed
+//                }
+                PlayerMetadata metadata = plugin.getMetadata(plugin.getServer().getPlayer(nick));
+		this.println(":" + metadata.getUid() + " PRIVMSG " + channel + " :" + message);
+	}
+
 	public void addPlayer(Player player) {
 		synchronized (pending) {
 			switch (state) {

src/de/johannes13/minecraft/bukkit/chat/plugin/ChatPlugin.java

@@ -1,5 +1,7 @@
 package de.johannes13.minecraft.bukkit.chat.plugin;
 
+import com.herocraftonline.dthielke.herochat.HeroChat;
+import com.herocraftonline.dthielke.herochat.channels.ChannelManager;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -31,7 +33,7 @@
 public class ChatPlugin extends JavaPlugin implements Listener {
 
 	private Hashtable<Player, PlayerMetadata> umeta;
-	/* package private */Ircd ircd;
+	public Ircd ircd;
 	private Method gmGetPermission;
 	private Method gmHas;
 	private Plugin gm;
@@ -43,6 +45,8 @@ public ChatPlugin() {
 //		super(pluginLoader, instance, desc, folder, plugin, loader);
 //	}
 
+        public ChannelManager hcm;
+
 	@Override
 	public void onDisable() {
 		getServer().broadcastMessage("Chat Channels and IRC relay have been disabled");
@@ -76,6 +80,7 @@ public void onEnable() {
 			pluginAddPlayer(p);
 		}
 		ircd.start();
+                this.enableHeroChat();
 	}
 
 	void pluginAddPlayer(Player p) {
@@ -286,6 +291,18 @@ public static String joinArgs(String... args) {
 		return msg.toString();
 	}
 
+        public void enableHeroChat() {
+		Plugin p = getServer().getPluginManager().getPlugin("HeroChat");
+		if (p != null) {
+			if (!p.isEnabled())
+				getServer().getPluginManager().enablePlugin(p);
+			hcm = ((HeroChat) p).getChannelManager();
+			System.out.println("[ChatPlugin] Linked to Herochat.");
+		} else {
+			System.out.println("[ChatPlugin] Could not link to HeroChat.");
+		}
+	}
+
 	public List<? extends CommandSender> findPlayer(String nick) {
 		List<Player> plMatch = getServer().matchPlayer(nick);
 		ArrayList<IrcUser> plMatch2 = new ArrayList<IrcUser>();
@@ -395,6 +412,10 @@ public void sendIrcMessage(String srcNick, ChannelMetadata channel, String messa
 
 	}
 
+        public void sendIrcMessage(String srcNick, String channel, String message) {
+		hcm.getChannel(channel).sendMessage(srcNick, message, hcm.getChannel(channel).getMsgFormat(), true);
+	}
+
 	public void sendIrcMessage(String srcNick, PlayerMetadata playerMetadata, String message) {
 		playerMetadata.getPlayer().sendMessage("(MSG) " + srcNick + ": " + message);
 	}

src/plugin.yml

@@ -3,12 +3,12 @@ main: de.johannes13.minecraft.bukkit.chat.plugin.ChatPlugin
 version: 0.9
 commands:
   me:
-    description: sends a action to the current channel
+    description: sends an action to the current channel
     usage: |
            /<command> <message>
            Example: /<command> is playing Minecraft
   msg:
-    description: 'sends a private message to a player'
+    description: sends a private message to a player
     usage: |
            /<command> <player> <message>
            Example: /<command> Bukkit Great Job! - Sends the message "Great Job!" to Bukkit