diff --git a/src/main/java/com/gmail/nossr50/api/ChatAPI.java b/src/main/java/com/gmail/nossr50/api/ChatAPI.java index 2ce4ce52e..2278c2ddb 100644 --- a/src/main/java/com/gmail/nossr50/api/ChatAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ChatAPI.java @@ -4,10 +4,10 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.events.chat.McMMOAdminChatEvent; import com.gmail.nossr50.events.chat.McMMOPartyChatEvent; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class ChatAPI { /** diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index 77c346b39..304f7e117 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -2,9 +2,9 @@ package com.gmail.nossr50.api; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; 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/api/PartyAPI.java b/src/main/java/com/gmail/nossr50/api/PartyAPI.java index d731e6af1..9bfd4fdde 100644 --- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java +++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java @@ -7,8 +7,8 @@ import java.util.ArrayList; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Users; public class PartyAPI { diff --git a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java index c463f4e18..6a3e66683 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java +++ b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java @@ -3,12 +3,12 @@ package com.gmail.nossr50.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Skills; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; 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 76f5ae612..89d3ace24 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java @@ -7,14 +7,14 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Skills; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; public class AddlevelsCommand implements CommandExecutor{ private final mcMMO plugin; 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 f81bac05f..5d98b6991 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java @@ -6,12 +6,12 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.SkillType; -import com.gmail.nossr50.skills.Skills; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; //TODO: Any way we can make this work for offline use? public class AddxpCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java index a7c00033b..8da1b9f31 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java @@ -6,13 +6,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; public class InspectCommand implements CommandExecutor { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java index 8127a7dd7..cd16a3d45 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java @@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; public class McstatsCommand implements CommandExecutor { 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 9e34a5644..c9e694f46 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java @@ -7,14 +7,14 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Skills; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; public class MmoeditCommand implements CommandExecutor { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java index 40d23dc7c..e7177c7b6 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java @@ -7,10 +7,10 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.runnables.SQLConversionTask; +import com.gmail.nossr50.util.Users; public class MmoupdateCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java index f53f4b000..0508af521 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java @@ -6,10 +6,10 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.m; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.m; public class XprateCommand implements CommandExecutor { private static int oldrate = LoadProperties.xpGainMultiplier; diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java index f0d820a09..edb442325 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java @@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; public class McabilityCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java index 2e5b81e10..d958271f0 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java @@ -6,9 +6,9 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.mcPermissions; //TODO: Rework this whole thing. It's ugly. public class MccCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java index f228473dd..617a29ffa 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java @@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; public class McgodCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java index da37b64de..8580b872b 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java @@ -6,13 +6,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.ToolType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class McrefreshCommand implements CommandExecutor { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java index 4cdefe196..18cccb4e9 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java @@ -11,11 +11,11 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class McremoveCommand implements CommandExecutor { String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users"; 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 c0667f165..62e6dc1d9 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java @@ -7,13 +7,13 @@ import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import com.gmail.nossr50.Leaderboard; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Skills; +import com.gmail.nossr50.util.Leaderboard; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.m; public class MctopCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/party/ACommand.java b/src/main/java/com/gmail/nossr50/commands/party/ACommand.java index 9f4d909de..a3ba33be5 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/ACommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/ACommand.java @@ -7,11 +7,11 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.chat.McMMOAdminChatEvent; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class ACommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java index cc1520461..5a46cd54f 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java @@ -7,13 +7,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class AcceptCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java index 340667342..24766098c 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java @@ -6,12 +6,12 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class InviteCommand implements CommandExecutor { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/commands/party/PCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PCommand.java index 5179adfc2..2fc7c7f29 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PCommand.java @@ -7,11 +7,11 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.chat.McMMOPartyChatEvent; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class PCommand implements CommandExecutor { public PCommand() {} diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index c63aaaaaf..a036c31f4 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -7,13 +7,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class PartyCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java index 81671c8be..efa5acc6d 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java @@ -7,14 +7,14 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class PtpCommand implements CommandExecutor { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index 4aab9bd05..ece682a23 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class AcrobaticsCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index a1b52851e..4f6762c56 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class ArcheryCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index e985efe17..cfdb86ef9 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -5,12 +5,12 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class AxesCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java index 17d2b6834..226db3437 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class ExcavationCommand implements CommandExecutor { @Override 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 70048a867..9151c2b3d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -5,14 +5,14 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Fishing; +import com.gmail.nossr50.skills.gathering.Fishing; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class FishingCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index d9a0dfb02..b9e14d569 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class HerbalismCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java index e541323f8..a4efdba5c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class MiningCommand implements CommandExecutor { @Override 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 a88cd64a4..14bbf685c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -5,15 +5,15 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Repair; +import com.gmail.nossr50.skills.misc.Repair; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class RepairCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 947bf948f..db6b02a8b 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class SwordsCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java index 839103052..f18bfff0c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -5,14 +5,14 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class TamingCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index 389ee90d5..6366d1525 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class UnarmedCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index 6eeb7803d..09d843892 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -5,13 +5,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.util.Page; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public class WoodcuttingCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java index 12b4ee965..bab6c1643 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java @@ -5,12 +5,12 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.HUDType; import com.gmail.nossr50.datatypes.HUDmmo; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.spout.SpoutStuff; +import com.gmail.nossr50.util.Users; public class MchudCommand implements CommandExecutor { @Override 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 05de9271f..81d48de33 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java @@ -6,14 +6,14 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.spout.SpoutStuff; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; public class XplockCommand implements CommandExecutor { @Override diff --git a/src/main/java/com/gmail/nossr50/datatypes/AbilityType.java b/src/main/java/com/gmail/nossr50/datatypes/AbilityType.java index 0a4906b35..73dfb647c 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/AbilityType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/AbilityType.java @@ -3,12 +3,12 @@ package com.gmail.nossr50.datatypes; import org.bukkit.Material; import org.bukkit.entity.Player; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Excavation; -import com.gmail.nossr50.skills.Herbalism; -import com.gmail.nossr50.skills.Mining; +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.util.mcPermissions; public enum AbilityType { BERSERK(LoadProperties.berserkCooldown, mcLocale.getString("Skills.BerserkOn"), mcLocale.getString("Skills.BerserkOff"), "Skills.BerserkPlayer", mcLocale.getString("Skills.YourBerserk"), "Skills.BerserkPlayerOff"), diff --git a/src/main/java/com/gmail/nossr50/datatypes/HUDmmo.java b/src/main/java/com/gmail/nossr50/datatypes/HUDmmo.java index 0c037e8a2..4e2d0d953 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/HUDmmo.java +++ b/src/main/java/com/gmail/nossr50/datatypes/HUDmmo.java @@ -10,11 +10,11 @@ import org.getspout.spoutapi.gui.RenderPriority; import org.getspout.spoutapi.gui.Widget; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.spout.SpoutStuff; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; public class HUDmmo { private int center_x = 427 / 2; diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java index 01daf227a..2bdefd478 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -14,8 +14,8 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; import com.gmail.nossr50.party.Party; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; import com.gmail.nossr50.mcMMO; public class PlayerProfile { diff --git a/src/main/java/com/gmail/nossr50/datatypes/SkillType.java b/src/main/java/com/gmail/nossr50/datatypes/SkillType.java index d00d249dd..8ed156169 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/SkillType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/SkillType.java @@ -2,9 +2,9 @@ package com.gmail.nossr50.datatypes; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; public enum SkillType { ACROBATICS(LoadProperties.levelCapAcrobatics, LoadProperties.acrobaticsxpmodifier), diff --git a/src/main/java/com/gmail/nossr50/datatypes/ToolType.java b/src/main/java/com/gmail/nossr50/datatypes/ToolType.java index cf898bba9..eb750a5c9 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/ToolType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/ToolType.java @@ -3,8 +3,8 @@ package com.gmail.nossr50.datatypes; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.ItemChecks; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.ItemChecks; public enum ToolType { AXE(mcLocale.getString("Skills.LowerAxe"), mcLocale.getString("Skills.ReadyAxe")), diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java similarity index 93% rename from src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java rename to src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 663c2e9a4..22ddce0a7 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -2,23 +2,23 @@ package com.gmail.nossr50.listeners; import java.util.List; -import com.gmail.nossr50.BlockChecks; -import com.gmail.nossr50.ItemChecks; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; -import com.gmail.nossr50.Users; import com.gmail.nossr50.config.LoadProperties; 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.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; @@ -41,10 +41,10 @@ import org.bukkit.metadata.FixedMetadataValue; import org.getspout.spoutapi.sound.SoundEffect; -public class mcBlockListener implements Listener { +public class BlockListener implements Listener { private final mcMMO plugin; - public mcBlockListener(final mcMMO plugin) { + public BlockListener(final mcMMO plugin) { this.plugin = plugin; } diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java similarity index 92% rename from src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java rename to src/main/java/com/gmail/nossr50/listeners/EntityListener.java index adc77fdae..5e3a04a03 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -22,11 +22,7 @@ import org.bukkit.event.entity.ExplosionPrimeEvent; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.metadata.FixedMetadataValue; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; @@ -34,17 +30,21 @@ 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.mcBleedTimer; -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.Staves; -import com.gmail.nossr50.skills.Taming; +import com.gmail.nossr50.skills.combat.Archery; +import com.gmail.nossr50.skills.combat.Staves; +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.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; -public class mcEntityListener implements Listener { +public class EntityListener implements Listener { private final mcMMO plugin; - public mcEntityListener(final mcMMO plugin) { + public EntityListener(final mcMMO plugin) { this.plugin = plugin; } diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java similarity index 92% rename from src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java rename to src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 6a98c6b85..8fb9a2926 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -26,13 +26,7 @@ import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.BlockChecks; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.Item; -import com.gmail.nossr50.ItemChecks; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.commands.general.XprateCommand; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask; @@ -44,18 +38,24 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent; import com.gmail.nossr50.events.chat.McMMOPartyChatEvent; import com.gmail.nossr50.locale.mcLocale; 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.Staves; -import com.gmail.nossr50.skills.Taming; +import com.gmail.nossr50.skills.combat.Staves; +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.Combat; +import com.gmail.nossr50.util.Item; +import com.gmail.nossr50.util.ItemChecks; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.mcPermissions; -public class mcPlayerListener implements Listener { +public class PlayerListener implements Listener { private mcMMO plugin; - public mcPlayerListener(mcMMO instance) { + public PlayerListener(mcMMO instance) { plugin = instance; } diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java similarity index 93% rename from src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java rename to src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 74939c8fe..01bcea59a 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -8,7 +8,7 @@ import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; /** * Listener for listening to our own events, only really useful for catching errors */ -public class mcSelfListener implements Listener { +public class SelfListener implements Listener { /** * Monitor internal XP gain events. diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSpoutInputListener.java b/src/main/java/com/gmail/nossr50/listeners/SpoutInputListener.java similarity index 89% rename from src/main/java/com/gmail/nossr50/listeners/mcSpoutInputListener.java rename to src/main/java/com/gmail/nossr50/listeners/SpoutInputListener.java index 7e2bda215..fe4dd70d0 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcSpoutInputListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SpoutInputListener.java @@ -6,15 +6,15 @@ import org.getspout.spoutapi.event.input.KeyPressedEvent; import org.getspout.spoutapi.gui.ScreenType; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.popups.PopupMMO; import com.gmail.nossr50.spout.SpoutStuff; +import com.gmail.nossr50.util.Users; -public class mcSpoutInputListener implements Listener { +public class SpoutInputListener implements Listener { private mcMMO plugin; - public mcSpoutInputListener(mcMMO plugin) { + public SpoutInputListener(mcMMO plugin) { this.plugin = plugin; } diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java b/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java similarity index 88% rename from src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java rename to src/main/java/com/gmail/nossr50/listeners/SpoutListener.java index 9111ba15e..c275d8465 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java @@ -6,18 +6,18 @@ import org.bukkit.event.Listener; import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.HUDmmo; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.spout.SpoutStuff; +import com.gmail.nossr50.util.Users; -public class mcSpoutListener implements Listener { +public class SpoutListener implements Listener { //Why do we have this here? We never use it... mcMMO plugin = null; - public mcSpoutListener(mcMMO pluginx) { + public SpoutListener(mcMMO pluginx) { plugin = pluginx; } diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java b/src/main/java/com/gmail/nossr50/listeners/SpoutScreenListener.java similarity index 92% rename from src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java rename to src/main/java/com/gmail/nossr50/listeners/SpoutScreenListener.java index 123a68a6f..17cabcb2d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SpoutScreenListener.java @@ -6,7 +6,6 @@ import org.getspout.spoutapi.event.screen.ButtonClickEvent; import org.getspout.spoutapi.event.screen.ScreenCloseEvent; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.HUDType; import com.gmail.nossr50.datatypes.HUDmmo; @@ -16,12 +15,13 @@ import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle; import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle; import com.gmail.nossr50.datatypes.popups.PopupMMO; import com.gmail.nossr50.spout.SpoutStuff; +import com.gmail.nossr50.util.Users; -public class mcSpoutScreenListener implements Listener { +public class SpoutScreenListener implements Listener { //Why do we have this here? We never use it... mcMMO plugin = null; - public mcSpoutScreenListener(mcMMO pluginx) { + public SpoutScreenListener(mcMMO pluginx) { plugin = pluginx; } diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 2ffa50496..c2addf7b9 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -8,9 +8,13 @@ import com.gmail.nossr50.commands.party.*; import com.gmail.nossr50.commands.general.*; import com.gmail.nossr50.config.*; import com.gmail.nossr50.runnables.*; -import com.gmail.nossr50.listeners.mcBlockListener; -import com.gmail.nossr50.listeners.mcEntityListener; -import com.gmail.nossr50.listeners.mcPlayerListener; +import com.gmail.nossr50.util.Database; +import com.gmail.nossr50.util.Leaderboard; +import com.gmail.nossr50.util.Metrics; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.listeners.BlockListener; +import com.gmail.nossr50.listeners.EntityListener; +import com.gmail.nossr50.listeners.PlayerListener; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; @@ -42,9 +46,9 @@ public class mcMMO extends JavaPlugin { public static File file = new File(maindirectory + File.separator + "config.yml"); public static File versionFile = new File(maindirectory + File.separator + "VERSION"); - private final mcPlayerListener playerListener = new mcPlayerListener(this); - private final mcBlockListener blockListener = new mcBlockListener(this); - private final mcEntityListener entityListener = new mcEntityListener(this); + private final PlayerListener playerListener = new PlayerListener(this); + private final BlockListener blockListener = new BlockListener(this); + private final EntityListener entityListener = new EntityListener(this); //Alias - Command public HashMap aliasMap = new HashMap(); diff --git a/src/main/java/com/gmail/nossr50/party/Party.java b/src/main/java/com/gmail/nossr50/party/Party.java index 94b6904cd..93df4872a 100644 --- a/src/main/java/com/gmail/nossr50/party/Party.java +++ b/src/main/java/com/gmail/nossr50/party/Party.java @@ -13,10 +13,10 @@ import java.util.HashMap; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; public class Party { public static String partyPlayersFile = mcMMO.maindirectory + File.separator + "FlatFileStuff" + File.separator + "partyPlayers"; 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/RemoveProfileFromMemoryTask.java b/src/main/java/com/gmail/nossr50/runnables/RemoveProfileFromMemoryTask.java index d8b953843..3bd753ce0 100644 --- a/src/main/java/com/gmail/nossr50/runnables/RemoveProfileFromMemoryTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/RemoveProfileFromMemoryTask.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; +import com.gmail.nossr50.util.Users; public class RemoveProfileFromMemoryTask implements Runnable { private Player player; diff --git a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java b/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java index 34efbda9d..43a74ca75 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java @@ -5,9 +5,9 @@ import java.io.FileReader; import org.bukkit.Bukkit; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.LoadProperties; +import com.gmail.nossr50.util.m; public class SQLConversionTask implements Runnable { diff --git a/src/main/java/com/gmail/nossr50/runnables/mcBleedTimer.java b/src/main/java/com/gmail/nossr50/runnables/mcBleedTimer.java index 4b671139b..fe92f4e2c 100644 --- a/src/main/java/com/gmail/nossr50/runnables/mcBleedTimer.java +++ b/src/main/java/com/gmail/nossr50/runnables/mcBleedTimer.java @@ -5,11 +5,11 @@ import java.util.HashSet; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Combat; +import com.gmail.nossr50.util.Users; public class mcBleedTimer implements Runnable { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/runnables/mcSaveTimer.java b/src/main/java/com/gmail/nossr50/runnables/mcSaveTimer.java index 4843168ba..a62183511 100644 --- a/src/main/java/com/gmail/nossr50/runnables/mcSaveTimer.java +++ b/src/main/java/com/gmail/nossr50/runnables/mcSaveTimer.java @@ -2,8 +2,8 @@ package com.gmail.nossr50.runnables; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.Users; public class mcSaveTimer implements Runnable { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/runnables/mcTimer.java b/src/main/java/com/gmail/nossr50/runnables/mcTimer.java index 977fa23f3..0d6c1d68e 100644 --- a/src/main/java/com/gmail/nossr50/runnables/mcTimer.java +++ b/src/main/java/com/gmail/nossr50/runnables/mcTimer.java @@ -2,12 +2,12 @@ package com.gmail.nossr50.runnables; import org.bukkit.entity.Player; -import com.gmail.nossr50.Users; 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 mcTimer implements Runnable { private final mcMMO plugin; 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 89% rename from src/main/java/com/gmail/nossr50/skills/Archery.java rename to src/main/java/com/gmail/nossr50/skills/combat/Archery.java index 1d9a2428e..1129df237 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; @@ -8,14 +8,14 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Combat; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; public class Archery { 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 95% rename from src/main/java/com/gmail/nossr50/skills/Axes.java rename to src/main/java/com/gmail/nossr50/skills/combat/Axes.java index ae4d82013..af660eb61 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; @@ -11,12 +11,12 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; public class Axes { diff --git a/src/main/java/com/gmail/nossr50/skills/Staves.java b/src/main/java/com/gmail/nossr50/skills/combat/Staves.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/Staves.java rename to src/main/java/com/gmail/nossr50/skills/combat/Staves.java index 343e47b95..b14701622 100644 --- a/src/main/java/com/gmail/nossr50/skills/Staves.java +++ b/src/main/java/com/gmail/nossr50/skills/combat/Staves.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills; +package com.gmail.nossr50.skills.combat; import java.util.Collection; 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 90% rename from src/main/java/com/gmail/nossr50/skills/Swords.java rename to src/main/java/com/gmail/nossr50/skills/combat/Swords.java index c68a1fc48..a0dc46635 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; @@ -9,17 +9,17 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Wolf; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.ItemChecks; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; import com.gmail.nossr50.runnables.mcBleedTimer; +import com.gmail.nossr50.util.Combat; +import com.gmail.nossr50.util.ItemChecks; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; public class Swords { 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 98% rename from src/main/java/com/gmail/nossr50/skills/Taming.java rename to src/main/java/com/gmail/nossr50/skills/combat/Taming.java index 24c762916..2dcefd097 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; @@ -18,15 +18,15 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.runnables.mcBleedTimer; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; public class Taming { 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 92% rename from src/main/java/com/gmail/nossr50/skills/Unarmed.java rename to src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java index 0fe6fbc6b..0210577b5 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; @@ -8,12 +8,12 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; public class Unarmed { 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 95% rename from src/main/java/com/gmail/nossr50/skills/BlastMining.java rename to src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java index 712f24d20..0b78fab1d 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; @@ -15,14 +15,15 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; -import com.gmail.nossr50.BlockChecks; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; 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.locale.mcLocale; +import com.gmail.nossr50.util.BlockChecks; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; 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 92% rename from src/main/java/com/gmail/nossr50/skills/Excavation.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java index 16586b995..f7b3f3d1b 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; @@ -12,9 +12,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.spout.SpoutSounds; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.config.LoadTreasures; import com.gmail.nossr50.datatypes.PlayerProfile; 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 94% rename from src/main/java/com/gmail/nossr50/skills/Fishing.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java index a74c5e82f..6009ed386 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; @@ -17,16 +17,17 @@ import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.material.Wool; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.ItemChecks; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.config.LoadTreasures; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.treasure.FishingTreasure; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Combat; +import com.gmail.nossr50.util.ItemChecks; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; 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 95% rename from src/main/java/com/gmail/nossr50/skills/Herbalism.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java index 9562242a7..c1f8b1769 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; @@ -12,16 +12,17 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.runnables.GreenThumbTimer; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; 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 93% rename from src/main/java/com/gmail/nossr50/skills/Mining.java rename to src/main/java/com/gmail/nossr50/skills/gathering/Mining.java index 04623444d..03fcac0b8 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; @@ -12,11 +12,12 @@ import org.bukkit.inventory.ItemStack; import org.getspout.spoutapi.sound.SoundEffect; import org.bukkit.enchantments.Enchantment; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.spout.SpoutSounds; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; 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 95% rename from src/main/java/com/gmail/nossr50/skills/WoodCutting.java rename to src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java index 1197a3873..34ef856c0 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; @@ -12,16 +12,17 @@ import org.bukkit.material.Tree; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.Bukkit; -import com.gmail.nossr50.Combat; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.spout.SpoutSounds; +import com.gmail.nossr50.util.Combat; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; 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 92% rename from src/main/java/com/gmail/nossr50/skills/Acrobatics.java rename to src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java index 205c2ebd5..578c226b0 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; @@ -6,13 +6,14 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; 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 96% rename from src/main/java/com/gmail/nossr50/skills/Repair.java rename to src/main/java/com/gmail/nossr50/skills/misc/Repair.java index 8a37dd84f..d36b6a0eb 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; @@ -15,12 +15,13 @@ import org.bukkit.inventory.PlayerInventory; import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.ItemChecks; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.spout.SpoutSounds; +import com.gmail.nossr50.util.ItemChecks; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; +import com.gmail.nossr50.util.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent; diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java index f20d6a103..e18d2c6ef 100644 --- a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java +++ b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java @@ -20,24 +20,24 @@ import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.keyboard.Keyboard; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.HUDmmo; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.popups.PopupMMO; import com.gmail.nossr50.datatypes.SkillType; -import com.gmail.nossr50.listeners.mcSpoutInputListener; -import com.gmail.nossr50.listeners.mcSpoutListener; -import com.gmail.nossr50.listeners.mcSpoutScreenListener; +import com.gmail.nossr50.listeners.SpoutInputListener; +import com.gmail.nossr50.listeners.SpoutListener; +import com.gmail.nossr50.listeners.SpoutScreenListener; +import com.gmail.nossr50.util.Users; +import com.gmail.nossr50.util.m; public class SpoutStuff { static mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO"); - private final static mcSpoutListener spoutListener = new mcSpoutListener(plugin); - private final static mcSpoutInputListener spoutInputListener = new mcSpoutInputListener(plugin); - private final static mcSpoutScreenListener spoutScreenListener = new mcSpoutScreenListener(plugin); + private final static SpoutListener spoutListener = new SpoutListener(plugin); + private final static SpoutInputListener spoutInputListener = new SpoutInputListener(plugin); + private final static SpoutScreenListener spoutScreenListener = new SpoutScreenListener(plugin); public static HashMap playerHUDs = new HashMap(); public static HashMap playerScreens = new HashMap(); diff --git a/src/main/java/com/gmail/nossr50/BlockChecks.java b/src/main/java/com/gmail/nossr50/util/BlockChecks.java similarity index 94% rename from src/main/java/com/gmail/nossr50/BlockChecks.java rename to src/main/java/com/gmail/nossr50/util/BlockChecks.java index a58c8c5ab..e1ec94a38 100644 --- a/src/main/java/com/gmail/nossr50/BlockChecks.java +++ b/src/main/java/com/gmail/nossr50/util/BlockChecks.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import org.bukkit.Material; diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/util/Combat.java similarity index 95% rename from src/main/java/com/gmail/nossr50/Combat.java rename to src/main/java/com/gmail/nossr50/util/Combat.java index 86ab06a7e..0c1b0ee79 100644 --- a/src/main/java/com/gmail/nossr50/Combat.java +++ b/src/main/java/com/gmail/nossr50/util/Combat.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -15,6 +15,7 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.PlayerProfile; @@ -26,14 +27,13 @@ import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.party.Party; import com.gmail.nossr50.runnables.GainXp; import com.gmail.nossr50.runnables.mcBleedTimer; -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.Staves; -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.Staves; +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/Database.java b/src/main/java/com/gmail/nossr50/util/Database.java similarity index 97% rename from src/main/java/com/gmail/nossr50/Database.java rename to src/main/java/com/gmail/nossr50/util/Database.java index aaa0109b4..801002673 100644 --- a/src/main/java/com/gmail/nossr50/Database.java +++ b/src/main/java/com/gmail/nossr50/util/Database.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import java.sql.Connection; import java.sql.DriverManager; @@ -12,6 +12,7 @@ import java.util.Properties; import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.DatabaseUpdate; import com.gmail.nossr50.datatypes.PlayerProfile; diff --git a/src/main/java/com/gmail/nossr50/Item.java b/src/main/java/com/gmail/nossr50/util/Item.java similarity index 95% rename from src/main/java/com/gmail/nossr50/Item.java rename to src/main/java/com/gmail/nossr50/util/Item.java index 6f1fd3049..ab1542522 100644 --- a/src/main/java/com/gmail/nossr50/Item.java +++ b/src/main/java/com/gmail/nossr50/util/Item.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -7,7 +7,6 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; diff --git a/src/main/java/com/gmail/nossr50/ItemChecks.java b/src/main/java/com/gmail/nossr50/util/ItemChecks.java similarity index 95% rename from src/main/java/com/gmail/nossr50/ItemChecks.java rename to src/main/java/com/gmail/nossr50/util/ItemChecks.java index 2e5b3b664..7be55d294 100644 --- a/src/main/java/com/gmail/nossr50/ItemChecks.java +++ b/src/main/java/com/gmail/nossr50/util/ItemChecks.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/gmail/nossr50/Leaderboard.java b/src/main/java/com/gmail/nossr50/util/Leaderboard.java similarity index 97% rename from src/main/java/com/gmail/nossr50/Leaderboard.java rename to src/main/java/com/gmail/nossr50/util/Leaderboard.java index 14e7477e3..814d4321b 100644 --- a/src/main/java/com/gmail/nossr50/Leaderboard.java +++ b/src/main/java/com/gmail/nossr50/util/Leaderboard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/Metrics.java b/src/main/java/com/gmail/nossr50/util/Metrics.java similarity index 99% rename from src/main/java/com/gmail/nossr50/Metrics.java rename to src/main/java/com/gmail/nossr50/util/Metrics.java index 112bd25c8..42e8c9276 100644 --- a/src/main/java/com/gmail/nossr50/Metrics.java +++ b/src/main/java/com/gmail/nossr50/util/Metrics.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/com/gmail/nossr50/util/Page.java b/src/main/java/com/gmail/nossr50/util/Page.java index 0bf75e608..f07086d97 100644 --- a/src/main/java/com/gmail/nossr50/util/Page.java +++ b/src/main/java/com/gmail/nossr50/util/Page.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.gmail.nossr50.m; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; 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 e841f548e..57917ce51 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.Bukkit; import org.bukkit.ChatColor; @@ -9,10 +9,6 @@ import org.bukkit.inventory.ItemStack; import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.Leaderboard; -import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; -import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.datatypes.AbilityType; diff --git a/src/main/java/com/gmail/nossr50/Users.java b/src/main/java/com/gmail/nossr50/util/Users.java similarity index 95% rename from src/main/java/com/gmail/nossr50/Users.java rename to src/main/java/com/gmail/nossr50/util/Users.java index c8e758207..65e6c2174 100644 --- a/src/main/java/com/gmail/nossr50/Users.java +++ b/src/main/java/com/gmail/nossr50/util/Users.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/com/gmail/nossr50/m.java b/src/main/java/com/gmail/nossr50/util/m.java similarity index 96% rename from src/main/java/com/gmail/nossr50/m.java rename to src/main/java/com/gmail/nossr50/util/m.java index 1bdcccb54..057518609 100644 --- a/src/main/java/com/gmail/nossr50/m.java +++ b/src/main/java/com/gmail/nossr50/util/m.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import java.util.Random; diff --git a/src/main/java/com/gmail/nossr50/mcPermissions.java b/src/main/java/com/gmail/nossr50/util/mcPermissions.java similarity index 96% rename from src/main/java/com/gmail/nossr50/mcPermissions.java rename to src/main/java/com/gmail/nossr50/util/mcPermissions.java index 61ea27a29..4e20490de 100644 --- a/src/main/java/com/gmail/nossr50/mcPermissions.java +++ b/src/main/java/com/gmail/nossr50/util/mcPermissions.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package com.gmail.nossr50.util; import org.bukkit.entity.Player;