From 952309ecda78c30da245d05b0a6f397432bd1809 Mon Sep 17 00:00:00 2001 From: ile123ile Date: Mon, 1 Sep 2014 19:05:43 -0700 Subject: [PATCH] Removed unused imports --- src/main/java/com/gmail/nossr50/api/ExperienceAPI.java | 4 ++-- src/main/java/com/gmail/nossr50/api/SkillAPI.java | 4 +--- src/main/java/com/gmail/nossr50/commands/KrakenCommand.java | 1 - .../java/com/gmail/nossr50/commands/McconvertCommand.java | 1 - .../java/com/gmail/nossr50/commands/McnotifyCommand.java | 1 - .../com/gmail/nossr50/commands/McscoreboardCommand.java | 1 - .../java/com/gmail/nossr50/commands/MobhealthCommand.java | 1 - src/main/java/com/gmail/nossr50/commands/ToggleCommand.java | 1 - src/main/java/com/gmail/nossr50/commands/XprateCommand.java | 1 - .../java/com/gmail/nossr50/commands/chat/ChatCommand.java | 1 - .../com/gmail/nossr50/commands/database/McpurgeCommand.java | 1 - .../gmail/nossr50/commands/database/McremoveCommand.java | 1 - .../gmail/nossr50/commands/database/MmoshowdbCommand.java | 1 - .../nossr50/commands/experience/ExperienceCommand.java | 1 - .../nossr50/commands/experience/SkillresetCommand.java | 1 - .../nossr50/commands/hardcore/HardcoreModeCommand.java | 1 - .../java/com/gmail/nossr50/commands/party/PartyCommand.java | 1 - .../commands/party/alliance/PartyAllianceCommand.java | 1 - .../gmail/nossr50/commands/party/teleport/PtpCommand.java | 1 - .../com/gmail/nossr50/commands/player/InspectCommand.java | 1 - .../gmail/nossr50/commands/player/MccooldownCommand.java | 1 - .../com/gmail/nossr50/commands/player/McrankCommand.java | 1 - .../com/gmail/nossr50/commands/player/McstatsCommand.java | 1 - .../com/gmail/nossr50/commands/skills/AprilCommand.java | 1 - .../com/gmail/nossr50/commands/skills/SkillCommand.java | 1 - .../com/gmail/nossr50/config/mods/CustomEntityConfig.java | 3 +-- .../com/gmail/nossr50/database/FlatfileDatabaseManager.java | 3 +-- .../java/com/gmail/nossr50/database/SQLDatabaseManager.java | 4 ++-- .../com/gmail/nossr50/datatypes/player/McMMOPlayer.java | 3 +-- .../com/gmail/nossr50/datatypes/player/PlayerProfile.java | 1 - .../com/gmail/nossr50/datatypes/skills/AbilityType.java | 2 +- .../java/com/gmail/nossr50/listeners/BlockListener.java | 1 - src/main/java/com/gmail/nossr50/mcMMO.java | 4 ++-- src/main/java/com/gmail/nossr50/metrics/MetricsManager.java | 1 - .../com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java | 4 ++-- .../nossr50/runnables/commands/McrankCommandAsyncTask.java | 3 +-- .../nossr50/runnables/commands/MctopCommandAsyncTask.java | 3 +-- src/main/java/com/gmail/nossr50/skills/SkillManager.java | 6 ------ .../java/com/gmail/nossr50/skills/child/ChildConfig.java | 1 - .../java/com/gmail/nossr50/skills/child/FamilyTree.java | 1 - src/main/java/com/gmail/nossr50/util/HolidayManager.java | 1 - .../java/com/gmail/nossr50/util/commands/CommandUtils.java | 1 - .../java/com/gmail/nossr50/util/player/UserManager.java | 1 - .../gmail/nossr50/util/scoreboards/ScoreboardManager.java | 1 - .../gmail/nossr50/util/scoreboards/ScoreboardWrapper.java | 3 +-- .../java/com/gmail/nossr50/util/skills/CombatUtils.java | 1 - src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java | 3 ++- .../java/net/gravitydevelopment/updater/mcmmo/Updater.java | 5 ++--- 48 files changed, 20 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index 701a4af0e..bf0f448ab 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -5,14 +5,14 @@ import java.util.UUID; import org.bukkit.entity.Player; -import com.gmail.nossr50.api.exceptions.InvalidFormulaTypeException; -import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.api.exceptions.InvalidFormulaTypeException; import com.gmail.nossr50.api.exceptions.InvalidPlayerException; import com.gmail.nossr50.api.exceptions.InvalidSkillException; import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; diff --git a/src/main/java/com/gmail/nossr50/api/SkillAPI.java b/src/main/java/com/gmail/nossr50/api/SkillAPI.java index 85ca42ff3..f7e773ce7 100644 --- a/src/main/java/com/gmail/nossr50/api/SkillAPI.java +++ b/src/main/java/com/gmail/nossr50/api/SkillAPI.java @@ -5,16 +5,14 @@ import java.util.List; import org.bukkit.Color; import org.bukkit.Material; -import org.bukkit.block.BlockState; import org.bukkit.entity.Player; import com.gmail.nossr50.commands.skills.SkillCommand; -import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SecondaryAbility; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.datatypes.skills.SkillType.SkillUseType; +import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.skills.SkillAbilityManager; import com.gmail.nossr50.skills.SkillManager; import com.gmail.nossr50.util.StringUtils; diff --git a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java index 8bf421020..46e206aed 100644 --- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class KrakenCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java b/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java index f141ea2c3..5904b228f 100644 --- a/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java @@ -16,7 +16,6 @@ import com.gmail.nossr50.commands.experience.ConvertExperienceCommand; import com.gmail.nossr50.database.DatabaseManagerFactory; import com.gmail.nossr50.datatypes.database.DatabaseType; import com.gmail.nossr50.datatypes.experience.FormulaType; - import com.google.common.collect.ImmutableList; public class McconvertCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java index 41ea4c939..e660fa266 100644 --- a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class McnotifyCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java index 0ad35a378..d90415e73 100644 --- a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; - import com.google.common.collect.ImmutableList; public class McscoreboardCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java index 8e22a544a..4de969d2c 100644 --- a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java @@ -14,7 +14,6 @@ import com.gmail.nossr50.datatypes.MobHealthbarType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class MobhealthCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java index 94735d834..7d8c588e9 100644 --- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java @@ -11,7 +11,6 @@ import org.bukkit.util.StringUtil; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public abstract class ToggleCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java index fd9a791d3..24c8fa340 100644 --- a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java @@ -14,7 +14,6 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.commands.CommandUtils; - import com.google.common.collect.ImmutableList; public class XprateCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java index 9266d435d..211e23526 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java @@ -19,7 +19,6 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public abstract class ChatCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java b/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java index 6b9ed05d1..acada6425 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java @@ -9,7 +9,6 @@ import org.bukkit.command.TabExecutor; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; - import com.google.common.collect.ImmutableList; public class McpurgeCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java b/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java index 7c68cbce5..98f858b5e 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class McremoveCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java b/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java index af39eb7f7..20bcb2ae5 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java @@ -9,7 +9,6 @@ import org.bukkit.command.TabExecutor; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.database.DatabaseManagerFactory; import com.gmail.nossr50.locale.LocaleLoader; - import com.google.common.collect.ImmutableList; public class MmoshowdbCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java index aeacb07cf..ac64f7e3b 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -16,7 +16,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public abstract class ExperienceCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java index 77fb065d8..119707ec1 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java @@ -19,7 +19,6 @@ import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java index 02f2c814f..27d1b01ae 100644 --- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java @@ -13,7 +13,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.commands.CommandUtils; - import com.google.common.collect.ImmutableList; public abstract class HardcoreModeCommand implements TabExecutor { 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 c90889113..c299d4b4d 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -21,7 +21,6 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class PartyCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java index 5347765a7..94c6b3104 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java @@ -19,7 +19,6 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class PartyAllianceCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java index 2eaee4153..2efee7af1 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java @@ -25,7 +25,6 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.SkillUtils; - import com.google.common.collect.ImmutableList; public class PtpCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java index c00cd5274..aa80418a9 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java @@ -19,7 +19,6 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; - import com.google.common.collect.ImmutableList; public class InspectCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java b/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java index 664f495af..defa33e23 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java @@ -14,7 +14,6 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; - import com.google.common.collect.ImmutableList; public class MccooldownCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java index 38a554512..4ea4b6340 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -18,7 +18,6 @@ import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class McrankCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java index 1184fc87e..4265119f4 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; - import com.google.common.collect.ImmutableList; public class McstatsCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java index e57e9e672..cf2ba8bf9 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java @@ -14,7 +14,6 @@ import com.gmail.nossr50.util.HolidayManager.FakeSkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.commands.CommandUtils; - import com.google.common.collect.ImmutableList; public class AprilCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java index 0fc4d2679..a474c0a8a 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java @@ -24,7 +24,6 @@ import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.util.skills.PerksUtils; - import com.google.common.collect.ImmutableList; public abstract class SkillCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java index 16be6e00e..76e7efbec 100644 --- a/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java +++ b/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java @@ -2,14 +2,13 @@ package com.gmail.nossr50.config.mods; import java.util.HashMap; +import org.apache.commons.lang.ClassUtils; import org.bukkit.Material; import org.bukkit.material.MaterialData; import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.datatypes.mods.CustomEntity; -import org.apache.commons.lang.ClassUtils; - public class CustomEntityConfig extends ConfigLoader { public HashMap customEntityClassMap = new HashMap(); public HashMap customEntityTypeMap = new HashMap(); diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java index becd00aaa..bce3fe11d 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.commons.lang.ArrayUtils; import org.bukkit.OfflinePlayer; import com.gmail.nossr50.mcMMO; @@ -30,8 +31,6 @@ import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.StringUtils; -import org.apache.commons.lang.ArrayUtils; - public final class FlatfileDatabaseManager implements DatabaseManager { private final HashMap> playerStatHash = new HashMap>(); private final List powerLevels = new ArrayList(); diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index c04cb203c..7974b207c 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -16,6 +16,8 @@ import java.util.concurrent.locks.ReentrantLock; import org.bukkit.scheduler.BukkitRunnable; +import snaq.db.ConnectionPool; + import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.MobHealthbarType; @@ -28,8 +30,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; import com.gmail.nossr50.util.Misc; -import snaq.db.ConnectionPool; - public final class SQLDatabaseManager implements DatabaseManager { private String tablePrefix = Config.getInstance().getMySQLTablePrefix(); diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index 078b74a1e..aa2194c0d 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -5,6 +5,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.apache.commons.lang.Validate; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Sound; @@ -55,8 +56,6 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils; import com.gmail.nossr50.util.skills.PerksUtils; import com.gmail.nossr50.util.skills.SkillUtils; -import org.apache.commons.lang.Validate; - public class McMMOPlayer { private Player player; private PlayerProfile profile; diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java index 837858c8a..1cee06585 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java @@ -15,7 +15,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask; import com.gmail.nossr50.skills.child.FamilyTree; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableMap; public class PlayerProfile { diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java index 8e5e80905..843b82efa 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.datatypes.skills; -import java.util.List; import java.util.ArrayList; +import java.util.List; import org.bukkit.Material; import org.bukkit.block.BlockState; diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 3f4e7efc7..1fb2314f2 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -33,7 +33,6 @@ import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; import com.gmail.nossr50.runnables.PistonTrackerTask; import com.gmail.nossr50.runnables.StickyPistonTrackerTask; -import com.gmail.nossr50.skills.SkillAbilityManager; import com.gmail.nossr50.skills.alchemy.Alchemy; import com.gmail.nossr50.skills.excavation.ExcavationManager; import com.gmail.nossr50.skills.herbalism.Herbalism; diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index d1eed8d36..a54751c7f 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -5,6 +5,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import net.shatteredlands.shatt.backup.ZipLibrary; + import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.metadata.FixedMetadataValue; @@ -64,8 +66,6 @@ import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.util.upgrade.UpgradeManager; -import net.shatteredlands.shatt.backup.ZipLibrary; - public class mcMMO extends JavaPlugin { /* Managers */ private static ChunkManager placeStore; diff --git a/src/main/java/com/gmail/nossr50/metrics/MetricsManager.java b/src/main/java/com/gmail/nossr50/metrics/MetricsManager.java index 6e0db3f74..ab1624f64 100644 --- a/src/main/java/com/gmail/nossr50/metrics/MetricsManager.java +++ b/src/main/java/com/gmail/nossr50/metrics/MetricsManager.java @@ -11,7 +11,6 @@ import com.gmail.nossr50.config.HiddenConfig; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.locale.LocaleLoader; - import com.turt2live.metrics.EMetrics; import com.turt2live.metrics.Metrics; import com.turt2live.metrics.Metrics.Graph; diff --git a/src/main/java/com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java b/src/main/java/com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java index 522230de7..ec4baf723 100644 --- a/src/main/java/com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java @@ -1,13 +1,13 @@ package com.gmail.nossr50.runnables; +import net.gravitydevelopment.updater.mcmmo.Updater; + import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; -import net.gravitydevelopment.updater.mcmmo.Updater; - public class UpdaterResultAsyncTask extends BukkitRunnable { private mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java index 266311e38..dafbc2c22 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java @@ -2,6 +2,7 @@ package com.gmail.nossr50.runnables.commands; import java.util.Map; +import org.apache.commons.lang.Validate; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -9,8 +10,6 @@ import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.skills.SkillType; -import org.apache.commons.lang.Validate; - public class McrankCommandAsyncTask extends BukkitRunnable { private final String playerName; private final CommandSender sender; diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java index 245a60a64..2036a6d05 100644 --- a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java @@ -2,6 +2,7 @@ package com.gmail.nossr50.runnables.commands; import java.util.List; +import org.apache.commons.lang.Validate; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -10,8 +11,6 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.database.PlayerStat; import com.gmail.nossr50.datatypes.skills.SkillType; -import org.apache.commons.lang.Validate; - public class MctopCommandAsyncTask extends BukkitRunnable { private final CommandSender sender; private final SkillType skill; diff --git a/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/src/main/java/com/gmail/nossr50/skills/SkillManager.java index 5b6940248..5019eeafa 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java @@ -1,19 +1,13 @@ package com.gmail.nossr50.skills; -import org.bukkit.block.BlockState; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.skills.ToolType; import com.gmail.nossr50.datatypes.skills.XPGainReason; -import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.skills.PerksUtils; -import com.gmail.nossr50.util.skills.SkillUtils; public abstract class SkillManager { public boolean usesAPIAbilitySystem = false; diff --git a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java index bb3863c03..77fdaa25c 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java +++ b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.skills.child; -import java.util.EnumSet; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java b/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java index 118fd266d..c1672b7a3 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java +++ b/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.skills.child; import java.util.Collections; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/src/main/java/com/gmail/nossr50/util/HolidayManager.java index 690de7eee..0c49f6899 100644 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ b/src/main/java/com/gmail/nossr50/util/HolidayManager.java @@ -36,7 +36,6 @@ import com.gmail.nossr50.commands.skills.AprilCommand; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.ParticleEffectUtils; - import com.google.common.collect.ImmutableList; public final class HolidayManager { diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java index c3b4c0545..e97f9a1ef 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java @@ -17,7 +17,6 @@ import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.SkillUtils; - import com.google.common.collect.ImmutableList; public final class CommandUtils { diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java index 61e704818..aa645e16e 100644 --- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java @@ -10,7 +10,6 @@ import org.bukkit.metadata.FixedMetadataValue; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.player.McMMOPlayer; - import com.google.common.collect.ImmutableList; public final class UserManager { diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java index 08f1878a1..5d33a12da 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java @@ -21,7 +21,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java index f79f2fbc2..73ccdf2a6 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.util.scoreboards; import java.util.List; import java.util.Map; +import org.apache.commons.lang.Validate; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -25,8 +26,6 @@ import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager.SidebarType; -import org.apache.commons.lang.Validate; - public class ScoreboardWrapper { // Initialization variables public final String playerName; diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index 5028e5fc2..0a221bf19 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -47,7 +47,6 @@ import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.MobHealthbarUtils; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableMap; public final class CombatUtils { diff --git a/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java b/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java index 289cf217d..a73e816d8 100644 --- a/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java +++ b/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java @@ -12,11 +12,12 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.Callable; -import com.google.common.collect.ImmutableList; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; +import com.google.common.collect.ImmutableList; + public class UUIDFetcher implements Callable> { private static final int PROFILES_PER_REQUEST = 100; private static final long RATE_LIMIT = 100L; diff --git a/src/main/java/net/gravitydevelopment/updater/mcmmo/Updater.java b/src/main/java/net/gravitydevelopment/updater/mcmmo/Updater.java index 92e3d9cf5..ccc873d20 100644 --- a/src/main/java/net/gravitydevelopment/updater/mcmmo/Updater.java +++ b/src/main/java/net/gravitydevelopment/updater/mcmmo/Updater.java @@ -22,13 +22,12 @@ import java.util.zip.ZipFile; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.Plugin; - -import com.gmail.nossr50.config.Config; - import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; +import com.gmail.nossr50.config.Config; + /** * Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed. *