From 93fe2ff5048c79126db86cbb6a6bf6cf11929efa Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Tue, 10 Sep 2013 15:28:07 +0200 Subject: [PATCH] Cleanup our imports --- .../com/gmail/nossr50/commands/KrakenCommand.java | 1 + .../nossr50/commands/McscoreboardCommand.java | 1 + .../commands/database/McconvertCommand.java | 3 ++- .../commands/database/MmoshowdbCommand.java | 1 + .../nossr50/commands/party/PartyCommand.java | 1 + .../commands/party/teleport/PtpCommand.java | 1 + .../nossr50/commands/player/McrankCommand.java | 1 + .../nossr50/commands/player/McstatsCommand.java | 1 + .../nossr50/commands/spout/MchudCommand.java | 1 + .../nossr50/commands/spout/XplockCommand.java | 1 + .../gmail/nossr50/config/spout/SpoutConfig.java | 4 ++-- .../gmail/nossr50/datatypes/skills/SkillType.java | 1 + .../nossr50/datatypes/spout/huds/McMMOHud.java | 3 ++- .../nossr50/datatypes/spout/popups/McMMOMenu.java | 10 +++++----- .../datatypes/spout/popups/McMMOXpBar.java | 14 +++++++------- .../gmail/nossr50/listeners/SpoutListener.java | 15 ++++++++------- src/main/java/com/gmail/nossr50/mcMMO.java | 6 +++--- .../com/gmail/nossr50/metrics/MetricsManager.java | 1 + .../runnables/database/FormulaConversionTask.java | 5 ++--- .../nossr50/skills/herbalism/HerbalismBlock.java | 1 + .../java/com/gmail/nossr50/util/BlockUtils.java | 4 ++-- .../com/gmail/nossr50/util/UpdateChecker.java | 6 +++--- .../util/commands/CommandRegistrationManager.java | 2 +- .../nossr50/util/experience/FormulaManager.java | 2 +- .../com/gmail/nossr50/util/skills/SkillUtils.java | 2 +- .../com/gmail/nossr50/util/spout/SpoutUtils.java | 7 ++++--- .../blockmeta/PrimitiveExChunkletStoreTest.java | 4 ++-- 27 files changed, 57 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java index 41a0b7471..f24ddf910 100644 --- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java @@ -15,6 +15,7 @@ import com.gmail.nossr50.util.Misc; 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/McscoreboardCommand.java b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java index 67ee40c9b..dbe887137 100644 --- a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java @@ -16,6 +16,7 @@ import com.gmail.nossr50.util.StringUtils; 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 McscoreboardCommand implements TabExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java b/src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java index c58301aa6..c53817de9 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java @@ -10,11 +10,12 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; import org.bukkit.util.StringUtil; +import com.gmail.nossr50.mcMMO; 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.gmail.nossr50.mcMMO; + import com.google.common.collect.ImmutableList; public class McconvertCommand 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 ea128838a..3190ef165 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java @@ -9,6 +9,7 @@ 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/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index 4b2505fb5..71c672440 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -20,6 +20,7 @@ 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/teleport/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java index 33cae241f..d3191bb16 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 @@ -23,6 +23,7 @@ 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/McrankCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java index e28e84e63..00a7adb59 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -19,6 +19,7 @@ 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 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 1c4a8bb1e..5711ecc73 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java @@ -13,6 +13,7 @@ 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/spout/MchudCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java index 19ce4b43e..06dbea47e 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java @@ -10,6 +10,7 @@ import org.bukkit.util.StringUtil; import com.gmail.nossr50.datatypes.spout.huds.HudType; import com.gmail.nossr50.locale.LocaleLoader; + import com.google.common.collect.ImmutableList; public class MchudCommand extends SpoutCommand { 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 9f5770545..a3f13a64e 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java @@ -12,6 +12,7 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.skills.SkillUtils; + import com.google.common.collect.ImmutableList; public class XplockCommand extends SpoutCommand { diff --git a/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java b/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java index 7350767d7..433a76438 100644 --- a/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java +++ b/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java @@ -1,11 +1,11 @@ package com.gmail.nossr50.config.spout; -import org.getspout.spoutapi.keyboard.Keyboard; - import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.datatypes.spout.huds.HudType; +import org.getspout.spoutapi.keyboard.Keyboard; + public class SpoutConfig extends ConfigLoader { private static SpoutConfig instance; diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java index 5525293a2..619adc065 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java @@ -26,6 +26,7 @@ import com.gmail.nossr50.skills.unarmed.UnarmedManager; import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.skills.SkillUtils; + import com.google.common.collect.ImmutableList; public enum SkillType { diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java b/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java index 141ae147e..4b6d64874 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java +++ b/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.datatypes.spout.huds; import org.bukkit.entity.Player; -import org.getspout.spoutapi.SpoutManager; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.spout.SpoutConfig; @@ -11,6 +10,8 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu; import com.gmail.nossr50.datatypes.spout.popups.McMMOXpBar; +import org.getspout.spoutapi.SpoutManager; + public class McMMOHud { private Player player; private PlayerProfile profile; diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java index 5fc4a7f23..8930e486c 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java +++ b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java @@ -1,10 +1,5 @@ package com.gmail.nossr50.datatypes.spout.popups; -import org.getspout.spoutapi.gui.GenericLabel; -import org.getspout.spoutapi.gui.GenericPopup; -import org.getspout.spoutapi.gui.InGameHUD; -import org.getspout.spoutapi.player.SpoutPlayer; - import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton; @@ -13,6 +8,11 @@ import com.gmail.nossr50.datatypes.spout.huds.HudType; import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; import com.gmail.nossr50.locale.LocaleLoader; +import org.getspout.spoutapi.gui.GenericLabel; +import org.getspout.spoutapi.gui.GenericPopup; +import org.getspout.spoutapi.gui.InGameHUD; +import org.getspout.spoutapi.player.SpoutPlayer; + public class McMMOMenu extends GenericPopup { private McMMOButton hudButton; private McMMOButton escapeButton; diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java index c4526c7bf..e3f062cb8 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java +++ b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java @@ -1,5 +1,12 @@ package com.gmail.nossr50.datatypes.spout.popups; +import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.config.spout.SpoutConfig; +import com.gmail.nossr50.datatypes.player.PlayerProfile; +import com.gmail.nossr50.datatypes.skills.SkillType; +import com.gmail.nossr50.datatypes.spout.huds.HudType; +import com.gmail.nossr50.util.StringUtils; + import org.getspout.spoutapi.gui.Color; import org.getspout.spoutapi.gui.GenericGradient; import org.getspout.spoutapi.gui.GenericTexture; @@ -8,13 +15,6 @@ import org.getspout.spoutapi.gui.RenderPriority; import org.getspout.spoutapi.gui.Widget; import org.getspout.spoutapi.player.SpoutPlayer; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.huds.HudType; -import com.gmail.nossr50.util.StringUtils; - public class McMMOXpBar { private SpoutPlayer spoutPlayer; private Widget xpBar; diff --git a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java b/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java index 6781d12e4..382f677f3 100644 --- a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java @@ -3,13 +3,6 @@ package com.gmail.nossr50.listeners; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.getspout.spoutapi.event.input.KeyPressedEvent; -import org.getspout.spoutapi.event.screen.ButtonClickEvent; -import org.getspout.spoutapi.event.screen.ScreenCloseEvent; -import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; -import org.getspout.spoutapi.gui.Button; -import org.getspout.spoutapi.gui.ScreenType; -import org.getspout.spoutapi.player.SpoutPlayer; import com.gmail.nossr50.config.spout.SpoutConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; @@ -19,6 +12,14 @@ import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.player.UserManager; +import org.getspout.spoutapi.event.input.KeyPressedEvent; +import org.getspout.spoutapi.event.screen.ButtonClickEvent; +import org.getspout.spoutapi.event.screen.ScreenCloseEvent; +import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; +import org.getspout.spoutapi.gui.Button; +import org.getspout.spoutapi.gui.ScreenType; +import org.getspout.spoutapi.player.SpoutPlayer; + public class SpoutListener implements Listener { /** diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index f240eed15..510c7f91a 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -5,9 +5,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import com.gmail.nossr50.util.experience.FormulaManager; -import net.shatteredlands.shatt.backup.ZipLibrary; - import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.metadata.FixedMetadataValue; @@ -52,9 +49,12 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager; import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory; import com.gmail.nossr50.util.commands.CommandRegistrationManager; +import com.gmail.nossr50.util.experience.FormulaManager; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.spout.SpoutUtils; +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 05349160d..313db4617 100644 --- a/src/main/java/com/gmail/nossr50/metrics/MetricsManager.java +++ b/src/main/java/com/gmail/nossr50/metrics/MetricsManager.java @@ -11,6 +11,7 @@ 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/database/FormulaConversionTask.java b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java index 00f1de275..8a63ab9cf 100644 --- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java @@ -1,16 +1,15 @@ package com.gmail.nossr50.runnables.database; -import com.gmail.nossr50.datatypes.experience.FormulaType; - import org.bukkit.command.CommandSender; import org.bukkit.scheduler.BukkitRunnable; -import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.SkillType; +import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.player.UserManager; public class FormulaConversionTask extends BukkitRunnable { diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismBlock.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismBlock.java index 8e78bad67..8b8a4e4c7 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismBlock.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismBlock.java @@ -11,6 +11,7 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.util.Permissions; + import com.google.common.collect.Maps; public enum HerbalismBlock { diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 1001a1bbe..8cd0d5daf 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -7,10 +7,10 @@ import org.bukkit.Material; import org.bukkit.NetherWartsState; import org.bukkit.block.BlockState; import org.bukkit.material.CocoaPlant; -import org.bukkit.material.Crops; -import org.bukkit.material.SmoothBrick; import org.bukkit.material.CocoaPlant.CocoaPlantSize; +import org.bukkit.material.Crops; import org.bukkit.material.NetherWarts; +import org.bukkit.material.SmoothBrick; import com.gmail.nossr50.skills.repair.Repair; diff --git a/src/main/java/com/gmail/nossr50/util/UpdateChecker.java b/src/main/java/com/gmail/nossr50/util/UpdateChecker.java index cb45bb476..87f874dfa 100644 --- a/src/main/java/com/gmail/nossr50/util/UpdateChecker.java +++ b/src/main/java/com/gmail/nossr50/util/UpdateChecker.java @@ -4,13 +4,13 @@ import java.io.InputStreamReader; import java.net.URL; import java.net.UnknownHostException; +import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.config.Config; + import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.Config; - public class UpdateChecker { private UpdateChecker() {} diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java index 95fe364d7..b6fc93dd2 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java @@ -17,10 +17,10 @@ import com.gmail.nossr50.commands.MobhealthCommand; import com.gmail.nossr50.commands.XprateCommand; import com.gmail.nossr50.commands.chat.AdminChatCommand; import com.gmail.nossr50.commands.chat.PartyChatCommand; +import com.gmail.nossr50.commands.database.McconvertCommand; import com.gmail.nossr50.commands.database.McpurgeCommand; import com.gmail.nossr50.commands.database.McremoveCommand; import com.gmail.nossr50.commands.database.MmoshowdbCommand; -import com.gmail.nossr50.commands.database.McconvertCommand; import com.gmail.nossr50.commands.experience.AddlevelsCommand; import com.gmail.nossr50.commands.experience.AddxpCommand; import com.gmail.nossr50.commands.experience.MmoeditCommand; diff --git a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java index 50db34636..ccc5a6e5b 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java @@ -6,11 +6,11 @@ import java.util.Map; import org.bukkit.configuration.file.YamlConfiguration; +import com.gmail.nossr50.mcMMO; 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.skills.SkillType; -import com.gmail.nossr50.mcMMO; public class FormulaManager { private static String formulaFilePath = mcMMO.getFlatFileDirectory() + "formula.yml"; diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index 1f189ebd3..12ed360dc 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -14,6 +14,7 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.HiddenConfig; @@ -28,7 +29,6 @@ import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.skills.AbilityDisableTask; import com.gmail.nossr50.runnables.skills.ToolLowerTask; import com.gmail.nossr50.util.ItemUtils; diff --git a/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java b/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java index fb394bdad..87766735e 100644 --- a/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java +++ b/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java @@ -13,9 +13,6 @@ import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; -import org.getspout.spoutapi.SpoutManager; -import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; -import org.getspout.spoutapi.player.SpoutPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.spout.SpoutConfig; @@ -28,6 +25,10 @@ import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.SkillUtils; +import org.getspout.spoutapi.SpoutManager; +import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; +import org.getspout.spoutapi.player.SpoutPlayer; + public class SpoutUtils { // The order of the values is extremely important, a few methods depend on it to work properly protected enum Tier { diff --git a/src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java b/src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java index 512a7a253..c85f22ba0 100644 --- a/src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java +++ b/src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java @@ -1,10 +1,10 @@ package com.gmail.nossr50.util.blockmeta; -import static org.junit.Assert.assertEquals; - import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class PrimitiveExChunkletStoreTest { byte addresses[][] = new byte[16][16];