From 3e310e096cf8855e90b38d96890e38cd5260b185 Mon Sep 17 00:00:00 2001
From: Jason <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 3 Nov 2021 19:42:18 -0700
Subject: [PATCH] Remove redundant and unneeded repos, reorder repos (#6867)

---
 build.gradle.kts                                 | 16 +++-------------
 patches/server/0003-Build-system-changes.patch   | 11 +++++------
 patches/server/0006-MC-Utils.patch               | 15 ++++++++++-----
 .../server/0143-Basic-PlayerProfile-API.patch    |  8 ++++----
 .../0260-Asynchronous-chunk-IO-and-loading.patch | 12 ++++++------
 ...Add-ray-tracing-methods-to-LivingEntity.patch |  4 ++--
 ...onParseException-in-Entity-and-TE-names.patch |  8 ++++----
 patches/server/0333-Chunk-debug-command.patch    |  8 ++++----
 ...68-No-Tick-view-distance-implementation.patch |  6 +++---
 ...tacktraces-in-log-messages-crash-report.patch | 10 +++++-----
 patches/server/0430-Implement-Mob-Goal-API.patch |  4 ++--
 ...hunk-Priority-Urgency-System-for-Chunks.patch |  6 +++---
 ...0-Add-git-branch-and-commit-to-manifest.patch |  6 +++---
 .../server/0768-Do-not-copy-visible-chunks.patch |  4 ++--
 ...0769-Replace-player-chunk-loader-system.patch |  4 ++--
 patches/server/0793-Fix-Codec-log-spam.patch     |  4 ++--
 ...Velocity-compression-and-cipher-natives.patch |  4 ++--
 17 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0bcc5758b4..d03a8cacad 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,22 +34,14 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven("https://repo1.maven.org/maven2/")
-        maven("https://oss.sonatype.org/content/groups/public/")
         maven("https://papermc.io/repo/repository/maven-public/")
-        maven("https://ci.emc.gs/nexus/content/groups/aikar/")
-        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/")
     }
 }
 
 repositories {
     mavenCentral()
     maven("https://papermc.io/repo/repository/maven-public/") {
-        content {
-            onlyForConfigurations("paperclip")
-        }
+        content { onlyForConfigurations("paperclip") }
     }
 }
 
@@ -96,12 +88,10 @@ tasks.generateDevelopmentBundle {
     mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
     libraryRepositories.set(
         listOf(
+            "https://repo.maven.apache.org/maven2/",
             "https://libraries.minecraft.net/",
-            "https://maven.quiltmc.org/repository/release/",
-            "https://repo.aikar.co/content/groups/aikar",
-            "https://ci.emc.gs/nexus/content/groups/aikar/",
             "https://papermc.io/repo/repository/maven-public/",
-            "https://repo.velocitypowered.com/snapshots/"
+            "https://maven.quiltmc.org/repository/release/",
         )
     )
 }
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 9174f2e578..3c805c2a99 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20a4b355a8 100644
+index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68ff602a310 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,21 +17,24 @@ repositories {
+@@ -17,21 +17,23 @@ repositories {
  dependencies {
      implementation(project(":Paper-API"))
      implementation("jline:jline:2.12.1")
@@ -31,13 +31,12 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
  
-+    implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
 +    implementation("io.netty:netty-all:4.1.65.Final") // Paper
 +
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
  }
-@@ -52,6 +55,7 @@ tasks.jar {
+@@ -52,6 +54,7 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
@@ -45,7 +44,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -82,7 +86,7 @@ relocation {
+@@ -82,7 +85,7 @@ relocation {
      sequenceOf(
          "commons-codec:commons-codec" to "org.apache.commons.codec",
          "commons-io:commons-io" to "org.apache.commons.io",
@@ -54,7 +53,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20
          "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
          "org.ow2.asm:asm" to "org.objectweb.asm"
      ).forEach { (owner, pack) ->
-@@ -102,9 +106,17 @@ relocation {
+@@ -102,9 +105,17 @@ relocation {
      }
  }
  
diff --git a/patches/server/0006-MC-Utils.patch b/patches/server/0006-MC-Utils.patch
index dc6d87b0fd..345db09f6a 100644
--- a/patches/server/0006-MC-Utils.patch
+++ b/patches/server/0006-MC-Utils.patch
@@ -4481,14 +4481,15 @@ index 5bcfbda6fd8bb8a3793ddad18f533f4f31f0bc94..8e9d685d04b93cef73b3fbebd086c970
                      } else {
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..80f8d6ce6dd717d4b37b78539c65b6ac814ec93d
+index 0000000000000000000000000000000000000000..850caa39d4875620b05c9a3cc27c65ef2c877005
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -0,0 +1,496 @@
+@@ -0,0 +1,501 @@
 +package net.minecraft.server;
 +
 +import com.google.common.util.concurrent.ThreadFactoryBuilder;
 +import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
++import java.lang.ref.Cleaner;
 +import net.minecraft.core.BlockPos;
 +import net.minecraft.core.Direction;
 +import net.minecraft.server.level.ServerLevel;
@@ -4561,10 +4562,14 @@ index 0000000000000000000000000000000000000000..80f8d6ce6dd717d4b37b78539c65b6ac
 +    public static Runnable registerCleaner(Object obj, Runnable run) {
 +        // Wrap callback in its own method above or the lambda will leak object
 +        Runnable cleaner = makeCleanerCallback(run);
-+        co.aikar.cleaner.Cleaner.register(obj, cleaner);
++        CleanerHolder.CLEANER.register(obj, cleaner);
 +        return cleaner;
 +    }
 +
++    private static final class CleanerHolder {
++        private static final Cleaner CLEANER = Cleaner.create();
++    }
++
 +    /**
 +     * DANGER WILL ROBINSON: Be sure you do not use a lambda that lives in the object being monitored, or leaky leaky!
 +     * @param obj
@@ -5759,7 +5764,7 @@ index 9591f50922343283597bad6d9ac17c175d8ae230..77d98bfa0ad9fc92a8e794b5a4e00c3e
  
                  Objects.requireNonNull(playerchunk);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 104296eec63e01061aa330e8a3f717e6fbec7a6a..837d4b3a56b68b1546ccf0a08994cb63acaf0300 100644
+index eded0e6fd0030f1f01f7e2b16497be768518728e..8115e016109f560f2de78c69285342a42ebd119a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -9,6 +9,7 @@ import it.unimi.dsi.fastutil.longs.LongSet;
@@ -5941,7 +5946,7 @@ index 391bae98e542333a431fb48bf0675c0e8a1873ac..0f6b534a4c789a2f09f6c4624e5d58b9
      public BlockState getBlockState(BlockPos pos) {
          return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1130a8b5e3314d879319b8b60b2408b6c1aa7f5b..d6bef66d1cc0e3915ca5a9b9d5fc6e645eb5a7de 100644
+index 294060d48c624d77e64ddfa19607905cda1be675..2c8fa37694212f03f6c1f760078230b36b0fd1eb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -218,9 +218,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/server/0143-Basic-PlayerProfile-API.patch
index 938cd35e86..b1f7472bb0 100644
--- a/patches/server/0143-Basic-PlayerProfile-API.patch
+++ b/patches/server/0143-Basic-PlayerProfile-API.patch
@@ -429,7 +429,7 @@ index 0000000000000000000000000000000000000000..3cdd06d3af7ff94f1fe1a11b9a9275e1
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 80f8d6ce6dd717d4b37b78539c65b6ac814ec93d..966f0951832040c38fdd2caa58f7eae372aa0f59 100644
+index f0fed1d2c297d8d2a6903d2caa219b458c5e43c2..aa96017819712f42e16c7eac57222301600b66a5 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,5 +1,7 @@
@@ -439,8 +439,8 @@ index 80f8d6ce6dd717d4b37b78539c65b6ac814ec93d..966f0951832040c38fdd2caa58f7eae3
 +import com.destroystokyo.paper.profile.PlayerProfile;
  import com.google.common.util.concurrent.ThreadFactoryBuilder;
  import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
- import net.minecraft.core.BlockPos;
-@@ -10,6 +12,7 @@ import net.minecraft.world.level.ChunkPos;
+ import java.lang.ref.Cleaner;
+@@ -11,6 +13,7 @@ import net.minecraft.world.level.ChunkPos;
  import net.minecraft.world.level.ClipContext;
  import net.minecraft.world.level.Level;
  import org.apache.commons.lang.exception.ExceptionUtils;
@@ -448,7 +448,7 @@ index 80f8d6ce6dd717d4b37b78539c65b6ac814ec93d..966f0951832040c38fdd2caa58f7eae3
  import org.bukkit.Location;
  import org.bukkit.block.BlockFace;
  import org.bukkit.craftbukkit.CraftWorld;
-@@ -344,6 +347,10 @@ public final class MCUtil {
+@@ -349,6 +352,10 @@ public final class MCUtil {
          return run.get();
      }
  
diff --git a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
index 7c8f06b23a..ccee3bed8a 100644
--- a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
@@ -159,7 +159,7 @@ index 0fda52841b5e1643efeda92106124998abc4e0aa..fe79c0add4f7cb18d487c5bb9415c40c
  
      public static Timing getTickList(ServerLevel worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dd81701230133442186524e9cd65d70232b824f3..8a1f581bd7ef8a20329813dedb5bb952e32d41ae 100644
+index 15e71c00f98721e609dfab341395313db95cdfc7..c29da813f5fcba07860314914180c9d9a3ec560a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -2278,10 +2278,10 @@ index a5e438a834826161c52ca9db57d234d9ff80a591..b8bc1b9b8e8a33df90a963f9f9769292
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 966f0951832040c38fdd2caa58f7eae372aa0f59..49fd3486a6c595749f33bbe1c1bec0454e4725c5 100644
+index aa96017819712f42e16c7eac57222301600b66a5..802e0259f660c05afb2b772f0e617d819b19c7cc 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -500,4 +500,8 @@ public final class MCUtil {
+@@ -505,4 +505,8 @@ public final class MCUtil {
                  return null;
          }
      }
@@ -2806,7 +2806,7 @@ index 1f3fe980e71c13b5e7852349cba1cb0e4aa42dcd..30b88f0e8ad40438af8a7d5bec1471a6
          } finally {
              chunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1d95dae881fd89056e2ad86a8f33aecf90cf8a3b..769753441eea00296d818b7a741551fd3034cb6a 100644
+index aa9999437b4b1b0b41ebf988e26bc3c3c262e985..5be5f95fe01e0132f9d4477149ba022351d8b2be 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -295,6 +295,78 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2910,7 +2910,7 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..be677d437d17b74c6188ce1bd5fc6fdc
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 265d147de39e306fac27913b2dc3899e82c63796..912171f8b3280a6c45311104216e04d661daff8a 100644
+index 678487d92095957d1346cf555486a7f2125f566b..c748446e423e3af92a0fccef45fcea45b158a272 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -711,6 +711,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3661,7 +3661,7 @@ index bccc66266739954ca5d7208d233884f5270e0064..034c2886b4e29be40fa2e5e213a7457d
      // Spigot start
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 473dc5e5ee3458e605ecf5e2b2dadb3573fd685b..0a0ece8361a0368629696e06c00165741b14e308 100644
+index ec11cf974222a2719aeea86ab425fdddb38928a8..989824be9c26d138ceed62ac533fcf2bbf37755f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -15,6 +15,7 @@ import net.minecraft.network.chat.Component;
diff --git a/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
index 94507390db..ecad384394 100644
--- a/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 49fd3486a6c595749f33bbe1c1bec0454e4725c5..5c290f263fc2b643987c96ea75729bf1ff493760 100644
+index 802e0259f660c05afb2b772f0e617d819b19c7cc..1c09656bfed70ead0f0d182be4f84f1a97b3cf1e 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -482,6 +482,18 @@ public final class MCUtil {
+@@ -487,6 +487,18 @@ public final class MCUtil {
          return getNMSWorld(entity.getWorld());
      }
  
diff --git a/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 3704aee1b2..d23a3f4d1c 100644
--- a/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -13,11 +13,11 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 5c290f263fc2b643987c96ea75729bf1ff493760..2d0c10c72a9ddc5a26352fad6baae2f6c2678923 100644
+index 1c09656bfed70ead0f0d182be4f84f1a97b3cf1e..f1135616657692a2611dde02e2dc5ac4d8127269 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -6,6 +6,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
- import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
+@@ -7,6 +7,8 @@ import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
+ import java.lang.ref.Cleaner;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
 +import net.minecraft.nbt.CompoundTag;
@@ -25,7 +25,7 @@ index 5c290f263fc2b643987c96ea75729bf1ff493760..2d0c10c72a9ddc5a26352fad6baae2f6
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.world.entity.Entity;
  import net.minecraft.world.level.ChunkPos;
-@@ -513,6 +515,21 @@ public final class MCUtil {
+@@ -518,6 +520,21 @@ public final class MCUtil {
          }
      }
  
diff --git a/patches/server/0333-Chunk-debug-command.patch b/patches/server/0333-Chunk-debug-command.patch
index d7a33f0c84..fafa15af72 100644
--- a/patches/server/0333-Chunk-debug-command.patch
+++ b/patches/server/0333-Chunk-debug-command.patch
@@ -212,10 +212,10 @@ index 1eb45df9dca5d0c31ac46709e706136a246cb8ea..005361c38b02713fb823d0be40954400
       * Ported from MinecraftForge - author: LexManos <LexManos@gmail.com> - License: LGPLv2.1
       */
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2d0c10c72a9ddc5a26352fad6baae2f6c2678923..5c1421620e02b7d4ab4171ebff41076c7ee8cd55 100644
+index f1135616657692a2611dde02e2dc5ac4d8127269..892524ffb54a3e4f43e1a6f259a736334bad9b58 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -8,13 +8,27 @@ import net.minecraft.core.BlockPos;
+@@ -9,13 +9,27 @@ import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.nbt.CompoundTag;
  import net.minecraft.network.chat.Component;
@@ -243,7 +243,7 @@ index 2d0c10c72a9ddc5a26352fad6baae2f6c2678923..5c1421620e02b7d4ab4171ebff41076c
  import org.bukkit.Location;
  import org.bukkit.block.BlockFace;
  import org.bukkit.craftbukkit.CraftWorld;
-@@ -23,8 +37,11 @@ import org.spigotmc.AsyncCatcher;
+@@ -24,8 +38,11 @@ import org.spigotmc.AsyncCatcher;
  
  import javax.annotation.Nonnull;
  import javax.annotation.Nullable;
@@ -255,7 +255,7 @@ index 2d0c10c72a9ddc5a26352fad6baae2f6c2678923..5c1421620e02b7d4ab4171ebff41076c
  import java.util.concurrent.CompletableFuture;
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.LinkedBlockingQueue;
-@@ -530,6 +547,172 @@ public final class MCUtil {
+@@ -535,6 +552,172 @@ public final class MCUtil {
          return null;
      }
  
diff --git a/patches/server/0368-No-Tick-view-distance-implementation.patch b/patches/server/0368-No-Tick-view-distance-implementation.patch
index 4701d08123..883b34d205 100644
--- a/patches/server/0368-No-Tick-view-distance-implementation.patch
+++ b/patches/server/0368-No-Tick-view-distance-implementation.patch
@@ -39,10 +39,10 @@ index 4dde7eec6afad0b4340631482dc23a9796736d43..f3ba9d869179fb4dc86acf1f4d097fb0
      public EngineMode engineMode;
      public int maxBlockHeight;
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 5c1421620e02b7d4ab4171ebff41076c7ee8cd55..4bc418f45c6f16a9a1c78b6688625268870a96ad 100644
+index 892524ffb54a3e4f43e1a6f259a736334bad9b58..6ace1cac8aad9baef045f332d387bbd9a25f360a 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -636,7 +636,8 @@ public final class MCUtil {
+@@ -641,7 +641,8 @@ public final class MCUtil {
              });
  
              worldData.addProperty("name", world.getWorld().getName());
@@ -685,7 +685,7 @@ index d580a66dd741b63dd8ed89d7b976b1612cfb4d90..01ac6e7e7b4b6c61d01684c77ecc2238
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
      {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2574ccd92c43f56e8be71f1bf6857c761a72a510..951e8ba1e05436aa0afcd0a72358550422afa791 100644
+index e0302f82356e8cba848aa8cec1e821e02abbd6f6..85449fc6d19974622588e7f13e1dc78c8dffbeee 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -188,7 +188,7 @@ public class ActivationRange
diff --git a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 8c7fbfca2d..ba8bb60f08 100644
--- a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16fdf26fdd 100644
+index a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46..7a7a6a1a1bdfecb619dd6ba6f6865eb0bb74d0d9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,7 +1,9 @@
@@ -34,8 +34,8 @@ index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16
  }
  
  dependencies {
-@@ -47,6 +57,8 @@ dependencies {
-     implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
+@@ -46,6 +56,8 @@ dependencies {
+ 
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
  
 +    implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
@@ -43,7 +43,7 @@ index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
  }
-@@ -140,6 +152,45 @@ tasks.shadowJar {
+@@ -139,6 +151,45 @@ tasks.shadowJar {
      transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
  }
  
@@ -90,7 +90,7 @@ index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f1034cfb63ea37c22e67b5d4a18214774f208de2..a8740f03a7feef40490e9f5be610c2c835114f08 100644
+index f4b1eb512defda8523ddaba054bde744a4aaeb32..14416856fde78bccbf53fa60f17c82588a2d11f6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -433,4 +433,9 @@ public class PaperConfig {
diff --git a/patches/server/0430-Implement-Mob-Goal-API.patch b/patches/server/0430-Implement-Mob-Goal-API.patch
index cacb5a3488..ed06d89048 100644
--- a/patches/server/0430-Implement-Mob-Goal-API.patch
+++ b/patches/server/0430-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3d4271b1c8715b84930d63378865e40671995fb9..de4f525573f222426a693b4d28e15caf4a87a210 100644
+index 7a7a6a1a1bdfecb619dd6ba6f6865eb0bb74d0d9..58c6e444ee8c8cabf8449b0e3b77970edf1d499b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -59,6 +59,7 @@ dependencies {
+@@ -58,6 +58,7 @@ dependencies {
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
  
diff --git a/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 7974af8cc9..ccf162efc4 100644
--- a/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -68,10 +68,10 @@ index 18ae2e2b339d357fbe0f6f2b18bc14c0dfe4c222..3b7ba9c755c82a6f086d5542d32b3567
      }
  
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 4bc418f45c6f16a9a1c78b6688625268870a96ad..379ba589b0423284d63782d951c64770b160cf2d 100644
+index 6ace1cac8aad9baef045f332d387bbd9a25f360a..436ea61d284120a43123709f0213ec56870147dc 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -671,6 +671,7 @@ public final class MCUtil {
+@@ -676,6 +676,7 @@ public final class MCUtil {
                  chunkData.addProperty("x", playerChunk.pos.x);
                  chunkData.addProperty("z", playerChunk.pos.z);
                  chunkData.addProperty("ticket-level", playerChunk.getTicketLevel());
@@ -1424,7 +1424,7 @@ index 8770fe0db46b01e8b608637df4f1a669a3f4cdde..3c1698ba0d3bc412ab957777d9b5211d
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c0ae236619bbdf9293fbf1c4a1764a785d16a67b..36a69fb0a9cd81ceb0f9cbe6549fc89bd643c77c 100644
+index f6ffefd6a15fdb64e620282fb73f9c811d7e2561..761ccf1c67578aa1099a3a5d72339bbf75f6ff1b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1545,6 +1545,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
index 4c8cbfe8bd..9f55d195ae 100644
--- a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
+++ b/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add git branch and commit to manifest
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 149607e8c080b79a20d204382db69fde58c6b513..f7f10a029fca29ed131324dda8030bd15abcbead 100644
+index 3dc4631c9a595c50c0f281897c6953d5a505a8e3..c42f192c5a5557ba4b541e9bd1769b353115d7e8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -73,6 +73,7 @@ tasks.jar {
+@@ -72,6 +72,7 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
          val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@@ -16,7 +16,7 @@ index 149607e8c080b79a20d204382db69fde58c6b513..f7f10a029fca29ed131324dda8030bd1
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
-@@ -82,6 +83,8 @@ tasks.jar {
+@@ -81,6 +82,8 @@ tasks.jar {
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
              "Multi-Release" to "true", // Paper
diff --git a/patches/server/0768-Do-not-copy-visible-chunks.patch b/patches/server/0768-Do-not-copy-visible-chunks.patch
index e6ed0b44c4..eea4115272 100644
--- a/patches/server/0768-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0768-Do-not-copy-visible-chunks.patch
@@ -22,10 +22,10 @@ index 807bbe54f6516f794bdcb735bb7b8d6812e3ef01..2ef4b4c2ff81d0fa33d4630593266066
                      continue;
                  }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 379ba589b0423284d63782d951c64770b160cf2d..ee668b989d661e1db1bdfe05b94d7cdadeae6923 100644
+index 436ea61d284120a43123709f0213ec56870147dc..d2ea11d35ea111c349df5aa375d7ee8831658262 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -614,7 +614,7 @@ public final class MCUtil {
+@@ -619,7 +619,7 @@ public final class MCUtil {
  
              ServerLevel world = ((org.bukkit.craftbukkit.CraftWorld)bukkitWorld).getHandle();
              ChunkMap chunkMap = world.getChunkSource().chunkMap;
diff --git a/patches/server/0769-Replace-player-chunk-loader-system.patch b/patches/server/0769-Replace-player-chunk-loader-system.patch
index b9395e8ba4..5fdb5d0caf 100644
--- a/patches/server/0769-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0769-Replace-player-chunk-loader-system.patch
@@ -1163,10 +1163,10 @@ index 103657ad936f1a75ffbb92ca5eafb816e977e363..23757f466da571aec35a373112dcbba0
      // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index ee668b989d661e1db1bdfe05b94d7cdadeae6923..a7ae331258b9d09795fcd20e6e633d4fa8bfb7fa 100644
+index d2ea11d35ea111c349df5aa375d7ee8831658262..c4117dcffd705d044f07eb5840a177b1b5825bb9 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -637,7 +637,7 @@ public final class MCUtil {
+@@ -642,7 +642,7 @@ public final class MCUtil {
  
              worldData.addProperty("name", world.getWorld().getName());
              worldData.addProperty("view-distance", world.getChunkSource().chunkMap.getEffectiveViewDistance());
diff --git a/patches/server/0793-Fix-Codec-log-spam.patch b/patches/server/0793-Fix-Codec-log-spam.patch
index 962b86ce2c..56249884d3 100644
--- a/patches/server/0793-Fix-Codec-log-spam.patch
+++ b/patches/server/0793-Fix-Codec-log-spam.patch
@@ -14,10 +14,10 @@ This fixes two instances:
   be provided for two new values (WITHOUT changing behavior).
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index a7ae331258b9d09795fcd20e6e633d4fa8bfb7fa..f9701ef4162868894a81f0d1ac9b58d00d9a2d65 100644
+index c4117dcffd705d044f07eb5840a177b1b5825bb9..f80791bd383dc6dc4a9c1aac5f8e4c1561e33ad9 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -718,4 +718,70 @@ public final class MCUtil {
+@@ -723,4 +723,70 @@ public final class MCUtil {
      public static int getTicketLevelFor(net.minecraft.world.level.chunk.ChunkStatus status) {
          return net.minecraft.server.level.ChunkMap.MAX_VIEW_DISTANCE + net.minecraft.world.level.chunk.ChunkStatus.getDistance(status);
      }
diff --git a/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
index 4bcf6a2a70..9b8effa915 100644
--- a/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f7f10a029fca29ed131324dda8030bd15abcbead..aa7fd467e703291756f66e8de2ba400b2cb81d0c 100644
+index c42f192c5a5557ba4b541e9bd1769b353115d7e8..d78267e02a705ffa9083815da0df042d3a184837 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -59,6 +59,7 @@ dependencies {
+@@ -58,6 +58,7 @@ dependencies {
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation