From da094e0f5765677fbf4c5afa9f088cfe7155bf90 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Mon, 13 Mar 2017 20:47:48 +0100 Subject: [PATCH] Optimize imports on all project files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Big commit, no functional changes ¯\_(ツ)_/¯ --- .../com/garbagemule/MobArena/ArenaClass.java | 11 ++- .../com/garbagemule/MobArena/ArenaImpl.java | 74 +++++++++++++------ .../garbagemule/MobArena/ArenaListener.java | 71 +++++++++++++----- .../garbagemule/MobArena/ArenaMasterImpl.java | 31 ++++---- .../com/garbagemule/MobArena/ArenaPlayer.java | 5 +- .../MobArena/ArenaPlayerStatistics.java | 12 +-- .../MobArena/ClassLimitManager.java | 13 ++-- .../garbagemule/MobArena/MASpawnThread.java | 26 ++++--- .../com/garbagemule/MobArena/MAUtils.java | 47 ++++++------ .../com/garbagemule/MobArena/MobArena.java | 34 ++++----- .../garbagemule/MobArena/MobArenaHandler.java | 4 +- .../garbagemule/MobArena/MonsterManager.java | 15 ++-- .../com/garbagemule/MobArena/PlayerData.java | 4 +- .../garbagemule/MobArena/RewardManager.java | 9 +-- .../MobArena/ScoreboardManager.java | 3 +- .../MobArena/commands/Command.java | 3 +- .../MobArena/commands/CommandHandler.java | 53 ++++++++++--- .../MobArena/commands/Commands.java | 13 ++-- .../commands/admin/DisableCommand.java | 10 +-- .../commands/admin/EnableCommand.java | 10 +-- .../MobArena/commands/admin/ForceCommand.java | 8 +- .../MobArena/commands/admin/KickCommand.java | 8 +- .../commands/admin/RestoreCommand.java | 7 +- .../commands/setup/AddArenaCommand.java | 11 +-- .../commands/setup/AddClassPermCommand.java | 8 +- .../commands/setup/AutoDegenerateCommand.java | 9 ++- .../commands/setup/AutoGenerateCommand.java | 12 +-- .../commands/setup/CheckDataCommand.java | 7 +- .../commands/setup/ClassChestCommand.java | 4 +- .../commands/setup/ConfigCommand.java | 7 +- .../commands/setup/EditArenaCommand.java | 9 +-- .../commands/setup/ListClassPermsCommand.java | 14 ++-- .../commands/setup/ListClassesCommand.java | 9 +-- .../commands/setup/RemoveArenaCommand.java | 7 +- .../commands/setup/RemoveClassCommand.java | 8 +- .../setup/RemoveClassPermCommand.java | 8 +- .../setup/RemoveContainerCommand.java | 7 +- .../setup/RemoveLeaderboardCommand.java | 5 +- .../setup/RemoveSpawnpointCommand.java | 7 +- .../commands/setup/SetClassCommand.java | 12 +-- .../commands/setup/SetClassPriceCommand.java | 4 - .../MobArena/commands/setup/SetupCommand.java | 14 +++- .../commands/user/ArenaListCommand.java | 14 ++-- .../MobArena/commands/user/JoinCommand.java | 11 +-- .../MobArena/commands/user/LeaveCommand.java | 11 +-- .../commands/user/NotReadyCommand.java | 12 +-- .../commands/user/PickClassCommand.java | 5 -- .../commands/user/PlayerListCommand.java | 15 ++-- .../MobArena/commands/user/SpecCommand.java | 11 +-- .../MobArena/events/ArenaEndEvent.java | 3 +- .../events/ArenaPlayerDeathEvent.java | 3 +- .../MobArena/events/ArenaPlayerJoinEvent.java | 3 +- .../events/ArenaPlayerLeaveEvent.java | 3 +- .../events/ArenaPlayerReadyEvent.java | 3 +- .../MobArena/events/ArenaStartEvent.java | 3 +- .../MobArena/events/NewWaveEvent.java | 7 +- .../garbagemule/MobArena/framework/Arena.java | 26 ++++--- .../MobArena/framework/ArenaMaster.java | 12 ++- .../AbstractLeaderboardColumn.java | 5 +- .../leaderboards/ClassLeaderboardColumn.java | 5 +- .../leaderboards/IntLeaderboardColumn.java | 5 +- .../MobArena/leaderboards/Leaderboard.java | 15 ++-- .../leaderboards/LeaderboardColumn.java | 5 +- .../leaderboards/PlayerLeaderboardColumn.java | 5 +- .../MobArena/listeners/MAGlobalListener.java | 52 +++++++++---- .../listeners/MagicSpellsListener.java | 14 ++-- .../MobArena/region/ArenaRegion.java | 13 +++- .../MobArena/region/RegionSerializer.java | 3 +- .../repairable/RepairableComparator.java | 4 +- .../repairable/RepairableContainer.java | 1 - .../com/garbagemule/MobArena/util/Delays.java | 3 +- .../MobArena/util/EntityPosition.java | 3 +- .../garbagemule/MobArena/util/ItemParser.java | 15 ++-- .../MobArena/util/PotionEffectParser.java | 6 +- .../garbagemule/MobArena/util/TextUtils.java | 5 +- .../garbagemule/MobArena/util/Updater.java | 20 +++-- .../MobArena/util/VersionChecker.java | 5 +- .../util/inventory/InventoryManager.java | 15 ++-- .../util/inventory/InventoryUtils.java | 4 +- .../MobArena/util/timer/ChatCallback.java | 6 +- .../MobArena/util/timer/LevelCallback.java | 2 +- .../MobArena/waves/AbstractWave.java | 10 +-- .../MobArena/waves/BossAbilityThread.java | 6 +- .../MobArena/waves/MACreature.java | 27 ++++--- .../MobArena/waves/SheepBouncer.java | 7 +- .../com/garbagemule/MobArena/waves/Wave.java | 10 +-- .../MobArena/waves/WaveManager.java | 9 ++- .../MobArena/waves/WaveParser.java | 34 ++++++--- .../garbagemule/MobArena/waves/WaveUtils.java | 17 ++--- .../waves/ability/AbilityManager.java | 34 +++++++-- .../MobArena/waves/ability/AbilityUtils.java | 11 ++- .../MobArena/waves/types/BossWave.java | 23 +++--- .../MobArena/waves/types/DefaultWave.java | 10 ++- .../MobArena/waves/types/SpecialWave.java | 7 +- .../MobArena/waves/types/SupplyWave.java | 14 ++-- .../MobArena/waves/types/SwarmWave.java | 8 +- .../MobArena/waves/types/UpgradeWave.java | 15 ++-- 97 files changed, 701 insertions(+), 527 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaClass.java b/src/main/java/com/garbagemule/MobArena/ArenaClass.java index 59304b3..bd5bcc6 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaClass.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java index d3c067c..7dcfd7a 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java @@ -1,9 +1,35 @@ package com.garbagemule.MobArena; -import java.util.*; -import java.util.Map.Entry; -import java.util.concurrent.PriorityBlockingQueue; +import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection; +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.inventory.*; +import org.bukkit.entity.AbstractHorse; +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 com.garbagemule.MobArena.ArenaClass.ArmorType; -import com.garbagemule.MobArena.events.*; -import com.garbagemule.MobArena.framework.Arena; -import com.garbagemule.MobArena.leaderboards.Leaderboard; -import com.garbagemule.MobArena.region.ArenaRegion; -import com.garbagemule.MobArena.repairable.*; -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.*; -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; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.PriorityBlockingQueue; public class ArenaImpl implements Arena { diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index 13cdb29..975cf25 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java index ebdacba..20bbf59 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java @@ -1,13 +1,14 @@ package com.garbagemule.MobArena; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection; +import static com.garbagemule.MobArena.util.config.ConfigUtils.parseLocation; +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 static com.garbagemule.MobArena.util.config.ConfigUtils.parseLocation; - -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 java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ArenaMasterImpl implements ArenaMaster { diff --git a/src/main/java/com/garbagemule/MobArena/ArenaPlayer.java b/src/main/java/com/garbagemule/MobArena/ArenaPlayer.java index 9d84cb2..ba26a11 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaPlayer.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/ArenaPlayerStatistics.java b/src/main/java/com/garbagemule/MobArena/ArenaPlayerStatistics.java index 5dee247..6012ffb 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaPlayerStatistics.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/ClassLimitManager.java b/src/main/java/com/garbagemule/MobArena/ClassLimitManager.java index 6666fa9..e032c1b 100644 --- a/src/main/java/com/garbagemule/MobArena/ClassLimitManager.java +++ b/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 classLimits; diff --git a/src/main/java/com/garbagemule/MobArena/MASpawnThread.java b/src/main/java/com/garbagemule/MobArena/MASpawnThread.java index 3dcca26..a40330e 100644 --- a/src/main/java/com/garbagemule/MobArena/MASpawnThread.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/MAUtils.java b/src/main/java/com/garbagemule/MobArena/MAUtils.java index 1117fa5..4ed6cb3 100644 --- a/src/main/java/com/garbagemule/MobArena/MAUtils.java +++ b/src/main/java/com/garbagemule/MobArena/MAUtils.java @@ -1,24 +1,15 @@ package com.garbagemule.MobArena; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -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 com.garbagemule.MobArena.framework.Arena; +import com.garbagemule.MobArena.framework.ArenaMaster; +import com.garbagemule.MobArena.region.ArenaRegion; +import com.garbagemule.MobArena.util.EntityPosition; +import com.garbagemule.MobArena.util.ItemParser; +import com.garbagemule.MobArena.util.TextUtils; 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 com.garbagemule.MobArena.framework.ArenaMaster; -import com.garbagemule.MobArena.region.ArenaRegion; -import com.garbagemule.MobArena.util.EntityPosition; -import com.garbagemule.MobArena.util.ItemParser; -import com.garbagemule.MobArena.util.TextUtils; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +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 { diff --git a/src/main/java/com/garbagemule/MobArena/MobArena.java b/src/main/java/com/garbagemule/MobArena/MobArena.java index 846589f..879cf5c 100644 --- a/src/main/java/com/garbagemule/MobArena/MobArena.java +++ b/src/main/java/com/garbagemule/MobArena/MobArena.java @@ -1,16 +1,17 @@ package com.garbagemule.MobArena; -import java.io.*; -import java.util.HashSet; -import java.util.Random; -import java.util.Set; -import java.util.logging.Logger; - +import com.garbagemule.MobArena.commands.CommandHandler; +import com.garbagemule.MobArena.framework.Arena; +import com.garbagemule.MobArena.framework.ArenaMaster; +import com.garbagemule.MobArena.listeners.MAGlobalListener; +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 com.garbagemule.MobArena.framework.Arena; -import com.garbagemule.MobArena.framework.ArenaMaster; -import com.garbagemule.MobArena.listeners.MAGlobalListener; -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 java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.HashSet; +import java.util.Random; +import java.util.Set; /** * MobArena diff --git a/src/main/java/com/garbagemule/MobArena/MobArenaHandler.java b/src/main/java/com/garbagemule/MobArena/MobArenaHandler.java index 5e3c9ca..7a161fd 100644 --- a/src/main/java/com/garbagemule/MobArena/MobArenaHandler.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/MonsterManager.java b/src/main/java/com/garbagemule/MobArena/MonsterManager.java index 2d36412..c5d59f5 100644 --- a/src/main/java/com/garbagemule/MobArena/MonsterManager.java +++ b/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 monsters, sheep, golems; diff --git a/src/main/java/com/garbagemule/MobArena/PlayerData.java b/src/main/java/com/garbagemule/MobArena/PlayerData.java index 71b119c..b8fafcf 100644 --- a/src/main/java/com/garbagemule/MobArena/PlayerData.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/RewardManager.java b/src/main/java/com/garbagemule/MobArena/RewardManager.java index 4cee6ad..d28bb2a 100644 --- a/src/main/java/com/garbagemule/MobArena/RewardManager.java +++ b/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") diff --git a/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java b/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java index f16db8b..1950cc4 100644 --- a/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java +++ b/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 "; diff --git a/src/main/java/com/garbagemule/MobArena/commands/Command.java b/src/main/java/com/garbagemule/MobArena/commands/Command.java index 99d8e1b..c7ddd34 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/Command.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java b/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java index 0b811f3..6bc0ff3 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java +++ b/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java @@ -1,19 +1,52 @@ package com.garbagemule.MobArena.commands; -import java.util.*; -import java.util.Map.Entry; - +import com.garbagemule.MobArena.MobArena; +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 { diff --git a/src/main/java/com/garbagemule/MobArena/commands/Commands.java b/src/main/java/com/garbagemule/MobArena/commands/Commands.java index 610488f..f890e05 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/Commands.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java index 02ecd48..f4039e9 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java +++ b/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 org.bukkit.command.CommandSender; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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.ChatColor; +import org.bukkit.command.CommandSender; @CommandInfo( name = "disable", diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java index c791837..9ed9157 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java +++ b/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 org.bukkit.command.CommandSender; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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.ChatColor; +import org.bukkit.command.CommandSender; @CommandInfo( name = "enable", diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java index b595d9a..dbf5e81 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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 = "force", diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java index 7cfb679..e69d87c 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "kick", diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java index db0293d..c5d245c 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +import com.garbagemule.MobArena.commands.Command; +import com.garbagemule.MobArena.commands.CommandInfo; import com.garbagemule.MobArena.framework.ArenaMaster; import com.garbagemule.MobArena.util.inventory.InventoryManager; +import org.bukkit.command.CommandSender; @CommandInfo( name = "restore", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java index 8b70271..7f9866c 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "addarena", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java index 517fb3e..ba52002 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "addclassperm", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java index 7dc808d..577f31a 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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.framework.Arena; import com.garbagemule.MobArena.framework.ArenaMaster; +import org.bukkit.command.CommandSender; @CommandInfo( name = "autodegenerate", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java index f772ac0..410f73c 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "autogenerate", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java index a310b97..e8f1560 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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 = "checkdata", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java index 4a91306..b329403 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java index 08e8b25..9bd74b8 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java index 3efc8ad..f71a07e 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java +++ b/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 org.bukkit.command.CommandSender; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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.ChatColor; +import org.bukkit.command.CommandSender; @CommandInfo( name = "editarena", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java index ab8572a..83ef28d 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java index bd6f07b..5377f55 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java +++ b/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 com.garbagemule.MobArena.commands.*; -import com.garbagemule.MobArena.framework.ArenaMaster; +import java.util.Set; @CommandInfo( name = "listclasses", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java index b4ce884..bdeaa10 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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 = "removearena", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java index dfc1d16..f998ba2 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "removeclass", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java index 97d18f3..0bfb66c 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java +++ b/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.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "removeclassperm", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java index f45598d..d570bd4 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java index e8d8edd..12b8029 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java index 8523ef7..489a983 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java index 9d44d5f..7216b01 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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 = "setclass", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java index f20c08c..6d98d7f 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java index e1161c7..fbbc8df 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java index f14a8c0..82932e5 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java +++ b/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 com.garbagemule.MobArena.commands.*; -import com.garbagemule.MobArena.framework.Arena; -import com.garbagemule.MobArena.framework.ArenaMaster; +import java.util.List; @CommandInfo( name = "arenalist", diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java index 293c456..f46cb58 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "join", diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java index 4ec3a00..74e5b51 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "leave", diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java index 8025183..685cace 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "notready", diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java index 8a74689..88f3707 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java +++ b/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", diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java index a736736..d0e13d5 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java +++ b/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 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.framework.Arena; +import com.garbagemule.MobArena.framework.ArenaMaster; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; -import com.garbagemule.MobArena.framework.Arena; -import com.garbagemule.MobArena.framework.ArenaMaster; +import java.util.LinkedList; +import java.util.List; @CommandInfo( name = "playerlist", diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java index 62cbfe2..912d3bd 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java +++ b/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 org.bukkit.entity.Player; - -import com.garbagemule.MobArena.*; -import com.garbagemule.MobArena.commands.*; +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; @CommandInfo( name = "spec", diff --git a/src/main/java/com/garbagemule/MobArena/events/ArenaEndEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaEndEvent.java index b5ef28d..ab553fd 100644 --- a/src/main/java/com/garbagemule/MobArena/events/ArenaEndEvent.java +++ b/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(); diff --git a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java index e8c8bc1..f1e4651 100644 --- a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerDeathEvent.java +++ b/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(); diff --git a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java index dc00af6..5a2e822 100644 --- a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerJoinEvent.java +++ b/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(); diff --git a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java index 0b068be..f58647e 100644 --- a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerLeaveEvent.java +++ b/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(); diff --git a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java index bae80d3..06be9a4 100644 --- a/src/main/java/com/garbagemule/MobArena/events/ArenaPlayerReadyEvent.java +++ b/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(); diff --git a/src/main/java/com/garbagemule/MobArena/events/ArenaStartEvent.java b/src/main/java/com/garbagemule/MobArena/events/ArenaStartEvent.java index 10f245d..0c3eb33 100644 --- a/src/main/java/com/garbagemule/MobArena/events/ArenaStartEvent.java +++ b/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(); diff --git a/src/main/java/com/garbagemule/MobArena/events/NewWaveEvent.java b/src/main/java/com/garbagemule/MobArena/events/NewWaveEvent.java index b8f09b5..7e19606 100644 --- a/src/main/java/com/garbagemule/MobArena/events/NewWaveEvent.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/framework/Arena.java b/src/main/java/com/garbagemule/MobArena/framework/Arena.java index 817b1f2..c03a69b 100644 --- a/src/main/java/com/garbagemule/MobArena/framework/Arena.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java index 2e60d74..b80ff7d 100644 --- a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java +++ b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java @@ -1,19 +1,17 @@ package com.garbagemule.MobArena.framework; -import java.util.Collection; -import java.util.List; -import java.util.Map; - +import com.garbagemule.MobArena.ArenaClass; 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 com.garbagemule.MobArena.MobArena; -import com.garbagemule.MobArena.framework.Arena; +import java.util.Collection; +import java.util.List; +import java.util.Map; public interface ArenaMaster { diff --git a/src/main/java/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java index fe07abc..dbd8bd6 100644 --- a/src/main/java/com/garbagemule/MobArena/leaderboards/AbstractLeaderboardColumn.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java index 83583ee..14b2c22 100644 --- a/src/main/java/com/garbagemule/MobArena/leaderboards/ClassLeaderboardColumn.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java index 0a48d03..9ad35c4 100644 --- a/src/main/java/com/garbagemule/MobArena/leaderboards/IntLeaderboardColumn.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java b/src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java index 2218397..5af8249 100644 --- a/src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java +++ b/src/main/java/com/garbagemule/MobArena/leaderboards/Leaderboard.java @@ -1,19 +1,18 @@ package com.garbagemule.MobArena.leaderboards; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - +import com.garbagemule.MobArena.ArenaPlayer; +import com.garbagemule.MobArena.ArenaPlayerStatistics; +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 com.garbagemule.MobArena.ArenaPlayerStatistics; -import com.garbagemule.MobArena.MobArena; -import com.garbagemule.MobArena.framework.Arena; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class Leaderboard { diff --git a/src/main/java/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java index 9d0a1e0..ebf583e 100644 --- a/src/main/java/com/garbagemule/MobArena/leaderboards/LeaderboardColumn.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java b/src/main/java/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java index 7d7bb59..c4eeab7 100644 --- a/src/main/java/com/garbagemule/MobArena/leaderboards/PlayerLeaderboardColumn.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java index 3f61d48..ec0b881 100644 --- a/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java b/src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java index 9081405..347a84d 100644 --- a/src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java +++ b/src/main/java/com/garbagemule/MobArena/listeners/MagicSpellsListener.java @@ -1,8 +1,9 @@ package com.garbagemule.MobArena.listeners; -import java.io.File; -import java.util.List; - +import com.garbagemule.MobArena.MobArena; +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 com.garbagemule.MobArena.waves.enums.*; -import com.garbagemule.MobArena.MobArena; - -import com.nisovin.magicspells.events.SpellCastEvent; +import java.io.File; +import java.util.List; public class MagicSpellsListener implements Listener { diff --git a/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java b/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java index f14bf12..6a01903 100644 --- a/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java +++ b/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 static com.garbagemule.MobArena.util.config.ConfigUtils.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ArenaRegion { diff --git a/src/main/java/com/garbagemule/MobArena/region/RegionSerializer.java b/src/main/java/com/garbagemule/MobArena/region/RegionSerializer.java index 3ad5473..469c4c0 100644 --- a/src/main/java/com/garbagemule/MobArena/region/RegionSerializer.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/repairable/RepairableComparator.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableComparator.java index 56db9a8..f2f7b6b 100644 --- a/src/main/java/com/garbagemule/MobArena/repairable/RepairableComparator.java +++ b/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 { public int compare(Repairable r1, Repairable r2) diff --git a/src/main/java/com/garbagemule/MobArena/repairable/RepairableContainer.java b/src/main/java/com/garbagemule/MobArena/repairable/RepairableContainer.java index 7e2df2f..ef8926d 100644 --- a/src/main/java/com/garbagemule/MobArena/repairable/RepairableContainer.java +++ b/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 diff --git a/src/main/java/com/garbagemule/MobArena/util/Delays.java b/src/main/java/com/garbagemule/MobArena/util/Delays.java index b3302b7..a86e9c3 100644 --- a/src/main/java/com/garbagemule/MobArena/util/Delays.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/util/EntityPosition.java b/src/main/java/com/garbagemule/MobArena/util/EntityPosition.java index 93c1498..71e920d 100644 --- a/src/main/java/com/garbagemule/MobArena/util/EntityPosition.java +++ b/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 diff --git a/src/main/java/com/garbagemule/MobArena/util/ItemParser.java b/src/main/java/com/garbagemule/MobArena/util/ItemParser.java index d814455..221f595 100644 --- a/src/main/java/com/garbagemule/MobArena/util/ItemParser.java +++ b/src/main/java/com/garbagemule/MobArena/util/ItemParser.java @@ -1,11 +1,6 @@ package com.garbagemule.MobArena.util; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import com.garbagemule.MobArena.MobArena; 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(); diff --git a/src/main/java/com/garbagemule/MobArena/util/PotionEffectParser.java b/src/main/java/com/garbagemule/MobArena/util/PotionEffectParser.java index e5f8b12..6ac47f4 100644 --- a/src/main/java/com/garbagemule/MobArena/util/PotionEffectParser.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/util/TextUtils.java b/src/main/java/com/garbagemule/MobArena/util/TextUtils.java index 9ae83df..4f3e0b3 100644 --- a/src/main/java/com/garbagemule/MobArena/util/TextUtils.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/util/Updater.java b/src/main/java/com/garbagemule/MobArena/util/Updater.java index bdad70b..15926cf 100644 --- a/src/main/java/com/garbagemule/MobArena/util/Updater.java +++ b/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. *

diff --git a/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java b/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java index 129bbb3..a713559 100644 --- a/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java index 7532a62..a52aace 100644 --- a/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java +++ b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java @@ -1,10 +1,7 @@ package com.garbagemule.MobArena.util.inventory; -import java.io.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.garbagemule.MobArena.MobArena; +import com.garbagemule.MobArena.framework.Arena; 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 com.garbagemule.MobArena.framework.Arena; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class InventoryManager { diff --git a/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryUtils.java b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryUtils.java index 43bf89c..ac377ee 100644 --- a/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryUtils.java +++ b/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 extractAll(int id, List items) { diff --git a/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java b/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java index 4c0e0cf..ec34137 100644 --- a/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java +++ b/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. diff --git a/src/main/java/com/garbagemule/MobArena/util/timer/LevelCallback.java b/src/main/java/com/garbagemule/MobArena/util/timer/LevelCallback.java index 3bfbb4d..82cf6c3 100644 --- a/src/main/java/com/garbagemule/MobArena/util/timer/LevelCallback.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/waves/AbstractWave.java b/src/main/java/com/garbagemule/MobArena/waves/AbstractWave.java index e9fc4b1..b6f1829 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/AbstractWave.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/waves/BossAbilityThread.java b/src/main/java/com/garbagemule/MobArena/waves/BossAbilityThread.java index 0308b1d..185c8ed 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/BossAbilityThread.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/waves/MACreature.java b/src/main/java/com/garbagemule/MobArena/waves/MACreature.java index f8243f7..b36318c 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/MACreature.java +++ b/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! diff --git a/src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java b/src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java index 253f0a3..c102cf8 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java +++ b/src/main/java/com/garbagemule/MobArena/waves/SheepBouncer.java @@ -1,13 +1,12 @@ package com.garbagemule.MobArena.waves; -import java.util.HashSet; -import java.util.Set; - +import com.garbagemule.MobArena.framework.Arena; 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 { diff --git a/src/main/java/com/garbagemule/MobArena/waves/Wave.java b/src/main/java/com/garbagemule/MobArena/waves/Wave.java index da516d9..d6a9fe3 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/Wave.java +++ b/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 { /** diff --git a/src/main/java/com/garbagemule/MobArena/waves/WaveManager.java b/src/main/java/com/garbagemule/MobArena/waves/WaveManager.java index 16c4cb8..4ca2149 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/WaveManager.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java index 258fa5b..f727d2f 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/waves/WaveUtils.java b/src/main/java/com/garbagemule/MobArena/waves/WaveUtils.java index 4fac166..8cac866 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/WaveUtils.java +++ b/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 { /** diff --git a/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityManager.java b/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityManager.java index c4878f2..f4b401a 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityManager.java +++ b/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"; diff --git a/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityUtils.java b/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityUtils.java index 8a6440c..5f02875 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/ability/AbilityUtils.java +++ b/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 java.util.List; -import java.util.Random; - +import com.garbagemule.MobArena.MAUtils; +import com.garbagemule.MobArena.framework.Arena; 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 com.garbagemule.MobArena.framework.Arena; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class AbilityUtils { diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java index 7e46fa9..206b6ac 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java +++ b/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; diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java index 31ef760..6585778 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/SpecialWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/SpecialWave.java index 87c9710..4a2ab3c 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/SpecialWave.java +++ b/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 monsterMap; diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/SupplyWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/SupplyWave.java index 70f6bf9..3000b69 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/SupplyWave.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/SwarmWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/SwarmWave.java index 96b5fa0..121e332 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/SwarmWave.java +++ b/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 { diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java index 12550e2..bc9bee1 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java +++ b/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 {