Skills refactoring

src/main/java/com/gmail/nossr50/api/ExperienceAPI.java

@@ -3,7 +3,7 @@ package com.gmail.nossr50.api;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class ExperienceAPI {

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

@@ -6,8 +6,8 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class CommandHelper {

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

@@ -12,8 +12,8 @@ import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class AddlevelsCommand implements CommandExecutor{

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

@@ -10,8 +10,8 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 //TODO: Any way we can make this work for offline use?

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

@@ -12,8 +12,8 @@ import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class MmoeditCommand implements CommandExecutor {

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

@@ -10,9 +10,9 @@ import org.bukkit.command.CommandSender;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 
 public class MctopCommand implements CommandExecutor {
 

src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

@@ -11,7 +11,7 @@ import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Fishing;
+import com.gmail.nossr50.skills.gathering.Fishing;
 import com.gmail.nossr50.util.Page;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -12,7 +12,7 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.skills.misc.Repair;
 import com.gmail.nossr50.util.Page;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java

@@ -11,10 +11,10 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class XplockCommand implements CommandExecutor {

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -8,16 +8,16 @@ import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.skills.Excavation;
-import com.gmail.nossr50.skills.Herbalism;
-import com.gmail.nossr50.skills.Mining;
-import com.gmail.nossr50.skills.Repair;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.WoodCutting;
+import com.gmail.nossr50.skills.gathering.Excavation;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.gathering.Mining;
+import com.gmail.nossr50.skills.gathering.WoodCutting;
+import com.gmail.nossr50.skills.misc.Repair;
 import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -30,14 +30,14 @@ import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.skills.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.BlastMining;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Taming;
+import com.gmail.nossr50.skills.combat.Archery;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.misc.Acrobatics;
 import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class EntityListener implements Listener {

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -37,16 +37,16 @@ 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.skills.BlastMining;
-import com.gmail.nossr50.skills.Fishing;
-import com.gmail.nossr50.skills.Herbalism;
-import com.gmail.nossr50.skills.Repair;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Taming;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.misc.Repair;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Item;
 import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class PlayerListener implements Listener {

src/main/java/com/gmail/nossr50/runnables/GainXp.java

@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
 
 public class GainXp implements Runnable {
     private Player player = null;

src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java

@@ -6,7 +6,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class SkillMonitor implements Runnable {

src/main/java/com/gmail/nossr50/skills/Archery.java → src/main/java/com/gmail/nossr50/skills/combat/Archery.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 

src/main/java/com/gmail/nossr50/skills/Axes.java → src/main/java/com/gmail/nossr50/skills/combat/Axes.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 

src/main/java/com/gmail/nossr50/skills/Swords.java → src/main/java/com/gmail/nossr50/skills/combat/Swords.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 

src/main/java/com/gmail/nossr50/skills/Taming.java → src/main/java/com/gmail/nossr50/skills/combat/Taming.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 

src/main/java/com/gmail/nossr50/skills/Unarmed.java → src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 

src/main/java/com/gmail/nossr50/skills/BlastMining.java → src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -23,6 +23,7 @@ import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class BlastMining {

src/main/java/com/gmail/nossr50/skills/Excavation.java → src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;

src/main/java/com/gmail/nossr50/skills/Fishing.java → src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,6 +27,7 @@ import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class Fishing {

src/main/java/com/gmail/nossr50/skills/Herbalism.java → src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.Random;
 
@@ -20,6 +20,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.GreenThumbTimer;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class Herbalism {

src/main/java/com/gmail/nossr50/skills/Mining.java → src/main/java/com/gmail/nossr50/skills/gathering/Mining.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.Random;
 
@@ -16,6 +16,7 @@ import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;

src/main/java/com/gmail/nossr50/skills/WoodCutting.java → src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -23,6 +23,7 @@ import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 import org.getspout.spoutapi.sound.SoundEffect;

src/main/java/com/gmail/nossr50/skills/Acrobatics.java → src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.misc;
 
 import java.util.Random;
 
@@ -12,6 +12,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class Acrobatics {

src/main/java/com/gmail/nossr50/skills/Repair.java → src/main/java/com/gmail/nossr50/skills/misc/Repair.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.misc;
 
 import java.util.Map;
 import java.util.Random;
@@ -20,6 +20,7 @@ import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;

src/main/java/com/gmail/nossr50/util/Combat.java

@@ -27,13 +27,12 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.runnables.GainXp;
 import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.skills.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.Axes;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-import com.gmail.nossr50.skills.Taming;
-import com.gmail.nossr50.skills.Unarmed;
+import com.gmail.nossr50.skills.combat.Archery;
+import com.gmail.nossr50.skills.combat.Axes;
+import com.gmail.nossr50.skills.combat.Swords;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.combat.Unarmed;
+import com.gmail.nossr50.skills.misc.Acrobatics;
 
 public class Combat {
 

src/main/java/com/gmail/nossr50/util/Item.java

@@ -7,7 +7,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 

src/main/java/com/gmail/nossr50/skills/Skills.java → src/main/java/com/gmail/nossr50/util/Skills.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.util;
 
 import org.bukkit.ChatColor;
 import org.bukkit.block.Block;
@@ -12,10 +12,6 @@ import org.getspout.spoutapi.player.SpoutPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Leaderboard;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.PlayerStat;