Phase 2 of rearrange. Reminder for self to move plugin.yml back once maven support is setup. plugin

commenting is to get around the craftbukkit dep (which disables colorsend and comments out something
nossr forgot about.) UNTESTED

src/com/gmail/nossr50/datatypes/HealthBarMMO.java

@@ -5,7 +5,7 @@ import org.bukkit.entity.LivingEntity;
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericTexture;
 
-import com.gmail.nossr50.spout.SpoutStuff;
+//import com.gmail.nossr50.spout.SpoutStuff;
 
 public class HealthBarMMO
 {
@@ -18,8 +18,8 @@ public class HealthBarMMO
 		health_name = new GenericLabel();
 		health_name.setText(ChatColor.GREEN+name).setDirty(true);
 		
-		health_bar = new GenericTexture();
-		health_bar.setUrl(SpoutStuff.getHealthBarURL(entity.getHealth())).setHeight(8).setWidth(64).setDirty(true);
+		//health_bar = new GenericTexture();
+		//health_bar.setUrl(SpoutStuff.getHealthBarURL(entity.getHealth())).setHeight(8).setWidth(64).setDirty(true);
 		
 		playerName = name;
 	}

src/com/gmail/nossr50/listeners/mcPlayerListener.java

@@ -7,7 +7,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.command.ColouredConsoleSender;
+//import org.bukkit.craftbukkit.command.ColouredConsoleSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerChatEvent;
@@ -243,11 +243,11 @@ public class mcPlayerListener extends PlayerListener
 				if(Party.getInstance().inSameParty(player, x))
 					x.sendMessage(format);
 			}
-			if(Bukkit.getServer() instanceof ColouredConsoleSender)
+			/*if(Bukkit.getServer() instanceof ColouredConsoleSender)
 			{
 				ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer();
 				ccs.sendMessage(ChatColor.GREEN+"[P]"+format); //Colors, woot!
-			}
+			}*/
 		} else if (PP.getAdminChatMode()) {
 			event.setCancelled(true);
 			String format = ChatColor.AQUA + "{" + ChatColor.WHITE + player.getDisplayName() + ChatColor.AQUA + "} "+event.getMessage();
@@ -256,11 +256,11 @@ public class mcPlayerListener extends PlayerListener
 				if(x.isOp() || mcPermissions.getInstance().adminChat(x))
 					x.sendMessage(format);
 			}
-			if(Bukkit.getServer() instanceof ColouredConsoleSender)
+			/*if(Bukkit.getServer() instanceof ColouredConsoleSender)
 			{
 				ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer();
 				ccs.sendMessage(ChatColor.AQUA+"[A]"+format); //Colors, woot!
-			}
+			}*/
 		}
 	}
 }

src/resources/plugin.yml → src/com/gmail/plugin.yml

@@ -1,6 +1,6 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 1.1.14
+version: 1.1.14-Disk-GIT
 softdepend: [Spout]
 commands:
     mchud: