Update to Minecraft 1.14-pre5

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

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

@@ -1,19 +1,11 @@
 package org.bukkit.entity;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.Multimap;
-import java.util.List;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.Merchant;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents a villager NPC
  */
-public interface Villager extends Ageable, NPC, InventoryHolder, Merchant {
+public interface Villager extends AbstractVillager {
 
     /**
      * Gets the current profession of this villager.
@@ -30,243 +22,86 @@ public interface Villager extends Ageable, NPC, InventoryHolder, Merchant {
      */
     public void setProfession(@NotNull Profession profession);
 
-    /**
-     * Get the current {@link Career} for this Villager.
-     *
-     * @return the {@link Career}
-     */
-    @NotNull
-    public Career getCareer();
-
-    /**
-     * Set the new {@link Career} for this Villager.
-     * This method will reset the villager's trades to the new career.
-     *
-     * @param career the new career, or null to clear the career to a random one
-     * @throws IllegalArgumentException when the new {@link Career} cannot be
-     * used with this Villager's current {@link Profession}.
-     */
-    public void setCareer(@Nullable Career career);
-
-    /**
-     * Set the new {@link Career} for this Villager.
-     *
-     * @param career the new career, or null to clear the career to a random one
-     * @param resetTrades true to reset this Villager's trades to the new
-     * career's (if any)
-     * @throws IllegalArgumentException when the new {@link Career} cannot be
-     * used with this Villager's current {@link Profession}.
-     */
-    public void setCareer(@Nullable Career career, boolean resetTrades);
-
-    /**
-     * Gets this villager's inventory.
-     * <br>
-     * Note that this inventory is not the Merchant inventory, rather, it is the
-     * items that a villager might have collected (from harvesting crops, etc.)
-     *
-     * {@inheritDoc}
-     */
-    @NotNull
-    @Override
-    Inventory getInventory();
-
-    /**
-     * Gets this villager's riches, the number of emeralds this villager has
-     * been given.
-     *
-     * @return the villager's riches
-     */
-    int getRiches();
-
-    /**
-     * Sets this villager's riches.
-     *
-     * @see Villager#getRiches()
-     *
-     * @param riches the new riches
-     */
-    void setRiches(int riches);
-
     /**
      * Represents the various different Villager professions there may be.
      * Villagers have different trading options depending on their profession,
      */
     public enum Profession {
+        NONE,
         /**
-         * Normal. <b>Reserved for Zombies.</b>
-         * @deprecated Unused
-         */
-        @Deprecated
-        NORMAL(true),
-        /**
-         * Farmer profession. Wears a brown robe.
-         */
-        FARMER(false),
-        /**
-         * Librarian profession. Wears a white robe.
-         */
-        LIBRARIAN(false),
-        /**
-         * Priest profession. Wears a purple robe.
-         */
-        PRIEST(false),
-        /**
-         * Blacksmith profession. Wears a black apron.
-         */
-        BLACKSMITH(false),
-        /**
-         * Butcher profession. Wears a white apron.
-         */
-        BUTCHER(false),
-        /**
-         * Nitwit profession. Wears a green apron, cannot trade.
-         */
-        NITWIT(false),
-        /**
-         * Husk. <b>Reserved for Zombies</b>
-         * @deprecated Unused
-         */
-        @Deprecated
-        HUSK(true);
-        private final boolean zombie;
-
-        private Profession(boolean zombie) {
-            this.zombie = zombie;
-        }
-
-        /**
-         * Returns if this profession can only be used by zombies.
-         *
-         * @return zombie profession status
-         * @deprecated Unused
-         */
-        @Deprecated
-        public boolean isZombie() {
-            return zombie;
-        }
-
-        /**
-         * Get an immutable list of {@link Career} belonging to this Profession.
-         *
-         * @return an immutable list of careers for this profession, or an empty
-         * map if this Profession has no careers.
-         */
-        @NotNull
-        public List<Career> getCareers() {
-            return Career.getCareers(this);
-        }
-    }
-
-    /**
-     * The Career of this Villager.
-     * Each {@link Profession} has a set of careers it is applicable to. Each
-     * career dictates the trading options that are generated.
-     */
-    public enum Career {
-        /*
-        NOTE: The Career entries are order-specific. They should be maintained in the numerical order they are used in the CB implementation.
-        (e.g. Farmer careers are 1,2,3,4 so Career should reflect that numerical order in their ordinal status)
-         */
-        // Farmer careers
-        /**
-         * Farmers primarily trade for food-related items.
-         */
-        FARMER(Profession.FARMER),
-        /**
-         * Fisherman primarily trade for fish, as well as possibly selling
-         * string and/or coal.
-         */
-        FISHERMAN(Profession.FARMER),
-        /**
-         * Shepherds primarily trade for wool items, and shears.
-         */
-        SHEPHERD(Profession.FARMER),
-        /**
-         * Fletchers primarily trade for string, bows, and arrows.
-         */
-        FLETCHER(Profession.FARMER),
-        // Librarian careers
-        /**
-         * Librarians primarily trade for paper, books, and enchanted books.
-         */
-        LIBRARIAN(Profession.LIBRARIAN),
-        /**
-         * Cartographers primarily trade for explorer maps and some paper.
-         */
-        CARTOGRAPHER(Profession.LIBRARIAN),
-        // Priest careers
-        /**
-         * Clerics primarily trade for rotten flesh, gold ingot, redstone,
-         * lapis, ender pearl, glowstone, and bottle o' enchanting.
-         */
-        CLERIC(Profession.PRIEST),
-        // Blacksmith careers
-        /**
+         * Armorer profession. Wears a black apron.
          * Armorers primarily trade for iron armor, chainmail armor, and
          * sometimes diamond armor.
          */
-        ARMORER(Profession.BLACKSMITH),
-        /**
-         * Weapon smiths primarily trade for iron and diamond weapons, sometimes
-         * enchanted.
-         */
-        WEAPON_SMITH(Profession.BLACKSMITH),
-        /**
-         * Tool smiths primarily trade for iron and diamond tools.
-         */
-        TOOL_SMITH(Profession.BLACKSMITH),
-        // Butcher careers
+        ARMORER,
         /**
+         * Butcher profession. Wears a white apron.
          * Butchers primarily trade for raw and cooked food.
          */
-        BUTCHER(Profession.BUTCHER),
+        BUTCHER,
         /**
+         * Cartographer profession. Wears a white robe.
+         * Cartographers primarily trade for explorer maps and some paper.
+         */
+        CARTOGRAPHER,
+        /**
+         * Cleric profession. Wears a purple robe.
+         * Clerics primarily trade for rotten flesh, gold ingot, redstone,
+         * lapis, ender pearl, glowstone, and bottle o' enchanting.
+         */
+        CLERIC,
+        /**
+         * Farmer profession. Wears a brown robe.
+         * Farmers primarily trade for food-related items.
+         */
+        FARMER,
+        /**
+         * Fisherman profession. Wears a brown robe.
+         * Fisherman primarily trade for fish, as well as possibly selling
+         * string and/or coal.
+         */
+        FISHERMAN,
+        /**
+         * Fletcher profession. Wears a brown robe.
+         * Fletchers primarily trade for string, bows, and arrows.
+         */
+        FLETCHER,
+        /**
+         * Leatherworker profession. Wears a white apron.
          * Leatherworkers primarily trade for leather, and leather armor, as
          * well as saddles.
          */
-        LEATHERWORKER(Profession.BUTCHER),
-        // Nitwit
+        LEATHERWORKER,
         /**
+         * Librarian profession. Wears a white robe.
+         * Librarians primarily trade for paper, books, and enchanted books.
+         */
+        LIBRARIAN,
+        /**
+         * Mason profession.
+         */
+        MASON,
+        /**
+         * Nitwit profession. Wears a green apron, cannot trade.
          * Nitwit villagers do not do anything. They do not have any trades by
          * default.
          */
-        NITWIT(Profession.NITWIT);
-
-        private static final Multimap<Profession, Career> careerMap = LinkedListMultimap.create();
-        private final Profession profession;
-
-        private Career(/*@NotNull*/ Profession profession) {
-            this.profession = profession;
-        }
-
+        NITWIT,
         /**
-         * Get the {@link Profession} this {@link Career} belongs to.
-         *
-         * @return the {@link Profession}.
+         * Sheperd profession. Wears a brown robe.
+         * Shepherds primarily trade for wool items, and shears.
          */
-        @NotNull
-        public Profession getProfession() {
-            return profession;
-        }
-
+        SHEPHERD,
         /**
-         * Get an immutable list of {@link Career}s that can be used with a
-         * given {@link Profession}
-         * 
-         * @param profession the profession to get careers for
-         * @return an immutable list of Careers that can be used by a
-         * profession, or an empty map if the profession was not found
+         * Toolsmith profession. Wears a black apron.
+         * Tool smiths primarily trade for iron and diamond tools.
          */
-        @NotNull
-        public static List<Career> getCareers(@NotNull Profession profession) {
-            return careerMap.containsKey(profession) ? ImmutableList.copyOf(careerMap.get(profession)) : ImmutableList.<Career>of();
-        }
-
-        static {
-            for (Career career : Career.values()) {
-                careerMap.put(career.profession, career);
-            }
-        }
+        TOOLSMITH,
+        /**
+         * Weaponsmith profession. Wears a black apron.
+         * Weapon smiths primarily trade for iron and diamond weapons, sometimes
+         * enchanted.
+         */
+        WEAPONSMITH;
     }
 }