3in1: Update Upstream, Remove useless patches, Fix cramming/colliding bug

patches/api/0009-Implement-ItemFactory-getMonsterEgg.patch

@@ -0,0 +1,32 @@
+From 7ed511aafa501fbfcf86c18a0f2b04ec9ba859e2 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Fri, 5 Jul 2019 16:37:04 -0500
+Subject: [PATCH] Implement ItemFactory#getMonsterEgg
+
+---
+ src/main/java/org/bukkit/inventory/ItemFactory.java | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
+index 03ba22659..630c15d23 100644
+--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
++++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
+@@ -166,4 +166,15 @@ public interface ItemFactory {
+     @Nullable
+     String getI18NDisplayName(@Nullable ItemStack item);
+     // Paper end
++
++    // Purpur start
++    /**
++     * Get a monster egg ItemStack from an EntityType
++     *
++     * @param type EntityType
++     * @return ItemStack spawner egg
++     */
++    @Nullable
++    ItemStack getMonsterEgg(@Nullable org.bukkit.entity.EntityType type);
++    // Purpur end
+ }
+-- 
+2.20.1
+