Apply import ordering rules to CraftBukkit classes

By: md_5 <git@md-5.net>

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java

@@ -6,11 +6,11 @@ import net.minecraft.server.EntityVillagerAbstract;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.craftbukkit.inventory.CraftMerchant;
+import org.bukkit.entity.AbstractVillager;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.MerchantRecipe;
-import org.bukkit.entity.AbstractVillager;
 
 public class CraftAbstractVillager extends CraftAgeable implements AbstractVillager, InventoryHolder {
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityAgeable;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Ageable;
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java

@@ -1,7 +1,7 @@
 package org.bukkit.craftbukkit.entity;
 
-import java.util.UUID;
 import com.google.common.base.Preconditions;
+import java.util.UUID;
 import net.minecraft.server.EntityAnimal;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Animals;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java

@@ -1,11 +1,11 @@
 package org.bukkit.craftbukkit.entity;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import net.minecraft.server.EntityAreaEffectCloud;
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.MobEffect;
 import net.minecraft.server.MobEffectList;
-
 import org.apache.commons.lang.Validate;
 import org.bukkit.Color;
 import org.bukkit.Particle;
@@ -15,12 +15,10 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil;
 import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.projectiles.ProjectileSource;
-import org.bukkit.potion.PotionData;
-
-import com.google.common.collect.ImmutableList;
 
 public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud {
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java

@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
 import com.google.common.base.Preconditions;
 import net.minecraft.server.BlockPosition;
 import net.minecraft.server.EntityArrow;
-
 import org.apache.commons.lang.Validate;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityBlaze;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Blaze;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityCaveSpider;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.CaveSpider;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityChicken;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Chicken;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityCow;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Cow;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java

@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
 
 import com.google.common.base.Preconditions;
 import net.minecraft.server.EntityCreeper;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java

@@ -2,13 +2,10 @@ package org.bukkit.craftbukkit.entity;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
-
 import java.util.Set;
-
 import net.minecraft.server.DragonControllerPhase;
 import net.minecraft.server.EntityComplexPart;
 import net.minecraft.server.EntityEnderDragon;
-
 import org.bukkit.boss.BossBar;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.boss.CraftBossBar;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityEnderman;
-
 import net.minecraft.server.IBlockData;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java

@@ -6,9 +6,137 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-
-import net.minecraft.server.*;
-
+import net.minecraft.server.AxisAlignedBB;
+import net.minecraft.server.BlockPosition;
+import net.minecraft.server.DamageSource;
+import net.minecraft.server.Entity;
+import net.minecraft.server.EntityAmbient;
+import net.minecraft.server.EntityAnimal;
+import net.minecraft.server.EntityAreaEffectCloud;
+import net.minecraft.server.EntityArmorStand;
+import net.minecraft.server.EntityArrow;
+import net.minecraft.server.EntityBat;
+import net.minecraft.server.EntityBlaze;
+import net.minecraft.server.EntityBoat;
+import net.minecraft.server.EntityCat;
+import net.minecraft.server.EntityCaveSpider;
+import net.minecraft.server.EntityChicken;
+import net.minecraft.server.EntityCod;
+import net.minecraft.server.EntityComplexPart;
+import net.minecraft.server.EntityCow;
+import net.minecraft.server.EntityCreature;
+import net.minecraft.server.EntityCreeper;
+import net.minecraft.server.EntityDolphin;
+import net.minecraft.server.EntityDragonFireball;
+import net.minecraft.server.EntityDrowned;
+import net.minecraft.server.EntityEgg;
+import net.minecraft.server.EntityEnderCrystal;
+import net.minecraft.server.EntityEnderDragon;
+import net.minecraft.server.EntityEnderPearl;
+import net.minecraft.server.EntityEnderSignal;
+import net.minecraft.server.EntityEnderman;
+import net.minecraft.server.EntityEndermite;
+import net.minecraft.server.EntityEvoker;
+import net.minecraft.server.EntityEvokerFangs;
+import net.minecraft.server.EntityExperienceOrb;
+import net.minecraft.server.EntityFallingBlock;
+import net.minecraft.server.EntityFireball;
+import net.minecraft.server.EntityFireworks;
+import net.minecraft.server.EntityFish;
+import net.minecraft.server.EntityFishingHook;
+import net.minecraft.server.EntityFlying;
+import net.minecraft.server.EntityFox;
+import net.minecraft.server.EntityGhast;
+import net.minecraft.server.EntityGiantZombie;
+import net.minecraft.server.EntityGolem;
+import net.minecraft.server.EntityGuardian;
+import net.minecraft.server.EntityGuardianElder;
+import net.minecraft.server.EntityHanging;
+import net.minecraft.server.EntityHorse;
+import net.minecraft.server.EntityHorseAbstract;
+import net.minecraft.server.EntityHorseChestedAbstract;
+import net.minecraft.server.EntityHorseDonkey;
+import net.minecraft.server.EntityHorseMule;
+import net.minecraft.server.EntityHorseSkeleton;
+import net.minecraft.server.EntityHorseZombie;
+import net.minecraft.server.EntityHuman;
+import net.minecraft.server.EntityIllagerAbstract;
+import net.minecraft.server.EntityIllagerIllusioner;
+import net.minecraft.server.EntityIllagerWizard;
+import net.minecraft.server.EntityIronGolem;
+import net.minecraft.server.EntityItem;
+import net.minecraft.server.EntityItemFrame;
+import net.minecraft.server.EntityLLamaTrader;
+import net.minecraft.server.EntityLargeFireball;
+import net.minecraft.server.EntityLeash;
+import net.minecraft.server.EntityLightning;
+import net.minecraft.server.EntityLiving;
+import net.minecraft.server.EntityLlama;
+import net.minecraft.server.EntityLlamaSpit;
+import net.minecraft.server.EntityMagmaCube;
+import net.minecraft.server.EntityMinecartAbstract;
+import net.minecraft.server.EntityMinecartChest;
+import net.minecraft.server.EntityMinecartCommandBlock;
+import net.minecraft.server.EntityMinecartFurnace;
+import net.minecraft.server.EntityMinecartHopper;
+import net.minecraft.server.EntityMinecartMobSpawner;
+import net.minecraft.server.EntityMinecartRideable;
+import net.minecraft.server.EntityMinecartTNT;
+import net.minecraft.server.EntityMonster;
+import net.minecraft.server.EntityMushroomCow;
+import net.minecraft.server.EntityOcelot;
+import net.minecraft.server.EntityPainting;
+import net.minecraft.server.EntityPanda;
+import net.minecraft.server.EntityParrot;
+import net.minecraft.server.EntityPhantom;
+import net.minecraft.server.EntityPig;
+import net.minecraft.server.EntityPigZombie;
+import net.minecraft.server.EntityPillager;
+import net.minecraft.server.EntityPlayer;
+import net.minecraft.server.EntityPolarBear;
+import net.minecraft.server.EntityPotion;
+import net.minecraft.server.EntityProjectile;
+import net.minecraft.server.EntityPufferFish;
+import net.minecraft.server.EntityRabbit;
+import net.minecraft.server.EntityRavager;
+import net.minecraft.server.EntitySalmon;
+import net.minecraft.server.EntitySheep;
+import net.minecraft.server.EntityShulker;
+import net.minecraft.server.EntityShulkerBullet;
+import net.minecraft.server.EntitySilverfish;
+import net.minecraft.server.EntitySkeletonAbstract;
+import net.minecraft.server.EntitySkeletonStray;
+import net.minecraft.server.EntitySkeletonWither;
+import net.minecraft.server.EntitySlime;
+import net.minecraft.server.EntitySmallFireball;
+import net.minecraft.server.EntitySnowball;
+import net.minecraft.server.EntitySnowman;
+import net.minecraft.server.EntitySpectralArrow;
+import net.minecraft.server.EntitySpider;
+import net.minecraft.server.EntitySquid;
+import net.minecraft.server.EntityTNTPrimed;
+import net.minecraft.server.EntityTameableAnimal;
+import net.minecraft.server.EntityThrownExpBottle;
+import net.minecraft.server.EntityThrownTrident;
+import net.minecraft.server.EntityTippedArrow;
+import net.minecraft.server.EntityTropicalFish;
+import net.minecraft.server.EntityTurtle;
+import net.minecraft.server.EntityVex;
+import net.minecraft.server.EntityVillager;
+import net.minecraft.server.EntityVillagerAbstract;
+import net.minecraft.server.EntityVillagerTrader;
+import net.minecraft.server.EntityVindicator;
+import net.minecraft.server.EntityWaterAnimal;
+import net.minecraft.server.EntityWitch;
+import net.minecraft.server.EntityWither;
+import net.minecraft.server.EntityWitherSkull;
+import net.minecraft.server.EntityWolf;
+import net.minecraft.server.EntityZombie;
+import net.minecraft.server.EntityZombieHusk;
+import net.minecraft.server.EntityZombieVillager;
+import net.minecraft.server.EnumChatFormat;
+import net.minecraft.server.IChatBaseComponent;
+import net.minecraft.server.NBTTagCompound;
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.Server;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityFallingBlock;
-
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java

@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityFireball;
 import net.minecraft.server.MathHelper;
-
 import org.apache.commons.lang.Validate;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java

@@ -1,9 +1,9 @@
 package org.bukkit.craftbukkit.entity;
 
+import java.util.Random;
 import net.minecraft.server.EntityFireworks;
 import net.minecraft.server.ItemStack;
 import net.minecraft.server.Items;
-
 import org.bukkit.Material;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
@@ -11,8 +11,6 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Firework;
 import org.bukkit.inventory.meta.FireworkMeta;
 
-import java.util.Random;
-
 public class CraftFirework extends CraftEntity implements Firework {
 
     private final Random random = new Random();

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java

@@ -4,7 +4,6 @@ import net.minecraft.server.BlockPosition;
 import net.minecraft.server.EntityFishingHook;
 import net.minecraft.server.EntityHuman;
 import net.minecraft.server.MathHelper;
-
 import org.apache.commons.lang.Validate;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityGhast;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Ghast;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityGiantZombie;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Giant;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java

@@ -6,7 +6,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.Set;
-import net.minecraft.server.BlockAnvil;
 import net.minecraft.server.BlockBed;
 import net.minecraft.server.BlockEnchantmentTable;
 import net.minecraft.server.BlockPosition;
@@ -27,7 +26,6 @@ import net.minecraft.server.IChatBaseComponent;
 import net.minecraft.server.IInventory;
 import net.minecraft.server.IMerchant;
 import net.minecraft.server.IRecipe;
-import net.minecraft.server.ITileEntityContainer;
 import net.minecraft.server.ITileInventory;
 import net.minecraft.server.ItemCooldown;
 import net.minecraft.server.NBTTagCompound;
@@ -40,8 +38,6 @@ import net.minecraft.server.TileEntityBlastFurnace;
 import net.minecraft.server.TileEntityBrewingStand;
 import net.minecraft.server.TileEntityDispenser;
 import net.minecraft.server.TileEntityDropper;
-import net.minecraft.server.TileEntityEnchantTable;
-import net.minecraft.server.TileEntityFurnace;
 import net.minecraft.server.TileEntityFurnaceFurnace;
 import net.minecraft.server.TileEntityHopper;
 import net.minecraft.server.TileEntityLectern;
@@ -61,7 +57,6 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
 import org.bukkit.craftbukkit.inventory.CraftInventoryView;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.inventory.CraftMerchant;
 import org.bukkit.craftbukkit.inventory.CraftMerchantCustom;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.craftbukkit.util.CraftNamespacedKey;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java

@@ -2,12 +2,11 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.Entity;
 import net.minecraft.server.EntityItem;
-
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.CraftServer;
 
 public class CraftItem extends CraftEntity implements Item {
     private final EntityItem item;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java

@@ -6,9 +6,7 @@ import net.minecraft.server.EntityItemFrame;
 import net.minecraft.server.EnumDirection;
 import net.minecraft.server.ItemStack;
 import net.minecraft.server.WorldServer;
-
 import org.apache.commons.lang.Validate;
-
 import org.bukkit.Rotation;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityLeash;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LeashHitch;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

@@ -6,16 +6,15 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-
 import net.minecraft.server.DamageSource;
 import net.minecraft.server.EntityArmorStand;
 import net.minecraft.server.EntityArrow;
 import net.minecraft.server.EntityDragonFireball;
 import net.minecraft.server.EntityEgg;
 import net.minecraft.server.EntityEnderPearl;
+import net.minecraft.server.EntityFireball;
 import net.minecraft.server.EntityFishingHook;
 import net.minecraft.server.EntityHuman;
-import net.minecraft.server.EntityFireball;
 import net.minecraft.server.EntityInsentient;
 import net.minecraft.server.EntityLargeFireball;
 import net.minecraft.server.EntityLiving;
@@ -25,17 +24,16 @@ import net.minecraft.server.EntityProjectile;
 import net.minecraft.server.EntityShulkerBullet;
 import net.minecraft.server.EntitySmallFireball;
 import net.minecraft.server.EntitySnowball;
-import net.minecraft.server.EntityThrownExpBottle;
-import net.minecraft.server.EntityTippedArrow;
 import net.minecraft.server.EntitySpectralArrow;
+import net.minecraft.server.EntityThrownExpBottle;
 import net.minecraft.server.EntityThrownTrident;
+import net.minecraft.server.EntityTippedArrow;
 import net.minecraft.server.EntityTypes;
 import net.minecraft.server.EntityWither;
 import net.minecraft.server.EntityWitherSkull;
 import net.minecraft.server.GenericAttributes;
 import net.minecraft.server.MobEffect;
 import net.minecraft.server.MobEffectList;
-
 import org.apache.commons.lang.Validate;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Location;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMagmaCube;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.MagmaCube;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java

@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.Blocks;
 import net.minecraft.server.EntityMinecartAbstract;
-
 import net.minecraft.server.IBlockData;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecartChest;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java

@@ -1,9 +1,7 @@
 package org.bukkit.craftbukkit.entity;
 
 import java.util.Set;
-
 import net.minecraft.server.EntityMinecartCommandBlock;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecartFurnace;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.minecart.PoweredMinecart;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecartHopper;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecartMobSpawner;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.minecart.SpawnerMinecart;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecartAbstract;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.minecart.RideableMinecart;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecartTNT;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.minecart.ExplosiveMinecart;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMonster;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Monster;
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMushroomCow;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.MushroomCow;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java

@@ -4,7 +4,6 @@ import net.minecraft.server.EntityPainting;
 import net.minecraft.server.EntityTypes;
 import net.minecraft.server.Paintings;
 import net.minecraft.server.WorldServer;
-
 import org.bukkit.Art;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.CraftArt;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java

@@ -3,8 +3,8 @@ package org.bukkit.craftbukkit.entity;
 import com.google.common.base.Preconditions;
 import net.minecraft.server.EntityPanda;
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Panda;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Panda;
 
 public class CraftPanda extends CraftAnimals implements Panda {
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityPig;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Pig;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityPigZombie;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.PigZombie;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java

@@ -3,8 +3,8 @@ package org.bukkit.craftbukkit.entity;
 import net.minecraft.server.EntityPillager;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.entity.Pillager;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Pillager;
 import org.bukkit.inventory.Inventory;
 
 public class CraftPillager extends CraftIllager implements Pillager {

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

@@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.io.BaseEncoding;
 import com.mojang.authlib.GameProfile;
 import io.netty.buffer.Unpooled;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -23,7 +22,7 @@ import java.util.UUID;
 import java.util.WeakHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import javax.annotation.Nullable;
 import net.minecraft.server.AdvancementDataPlayer;
 import net.minecraft.server.AdvancementProgress;
 import net.minecraft.server.AttributeInstance;
@@ -64,32 +63,40 @@ import net.minecraft.server.TileEntitySign;
 import net.minecraft.server.Vec3D;
 import net.minecraft.server.WhiteListEntry;
 import net.minecraft.server.WorldServer;
-
-import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.NotImplementedException;
-import org.bukkit.*;
+import org.apache.commons.lang.Validate;
 import org.bukkit.Achievement;
 import org.bukkit.BanList;
-import org.bukkit.Statistic;
+import org.bukkit.Bukkit;
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Instrument;
+import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Note;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Particle;
+import org.bukkit.Sound;
+import org.bukkit.Statistic;
 import org.bukkit.Statistic.Type;
+import org.bukkit.WeatherType;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.configuration.serialization.DelegateDeserialization;
 import org.bukkit.conversations.Conversation;
 import org.bukkit.conversations.ConversationAbandonedEvent;
 import org.bukkit.conversations.ManuallyAbandonedConversationCanceller;
-import org.bukkit.craftbukkit.CraftParticle;
-import org.bukkit.craftbukkit.block.CraftSign;
-import org.bukkit.craftbukkit.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.conversations.ConversationTracker;
 import org.bukkit.craftbukkit.CraftEffect;
 import org.bukkit.craftbukkit.CraftOfflinePlayer;
+import org.bukkit.craftbukkit.CraftParticle;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftSound;
 import org.bukkit.craftbukkit.CraftStatistic;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.advancement.CraftAdvancement;
 import org.bukkit.craftbukkit.advancement.CraftAdvancementProgress;
+import org.bukkit.craftbukkit.block.CraftSign;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.conversations.ConversationTracker;
 import org.bukkit.craftbukkit.map.CraftMapView;
 import org.bukkit.craftbukkit.map.RenderData;
 import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
@@ -108,8 +115,6 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.messaging.StandardMessenger;
 import org.bukkit.scoreboard.Scoreboard;
 
-import javax.annotation.Nullable;
-
 @DelegateDeserialization(CraftOfflinePlayer.class)
 public class CraftPlayer extends CraftHumanEntity implements Player {
     private long firstPlayed = 0;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java

@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.EntityProjectile;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.ProjectileSource;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPufferFish.java

@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityPufferFish;
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.PufferFish;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.PufferFish;
 
 public class CraftPufferFish extends CraftFish implements PufferFish {
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java

@@ -1,12 +1,12 @@
 package org.bukkit.craftbukkit.entity;
 
-import net.minecraft.server.World;
 import net.minecraft.server.EntityRabbit;
 import net.minecraft.server.PathfinderGoalSelector;
+import net.minecraft.server.World;
 import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Rabbit;
-import org.bukkit.craftbukkit.CraftWorld;
 
 public class CraftRabbit extends CraftAnimals implements Rabbit {
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java

@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySalmon;
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Salmon;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Salmon;
 
 public class CraftSalmon extends CraftFish implements Salmon {
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySheep;
-
 import net.minecraft.server.EnumColor;
 import org.bukkit.DyeColor;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java

@@ -1,6 +1,5 @@
 package org.bukkit.craftbukkit.entity;
 
-import com.google.common.base.Preconditions;
 import net.minecraft.server.EntityShulker;
 import org.bukkit.DyeColor;
 import org.bukkit.craftbukkit.CraftServer;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySilverfish;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Silverfish;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySkeletonAbstract;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Skeleton;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySlime;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Slime;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySpider;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Spider;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySquid;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Squid;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java

@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.EntityTNTPrimed;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java

@@ -1,13 +1,12 @@
 package org.bukkit.craftbukkit.entity;
 
+import java.util.UUID;
 import net.minecraft.server.EntityTameableAnimal;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Tameable;
 
-import java.util.UUID;
-
 public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creature {
     public CraftTameableAnimal(CraftServer server, EntityTameableAnimal entity) {
         super(server, entity);

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java

@@ -1,10 +1,10 @@
 package org.bukkit.craftbukkit.entity;
 
+import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import net.minecraft.server.EntityPotion;
 import net.minecraft.server.MobEffect;
 import net.minecraft.server.PotionUtil;
-
 import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
 import org.bukkit.craftbukkit.CraftServer;
@@ -15,8 +15,6 @@ import org.bukkit.entity.ThrownPotion;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 
-import com.google.common.collect.ImmutableList;
-
 public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
     public CraftThrownPotion(CraftServer server, EntityPotion entity) {
         super(server, entity);

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java

@@ -1,7 +1,10 @@
 package org.bukkit.craftbukkit.entity;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
+import net.minecraft.server.EntityTippedArrow;
+import net.minecraft.server.MobEffect;
+import net.minecraft.server.MobEffectList;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Color;
 import org.bukkit.craftbukkit.CraftServer;
@@ -13,12 +16,6 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
 
-import com.google.common.collect.ImmutableList;
-
-import net.minecraft.server.EntityTippedArrow;
-import net.minecraft.server.MobEffect;
-import net.minecraft.server.MobEffectList;
-
 public class CraftTippedArrow extends CraftArrow implements TippedArrow {
 
     public CraftTippedArrow(CraftServer server, EntityTippedArrow entity) {

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityWaterAnimal;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.WaterMob;
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java

@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityWitch;
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Witch;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Witch;
 
 public class CraftWitch extends CraftRaider implements Witch {
     public CraftWitch(CraftServer server, EntityWitch entity) {

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java

@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
 import com.google.common.base.Preconditions;
 import net.minecraft.server.EntityZombie;
 import net.minecraft.server.EntityZombieVillager;
-
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Villager;