Update to Minecraft 1.11

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

paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java

@@ -0,0 +1,99 @@
+package org.bukkit.entity;
+
+import org.bukkit.inventory.InventoryHolder;
+
+/**
+ * Represents a Horse-like creature.
+ */
+public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameable {
+
+    /**
+     * Gets the horse's variant.
+     * <p>
+     * A horse's variant defines its physical appearance and capabilities.
+     * Whether a horse is a regular horse, donkey, mule, or other kind of horse
+     * is determined using the variant.
+     *
+     * @return a {@link Variant} representing the horse's variant
+     * @deprecated different variants are different classes
+     */
+    @Deprecated
+    public Horse.Variant getVariant();
+
+    /**
+     * @param variant
+     * @deprecated you are required to spawn a different entity
+     */
+    @Deprecated
+    public void setVariant(Horse.Variant variant);
+
+    /**
+     * Gets the domestication level of this horse.
+     * <p>
+     * A higher domestication level indicates that the horse is closer to
+     * becoming tame. As the domestication level gets closer to the max
+     * domestication level, the chance of the horse becoming tame increases.
+     *
+     * @return domestication level
+     */
+    public int getDomestication();
+
+    /**
+     * Sets the domestication level of this horse.
+     * <p>
+     * Setting the domestication level to a high value will increase the
+     * horse's chances of becoming tame.
+     * <p>
+     * Domestication level must be greater than zero and no greater than
+     * the max domestication level of the horse, determined with
+     * {@link #getMaxDomestication()}
+     *
+     * @param level domestication level
+     */
+    public void setDomestication(int level);
+
+    /**
+     * Gets the maximum domestication level of this horse.
+     * <p>
+     * The higher this level is, the longer it will likely take
+     * for the horse to be tamed.
+     *
+     * @return the max domestication level
+     */
+    public int getMaxDomestication();
+
+    /**
+     * Sets the maximum domestication level of this horse.
+     * <p>
+     * Setting a higher max domestication will increase the amount of
+     * domesticating (feeding, riding, etc.) necessary in order to tame it,
+     * while setting a lower max value will have the opposite effect.
+     * <p>
+     * Maximum domestication must be greater than zero.
+     *
+     * @param level the max domestication level
+     */
+    public void setMaxDomestication(int level);
+
+    /**
+     * Gets the jump strength of this horse.
+     * <p>
+     * Jump strength defines how high the horse can jump. A higher jump strength
+     * increases how high a jump will go.
+     *
+     * @return the horse's jump strength
+     */
+    public double getJumpStrength();
+
+    /**
+     * Sets the jump strength of this horse.
+     * <p>
+     * A higher jump strength increases how high a jump will go.
+     * Setting a jump strength to 0 will result in no jump.
+     * You cannot set a jump strength to a value below 0 or
+     * above 2.
+     *
+     * @param strength jump strength for this horse
+     */
+    public void setJumpStrength(double strength);
+}

paper-api/src/main/java/org/bukkit/entity/ChestedHorse.java

@@ -0,0 +1,22 @@
+package org.bukkit.entity;
+
+/**
+ * Represents Horse-like creatures which can carry an inventory.
+ */
+public interface ChestedHorse extends AbstractHorse {
+
+    /**
+     * Gets whether the horse has a chest equipped.
+     *
+     * @return true if the horse has chest storage
+     */
+    public boolean isCarryingChest();
+
+    /**
+     * Sets whether the horse has a chest equipped. Removing a chest will also
+     * clear the chest's inventory.
+     *
+     * @param chest true if the horse should have a chest
+     */
+    public void setCarryingChest(boolean chest);
+}

paper-api/src/main/java/org/bukkit/entity/Donkey.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Donkey - variant of {@link ChestedHorse}.
+ */
+public interface Donkey extends ChestedHorse { }

paper-api/src/main/java/org/bukkit/entity/ElderGuardian.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an ElderGuardian - variant of {@link Guardian}.
+ */
+public interface ElderGuardian extends Guardian { }

paper-api/src/main/java/org/bukkit/entity/EntityType.java

@@ -24,172 +24,225 @@ public enum EntityType {
      * Spawn with {@link World#dropItem(Location, ItemStack)} or {@link
      * World#dropItemNaturally(Location, ItemStack)}
      */
-    DROPPED_ITEM("Item", Item.class, 1, false),
+    DROPPED_ITEM("item", Item.class, 1, false),
     /**
      * An experience orb.
      */
-    EXPERIENCE_ORB("XPOrb", ExperienceOrb.class, 2),
+    EXPERIENCE_ORB("xp_orb", ExperienceOrb.class, 2),
+    /**
+     * @see AreaEffectCloud
+     */
+    AREA_EFFECT_CLOUD("area_effect_cloud", AreaEffectCloud.class, 3),
+    /**
+     * @see ElderGuardian
+     */
+    ELDER_GUARDIAN("elder_guardian", ElderGuardian.class, 4),
+    /**
+     * @see WitherSkull
+     */
+    WITHER_SKELETON("wither_skeleton", WitherSkeleton.class, 5),
+    /**
+     * @See Stray
+     */
+    STRAY("stray", Stray.class, 6),
+    /**
+     * A flying chicken egg.
+     */
+    EGG("egg", Egg.class, 7),
     /**
      * A leash attached to a fencepost.
      */
-    LEASH_HITCH("LeashKnot", LeashHitch.class, 8),
+    LEASH_HITCH("leash_knot", LeashHitch.class, 8),
     /**
      * A painting on a wall.
      */
-    PAINTING("Painting", Painting.class, 9),
+    PAINTING("painting", Painting.class, 9),
     /**
      * An arrow projectile; may get stuck in the ground.
      */
-    ARROW("Arrow", Arrow.class, 10),
+    ARROW("arrow", Arrow.class, 10),
     /**
      * A flying snowball.
      */
-    SNOWBALL("Snowball", Snowball.class, 11),
+    SNOWBALL("snowball", Snowball.class, 11),
     /**
      * A flying large fireball, as thrown by a Ghast for example.
      */
-    FIREBALL("Fireball", LargeFireball.class, 12),
+    FIREBALL("fireball", LargeFireball.class, 12),
     /**
      * A flying small fireball, such as thrown by a Blaze or player.
      */
-    SMALL_FIREBALL("SmallFireball", SmallFireball.class, 13),
+    SMALL_FIREBALL("small_fireball", SmallFireball.class, 13),
     /**
      * A flying ender pearl.
      */
-    ENDER_PEARL("ThrownEnderpearl", EnderPearl.class, 14),
+    ENDER_PEARL("ender_pearl", EnderPearl.class, 14),
     /**
      * An ender eye signal.
      */
-    ENDER_SIGNAL("EyeOfEnderSignal", EnderSignal.class, 15),
+    ENDER_SIGNAL("eye_of_ender_signal", EnderSignal.class, 15),
+    /**
+     * A flying splash potion.
+     */
+    SPLASH_POTION("potion", SplashPotion.class, 16, false),
     /**
      * A flying experience bottle.
      */
-    THROWN_EXP_BOTTLE("ThrownExpBottle", ThrownExpBottle.class, 17),
+    THROWN_EXP_BOTTLE("xp_bottle", ThrownExpBottle.class, 17),
     /**
      * An item frame on a wall.
      */
-    ITEM_FRAME("ItemFrame", ItemFrame.class, 18),
+    ITEM_FRAME("item_frame", ItemFrame.class, 18),
     /**
      * A flying wither skull projectile.
      */
-    WITHER_SKULL("WitherSkull", WitherSkull.class, 19),
+    WITHER_SKULL("wither_skull", WitherSkull.class, 19),
     /**
      * Primed TNT that is about to explode.
      */
-    PRIMED_TNT("PrimedTnt", TNTPrimed.class, 20),
+    PRIMED_TNT("tnt", TNTPrimed.class, 20),
     /**
      * A block that is going to or is about to fall.
      */
-    FALLING_BLOCK("FallingSand", FallingBlock.class, 21, false),
+    FALLING_BLOCK("falling_block", FallingBlock.class, 21, false),
     /**
      * Internal representation of a Firework once it has been launched.
      */
-    FIREWORK("FireworksRocketEntity", Firework.class, 22, false),
+    FIREWORK("fireworks_rocket", Firework.class, 22, false),
     /**
-     * Like {@link #ARROW} but tipped with a specific potion which is applied on contact.
+     * @see Husk
      */
-    TIPPED_ARROW("TippedArrow", TippedArrow.class, 23),
+    HUSK("husk", Husk.class, 23),
     /**
      * Like {@link #TIPPED_ARROW} but causes the {@link PotionEffectType#GLOWING} effect on all team members.
      */
-    SPECTRAL_ARROW("SpectralArrow", SpectralArrow.class, 24),
+    SPECTRAL_ARROW("spectral_arrow", SpectralArrow.class, 24),
     /**
      * Bullet fired by {@link #SHULKER}.
      */
-    SHULKER_BULLET("ShulkerBullet", ShulkerBullet.class, 25),
+    SHULKER_BULLET("shulker_bullet", ShulkerBullet.class, 25),
     /**
      * Like {@link #FIREBALL} but with added effects.
      */
-    DRAGON_FIREBALL("DragonFireball", DragonFireball.class, 26),
+    DRAGON_FIREBALL("dragon_fireball", DragonFireball.class, 26),
+    /**
+     * @see ZombieVillager
+     */
+    ZOMBIE_VILLAGER("zombie_villager", ZombieVillager.class, 27),
+    /**
+     * @see SkeletonHorse
+     */
+    SKELETON_HORSE("skeleton_horse", SkeletonHorse.class, 28),
+    /**
+     * @see ZombieHorse
+     */
+    ZOMBIE_HORSE("zombie_horse", ZombieHorse.class, 29),
     /**
      * Mechanical entity with an inventory for placing weapons / armor into.
      */
-    ARMOR_STAND("ArmorStand", ArmorStand.class, 30),
+    ARMOR_STAND("armor_stand", ArmorStand.class, 30),
+    /**
+     * @see Donkey
+     */
+    DONKEY("donkey", Donkey.class, 31),
+    /**
+     * @see Mule
+     */
+    MULE("mule", Mule.class, 32),
+    /**
+     * @see EvokerFangs
+     */
+    EVOKER_FANGS("evocation_fangs", EvokerFangs.class, 33),
+    /**
+     * @see Evoker
+     */
+    EVOKER("evocation_illager", Evoker.class, 34),
+    /**
+     * @see Vex
+     */
+    VEX("vex", Vex.class, 35),
+    /**
+     * @see Vindicator
+     */
+    VINDICATOR("vindication_illager", Vindicator.class, 36),
     /**
      * @see CommandMinecart
      */
-    MINECART_COMMAND("MinecartCommandBlock", CommandMinecart.class, 40),
+    MINECART_COMMAND("commandblock_minecart", CommandMinecart.class, 40),
     /**
      * A placed boat.
      */
-    BOAT("Boat", Boat.class, 41),
+    BOAT("boat", Boat.class, 41),
     /**
      * @see RideableMinecart
      */
-    MINECART("MinecartRideable", RideableMinecart.class, 42),
+    MINECART("minecart", RideableMinecart.class, 42),
     /**
      * @see StorageMinecart
      */
-    MINECART_CHEST("MinecartChest", StorageMinecart.class, 43),
+    MINECART_CHEST("chest_minecart", StorageMinecart.class, 43),
     /**
      * @see PoweredMinecart
      */
-    MINECART_FURNACE("MinecartFurnace", PoweredMinecart.class, 44),
+    MINECART_FURNACE("chest_minecart", PoweredMinecart.class, 44),
     /**
      * @see ExplosiveMinecart
      */
-    MINECART_TNT("MinecartTNT", ExplosiveMinecart.class, 45),
+    MINECART_TNT("tnt_minecart", ExplosiveMinecart.class, 45),
     /**
      * @see HopperMinecart
      */
-    MINECART_HOPPER("MinecartHopper", HopperMinecart.class, 46),
+    MINECART_HOPPER("hopper_minecart", HopperMinecart.class, 46),
     /**
      * @see SpawnerMinecart
      */
-    MINECART_MOB_SPAWNER("MinecartMobSpawner", SpawnerMinecart.class, 47),
-    CREEPER("Creeper", Creeper.class, 50),
-    SKELETON("Skeleton", Skeleton.class, 51),
-    SPIDER("Spider", Spider.class, 52),
-    GIANT("Giant", Giant.class, 53),
-    ZOMBIE("Zombie", Zombie.class, 54),
-    SLIME("Slime", Slime.class, 55),
-    GHAST("Ghast", Ghast.class, 56),
-    PIG_ZOMBIE("PigZombie", PigZombie.class, 57),
-    ENDERMAN("Enderman", Enderman.class, 58),
-    CAVE_SPIDER("CaveSpider", CaveSpider.class, 59),
-    SILVERFISH("Silverfish", Silverfish.class, 60),
-    BLAZE("Blaze", Blaze.class, 61),
-    MAGMA_CUBE("LavaSlime", MagmaCube.class, 62),
-    ENDER_DRAGON("EnderDragon", EnderDragon.class, 63),
-    WITHER("WitherBoss", Wither.class, 64),
-    BAT("Bat", Bat.class, 65),
-    WITCH("Witch", Witch.class, 66),
-    ENDERMITE("Endermite", Endermite.class, 67),
-    GUARDIAN("Guardian", Guardian.class, 68),
-    SHULKER("Shulker", Shulker.class, 69),
-    PIG("Pig", Pig.class, 90),
-    SHEEP("Sheep", Sheep.class, 91),
-    COW("Cow", Cow.class, 92),
-    CHICKEN("Chicken", Chicken.class, 93),
-    SQUID("Squid", Squid.class, 94),
-    WOLF("Wolf", Wolf.class, 95),
-    MUSHROOM_COW("MushroomCow", MushroomCow.class, 96),
-    SNOWMAN("SnowMan", Snowman.class, 97),
-    OCELOT("Ozelot", Ocelot.class, 98),
-    IRON_GOLEM("VillagerGolem", IronGolem.class, 99),
-    HORSE("EntityHorse", Horse.class, 100),
-    RABBIT("Rabbit", Rabbit.class, 101),
-    POLAR_BEAR("PolarBear", PolarBear.class, 102),
-    VILLAGER("Villager", Villager.class, 120),
-    ENDER_CRYSTAL("EnderCrystal", EnderCrystal.class, 200),
+    MINECART_MOB_SPAWNER("spawner_minecart", SpawnerMinecart.class, 47),
+    CREEPER("creeper", Creeper.class, 50),
+    SKELETON("skeleton", Skeleton.class, 51),
+    SPIDER("spider", Spider.class, 52),
+    GIANT("giant", Giant.class, 53),
+    ZOMBIE("zombie", Zombie.class, 54),
+    SLIME("slime", Slime.class, 55),
+    GHAST("ghast", Ghast.class, 56),
+    PIG_ZOMBIE("zombie_pigman", PigZombie.class, 57),
+    ENDERMAN("enderman", Enderman.class, 58),
+    CAVE_SPIDER("cave_spider", CaveSpider.class, 59),
+    SILVERFISH("silverfish", Silverfish.class, 60),
+    BLAZE("blaze", Blaze.class, 61),
+    MAGMA_CUBE("magma_cube", MagmaCube.class, 62),
+    ENDER_DRAGON("ender_dragon", EnderDragon.class, 63),
+    WITHER("wither", Wither.class, 64),
+    BAT("bat", Bat.class, 65),
+    WITCH("witch", Witch.class, 66),
+    ENDERMITE("endermite", Endermite.class, 67),
+    GUARDIAN("guardian", Guardian.class, 68),
+    SHULKER("shulker", Shulker.class, 69),
+    PIG("pig", Pig.class, 90),
+    SHEEP("sheep", Sheep.class, 91),
+    COW("cow", Cow.class, 92),
+    CHICKEN("chicken", Chicken.class, 93),
+    SQUID("squid", Squid.class, 94),
+    WOLF("wolf", Wolf.class, 95),
+    MUSHROOM_COW("mooshroom", MushroomCow.class, 96),
+    SNOWMAN("snowman", Snowman.class, 97),
+    OCELOT("ocelot", Ocelot.class, 98),
+    IRON_GOLEM("villager_golem", IronGolem.class, 99),
+    HORSE("horse", Horse.class, 100),
+    RABBIT("rabbit", Rabbit.class, 101),
+    POLAR_BEAR("polar_bear", PolarBear.class, 102),
+    LLAMA("llama", Llama.class, 103),
+    LLAMA_SPIT("llama_spit", LlamaSpit.class, 104),
+    VILLAGER("villager", Villager.class, 120),
+    ENDER_CRYSTAL("ender_crystal", EnderCrystal.class, 200),
     // These don't have an entity ID in nms.EntityTypes.
-    /**
-     * A flying splash potion
-     */
-    SPLASH_POTION(null, SplashPotion.class, -1, false),
     /**
      * A flying lingering potion
      */
     LINGERING_POTION(null, LingeringPotion.class, -1, false),
-    AREA_EFFECT_CLOUD(null, AreaEffectCloud.class, -1),
-    /**
-     * A flying chicken egg.
-     */
-    EGG(null, Egg.class, -1, false),
     /**
      * A fishing line and bobber.
      */
-    FISHING_HOOK(null, Fish.class, -1, false),
+    FISHING_HOOK(null, FishHook.class, -1, false),
     /**
      * A bolt of lightning.
      * <p>
@@ -199,6 +252,11 @@ public enum EntityType {
     WEATHER(null, Weather.class, -1, false),
     PLAYER(null, Player.class, -1, false),
     COMPLEX_PART(null, ComplexEntityPart.class, -1, false),
+    /**
+     * Like {@link #ARROW} but tipped with a specific potion which is applied on
+     * contact.
+     */
+    TIPPED_ARROW("TippedArrow", TippedArrow.class, -1),
     /**
      * An unknown entity without an Entity Class
      */

paper-api/src/main/java/org/bukkit/entity/Evoker.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an Evoker.
+ */
+public interface Evoker extends Monster { }

paper-api/src/main/java/org/bukkit/entity/EvokerFangs.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents Evoker Fangs.
+ */
+public interface EvokerFangs extends Entity { }

paper-api/src/main/java/org/bukkit/entity/FallingSand.java

@@ -1,9 +0,0 @@
-package org.bukkit.entity;
-
-/**
- * Represents a falling block.
- *
- * @deprecated See {@link FallingBlock}
- */
-@Deprecated
-public interface FallingSand extends FallingBlock {}

paper-api/src/main/java/org/bukkit/entity/Guardian.java

@@ -6,16 +6,14 @@ public interface Guardian extends Monster {
      * Check if the Guardian is an elder Guardian
      * 
      * @return true if the Guardian is an Elder Guardian, false if not
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @deprecated should check if instance of {@link ElderGuardian}.
      */
     @Deprecated
     public boolean isElder();
 
     /**
-     * Set the Guardian to an elder Guardian or not
-     *
-     * @param shouldBeElder True if this Guardian should be a elder Guardian, false if not
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @param shouldBeElder
+     * @deprecated Must spawn a new {@link ElderGuardian}.
      */
     @Deprecated
     public void setElder(boolean shouldBeElder);

paper-api/src/main/java/org/bukkit/entity/Horse.java

@@ -1,18 +1,16 @@
 package org.bukkit.entity;
 
 import org.bukkit.inventory.HorseInventory;
-import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a Horse.
- * @deprecated Entity subtypes will be separate entities in a future Minecraft release
  */
-@Deprecated
-public interface Horse extends Animals, Vehicle, InventoryHolder, Tameable {
+public interface Horse extends AbstractHorse {
 
     /**
-     * Represents the different types of horses that may exist.
+     * @deprecated different variants are differing classes
      */
+    @Deprecated
     public enum Variant {
         /**
          * A normal horse
@@ -34,6 +32,10 @@ public interface Horse extends Animals, Vehicle, InventoryHolder, Tameable {
          * A skeleton horse
          */
         SKELETON_HORSE,
+        /**
+         * Not really a horse :)
+         */
+        LLAMA
         ;
     }
 
@@ -99,37 +101,6 @@ public interface Horse extends Animals, Vehicle, InventoryHolder, Tameable {
         ;
     }
 
-    /**
-     * Gets the horse's variant.
-     * <p>
-     * A horse's variant defines its physical appearance and capabilities.
-     * Whether a horse is a regular horse, donkey, mule, or other kind of
-     * horse is determined using the variant.
-     *
-     * @return a {@link Variant} representing the horse's variant
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
-     */
-    @Deprecated
-    public Variant getVariant();
-
-    /**
-     * Sets the horse's variant.
-     * <p>
-     * A horse's variant defines its physical appearance and capabilities.
-     * Whether a horse is a regular horse, donkey, mule, or other kind of
-     * horse can be set using the variant.
-     * <p>
-     * Setting a horse's variant does not change its attributes such as
-     * its owner and its tamed status, but changing a mule or donkey
-     * with a chest to another variant which does not support a chest
-     * will remove the chest and its contents.
-     *
-     * @param variant a {@link Variant} for this horse
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
-     */
-    @Deprecated
-    public void setVariant(Variant variant);
-
     /**
      * Gets the horse's color.
      * <p>
@@ -173,90 +144,19 @@ public interface Horse extends Animals, Vehicle, InventoryHolder, Tameable {
     public void setStyle(Style style);
 
     /**
-     * Gets whether the horse has a chest equipped.
-     *
-     * @return true if the horse has chest storage
+     * @return
+     * @deprecated see {@link ChestedHorse}
      */
+    @Deprecated
     public boolean isCarryingChest();
 
     /**
-     * Sets whether the horse has a chest equipped.
-     * Removing a chest will also clear the chest's inventory.
-     *
-     * @param chest true if the horse should have a chest
+     * @param chest
+     * @deprecated see {@link ChestedHorse}
      */
+    @Deprecated
     public void setCarryingChest(boolean chest);
 
-    /**
-     * Gets the domestication level of this horse.
-     * <p>
-     * A higher domestication level indicates that the horse is closer to
-     * becoming tame. As the domestication level gets closer to the max
-     * domestication level, the chance of the horse becoming tame increases.
-     *
-     * @return domestication level
-     */
-    public int getDomestication();
-
-    /**
-     * Sets the domestication level of this horse.
-     * <p>
-     * Setting the domestication level to a high value will increase the
-     * horse's chances of becoming tame.
-     * <p>
-     * Domestication level must be greater than zero and no greater than
-     * the max domestication level of the horse, determined with
-     * {@link #getMaxDomestication()}
-     *
-     * @param level domestication level
-     */
-    public void setDomestication(int level);
-
-    /**
-     * Gets the maximum domestication level of this horse.
-     * <p>
-     * The higher this level is, the longer it will likely take
-     * for the horse to be tamed.
-     *
-     * @return the max domestication level
-     */
-    public int getMaxDomestication();
-
-    /**
-     * Sets the maximum domestication level of this horse.
-     * <p>
-     * Setting a higher max domestication will increase the amount of
-     * domesticating (feeding, riding, etc.) necessary in order to tame it,
-     * while setting a lower max value will have the opposite effect.
-     * <p>
-     * Maximum domestication must be greater than zero.
-     *
-     * @param level the max domestication level
-     */
-    public void setMaxDomestication(int level);
-
-    /**
-     * Gets the jump strength of this horse.
-     * <p>
-     * Jump strength defines how high the horse can jump. A higher jump strength
-     * increases how high a jump will go.
-     *
-     * @return the horse's jump strength
-     */
-    public double getJumpStrength();
-
-    /**
-     * Sets the jump strength of this horse.
-     * <p>
-     * A higher jump strength increases how high a jump will go.
-     * Setting a jump strength to 0 will result in no jump.
-     * You cannot set a jump strength to a value below 0 or
-     * above 2.
-     *
-     * @param strength jump strength for this horse
-     */
-    public void setJumpStrength(double strength);
-
     @Override
     public HorseInventory getInventory();
 }

paper-api/src/main/java/org/bukkit/entity/Husk.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Husk - variant of {@link Zombie}.
+ */
+public interface Husk extends Zombie { }

paper-api/src/main/java/org/bukkit/entity/Llama.java

@@ -0,0 +1,49 @@
+package org.bukkit.entity;
+
+import org.bukkit.inventory.LlamaInventory;
+
+/**
+ * Represents a Llama.
+ */
+public interface Llama extends ChestedHorse {
+
+    /**
+     * Represents the base color that the llama has.
+     */
+    public enum Color {
+
+        /**
+         * A cream-colored llama.
+         */
+        CREAMY,
+        /**
+         * A white llama.
+         */
+        WHITE,
+        /**
+         * A brown llama.
+         */
+        BROWN,
+        /**
+         * A gray llama.
+         */
+        GRAY;
+    }
+
+    /**
+     * Gets the llamas's color.
+     *
+     * @return a {@link Color} representing the llama's color
+     */
+    public Color getColor();
+
+    /**
+     * Sets the llama's color.
+     *
+     * @param color a {@link Color} for this llama
+     */
+    public void setColor(Color color);
+
+    @Override
+    public LlamaInventory getInventory();
+}

paper-api/src/main/java/org/bukkit/entity/LlamaSpit.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents Llama spit.
+ */
+public interface LlamaSpit extends Projectile { }

paper-api/src/main/java/org/bukkit/entity/Mule.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Mule - variant of {@link ChestedHorse}.
+ */
+public interface Mule extends ChestedHorse { }

paper-api/src/main/java/org/bukkit/entity/PoweredMinecart.java

@@ -1,9 +0,0 @@
-package org.bukkit.entity;
-
-/**
- * @deprecated This class has been moved into a sub package; {@link
- * org.bukkit.entity.minecart.PoweredMinecart} should be used instead.
- * @see org.bukkit.entity.minecart.PoweredMinecart
- */
-@Deprecated
-public interface PoweredMinecart extends org.bukkit.entity.minecart.PoweredMinecart {}

paper-api/src/main/java/org/bukkit/entity/Skeleton.java

@@ -9,23 +9,21 @@ public interface Skeleton extends Monster {
      * Gets the current type of this skeleton.
      *
      * @return Current type
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @deprecated should check what class instance this is
      */
     @Deprecated
     public SkeletonType getSkeletonType();
 
     /**
-     * Sets the new type of this skeleton.
-     *
-     * @param type New type
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @deprecated Must spawn a new subtype variant
      */
     @Deprecated
     public void setSkeletonType(SkeletonType type);
 
     /*
-     * Represents the various different Skeleton types.
+     * @deprecated classes are different types
      */
+    @Deprecated
     public enum SkeletonType {
 
         /**

paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a SkeletonHorse - variant of {@link AbstractHorse}.
+ */
+public interface SkeletonHorse extends AbstractHorse { }

paper-api/src/main/java/org/bukkit/entity/StorageMinecart.java

@@ -1,9 +0,0 @@
-package org.bukkit.entity;
-
-/**
- * @deprecated This class has been moved into a sub package; {@link
- * org.bukkit.entity.minecart.StorageMinecart} should be used instead.
- * @see org.bukkit.entity.minecart.StorageMinecart
- */
-@Deprecated
-public interface StorageMinecart extends org.bukkit.entity.minecart.StorageMinecart {}

paper-api/src/main/java/org/bukkit/entity/Stray.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Stray - variant of {@link Skeleton}.
+ */
+public interface Stray extends Skeleton { }

paper-api/src/main/java/org/bukkit/entity/Vex.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Vex.
+ */
+public interface Vex extends Monster { }

paper-api/src/main/java/org/bukkit/entity/Vindicator.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Vindicator.
+ */
+public interface Vindicator extends Monster { }

paper-api/src/main/java/org/bukkit/entity/WitherSkeleton.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a WitherSkeleton - variant of {@link Skeleton}.
+ */
+public interface WitherSkeleton extends Skeleton { }

paper-api/src/main/java/org/bukkit/entity/Zombie.java

@@ -23,35 +23,28 @@ public interface Zombie extends Monster {
      * Gets whether the zombie is a villager
      *
      * @return Whether the zombie is a villager
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @deprecated check if instanceof {@link ZombieVillager}.
      */
     @Deprecated
     public boolean isVillager();
 
     /**
-     * Sets whether the zombie is a villager
-     *
-     * @param flag Whether the zombie is a villager
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @param flag
+     * @deprecated must spawn {@link ZombieVillager}.
      */
     @Deprecated
     public void setVillager(boolean flag);
 
     /**
-     * Sets whether the zombie is a villager
-     *
-     * @param profession the profession of the villager or null to clear
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @param profession
+     * @see ZombieVillager#getVillagerProfession()
      */
     @Deprecated
     public void setVillagerProfession(Villager.Profession profession);
 
     /**
-     * Returns the villager profession of the zombie if the
-     * zombie is a villager
-     *
-     * @return the profession or null
-     * @deprecated Entity subtypes will be separate entities in a future Minecraft release
+     * @return 
+     * @see ZombieVillager#getVillagerProfession()
      */
     @Deprecated
     public Villager.Profession getVillagerProfession();

paper-api/src/main/java/org/bukkit/entity/ZombieHorse.java

@@ -0,0 +1,6 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a ZombieHorse - variant of {@link AbstractHorse}.
+ */
+public interface ZombieHorse extends AbstractHorse { }

paper-api/src/main/java/org/bukkit/entity/ZombieVillager.java

@@ -0,0 +1,19 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a {@link Zombie} which was once a {@link Villager}.
+ */
+public interface ZombieVillager extends Zombie {
+
+    /**
+     * Sets the villager profession of this zombie.
+     */
+    public void setVillagerProfession(Villager.Profession profession);
+
+    /**
+     * Returns the villager profession of this zombie.
+     *
+     * @return the profession or null
+     */
+    public Villager.Profession getVillagerProfession();
+}