From 6afe0e8a344c026a1a0bbb3d14d4276ee5ce2367 Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 5 Jun 2012 10:13:10 -0400 Subject: [PATCH] Organize imports. --- .../nossr50/commands/mc/MctopCommand.java | 1 + .../nossr50/datatypes/PlayerProfile.java | 4 +- .../com/gmail/nossr50/datatypes/Tree.java | 2 - .../com/gmail/nossr50/datatypes/TreeNode.java | 2 - .../nossr50/datatypes/popups/PopupMMO.java | 1 + .../nossr50/listeners/BlockListener.java | 45 +++++----- .../nossr50/listeners/PlayerListener.java | 6 +- src/main/java/com/gmail/nossr50/mcMMO.java | 90 +++++++++++++------ .../nossr50/skills/gathering/Excavation.java | 15 ++-- .../nossr50/skills/gathering/Mining.java | 8 +- .../nossr50/skills/gathering/WoodCutting.java | 5 +- .../gmail/nossr50/skills/repair/Repair.java | 8 +- .../com/gmail/nossr50/spout/SpoutSounds.java | 1 - .../com/gmail/nossr50/spout/SpoutStuff.java | 3 +- .../java/com/gmail/nossr50/util/Combat.java | 2 +- .../java/com/gmail/nossr50/util/Database.java | 5 +- .../java/com/gmail/nossr50/util/Item.java | 2 +- .../java/com/gmail/nossr50/util/Metrics.java | 12 +-- .../com/gmail/nossr50/util/ModChecks.java | 2 +- .../java/com/gmail/nossr50/util/Skills.java | 3 +- 20 files changed, 121 insertions(+), 96 deletions(-) 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 8a8df5f59..6b5ac3368 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java @@ -7,6 +7,7 @@ import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; + import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java index 049e5a44e..daa25c55f 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -4,13 +4,14 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.FileReader; import java.io.FileWriter; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import org.bukkit.GameMode; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.SpoutConfig; import com.gmail.nossr50.datatypes.mods.CustomTool; @@ -19,7 +20,6 @@ import com.gmail.nossr50.party.Party; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.ModChecks; import com.gmail.nossr50.util.Users; -import com.gmail.nossr50.mcMMO; public class PlayerProfile { diff --git a/src/main/java/com/gmail/nossr50/datatypes/Tree.java b/src/main/java/com/gmail/nossr50/datatypes/Tree.java index 7c70e11c9..e4a800ec4 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/Tree.java +++ b/src/main/java/com/gmail/nossr50/datatypes/Tree.java @@ -2,8 +2,6 @@ package com.gmail.nossr50.datatypes; import java.util.ArrayList; -import com.gmail.nossr50.datatypes.PlayerStat; - public class Tree { private TreeNode root = null; diff --git a/src/main/java/com/gmail/nossr50/datatypes/TreeNode.java b/src/main/java/com/gmail/nossr50/datatypes/TreeNode.java index 2744bb4fb..a5c73f077 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/TreeNode.java +++ b/src/main/java/com/gmail/nossr50/datatypes/TreeNode.java @@ -2,8 +2,6 @@ package com.gmail.nossr50.datatypes; import java.util.ArrayList; -import com.gmail.nossr50.datatypes.PlayerStat; - public class TreeNode { TreeNode left = null; TreeNode right = null; diff --git a/src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java b/src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java index 36c65f59b..e182b5925 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java +++ b/src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java @@ -4,6 +4,7 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.getspout.spoutapi.gui.GenericLabel; import org.getspout.spoutapi.gui.GenericPopup; + import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.buttons.ButtonEscape; diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 228855da8..840bf302a 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -2,28 +2,6 @@ package com.gmail.nossr50.listeners; import java.util.List; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.Config; -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.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.repair.Repair; -import com.gmail.nossr50.spout.SpoutSounds; -import com.gmail.nossr50.util.BlockChecks; -import com.gmail.nossr50.util.ItemChecks; -import com.gmail.nossr50.util.ModChecks; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.Skills; -import com.gmail.nossr50.util.Users; -import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; -import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; -import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; - import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -39,9 +17,30 @@ import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; - import org.getspout.spoutapi.sound.SoundEffect; +import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.config.Config; +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.events.fake.FakeBlockBreakEvent; +import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; +import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; +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.repair.Repair; +import com.gmail.nossr50.spout.SpoutSounds; +import com.gmail.nossr50.util.BlockChecks; +import com.gmail.nossr50.util.ItemChecks; +import com.gmail.nossr50.util.ModChecks; +import com.gmail.nossr50.util.Permissions; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; + public class BlockListener implements Listener { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index b3052cacd..f3e1469cf 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -24,9 +24,6 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.general.XprateCommand; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.runnables.BleedTimer; -import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask; -import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; @@ -34,10 +31,13 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent; import com.gmail.nossr50.events.chat.McMMOPartyChatEvent; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.Party; +import com.gmail.nossr50.runnables.BleedTimer; +import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask; 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.spout.SpoutStuff; import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.Item; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 835ea7cd6..b0f9f6d74 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -1,19 +1,72 @@ package com.gmail.nossr50; -import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.commands.skills.*; -import com.gmail.nossr50.commands.spout.*; -import com.gmail.nossr50.commands.mc.*; -import com.gmail.nossr50.commands.party.*; -import com.gmail.nossr50.commands.general.*; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import net.shatteredlands.shatt.backup.ZipLibrary; + +import org.bukkit.OfflinePlayer; +import org.bukkit.entity.Player; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitScheduler; + +import com.gmail.nossr50.commands.general.AddlevelsCommand; +import com.gmail.nossr50.commands.general.AddxpCommand; +import com.gmail.nossr50.commands.general.InspectCommand; +import com.gmail.nossr50.commands.general.McstatsCommand; +import com.gmail.nossr50.commands.general.MmoeditCommand; +import com.gmail.nossr50.commands.general.MmoupdateCommand; +import com.gmail.nossr50.commands.general.XprateCommand; +import com.gmail.nossr50.commands.mc.McabilityCommand; +import com.gmail.nossr50.commands.mc.MccCommand; +import com.gmail.nossr50.commands.mc.McgodCommand; +import com.gmail.nossr50.commands.mc.McmmoCommand; +import com.gmail.nossr50.commands.mc.McrefreshCommand; +import com.gmail.nossr50.commands.mc.McremoveCommand; +import com.gmail.nossr50.commands.mc.MctopCommand; +import com.gmail.nossr50.commands.party.ACommand; +import com.gmail.nossr50.commands.party.AcceptCommand; +import com.gmail.nossr50.commands.party.InviteCommand; +import com.gmail.nossr50.commands.party.PCommand; +import com.gmail.nossr50.commands.party.PartyCommand; +import com.gmail.nossr50.commands.party.PtpCommand; +import com.gmail.nossr50.commands.skills.AcrobaticsCommand; +import com.gmail.nossr50.commands.skills.ArcheryCommand; +import com.gmail.nossr50.commands.skills.AxesCommand; +import com.gmail.nossr50.commands.skills.ExcavationCommand; +import com.gmail.nossr50.commands.skills.FishingCommand; +import com.gmail.nossr50.commands.skills.HerbalismCommand; +import com.gmail.nossr50.commands.skills.MiningCommand; +import com.gmail.nossr50.commands.skills.RepairCommand; +import com.gmail.nossr50.commands.skills.SwordsCommand; +import com.gmail.nossr50.commands.skills.TamingCommand; +import com.gmail.nossr50.commands.skills.UnarmedCommand; +import com.gmail.nossr50.commands.skills.WoodcuttingCommand; +import com.gmail.nossr50.commands.spout.MchudCommand; +import com.gmail.nossr50.commands.spout.XplockCommand; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.HiddenConfig; import com.gmail.nossr50.config.RepairConfigManager; import com.gmail.nossr50.config.TreasuresConfig; -import com.gmail.nossr50.config.mods.CustomBlocksConfig; import com.gmail.nossr50.config.mods.CustomArmorConfig; +import com.gmail.nossr50.config.mods.CustomBlocksConfig; import com.gmail.nossr50.config.mods.CustomToolsConfig; -import com.gmail.nossr50.runnables.*; +import com.gmail.nossr50.datatypes.PlayerProfile; +import com.gmail.nossr50.listeners.BlockListener; +import com.gmail.nossr50.listeners.EntityListener; +import com.gmail.nossr50.listeners.HardcoreListener; +import com.gmail.nossr50.listeners.PlayerListener; +import com.gmail.nossr50.listeners.WorldListener; +import com.gmail.nossr50.locale.LocaleLoader; +import com.gmail.nossr50.runnables.BleedTimer; +import com.gmail.nossr50.runnables.SaveTimer; +import com.gmail.nossr50.runnables.SkillMonitor; +import com.gmail.nossr50.runnables.SpoutStart; import com.gmail.nossr50.skills.repair.RepairManager; import com.gmail.nossr50.skills.repair.RepairManagerFactory; import com.gmail.nossr50.skills.repair.Repairable; @@ -24,27 +77,6 @@ import com.gmail.nossr50.util.Metrics.Graph; import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.blockmeta.ChunkletManager; import com.gmail.nossr50.util.blockmeta.ChunkletManagerFactory; -import com.gmail.nossr50.listeners.BlockListener; -import com.gmail.nossr50.listeners.EntityListener; -import com.gmail.nossr50.listeners.HardcoreListener; -import com.gmail.nossr50.listeners.PlayerListener; -import com.gmail.nossr50.listeners.WorldListener; -import com.gmail.nossr50.locale.LocaleLoader; - -import net.shatteredlands.shatt.backup.ZipLibrary; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.bukkit.OfflinePlayer; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.plugin.PluginManager; -import org.bukkit.scheduler.BukkitScheduler; -import org.bukkit.entity.Player; public class mcMMO extends JavaPlugin { diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java index 34c0ac20d..20b120764 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java @@ -9,13 +9,8 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.getspout.spoutapi.sound.SoundEffect; -import com.gmail.nossr50.spout.SpoutSounds; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.ModChecks; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.Skills; -import com.gmail.nossr50.util.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.TreasuresConfig; @@ -24,8 +19,12 @@ import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; - -import org.getspout.spoutapi.sound.SoundEffect; +import com.gmail.nossr50.spout.SpoutSounds; +import com.gmail.nossr50.util.Misc; +import com.gmail.nossr50.util.ModChecks; +import com.gmail.nossr50.util.Permissions; +import com.gmail.nossr50.util.Skills; +import com.gmail.nossr50.util.Users; public class Excavation { diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java index c5321f824..ece590f41 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java @@ -12,16 +12,16 @@ import org.bukkit.inventory.ItemStack; import org.getspout.spoutapi.sound.SoundEffect; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.config.Config; +import com.gmail.nossr50.datatypes.PlayerProfile; +import com.gmail.nossr50.datatypes.SkillType; +import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; import com.gmail.nossr50.spout.SpoutSounds; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.ModChecks; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Skills; import com.gmail.nossr50.util.Users; -import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.datatypes.SkillType; -import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; public class Mining { private static Random random = new Random(); diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java index 3b8952166..ffdcaaac4 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java @@ -8,9 +8,10 @@ import org.bukkit.Material; import org.bukkit.TreeSpecies; import org.bukkit.block.Block; import org.bukkit.entity.Player; +import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.material.Tree; -import org.bukkit.event.block.BlockBreakEvent; +import org.getspout.spoutapi.sound.SoundEffect; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; @@ -28,8 +29,6 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Skills; import com.gmail.nossr50.util.Users; -import org.getspout.spoutapi.sound.SoundEffect; - public class WoodCutting { private static Random random = new Random(); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index 51eb02fa3..fc08409e6 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -1,8 +1,8 @@ package com.gmail.nossr50.skills.repair; import java.util.Map; -import java.util.Random; import java.util.Map.Entry; +import java.util.Random; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -13,13 +13,13 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; +import com.gmail.nossr50.datatypes.PlayerProfile; +import com.gmail.nossr50.datatypes.SkillType; +import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.spout.SpoutSounds; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Skills; import com.gmail.nossr50.util.Users; -import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.datatypes.SkillType; -import com.gmail.nossr50.locale.LocaleLoader; public class Repair { diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutSounds.java b/src/main/java/com/gmail/nossr50/spout/SpoutSounds.java index f677cf6a0..6df11309d 100644 --- a/src/main/java/com/gmail/nossr50/spout/SpoutSounds.java +++ b/src/main/java/com/gmail/nossr50/spout/SpoutSounds.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.spout; import org.bukkit.Location; import org.bukkit.entity.Player; - import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.player.SpoutPlayer; import org.getspout.spoutapi.sound.SoundEffect; diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java index 1ec2cf141..765b9a15e 100644 --- a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java +++ b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java @@ -15,7 +15,6 @@ import java.util.jar.JarFile; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; - import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.keyboard.Keyboard; import org.getspout.spoutapi.player.SpoutPlayer; @@ -24,8 +23,8 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.SpoutConfig; 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.datatypes.popups.PopupMMO; import com.gmail.nossr50.listeners.SpoutListener; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/util/Combat.java b/src/main/java/com/gmail/nossr50/util/Combat.java index 46dd5f5d3..981339e08 100644 --- a/src/main/java/com/gmail/nossr50/util/Combat.java +++ b/src/main/java/com/gmail/nossr50/util/Combat.java @@ -28,8 +28,8 @@ import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.Party; -import com.gmail.nossr50.runnables.GainXp; import com.gmail.nossr50.runnables.BleedTimer; +import com.gmail.nossr50.runnables.GainXp; import com.gmail.nossr50.skills.combat.Archery; import com.gmail.nossr50.skills.combat.Axes; import com.gmail.nossr50.skills.combat.Swords; diff --git a/src/main/java/com/gmail/nossr50/util/Database.java b/src/main/java/com/gmail/nossr50/util/Database.java index 9182f99a1..bcbf978f0 100644 --- a/src/main/java/com/gmail/nossr50/util/Database.java +++ b/src/main/java/com/gmail/nossr50/util/Database.java @@ -2,12 +2,13 @@ package com.gmail.nossr50.util; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.PreparedStatement; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.Properties; + import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.DatabaseUpdate; diff --git a/src/main/java/com/gmail/nossr50/util/Item.java b/src/main/java/com/gmail/nossr50/util/Item.java index 9dc062ca0..0e2b5e8cc 100644 --- a/src/main/java/com/gmail/nossr50/util/Item.java +++ b/src/main/java/com/gmail/nossr50/util/Item.java @@ -6,9 +6,9 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; +import com.gmail.nossr50.locale.LocaleLoader; public class Item { diff --git a/src/main/java/com/gmail/nossr50/util/Metrics.java b/src/main/java/com/gmail/nossr50/util/Metrics.java index d1adba969..490b64159 100644 --- a/src/main/java/com/gmail/nossr50/util/Metrics.java +++ b/src/main/java/com/gmail/nossr50/util/Metrics.java @@ -27,12 +27,6 @@ package com.gmail.nossr50.util; * either expressed or implied, of anybody else. */ -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -51,6 +45,12 @@ import java.util.Set; import java.util.UUID; import java.util.logging.Level; +import org.bukkit.Bukkit; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; + /** *

* The metrics class obtains data about a plugin and submits statistics about it to the metrics backend. diff --git a/src/main/java/com/gmail/nossr50/util/ModChecks.java b/src/main/java/com/gmail/nossr50/util/ModChecks.java index 537a2bb3b..7a36d61d6 100644 --- a/src/main/java/com/gmail/nossr50/util/ModChecks.java +++ b/src/main/java/com/gmail/nossr50/util/ModChecks.java @@ -4,8 +4,8 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.config.mods.CustomBlocksConfig; import com.gmail.nossr50.config.mods.CustomArmorConfig; +import com.gmail.nossr50.config.mods.CustomBlocksConfig; import com.gmail.nossr50.config.mods.CustomToolsConfig; import com.gmail.nossr50.datatypes.mods.CustomBlock; import com.gmail.nossr50.datatypes.mods.CustomItem; diff --git a/src/main/java/com/gmail/nossr50/util/Skills.java b/src/main/java/com/gmail/nossr50/util/Skills.java index 90837a825..ef16be75c 100644 --- a/src/main/java/com/gmail/nossr50/util/Skills.java +++ b/src/main/java/com/gmail/nossr50/util/Skills.java @@ -7,14 +7,12 @@ import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; - import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.player.SpoutPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.SpoutConfig; -import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerStat; @@ -22,6 +20,7 @@ import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.ToolType; import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent; import com.gmail.nossr50.locale.LocaleLoader; +import com.gmail.nossr50.spout.SpoutStuff; public class Skills {