Remove Tuinity patches (you will be missed)

patches/api/0002-Purpur-config-files.patch

@@ -1,37 +1,35 @@
-From bb9d00d17399d52be12b31df4b9a29c10c196ea8 Mon Sep 17 00:00:00 2001
+From cde36d86144f76c8c6ff5e9d0f3eac749580fa51 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
 
 ---
- .../java/co/aikar/timings/TimingsExport.java  | 25 ++++++++++++++++---
- src/main/java/org/bukkit/Server.java          | 12 +++++++++
- 2 files changed, 33 insertions(+), 4 deletions(-)
+ .../java/co/aikar/timings/TimingsExport.java  | 23 ++++++++++++++++---
+ src/main/java/org/bukkit/Server.java          | 12 ++++++++++
+ 2 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index cb92d7b21..41dc89d99 100644
+index 93d5a3f97..47be89aea 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -204,10 +204,14 @@ class TimingsExport extends Thread {
+@@ -204,9 +204,13 @@ class TimingsExport extends Thread {
          // Information on the users Config
  
          parent.put("config", createObject(
 -            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
 -            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
--            pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
 +                // Purpur start
 +                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
 +                pair("bukkit.yml", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
 +                pair("spigot.yml", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
-+                pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)), // Tuinity - add config to timings report
++                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
 +                pair("purpur.yml", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
 +                // Purpur end
          ));
  
          new TimingsExport(listeners, parent, history).start();
-@@ -248,6 +252,19 @@ class TimingsExport extends Thread {
+@@ -247,6 +251,19 @@ class TimingsExport extends Thread {
          return timingsCost;
      }
  
@@ -52,12 +50,12 @@ index cb92d7b21..41dc89d99 100644
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 55ec8d2d0..d85c215e4 100644
+index 80f9abdca..eaaf9a4e9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1379,6 +1379,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1371,6 +1371,18 @@ public interface Server extends PluginMessageRecipient {
          }
-         // Tuinity end - add config to timings report
+         // Paper end
  
 +        // Purpur start
 +        @NotNull

patches/api/0002-Tuinity-API-Patches.patch

@@ -1,148 +0,0 @@
-From ee2e3f5670923c7e90dd298163822152ec56296e Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Fri, 14 Dec 2018 21:52:29 -0800
-Subject: [PATCH] Tuinity API Patches
-
----
- pom.xml                                       |  8 ++++--
- .../java/co/aikar/timings/TimingsExport.java  |  3 +-
- src/main/java/org/bukkit/Server.java          |  8 ++++++
- src/main/java/org/bukkit/World.java           | 28 +++++++++++++++++++
- src/main/java/org/bukkit/entity/Player.java   | 23 +++++++++++++++
- 5 files changed, 67 insertions(+), 3 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 58a1f7d07..19d003fa8 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -18,8 +18,8 @@
- 
-     <properties>
-         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
--        <maven.compiler.source>1.8</maven.compiler.source>
--        <maven.compiler.target>1.8</maven.compiler.target>
-+        <maven.compiler.source>11</maven.compiler.source>
-+        <maven.compiler.target>11</maven.compiler.target>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     </properties>
- 
-@@ -154,6 +154,10 @@
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.8.1</version>
-+                <!-- Tuinity - https://issues.apache.org/jira/browse/MCOMPILER-346 -->
-+                <configuration>
-+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-+                </configuration>
-                 <dependencies>
-                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
-                     <dependency>
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f97..cb92d7b21 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
-         parent.put("config", createObject(
-             pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
-+            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
-+            pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
-         ));
- 
-         new TimingsExport(listeners, parent, history).start();
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80f9abdca..55ec8d2d0 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1371,6 +1371,14 @@ public interface Server extends PluginMessageRecipient {
-         }
-         // Paper end
- 
-+        // Tuinity start - add config to timings report
-+        @NotNull
-+        public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig()
-+        {
-+            throw new UnsupportedOperationException("Not supported yet.");
-+        }
-+        // Tuinity end - add config to timings report
-+
-         /**
-          * Sends the component to the player
-          *
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index db18f70ec..be92b1a3e 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -3166,6 +3166,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
-     int getViewDistance();
-     // Spigot end
- 
-+    // Tuinity start - view distance api
-+    /**
-+     * Sets the view distance for this world.
-+     * @param viewDistance view distance in [2, 32]
-+     */
-+    void setViewDistance(int viewDistance);
-+
-+    /**
-+     * Returns the no-tick view distance for this world.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @return The no-tick view distance for this world.
-+     */
-+    int getNoTickViewDistance();
-+
-+    /**
-+     * Sets the no-tick view distance for this world.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @param viewDistance view distance in [2, 32]
-+     */
-+    void setNoTickViewDistance(int viewDistance);
-+    // Tuinity end - view distance api
-+
-     // Spigot start
-     public class Spigot {
- 
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ea4f32..5367975ac 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     void resetCooldown();
-     // Paper end
- 
-+    // Tuinity start
-+    /**
-+     * Returns the no-tick view distance for this player.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @return The no-tick view distance for this player.
-+     */
-+    int getNoTickViewDistance();
-+
-+    /**
-+     * Sets the no-tick view distance for this player. Setting to a value of -1 will default to the world no-tick
-+     * view distance.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @param viewDistance view distance in [2, 32] or -1
-+     */
-+    void setNoTickViewDistance(int viewDistance);
-+    // Tuinity end
-+
-     // Spigot start
-     public class Spigot extends Entity.Spigot {
- 
--- 
-2.24.0
-

patches/api/0003-Host-our-own-timings.patch

@@ -1,4 +1,4 @@
-From c9e3dae6773177302297c61c55d0bbbe9f1c6f9c Mon Sep 17 00:00:00 2001
+From efced177921197f8480a7c4e9fba2484fdd41604 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:38:26 -0600
 Subject: [PATCH] Host our own timings
@@ -8,10 +8,10 @@ Subject: [PATCH] Host our own timings
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index b5111928d..63d21ddbc 100644
+index 47be89aea..1b5767b29 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -301,7 +301,7 @@ class TimingsExport extends Thread {
+@@ -300,7 +300,7 @@ class TimingsExport extends Thread {
          String response = null;
          String timingsURL = null;
          try {

patches/api/0004-Ridables.patch

@@ -1,4 +1,4 @@
-From d8696f7eef73586001263719c3c51525c2760d13 Mon Sep 17 00:00:00 2001
+From ccac8f08b0f9555958a6bf423cbe7cbd90756fe1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables

patches/api/0005-Remove-pointless-annotations-and-deprecations.patch

@@ -1,4 +1,4 @@
-From 05c1703c9edc678587fbb6a84e91edca73ec9747 Mon Sep 17 00:00:00 2001
+From 89b558740be091a89cafc861442b18d114fd2626 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 31 Dec 2019 23:00:07 -0600
 Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,7 +14,7 @@ Subject: [PATCH] Remove pointless annotations and deprecations
  7 files changed, 9 insertions(+), 18 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b9973406..3a60094a 100644
+index b99734068..3a60094a1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -851,13 +851,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index b9973406..3a60094a 100644
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 739182ef..0f7e84fb 100644
+index eaaf9a4e9..e8b2fe0c2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -712,13 +712,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 739182ef..0f7e84fb 100644
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
 diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
-index 45cb8da1..383b43e1 100644
+index 45cb8da12..383b43e1b 100644
 --- a/src/main/java/org/bukkit/command/CommandExecutor.java
 +++ b/src/main/java/org/bukkit/command/CommandExecutor.java
 @@ -19,5 +19,5 @@ public interface CommandExecutor {
@@ -61,7 +61,7 @@ index 45cb8da1..383b43e1 100644
 +    public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
-index e9cf71f5..34d3462c 100644
+index e9cf71f5c..34d3462c7 100644
 --- a/src/main/java/org/bukkit/command/TabCompleter.java
 +++ b/src/main/java/org/bukkit/command/TabCompleter.java
 @@ -23,5 +23,5 @@ public interface TabCompleter {
@@ -72,7 +72,7 @@ index e9cf71f5..34d3462c 100644
 +    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index d7d6a3e8..cf8d7749 100644
+index d7d6a3e83..cf8d77491 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -100,7 +100,7 @@ index d7d6a3e8..cf8d7749 100644
          ItemMeta meta = getItemMeta();
          return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 04fa3991..24d65491 100644
+index 04fa3991f..24d65491c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -122,7 +122,7 @@ index 04fa3991..24d65491 100644
      }
  
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index a48be38b..951b81e7 100644
+index a48be38b1..951b81e79 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -41,6 +41,11 @@ public class AnnotationTest {

patches/api/0006-Allow-inventory-resizing.patch

@@ -1,4 +1,4 @@
-From 3f163f0caeb3cbf242e1fc7a7d52905a36a52d72 Mon Sep 17 00:00:00 2001
+From fd0bef0590aaaa10deefcda30d4e6b7a6bde21fc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 06:50:55 -0500
 Subject: [PATCH] Allow inventory resizing

patches/api/0007-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From e9286b665d474b7569018a78f391cbea9f900994 Mon Sep 17 00:00:00 2001
+From 464c7f06726b30fef190cdffe4953f2c12a9630d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -87,10 +87,10 @@ index 000000000..0c8b3e5e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5367975ac..c7cba5046 100644
+index 877ea4f32..b9fe2a0fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2090,4 +2090,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0008-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From fb1b62df2e5107f2a3f0a8d3a99a48a6c711ed62 Mon Sep 17 00:00:00 2001
+From 07869e37e8dc3b12e9e0fa2ce5ee0a4e23e250a6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:00 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent

patches/api/0009-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From 8b372c69f358a53c1bb457358903de56bb174013 Mon Sep 17 00:00:00 2001
+From 9d3f33b35ebc4ff79bff98b87904592581b3ebce Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:08 -0600
 Subject: [PATCH] Add tick times API
@@ -39,10 +39,10 @@ index 3a60094a1..6935cf272 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 69a100a6b..e7166bcd4 100644
+index e8b2fe0c2..9d306c084 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1473,4 +1473,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1465,4 +1465,21 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end

patches/api/0010-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From f2745516a51e9bf2765e629bdc036c3af1b5ebb9 Mon Sep 17 00:00:00 2001
+From 59d3509aaea5bc9b3b15b30602af394a6ef741ec Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -29,10 +29,10 @@ index 6935cf272..abf7caf0b 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e7166bcd4..f6119933d 100644
+index 9d306c084..89e9395e8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1475,6 +1475,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1467,6 +1467,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start

patches/api/0011-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 778fce635a6e952ffde90f502fe471cc363913b3 Mon Sep 17 00:00:00 2001
+From 9ca629db681febcd959f6306016d7f41f0b3346c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:19 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance

patches/api/0012-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From e4c1a33b0b4c1f5fab1b728f52585dd283ab9ddc Mon Sep 17 00:00:00 2001
+From d1701e7bd21359dcd6f6c376ca1d4040cf762c8b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 00:08:28 -0500
 Subject: [PATCH] Add ExecuteCommandEvent

patches/api/0013-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 903689d819caca268cb23ae68aa7d452e89cf5e7 Mon Sep 17 00:00:00 2001
+From 24cdbc2b213aabcec55bb2ced1986b8534972b26 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:09:58 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent

patches/api/0014-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 9f6e4fe83868940e79f893f78c6e8ee5807ef9e9 Mon Sep 17 00:00:00 2001
+From 0fa0f29ff2114ab2c3d770bfb54ef050bb727e87 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -29,10 +29,10 @@ index abf7caf0b..c9fc59a2e 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f6119933d..c99ce2d89 100644
+index 89e9395e8..6f2e580ce 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1482,6 +1482,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1474,6 +1474,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();
  

patches/api/0015-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From e073e5ae742d57f67c3d9a075319d00835c1542a Mon Sep 17 00:00:00 2001
+From 027ad3f60ab42dbe2eb1078bcdb76576d911a1df Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:21 -0500
 Subject: [PATCH] Advancement API Additions

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

@@ -1,4 +1,4 @@
-From 5ecbac582fc2724107823f64b9adf673bdf3d84b Mon Sep 17 00:00:00 2001
+From e340688cba311b2693ce5aa181c4becdeeb6a7f7 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

patches/api/0017-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 873158f78a95d7943a75f989a9f35dd8ec9831df Mon Sep 17 00:00:00 2001
+From 420c5de1e9bf05bccf77e124fd21f2cb5aa97bc7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:15 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent

patches/api/0018-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 78387652cf81f45c5f036d405da4daf466b1c63e Mon Sep 17 00:00:00 2001
+From d711dbe787c21f7e233d3182eb0a83ebfa5aadad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:49 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent

patches/api/0019-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From fbb8402a553e112483f966d23b5066dc844dcfb3 Mon Sep 17 00:00:00 2001
+From 3124545ae453199123c269ba33f19659eed3a762 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:27:55 -0500
 Subject: [PATCH] Add ThrownEggHatchEvent

patches/api/0020-Add-moon-phase-API.patch

@@ -1,4 +1,4 @@
-From 66e13328cfc3db8a10f81e958e8d760754215fd4 Mon Sep 17 00:00:00 2001
+From bf0b94205c7c7696e169389ebe93ec36f50fcfe8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:07 -0600
 Subject: [PATCH] Add moon phase API
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index be92b1a3e..97441dcae 100644
+index db18f70ec..af66b8255 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3244,6 +3244,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3216,6 +3216,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public List<Raid> getRaids();
  

patches/api/0021-Add-API-for-Villager-resetOffers.patch

@@ -1,4 +1,4 @@
-From 57837a0e93830ce84c108064a1457cb59a56e385 Mon Sep 17 00:00:00 2001
+From e993accd1a71c004bd289404b8052e4e523b5a21 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:28 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()

patches/api/0022-Expose-getItemStack-for-Trident.patch

@@ -1,4 +1,4 @@
-From b51632e4cebc06f041b40c0612164edc4eccaaf6 Mon Sep 17 00:00:00 2001
+From c62e0ab72ac8f76f357effbcc8a362a2ef637b26 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:31 -0500
 Subject: [PATCH] Expose getItemStack for Trident

patches/api/0023-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From dfa71eca3789c870c339374b97e07dde48bd57ef Mon Sep 17 00:00:00 2001
+From ff2ee64d734a14655665bca67ad75420b7f570ea Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:05 -0500
 Subject: [PATCH] Add more llama API

patches/api/0024-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From c2c0ee0dfa314e6df207e32e2bfd9516e9efa0f6 Mon Sep 17 00:00:00 2001
+From e6dd34a38b3bba976bee9a04743c910f3baccf97 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:28:53 -0500
 Subject: [PATCH] Add more evoker API

patches/api/0025-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 0a22c90004e121545e4e96662f7ce11a53a5059d Mon Sep 17 00:00:00 2001
+From 61ba17cba901baddbda5f01637ba70794bfec56e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 97441dcae..5bf0e2252 100644
+index af66b8255..04ced7551 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3252,6 +3252,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3224,6 +3224,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      @NotNull
      net.pl3x.purpur.MoonPhase getMoonPhase();

patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 46686f8401311206e87ecd14fef0bd3db10fda27 Mon Sep 17 00:00:00 2001
+From e35ad3105f4ef498db4bb8cf99b758c240d23c32 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:05 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity

patches/api/0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch

@@ -1,4 +1,4 @@
-From 58841d3d8e5e181681cabd0855899db6ad1dc73f Mon Sep 17 00:00:00 2001
+From c85760f19f046a8359c8c41e874d7b6d25fd8c5c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:24 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent

patches/api/0028-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From f4f5c5f77c403730091b31b16aa5420b0186377a Mon Sep 17 00:00:00 2001
+From a4708f2c66531344b9d1e994f5a41fd553de117f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:10 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent

patches/api/0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch

@@ -1,4 +1,4 @@
-From fdba4b920a64e6c43993c7afa7a75c2edc13bade Mon Sep 17 00:00:00 2001
+From 95eca5bebcdcd984f891344534b2a3968260246c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:53:46 -0500
 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon

patches/api/0030-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From c34b526bbe4747bcfaef76680f94101a76a6bfe0 Mon Sep 17 00:00:00 2001
+From bc1a6978add0784b4b5111b4c0fba8ca2c7edbb9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:38 -0600
 Subject: [PATCH] Implement EntityMoveEvent

patches/api/0031-Add-ItemStack-convenience-methods-for-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 7b8f20e6429b26355dcab8a205ca7d491a08ee7b Mon Sep 17 00:00:00 2001
+From e957ac37c9a7393b96fbc805c4c1a8f88c7e9940 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Mar 2020 20:52:12 -0500
 Subject: [PATCH] Add ItemStack convenience methods for ItemMeta
@@ -8,7 +8,7 @@ Subject: [PATCH] Add ItemStack convenience methods for ItemMeta
  1 file changed, 590 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index cf8d7749..2c2ca7d9 100644
+index cf8d77491..2c2ca7d97 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;

patches/api/0032-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From 37b973d83707270ff4f9c7f5831f29279891277a Mon Sep 17 00:00:00 2001
+From 3a2edd722a0d72cb193664d7dea177f12a4d9ddd Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:39 -0700
 Subject: [PATCH] Add BellRingEvent