Remove redundant and unneeded repos, reorder repos (#6867)

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/",
         )
     )
 }

patches/server/Basic-PlayerProfile-API.patch

@@ -439,7 +439,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +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;
+ import java.lang.ref.Cleaner;
 @@ -0,0 +0,0 @@ import net.minecraft.world.level.ChunkPos;
  import net.minecraft.world.level.ClipContext;
  import net.minecraft.world.level.Level;

patches/server/Build-system-changes.patch

@@ -31,7 +31,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      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")

patches/server/Catch-JsonParseException-in-Entity-and-TE-names.patch

@@ -16,8 +16,8 @@ diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -0,0 +0,0 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
- import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
+@@ -0,0 +0,0 @@ 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;

patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch

@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  dependencies {
 @@ -0,0 +0,0 @@ dependencies {
-     implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
+ 
      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

patches/server/MC-Utils.patch

@@ -4489,6 +4489,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +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..00000000000000000000000000000000
 +    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