diff --git a/checkstyle.xml b/checkstyle.xml index 8372bb71..bd5e885c 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -19,8 +19,21 @@ - + + + + + + + + + + + + + + diff --git a/src/main/java/org/bukkit/Art.java b/src/main/java/org/bukkit/Art.java index c6548738..e7563acf 100644 --- a/src/main/java/org/bukkit/Art.java +++ b/src/main/java/org/bukkit/Art.java @@ -1,10 +1,8 @@ package org.bukkit; -import java.util.HashMap; - -import org.apache.commons.lang.Validate; - import com.google.common.collect.Maps; +import java.util.HashMap; +import org.apache.commons.lang.Validate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/BanEntry.java b/src/main/java/org/bukkit/BanEntry.java index 30c8b0a0..2cf11ca4 100644 --- a/src/main/java/org/bukkit/BanEntry.java +++ b/src/main/java/org/bukkit/BanEntry.java @@ -1,10 +1,9 @@ package org.bukkit; +import java.util.Date; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Date; - /** * A single entry from a ban list. This may represent either a player ban or * an IP ban. diff --git a/src/main/java/org/bukkit/BanList.java b/src/main/java/org/bukkit/BanList.java index f506b644..96ef22fe 100644 --- a/src/main/java/org/bukkit/BanList.java +++ b/src/main/java/org/bukkit/BanList.java @@ -1,10 +1,9 @@ package org.bukkit; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.Date; import java.util.Set; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A ban list, containing bans of some {@link Type}. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index b47cc31d..17d2a6ec 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1,5 +1,6 @@ package org.bukkit; +import com.google.common.collect.ImmutableList; import java.awt.image.BufferedImage; import java.io.File; import java.io.Serializable; @@ -12,8 +13,8 @@ import java.util.Set; import java.util.UUID; import java.util.function.Consumer; import java.util.logging.Logger; - import org.bukkit.Warning.WarningState; +import org.bukkit.advancement.Advancement; import org.bukkit.block.data.BlockData; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarFlag; @@ -28,12 +29,15 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.server.ServerListPingEvent; +import org.bukkit.generator.ChunkGenerator; import org.bukkit.help.HelpMap; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; +import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Merchant; import org.bukkit.inventory.Recipe; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.loot.LootTable; import org.bukkit.map.MapView; import org.bukkit.permissions.Permissible; @@ -43,13 +47,6 @@ import org.bukkit.plugin.messaging.Messenger; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.util.CachedServerIcon; - -import com.google.common.collect.ImmutableList; -import org.bukkit.advancement.Advancement; -import org.bukkit.generator.ChunkGenerator; - -import org.bukkit.inventory.ItemFactory; -import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java index b8f4fcab..e1552156 100644 --- a/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java @@ -1,11 +1,9 @@ package org.bukkit; +import com.google.common.collect.Maps; import java.util.Map; import java.util.regex.Pattern; - import org.apache.commons.lang.Validate; - -import com.google.common.collect.Maps; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/CoalType.java b/src/main/java/org/bukkit/CoalType.java index c9fcc5dd..c07499db 100644 --- a/src/main/java/org/bukkit/CoalType.java +++ b/src/main/java/org/bukkit/CoalType.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/Color.java b/src/main/java/org/bukkit/Color.java index fbad4590..e7aa3d1b 100644 --- a/src/main/java/org/bukkit/Color.java +++ b/src/main/java/org/bukkit/Color.java @@ -1,12 +1,10 @@ package org.bukkit; +import com.google.common.collect.ImmutableMap; import java.util.Map; - import org.apache.commons.lang.Validate; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.SerializableAs; - -import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/CropState.java b/src/main/java/org/bukkit/CropState.java index 8a9a36cf..fb4832fb 100644 --- a/src/main/java/org/bukkit/CropState.java +++ b/src/main/java/org/bukkit/CropState.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/Difficulty.java b/src/main/java/org/bukkit/Difficulty.java index 95682077..3f6cbefc 100644 --- a/src/main/java/org/bukkit/Difficulty.java +++ b/src/main/java/org/bukkit/Difficulty.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/DyeColor.java b/src/main/java/org/bukkit/DyeColor.java index d00c8f91..bd213cab 100644 --- a/src/main/java/org/bukkit/DyeColor.java +++ b/src/main/java/org/bukkit/DyeColor.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.ImmutableMap; +import java.util.Map; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java index e476de65..87911e08 100644 --- a/src/main/java/org/bukkit/Effect.java +++ b/src/main/java/org/bukkit/Effect.java @@ -1,9 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; - +import java.util.Map; import org.bukkit.block.BlockFace; import org.bukkit.potion.Potion; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/EntityEffect.java b/src/main/java/org/bukkit/EntityEffect.java index c201a54b..4cec7268 100644 --- a/src/main/java/org/bukkit/EntityEffect.java +++ b/src/main/java/org/bukkit/EntityEffect.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.bukkit.entity.Ageable; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Entity; diff --git a/src/main/java/org/bukkit/FireworkEffect.java b/src/main/java/org/bukkit/FireworkEffect.java index 524dc998..31e14b0c 100644 --- a/src/main/java/org/bukkit/FireworkEffect.java +++ b/src/main/java/org/bukkit/FireworkEffect.java @@ -1,14 +1,12 @@ package org.bukkit; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.Validate; -import org.bukkit.configuration.serialization.ConfigurationSerializable; -import org.bukkit.configuration.serialization.SerializableAs; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.Validate; +import org.bukkit.configuration.serialization.ConfigurationSerializable; +import org.bukkit.configuration.serialization.SerializableAs; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/GameMode.java b/src/main/java/org/bukkit/GameMode.java index 168c4dc8..938c3217 100644 --- a/src/main/java/org/bukkit/GameMode.java +++ b/src/main/java/org/bukkit/GameMode.java @@ -1,10 +1,8 @@ package org.bukkit; -import java.util.Map; - -import org.bukkit.entity.HumanEntity; - import com.google.common.collect.Maps; +import java.util.Map; +import org.bukkit.entity.HumanEntity; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java index da49c26c..60a00324 100644 --- a/src/main/java/org/bukkit/GameRule.java +++ b/src/main/java/org/bukkit/GameRule.java @@ -1,11 +1,10 @@ package org.bukkit; import com.google.common.base.Preconditions; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.HashMap; import java.util.Map; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * GameRules dictate certain behavior within Minecraft itself diff --git a/src/main/java/org/bukkit/GrassSpecies.java b/src/main/java/org/bukkit/GrassSpecies.java index c178847e..f9c9ae46 100644 --- a/src/main/java/org/bukkit/GrassSpecies.java +++ b/src/main/java/org/bukkit/GrassSpecies.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/Instrument.java b/src/main/java/org/bukkit/Instrument.java index 2a6dd05c..92194803 100644 --- a/src/main/java/org/bukkit/Instrument.java +++ b/src/main/java/org/bukkit/Instrument.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; public enum Instrument { diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java index 19b23e8e..39e57fe1 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -2,7 +2,6 @@ package org.bukkit; import java.util.HashMap; import java.util.Map; - import org.bukkit.block.Block; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.util.NumberConversions; diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java index bafc41ec..bb694bfb 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -16,9 +16,9 @@ import org.bukkit.block.data.Lightable; import org.bukkit.block.data.MultipleFacing; import org.bukkit.block.data.Orientable; import org.bukkit.block.data.Powerable; +import org.bukkit.block.data.Rail; import org.bukkit.block.data.Rotatable; import org.bukkit.block.data.Snowable; -import org.bukkit.block.data.Rail; import org.bukkit.block.data.Waterlogged; import org.bukkit.block.data.type.Bamboo; import org.bukkit.block.data.type.Bed; diff --git a/src/main/java/org/bukkit/Note.java b/src/main/java/org/bukkit/Note.java index 6aa02542..b1c86aef 100644 --- a/src/main/java/org/bukkit/Note.java +++ b/src/main/java/org/bukkit/Note.java @@ -1,10 +1,8 @@ package org.bukkit; -import java.util.Map; - -import org.apache.commons.lang.Validate; - import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.commons.lang.Validate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java index cf8a2cb8..11eedda6 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -1,7 +1,6 @@ package org.bukkit; import java.util.UUID; - import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Player; diff --git a/src/main/java/org/bukkit/SandstoneType.java b/src/main/java/org/bukkit/SandstoneType.java index 8f859ac1..6277451c 100644 --- a/src/main/java/org/bukkit/SandstoneType.java +++ b/src/main/java/org/bukkit/SandstoneType.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index c7e64545..1b48b8ee 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1,5 +1,6 @@ package org.bukkit; +import com.google.common.collect.ImmutableList; import java.awt.image.BufferedImage; import java.io.File; import java.io.Serializable; @@ -12,8 +13,8 @@ import java.util.Set; import java.util.UUID; import java.util.function.Consumer; import java.util.logging.Logger; - import org.bukkit.Warning.WarningState; +import org.bukkit.advancement.Advancement; import org.bukkit.block.data.BlockData; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarFlag; @@ -28,12 +29,15 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.server.ServerListPingEvent; +import org.bukkit.generator.ChunkGenerator; import org.bukkit.help.HelpMap; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; +import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Merchant; import org.bukkit.inventory.Recipe; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.loot.LootTable; import org.bukkit.map.MapView; import org.bukkit.permissions.Permissible; @@ -44,13 +48,6 @@ import org.bukkit.plugin.messaging.PluginMessageRecipient; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.util.CachedServerIcon; - -import com.google.common.collect.ImmutableList; -import org.bukkit.advancement.Advancement; -import org.bukkit.generator.ChunkGenerator; - -import org.bukkit.inventory.ItemFactory; -import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/StructureType.java b/src/main/java/org/bukkit/StructureType.java index 5c2e6977..e062c90e 100644 --- a/src/main/java/org/bukkit/StructureType.java +++ b/src/main/java/org/bukkit/StructureType.java @@ -2,15 +2,14 @@ package org.bukkit; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import org.apache.commons.lang.Validate; import org.bukkit.map.MapCursor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - /** * This class handles the creation and storage of all structure types for * Bukkit. Structure Types are the different kinds of structures that can be diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java index cb8daefb..1d9021b0 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -1,8 +1,7 @@ package org.bukkit; -import org.jetbrains.annotations.NotNull; - import java.util.Set; +import org.jetbrains.annotations.NotNull; /** * Represents a tag that may be defined by the server or a resource pack to diff --git a/src/main/java/org/bukkit/TreeSpecies.java b/src/main/java/org/bukkit/TreeSpecies.java index d3a15d19..2b177f98 100644 --- a/src/main/java/org/bukkit/TreeSpecies.java +++ b/src/main/java/org/bukkit/TreeSpecies.java @@ -1,8 +1,7 @@ package org.bukkit; -import java.util.Map; - import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/Warning.java b/src/main/java/org/bukkit/Warning.java index f86f25a0..91c9cb8f 100644 --- a/src/main/java/org/bukkit/Warning.java +++ b/src/main/java/org/bukkit/Warning.java @@ -1,12 +1,11 @@ package org.bukkit; +import com.google.common.collect.ImmutableMap; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.Map; - -import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java index 28cc1619..5ac1be9d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,19 +1,25 @@ package org.bukkit; import java.io.File; -import org.bukkit.generator.ChunkGenerator; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.function.Predicate; - import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; -import org.bukkit.entity.*; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.FallingBlock; +import org.bukkit.entity.Item; +import org.bukkit.entity.LightningStrike; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; import org.bukkit.generator.BlockPopulator; +import org.bukkit.generator.ChunkGenerator; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; import org.bukkit.metadata.Metadatable; diff --git a/src/main/java/org/bukkit/WorldType.java b/src/main/java/org/bukkit/WorldType.java index 8052a49c..f98b13e7 100644 --- a/src/main/java/org/bukkit/WorldType.java +++ b/src/main/java/org/bukkit/WorldType.java @@ -1,11 +1,10 @@ package org.bukkit; import com.google.common.collect.Maps; +import java.util.Map; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Map; - /** * Represents various types of worlds that may exist */ diff --git a/src/main/java/org/bukkit/advancement/AdvancementProgress.java b/src/main/java/org/bukkit/advancement/AdvancementProgress.java index 00823dc9..f9bc179d 100644 --- a/src/main/java/org/bukkit/advancement/AdvancementProgress.java +++ b/src/main/java/org/bukkit/advancement/AdvancementProgress.java @@ -1,10 +1,9 @@ package org.bukkit.advancement; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.Collection; import java.util.Date; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The individual status of an advancement for a player. This class is not diff --git a/src/main/java/org/bukkit/attribute/AttributeInstance.java b/src/main/java/org/bukkit/attribute/AttributeInstance.java index 18bafb04..f08ee26c 100644 --- a/src/main/java/org/bukkit/attribute/AttributeInstance.java +++ b/src/main/java/org/bukkit/attribute/AttributeInstance.java @@ -1,8 +1,7 @@ package org.bukkit.attribute; -import org.jetbrains.annotations.NotNull; - import java.util.Collection; +import org.jetbrains.annotations.NotNull; /** * Represents a mutable instance of an attribute and its associated modifiers diff --git a/src/main/java/org/bukkit/block/Banner.java b/src/main/java/org/bukkit/block/Banner.java index befa9da6..92fe953a 100644 --- a/src/main/java/org/bukkit/block/Banner.java +++ b/src/main/java/org/bukkit/block/Banner.java @@ -1,11 +1,10 @@ package org.bukkit.block; +import java.util.List; import org.bukkit.DyeColor; import org.bukkit.block.banner.Pattern; import org.jetbrains.annotations.NotNull; -import java.util.List; - /** * Represents a captured state of a banner. */ diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java index 323767d6..ab6750c7 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -1,7 +1,6 @@ package org.bukkit.block; import java.util.Collection; - import org.bukkit.Chunk; import org.bukkit.FluidCollisionMode; import org.bukkit.Location; diff --git a/src/main/java/org/bukkit/block/PistonMoveReaction.java b/src/main/java/org/bukkit/block/PistonMoveReaction.java index 02df8868..b90f5dc3 100644 --- a/src/main/java/org/bukkit/block/PistonMoveReaction.java +++ b/src/main/java/org/bukkit/block/PistonMoveReaction.java @@ -1,9 +1,8 @@ package org.bukkit.block; -import org.jetbrains.annotations.Nullable; - import java.util.HashMap; import java.util.Map; +import org.jetbrains.annotations.Nullable; /** * Represents how a block or entity will react when interacting with a piston diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java index 95f55a44..c9eb4d59 100644 --- a/src/main/java/org/bukkit/block/banner/PatternType.java +++ b/src/main/java/org/bukkit/block/banner/PatternType.java @@ -1,11 +1,10 @@ package org.bukkit.block.banner; -import org.jetbrains.annotations.Contract; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.HashMap; import java.util.Map; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public enum PatternType { BASE("b"), diff --git a/src/main/java/org/bukkit/block/data/Rail.java b/src/main/java/org/bukkit/block/data/Rail.java index e8300a74..b8993880 100644 --- a/src/main/java/org/bukkit/block/data/Rail.java +++ b/src/main/java/org/bukkit/block/data/Rail.java @@ -1,8 +1,7 @@ package org.bukkit.block.data; -import org.jetbrains.annotations.NotNull; - import java.util.Set; +import org.jetbrains.annotations.NotNull; /** * 'shape' represents the current layout of a minecart rail. diff --git a/src/main/java/org/bukkit/boss/BossBar.java b/src/main/java/org/bukkit/boss/BossBar.java index acaf8ff0..70274f2e 100644 --- a/src/main/java/org/bukkit/boss/BossBar.java +++ b/src/main/java/org/bukkit/boss/BossBar.java @@ -1,12 +1,10 @@ package org.bukkit.boss; +import java.util.List; import org.bukkit.entity.Player; -import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; - public interface BossBar { /** diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java index b55c514d..03d801a9 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -1,10 +1,10 @@ package org.bukkit.command; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; - import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -16,8 +16,6 @@ import org.bukkit.entity.minecart.CommandMinecart; import org.bukkit.permissions.Permissible; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.util.StringUtil; - -import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java index 2035880e..d6c8938b 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -1,7 +1,6 @@ package org.bukkit.command; import java.util.ArrayList; - import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java index 92c23424..30597d30 100644 --- a/src/main/java/org/bukkit/command/PluginCommand.java +++ b/src/main/java/org/bukkit/command/PluginCommand.java @@ -1,7 +1,6 @@ package org.bukkit.command; import java.util.List; - import org.apache.commons.lang.Validate; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java index 92b3f799..a542c4bb 100644 --- a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java +++ b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java index aa44e79e..906734ec 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -8,11 +8,15 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.apache.commons.lang.Validate; import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.command.defaults.*; +import org.bukkit.command.defaults.BukkitCommand; +import org.bukkit.command.defaults.HelpCommand; +import org.bukkit.command.defaults.PluginsCommand; +import org.bukkit.command.defaults.ReloadCommand; +import org.bukkit.command.defaults.TimingsCommand; +import org.bukkit.command.defaults.VersionCommand; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java index 80127fda..e9cf71f5 100644 --- a/src/main/java/org/bukkit/command/TabCompleter.java +++ b/src/main/java/org/bukkit/command/TabCompleter.java @@ -1,10 +1,9 @@ package org.bukkit.command; +import java.util.List; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; - /** * Represents a class which can suggest tab completions for commands. */ diff --git a/src/main/java/org/bukkit/command/defaults/BukkitCommand.java b/src/main/java/org/bukkit/command/defaults/BukkitCommand.java index 1d8249da..cb032d03 100644 --- a/src/main/java/org/bukkit/command/defaults/BukkitCommand.java +++ b/src/main/java/org/bukkit/command/defaults/BukkitCommand.java @@ -1,7 +1,6 @@ package org.bukkit.command.defaults; import java.util.List; - import org.bukkit.command.Command; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/command/defaults/HelpCommand.java b/src/main/java/org/bukkit/command/defaults/HelpCommand.java index 391283bd..3ec11eb2 100644 --- a/src/main/java/org/bukkit/command/defaults/HelpCommand.java +++ b/src/main/java/org/bukkit/command/defaults/HelpCommand.java @@ -1,5 +1,6 @@ package org.bukkit.command.defaults; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -7,7 +8,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; - import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; @@ -21,8 +21,6 @@ import org.bukkit.help.HelpTopic; import org.bukkit.help.HelpTopicComparator; import org.bukkit.help.IndexHelpTopic; import org.bukkit.util.ChatPaginator; - -import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java index 6f95bf3c..11fbd0e0 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -3,7 +3,6 @@ package org.bukkit.command.defaults; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java index 1104c603..50cc311b 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -3,7 +3,6 @@ package org.bukkit.command.defaults; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java index c4f1979a..db27723e 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -1,11 +1,11 @@ package org.bukkit.command.defaults; +import com.google.common.collect.ImmutableList; import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; import java.util.List; - import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -16,8 +16,6 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredListener; import org.bukkit.plugin.TimedRegisteredListener; import org.bukkit.util.StringUtil; - -import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; public class TimingsCommand extends BukkitCommand { diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java index b8126985..cbce5244 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -1,18 +1,6 @@ package org.bukkit.command.defaults; import com.google.common.base.Charsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.util.StringUtil; - import com.google.common.collect.ImmutableList; import com.google.common.io.Resources; import com.google.gson.Gson; @@ -22,10 +10,19 @@ import java.io.BufferedReader; import java.io.IOException; import java.net.URL; import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; - +import org.apache.commons.lang.Validate; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.util.StringUtil; import org.jetbrains.annotations.NotNull; public class VersionCommand extends BukkitCommand { diff --git a/src/main/java/org/bukkit/configuration/Configuration.java b/src/main/java/org/bukkit/configuration/Configuration.java index 7f7e3ff7..cfa63e8f 100644 --- a/src/main/java/org/bukkit/configuration/Configuration.java +++ b/src/main/java/org/bukkit/configuration/Configuration.java @@ -1,10 +1,9 @@ package org.bukkit.configuration; +import java.util.Map; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Map; - /** * Represents a source of configurable options and settings */ diff --git a/src/main/java/org/bukkit/configuration/ConfigurationSection.java b/src/main/java/org/bukkit/configuration/ConfigurationSection.java index e83de68a..bab2106d 100644 --- a/src/main/java/org/bukkit/configuration/ConfigurationSection.java +++ b/src/main/java/org/bukkit/configuration/ConfigurationSection.java @@ -1,14 +1,13 @@ package org.bukkit.configuration; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; - import org.bukkit.Color; import org.bukkit.OfflinePlayer; import org.bukkit.configuration.serialization.ConfigurationSerializable; -import org.bukkit.util.Vector; import org.bukkit.inventory.ItemStack; +import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/configuration/MemoryConfiguration.java b/src/main/java/org/bukkit/configuration/MemoryConfiguration.java index e03108b1..df1e076d 100644 --- a/src/main/java/org/bukkit/configuration/MemoryConfiguration.java +++ b/src/main/java/org/bukkit/configuration/MemoryConfiguration.java @@ -1,7 +1,6 @@ package org.bukkit.configuration; import java.util.Map; - import org.apache.commons.lang.Validate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/configuration/MemorySection.java b/src/main/java/org/bukkit/configuration/MemorySection.java index 37bb1c67..6fdd75e7 100644 --- a/src/main/java/org/bukkit/configuration/MemorySection.java +++ b/src/main/java/org/bukkit/configuration/MemorySection.java @@ -1,14 +1,12 @@ package org.bukkit.configuration; import static org.bukkit.util.NumberConversions.*; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.commons.lang.Validate; import org.bukkit.Color; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/org/bukkit/configuration/file/FileConfiguration.java b/src/main/java/org/bukkit/configuration/file/FileConfiguration.java index 82746d71..581889ff 100644 --- a/src/main/java/org/bukkit/configuration/file/FileConfiguration.java +++ b/src/main/java/org/bukkit/configuration/file/FileConfiguration.java @@ -2,10 +2,6 @@ package org.bukkit.configuration.file; import com.google.common.base.Charsets; import com.google.common.io.Files; - -import org.apache.commons.lang.Validate; -import org.bukkit.configuration.InvalidConfigurationException; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -16,8 +12,9 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; - +import org.apache.commons.lang.Validate; import org.bukkit.configuration.Configuration; +import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.MemoryConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java index 4919f6c9..eaa0afac 100644 --- a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java +++ b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java @@ -1,6 +1,7 @@ package org.bukkit.configuration.file; -import org.bukkit.configuration.*; +import org.bukkit.configuration.MemoryConfiguration; +import org.bukkit.configuration.MemoryConfigurationOptions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java index 441e7ff9..dc8cb193 100644 --- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java +++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.Reader; import java.util.Map; import java.util.logging.Level; - import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.configuration.Configuration; diff --git a/src/main/java/org/bukkit/configuration/file/YamlConstructor.java b/src/main/java/org/bukkit/configuration/file/YamlConstructor.java index 397b58c5..c8466a29 100644 --- a/src/main/java/org/bukkit/configuration/file/YamlConstructor.java +++ b/src/main/java/org/bukkit/configuration/file/YamlConstructor.java @@ -2,16 +2,14 @@ package org.bukkit.configuration.file; import java.util.LinkedHashMap; import java.util.Map; - +import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.YAMLException; +import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.Tag; -import org.bukkit.configuration.serialization.ConfigurationSerialization; - public class YamlConstructor extends SafeConstructor { public YamlConstructor() { diff --git a/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java b/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java index 63cb3555..f03da362 100644 --- a/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java +++ b/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java @@ -2,11 +2,9 @@ package org.bukkit.configuration.file; import java.util.LinkedHashMap; import java.util.Map; - import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; - import org.jetbrains.annotations.NotNull; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.representer.Representer; diff --git a/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java b/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java index a666db15..177944d4 100644 --- a/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java +++ b/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java @@ -1,8 +1,7 @@ package org.bukkit.configuration.serialization; -import org.jetbrains.annotations.NotNull; - import java.util.Map; +import org.jetbrains.annotations.NotNull; /** * Represents an object that may be serialized. diff --git a/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java b/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java index 76d9b966..8c9b4f69 100644 --- a/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java +++ b/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; - import org.apache.commons.lang.Validate; import org.bukkit.Color; import org.bukkit.FireworkEffect; @@ -18,8 +17,8 @@ import org.bukkit.block.banner.Pattern; import org.bukkit.configuration.Configuration; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import org.bukkit.util.BoundingBox; import org.bukkit.util.BlockVector; +import org.bukkit.util.BoundingBox; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java b/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java index 2fa5d2df..13839611 100644 --- a/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java +++ b/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java @@ -1,11 +1,10 @@ package org.bukkit.configuration.serialization; -import org.jetbrains.annotations.NotNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.jetbrains.annotations.NotNull; /** * Applies to a {@link ConfigurationSerializable} that will delegate all diff --git a/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java b/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java index 9f4e7950..725685ed 100644 --- a/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java +++ b/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java @@ -1,11 +1,10 @@ package org.bukkit.configuration.serialization; -import org.jetbrains.annotations.NotNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.jetbrains.annotations.NotNull; /** * Represents an "alias" that a {@link ConfigurationSerializable} may be diff --git a/src/main/java/org/bukkit/conversations/Conversation.java b/src/main/java/org/bukkit/conversations/Conversation.java index cb77dbd3..bf2407c8 100644 --- a/src/main/java/org/bukkit/conversations/Conversation.java +++ b/src/main/java/org/bukkit/conversations/Conversation.java @@ -1,13 +1,12 @@ package org.bukkit.conversations; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The Conversation class is responsible for tracking the current state of a diff --git a/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java b/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java index 5c634789..0d67fe0c 100644 --- a/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java +++ b/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java @@ -1,10 +1,9 @@ package org.bukkit.conversations; +import java.util.EventObject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.EventObject; - /** * ConversationAbandonedEvent contains information about an abandoned * conversation. diff --git a/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java b/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java index 48585ce5..451121e7 100644 --- a/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java +++ b/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java @@ -1,8 +1,7 @@ package org.bukkit.conversations; -import org.jetbrains.annotations.NotNull; - import java.util.EventListener; +import org.jetbrains.annotations.NotNull; /** */ diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java index b192b03b..5bc0d36f 100644 --- a/src/main/java/org/bukkit/conversations/ConversationContext.java +++ b/src/main/java/org/bukkit/conversations/ConversationContext.java @@ -1,11 +1,10 @@ package org.bukkit.conversations; +import java.util.Map; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Map; - /** * A ConversationContext provides continuity between nodes in the prompt graph * by giving the developer access to the subject of the conversation and a diff --git a/src/main/java/org/bukkit/conversations/ConversationFactory.java b/src/main/java/org/bukkit/conversations/ConversationFactory.java index efaaa7d9..ec8129de 100644 --- a/src/main/java/org/bukkit/conversations/ConversationFactory.java +++ b/src/main/java/org/bukkit/conversations/ConversationFactory.java @@ -1,14 +1,13 @@ package org.bukkit.conversations; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A ConversationFactory is responsible for creating a {@link Conversation} diff --git a/src/main/java/org/bukkit/conversations/FixedSetPrompt.java b/src/main/java/org/bukkit/conversations/FixedSetPrompt.java index bd3a8b40..9bf3336f 100644 --- a/src/main/java/org/bukkit/conversations/FixedSetPrompt.java +++ b/src/main/java/org/bukkit/conversations/FixedSetPrompt.java @@ -1,11 +1,9 @@ package org.bukkit.conversations; -import org.apache.commons.lang.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.Arrays; import java.util.List; +import org.apache.commons.lang.StringUtils; +import org.jetbrains.annotations.NotNull; /** * FixedSetPrompt is the base class for any prompt that requires a fixed set diff --git a/src/main/java/org/bukkit/conversations/RegexPrompt.java b/src/main/java/org/bukkit/conversations/RegexPrompt.java index a081c19a..6b3f1e45 100644 --- a/src/main/java/org/bukkit/conversations/RegexPrompt.java +++ b/src/main/java/org/bukkit/conversations/RegexPrompt.java @@ -1,9 +1,7 @@ package org.bukkit.conversations; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.regex.Pattern; +import org.jetbrains.annotations.NotNull; /** * RegexPrompt is the base class for any prompt that requires an input diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java index f871cfce..d1885f17 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java @@ -2,7 +2,6 @@ package org.bukkit.enchantments; import java.util.HashMap; import java.util.Map; - import org.bukkit.Keyed; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/entity/AnimalTamer.java b/src/main/java/org/bukkit/entity/AnimalTamer.java index 9f1eed9b..2e17b2d4 100644 --- a/src/main/java/org/bukkit/entity/AnimalTamer.java +++ b/src/main/java/org/bukkit/entity/AnimalTamer.java @@ -1,10 +1,9 @@ package org.bukkit.entity; +import java.util.UUID; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.UUID; - public interface AnimalTamer { /** diff --git a/src/main/java/org/bukkit/entity/Animals.java b/src/main/java/org/bukkit/entity/Animals.java index 3d4f8c3d..1047481e 100644 --- a/src/main/java/org/bukkit/entity/Animals.java +++ b/src/main/java/org/bukkit/entity/Animals.java @@ -1,8 +1,7 @@ package org.bukkit.entity; -import org.jetbrains.annotations.Nullable; - import java.util.UUID; +import org.jetbrains.annotations.Nullable; /** * Represents an Animal. diff --git a/src/main/java/org/bukkit/entity/ComplexLivingEntity.java b/src/main/java/org/bukkit/entity/ComplexLivingEntity.java index 038bcb6d..2151e3ba 100644 --- a/src/main/java/org/bukkit/entity/ComplexLivingEntity.java +++ b/src/main/java/org/bukkit/entity/ComplexLivingEntity.java @@ -1,8 +1,7 @@ package org.bukkit.entity; -import org.jetbrains.annotations.NotNull; - import java.util.Set; +import org.jetbrains.annotations.NotNull; /** * Represents a complex living entity - one that is made up of various smaller diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java index a1e74cb0..7fdcedf3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -1,23 +1,22 @@ package org.bukkit.entity; +import java.util.List; +import java.util.Set; +import java.util.UUID; import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.block.BlockFace; +import org.bukkit.block.PistonMoveReaction; +import org.bukkit.command.CommandSender; import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.material.Directional; import org.bukkit.metadata.Metadatable; import org.bukkit.util.BoundingBox; import org.bukkit.util.Vector; - -import java.util.List; -import java.util.Set; -import java.util.UUID; -import org.bukkit.block.PistonMoveReaction; -import org.bukkit.command.CommandSender; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java index 38735030..86a185a3 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -3,19 +3,18 @@ package org.bukkit.entity; import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.Map; - import org.bukkit.Keyed; -import org.bukkit.entity.minecart.CommandMinecart; -import org.bukkit.entity.minecart.HopperMinecart; -import org.bukkit.entity.minecart.SpawnerMinecart; -import org.bukkit.entity.minecart.RideableMinecart; -import org.bukkit.entity.minecart.ExplosiveMinecart; -import org.bukkit.entity.minecart.PoweredMinecart; -import org.bukkit.entity.minecart.StorageMinecart; -import org.bukkit.inventory.ItemStack; import org.bukkit.Location; import org.bukkit.NamespacedKey; import org.bukkit.World; +import org.bukkit.entity.minecart.CommandMinecart; +import org.bukkit.entity.minecart.ExplosiveMinecart; +import org.bukkit.entity.minecart.HopperMinecart; +import org.bukkit.entity.minecart.PoweredMinecart; +import org.bukkit.entity.minecart.RideableMinecart; +import org.bukkit.entity.minecart.SpawnerMinecart; +import org.bukkit.entity.minecart.StorageMinecart; +import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffectType; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java index f76bc85c..9cb5c3be 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -5,12 +5,12 @@ import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.NamespacedKey; -import org.bukkit.inventory.MainHand; -import org.bukkit.inventory.Merchant; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.MainHand; +import org.bukkit.inventory.Merchant; import org.bukkit.inventory.PlayerInventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java index af8ea5ca..5427c99a 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -3,7 +3,6 @@ package org.bukkit.entity; import java.util.Collection; import java.util.List; import java.util.Set; - import org.bukkit.FluidCollisionMode; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java index e77eb822..ab9045e2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,7 +1,6 @@ package org.bukkit.entity; import java.net.InetSocketAddress; - import org.bukkit.Achievement; import org.bukkit.Effect; import org.bukkit.GameMode; diff --git a/src/main/java/org/bukkit/entity/ThrownPotion.java b/src/main/java/org/bukkit/entity/ThrownPotion.java index 02218457..10a3c297 100644 --- a/src/main/java/org/bukkit/entity/ThrownPotion.java +++ b/src/main/java/org/bukkit/entity/ThrownPotion.java @@ -1,7 +1,6 @@ package org.bukkit.entity; import java.util.Collection; - import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/entity/TippedArrow.java b/src/main/java/org/bukkit/entity/TippedArrow.java index d53b40d3..61846e8b 100644 --- a/src/main/java/org/bukkit/entity/TippedArrow.java +++ b/src/main/java/org/bukkit/entity/TippedArrow.java @@ -1,7 +1,6 @@ package org.bukkit.entity; import java.util.List; - import org.bukkit.Color; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffect; diff --git a/src/main/java/org/bukkit/event/HandlerList.java b/src/main/java/org/bukkit/event/HandlerList.java index e73e8d4c..ed78cca7 100644 --- a/src/main/java/org/bukkit/event/HandlerList.java +++ b/src/main/java/org/bukkit/event/HandlerList.java @@ -1,12 +1,15 @@ package org.bukkit.event; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map.Entry; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredListener; import org.jetbrains.annotations.NotNull; -import java.util.*; -import java.util.Map.Entry; - /** * A list of event handlers, stored per-event. Based on lahwran's fevents. */ diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java index 3c9903c0..977eb8d3 100644 --- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.block; -import org.bukkit.block.Block; import org.bukkit.Material; +import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java index 635d4bc0..2b9816d3 100644 --- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java @@ -1,12 +1,11 @@ package org.bukkit.event.block; +import java.util.List; import org.bukkit.block.Block; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -import java.util.List; - /** * Called when a block explodes */ diff --git a/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java b/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java index 1d12e68c..695309b4 100644 --- a/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java @@ -1,7 +1,6 @@ package org.bukkit.event.block; import java.util.List; - import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; diff --git a/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java index e4f7ca66..fe2ec79d 100644 --- a/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java @@ -1,14 +1,13 @@ package org.bukkit.event.block; import com.google.common.collect.ImmutableList; +import java.util.List; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; -import java.util.List; - /** * Fired when a single block placement action of a player triggers the * creation of multiple blocks(e.g. placing a bed block). The block returned diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java index 026ca7f1..aabbcbb0 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.block; -import org.bukkit.block.Block; import org.bukkit.Material; +import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java b/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java index 51bca651..40ddc364 100644 --- a/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java @@ -3,7 +3,6 @@ package org.bukkit.event.block; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.event.HandlerList; diff --git a/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java b/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java index ab98bba6..7029cfcd 100644 --- a/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java +++ b/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java @@ -1,11 +1,11 @@ package org.bukkit.event.block; +import java.util.List; +import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; -import java.util.List; -import org.bukkit.Material; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java index ac1b1cb9..59d46b52 100644 --- a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java +++ b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.enchantment; import java.util.HashMap; import java.util.Map; - import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java b/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java index 618db8ed..a37febd0 100644 --- a/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java +++ b/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java @@ -1,7 +1,6 @@ package org.bukkit.event.entity; import java.util.List; - import org.bukkit.entity.AreaEffectCloud; import org.bukkit.entity.LivingEntity; import org.bukkit.event.Cancellable; diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java index 4c519eba..461727dc 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java @@ -1,8 +1,7 @@ package org.bukkit.event.entity; -import java.util.Map; - import com.google.common.base.Function; +import java.util.Map; import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java index b6e86696..869bad74 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java @@ -1,8 +1,7 @@ package org.bukkit.event.entity; -import java.util.Map; - import com.google.common.base.Function; +import java.util.Map; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java index 477ecfbc..b5d8a34c 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java @@ -1,18 +1,16 @@ package org.bukkit.event.entity; +import com.google.common.base.Function; +import com.google.common.base.Functions; +import com.google.common.collect.ImmutableMap; import java.util.EnumMap; import java.util.Map; - import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; - -import com.google.common.base.Function; -import com.google.common.base.Functions; -import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java index 21eb0929..a483f385 100644 --- a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java @@ -1,14 +1,12 @@ package org.bukkit.event.entity; +import java.util.List; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; /** * Called when an entity explodes diff --git a/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java b/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java index e949072b..6818e9f0 100644 --- a/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.entity; -import org.bukkit.entity.Entity; import org.bukkit.Location; +import org.bukkit.entity.Entity; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java b/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java index 74588fc8..d38cc3cb 100644 --- a/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java +++ b/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java @@ -1,8 +1,8 @@ package org.bukkit.event.entity; +import org.bukkit.entity.AbstractHorse; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; -import org.bukkit.entity.AbstractHorse; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java b/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java index 657589da..faf98bb5 100644 --- a/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java +++ b/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java @@ -1,7 +1,6 @@ package org.bukkit.event.entity; import org.bukkit.Location; -import org.bukkit.UndefinedNullability; import org.bukkit.entity.Item; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java index 5b0ef1eb..f0dda632 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -1,7 +1,6 @@ package org.bukkit.event.entity; import java.util.List; - import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java index 45d224ec..17b49300 100644 --- a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java +++ b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java @@ -3,7 +3,6 @@ package org.bukkit.event.entity; import java.util.ArrayList; import java.util.Collection; import java.util.Map; - import org.apache.commons.lang.Validate; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.ThrownPotion; diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java index f8dde282..02766d93 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java @@ -1,15 +1,15 @@ package org.bukkit.event.inventory; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryView; +import org.bukkit.Location; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.inventory.InventoryType.SlotType; -import org.bukkit.Location; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; -import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitScheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java index 67409477..856e945c 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java @@ -1,9 +1,9 @@ package org.bukkit.event.inventory; +import com.google.common.collect.ImmutableSet; import java.util.Collections; import java.util.Map; import java.util.Set; - import org.apache.commons.lang.Validate; import org.bukkit.Location; import org.bukkit.entity.HumanEntity; @@ -14,8 +14,6 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitScheduler; - -import com.google.common.collect.ImmutableSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/event/inventory/InventoryEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryEvent.java index cc534420..5d3fe64a 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryEvent.java @@ -2,10 +2,9 @@ package org.bukkit.event.inventory; import java.util.List; - -import org.bukkit.event.HandlerList; import org.bukkit.entity.HumanEntity; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java index 3b1d1436..b75b184d 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java @@ -64,8 +64,8 @@ public abstract class InventoryInteractEvent extends InventoryEvent implements C } /** - * Proxy method to {@link #setResult(Event.Result)} for the Cancellable - * interface. {@link #setResult(Event.Result)} is preferred, as it allows + * Proxy method to {@link #setResult(org.bukkit.event.Event.Result)} for the Cancellable + * interface. {@link #setResult(org.bukkit.event.Event.Result)} is preferred, as it allows * you to specify the Result beyond Result.DENY and Result.ALLOW. *

* {@inheritDoc} diff --git a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java index 331a1bd7..946e3460 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java @@ -1,9 +1,9 @@ package org.bukkit.event.inventory; -import org.bukkit.inventory.InventoryView; import org.bukkit.entity.HumanEntity; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; +import org.bukkit.inventory.InventoryView; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java index cc3049e8..dadd20d9 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.player; import java.util.IllegalFormatException; import java.util.Set; - import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java index a0909736..c8384da6 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.player; import java.net.InetAddress; import java.util.UUID; - import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java index 7f12156b..4dfd97ee 100644 --- a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java @@ -1,9 +1,9 @@ package org.bukkit.event.player; -import org.bukkit.inventory.EquipmentSlot; -import org.bukkit.entity.Player; import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java index fec303c9..da2e54f6 100644 --- a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.player; import java.util.HashSet; import java.util.Set; - import org.apache.commons.lang.Validate; import org.bukkit.Warning; import org.bukkit.entity.Player; diff --git a/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java b/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java index c3ac3792..0b99c7fb 100644 --- a/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java @@ -1,7 +1,6 @@ package org.bukkit.event.player; import java.util.Collection; - import org.apache.commons.lang.Validate; import org.bukkit.Warning; import org.bukkit.entity.Player; diff --git a/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java b/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java index 66c930da..2efc885b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.player; import java.util.HashSet; import java.util.Set; - import org.apache.commons.lang.Validate; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/org/bukkit/event/player/PlayerFishEvent.java b/src/main/java/org/bukkit/event/player/PlayerFishEvent.java index 732d4579..3ee819ee 100644 --- a/src/main/java/org/bukkit/event/player/PlayerFishEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerFishEvent.java @@ -1,9 +1,9 @@ package org.bukkit.event.player; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; import org.bukkit.entity.Entity; import org.bukkit.entity.FishHook; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java index 3563aac3..0320c015 100644 --- a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java @@ -1,15 +1,15 @@ package org.bukkit.event.player; +import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockCanBuildEvent; import org.bukkit.inventory.EquipmentSlot; +import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java index dccffa03..498f0be8 100644 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java @@ -1,7 +1,6 @@ package org.bukkit.event.player; import java.net.InetAddress; - import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java index a23a06a4..63a96320 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.player; import java.net.InetAddress; import java.util.UUID; - import org.bukkit.Warning; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java index de940f6e..7a2a58ba 100644 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java @@ -2,7 +2,6 @@ package org.bukkit.event.server; import java.net.InetAddress; import java.util.Iterator; - import org.apache.commons.lang.Validate; import org.bukkit.UndefinedNullability; import org.bukkit.entity.Player; diff --git a/src/main/java/org/bukkit/event/world/PortalCreateEvent.java b/src/main/java/org/bukkit/event/world/PortalCreateEvent.java index 71427266..6e6ee66a 100644 --- a/src/main/java/org/bukkit/event/world/PortalCreateEvent.java +++ b/src/main/java/org/bukkit/event/world/PortalCreateEvent.java @@ -1,13 +1,12 @@ package org.bukkit.event.world; -import org.bukkit.block.Block; -import org.bukkit.World; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.Collection; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.jetbrains.annotations.NotNull; /** * Called when a portal is created diff --git a/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java b/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java index 4c49c761..9ce93d00 100644 --- a/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java +++ b/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.world; -import org.bukkit.World; import org.bukkit.Location; +import org.bukkit.World; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java b/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java index b05f570a..3e103efd 100644 --- a/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java +++ b/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java @@ -1,9 +1,9 @@ package org.bukkit.help; +import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.apache.commons.lang.StringUtils; import org.bukkit.command.ConsoleCommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/help/HelpMap.java b/src/main/java/org/bukkit/help/HelpMap.java index 7a8795f8..48997b5c 100644 --- a/src/main/java/org/bukkit/help/HelpMap.java +++ b/src/main/java/org/bukkit/help/HelpMap.java @@ -1,10 +1,9 @@ package org.bukkit.help; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.Collection; import java.util.List; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The HelpMap tracks all help topics registered in a Bukkit server. When the diff --git a/src/main/java/org/bukkit/help/HelpTopicComparator.java b/src/main/java/org/bukkit/help/HelpTopicComparator.java index dee86aef..2ec93333 100644 --- a/src/main/java/org/bukkit/help/HelpTopicComparator.java +++ b/src/main/java/org/bukkit/help/HelpTopicComparator.java @@ -1,8 +1,7 @@ package org.bukkit.help; -import org.jetbrains.annotations.NotNull; - import java.util.Comparator; +import org.jetbrains.annotations.NotNull; /** * Used to impose a custom total ordering on help topics. diff --git a/src/main/java/org/bukkit/help/IndexHelpTopic.java b/src/main/java/org/bukkit/help/IndexHelpTopic.java index 2914c9f8..150c4272 100644 --- a/src/main/java/org/bukkit/help/IndexHelpTopic.java +++ b/src/main/java/org/bukkit/help/IndexHelpTopic.java @@ -1,5 +1,6 @@ package org.bukkit.help; +import java.util.Collection; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -8,8 +9,6 @@ import org.bukkit.util.ChatPaginator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Collection; - /** * This help topic generates a list of other help topics. This class is useful * for adding your own index help topics. To enforce a particular order, use a diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java index f9a8aff0..5a38d8f1 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java @@ -3,7 +3,6 @@ package org.bukkit.inventory; import java.util.HashMap; import java.util.List; import java.util.ListIterator; - import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.HumanEntity; diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java index 8628e655..35066cea 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -3,7 +3,6 @@ package org.bukkit.inventory; import com.google.common.collect.ImmutableMap; import java.util.LinkedHashMap; import java.util.Map; - import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java index 668e9195..ab2b5958 100644 --- a/src/main/java/org/bukkit/inventory/Merchant.java +++ b/src/main/java/org/bukkit/inventory/Merchant.java @@ -1,7 +1,6 @@ package org.bukkit.inventory; import java.util.List; - import org.bukkit.entity.HumanEntity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/inventory/MerchantRecipe.java b/src/main/java/org/bukkit/inventory/MerchantRecipe.java index 149e63b3..1fb4a1c5 100644 --- a/src/main/java/org/bukkit/inventory/MerchantRecipe.java +++ b/src/main/java/org/bukkit/inventory/MerchantRecipe.java @@ -1,10 +1,9 @@ package org.bukkit.inventory; import com.google.common.base.Preconditions; -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.List; +import org.jetbrains.annotations.NotNull; /** * Represents a merchant's trade. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java index 77e6ccf5..83c72eda 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -4,9 +4,7 @@ import com.google.common.base.Preconditions; import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.apache.commons.lang.Validate; - import org.bukkit.Keyed; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java index a8d5f330..ef28e75d 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -5,10 +5,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; - import org.apache.commons.lang.Validate; import org.bukkit.Keyed; - import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.material.MaterialData; diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java index cb655ae8..9775dca7 100644 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java @@ -1,7 +1,6 @@ package org.bukkit.inventory.meta; import java.util.List; - import org.bukkit.Material; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java b/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java index c44a227e..19347a31 100644 --- a/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java @@ -1,7 +1,6 @@ package org.bukkit.inventory.meta; import java.util.Map; - import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java b/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java index f1fe2b07..bd7cd4b3 100644 --- a/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java @@ -1,7 +1,6 @@ package org.bukkit.inventory.meta; import java.util.List; - import org.bukkit.FireworkEffect; import org.bukkit.Material; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java index d1cd8dfd..c103599f 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -1,11 +1,10 @@ package org.bukkit.inventory.meta; +import com.google.common.collect.Multimap; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; - -import com.google.common.collect.Multimap; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.configuration.serialization.ConfigurationSerializable; diff --git a/src/main/java/org/bukkit/inventory/meta/PotionMeta.java b/src/main/java/org/bukkit/inventory/meta/PotionMeta.java index f26ec165..1056849d 100644 --- a/src/main/java/org/bukkit/inventory/meta/PotionMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/PotionMeta.java @@ -1,14 +1,13 @@ package org.bukkit.inventory.meta; +import java.util.List; import org.bukkit.Color; +import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import org.bukkit.potion.PotionData; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; - /** * Represents a potion or item that can have custom effects. */ diff --git a/src/main/java/org/bukkit/loot/LootTable.java b/src/main/java/org/bukkit/loot/LootTable.java index b391b55d..73aa119b 100644 --- a/src/main/java/org/bukkit/loot/LootTable.java +++ b/src/main/java/org/bukkit/loot/LootTable.java @@ -1,13 +1,12 @@ package org.bukkit.loot; +import java.util.Collection; +import java.util.Random; import org.bukkit.Keyed; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; -import java.util.Collection; -import java.util.Random; - /** * LootTables are technical files that represent what items should be in * naturally generated containers, what items should be dropped when killing a diff --git a/src/main/java/org/bukkit/map/MapCanvas.java b/src/main/java/org/bukkit/map/MapCanvas.java index f04b0108..cc171401 100644 --- a/src/main/java/org/bukkit/map/MapCanvas.java +++ b/src/main/java/org/bukkit/map/MapCanvas.java @@ -1,8 +1,7 @@ package org.bukkit.map; -import org.jetbrains.annotations.NotNull; - import java.awt.Image; +import org.jetbrains.annotations.NotNull; /** * Represents a canvas for drawing to a map. Each canvas is associated with a diff --git a/src/main/java/org/bukkit/map/MapCursorCollection.java b/src/main/java/org/bukkit/map/MapCursorCollection.java index be0683ba..4dba721a 100644 --- a/src/main/java/org/bukkit/map/MapCursorCollection.java +++ b/src/main/java/org/bukkit/map/MapCursorCollection.java @@ -1,10 +1,9 @@ package org.bukkit.map; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.ArrayList; import java.util.List; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Represents all the map cursors on a {@link MapCanvas}. Like MapCanvas, a diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java index afe727e2..8c3016d4 100644 --- a/src/main/java/org/bukkit/map/MapPalette.java +++ b/src/main/java/org/bukkit/map/MapPalette.java @@ -1,12 +1,11 @@ package org.bukkit.map; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.awt.Color; import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Represents the palette that map items use. diff --git a/src/main/java/org/bukkit/material/Button.java b/src/main/java/org/bukkit/material/Button.java index 62c499a1..f705977a 100644 --- a/src/main/java/org/bukkit/material/Button.java +++ b/src/main/java/org/bukkit/material/Button.java @@ -1,7 +1,7 @@ package org.bukkit.material; -import org.bukkit.block.BlockFace; import org.bukkit.Material; +import org.bukkit.block.BlockFace; /** * Represents a button diff --git a/src/main/java/org/bukkit/material/Ladder.java b/src/main/java/org/bukkit/material/Ladder.java index b4f9db90..54447bbb 100644 --- a/src/main/java/org/bukkit/material/Ladder.java +++ b/src/main/java/org/bukkit/material/Ladder.java @@ -1,7 +1,7 @@ package org.bukkit.material; -import org.bukkit.block.BlockFace; import org.bukkit.Material; +import org.bukkit.block.BlockFace; /** * Represents Ladder data diff --git a/src/main/java/org/bukkit/material/Lever.java b/src/main/java/org/bukkit/material/Lever.java index 5bc83533..8e68da3c 100644 --- a/src/main/java/org/bukkit/material/Lever.java +++ b/src/main/java/org/bukkit/material/Lever.java @@ -1,7 +1,7 @@ package org.bukkit.material; -import org.bukkit.block.BlockFace; import org.bukkit.Material; +import org.bukkit.block.BlockFace; /** * Represents a lever diff --git a/src/main/java/org/bukkit/material/MaterialData.java b/src/main/java/org/bukkit/material/MaterialData.java index 9f6a0ca6..a6483e08 100644 --- a/src/main/java/org/bukkit/material/MaterialData.java +++ b/src/main/java/org/bukkit/material/MaterialData.java @@ -1,8 +1,8 @@ package org.bukkit.material; -import org.bukkit.inventory.ItemStack; import org.bukkit.Material; import org.bukkit.block.data.BlockData; +import org.bukkit.inventory.ItemStack; /** * Handles specific metadata for certain items or blocks diff --git a/src/main/java/org/bukkit/material/MonsterEggs.java b/src/main/java/org/bukkit/material/MonsterEggs.java index 3e483fdf..a6205344 100644 --- a/src/main/java/org/bukkit/material/MonsterEggs.java +++ b/src/main/java/org/bukkit/material/MonsterEggs.java @@ -2,7 +2,6 @@ package org.bukkit.material; import java.util.ArrayList; import java.util.List; - import org.bukkit.Material; /** diff --git a/src/main/java/org/bukkit/material/Mushroom.java b/src/main/java/org/bukkit/material/Mushroom.java index cbc7d9bf..b291422c 100644 --- a/src/main/java/org/bukkit/material/Mushroom.java +++ b/src/main/java/org/bukkit/material/Mushroom.java @@ -2,7 +2,6 @@ package org.bukkit.material; import java.util.EnumSet; import java.util.Set; - import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.block.BlockFace; diff --git a/src/main/java/org/bukkit/material/Sign.java b/src/main/java/org/bukkit/material/Sign.java index d33b8ed2..51a6b825 100644 --- a/src/main/java/org/bukkit/material/Sign.java +++ b/src/main/java/org/bukkit/material/Sign.java @@ -1,7 +1,7 @@ package org.bukkit.material; -import org.bukkit.block.BlockFace; import org.bukkit.Material; +import org.bukkit.block.BlockFace; /** * MaterialData for signs diff --git a/src/main/java/org/bukkit/material/SmoothBrick.java b/src/main/java/org/bukkit/material/SmoothBrick.java index 3e4a8525..ebe328e6 100644 --- a/src/main/java/org/bukkit/material/SmoothBrick.java +++ b/src/main/java/org/bukkit/material/SmoothBrick.java @@ -2,7 +2,6 @@ package org.bukkit.material; import java.util.ArrayList; import java.util.List; - import org.bukkit.Material; /** diff --git a/src/main/java/org/bukkit/material/Step.java b/src/main/java/org/bukkit/material/Step.java index 8c255ba0..904fd534 100644 --- a/src/main/java/org/bukkit/material/Step.java +++ b/src/main/java/org/bukkit/material/Step.java @@ -2,7 +2,6 @@ package org.bukkit.material; import java.util.ArrayList; import java.util.List; - import org.bukkit.Material; /** diff --git a/src/main/java/org/bukkit/material/TexturedMaterial.java b/src/main/java/org/bukkit/material/TexturedMaterial.java index ea3433ac..e48f002f 100644 --- a/src/main/java/org/bukkit/material/TexturedMaterial.java +++ b/src/main/java/org/bukkit/material/TexturedMaterial.java @@ -1,7 +1,6 @@ package org.bukkit.material; import java.util.List; - import org.bukkit.Material; /** diff --git a/src/main/java/org/bukkit/material/Torch.java b/src/main/java/org/bukkit/material/Torch.java index 0c34004d..11778467 100644 --- a/src/main/java/org/bukkit/material/Torch.java +++ b/src/main/java/org/bukkit/material/Torch.java @@ -1,7 +1,7 @@ package org.bukkit.material; -import org.bukkit.block.BlockFace; import org.bukkit.Material; +import org.bukkit.block.BlockFace; /** * MaterialData for torches diff --git a/src/main/java/org/bukkit/material/Vine.java b/src/main/java/org/bukkit/material/Vine.java index abfc211c..e0c222f6 100644 --- a/src/main/java/org/bukkit/material/Vine.java +++ b/src/main/java/org/bukkit/material/Vine.java @@ -2,7 +2,6 @@ package org.bukkit.material; import java.util.Arrays; import java.util.EnumSet; - import org.bukkit.Material; import org.bukkit.block.BlockFace; diff --git a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java index f7e85d31..0ea9c6b2 100644 --- a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java +++ b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java @@ -1,11 +1,8 @@ package org.bukkit.material.types; -import java.util.Map; - -import org.bukkit.block.BlockFace; - import com.google.common.collect.Maps; -import org.jetbrains.annotations.NotNull; +import java.util.Map; +import org.bukkit.block.BlockFace; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/bukkit/metadata/LazyMetadataValue.java b/src/main/java/org/bukkit/metadata/LazyMetadataValue.java index eeb98c4c..39839929 100644 --- a/src/main/java/org/bukkit/metadata/LazyMetadataValue.java +++ b/src/main/java/org/bukkit/metadata/LazyMetadataValue.java @@ -2,7 +2,6 @@ package org.bukkit.metadata; import java.lang.ref.SoftReference; import java.util.concurrent.Callable; - import org.apache.commons.lang.Validate; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/metadata/MetadataStore.java b/src/main/java/org/bukkit/metadata/MetadataStore.java index 1ebba41f..29f86fa9 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStore.java +++ b/src/main/java/org/bukkit/metadata/MetadataStore.java @@ -1,10 +1,9 @@ package org.bukkit.metadata; +import java.util.List; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import java.util.List; - public interface MetadataStore { /** * Adds a metadata value to an object. diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java index 9dbc32d8..02795349 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -1,11 +1,16 @@ package org.bukkit.metadata; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; import org.apache.commons.lang.Validate; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import java.util.*; - public abstract class MetadataStoreBase { private Map> metadataMap = new HashMap>(); diff --git a/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java b/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java index f8829910..02b7e0dc 100644 --- a/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java +++ b/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java @@ -1,7 +1,6 @@ package org.bukkit.metadata; import java.lang.ref.WeakReference; - import org.apache.commons.lang.Validate; import org.bukkit.plugin.Plugin; import org.bukkit.util.NumberConversions; diff --git a/src/main/java/org/bukkit/metadata/Metadatable.java b/src/main/java/org/bukkit/metadata/Metadatable.java index 891e5160..b35f41a1 100644 --- a/src/main/java/org/bukkit/metadata/Metadatable.java +++ b/src/main/java/org/bukkit/metadata/Metadatable.java @@ -1,10 +1,9 @@ package org.bukkit.metadata; +import java.util.List; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import java.util.List; - /** * This interface is implemented by all objects that can provide metadata * about themselves. diff --git a/src/main/java/org/bukkit/permissions/Permission.java b/src/main/java/org/bukkit/permissions/Permission.java index 09eb28cc..91d45b96 100644 --- a/src/main/java/org/bukkit/permissions/Permission.java +++ b/src/main/java/org/bukkit/permissions/Permission.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; - import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; diff --git a/src/main/java/org/bukkit/permissions/PermissionDefault.java b/src/main/java/org/bukkit/permissions/PermissionDefault.java index 3380f2f2..449df7c7 100644 --- a/src/main/java/org/bukkit/permissions/PermissionDefault.java +++ b/src/main/java/org/bukkit/permissions/PermissionDefault.java @@ -1,10 +1,9 @@ package org.bukkit.permissions; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.HashMap; import java.util.Map; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Represents the possible default values for permissions diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java index 076ec041..febfec6e 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -3,7 +3,6 @@ package org.bukkit.plugin; import java.io.File; import java.io.InputStream; import java.util.logging.Logger; - import org.bukkit.Server; import org.bukkit.command.TabExecutor; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java index 6d3e9cc1..cb31a6d5 100644 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java @@ -1,5 +1,8 @@ package org.bukkit.plugin; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import java.io.InputStream; import java.io.Reader; import java.io.Writer; @@ -9,16 +12,15 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; - import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; import org.bukkit.command.TabCompleter; -import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; +import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.yaml.snakeyaml.Yaml; @@ -27,10 +29,6 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.Tag; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; - /** * This type is the runtime-container for the information in the plugin.yml. * All plugins must have a respective plugin.yml. For plugins written in java diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java index da7839aa..a88733f1 100644 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java @@ -4,7 +4,6 @@ import java.io.File; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; - import org.bukkit.event.Event; import org.bukkit.event.Listener; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/plugin/PluginLogger.java b/src/main/java/org/bukkit/plugin/PluginLogger.java index 533f0b6f..01823700 100644 --- a/src/main/java/org/bukkit/plugin/PluginLogger.java +++ b/src/main/java/org/bukkit/plugin/PluginLogger.java @@ -1,10 +1,9 @@ package org.bukkit.plugin; -import org.jetbrains.annotations.NotNull; - import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import org.jetbrains.annotations.NotNull; /** * The PluginLogger class is a modified {@link Logger} that prepends all diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java index a468467b..41e26451 100644 --- a/src/main/java/org/bukkit/plugin/PluginManager.java +++ b/src/main/java/org/bukkit/plugin/PluginManager.java @@ -2,7 +2,6 @@ package org.bukkit.plugin; import java.io.File; import java.util.Set; - import org.bukkit.event.Event; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/src/main/java/org/bukkit/plugin/RegisteredListener.java b/src/main/java/org/bukkit/plugin/RegisteredListener.java index a3b3a056..419aec56 100644 --- a/src/main/java/org/bukkit/plugin/RegisteredListener.java +++ b/src/main/java/org/bukkit/plugin/RegisteredListener.java @@ -1,6 +1,10 @@ package org.bukkit.plugin; -import org.bukkit.event.*; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.EventException; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/bukkit/plugin/ServicesManager.java b/src/main/java/org/bukkit/plugin/ServicesManager.java index 185b644b..9e2f0057 100644 --- a/src/main/java/org/bukkit/plugin/ServicesManager.java +++ b/src/main/java/org/bukkit/plugin/ServicesManager.java @@ -1,10 +1,9 @@ package org.bukkit.plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.Collection; import java.util.List; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Manages services and service providers. Services are an interface diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index 657d9692..0c4119ae 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -1,5 +1,6 @@ package org.bukkit.plugin; +import com.google.common.collect.ImmutableSet; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -18,7 +19,6 @@ import java.util.WeakHashMap; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.apache.commons.lang.Validate; import org.bukkit.Server; import org.bukkit.command.Command; @@ -32,8 +32,6 @@ import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.util.FileUtil; - -import com.google.common.collect.ImmutableSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/plugin/SimpleServicesManager.java b/src/main/java/org/bukkit/plugin/SimpleServicesManager.java index 6514d4ef..6f0a63fb 100644 --- a/src/main/java/org/bukkit/plugin/SimpleServicesManager.java +++ b/src/main/java/org/bukkit/plugin/SimpleServicesManager.java @@ -1,22 +1,20 @@ package org.bukkit.plugin; -import org.bukkit.Bukkit; -import org.bukkit.event.server.ServiceRegisterEvent; -import org.bukkit.event.server.ServiceUnregisterEvent; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import org.bukkit.Bukkit; +import org.bukkit.event.server.ServiceRegisterEvent; +import org.bukkit.event.server.ServiceUnregisterEvent; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A simple services manager. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java index 7c934899..22319005 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -1,5 +1,6 @@ package org.bukkit.plugin.java; +import com.google.common.base.Charsets; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -12,7 +13,6 @@ import java.net.URLConnection; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - import org.apache.commons.lang.Validate; import org.bukkit.Server; import org.bukkit.command.Command; @@ -25,8 +25,6 @@ import org.bukkit.plugin.PluginBase; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.PluginLogger; - -import com.google.common.base.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 7b6aefa4..43eee27d 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -18,7 +18,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Level; import java.util.regex.Pattern; - import org.apache.commons.lang.Validate; import org.bukkit.Server; import org.bukkit.Warning; diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java index 541d8ee6..0ffc1dfd 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -15,7 +15,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; - import org.apache.commons.lang.Validate; import org.bukkit.plugin.InvalidPluginException; import org.bukkit.plugin.PluginDescriptionFile; diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java index 63b7c70c..57d893a4 100644 --- a/src/main/java/org/bukkit/potion/Potion.java +++ b/src/main/java/org/bukkit/potion/Potion.java @@ -1,7 +1,6 @@ package org.bukkit.potion; import java.util.Collection; - import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java index 9f913e1e..91ddadbb 100644 --- a/src/main/java/org/bukkit/potion/PotionBrewer.java +++ b/src/main/java/org/bukkit/potion/PotionBrewer.java @@ -1,8 +1,7 @@ package org.bukkit.potion; -import org.jetbrains.annotations.NotNull; - import java.util.Collection; +import org.jetbrains.annotations.NotNull; /** * Represents a brewer that can create {@link PotionEffect}s. diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java index d57450c9..a0529fbe 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java @@ -1,15 +1,13 @@ package org.bukkit.potion; +import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.NoSuchElementException; - import org.apache.commons.lang.Validate; import org.bukkit.Color; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.entity.LivingEntity; - -import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java index 941eeab9..b5790aaa 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java @@ -3,7 +3,6 @@ package org.bukkit.potion; import java.util.Arrays; import java.util.HashMap; import java.util.Map; - import org.apache.commons.lang.Validate; import org.bukkit.Color; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java index acbd2368..ac140fc2 100644 --- a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java +++ b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java @@ -1,12 +1,11 @@ package org.bukkit.scheduler; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; - +import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.Future; -import java.util.List; import java.util.function.Consumer; +import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; public interface BukkitScheduler { diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java index fa35d7d5..aeab2425 100644 --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java @@ -1,7 +1,6 @@ package org.bukkit.scoreboard; import java.util.Set; - import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java b/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java index 255977c2..3c074079 100644 --- a/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java +++ b/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java @@ -1,8 +1,7 @@ package org.bukkit.scoreboard; -import org.jetbrains.annotations.NotNull; - import java.lang.ref.WeakReference; +import org.jetbrains.annotations.NotNull; /** * Manager of Scoreboards diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java index f75dbe84..dc20daae 100644 --- a/src/main/java/org/bukkit/scoreboard/Team.java +++ b/src/main/java/org/bukkit/scoreboard/Team.java @@ -1,7 +1,6 @@ package org.bukkit.scoreboard; import java.util.Set; - import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.potion.PotionEffectType; diff --git a/src/main/java/org/bukkit/util/BlockIterator.java b/src/main/java/org/bukkit/util/BlockIterator.java index 8e6887ae..bd82faf8 100644 --- a/src/main/java/org/bukkit/util/BlockIterator.java +++ b/src/main/java/org/bukkit/util/BlockIterator.java @@ -1,17 +1,15 @@ package org.bukkit.util; import static org.bukkit.util.NumberConversions.*; - -import org.bukkit.World; +import java.util.Iterator; +import java.util.NoSuchElementException; import org.bukkit.Location; +import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.LivingEntity; import org.jetbrains.annotations.NotNull; -import java.util.Iterator; -import java.util.NoSuchElementException; - /** * This class performs ray tracing and iterates along blocks on a line */ diff --git a/src/main/java/org/bukkit/util/ChatPaginator.java b/src/main/java/org/bukkit/util/ChatPaginator.java index 04358f17..1f510211 100644 --- a/src/main/java/org/bukkit/util/ChatPaginator.java +++ b/src/main/java/org/bukkit/util/ChatPaginator.java @@ -1,12 +1,11 @@ package org.bukkit.util; -import org.bukkit.ChatColor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import org.bukkit.ChatColor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The ChatPaginator takes a raw string of arbitrary length and breaks it down diff --git a/src/main/java/org/bukkit/util/FileUtil.java b/src/main/java/org/bukkit/util/FileUtil.java index af75ce2e..6e2352a3 100644 --- a/src/main/java/org/bukkit/util/FileUtil.java +++ b/src/main/java/org/bukkit/util/FileUtil.java @@ -1,12 +1,11 @@ package org.bukkit.util; -import org.jetbrains.annotations.NotNull; - -import java.nio.channels.FileChannel; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.channels.FileChannel; +import org.jetbrains.annotations.NotNull; /** * Class containing file utilities diff --git a/src/main/java/org/bukkit/util/RayTraceResult.java b/src/main/java/org/bukkit/util/RayTraceResult.java index 05463019..19c52a2a 100644 --- a/src/main/java/org/bukkit/util/RayTraceResult.java +++ b/src/main/java/org/bukkit/util/RayTraceResult.java @@ -1,7 +1,6 @@ package org.bukkit.util; import java.util.Objects; - import org.apache.commons.lang.Validate; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java b/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java index 13725531..d05aaaa4 100644 --- a/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java +++ b/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java @@ -3,7 +3,6 @@ package org.bukkit.util.io; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; - import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; diff --git a/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java b/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java index 84528502..0b073f26 100644 --- a/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java +++ b/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.io.Serializable; - import org.bukkit.configuration.serialization.ConfigurationSerializable; /** diff --git a/src/main/java/org/bukkit/util/io/Wrapper.java b/src/main/java/org/bukkit/util/io/Wrapper.java index 1961370e..c3496dc8 100644 --- a/src/main/java/org/bukkit/util/io/Wrapper.java +++ b/src/main/java/org/bukkit/util/io/Wrapper.java @@ -1,12 +1,10 @@ package org.bukkit.util.io; +import com.google.common.collect.ImmutableMap; import java.io.Serializable; import java.util.Map; - import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; - -import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; final class Wrapper & Serializable> implements Serializable { diff --git a/src/test/java/org/bukkit/ArtTest.java b/src/test/java/org/bukkit/ArtTest.java index 29fe34ad..2e9249a6 100644 --- a/src/test/java/org/bukkit/ArtTest.java +++ b/src/test/java/org/bukkit/ArtTest.java @@ -1,9 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.greaterThan; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class ArtTest { diff --git a/src/test/java/org/bukkit/BukkitMirrorTest.java b/src/test/java/org/bukkit/BukkitMirrorTest.java index 9d7b9eb6..6ea9c3ca 100644 --- a/src/test/java/org/bukkit/BukkitMirrorTest.java +++ b/src/test/java/org/bukkit/BukkitMirrorTest.java @@ -2,12 +2,12 @@ package org.bukkit; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - +import com.google.common.base.Function; +import com.google.common.collect.Lists; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.List; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -15,9 +15,6 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import com.google.common.base.Function; -import com.google.common.collect.Lists; - @RunWith(Parameterized.class) public class BukkitMirrorTest { diff --git a/src/test/java/org/bukkit/ChatColorTest.java b/src/test/java/org/bukkit/ChatColorTest.java index 523399a9..2a8c8c72 100644 --- a/src/test/java/org/bukkit/ChatColorTest.java +++ b/src/test/java/org/bukkit/ChatColorTest.java @@ -1,9 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class ChatColorTest { diff --git a/src/test/java/org/bukkit/ChatPaginatorTest.java b/src/test/java/org/bukkit/ChatPaginatorTest.java index a644b150..d38e64f0 100644 --- a/src/test/java/org/bukkit/ChatPaginatorTest.java +++ b/src/test/java/org/bukkit/ChatPaginatorTest.java @@ -1,12 +1,10 @@ package org.bukkit; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.bukkit.util.ChatPaginator; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; - public class ChatPaginatorTest { @Test public void testWordWrap1() { diff --git a/src/test/java/org/bukkit/CoalTypeTest.java b/src/test/java/org/bukkit/CoalTypeTest.java index 7eb11cea..b90f10c4 100644 --- a/src/test/java/org/bukkit/CoalTypeTest.java +++ b/src/test/java/org/bukkit/CoalTypeTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class CoalTypeTest { diff --git a/src/test/java/org/bukkit/ColorTest.java b/src/test/java/org/bukkit/ColorTest.java index 8d9557af..78fc76e9 100644 --- a/src/test/java/org/bukkit/ColorTest.java +++ b/src/test/java/org/bukkit/ColorTest.java @@ -2,7 +2,6 @@ package org.bukkit; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - import org.bukkit.configuration.file.YamlConfiguration; import org.junit.Test; diff --git a/src/test/java/org/bukkit/CropStateTest.java b/src/test/java/org/bukkit/CropStateTest.java index f792a1c4..5cd9d6d2 100644 --- a/src/test/java/org/bukkit/CropStateTest.java +++ b/src/test/java/org/bukkit/CropStateTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class CropStateTest { diff --git a/src/test/java/org/bukkit/DifficultyTest.java b/src/test/java/org/bukkit/DifficultyTest.java index 293e283a..d7fe8d39 100644 --- a/src/test/java/org/bukkit/DifficultyTest.java +++ b/src/test/java/org/bukkit/DifficultyTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class DifficultyTest { diff --git a/src/test/java/org/bukkit/DyeColorTest.java b/src/test/java/org/bukkit/DyeColorTest.java index c5aaecf5..38769c1d 100644 --- a/src/test/java/org/bukkit/DyeColorTest.java +++ b/src/test/java/org/bukkit/DyeColorTest.java @@ -1,11 +1,9 @@ package org.bukkit; -import static org.junit.Assert.*; import static org.hamcrest.Matchers.*; - +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; - import org.bukkit.material.Colorable; import org.bukkit.material.Dye; import org.bukkit.material.Wool; diff --git a/src/test/java/org/bukkit/EffectTest.java b/src/test/java/org/bukkit/EffectTest.java index 08aa71d3..54e621e8 100644 --- a/src/test/java/org/bukkit/EffectTest.java +++ b/src/test/java/org/bukkit/EffectTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class EffectTest { diff --git a/src/test/java/org/bukkit/EntityEffectTest.java b/src/test/java/org/bukkit/EntityEffectTest.java index 0c92d5cd..a50dac4f 100644 --- a/src/test/java/org/bukkit/EntityEffectTest.java +++ b/src/test/java/org/bukkit/EntityEffectTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class EntityEffectTest { diff --git a/src/test/java/org/bukkit/GameModeTest.java b/src/test/java/org/bukkit/GameModeTest.java index f671faef..1c53e8ed 100644 --- a/src/test/java/org/bukkit/GameModeTest.java +++ b/src/test/java/org/bukkit/GameModeTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class GameModeTest { diff --git a/src/test/java/org/bukkit/GrassSpeciesTest.java b/src/test/java/org/bukkit/GrassSpeciesTest.java index 9e332c71..39f1b899 100644 --- a/src/test/java/org/bukkit/GrassSpeciesTest.java +++ b/src/test/java/org/bukkit/GrassSpeciesTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class GrassSpeciesTest { diff --git a/src/test/java/org/bukkit/InstrumentTest.java b/src/test/java/org/bukkit/InstrumentTest.java index f1a05705..f6d261ae 100644 --- a/src/test/java/org/bukkit/InstrumentTest.java +++ b/src/test/java/org/bukkit/InstrumentTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class InstrumentTest { diff --git a/src/test/java/org/bukkit/LocationTest.java b/src/test/java/org/bukkit/LocationTest.java index c288e411..f3191ef2 100644 --- a/src/test/java/org/bukkit/LocationTest.java +++ b/src/test/java/org/bukkit/LocationTest.java @@ -2,10 +2,9 @@ package org.bukkit; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Random; - import org.bukkit.util.Vector; import org.junit.Test; import org.junit.runner.RunWith; @@ -13,8 +12,6 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import com.google.common.collect.ImmutableList; - @RunWith(Parameterized.class) public class LocationTest { private static final double delta = 1.0 / 1000000; diff --git a/src/test/java/org/bukkit/MaterialTest.java b/src/test/java/org/bukkit/MaterialTest.java index 66f4603a..6b0eaaad 100644 --- a/src/test/java/org/bukkit/MaterialTest.java +++ b/src/test/java/org/bukkit/MaterialTest.java @@ -2,7 +2,6 @@ package org.bukkit; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - import org.bukkit.material.MaterialData; import org.junit.Test; diff --git a/src/test/java/org/bukkit/NoteTest.java b/src/test/java/org/bukkit/NoteTest.java index 4759041a..3711db09 100644 --- a/src/test/java/org/bukkit/NoteTest.java +++ b/src/test/java/org/bukkit/NoteTest.java @@ -1,19 +1,10 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Collection; - -import org.junit.Test; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import com.google.common.collect.Lists; +import java.util.Collection; +import org.junit.Test; public class NoteTest { @Test diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java index 316f3e61..596384b1 100644 --- a/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java @@ -1,17 +1,15 @@ package org.bukkit; +import com.google.common.collect.ImmutableMap; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Map; import java.util.logging.Logger; - import org.bukkit.command.SimpleCommandMap; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; -import com.google.common.collect.ImmutableMap; - public final class TestServer implements InvocationHandler { private static interface MethodHandler { Object handle(TestServer server, Object[] args); diff --git a/src/test/java/org/bukkit/TreeSpeciesTest.java b/src/test/java/org/bukkit/TreeSpeciesTest.java index 4a997306..51e956cc 100644 --- a/src/test/java/org/bukkit/TreeSpeciesTest.java +++ b/src/test/java/org/bukkit/TreeSpeciesTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class TreeSpeciesTest { diff --git a/src/test/java/org/bukkit/WorldTypeTest.java b/src/test/java/org/bukkit/WorldTypeTest.java index d31c2052..3c5f7b8a 100644 --- a/src/test/java/org/bukkit/WorldTypeTest.java +++ b/src/test/java/org/bukkit/WorldTypeTest.java @@ -1,8 +1,7 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class WorldTypeTest { diff --git a/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java b/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java index 434e6e0b..aab5c89f 100644 --- a/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java +++ b/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java @@ -1,15 +1,15 @@ package org.bukkit.configuration; -import org.bukkit.Material; +import static org.junit.Assert.*; import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; import org.junit.Test; -import static org.junit.Assert.*; public abstract class ConfigurationSectionTest { public abstract ConfigurationSection getConfigurationSection(); diff --git a/src/test/java/org/bukkit/configuration/ConfigurationTest.java b/src/test/java/org/bukkit/configuration/ConfigurationTest.java index 8ffe873a..94eb854e 100644 --- a/src/test/java/org/bukkit/configuration/ConfigurationTest.java +++ b/src/test/java/org/bukkit/configuration/ConfigurationTest.java @@ -1,14 +1,14 @@ package org.bukkit.configuration; -import java.util.LinkedHashMap; +import static org.junit.Assert.*; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import org.bukkit.util.Vector; import org.junit.Test; -import static org.junit.Assert.*; public abstract class ConfigurationTest { public abstract Configuration getConfig(); diff --git a/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java b/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java index ce0c2e5a..a996753b 100644 --- a/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java +++ b/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java @@ -1,5 +1,6 @@ package org.bukkit.configuration.file; +import static org.junit.Assert.*; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -8,7 +9,6 @@ import org.bukkit.configuration.MemoryConfigurationTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import static org.junit.Assert.*; public abstract class FileConfigurationTest extends MemoryConfigurationTest { @Rule diff --git a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java index aa83af32..71ba36c0 100644 --- a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java +++ b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java @@ -1,7 +1,7 @@ package org.bukkit.configuration.file; -import org.junit.Test; import static org.junit.Assert.*; +import org.junit.Test; public class YamlConfigurationTest extends FileConfigurationTest { diff --git a/src/test/java/org/bukkit/conversations/ConversationContextTest.java b/src/test/java/org/bukkit/conversations/ConversationContextTest.java index dfc462b5..3780a47c 100644 --- a/src/test/java/org/bukkit/conversations/ConversationContextTest.java +++ b/src/test/java/org/bukkit/conversations/ConversationContextTest.java @@ -1,10 +1,9 @@ package org.bukkit.conversations; -import org.junit.Test; import static org.junit.Assert.*; - import java.util.HashMap; import java.util.Map; +import org.junit.Test; /** */ diff --git a/src/test/java/org/bukkit/conversations/ConversationTest.java b/src/test/java/org/bukkit/conversations/ConversationTest.java index 544f1f3c..139dcfd6 100644 --- a/src/test/java/org/bukkit/conversations/ConversationTest.java +++ b/src/test/java/org/bukkit/conversations/ConversationTest.java @@ -1,8 +1,8 @@ package org.bukkit.conversations; +import static org.junit.Assert.*; import org.bukkit.plugin.TestPlugin; import org.junit.Test; -import static org.junit.Assert.*; /** */ diff --git a/src/test/java/org/bukkit/conversations/FakeConversable.java b/src/test/java/org/bukkit/conversations/FakeConversable.java index ca981336..8d8f3480 100644 --- a/src/test/java/org/bukkit/conversations/FakeConversable.java +++ b/src/test/java/org/bukkit/conversations/FakeConversable.java @@ -1,13 +1,12 @@ package org.bukkit.conversations; +import java.util.Set; import org.bukkit.Server; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; -import java.util.Set; - /** */ public class FakeConversable implements Conversable { diff --git a/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java b/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java index 443b1218..0af8afd8 100644 --- a/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java +++ b/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java @@ -1,8 +1,7 @@ package org.bukkit.conversations; -import org.junit.Test; - import static org.junit.Assert.*; +import org.junit.Test; /** */ diff --git a/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java b/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java index 619bf30b..dd5fb243 100644 --- a/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java +++ b/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java @@ -1,14 +1,12 @@ package org.bukkit.event; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; +import com.google.common.collect.ImmutableList; import org.bukkit.event.player.PlayerChatTabCompleteEvent; import org.bukkit.plugin.messaging.TestPlayer; import org.junit.Test; -import com.google.common.collect.ImmutableList; - public class PlayerChatTabCompleteEventTest { @Test diff --git a/src/test/java/org/bukkit/materials/MaterialDataTest.java b/src/test/java/org/bukkit/materials/MaterialDataTest.java index cde2adc9..1bb00930 100644 --- a/src/test/java/org/bukkit/materials/MaterialDataTest.java +++ b/src/test/java/org/bukkit/materials/MaterialDataTest.java @@ -1,15 +1,14 @@ package org.bukkit.materials; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import org.bukkit.CropState; import org.bukkit.Material; import org.bukkit.NetherWartsState; import org.bukkit.TreeSpecies; import org.bukkit.block.BlockFace; -import org.bukkit.material.Crops; import org.bukkit.material.Comparator; +import org.bukkit.material.Crops; import org.bukkit.material.Diode; import org.bukkit.material.Door; import org.bukkit.material.Hopper; diff --git a/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java b/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java index 5583b274..e8cea99f 100644 --- a/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java +++ b/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java @@ -1,8 +1,6 @@ package org.bukkit.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - +import static org.junit.Assert.*; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.TestPlugin; import org.junit.Test; diff --git a/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java b/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java index a3172db7..2850a082 100644 --- a/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java +++ b/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java @@ -1,12 +1,10 @@ package org.bukkit.metadata; +import static org.junit.Assert.*; +import java.util.concurrent.Callable; import org.bukkit.plugin.TestPlugin; import org.junit.Test; -import java.util.concurrent.Callable; - -import static org.junit.Assert.*; - public class LazyMetadataValueTest { private LazyMetadataValue subject; private TestPlugin plugin = new TestPlugin("x"); diff --git a/src/test/java/org/bukkit/metadata/MetadataConversionTest.java b/src/test/java/org/bukkit/metadata/MetadataConversionTest.java index a595cc8d..a9c10a2f 100644 --- a/src/test/java/org/bukkit/metadata/MetadataConversionTest.java +++ b/src/test/java/org/bukkit/metadata/MetadataConversionTest.java @@ -15,12 +15,11 @@ package org.bukkit.metadata; +import static org.junit.Assert.*; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.TestPlugin; import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** */ public class MetadataConversionTest { diff --git a/src/test/java/org/bukkit/metadata/MetadataStoreTest.java b/src/test/java/org/bukkit/metadata/MetadataStoreTest.java index 86e4b328..ffb84558 100644 --- a/src/test/java/org/bukkit/metadata/MetadataStoreTest.java +++ b/src/test/java/org/bukkit/metadata/MetadataStoreTest.java @@ -1,12 +1,8 @@ package org.bukkit.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import static org.junit.Assert.*; import java.util.List; import java.util.concurrent.Callable; - import org.bukkit.plugin.Plugin; import org.bukkit.plugin.TestPlugin; import org.junit.Test; diff --git a/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java b/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java index 7d8a17fe..d3026a49 100644 --- a/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java +++ b/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java @@ -1,7 +1,6 @@ package org.bukkit.metadata; -import static org.junit.Assert.assertEquals; - +import static org.junit.Assert.*; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.TestPlugin; import org.junit.Test; diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java index 4fdb9b22..5e986de8 100644 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java @@ -2,12 +2,10 @@ package org.bukkit.plugin; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - import org.bukkit.TestServer; import org.bukkit.event.Event; import org.bukkit.event.TestEvent; import org.bukkit.permissions.Permission; - import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/bukkit/plugin/TestPlugin.java b/src/test/java/org/bukkit/plugin/TestPlugin.java index 452d3618..e6819e58 100644 --- a/src/test/java/org/bukkit/plugin/TestPlugin.java +++ b/src/test/java/org/bukkit/plugin/TestPlugin.java @@ -3,7 +3,6 @@ package org.bukkit.plugin; import java.io.File; import java.io.InputStream; import java.util.List; - import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java b/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java index b206b1f3..f2758cd3 100644 --- a/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java +++ b/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java @@ -2,7 +2,6 @@ package org.bukkit.plugin; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - import org.bukkit.event.Event; import org.bukkit.event.EventException; import org.bukkit.event.EventPriority; diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java index c15fa003..dce3d619 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -1,12 +1,12 @@ package org.bukkit.plugin.messaging; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; +import java.util.Collection; import org.bukkit.entity.Player; import org.bukkit.plugin.TestPlugin; -import java.util.Collection; -import org.junit.Test; import org.junit.Assert; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; +import org.junit.Test; public class StandardMessengerTest { public StandardMessenger getMessenger() { diff --git a/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java b/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java index 98860ec1..10370c3e 100644 --- a/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java +++ b/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java @@ -1,7 +1,7 @@ package org.bukkit.plugin.messaging; -import org.bukkit.entity.Player; import static org.junit.Assert.*; +import org.bukkit.entity.Player; public class TestMessageListener implements PluginMessageListener { private final String channel; diff --git a/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java b/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java index 46daf210..c4ed33fc 100644 --- a/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java +++ b/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java @@ -5,7 +5,6 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.HashMap; - import org.bukkit.entity.Player; diff --git a/src/test/java/org/bukkit/util/BoundingBoxTest.java b/src/test/java/org/bukkit/util/BoundingBoxTest.java index 1332aa26..2d50a9ed 100644 --- a/src/test/java/org/bukkit/util/BoundingBoxTest.java +++ b/src/test/java/org/bukkit/util/BoundingBoxTest.java @@ -2,9 +2,7 @@ package org.bukkit.util; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - import java.util.Map; - import org.bukkit.Location; import org.bukkit.block.BlockFace; import org.junit.Test; diff --git a/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java b/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java index b85a2b21..5dc9bf8c 100644 --- a/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java +++ b/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java @@ -2,17 +2,14 @@ package org.bukkit.util; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - +import com.google.common.collect.ImmutableList; import java.util.List; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import com.google.common.collect.ImmutableList; - @RunWith(Parameterized.class) public class StringUtilStartsWithTest { diff --git a/src/test/java/org/bukkit/util/StringUtilTest.java b/src/test/java/org/bukkit/util/StringUtilTest.java index 9c8444c1..326d0b2f 100644 --- a/src/test/java/org/bukkit/util/StringUtilTest.java +++ b/src/test/java/org/bukkit/util/StringUtilTest.java @@ -2,15 +2,12 @@ package org.bukkit.util; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.junit.Test; -import com.google.common.collect.ImmutableList; - public class StringUtilTest { @Test(expected=NullPointerException.class) diff --git a/src/test/java/org/bukkit/util/VectorTest.java b/src/test/java/org/bukkit/util/VectorTest.java index 6170f28c..05ddb876 100644 --- a/src/test/java/org/bukkit/util/VectorTest.java +++ b/src/test/java/org/bukkit/util/VectorTest.java @@ -1,8 +1,8 @@ package org.bukkit.util; +import static org.junit.Assert.*; import org.bukkit.block.BlockFace; import org.junit.Test; -import static org.junit.Assert.*; public class VectorTest { diff --git a/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java b/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java index d0af4a01..1586056e 100644 --- a/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java +++ b/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java @@ -2,14 +2,13 @@ package org.bukkit.util.io; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - +import com.google.common.collect.ImmutableList; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.List; - import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; @@ -23,8 +22,6 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; -import com.google.common.collect.ImmutableList; - @RunWith(Parameterized.class) public class BukkitObjectStreamTest {