and here's some more patches

patches/unapplied/api/Add-ItemStack-Recipe-API-helper-methods.patch

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 28 Jan 2014 19:13:57 -0500
-Subject: [PATCH] Add ItemStack Recipe API helper methods
-
-Allows using ExactChoice Recipes with easier methodss
-
-diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
-         return this;
-     }
- 
-+    // Paper start
-+    @NotNull
-+    public ShapedRecipe setIngredient(char key, @NotNull ItemStack item) {
-+        return setIngredient(key, new RecipeChoice.ExactChoice(item));
-+    }
-+    // Paper end
-+
-     /**
-      * Get a copy of the ingredients map.
-      *
-diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
-         return this;
-     }
- 
-+    // Paper start
-+    @NotNull
-+    public ShapelessRecipe addIngredient(@NotNull ItemStack item) {
-+        return addIngredient(item.getAmount(), item);
-+    }
-+
-+    @NotNull
-+    public ShapelessRecipe addIngredient(int count, @NotNull ItemStack item) {
-+        Validate.isTrue(ingredients.size() + count <= 9, "Shapeless recipes cannot have more than 9 ingredients");
-+        while (count-- > 0) {
-+            ingredients.add(new RecipeChoice.ExactChoice(item));
-+        }
-+        return this;
-+    }
-+
-+    @NotNull
-+    public ShapelessRecipe removeIngredient(@NotNull ItemStack item) {
-+        return removeIngredient(1, item);
-+    }
-+
-+    @NotNull
-+    public ShapelessRecipe removeIngredient(int count, @NotNull ItemStack item) {
-+        Iterator<RecipeChoice> iterator = ingredients.iterator();
-+        while (count > 0 && iterator.hasNext()) {
-+            ItemStack stack = iterator.next().getItemStack();
-+            if (stack.equals(item)) {
-+                iterator.remove();
-+                count--;
-+            }
-+        }
-+        return this;
-+    }
-+    // Paper end
-+
-     /**
-      * Removes an ingredient from the list.
-      *

patches/unapplied/api/Add-WhitelistToggleEvent.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Wed, 13 Mar 2019 20:04:43 +0200
-Subject: [PATCH] Add WhitelistToggleEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
-@@ -0,0 +0,0 @@
-+package com.destroystokyo.paper.event.server;
-+
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * This event is fired when whitelist is toggled
-+ *
-+ * @author Mark Vainomaa
-+ */
-+public class WhitelistToggleEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    private boolean enabled;
-+
-+    public WhitelistToggleEvent(boolean enabled) {
-+        this.enabled = enabled;
-+    }
-+
-+    /**
-+     * Gets whether whitelist is going to be enabled or not
-+     *
-+     * @return Whether whitelist is going to be enabled or not
-+     */
-+    public boolean isEnabled() {
-+        return enabled;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/unapplied/api/Annotation-Test-changes.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 17 Mar 2019 23:04:30 +0000
-Subject: [PATCH] Annotation Test changes
-
-
-diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/test/java/org/bukkit/AnnotationTest.java
-+++ b/src/test/java/org/bukkit/AnnotationTest.java
-@@ -0,0 +0,0 @@ public class AnnotationTest {
-         "org/bukkit/util/io/Wrapper",
-         "org/bukkit/plugin/java/PluginClassLoader",
-         // Generic functional interface
--        "org/bukkit/util/Consumer"
-+        "org/bukkit/util/Consumer",
-+        // Paper start
-+        // Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull
-+        "co/aikar/timings/TimingHistory$2",
-+        "co/aikar/timings/TimingHistory$2$1",
-+        "co/aikar/timings/TimingHistory$2$1$1",
-+        "co/aikar/timings/TimingHistory$2$1$2",
-+        "co/aikar/timings/TimingHistory$3",
-+        "co/aikar/timings/TimingHistory$4",
-+        "co/aikar/timings/TimingHistoryEntry$1"
-+        // Paper end
-     };
- 
-     @Test