From d1f499f6fd14924ad210233b619e502ffcaae74c Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Sat, 2 Feb 2013 00:09:47 -0500
Subject: [PATCH] Moved around a few more commands.

---
 src/main/java/com/gmail/nossr50/api/ChatAPI.java              | 2 +-
 .../java/com/gmail/nossr50/{util => chat}/ChatManager.java    | 3 ++-
 .../com/gmail/nossr50/{party => chat}/commands/ACommand.java  | 4 ++--
 .../com/gmail/nossr50/{party => chat}/commands/PCommand.java  | 4 ++--
 src/main/java/com/gmail/nossr50/listeners/PlayerListener.java | 2 +-
 src/main/java/com/gmail/nossr50/mcMMO.java                    | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename src/main/java/com/gmail/nossr50/{util => chat}/ChatManager.java (94%)
 rename src/main/java/com/gmail/nossr50/{party => chat}/commands/ACommand.java (93%)
 rename src/main/java/com/gmail/nossr50/{party => chat}/commands/PCommand.java (94%)

diff --git a/src/main/java/com/gmail/nossr50/api/ChatAPI.java b/src/main/java/com/gmail/nossr50/api/ChatAPI.java
index 66b7dad95..c20835b01 100644
--- a/src/main/java/com/gmail/nossr50/api/ChatAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ChatAPI.java
@@ -2,8 +2,8 @@ package com.gmail.nossr50.api;
 
 import org.bukkit.plugin.Plugin;
 
+import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.ChatManager;
 
 public final class ChatAPI {
     private ChatAPI() {}
diff --git a/src/main/java/com/gmail/nossr50/util/ChatManager.java b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
similarity index 94%
rename from src/main/java/com/gmail/nossr50/util/ChatManager.java
rename to src/main/java/com/gmail/nossr50/chat/ChatManager.java
index 6a9f41313..e810a31bb 100644
--- a/src/main/java/com/gmail/nossr50/util/ChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.util;
+package com.gmail.nossr50.chat;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -10,6 +10,7 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Permissions;
 
 public final class ChatManager {
     public ChatManager () {}
diff --git a/src/main/java/com/gmail/nossr50/party/commands/ACommand.java b/src/main/java/com/gmail/nossr50/chat/commands/ACommand.java
similarity index 93%
rename from src/main/java/com/gmail/nossr50/party/commands/ACommand.java
rename to src/main/java/com/gmail/nossr50/chat/commands/ACommand.java
index 28aeeaae6..a76772e7d 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/ACommand.java
+++ b/src/main/java/com/gmail/nossr50/chat/commands/ACommand.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.party.commands;
+package com.gmail.nossr50.chat.commands;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.ChatManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
diff --git a/src/main/java/com/gmail/nossr50/party/commands/PCommand.java b/src/main/java/com/gmail/nossr50/chat/commands/PCommand.java
similarity index 94%
rename from src/main/java/com/gmail/nossr50/party/commands/PCommand.java
rename to src/main/java/com/gmail/nossr50/chat/commands/PCommand.java
index 845966c22..0022a444a 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/PCommand.java
+++ b/src/main/java/com/gmail/nossr50/chat/commands/PCommand.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.party.commands;
+package com.gmail.nossr50.chat.commands;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -6,12 +6,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.ChatManager;
 import com.gmail.nossr50.util.Users;
 
 public class PCommand implements CommandExecutor {
diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index df102208e..8425e0571 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -18,6 +18,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
@@ -34,7 +35,6 @@ import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.ChatManager;
 import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Misc;
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 28eb34210..8f0ba2163 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -18,6 +18,8 @@ import org.bukkit.scheduler.BukkitScheduler;
 
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
+import com.gmail.nossr50.chat.commands.ACommand;
+import com.gmail.nossr50.chat.commands.PCommand;
 import com.gmail.nossr50.commands.CommandRegistrationHelper;
 import com.gmail.nossr50.commands.admin.AddxpCommand;
 import com.gmail.nossr50.commands.admin.McgodCommand;
@@ -52,8 +54,6 @@ import com.gmail.nossr50.mods.config.CustomArmorConfig;
 import com.gmail.nossr50.mods.config.CustomBlocksConfig;
 import com.gmail.nossr50.mods.config.CustomToolsConfig;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.commands.ACommand;
-import com.gmail.nossr50.party.commands.PCommand;
 import com.gmail.nossr50.party.commands.PartyCommand;
 import com.gmail.nossr50.party.commands.PtpCommand;
 import com.gmail.nossr50.runnables.MobStoreCleaner;