Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d58803c2 SPIGOT-4597: Make BlockDropItemEvent use a list
d450fdf1 Add note about Maven repository usage to pom.xml

CraftBukkit Changes:
ed274c51 SPIGOT-4597: Make BlockDropItemEvent use a list
1734f378 SPIGOT-4598: Shift click on custom workbench inventory causes crash
a65b73ad Add note about Maven repository usage to pom.xml

Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/pom.xml b/pom.xml
-index 229fe559..412a6901 100644
+index a613cf963..f8f12595b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@

Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 041ae474..3e2c1cd5 100644
+index 84ba2076f..3ebc62871 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -33,7 +33,7 @@ index 041ae474..3e2c1cd5 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index 55debf5d..8d2999ac 100644
+index 55debf5d5..8d2999ace 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java
 +++ b/src/main/java/org/bukkit/plugin/Plugin.java
 @@ -0,0 +0,0 @@ public interface Plugin extends TabExecutor {

Spigot-API-Patches/POM-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 00d8019d9..148c322bc 100644
+index 23fde9622..a613cf963 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -53,7 +53,9 @@ index 00d8019d9..148c322bc 100644
 -    </distributionManagement>
 -
      <repositories>
-         <repository>
+         <!--
+             If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+@@ -0,0 +0,0 @@
              <id>spigotmc-public</id>
              <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
          </repository>

Spigot-API-Patches/Use-ASM-for-event-executors.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 412a6901..041ae474 100644
+index f8f12595b..84ba2076f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -29,7 +29,7 @@ index 412a6901..041ae474 100644
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 00000000..9ff99e3b
+index 000000000..9ff99e3b3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +0,0 @@
@@ -75,7 +75,7 @@ index 00000000..9ff99e3b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 00000000..f60f0100
+index 000000000..f60f01005
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +0,0 @@
@@ -120,7 +120,7 @@ index 00000000..f60f0100
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 00000000..140cf0ad
+index 000000000..140cf0ad3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +0,0 @@
@@ -170,7 +170,7 @@ index 00000000..140cf0ad
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 00000000..6941d9fb
+index 000000000..6941d9fbf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +0,0 @@
@@ -208,7 +208,7 @@ index 00000000..6941d9fb
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 00000000..1473ff8c
+index 000000000..1473ff8cd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +0,0 @@
@@ -277,7 +277,7 @@ index 00000000..1473ff8c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 00000000..62acbf82
+index 000000000..62acbf821
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +0,0 @@
@@ -315,7 +315,7 @@ index 00000000..62acbf82
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index 3b2c99ea..b45b6c1c 100644
+index 3b2c99ea7..b45b6c1c3 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.Event;
@@ -401,7 +401,7 @@ index 3b2c99ea..b45b6c1c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index bf972302..77207f14 100644
+index bf9723029..77207f147 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {