Optimize imports on all project files.

Big commit, no functional changes ¯\_(ツ)_/¯

src/main/java/com/garbagemule/MobArena/ArenaClass.java

@@ -1,8 +1,5 @@
 package com.garbagemule.MobArena;
 
-import java.util.*;
-import java.util.Map.Entry;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.Location;
@@ -12,6 +9,14 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.permissions.PermissionAttachment;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 public class ArenaClass
 {
     private String configName, lowercaseName;

src/main/java/com/garbagemule/MobArena/ArenaImpl.java

@@ -1,9 +1,35 @@
 package com.garbagemule.MobArena;
 
-import java.util.*;
+import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection;
-import java.util.Map.Entry;
-import java.util.concurrent.PriorityBlockingQueue;
 
+import com.garbagemule.MobArena.ArenaClass.ArmorType;
+import com.garbagemule.MobArena.ScoreboardManager.NullScoreboardManager;
+import com.garbagemule.MobArena.events.ArenaEndEvent;
+import com.garbagemule.MobArena.events.ArenaPlayerDeathEvent;
+import com.garbagemule.MobArena.events.ArenaPlayerJoinEvent;
+import com.garbagemule.MobArena.events.ArenaPlayerLeaveEvent;
+import com.garbagemule.MobArena.events.ArenaPlayerReadyEvent;
+import com.garbagemule.MobArena.events.ArenaStartEvent;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.leaderboards.Leaderboard;
+import com.garbagemule.MobArena.region.ArenaRegion;
+import com.garbagemule.MobArena.repairable.Repairable;
+import com.garbagemule.MobArena.repairable.RepairableComparator;
+import com.garbagemule.MobArena.repairable.RepairableContainer;
+import com.garbagemule.MobArena.time.Time;
+import com.garbagemule.MobArena.time.TimeStrategy;
+import com.garbagemule.MobArena.time.TimeStrategyLocked;
+import com.garbagemule.MobArena.time.TimeStrategyNull;
+import com.garbagemule.MobArena.util.ClassChests;
+import com.garbagemule.MobArena.util.Delays;
+import com.garbagemule.MobArena.util.Enums;
+import com.garbagemule.MobArena.util.ItemParser;
+import com.garbagemule.MobArena.util.inventory.InventoryManager;
+import com.garbagemule.MobArena.util.inventory.InventoryUtils;
+import com.garbagemule.MobArena.util.timer.AutoStartTimer;
+import com.garbagemule.MobArena.util.timer.StartDelayTimer;
+import com.garbagemule.MobArena.waves.SheepBouncer;
+import com.garbagemule.MobArena.waves.WaveManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
@@ -14,30 +40,30 @@ import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.*;
+import org.bukkit.entity.AbstractHorse;
-import org.bukkit.inventory.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Wolf;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.potion.PotionEffect;
 
-import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection;
+import java.util.Collection;
-
+import java.util.Collections;
-import com.garbagemule.MobArena.ArenaClass.ArmorType;
+import java.util.HashMap;
-import com.garbagemule.MobArena.events.*;
+import java.util.HashSet;
-import com.garbagemule.MobArena.framework.Arena;
+import java.util.LinkedList;
-import com.garbagemule.MobArena.leaderboards.Leaderboard;
+import java.util.List;
-import com.garbagemule.MobArena.region.ArenaRegion;
+import java.util.Map;
-import com.garbagemule.MobArena.repairable.*;
+import java.util.Map.Entry;
-import com.garbagemule.MobArena.time.Time;
+import java.util.Random;
-import com.garbagemule.MobArena.time.TimeStrategy;
+import java.util.Set;
-import com.garbagemule.MobArena.time.TimeStrategyLocked;
+import java.util.concurrent.PriorityBlockingQueue;
-import com.garbagemule.MobArena.time.TimeStrategyNull;
-import com.garbagemule.MobArena.util.*;
-import com.garbagemule.MobArena.util.inventory.InventoryManager;
-import com.garbagemule.MobArena.util.inventory.InventoryUtils;
-import com.garbagemule.MobArena.util.timer.AutoStartTimer;
-import com.garbagemule.MobArena.util.timer.StartDelayTimer;
-import com.garbagemule.MobArena.waves.*;
-import com.garbagemule.MobArena.ScoreboardManager.NullScoreboardManager;
 
 public class ArenaImpl implements Arena
 {

src/main/java/com/garbagemule/MobArena/ArenaListener.java

@@ -1,9 +1,20 @@
 package com.garbagemule.MobArena;
 
-import java.util.*;
-
 import com.garbagemule.MobArena.events.ArenaKillEvent;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.leaderboards.Leaderboard;
+import com.garbagemule.MobArena.listeners.MAGlobalListener.TeleportResponse;
+import com.garbagemule.MobArena.region.ArenaRegion;
+import com.garbagemule.MobArena.region.RegionPoint;
+import com.garbagemule.MobArena.repairable.Repairable;
+import com.garbagemule.MobArena.repairable.RepairableAttachable;
+import com.garbagemule.MobArena.repairable.RepairableBed;
+import com.garbagemule.MobArena.repairable.RepairableBlock;
+import com.garbagemule.MobArena.repairable.RepairableContainer;
+import com.garbagemule.MobArena.repairable.RepairableDoor;
+import com.garbagemule.MobArena.repairable.RepairableSign;
 import com.garbagemule.MobArena.util.ClassChests;
+import com.garbagemule.MobArena.waves.MABoss;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -12,9 +23,28 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.*;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Snowman;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.Event.Result;
-import org.bukkit.event.block.*;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
@@ -23,18 +53,27 @@ import org.bukkit.event.entity.EntityCombustByEntityEvent;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.entity.EntityTeleportEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.PotionSplashEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.hanging.HangingBreakEvent;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerAnimationEvent;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.InventoryHolder;
@@ -49,17 +88,15 @@ import org.bukkit.metadata.MetadataValue;
 import org.bukkit.metadata.Metadatable;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.leaderboards.Leaderboard;
-import com.garbagemule.MobArena.listeners.MAGlobalListener.TeleportResponse;
-import com.garbagemule.MobArena.region.ArenaRegion;
-import com.garbagemule.MobArena.region.RegionPoint;
-import com.garbagemule.MobArena.repairable.*;
-import com.garbagemule.MobArena.util.TextUtils;
-import com.garbagemule.MobArena.waves.MABoss;
 import org.bukkit.projectiles.ProjectileSource;
 
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
 public class ArenaListener
 {
     private MobArena plugin;

src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java

@@ -1,13 +1,14 @@
 package com.garbagemule.MobArena;
 
-import java.util.Collection;
+import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection;
-import java.util.HashMap;
+import static com.garbagemule.MobArena.util.config.ConfigUtils.parseLocation;
-import java.util.HashSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
+import com.garbagemule.MobArena.ArenaClass.ArmorType;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.framework.ArenaMaster;
+import com.garbagemule.MobArena.util.ItemParser;
+import com.garbagemule.MobArena.util.TextUtils;
+import com.garbagemule.MobArena.util.config.ConfigUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -21,15 +22,13 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
 
-import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection;
+import java.util.ArrayList;
-import static com.garbagemule.MobArena.util.config.ConfigUtils.parseLocation;
+import java.util.Collection;
-
+import java.util.HashMap;
-import com.garbagemule.MobArena.ArenaClass.ArmorType;
+import java.util.HashSet;
-import com.garbagemule.MobArena.framework.Arena;
+import java.util.List;
-import com.garbagemule.MobArena.framework.ArenaMaster;
+import java.util.Map;
-import com.garbagemule.MobArena.util.ItemParser;
+import java.util.Set;
-import com.garbagemule.MobArena.util.TextUtils;
-import com.garbagemule.MobArena.util.config.ConfigUtils;
 
 public class ArenaMasterImpl implements ArenaMaster
 {

src/main/java/com/garbagemule/MobArena/ArenaPlayer.java

@@ -1,10 +1,7 @@
 package com.garbagemule.MobArena;
 
-import org.bukkit.entity.Player;
-
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
-import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.framework.Arena;
+import org.bukkit.entity.Player;
 
 public class ArenaPlayer
 {

src/main/java/com/garbagemule/MobArena/ArenaPlayerStatistics.java

@@ -1,17 +1,13 @@
 package com.garbagemule.MobArena;
 
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.util.MutableInt;
+import org.bukkit.entity.Player;
+
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bukkit.entity.Player;
-
-import com.garbagemule.MobArena.ArenaPlayer;
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
-import com.garbagemule.MobArena.MobArena;
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.util.MutableInt;
-
 public class ArenaPlayerStatistics
 {
     private ArenaPlayer player;

src/main/java/com/garbagemule/MobArena/ClassLimitManager.java

@@ -1,16 +1,15 @@
 package com.garbagemule.MobArena;
 
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.util.MutableInt;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.util.MutableInt;
-import org.bukkit.plugin.Plugin;
-
 public class ClassLimitManager
 {
     private HashMap<ArenaClass,MutableInt> classLimits;

src/main/java/com/garbagemule/MobArena/MASpawnThread.java

@@ -1,25 +1,27 @@
 package com.garbagemule.MobArena;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import com.garbagemule.MobArena.events.ArenaCompleteEvent;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-
 import com.garbagemule.MobArena.events.NewWaveEvent;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.region.ArenaRegion;
-import com.garbagemule.MobArena.waves.*;
+import com.garbagemule.MobArena.waves.MABoss;
+import com.garbagemule.MobArena.waves.MACreature;
+import com.garbagemule.MobArena.waves.Wave;
+import com.garbagemule.MobArena.waves.WaveManager;
 import com.garbagemule.MobArena.waves.enums.WaveType;
 import com.garbagemule.MobArena.waves.types.BossWave;
 import com.garbagemule.MobArena.waves.types.SupplyWave;
 import com.garbagemule.MobArena.waves.types.UpgradeWave;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class MASpawnThread implements Runnable
 {

src/main/java/com/garbagemule/MobArena/MAUtils.java

@@ -1,24 +1,15 @@
 package com.garbagemule.MobArena;
 
-import java.io.File;
+import com.garbagemule.MobArena.framework.Arena;
-import java.io.FileInputStream;
+import com.garbagemule.MobArena.framework.ArenaMaster;
-import java.io.FileOutputStream;
+import com.garbagemule.MobArena.region.ArenaRegion;
-import java.io.ObjectInputStream;
+import com.garbagemule.MobArena.util.EntityPosition;
-import java.io.ObjectOutputStream;
+import com.garbagemule.MobArena.util.ItemParser;
-import java.util.ArrayList;
+import com.garbagemule.MobArena.util.TextUtils;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Random;
-import java.util.Set;
-
-import org.bukkit.block.Sign;
-import org.bukkit.World;
-import org.bukkit.Material;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Sign;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Ocelot;
@@ -27,12 +18,20 @@ import org.bukkit.entity.Wolf;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.garbagemule.MobArena.framework.Arena;
+import java.io.File;
-import com.garbagemule.MobArena.framework.ArenaMaster;
+import java.io.FileInputStream;
-import com.garbagemule.MobArena.region.ArenaRegion;
+import java.io.FileOutputStream;
-import com.garbagemule.MobArena.util.EntityPosition;
+import java.io.ObjectInputStream;
-import com.garbagemule.MobArena.util.ItemParser;
+import java.io.ObjectOutputStream;
-import com.garbagemule.MobArena.util.TextUtils;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 
 public class MAUtils
 {         

src/main/java/com/garbagemule/MobArena/MobArena.java

@@ -1,16 +1,17 @@
 package com.garbagemule.MobArena;
 
-import java.io.*;
+import com.garbagemule.MobArena.commands.CommandHandler;
-import java.util.HashSet;
+import com.garbagemule.MobArena.framework.Arena;
-import java.util.Random;
+import com.garbagemule.MobArena.framework.ArenaMaster;
-import java.util.Set;
+import com.garbagemule.MobArena.listeners.MAGlobalListener;
-import java.util.logging.Logger;
+import com.garbagemule.MobArena.listeners.MagicSpellsListener;
-
+import com.garbagemule.MobArena.util.VersionChecker;
+import com.garbagemule.MobArena.util.config.ConfigUtils;
+import com.garbagemule.MobArena.util.inventory.InventoryManager;
+import com.garbagemule.MobArena.waves.ability.AbilityManager;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
-
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -25,15 +26,14 @@ import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.ServicesManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.garbagemule.MobArena.commands.CommandHandler;
+import java.io.BufferedReader;
-import com.garbagemule.MobArena.framework.Arena;
+import java.io.File;
-import com.garbagemule.MobArena.framework.ArenaMaster;
+import java.io.FileNotFoundException;
-import com.garbagemule.MobArena.listeners.MAGlobalListener;
+import java.io.FileReader;
-import com.garbagemule.MobArena.listeners.MagicSpellsListener;
+import java.io.IOException;
-import com.garbagemule.MobArena.util.VersionChecker;
+import java.util.HashSet;
-import com.garbagemule.MobArena.util.config.ConfigUtils;
+import java.util.Random;
-import com.garbagemule.MobArena.util.inventory.InventoryManager;
+import java.util.Set;
-import com.garbagemule.MobArena.waves.ability.AbilityManager;
 
 /**
  * MobArena

src/main/java/com/garbagemule/MobArena/MobArenaHandler.java

@@ -1,14 +1,12 @@
 package com.garbagemule.MobArena;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import com.garbagemule.MobArena.MobArena;
-import com.garbagemule.MobArena.framework.Arena;
-
 public class MobArenaHandler
 {
     private MobArena plugin;

src/main/java/com/garbagemule/MobArena/MonsterManager.java

@@ -1,5 +1,12 @@
 package com.garbagemule.MobArena;
 
+import com.garbagemule.MobArena.waves.MABoss;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Wolf;
+import org.bukkit.inventory.ItemStack;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,14 +14,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.inventory.ItemStack;
-
-import com.garbagemule.MobArena.waves.MABoss;
-
 public class MonsterManager
 {
     private Set<LivingEntity> monsters, sheep, golems;

src/main/java/com/garbagemule/MobArena/PlayerData.java

@@ -1,12 +1,12 @@
 package com.garbagemule.MobArena;
 
-import java.util.Collection;
-
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 
+import java.util.Collection;
+
 public class PlayerData
 {
     private Player player;

src/main/java/com/garbagemule/MobArena/RewardManager.java

@@ -1,5 +1,9 @@
 package com.garbagemule.MobArena;
 
+import com.garbagemule.MobArena.framework.Arena;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -8,11 +12,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.garbagemule.MobArena.framework.Arena;
-
 public class RewardManager
 {
     @SuppressWarnings("unused")

src/main/java/com/garbagemule/MobArena/ScoreboardManager.java

@@ -1,5 +1,6 @@
 package com.garbagemule.MobArena;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -8,8 +9,6 @@ import org.bukkit.scoreboard.Objective;
 import org.bukkit.scoreboard.Score;
 import org.bukkit.scoreboard.Scoreboard;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ScoreboardManager {
     private static final String DISPLAY_NAME = ChatColor.GREEN + "Kills       " + ChatColor.AQUA + "Wave ";
 

src/main/java/com/garbagemule/MobArena/commands/Command.java

@@ -1,8 +1,7 @@
 package com.garbagemule.MobArena.commands;
 
-import org.bukkit.command.CommandSender;
-
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 public interface Command
 {

src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java

@@ -1,19 +1,52 @@
 package com.garbagemule.MobArena.commands;
 
-import java.util.*;
+import com.garbagemule.MobArena.MobArena;
-import java.util.Map.Entry;
+import com.garbagemule.MobArena.Msg;
-
+import com.garbagemule.MobArena.commands.admin.DisableCommand;
+import com.garbagemule.MobArena.commands.admin.EnableCommand;
+import com.garbagemule.MobArena.commands.admin.ForceCommand;
+import com.garbagemule.MobArena.commands.admin.KickCommand;
+import com.garbagemule.MobArena.commands.admin.RestoreCommand;
+import com.garbagemule.MobArena.commands.setup.AddArenaCommand;
+import com.garbagemule.MobArena.commands.setup.AddClassPermCommand;
+import com.garbagemule.MobArena.commands.setup.AutoDegenerateCommand;
+import com.garbagemule.MobArena.commands.setup.AutoGenerateCommand;
+import com.garbagemule.MobArena.commands.setup.CheckDataCommand;
+import com.garbagemule.MobArena.commands.setup.CheckSpawnsCommand;
+import com.garbagemule.MobArena.commands.setup.ClassChestCommand;
+import com.garbagemule.MobArena.commands.setup.ConfigCommand;
+import com.garbagemule.MobArena.commands.setup.EditArenaCommand;
+import com.garbagemule.MobArena.commands.setup.ListClassPermsCommand;
+import com.garbagemule.MobArena.commands.setup.ListClassesCommand;
+import com.garbagemule.MobArena.commands.setup.RemoveArenaCommand;
+import com.garbagemule.MobArena.commands.setup.RemoveClassCommand;
+import com.garbagemule.MobArena.commands.setup.RemoveClassPermCommand;
+import com.garbagemule.MobArena.commands.setup.RemoveContainerCommand;
+import com.garbagemule.MobArena.commands.setup.RemoveLeaderboardCommand;
+import com.garbagemule.MobArena.commands.setup.RemoveSpawnpointCommand;
+import com.garbagemule.MobArena.commands.setup.SetClassCommand;
+import com.garbagemule.MobArena.commands.setup.SetClassPriceCommand;
+import com.garbagemule.MobArena.commands.setup.SettingCommand;
+import com.garbagemule.MobArena.commands.setup.SetupCommand;
+import com.garbagemule.MobArena.commands.user.ArenaListCommand;
+import com.garbagemule.MobArena.commands.user.JoinCommand;
+import com.garbagemule.MobArena.commands.user.LeaveCommand;
+import com.garbagemule.MobArena.commands.user.NotReadyCommand;
+import com.garbagemule.MobArena.commands.user.PickClassCommand;
+import com.garbagemule.MobArena.commands.user.PlayerListCommand;
+import com.garbagemule.MobArena.commands.user.SpecCommand;
+import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.user.*;
-import com.garbagemule.MobArena.commands.admin.*;
-import com.garbagemule.MobArena.commands.setup.*;
-import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.conversations.Conversable;
-import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public class CommandHandler implements CommandExecutor
 {

src/main/java/com/garbagemule/MobArena/commands/Commands.java

@@ -1,16 +1,15 @@
 package com.garbagemule.MobArena.commands;
 
-import java.util.List;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import com.garbagemule.MobArena.Msg;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.TextUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.UUID;
 
 public class Commands
 {

src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java

@@ -1,12 +1,12 @@
 package com.garbagemule.MobArena.commands.admin;
 
-import org.bukkit.ChatColor;
+import com.garbagemule.MobArena.Msg;
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "disable",

src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java

@@ -1,12 +1,12 @@
 package com.garbagemule.MobArena.commands.admin;
 
-import org.bukkit.ChatColor;
+import com.garbagemule.MobArena.Msg;
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "enable",

src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java

@@ -1,11 +1,11 @@
 package com.garbagemule.MobArena.commands.admin;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.Msg;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "force",

src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java

@@ -1,11 +1,11 @@
 package com.garbagemule.MobArena.commands.admin;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.Command;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.commands.CommandInfo;
-
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "kick",

src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.commands.admin;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.inventory.InventoryManager;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "restore",

src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java

@@ -1,12 +1,13 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.Msg;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.Commands;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "addarena",

src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java

@@ -1,11 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.ArenaClass;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.TextUtils;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "addclassperm",

src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java

@@ -1,11 +1,12 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.MAUtils;
-
+import com.garbagemule.MobArena.Msg;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.commands.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "autodegenerate",

src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java

@@ -1,12 +1,14 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.MAUtils;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.Msg;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
+import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "autogenerate",

src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "checkdata",

src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java

@@ -1,5 +1,7 @@
 package com.garbagemule.MobArena.commands.setup;
 
+import static com.garbagemule.MobArena.util.config.ConfigUtils.setLocation;
+
 import com.garbagemule.MobArena.ArenaClass;
 import com.garbagemule.MobArena.Msg;
 import com.garbagemule.MobArena.commands.Command;
@@ -13,8 +15,6 @@ import org.bukkit.entity.Player;
 
 import java.util.Set;
 
-import static com.garbagemule.MobArena.util.config.ConfigUtils.setLocation;
-
 @CommandInfo(
     name    = "classchest",
     pattern = "classchest",

src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
+import com.garbagemule.MobArena.commands.Command;
+import com.garbagemule.MobArena.commands.CommandInfo;
+import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
-import com.garbagemule.MobArena.framework.ArenaMaster;
-
 @CommandInfo(
     name    = "config",
     pattern = "config|cfg",

src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.ChatColor;
+import com.garbagemule.MobArena.commands.Command;
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.CommandInfo;
-
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "editarena",

src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java

@@ -1,15 +1,15 @@
 package com.garbagemule.MobArena.commands.setup;
 
+import com.garbagemule.MobArena.ArenaClass;
+import com.garbagemule.MobArena.commands.Command;
+import com.garbagemule.MobArena.commands.CommandInfo;
+import com.garbagemule.MobArena.framework.ArenaMaster;
+import com.garbagemule.MobArena.util.TextUtils;
+import org.bukkit.command.CommandSender;
+
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.bukkit.command.CommandSender;
-
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
-import com.garbagemule.MobArena.framework.ArenaMaster;
-import com.garbagemule.MobArena.util.TextUtils;
-
 @CommandInfo(
     name    = "listclassperms",
     pattern = "(list)?classperm(.*)s",

src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import java.util.Set;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
+import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.command.CommandSender;
 
-import com.garbagemule.MobArena.*;
+import java.util.Set;
-import com.garbagemule.MobArena.commands.*;
-import com.garbagemule.MobArena.framework.ArenaMaster;
 
 @CommandInfo(
     name    = "listclasses",

src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "removearena",

src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java

@@ -1,11 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.ArenaClass;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.TextUtils;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "removeclass",

src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java

@@ -1,11 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.ArenaClass;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.TextUtils;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "removeclassperm",

src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.commands.setup;
 
+import com.garbagemule.MobArena.commands.Command;
+import com.garbagemule.MobArena.commands.CommandInfo;
 import com.garbagemule.MobArena.framework.Arena;
-import org.bukkit.command.CommandSender;
-
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "removecontainer",

src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import com.garbagemule.MobArena.framework.Arena;
-import org.bukkit.command.CommandSender;
-
 import com.garbagemule.MobArena.Msg;
 import com.garbagemule.MobArena.commands.Command;
 import com.garbagemule.MobArena.commands.CommandInfo;
+import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "removeleaderboard",

src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.commands.setup;
 
+import com.garbagemule.MobArena.commands.Command;
+import com.garbagemule.MobArena.commands.CommandInfo;
 import com.garbagemule.MobArena.framework.Arena;
-import org.bukkit.command.CommandSender;
-
-import com.garbagemule.MobArena.*;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
 
 @CommandInfo(
     name    = "delspawn",

src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java

@@ -1,12 +1,14 @@
 package com.garbagemule.MobArena.commands.setup;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.ArenaClass;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.Msg;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
+import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.TextUtils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "setclass",

src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java

@@ -1,14 +1,10 @@
 package com.garbagemule.MobArena.commands.setup;
 
 import com.garbagemule.MobArena.ArenaClass;
-import com.garbagemule.MobArena.Msg;
 import com.garbagemule.MobArena.commands.Command;
 import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.ArenaMaster;
-import com.garbagemule.MobArena.util.TextUtils;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "setclassprice",

src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java

@@ -7,16 +7,24 @@ import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.region.ArenaRegion;
-
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
-import org.bukkit.conversations.*;
+import org.bukkit.conversations.Conversable;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationAbandonedEvent;
+import org.bukkit.conversations.ConversationAbandonedListener;
+import org.bukkit.conversations.ConversationContext;
+import org.bukkit.conversations.Prompt;
 import org.bukkit.entity.Player;
-import org.bukkit.event.*;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;

src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java

@@ -1,14 +1,16 @@
 package com.garbagemule.MobArena.commands.user;
 
-import java.util.List;
+import com.garbagemule.MobArena.MAUtils;
-
+import com.garbagemule.MobArena.Msg;
+import com.garbagemule.MobArena.commands.Command;
+import com.garbagemule.MobArena.commands.CommandInfo;
+import com.garbagemule.MobArena.commands.Commands;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.garbagemule.MobArena.*;
+import java.util.List;
-import com.garbagemule.MobArena.commands.*;
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.framework.ArenaMaster;
 
 @CommandInfo(
     name    = "arenalist",

src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java

@@ -1,12 +1,13 @@
 package com.garbagemule.MobArena.commands.user;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.Msg;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.Commands;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "join",

src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java

@@ -1,12 +1,13 @@
 package com.garbagemule.MobArena.commands.user;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.Msg;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.Commands;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "leave",

src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java

@@ -1,12 +1,14 @@
 package com.garbagemule.MobArena.commands.user;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.MAUtils;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.Msg;
-
+import com.garbagemule.MobArena.commands.Command;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.commands.*;
+import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "notready",

src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java

@@ -9,13 +9,8 @@ import com.garbagemule.MobArena.commands.Commands;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.util.ClassChests;
-import com.garbagemule.MobArena.util.TextUtils;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
 
 @CommandInfo(
     name    = "class",

src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java

@@ -1,15 +1,16 @@
 package com.garbagemule.MobArena.commands.user;
 
-import java.util.LinkedList;
+import com.garbagemule.MobArena.MAUtils;
-import java.util.List;
+import com.garbagemule.MobArena.Msg;
-
+import com.garbagemule.MobArena.commands.Command;
+import com.garbagemule.MobArena.commands.CommandInfo;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.framework.ArenaMaster;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.garbagemule.MobArena.*;
+import java.util.LinkedList;
-import com.garbagemule.MobArena.commands.*;
+import java.util.List;
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.framework.ArenaMaster;
 
 @CommandInfo(
     name    = "playerlist",

src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java

@@ -1,12 +1,13 @@
 package com.garbagemule.MobArena.commands.user;
 
-import org.bukkit.command.CommandSender;
+import com.garbagemule.MobArena.Msg;
-import org.bukkit.entity.Player;
+import com.garbagemule.MobArena.commands.Command;
-
+import com.garbagemule.MobArena.commands.CommandInfo;
-import com.garbagemule.MobArena.*;
+import com.garbagemule.MobArena.commands.Commands;
-import com.garbagemule.MobArena.commands.*;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 @CommandInfo(
     name    = "spec",

src/main/java/com/garbagemule/MobArena/events/ArenaEndEvent.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.events;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ArenaEndEvent extends Event implements Cancellable
 {
     private static final HandlerList handlers = new HandlerList();

src/main/java/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.events;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ArenaPlayerDeathEvent extends Event
 {
     private static final HandlerList handlers = new HandlerList();

src/main/java/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.events;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ArenaPlayerJoinEvent extends Event implements Cancellable
 {
     private static final HandlerList handlers = new HandlerList();

src/main/java/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.events;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ArenaPlayerLeaveEvent extends Event implements Cancellable
 {
     private static final HandlerList handlers = new HandlerList();

src/main/java/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java

@@ -1,12 +1,11 @@
 package com.garbagemule.MobArena.events;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ArenaPlayerReadyEvent extends Event implements Cancellable
 {
     private static final HandlerList handlers = new HandlerList();

src/main/java/com/garbagemule/MobArena/events/ArenaStartEvent.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.events;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class ArenaStartEvent extends Event implements Cancellable
 {
     private static final HandlerList handlers = new HandlerList();

src/main/java/com/garbagemule/MobArena/events/NewWaveEvent.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.events;
 
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.Wave;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
 
 public class NewWaveEvent extends Event implements Cancellable
 {

src/main/java/com/garbagemule/MobArena/framework/Arena.java

@@ -1,24 +1,14 @@
 package com.garbagemule.MobArena.framework;
 
-import java.util.*;
-
-import com.garbagemule.MobArena.Messenger;
-import com.garbagemule.MobArena.Msg;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
 import com.garbagemule.MobArena.ArenaClass;
 import com.garbagemule.MobArena.ArenaListener;
 import com.garbagemule.MobArena.ArenaPlayer;
 import com.garbagemule.MobArena.ClassLimitManager;
 import com.garbagemule.MobArena.MASpawnThread;
+import com.garbagemule.MobArena.Messenger;
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.MonsterManager;
+import com.garbagemule.MobArena.Msg;
 import com.garbagemule.MobArena.RewardManager;
 import com.garbagemule.MobArena.ScoreboardManager;
 import com.garbagemule.MobArena.leaderboards.Leaderboard;
@@ -27,6 +17,18 @@ import com.garbagemule.MobArena.repairable.Repairable;
 import com.garbagemule.MobArena.util.inventory.InventoryManager;
 import com.garbagemule.MobArena.util.timer.AutoStartTimer;
 import com.garbagemule.MobArena.waves.WaveManager;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public interface Arena
 {

src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java

@@ -1,19 +1,17 @@
 package com.garbagemule.MobArena.framework;
 
-import java.util.Collection;
+import com.garbagemule.MobArena.ArenaClass;
-import java.util.List;
-import java.util.Map;
-
 import com.garbagemule.MobArena.Messenger;
+import com.garbagemule.MobArena.MobArena;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.PlayerInventory;
 
-import com.garbagemule.MobArena.ArenaClass;
+import java.util.Collection;
-import com.garbagemule.MobArena.MobArena;
+import java.util.List;
-import com.garbagemule.MobArena.framework.Arena;
+import java.util.Map;
 
 public interface ArenaMaster
 {

src/main/java/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java

@@ -1,10 +1,9 @@
 package com.garbagemule.MobArena.leaderboards;
 
-import java.util.List;
+import com.garbagemule.MobArena.ArenaPlayerStatistics;
-
 import org.bukkit.block.Sign;
 
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
+import java.util.List;
 
 public abstract class AbstractLeaderboardColumn implements LeaderboardColumn
 {

src/main/java/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java

@@ -1,10 +1,9 @@
 package com.garbagemule.MobArena.leaderboards;
 
-import java.util.List;
+import com.garbagemule.MobArena.ArenaPlayerStatistics;
-
 import org.bukkit.block.Sign;
 
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
+import java.util.List;
 
 public class ClassLeaderboardColumn extends AbstractLeaderboardColumn
 {

src/main/java/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java

@@ -1,10 +1,9 @@
 package com.garbagemule.MobArena.leaderboards;
 
-import java.util.List;
+import com.garbagemule.MobArena.ArenaPlayerStatistics;
-
 import org.bukkit.block.Sign;
 
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
+import java.util.List;
 
 public class IntLeaderboardColumn extends AbstractLeaderboardColumn
 {

src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java

@@ -1,19 +1,18 @@
 package com.garbagemule.MobArena.leaderboards;
 
-import java.util.ArrayList;
+import com.garbagemule.MobArena.ArenaPlayer;
-import java.util.Collections;
+import com.garbagemule.MobArena.ArenaPlayerStatistics;
-import java.util.List;
+import com.garbagemule.MobArena.MobArena;
-
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 
-import com.garbagemule.MobArena.ArenaPlayer;
+import java.util.ArrayList;
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
+import java.util.Collections;
-import com.garbagemule.MobArena.MobArena;
+import java.util.List;
-import com.garbagemule.MobArena.framework.Arena;
 
 public class Leaderboard
 {

src/main/java/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java

@@ -1,10 +1,9 @@
 package com.garbagemule.MobArena.leaderboards;
 
-import java.util.List;
+import com.garbagemule.MobArena.ArenaPlayerStatistics;
-
 import org.bukkit.block.Sign;
 
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
+import java.util.List;
 
 public interface LeaderboardColumn
 {

src/main/java/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java

@@ -1,10 +1,9 @@
 package com.garbagemule.MobArena.leaderboards;
 
-import java.util.List;
+import com.garbagemule.MobArena.ArenaPlayerStatistics;
-
 import org.bukkit.block.Sign;
 
-import com.garbagemule.MobArena.ArenaPlayerStatistics;
+import java.util.List;
 
 public class PlayerLeaderboardColumn extends AbstractLeaderboardColumn
 {

src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java

@@ -1,24 +1,50 @@
 package com.garbagemule.MobArena.listeners;
 
-import org.bukkit.ChatColor;
-import org.bukkit.block.Block;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.*;
-import org.bukkit.event.entity.*;
-import org.bukkit.event.hanging.HangingBreakEvent;
-import org.bukkit.event.player.*;
-import org.bukkit.event.vehicle.VehicleExitEvent;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.event.world.WorldUnloadEvent;
-
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.leaderboards.Stats;
 import com.garbagemule.MobArena.util.VersionChecker;
 import com.garbagemule.MobArena.util.inventory.InventoryManager;
+import org.bukkit.ChatColor;
+import org.bukkit.block.Block;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockExplodeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.entity.EntityTeleportEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.event.hanging.HangingBreakEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerAnimationEvent;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java

@@ -1,8 +1,9 @@
 package com.garbagemule.MobArena.listeners;
 
-import java.io.File;
+import com.garbagemule.MobArena.MobArena;
-import java.util.List;
+import com.garbagemule.MobArena.framework.Arena;
-
+import com.garbagemule.MobArena.waves.enums.WaveType;
+import com.nisovin.magicspells.events.SpellCastEvent;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -10,11 +11,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.garbagemule.MobArena.framework.Arena;
+import java.io.File;
-import com.garbagemule.MobArena.waves.enums.*;
+import java.util.List;
-import com.garbagemule.MobArena.MobArena;
-
-import com.nisovin.magicspells.events.SpellCastEvent;
 
 public class MagicSpellsListener implements Listener
 {

src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java

@@ -1,5 +1,9 @@
 package com.garbagemule.MobArena.region;
 
+import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection;
+import static com.garbagemule.MobArena.util.config.ConfigUtils.parseLocation;
+import static com.garbagemule.MobArena.util.config.ConfigUtils.setLocation;
+
 import com.garbagemule.MobArena.MAUtils;
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.framework.Arena;
@@ -14,9 +18,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
-
+import java.util.Collection;
-import static com.garbagemule.MobArena.util.config.ConfigUtils.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class ArenaRegion
 {

src/main/java/com/garbagemule/MobArena/region/RegionSerializer.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.region;
 
+import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 
-import com.garbagemule.MobArena.framework.Arena;
-
 public class RegionSerializer
 {
     //private UUID worldUID;

src/main/java/com/garbagemule/MobArena/repairable/RepairableComparator.java

@@ -1,7 +1,5 @@
 package com.garbagemule.MobArena.repairable;
 
-import java.util.Comparator;
-
 import org.bukkit.Material;
 import org.bukkit.material.Attachable;
 import org.bukkit.material.Bed;
@@ -9,6 +7,8 @@ import org.bukkit.material.Door;
 import org.bukkit.material.MaterialData;
 import org.bukkit.material.Redstone;
 
+import java.util.Comparator;
+
 public class RepairableComparator implements Comparator<Repairable>
 {    
     public int compare(Repairable r1, Repairable r2)

src/main/java/com/garbagemule/MobArena/repairable/RepairableContainer.java

@@ -3,7 +3,6 @@ package com.garbagemule.MobArena.repairable;
 import org.bukkit.block.BlockState;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
-
 import org.bukkit.inventory.ItemStack;
 
 public class RepairableContainer extends RepairableBlock

src/main/java/com/garbagemule/MobArena/util/Delays.java

@@ -1,9 +1,8 @@
 package com.garbagemule.MobArena.util;
 
-import org.bukkit.entity.Player;
-
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.framework.Arena;
+import org.bukkit.entity.Player;
 
 public class Delays
 {

src/main/java/com/garbagemule/MobArena/util/EntityPosition.java

@@ -1,9 +1,10 @@
 package com.garbagemule.MobArena.util;
 
-import java.io.Serializable;
 import org.bukkit.Location;
 import org.bukkit.World;
 
+import java.io.Serializable;
+
 /**
  * NOTE: I (garbagemule) DID NOT WRITE THIS CLASS (notice the author below)
  * @author creadri

src/main/java/com/garbagemule/MobArena/util/ItemParser.java

@@ -1,11 +1,6 @@
 package com.garbagemule.MobArena.util;
 
-import java.util.ArrayList;
+import com.garbagemule.MobArena.MobArena;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
@@ -14,11 +9,15 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.material.MaterialData;
-
-import com.garbagemule.MobArena.MobArena;
 import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionType;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 public class ItemParser
 {
     private static final int WOOL_ID = Material.WOOL.getId();

src/main/java/com/garbagemule/MobArena/util/PotionEffectParser.java

@@ -1,12 +1,12 @@
 package com.garbagemule.MobArena.util;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.Bukkit;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PotionEffectParser
 {
     private static final int TICKS_PER_SECOND = 20;

src/main/java/com/garbagemule/MobArena/util/TextUtils.java

@@ -1,10 +1,9 @@
 package com.garbagemule.MobArena.util;
 
-import java.util.Collection;
+import com.garbagemule.MobArena.Msg;
-
 import org.bukkit.entity.Player;
 
-import com.garbagemule.MobArena.Msg;
+import java.util.Collection;
 
 public class TextUtils
 {

src/main/java/com/garbagemule/MobArena/util/Updater.java

@@ -5,7 +5,19 @@
  */
 package com.garbagemule.MobArena.util;
 
-import java.io.*;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -13,12 +25,6 @@ import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-
 /**
  * Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed.
  * <p/>

src/main/java/com/garbagemule/MobArena/util/VersionChecker.java

@@ -1,11 +1,10 @@
 package com.garbagemule.MobArena.util;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.util.Updater.UpdateResult;
 import com.garbagemule.MobArena.util.Updater.UpdateType;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 public class VersionChecker
 {

src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java

@@ -1,10 +1,7 @@
 package com.garbagemule.MobArena.util.inventory;
 
-import java.io.*;
+import com.garbagemule.MobArena.MobArena;
-import java.util.HashMap;
+import com.garbagemule.MobArena.framework.Arena;
-import java.util.List;
-import java.util.Map;
-
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
@@ -13,8 +10,12 @@ import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import com.garbagemule.MobArena.MobArena;
+import java.io.File;
-import com.garbagemule.MobArena.framework.Arena;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class InventoryManager
 {

src/main/java/com/garbagemule/MobArena/util/inventory/InventoryUtils.java

@@ -1,10 +1,10 @@
 package com.garbagemule.MobArena.util.inventory;
 
+import org.bukkit.inventory.ItemStack;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.bukkit.inventory.ItemStack;
-
 public class InventoryUtils
 {
     public static List<ItemStack> extractAll(int id, List<ItemStack> items) {

src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java

@@ -1,11 +1,11 @@
 package com.garbagemule.MobArena.util.timer;
 
-import com.garbagemule.MobArena.Msg;
-import com.garbagemule.MobArena.framework.Arena;
-
 import static com.garbagemule.MobArena.util.timer.Common.toSeconds;
 import static com.garbagemule.MobArena.util.timer.Common.toTicks;
 
+import com.garbagemule.MobArena.Msg;
+import com.garbagemule.MobArena.framework.Arena;
+
 /**
  * The ChatCallback will periodically announce a message to all players in an
  * arena, based on the tick interval triggers provided in the constructor.

src/main/java/com/garbagemule/MobArena/util/timer/LevelCallback.java

@@ -1,6 +1,6 @@
 package com.garbagemule.MobArena.util.timer;
 
-import static com.garbagemule.MobArena.util.timer.Common.*;
+import static com.garbagemule.MobArena.util.timer.Common.toSeconds;
 
 import com.garbagemule.MobArena.framework.Arena;
 import org.bukkit.entity.Player;

src/main/java/com/garbagemule/MobArena/waves/AbstractWave.java

@@ -1,13 +1,13 @@
 package com.garbagemule.MobArena.waves;
 
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.waves.enums.WaveBranch;
+import com.garbagemule.MobArena.waves.enums.WaveType;
+import org.bukkit.Location;
+
 import java.util.List;
 import java.util.Map;
 
-import org.bukkit.Location;
-
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.waves.enums.*;
-
 public abstract class AbstractWave implements Wave
 {
     private String name;

src/main/java/com/garbagemule/MobArena/waves/BossAbilityThread.java

@@ -1,12 +1,12 @@
 package com.garbagemule.MobArena.waves;
 
-import java.util.List;
-import java.util.Set;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.ability.Ability;
 import com.garbagemule.MobArena.waves.types.BossWave;
 
+import java.util.List;
+import java.util.Set;
+
 public class BossAbilityThread implements Runnable
 {
     private BossWave wave;

src/main/java/com/garbagemule/MobArena/waves/MACreature.java

@@ -1,20 +1,27 @@
 package com.garbagemule.MobArena.waves;
 
+import com.garbagemule.MobArena.MobArena;
+import com.garbagemule.MobArena.framework.Arena;
+import org.bukkit.DyeColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Rabbit;
+import org.bukkit.entity.Sheep;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Zombie;
+import org.bukkit.inventory.ItemStack;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.bukkit.DyeColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.*;
-
-import com.garbagemule.MobArena.MobArena;
-import com.garbagemule.MobArena.framework.Arena;
-import org.bukkit.inventory.ItemStack;
-
 public class MACreature
 {
     // This part must come before the constants!

src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java

@@ -1,13 +1,12 @@
 package com.garbagemule.MobArena.waves;
 
-import java.util.HashSet;
+import com.garbagemule.MobArena.framework.Arena;
-import java.util.Set;
-
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import com.garbagemule.MobArena.framework.Arena;
+import java.util.HashSet;
+import java.util.Set;
 
 public class SheepBouncer implements Runnable
 {

src/main/java/com/garbagemule/MobArena/waves/Wave.java

@@ -1,13 +1,13 @@
 package com.garbagemule.MobArena.waves;
 
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.waves.enums.WaveBranch;
+import com.garbagemule.MobArena.waves.enums.WaveType;
+import org.bukkit.Location;
+
 import java.util.List;
 import java.util.Map;
 
-import org.bukkit.Location;
-
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.waves.enums.*;
-
 public interface Wave
 {
     /**

src/main/java/com/garbagemule/MobArena/waves/WaveManager.java

@@ -1,12 +1,13 @@
 package com.garbagemule.MobArena.waves;
 
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.waves.enums.WaveBranch;
+import com.garbagemule.MobArena.waves.enums.WaveError;
+import org.bukkit.configuration.ConfigurationSection;
+
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.waves.enums.*;
-import org.bukkit.configuration.ConfigurationSection;
-
 public class WaveManager
 {
     private Arena arena;

src/main/java/com/garbagemule/MobArena/waves/WaveParser.java

@@ -1,28 +1,42 @@
 package com.garbagemule.MobArena.waves;
 
-import java.util.*;
-
 import com.garbagemule.MobArena.ArenaClass;
-
-import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.region.ArenaRegion;
 import com.garbagemule.MobArena.util.ItemParser;
 import com.garbagemule.MobArena.util.PotionEffectParser;
 import com.garbagemule.MobArena.waves.ability.Ability;
 import com.garbagemule.MobArena.waves.ability.AbilityManager;
-import com.garbagemule.MobArena.waves.enums.*;
+import com.garbagemule.MobArena.waves.enums.BossHealth;
+import com.garbagemule.MobArena.waves.enums.SwarmAmount;
+import com.garbagemule.MobArena.waves.enums.WaveBranch;
+import com.garbagemule.MobArena.waves.enums.WaveError;
+import com.garbagemule.MobArena.waves.enums.WaveGrowth;
+import com.garbagemule.MobArena.waves.enums.WaveType;
 import com.garbagemule.MobArena.waves.types.BossWave;
 import com.garbagemule.MobArena.waves.types.DefaultWave;
 import com.garbagemule.MobArena.waves.types.SpecialWave;
 import com.garbagemule.MobArena.waves.types.SupplyWave;
 import com.garbagemule.MobArena.waves.types.SwarmWave;
 import com.garbagemule.MobArena.waves.types.UpgradeWave;
-import com.garbagemule.MobArena.waves.types.UpgradeWave.*;
+import com.garbagemule.MobArena.waves.types.UpgradeWave.ArmorUpgrade;
+import com.garbagemule.MobArena.waves.types.UpgradeWave.GenericUpgrade;
+import com.garbagemule.MobArena.waves.types.UpgradeWave.PermissionUpgrade;
+import com.garbagemule.MobArena.waves.types.UpgradeWave.Upgrade;
+import com.garbagemule.MobArena.waves.types.UpgradeWave.WeaponUpgrade;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 public class WaveParser
 {

src/main/java/com/garbagemule/MobArena/waves/WaveUtils.java

@@ -1,19 +1,18 @@
 package com.garbagemule.MobArena.waves;
 
+import com.garbagemule.MobArena.MAUtils;
+import com.garbagemule.MobArena.MobArena;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.waves.enums.WaveBranch;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.waves.enums.*;
-import com.garbagemule.MobArena.MAUtils;
-import com.garbagemule.MobArena.MobArena;
-
 public class WaveUtils
 {
     /**

src/main/java/com/garbagemule/MobArena/waves/ability/AbilityManager.java

@@ -1,5 +1,34 @@
 package com.garbagemule.MobArena.waves.ability;
 
+import com.garbagemule.MobArena.waves.ability.core.ChainLightning;
+import com.garbagemule.MobArena.waves.ability.core.DisorientDistant;
+import com.garbagemule.MobArena.waves.ability.core.DisorientNearby;
+import com.garbagemule.MobArena.waves.ability.core.DisorientTarget;
+import com.garbagemule.MobArena.waves.ability.core.FetchDistant;
+import com.garbagemule.MobArena.waves.ability.core.FetchNearby;
+import com.garbagemule.MobArena.waves.ability.core.FetchTarget;
+import com.garbagemule.MobArena.waves.ability.core.FireAura;
+import com.garbagemule.MobArena.waves.ability.core.Flood;
+import com.garbagemule.MobArena.waves.ability.core.LightningAura;
+import com.garbagemule.MobArena.waves.ability.core.LivingBomb;
+import com.garbagemule.MobArena.waves.ability.core.ObsidianBomb;
+import com.garbagemule.MobArena.waves.ability.core.PullDistant;
+import com.garbagemule.MobArena.waves.ability.core.PullNearby;
+import com.garbagemule.MobArena.waves.ability.core.PullTarget;
+import com.garbagemule.MobArena.waves.ability.core.RootTarget;
+import com.garbagemule.MobArena.waves.ability.core.ShootArrow;
+import com.garbagemule.MobArena.waves.ability.core.ShootFireball;
+import com.garbagemule.MobArena.waves.ability.core.ShufflePositions;
+import com.garbagemule.MobArena.waves.ability.core.ThrowDistant;
+import com.garbagemule.MobArena.waves.ability.core.ThrowNearby;
+import com.garbagemule.MobArena.waves.ability.core.ThrowTarget;
+import com.garbagemule.MobArena.waves.ability.core.WarpToPlayer;
+import org.bukkit.Bukkit;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -9,11 +38,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.tools.*;
-
-import com.garbagemule.MobArena.waves.ability.core.*;
-import org.bukkit.Bukkit;
-
 public class AbilityManager
 {
     private static final String ma = "plugins" + File.separator + "MobArena.jar";

src/main/java/com/garbagemule/MobArena/waves/ability/AbilityUtils.java

@@ -1,16 +1,15 @@
 package com.garbagemule.MobArena.waves.ability;
 
-import java.util.ArrayList;
+import com.garbagemule.MobArena.MAUtils;
-import java.util.List;
+import com.garbagemule.MobArena.framework.Arena;
-import java.util.Random;
-
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import com.garbagemule.MobArena.MAUtils;
+import java.util.ArrayList;
-import com.garbagemule.MobArena.framework.Arena;
+import java.util.List;
+import java.util.Random;
 
 public class AbilityUtils
 {

src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java

@@ -1,5 +1,19 @@
 package com.garbagemule.MobArena.waves.types;
 
+import com.garbagemule.MobArena.Msg;
+import com.garbagemule.MobArena.framework.Arena;
+import com.garbagemule.MobArena.waves.AbstractWave;
+import com.garbagemule.MobArena.waves.BossAbilityThread;
+import com.garbagemule.MobArena.waves.MABoss;
+import com.garbagemule.MobArena.waves.MACreature;
+import com.garbagemule.MobArena.waves.Wave;
+import com.garbagemule.MobArena.waves.ability.Ability;
+import com.garbagemule.MobArena.waves.ability.AbilityInfo;
+import com.garbagemule.MobArena.waves.enums.BossHealth;
+import com.garbagemule.MobArena.waves.enums.WaveType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,15 +21,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-
-import com.garbagemule.MobArena.Msg;
-import com.garbagemule.MobArena.framework.Arena;
-import com.garbagemule.MobArena.waves.*;
-import com.garbagemule.MobArena.waves.ability.*;
-import com.garbagemule.MobArena.waves.enums.*;
-
 public class BossWave extends AbstractWave
 {
     private String bossName;

src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java

@@ -1,12 +1,16 @@
 package com.garbagemule.MobArena.waves.types;
 
-import java.util.*;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.AbstractWave;
 import com.garbagemule.MobArena.waves.MACreature;
 import com.garbagemule.MobArena.waves.Wave;
-import com.garbagemule.MobArena.waves.enums.*;
+import com.garbagemule.MobArena.waves.enums.WaveGrowth;
+import com.garbagemule.MobArena.waves.enums.WaveType;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
 
 public class DefaultWave extends AbstractWave
 {

src/main/java/com/garbagemule/MobArena/waves/types/SpecialWave.java

@@ -1,13 +1,16 @@
 package com.garbagemule.MobArena.waves.types;
 
-import java.util.*;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.AbstractWave;
 import com.garbagemule.MobArena.waves.MACreature;
 import com.garbagemule.MobArena.waves.Wave;
 import com.garbagemule.MobArena.waves.enums.WaveType;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
+
 public class SpecialWave extends AbstractWave
 {
     private SortedMap<Integer,MACreature> monsterMap;

src/main/java/com/garbagemule/MobArena/waves/types/SupplyWave.java

@@ -1,14 +1,18 @@
 package com.garbagemule.MobArena.waves.types;
 
-import java.util.*;
-
-import com.garbagemule.MobArena.waves.Wave;
-import org.bukkit.inventory.ItemStack;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.AbstractWave;
 import com.garbagemule.MobArena.waves.MACreature;
+import com.garbagemule.MobArena.waves.Wave;
 import com.garbagemule.MobArena.waves.enums.WaveType;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
 
 public class SupplyWave extends AbstractWave
 {

src/main/java/com/garbagemule/MobArena/waves/types/SwarmWave.java

@@ -1,12 +1,14 @@
 package com.garbagemule.MobArena.waves.types;
 
-import java.util.*;
-
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.AbstractWave;
 import com.garbagemule.MobArena.waves.MACreature;
 import com.garbagemule.MobArena.waves.Wave;
-import com.garbagemule.MobArena.waves.enums.*;
+import com.garbagemule.MobArena.waves.enums.SwarmAmount;
+import com.garbagemule.MobArena.waves.enums.WaveType;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class SwarmWave extends AbstractWave
 {

src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java

@@ -1,16 +1,19 @@
 package com.garbagemule.MobArena.waves.types;
 
-import java.util.*;
-
-import com.garbagemule.MobArena.waves.Wave;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
 import com.garbagemule.MobArena.ArenaClass.ArmorType;
 import com.garbagemule.MobArena.framework.Arena;
 import com.garbagemule.MobArena.waves.AbstractWave;
 import com.garbagemule.MobArena.waves.MACreature;
+import com.garbagemule.MobArena.waves.Wave;
 import com.garbagemule.MobArena.waves.enums.WaveType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 public class UpgradeWave extends AbstractWave
 {