move extra plugins patch up & more work

patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 4 Aug 2018 19:37:35 -0400
+Subject: [PATCH] Provide Chunk Coordinates as a Long API
+
+Allows you to easily access the chunks X/z as a long, and a method
+to look up by the long key too.
+
+diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
+index 5fd6030b2693d793951ed632ad4870e1a6f909aa..40ddeb7abd49eeece531a8e90b4508f3831cc3e9 100644
+--- a/src/main/java/org/bukkit/Chunk.java
++++ b/src/main/java/org/bukkit/Chunk.java
+@@ -28,6 +28,32 @@ public interface Chunk extends PersistentDataHolder {
+      */
+     int getZ();
+ 
++    // Paper start
++    /**
++     * @return The Chunks X and Z coordinates packed into a long
++     */
++    default long getChunkKey() {
++        return getChunkKey(getX(), getZ());
++    }
++
++    /**
++     * @param loc Location to get chunk key
++     * @return Location's chunk coordinates packed into a long
++     */
++    static long getChunkKey(@NotNull Location loc) {
++        return getChunkKey((int) Math.floor(loc.getX()) >> 4, (int) Math.floor(loc.getZ()) >> 4);
++    }
++
++    /**
++     * @param x X Coordinate
++     * @param z Z Coordinate
++     * @return Chunk coordinates packed into a long
++     */
++    static long getChunkKey(int x, int z) {
++        return (long) x & 0xffffffffL | ((long) z & 0xffffffffL) << 32;
++    }
++    // Paper end
++
+     /**
+      * Gets the world containing this chunk
+      *
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 91755d27b84abad516d891d4b0b7869124cb263e..d3d0e4448135f6c0440c15e0dd3fc15c2616263a 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -207,6 +207,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+     @NotNull
+     public Chunk getChunkAt(@NotNull Block block);
+ 
++    // Paper start
++    /**
++     * Gets the chunk at the specified chunk key, which is the X and Z packed into a long.
++     *
++     * See {@link Chunk#getChunkKey()} for easy access to the key, or you may calculate it as:
++     * long chunkKey = (long) chunkX &amp; 0xffffffffL | ((long) chunkZ &amp; 0xffffffffL) &gt;&gt; 32;
++     *
++     * @param chunkKey The Chunk Key to look up the chunk by
++     * @return The chunk at the specified key
++     */
++    @NotNull
++    public default Chunk getChunkAt(long chunkKey) {
++        return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
++    }
++    // Paper end
++
+     /**
+      * Checks if the specified {@link Chunk} is loaded
+      *