Merge in Tuinity patches

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

@@ -0,0 +1,113 @@
+From ac2da46e3db5951ece720838726cf5b0d8ceb7f2 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 ++++--
+ src/main/java/org/bukkit/World.java         | 28 +++++++++++++++++++++
+ src/main/java/org/bukkit/entity/Player.java | 23 +++++++++++++++++
+ 3 files changed, 57 insertions(+), 2 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/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 5047be15f..d9df7509a 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -3067,6 +3067,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-Purpur-config-files.patch

@@ -1,4 +1,4 @@
-From a5bf35da63687caa3e7bca2b719c2c4f279d5723 Mon Sep 17 00:00:00 2001
+From 2cab1732fb9596bf2c2b692f3f018dd51609596f 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

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

@@ -1,4 +1,4 @@
-From 8a1d326049c054417215c4323b06599aa1c5542b Mon Sep 17 00:00:00 2001
+From 31d3ec5ad187df9a8a60c212260a729abc029703 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,7 +8,7 @@ Subject: [PATCH] Host our own timings
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 23eb8c65c..13f335997 100644
+index 93d5a3f97..a4ae730da 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 {

patches/api/0005-Ridables.patch

@@ -1,4 +1,4 @@
-From 2226788f01d043f4c3839259447f0bacb3c166fb Mon Sep 17 00:00:00 2001
+From d8696f7eef73586001263719c3c51525c2760d13 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/0006-Remove-pointless-annotations-and-deprecations.patch

@@ -1,4 +1,4 @@
-From 53631afe68d9acea33e6902859a2e3a39fe370b4 Mon Sep 17 00:00:00 2001
+From 88169f864dd54bc7ee722705785554377e745594 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

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

@@ -1,4 +1,4 @@
-From fc6e3fdc54656b498d5bb9ae14fad4892ba50229 Mon Sep 17 00:00:00 2001
+From 3f163f0caeb3cbf242e1fc7a7d52905a36a52d72 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/0008-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 2485a3cead97fe0e750fc0d9e91541d22e433593 Mon Sep 17 00:00:00 2001
+From a97b62ca22425cb2e180fe13b2e537905b240822 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
@@ -86,10 +86,10 @@ index 000000000..4db334854
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ea4f32..b9fe2a0fa 100644
+index 5367975ac..c7cba5046 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2090,4 +2090,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0009-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 5674b1e40686d33ce2ca4bf877784dadd9aec77f Mon Sep 17 00:00:00 2001
+From fb1b62df2e5107f2a3f0a8d3a99a48a6c711ed62 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/0010-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From 91cf9066559c224fe335daba79f4cad4a0aac81c Mon Sep 17 00:00:00 2001
+From edf1d2066b94a4e52c17e326ace3b64289ecee8b 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

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

@@ -1,4 +1,4 @@
-From ff8c9b346b116a2558a9c6499b600ce56c5f7904 Mon Sep 17 00:00:00 2001
+From 598786fbe7fa753987cb8593d89e16758f118fc6 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

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

@@ -1,4 +1,4 @@
-From 1797a7519f80bf7356430fe1c8e9444942ba35db Mon Sep 17 00:00:00 2001
+From 778fce635a6e952ffde90f502fe471cc363913b3 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/0013-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From f142340af07c20e2e48954e21d0395563028f742 Mon Sep 17 00:00:00 2001
+From e4c1a33b0b4c1f5fab1b728f52585dd283ab9ddc 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/0014-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 20b2357b34fb3596a795660ec87e3ec2a4488f62 Mon Sep 17 00:00:00 2001
+From 903689d819caca268cb23ae68aa7d452e89cf5e7 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/0015-Implement-lagging-threshold.patch

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

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

@@ -1,4 +1,4 @@
-From e43f10dce3d188e53ec6cd1a4d9e8819350e95d4 Mon Sep 17 00:00:00 2001
+From e073e5ae742d57f67c3d9a075319d00835c1542a 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/0017-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From ba7c31d363c124d1d76e449314cea73c71eaf513 Mon Sep 17 00:00:00 2001
+From 5ecbac582fc2724107823f64b9adf673bdf3d84b 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/0018-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 1706141ee6b09fd3eacc90cd54ce8e10f9bc2b7b Mon Sep 17 00:00:00 2001
+From 873158f78a95d7943a75f989a9f35dd8ec9831df 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/0019-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 42efc2192856cf55d70e06391ac7f8fadf19681a Mon Sep 17 00:00:00 2001
+From 78387652cf81f45c5f036d405da4daf466b1c63e 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/0020-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From 11affff10e4891f58f728891f8fdbcf29de19984 Mon Sep 17 00:00:00 2001
+From fbb8402a553e112483f966d23b5066dc844dcfb3 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/0021-Add-moon-phase-API.patch

@@ -1,4 +1,4 @@
-From 0b2ca9d055cbef330876bd0a759210ce7fd9b907 Mon Sep 17 00:00:00 2001
+From 21773eb994120e80f72be1ed9d0a51523149b022 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 5047be15f..80d63e250 100644
+index d9df7509a..d8178abfc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3117,6 +3117,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public List<Raid> getRaids();
  

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

@@ -1,4 +1,4 @@
-From c4edd7018545faf35f370d4e8fe4f08ecb2baced Mon Sep 17 00:00:00 2001
+From 57837a0e93830ce84c108064a1457cb59a56e385 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/0023-Expose-getItemStack-for-Trident.patch

@@ -1,4 +1,4 @@
-From 0b7223ebf7e15b584fc72ec60da3ca841f90ed08 Mon Sep 17 00:00:00 2001
+From b51632e4cebc06f041b40c0612164edc4eccaaf6 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/0024-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From b3769f637f3dc7e629337a2d1fc24b68d37069d0 Mon Sep 17 00:00:00 2001
+From dfa71eca3789c870c339374b97e07dde48bd57ef 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/0025-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From 8b6dbecee0d1542ac21cc0e0b7cb0972459ad31c Mon Sep 17 00:00:00 2001
+From c2c0ee0dfa314e6df207e32e2bfd9516e9efa0f6 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/0026-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 751e2690ac68caf38a98e10dba2fd5638798c468 Mon Sep 17 00:00:00 2001
+From c5c975aca49194cc02c4af567d9b73a8edcc6f22 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 80d63e250..3a0be1004 100644
+index d8178abfc..b17a03334 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3125,6 +3125,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3153,6 +3153,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      @NotNull
      net.pl3x.purpur.MoonPhase getMoonPhase();

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

@@ -1,4 +1,4 @@
-From c6a7136fcdf483a98edb1d05c4f04622d4f57c87 Mon Sep 17 00:00:00 2001
+From 46686f8401311206e87ecd14fef0bd3db10fda27 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/0028-Add-getPlayer-to-SkeletonHorseTrapEvent.patch

@@ -1,4 +1,4 @@
-From 562ac86ea29bd27b5fc5d752b6420f3453417d62 Mon Sep 17 00:00:00 2001
+From 58841d3d8e5e181681cabd0855899db6ad1dc73f 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/0029-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From ddf19ccd8ab11161730a8343d8d3b7d519645581 Mon Sep 17 00:00:00 2001
+From f4f5c5f77c403730091b31b16aa5420b0186377a 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/0030-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch

@@ -1,4 +1,4 @@
-From cac280553cbb6a3332741a1eb53118a46eecee90 Mon Sep 17 00:00:00 2001
+From fdba4b920a64e6c43993c7afa7a75c2edc13bade 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/0031-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From 534c94b62bf879c90aeecd784759b4e4564b884e Mon Sep 17 00:00:00 2001
+From c34b526bbe4747bcfaef76680f94101a76a6bfe0 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