From edaa51593bae8d7cf3b707bffeffcfe5633589b4 Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 1 May 2012 13:58:47 -0400 Subject: [PATCH] Skills refactoring --- .../java/com/gmail/nossr50/api/ExperienceAPI.java | 2 +- .../com/gmail/nossr50/commands/CommandHelper.java | 2 +- .../nossr50/commands/general/AddlevelsCommand.java | 2 +- .../nossr50/commands/general/AddxpCommand.java | 2 +- .../nossr50/commands/general/MmoeditCommand.java | 2 +- .../com/gmail/nossr50/commands/mc/MctopCommand.java | 2 +- .../nossr50/commands/skills/FishingCommand.java | 2 +- .../nossr50/commands/skills/RepairCommand.java | 2 +- .../gmail/nossr50/commands/spout/XplockCommand.java | 2 +- .../com/gmail/nossr50/listeners/BlockListener.java | 12 ++++++------ .../com/gmail/nossr50/listeners/EntityListener.java | 10 +++++----- .../com/gmail/nossr50/listeners/PlayerListener.java | 12 ++++++------ .../java/com/gmail/nossr50/runnables/GainXp.java | 2 +- .../com/gmail/nossr50/runnables/SkillMonitor.java | 2 +- .../gmail/nossr50/skills/{ => combat}/Archery.java | 2 +- .../com/gmail/nossr50/skills/{ => combat}/Axes.java | 2 +- .../gmail/nossr50/skills/{ => combat}/Swords.java | 2 +- .../gmail/nossr50/skills/{ => combat}/Taming.java | 2 +- .../gmail/nossr50/skills/{ => combat}/Unarmed.java | 2 +- .../nossr50/skills/{ => gathering}/BlastMining.java | 3 ++- .../nossr50/skills/{ => gathering}/Excavation.java | 3 ++- .../nossr50/skills/{ => gathering}/Fishing.java | 3 ++- .../nossr50/skills/{ => gathering}/Herbalism.java | 3 ++- .../nossr50/skills/{ => gathering}/Mining.java | 3 ++- .../nossr50/skills/{ => gathering}/WoodCutting.java | 3 ++- .../gmail/nossr50/skills/{ => misc}/Acrobatics.java | 3 ++- .../com/gmail/nossr50/skills/{ => misc}/Repair.java | 3 ++- src/main/java/com/gmail/nossr50/util/Combat.java | 13 ++++++------- src/main/java/com/gmail/nossr50/util/Item.java | 1 - .../com/gmail/nossr50/{skills => util}/Skills.java | 6 +----- 30 files changed, 56 insertions(+), 54 deletions(-) rename src/main/java/com/gmail/nossr50/skills/{ => combat}/Archery.java (95%) rename src/main/java/com/gmail/nossr50/skills/{ => combat}/Axes.java (96%) rename src/main/java/com/gmail/nossr50/skills/{ => combat}/Swords.java (95%) rename src/main/java/com/gmail/nossr50/skills/{ => combat}/Taming.java (99%) rename src/main/java/com/gmail/nossr50/skills/{ => combat}/Unarmed.java (95%) rename src/main/java/com/gmail/nossr50/skills/{ => gathering}/BlastMining.java (96%) rename src/main/java/com/gmail/nossr50/skills/{ => gathering}/Excavation.java (95%) rename src/main/java/com/gmail/nossr50/skills/{ => gathering}/Fishing.java (96%) rename src/main/java/com/gmail/nossr50/skills/{ => gathering}/Herbalism.java (96%) rename src/main/java/com/gmail/nossr50/skills/{ => gathering}/Mining.java (95%) rename src/main/java/com/gmail/nossr50/skills/{ => gathering}/WoodCutting.java (96%) rename src/main/java/com/gmail/nossr50/skills/{ => misc}/Acrobatics.java (95%) rename src/main/java/com/gmail/nossr50/skills/{ => misc}/Repair.java (97%) rename src/main/java/com/gmail/nossr50/{skills => util}/Skills.java (96%) diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index de2002584..304f7e117 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java index 6023ab262..4b120fb78 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java index bc8d648b2..062b48443 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java +++ b/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{ diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java index c4378c207..b0e893914 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/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? diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java index c137a1be4..4e0f3d679 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java index c915c0de0..88fff70ea 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index d0a42cfc5..a2e072f9c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index c2245a2bd..d66b41bf8 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java index 8b69311d8..c2d6b16f6 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 936e3be32..16545a1c7 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index d28361513..4c0518876 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index bd5b82e93..3a2c92a2c 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/runnables/GainXp.java b/src/main/java/com/gmail/nossr50/runnables/GainXp.java index 8ba896dfc..293d729e1 100644 --- a/src/main/java/com/gmail/nossr50/runnables/GainXp.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java b/src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java index 71f1c097d..7f24cd3a8 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/skills/Archery.java b/src/main/java/com/gmail/nossr50/skills/combat/Archery.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/Archery.java rename to src/main/java/com/gmail/nossr50/skills/combat/Archery.java index 8650f58ef..aa9af16c2 100644 --- a/src/main/java/com/gmail/nossr50/skills/Archery.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Axes.java b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/Axes.java rename to src/main/java/com/gmail/nossr50/skills/combat/Axes.java index 62a1cb057..0c63218e3 100644 --- a/src/main/java/com/gmail/nossr50/skills/Axes.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Swords.java b/src/main/java/com/gmail/nossr50/skills/combat/Swords.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/Swords.java rename to src/main/java/com/gmail/nossr50/skills/combat/Swords.java index 6f89f012e..7c01482ca 100644 --- a/src/main/java/com/gmail/nossr50/skills/Swords.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Taming.java b/src/main/java/com/gmail/nossr50/skills/combat/Taming.java similarity index 99% rename from src/main/java/com/gmail/nossr50/skills/Taming.java rename to src/main/java/com/gmail/nossr50/skills/combat/Taming.java index c89a97200..550c4f92e 100644 --- a/src/main/java/com/gmail/nossr50/skills/Taming.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/Unarmed.java rename to src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java index 6553296f0..844da6159 100644 --- a/src/main/java/com/gmail/nossr50/skills/Unarmed.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/BlastMining.java b/src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/BlastMining.java rename to src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java index 8bd45aa53..bb5518028 100644 --- a/src/main/java/com/gmail/nossr50/skills/BlastMining.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/skills/Excavation.java b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/Excavation.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java index 05766662d..7e322f6f4 100644 --- a/src/main/java/com/gmail/nossr50/skills/Excavation.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Fishing.java b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/Fishing.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java index 267d12276..bbc441960 100644 --- a/src/main/java/com/gmail/nossr50/skills/Fishing.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/skills/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/Herbalism.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java index 2f50428f1..982b856cd 100644 --- a/src/main/java/com/gmail/nossr50/skills/Herbalism.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/Mining.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Mining.java index d4663d6a2..ff7e35c46 100644 --- a/src/main/java/com/gmail/nossr50/skills/Mining.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/WoodCutting.java rename to src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java index f02e3512c..384fd5e88 100644 --- a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Acrobatics.java b/src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/Acrobatics.java rename to src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java index 14827ab14..917fb0f49 100644 --- a/src/main/java/com/gmail/nossr50/skills/Acrobatics.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/skills/Repair.java b/src/main/java/com/gmail/nossr50/skills/misc/Repair.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/Repair.java rename to src/main/java/com/gmail/nossr50/skills/misc/Repair.java index b196fff5c..5ba6e5dee 100644 --- a/src/main/java/com/gmail/nossr50/skills/Repair.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/util/Combat.java b/src/main/java/com/gmail/nossr50/util/Combat.java index 5c52a1c00..7eca54ef1 100644 --- a/src/main/java/com/gmail/nossr50/util/Combat.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/util/Item.java b/src/main/java/com/gmail/nossr50/util/Item.java index e439d44fd..9dc062ca0 100644 --- a/src/main/java/com/gmail/nossr50/util/Item.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/Skills.java b/src/main/java/com/gmail/nossr50/util/Skills.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/Skills.java rename to src/main/java/com/gmail/nossr50/util/Skills.java index de7a1aae6..2591da1dc 100644 --- a/src/main/java/com/gmail/nossr50/skills/Skills.java +++ b/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;