Refactoring of general commands - the prior package structure made no

sense.

New package structure splits commands into those normally reserved for
admin use and commands normally available to all players.

src/main/java/com/gmail/nossr50/commands/CommandRegistrationHelper.java

@@ -6,7 +6,7 @@ import java.util.List;
 import org.bukkit.command.PluginCommand;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.general.AddlevelsCommand;
+import com.gmail.nossr50.commands.admin.AddlevelsCommand;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsCommand;
 import com.gmail.nossr50.skills.archery.ArcheryCommand;

src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java → src/main/java/com/gmail/nossr50/commands/admin/AddlevelsCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java → src/main/java/com/gmail/nossr50/commands/admin/AddxpCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java → src/main/java/com/gmail/nossr50/commands/admin/McgodCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java → src/main/java/com/gmail/nossr50/commands/admin/McrefreshCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;

src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java → src/main/java/com/gmail/nossr50/commands/admin/MmoeditCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java → src/main/java/com/gmail/nossr50/commands/admin/SkillResetCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;

src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java → src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.admin;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java → src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.player;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java → src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.player;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;

src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java → src/main/java/com/gmail/nossr50/commands/player/MccCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.player;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java → src/main/java/com/gmail/nossr50/commands/player/McmmoCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.player;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;

src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java → src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.player;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;

src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java → src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.commands.player;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java → src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.commands.player;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -19,20 +19,20 @@ 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.commands.CommandRegistrationHelper;
-import com.gmail.nossr50.commands.general.AddlevelsCommand;
-import com.gmail.nossr50.commands.general.AddxpCommand;
-import com.gmail.nossr50.commands.general.InspectCommand;
-import com.gmail.nossr50.commands.general.McstatsCommand;
-import com.gmail.nossr50.commands.general.MmoeditCommand;
-import com.gmail.nossr50.commands.general.SkillResetCommand;
-import com.gmail.nossr50.commands.general.XprateCommand;
-import com.gmail.nossr50.commands.mc.McabilityCommand;
-import com.gmail.nossr50.commands.mc.MccCommand;
-import com.gmail.nossr50.commands.mc.McgodCommand;
-import com.gmail.nossr50.commands.mc.McmmoCommand;
-import com.gmail.nossr50.commands.mc.McrankCommand;
-import com.gmail.nossr50.commands.mc.McrefreshCommand;
-import com.gmail.nossr50.commands.mc.MctopCommand;
+import com.gmail.nossr50.commands.admin.AddlevelsCommand;
+import com.gmail.nossr50.commands.admin.AddxpCommand;
+import com.gmail.nossr50.commands.admin.McgodCommand;
+import com.gmail.nossr50.commands.admin.McrefreshCommand;
+import com.gmail.nossr50.commands.admin.MmoeditCommand;
+import com.gmail.nossr50.commands.admin.SkillResetCommand;
+import com.gmail.nossr50.commands.admin.XprateCommand;
+import com.gmail.nossr50.commands.player.InspectCommand;
+import com.gmail.nossr50.commands.player.McabilityCommand;
+import com.gmail.nossr50.commands.player.MccCommand;
+import com.gmail.nossr50.commands.player.McmmoCommand;
+import com.gmail.nossr50.commands.player.McrankCommand;
+import com.gmail.nossr50.commands.player.McstatsCommand;
+import com.gmail.nossr50.commands.player.MctopCommand;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;

src/main/resources/plugin.yml

@@ -118,11 +118,11 @@ permissions:
         default: true
         description: mcmmo permisions that default to true
         children:
-            mcmmo.ability.all: true 
-            mcmmo.item.all: true   
+            mcmmo.ability.all: true
+            mcmmo.item.all: true
             mcmmo.motd: true 
-            mcmmo.commands.defaults: true 
-            mcmmo.chat.partychat: true 
+            mcmmo.commands.defaults: true
+            mcmmo.chat.partychat: true
             mcmmo.skills.all: true
     mcmmo.defaultsop:
         default: op