merge some patches & re-enable timings

build.gradle.kts

@@ -46,7 +46,7 @@ subprojects {
         maven("https://repo.aikar.co/content/groups/aikar")
         maven("https://repo.md-5.net/content/repositories/releases/")
         maven("https://hub.spigotmc.org/nexus/content/groups/public/")
-        maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
+        maven("https://jitpack.io")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }
 

patches/api/0005-Purpur-client-support.patch

@@ -1,24 +1,24 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Fredthedoggy <45927799+fredthedoggy@users.noreply.github.com>
 Date: Thu, 19 Aug 2021 20:04:18 -0400
-Subject: [PATCH] Add usesPurpurClient() to Purpur-API
+Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 42c9911885b1323032cc14c737c562695692744c..2303dea99e6243443a7c0a33f72892eedc118e2c 100644
+index c87cb640dc829a266e85e97a2e3bb2f0f52a2eaa..fa4147d4dc36e7f442587428c66e2378511ea6b0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2442,5 +2442,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
-      */
-     public boolean hasFlyingFallDamage();
+@@ -2299,4 +2299,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     @Override
+     Spigot spigot();
+     // Spigot end
 +
++    // Purpur start
 +    /**
 +     * Allows you to get if player uses Purpur Client
 +     *
 +     * @return True if Player uses Purpur Client
 +     */
 +    public boolean usesPurpurClient();
-+
-     // Purpur end
++    // Purpur end
  }

patches/api/0011-AFK-API.patch

@@ -81,15 +81,14 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c87cb640dc829a266e85e97a2e3bb2f0f52a2eaa..285c8a5c6991c26e0b9c2b6af252cc1b320a8a2f 100644
+index fa4147d4dc36e7f442587428c66e2378511ea6b0..841e7d45b8cefee0cc9fbca1977ea007f446d824 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2299,4 +2299,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Override
-     Spigot spigot();
-     // Spigot end
+@@ -2307,5 +2307,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @return True if Player uses Purpur Client
+      */
+     public boolean usesPurpurClient();
 +
-+    // Purpur start
 +    /**
 +     * Check if player is AFK
 +     *
@@ -108,5 +107,5 @@ index c87cb640dc829a266e85e97a2e3bb2f0f52a2eaa..285c8a5c6991c26e0b9c2b6af252cc1b
 +     * Reset the idle timer back to 0
 +     */
 +    void resetIdleTimer();
-+    // Purpur end
+     // Purpur end
  }

patches/api/0020-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 285c8a5c6991c26e0b9c2b6af252cc1b320a8a2f..702b2cb940fd269c4ddc0c25c7aefd00d014b942 100644
+index 841e7d45b8cefee0cc9fbca1977ea007f446d824..b59a297a9eb21f0e7d70d9662fd7c0e0080ff3e1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2319,5 +2319,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2326,5 +2326,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0034-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -949,7 +949,7 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 702b2cb940fd269c4ddc0c25c7aefd00d014b942..3fc740eca60e4d21c13f1a4495f84ec765c007c9 100644
+index b59a297a9eb21f0e7d70d9662fd7c0e0080ff3e1..89345f789bb6f5e87463f423c69f1fb8a350bfaa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2121,6 +2121,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0040-Conflict-on-change-for-adventure-deprecations.patch

@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3fc740eca60e4d21c13f1a4495f84ec765c007c9..6c540b0c74ba6f4fe8a1ff35db24050b78775fc3 100644
+index 89345f789bb6f5e87463f423c69f1fb8a350bfaa..cce3d28121c89411e0acc4a8d45a624395a0ac85 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0044-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6c540b0c74ba6f4fe8a1ff35db24050b78775fc3..8f132156ca772c651648de5333152e1b50adecb8 100644
+index cce3d28121c89411e0acc4a8d45a624395a0ac85..8748199736a288f602e4cf5fb5ac4a08278f38b9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2345,5 +2345,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2352,5 +2352,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0049-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8f132156ca772c651648de5333152e1b50adecb8..42c9911885b1323032cc14c737c562695692744c 100644
+index 8748199736a288f602e4cf5fb5ac4a08278f38b9..743883f3d95b94a58ed7826dd74b3f37be9aecb9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1490,6 +1490,89 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/server/0003-Change-Airplane-defaults-closer-to-vanilla.patch

@@ -4,6 +4,28 @@ Date: Wed, 18 Aug 2021 13:53:37 -0500
 Subject: [PATCH] Change Airplane defaults closer to vanilla
 
 
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index cba14fd282d1294eba4581336c5e438484df76f9..5b4000d1f63e2b028e7a4450dcd084eb507f7f91 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -202,7 +202,7 @@ public class PaperConfig {
+     public static String timingsServerName;
+     private static void timings() {
+         boolean timings = getBoolean("timings.enabled", true);
+-        // Airplane start
++        /* // Airplane start // Purpur start
+         boolean reallyEnableTimings = getBoolean("timings.really-enabled", false);
+         if (timings && !reallyEnableTimings) {
+             Bukkit.getLogger().log(Level.WARNING, "[Airplane] To improve performance, timings have been disabled by default");
+@@ -210,7 +210,7 @@ public class PaperConfig {
+             Bukkit.getLogger().log(Level.WARNING, "[Airplane] If you would like to disable this message, either set timings.really-enabled to true or timings.enabled to false.");
+         }
+         timings = reallyEnableTimings;
+-        // Airplane end
++        // Airplane end */ // Purpur end
+         boolean verboseTimings = getBoolean("timings.verbose", true);
+         TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
+         if (!TimingsManager.url.endsWith("/")) {
 diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java
 index 2b654e6adfe331a5fa68c1aea7d6d6cea1f3567d..0f4cb1644d32c4411cda3cf7ee5faea91a9ab205 100644
 --- a/src/main/java/gg/airplane/AirplaneConfig.java

patches/server/0004-Rebrand.patch

@@ -5,14 +5,10 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 467ac5ba77cc35dc84c38161881db37e8f9adc14..1dac8dda93c03d1f0c4f8a91387527a7d06d1360 100644
+index 467ac5ba77cc35dc84c38161881db37e8f9adc14..9b844735f37de2f833b59f619c88045e8ad336c9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -32,10 +32,11 @@ repositories {
-     }
-     // Paper end
-     maven("https://repo.velocitypowered.com/snapshots/") // Tuinity
-+    maven ("https://jitpack.io") // Purpur
+@@ -35,7 +35,7 @@ repositories {
  }
  
  dependencies {
@@ -21,7 +17,7 @@ index 467ac5ba77cc35dc84c38161881db37e8f9adc14..1dac8dda93c03d1f0c4f8a91387527a7
      implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Tuinity
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
-@@ -67,6 +68,7 @@ dependencies {
+@@ -67,6 +67,7 @@ dependencies {
  
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
@@ -29,7 +25,7 @@ index 467ac5ba77cc35dc84c38161881db37e8f9adc14..1dac8dda93c03d1f0c4f8a91387527a7
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
      implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Tuinity
-@@ -86,13 +88,13 @@ tasks.jar {
+@@ -86,13 +87,13 @@ tasks.jar {
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()

patches/server/0006-Purpur-client-support.patch

@@ -42,3 +42,19 @@ index 162a4b3b3312867a64425caa0d6ec6af157b20e1..f99d06e53856c14f5b94c28d379b8188
          } else {
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index b2c6d1611422a3900e5c9d4b1983cc74dd820973..03ac2878f54ca994b5faf28fa68aa547bd7388c3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2549,4 +2549,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         return this.spigot;
+     }
+     // Spigot end
++
++    // Purpur start
++    @Override
++    public boolean usesPurpurClient() {
++        return getHandle().purpurClient;
++    }
++    // Purpur end
+ }

patches/server/0010-Timings-stuff.patch

@@ -47,12 +47,12 @@ index 4cd8116fd623fbc9e175986526d3ae51a72b76e0..0e86ceb4d70c45835c9d1c6ca0908fdd
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a189ad563e6072cf34e47fa66e3638b9fa577c61..caed8d2a39260b2c06b0cdac865f178e3074e7ef 100644
+index b294fa10dc0fa804b94757eaa3becb104f20565a..aed391418d867e79d7236a3a3d8de54cb35807b1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -217,7 +217,7 @@ public class PaperConfig {
          timings = reallyEnableTimings;
-         // Airplane end
+         // Airplane end */ // Purpur end
          boolean verboseTimings = getBoolean("timings.verbose", true);
 -        TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
 +        TimingsManager.url = getString("timings.url", "https://timings.pl3x.net/");

patches/server/0014-AFK-API.patch

@@ -237,7 +237,7 @@ index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..58b2f795b7018ac92fd72369bbe58d2f
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b2c6d1611422a3900e5c9d4b1983cc74dd820973..c5c611cfba9feb18d417b45e9909e08be7743e22 100644
+index 03ac2878f54ca994b5faf28fa68aa547bd7388c3..4254b3168f34b5d6ab9ac8bcece37ab02478b8e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -424,10 +424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -257,12 +257,11 @@ index b2c6d1611422a3900e5c9d4b1983cc74dd820973..c5c611cfba9feb18d417b45e9909e08b
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2549,4 +2554,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         return this.spigot;
+@@ -2555,5 +2560,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     public boolean usesPurpurClient() {
+         return getHandle().purpurClient;
      }
-     // Spigot end
 +
-+    // Purpur start
 +    @Override
 +    public boolean isAfk() {
 +        return getHandle().isAfk();
@@ -277,7 +276,7 @@ index b2c6d1611422a3900e5c9d4b1983cc74dd820973..c5c611cfba9feb18d417b45e9909e08b
 +    public void resetIdleTimer() {
 +        getHandle().resetLastActionTime();
 +    }
-+    // Purpur end
+     // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
 index 0d56df555b8d2de12447cc2e869c9eba20c5ea6d..e58db9acba9fd4f0b7e93ad82ae823c43246fde7 100644

patches/server/0022-Player-invulnerabilities.patch

@@ -142,10 +142,10 @@ index 58b2f795b7018ac92fd72369bbe58d2f2c266adc..613dd74b460c0bd15fc8fd4e78380a81
  
      public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c5c611cfba9feb18d417b45e9909e08be7743e22..ec4397cc98b66fef55a91854c42518479b839bbe 100644
+index 4254b3168f34b5d6ab9ac8bcece37ab02478b8e9..47f3eccc14b98adf41c9e6fe10b5b683bb94dc85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2570,5 +2570,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2575,5 +2575,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0213-Flying-Fall-Damage-API.patch

@@ -26,10 +26,10 @@ index 24523dd712329f2f3abe40bb3f1801ef7946e831..ebd744b08e27d6fc6dda31ada7ad8bb1
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7474ead18b667290c6bbe1d692b09d58bccf6b39..98751b195e5bea9ef89e1432fba54d6823036818 100644
+index e409c6c4f4da1cb2d4a42971dbc362a258a51d3b..0c1d64731c3c9581b0cf9b720057ef07be4f764e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2595,5 +2595,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2600,5 +2600,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0251-Add-usesPurpurClient-to-Purpur-Server.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fredthedoggy <45927799+fredthedoggy@users.noreply.github.com>
-Date: Thu, 19 Aug 2021 20:04:57 -0400
-Subject: [PATCH] Add usesPurpurClient() to Purpur-Server
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c0e14be91996628be0e69ae0ec5dd0b785b9e11f..0c56d9ace1911e87034e45880a2d986d4663a94c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2618,5 +2618,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public boolean hasFlyingFallDamage() {
-         return getHandle().flyingFallDamage;
-     }
-+
-+    @Override
-+    public boolean usesPurpurClient() {
-+        return getHandle().purpurClient;
-+    }
-     // Purpur end
- }