62

patches/unapplied/server/0001-Setup-Gradle-project.patch

@@ -1,770 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <kyle@denwav.dev>
-Date: Thu, 10 Dec 2020 20:54:19 -0800
-Subject: [PATCH] Setup Gradle project
-
-The pom.xml file is deleted in this patch so the patch will fail to
-apply if there are changes made to it from upstream - thus notifying us
-that changes were made.
-
-diff --git a/.gitignore b/.gitignore
-index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f7f570448 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,3 +1,6 @@
-+.gradle/
-+build/
-+
- # Eclipse stuff
- /.classpath
- /.project
-@@ -39,3 +42,7 @@ dependency-reduced-pom.xml
- 
- /src/main/resources/achievement
- /src/main/resources/lang
-+
-+# vs code
-+/.vscode
-+/.factorypath
-diff --git a/build.gradle.kts b/build.gradle.kts
-new file mode 100644
-index 0000000000000000000000000000000000000000..a457cf30d37037ce09fbe5d26e051b9555ce9982
---- /dev/null
-+++ b/build.gradle.kts
-@@ -0,0 +1,126 @@
-+import io.papermc.paperweight.util.*
-+
-+plugins {
-+    java
-+    `maven-publish`
-+}
-+
-+dependencies {
-+    implementation(project(":paper-api"))
-+    implementation("jline:jline:2.12.1")
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
-+        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
-+    }
-+    implementation("org.ow2.asm:asm-commons:9.7")
-+    implementation("commons-lang:commons-lang:2.6")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
-+    runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
-+
-+    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
-+
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-+    testImplementation("org.hamcrest:hamcrest:2.2")
-+    testImplementation("org.mockito:mockito-core:5.11.0")
-+    testImplementation("org.ow2.asm:asm-tree:9.7")
-+}
-+
-+paperweight {
-+    craftBukkitPackageVersion.set("v1_20_R4") // also needs to be updated in MappingEnvironment
-+}
-+
-+tasks.jar {
-+    archiveClassifier.set("dev")
-+
-+    manifest {
-+        val git = Git(rootProject.layout.projectDirectory.path)
-+        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
-+        attributes(
-+            "Main-Class" to "org.bukkit.craftbukkit.Main",
-+            "Implementation-Title" to "CraftBukkit",
-+            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Vendor" to date, // Paper
-+            "Specification-Title" to "Bukkit",
-+            "Specification-Version" to project.version,
-+            "Specification-Vendor" to "Bukkit Team",
-+        )
-+        for (tld in setOf("net", "com", "org")) {
-+            attributes("$tld/bukkit", "Sealed" to true)
-+        }
-+    }
-+}
-+
-+publishing {
-+    publications.create<MavenPublication>("maven") {
-+    }
-+}
-+
-+tasks.test {
-+    exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
-+    useJUnitPlatform()
-+}
-+
-+fun TaskContainer.registerRunTask(
-+    name: String,
-+    block: JavaExec.() -> Unit
-+): TaskProvider<JavaExec> = register<JavaExec>(name) {
-+    group = "paper"
-+    mainClass.set("org.bukkit.craftbukkit.Main")
-+    standardInput = System.`in`
-+    workingDir = rootProject.layout.projectDirectory
-+        .dir(providers.gradleProperty("paper.runWorkDir").getOrElse("run"))
-+        .asFile
-+    javaLauncher.set(project.javaToolchains.launcherFor {
-+        languageVersion.set(JavaLanguageVersion.of(21))
-+        vendor.set(JvmVendorSpec.JETBRAINS)
-+    })
-+    jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods")
-+
-+    if (rootProject.childProjects["test-plugin"] != null) {
-+        val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
-+        inputs.file(testPluginJar)
-+        args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
-+    }
-+
-+    args("--nogui")
-+    systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
-+    if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") {
-+        systemProperty("disable.watchdog", true)
-+    }
-+    systemProperty("io.papermc.paper.suppress.sout.nags", true)
-+
-+    val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
-+    minHeapSize = "${memoryGb}G"
-+    maxHeapSize = "${memoryGb}G"
-+
-+    doFirst {
-+        workingDir.mkdirs()
-+    }
-+
-+    block(this)
-+}
-+
-+val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatMap { it.elements }
-+    .zip(configurations.vanillaServer.map { it.singleFile.absolutePath }) { runtime, vanilla ->
-+        runtime.filterNot { it.asFile.absolutePath == vanilla }
-+    }
-+
-+tasks.registerRunTask("runServerJar") {
-+    description = "Spin up a test server from the serverJar archiveFile"
-+    classpath(tasks.serverJar.flatMap { it.archiveFile })
-+    classpath(runtimeClasspathWithoutVanillaServer)
-+}
-+
-+tasks.registerRunTask("runReobf") {
-+    description = "Spin up a test server from the reobfJar output jar"
-+    classpath(tasks.reobfJar.flatMap { it.outputJar })
-+    classpath(runtimeClasspathWithoutVanillaServer)
-+}
-+
-+tasks.registerRunTask("runDev") {
-+    description = "Spin up a non-relocated Mojang-mapped test server"
-+    classpath(sourceSets.main.map { it.runtimeClasspath })
-+}
-diff --git a/pom.xml b/pom.xml
-deleted file mode 100644
-index 4fabd6c37587aa6a9af11566d64c6b49f5bfadaa..0000000000000000000000000000000000000000
---- a/pom.xml
-+++ /dev/null
-@@ -1,604 +0,0 @@
--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
--    <modelVersion>4.0.0</modelVersion>
--    <groupId>org.spigotmc</groupId>
--    <artifactId>spigot</artifactId>
--    <packaging>jar</packaging>
--    <version>1.20.6-R0.1-SNAPSHOT</version>
--    <name>Spigot</name>
--    <url>https://www.spigotmc.org/</url>
--
--    <parent>
--        <groupId>org.spigotmc</groupId>
--        <artifactId>spigot-parent</artifactId>
--        <version>dev-SNAPSHOT</version>
--        <relativePath>../pom.xml</relativePath>
--    </parent>
--
--    <properties>
--        <skipTests>true</skipTests>
--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--        <api.version>unknown</api.version>
--        <bt.name>git</bt.name>
--        <minecraft_version>1_20_R4</minecraft_version>
--        <maven.compiler.release>21</maven.compiler.release>
--    </properties>
--
--    <repositories>
--        <repository>
--            <id>minecraft-libraries</id>
--            <name>Minecraft Libraries</name>
--            <url>https://libraries.minecraft.net/</url>
--        </repository>
--    </repositories>
--
--    <dependencies>
--        <dependency>
--            <groupId>org.spigotmc</groupId>
--            <artifactId>spigot-api</artifactId>
--            <version>${project.version}</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.spigotmc</groupId>
--            <artifactId>minecraft-server</artifactId>
--            <version>${project.version}</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>jline</groupId>
--            <artifactId>jline</artifactId>
--            <version>2.12.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-iostreams</artifactId>
--            <version>2.22.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.ow2.asm</groupId>
--            <artifactId>asm-commons</artifactId>
--            <version>9.7</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- Mojang depends -->
--        <dependency>
--            <groupId>com.github.oshi</groupId>
--            <artifactId>oshi-core</artifactId>
--            <version>6.4.10</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>authlib</artifactId>
--            <version>6.0.54</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>brigadier</artifactId>
--            <version>1.2.9</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>datafixerupper</artifactId>
--            <version>7.0.14</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>logging</artifactId>
--            <version>1.2.7</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>commons-io</groupId>
--            <artifactId>commons-io</artifactId>
--            <version>2.15.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-buffer</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-codec</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-common</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-handler</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-resolver</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-classes-epoll</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.97.Final</version>
--            <classifier>linux-x86_64</classifier>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.97.Final</version>
--            <classifier>linux-aarch_64</classifier>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-native-unix-common</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>it.unimi.dsi</groupId>
--            <artifactId>fastutil</artifactId>
--            <version>8.5.12</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>net.java.dev.jna</groupId>
--            <artifactId>jna</artifactId>
--            <version>5.14.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>net.java.dev.jna</groupId>
--            <artifactId>jna-platform</artifactId>
--            <version>5.14.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>net.sf.jopt-simple</groupId>
--            <artifactId>jopt-simple</artifactId>
--            <version>5.0.4</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.commons</groupId>
--            <artifactId>commons-lang3</artifactId>
--            <version>3.14.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-core</artifactId>
--            <version>2.22.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-slf4j2-impl</artifactId>
--            <version>2.22.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.slf4j</groupId>
--            <artifactId>slf4j-api</artifactId>
--            <version>2.0.9</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.lz4</groupId>
--            <artifactId>lz4-java</artifactId>
--            <version>1.8.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- deprecated API depend -->
--        <dependency>
--            <groupId>commons-lang</groupId>
--            <artifactId>commons-lang</artifactId>
--            <version>2.6</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- deprecated API depend -->
--        <dependency>
--            <groupId>com.googlecode.json-simple</groupId>
--            <artifactId>json-simple</artifactId>
--            <version>1.1.1</version>
--            <scope>runtime</scope>
--            <exclusions>
--                <exclusion>
--                    <groupId>junit</groupId>
--                    <artifactId>junit</artifactId>
--                </exclusion>
--            </exclusions>
--        </dependency>
--        <dependency>
--            <groupId>org.xerial</groupId>
--            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.45.3.0</version>
--            <scope>runtime</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mysql</groupId>
--            <artifactId>mysql-connector-j</artifactId>
--            <version>8.3.0</version>
--            <scope>runtime</scope>
--        </dependency>
--        <!-- add these back in as they are not exposed by the API -->
--        <dependency>
--            <groupId>org.apache.maven</groupId>
--            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.9.6</version>
--            <scope>runtime</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.maven.resolver</groupId>
--            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.9.18</version>
--            <scope>runtime</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.maven.resolver</groupId>
--            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.9.18</version>
--            <scope>runtime</scope>
--        </dependency>
--        <!-- annotations -->
--        <dependency>
--            <groupId>org.jetbrains</groupId>
--            <artifactId>annotations-java5</artifactId>
--            <version>24.1.0</version>
--            <scope>provided</scope>
--        </dependency>
--        <!-- testing -->
--        <dependency>
--            <groupId>org.junit.jupiter</groupId>
--            <artifactId>junit-jupiter</artifactId>
--            <version>5.10.2</version>
--            <scope>test</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.hamcrest</groupId>
--            <artifactId>hamcrest</artifactId>
--            <version>2.2</version>
--            <scope>test</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.mockito</groupId>
--            <artifactId>mockito-core</artifactId>
--            <version>5.11.0</version>
--            <scope>test</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.ow2.asm</groupId>
--            <artifactId>asm-tree</artifactId>
--            <version>9.7</version>
--            <scope>test</scope>
--        </dependency>
--    </dependencies>
--
--    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
--    <build>
--        <plugins>
--            <plugin>
--                <groupId>net.md-5</groupId>
--                <artifactId>scriptus</artifactId>
--                <version>0.5.0</version>
--                <executions>
--                    <execution>
--                        <id>ex-spigot</id>
--                        <configuration>
--                            <format>${bt.name}-Spigot-%s</format>
--                            <scmDirectory>../</scmDirectory>
--                            <descriptionProperty>spigot.desc</descriptionProperty>
--                        </configuration>
--                        <phase>initialize</phase>
--                        <goals>
--                            <goal>describe</goal>
--                        </goals>
--                    </execution>
--                    <execution>
--                        <id>ex-craftbukkit</id>
--                        <configuration>
--                            <format>-%s</format>
--                            <scmDirectory>../../CraftBukkit</scmDirectory>
--                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
--                        </configuration>
--                        <phase>initialize</phase>
--                        <goals>
--                            <goal>describe</goal>
--                        </goals>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-clean-plugin</artifactId>
--                <version>3.2.0</version>
--                <executions>
--                    <execution>
--                        <phase>initialize</phase>
--                        <goals>
--                            <goal>clean</goal>
--                        </goals>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-jar-plugin</artifactId>
--                <version>3.4.1</version>
--                <configuration>
--                    <archive>
--                        <manifest>
--                            <addDefaultEntries>false</addDefaultEntries>
--                        </manifest>
--                        <manifestEntries>
--                            <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
--                            <Implementation-Title>CraftBukkit</Implementation-Title>
--                            <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
--                            <Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
--                            <Specification-Title>Bukkit</Specification-Title>
--                            <Specification-Version>${api.version}</Specification-Version>
--                            <Specification-Vendor>Bukkit Team</Specification-Vendor>
--                            <Multi-Release>true</Multi-Release>
--                        </manifestEntries>
--                        <manifestSections>
--                            <manifestSection>
--                                <name>net/bukkit/</name>
--                                <manifestEntries>
--                                    <Sealed>true</Sealed>
--                                </manifestEntries>
--                            </manifestSection>
--                            <manifestSection>
--                                <name>com/bukkit/</name>
--                                <manifestEntries>
--                                    <Sealed>true</Sealed>
--                                </manifestEntries>
--                            </manifestSection>
--                            <manifestSection>
--                                <name>org/bukkit/</name>
--                                <manifestEntries>
--                                    <Sealed>true</Sealed>
--                                </manifestEntries>
--                            </manifestSection>
--                        </manifestSections>
--                    </archive>
--                </configuration>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.5.3</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>shade</goal>
--                        </goals>
--                        <configuration>
--                            <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
--                            <artifactSet>
--                                <includes>
--                                    <include>org.spigotmc:minecraft-server</include>
--                                </includes>
--                            </artifactSet>
--                            <relocations>
--                                <relocation>
--                                    <pattern>org.bukkit.craftbukkit</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
--                                    <excludes>
--                                        <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
--                                        <exclude>org.bukkit.craftbukkit.Main*</exclude>
--                                    </excludes>
--                                </relocation>
--                            </relocations>
--                        </configuration>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>net.md-5</groupId>
--                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>2.0.3</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>remap</goal>
--                        </goals>
--                        <id>remap-members</id>
--                        <configuration>
--                            <useProjectDependencies>false</useProjectDependencies>
--                            <logFile>${project.build.directory}/server.txt</logFile>
--                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
--                            <reverse>true</reverse>
--                        </configuration>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>net.nicoulaj.maven.plugins</groupId>
--                <artifactId>checksum-maven-plugin</artifactId>
--                <version>1.11</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>artifacts</goal>
--                            <goal>dependencies</goal>
--                        </goals>
--                        <configuration>
--                            <algorithms>
--                                <algorithm>SHA-256</algorithm>
--                            </algorithms>
--                            <quiet>true</quiet>
--                            <scopes>
--                                <scope>compile</scope>
--                                <scope>runtime</scope>
--                            </scopes>
--                            <shasumSummary>true</shasumSummary>
--                            <transitive>true</transitive>
--                        </configuration>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-assembly-plugin</artifactId>
--                <version>3.7.1</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>single</goal>
--                        </goals>
--                        <configuration>
--                            <archive>
--                                <manifest>
--                                    <addDefaultEntries>false</addDefaultEntries>
--                                </manifest>
--                                <manifestEntries>
--                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
--                                </manifestEntries>
--                            </archive>
--                            <attach>false</attach>
--                            <descriptors>
--                                <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
--                            </descriptors>
--                        </configuration>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-compiler-plugin</artifactId>
--                <version>3.13.0</version>
--                <configuration>
--                    <!-- default changed with version 3.11.0 -->
--                    <showWarnings>false</showWarnings>
--                </configuration>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-surefire-plugin</artifactId>
--                <version>3.2.5</version>
--                <configuration>
--                    <workingDirectory>${basedir}/target/test-server</workingDirectory>
--                    <excludes>
--                        <exclude>org/bukkit/craftbukkit/inventory/ItemStack*Test.java</exclude>
--                    </excludes>
--                </configuration>
--            </plugin>
--        </plugins>
--    </build>
--
--    <profiles>
--        <profile>
--            <id>shadeSourcesJar</id>
--            <properties>
--                <shadeSourcesJar>true</shadeSourcesJar>
--                <shadeSourcesContent>true</shadeSourcesContent>
--            </properties>
--        </profile>
--        <profile>
--            <id>development</id>
--            <properties>
--                <skipTests>false</skipTests>
--            </properties>
--            <build>
--                <plugins>
--                    <plugin>
--                        <groupId>org.apache.maven.plugins</groupId>
--                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.3.1</version>
--                        <executions>
--                            <execution>
--                                <phase>test-compile</phase>
--                                <goals>
--                                    <goal>check</goal>
--                                </goals>
--                            </execution>
--                        </executions>
--                        <configuration>
--                            <configLocation>checkstyle.xml</configLocation>
--                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
--                        </configuration>
--                        <dependencies>
--                            <dependency>
--                                <groupId>com.puppycrawl.tools</groupId>
--                                <artifactId>checkstyle</artifactId>
--                                <version>8.45.1</version>
--                            </dependency>
--                        </dependencies>
--                    </plugin>
--                </plugins>
--            </build>
--        </profile>
--        <profile>
--            <id>remapped</id>
--            <build>
--                <plugins>
--                    <plugin>
--                        <groupId>net.md-5</groupId>
--                        <artifactId>specialsource-maven-plugin</artifactId>
--                        <executions>
--                            <execution>
--                                <phase>verify</phase>
--                                <goals>
--                                    <goal>remap</goal>
--                                </goals>
--                                <id>remap-obf</id>
--                                <configuration>
--                                    <useProjectDependencies>false</useProjectDependencies>
--                                    <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot</srgIn>
--                                    <reverse>true</reverse>
--                                    <remappedArtifactAttached>true</remappedArtifactAttached>
--                                    <remappedClassifierName>remapped-obf</remappedClassifierName>
--                                </configuration>
--                            </execution>
--                            <execution>
--                                <phase>verify</phase>
--                                <goals>
--                                    <goal>remap</goal>
--                                </goals>
--                                <id>remap-mojang</id>
--                                <configuration>
--                                    <useProjectDependencies>false</useProjectDependencies>
--                                    <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
--                                    <srgIn>org.spigotmc:minecraft-server:${project.version}:txt:maps-mojang</srgIn>
--                                    <remappedArtifactAttached>true</remappedArtifactAttached>
--                                    <remappedClassifierName>remapped-mojang</remappedClassifierName>
--                                </configuration>
--                            </execution>
--                        </executions>
--                    </plugin>
--                </plugins>
--            </build>
--        </profile>
--    </profiles>
--</project>

patches/unapplied/server/0002-Remap-fixes.patch

@@ -1,211 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <kyle@denwav.dev>
-Date: Fri, 11 Jun 2021 05:25:03 -0500
-Subject: [PATCH] Remap fixes
-
-
-diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index f0a764d3e1a756537b8188e9f5361d0dbaca25a9..478d2114fbd5c499a8adbf8b6cefcc8335e830dc 100644
---- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -311,9 +311,11 @@ public class BlockPos extends Vec3i {
- 
-     public static Iterable<BlockPos> withinManhattan(BlockPos center, int rangeX, int rangeY, int rangeZ) {
-         int i = rangeX + rangeY + rangeZ;
--        int j = center.getX();
--        int k = center.getY();
--        int l = center.getZ();
-+        // Paper start - rename variables to fix conflict with anonymous class (remap fix)
-+        int centerX = center.getX();
-+        int centerY = center.getY();
-+        int centerZ = center.getZ();
-+        // Paper end
-         return () -> new AbstractIterator<BlockPos>() {
-                 private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
-                 private int currentDepth;
-@@ -327,7 +329,7 @@ public class BlockPos extends Vec3i {
-                 protected BlockPos computeNext() {
-                     if (this.zMirror) {
-                         this.zMirror = false;
--                        this.cursor.setZ(l - (this.cursor.getZ() - l));
-+                        this.cursor.setZ(centerZ - (this.cursor.getZ() - centerZ)); // Paper - remap fix
-                         return this.cursor;
-                     } else {
-                         BlockPos blockPos;
-@@ -353,7 +355,7 @@ public class BlockPos extends Vec3i {
-                             int k = this.currentDepth - Math.abs(i) - Math.abs(j);
-                             if (k <= rangeZ) {
-                                 this.zMirror = k != 0;
--                                blockPos = this.cursor.set(j + i, k + j, l + k);
-+                                blockPos = this.cursor.set(centerX + i, centerY + j, centerZ + k); // Paper - remap fix
-                             }
-                         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index 7344cff32fa6fe3dedb74ed98126072c55b0abd2..d98b28e9488a5a7736719cf656736bb026ec8c7e 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-@@ -169,10 +169,10 @@ public class BehaviorUtils {
- 
-         return optional.map((uuid) -> {
-             return ((ServerLevel) entity.level()).getEntity(uuid);
--        }).map((entity) -> {
-+        }).map((entity1) -> { // Paper - remap fix
-             LivingEntity entityliving1;
- 
--            if (entity instanceof LivingEntity entityliving2) {
-+            if (entity1 instanceof LivingEntity entityliving2) { // Paper - remap fix
-                 entityliving1 = entityliving2;
-             } else {
-                 entityliving1 = null;
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-index 61592d57c26c359abda266f4ac8c58419e9beb02..83fce6746aaa3b378da6c5573ec9991d8438b071 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-@@ -255,8 +255,8 @@ public class LootTable {
- 
-     public static class Builder implements FunctionUserBuilder<LootTable.Builder> {
- 
--        private final Builder<LootPool> pools = ImmutableList.builder();
--        private final Builder<LootItemFunction> functions = ImmutableList.builder();
-+        private final ImmutableList.Builder<LootPool> pools = ImmutableList.builder();
-+        private final ImmutableList.Builder<LootItemFunction> functions = ImmutableList.builder();
-         private LootContextParamSet paramSet;
-         private Optional<ResourceLocation> randomSequence;
- 
-diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java
-index b70450722da13bc4d358a70d3d1d2f30a2cca2b9..86d86c292bdeeb7f42685691287c3b4bd476ea14 100644
---- a/src/test/java/org/bukkit/DyeColorsTest.java
-+++ b/src/test/java/org/bukkit/DyeColorsTest.java
-@@ -3,7 +3,6 @@ package org.bukkit;
- import static org.bukkit.support.MatcherAssert.*;
- import static org.hamcrest.Matchers.*;
- 
--import net.minecraft.world.item.DyeColor;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.jupiter.params.ParameterizedTest;
- import org.junit.jupiter.params.provider.EnumSource;
-@@ -14,7 +13,7 @@ public class DyeColorsTest extends AbstractTestingBase {
-     @EnumSource(DyeColor.class)
-     public void checkColor(DyeColor dye) {
-         Color color = dye.getColor();
--        float[] nmsColorArray = DyeColor.byId(dye.getWoolData()).getTextureDiffuseColors();
-+        float[] nmsColorArray = net.minecraft.world.item.DyeColor.byId(dye.getWoolData()).getTextureDiffuseColors(); // Paper - remap fix
-         Color nmsColor = Color.fromRGB((int) (nmsColorArray[0] * 255), (int) (nmsColorArray[1] * 255), (int) (nmsColorArray[2] * 255));
-         assertThat(color, is(nmsColor));
-     }
-@@ -23,7 +22,7 @@ public class DyeColorsTest extends AbstractTestingBase {
-     @EnumSource(org.bukkit.DyeColor.class)
-     public void checkFireworkColor(org.bukkit.DyeColor dye) {
-         Color color = dye.getFireworkColor();
--        int nmsColor = DyeColor.byId(dye.getWoolData()).getFireworkColor();
-+        int nmsColor = net.minecraft.world.item.DyeColor.byId(dye.getWoolData()).getFireworkColor(); // Paper - remap fix
-         assertThat(color, is(Color.fromRGB(nmsColor)));
-     }
- }
-diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java
-index 9c9f5dd2351b3067b54d6cc5bdb572c46b12aaa8..307e8a3694c6f0b48d2df9792c3e5fdbaae1fd8e 100644
---- a/src/test/java/org/bukkit/ParticleTest.java
-+++ b/src/test/java/org/bukkit/ParticleTest.java
-@@ -250,7 +250,7 @@ public class ParticleTest extends AbstractTestingBase {
-                 Check in CraftParticle if the conversion is still correct.
-                 """, bukkit.getKey()));
- 
--        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam),
-+        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix
-                 String.format("""
-                         Could not encoded particle param for particle %s.
-                         This can indicated, that the wrong particle param is created in CraftParticle.
-diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
-index 32df0090aab65b551b524603cce0b96e461cc358..952924abae79cc504342bbdb6f6953ab8a6cc295 100644
---- a/src/test/java/org/bukkit/entity/EntityTypesTest.java
-+++ b/src/test/java/org/bukkit/entity/EntityTypesTest.java
-@@ -6,7 +6,6 @@ import java.util.Set;
- import java.util.stream.Collectors;
- import net.minecraft.core.registries.BuiltInRegistries;
- import net.minecraft.resources.ResourceLocation;
--import net.minecraft.world.entity.EntityType;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.jupiter.api.Test;
- 
-@@ -16,8 +15,8 @@ public class EntityTypesTest extends AbstractTestingBase {
-     public void testMaps() {
-         Set<EntityType> allBukkit = Arrays.stream(EntityType.values()).filter((b) -> b.getName() != null).collect(Collectors.toSet());
- 
--        for (EntityType<?> nms : BuiltInRegistries.ENTITY_TYPE) {
--            ResourceLocation key = EntityType.getKey(nms);
-+        for (net.minecraft.world.entity.EntityType<?> nms : BuiltInRegistries.ENTITY_TYPE) { // Paper - remap fix
-+            ResourceLocation key = net.minecraft.world.entity.EntityType.getKey(nms); // Paper - remap fix
- 
-             org.bukkit.entity.EntityType bukkit = org.bukkit.entity.EntityType.fromName(key.getPath());
-             assertNotNull(bukkit, "Missing nms->bukkit " + key);
-diff --git a/src/test/java/org/bukkit/entity/PandaGeneTest.java b/src/test/java/org/bukkit/entity/PandaGeneTest.java
-index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b320842de2 100644
---- a/src/test/java/org/bukkit/entity/PandaGeneTest.java
-+++ b/src/test/java/org/bukkit/entity/PandaGeneTest.java
-@@ -2,7 +2,6 @@ package org.bukkit.entity;
- 
- import static org.junit.jupiter.api.Assertions.*;
- 
--import net.minecraft.world.entity.animal.Panda;
- import org.bukkit.craftbukkit.entity.CraftPanda;
- import org.junit.jupiter.api.Test;
- 
-@@ -10,8 +9,8 @@ public class PandaGeneTest {
- 
-     @Test
-     public void testBukkit() {
--        for (Panda.Gene gene : Panda.Gene.values()) {
--            Panda.Gene nms = CraftPanda.toNms(gene);
-+        for (Panda.Gene gene : Panda.Gene.values()) { // Paper - remap fix
-+            net.minecraft.world.entity.animal.Panda.Gene nms = CraftPanda.toNms(gene); // Paper - remap fix
- 
-             assertNotNull(nms, "NMS gene null for " + gene);
-             assertEquals(gene.isRecessive(), nms.isRecessive(), "Recessive status did not match " + gene);
-@@ -21,7 +20,7 @@ public class PandaGeneTest {
- 
-     @Test
-     public void testNMS() {
--        for (Panda.Gene gene : Panda.Gene.values()) {
-+        for (net.minecraft.world.entity.animal.Panda.Gene gene : net.minecraft.world.entity.animal.Panda.Gene.values()) { // Paper - remap fix
-             org.bukkit.entity.Panda.Gene bukkit = CraftPanda.fromNms(gene);
- 
-             assertNotNull(bukkit, "Bukkit gene null for " + gene);
-diff --git a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-index 6c84f1289c84d0aca1935c473ffa63dae1b52598..ebcb65cb74acdb9d1bcf2b4b3551a2dc6d809bc9 100644
---- a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-+++ b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-@@ -29,17 +29,17 @@ public class RegistryConstantsTest extends AbstractTestingBase {
- 
-     @Test
-     public void testTrimMaterial() {
--        this.testExcessConstants(TrimMaterial.class, Registry.TRIM_MATERIAL);
-+        this.testExcessConstants(TrimMaterial.class, org.bukkit.Registry.TRIM_MATERIAL); // Paper - remap fix
-         this.testMissingConstants(TrimMaterial.class, Registries.TRIM_MATERIAL);
-     }
- 
-     @Test
-     public void testTrimPattern() {
--        this.testExcessConstants(TrimPattern.class, Registry.TRIM_PATTERN);
-+        this.testExcessConstants(TrimPattern.class, org.bukkit.Registry.TRIM_PATTERN); // Paper - remap fix
-         this.testMissingConstants(TrimPattern.class, Registries.TRIM_PATTERN);
-     }
- 
--    private <T extends Keyed> void testExcessConstants(Class<T> clazz, Registry<T> registry) {
-+    private <T extends Keyed> void testExcessConstants(Class<T> clazz, org.bukkit.Registry<T> registry) { // Paper - remap fix
-         List<NamespacedKey> excessKeys = new ArrayList<>();
- 
-         for (Field field : clazz.getFields()) {
-diff --git a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-index 31062b6d9ad685ea3750c6b5ddc6b295bb263e0a..5842cb5a6f3da42b8c40e6cbd5c5366572bf7684 100644
---- a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-+++ b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-@@ -24,7 +24,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
- 
-     private static boolean initInterface = false;
-     private static boolean initAbstract = false;
--    private static Registry<Keyed> registry;
-+    private static org.bukkit.Registry<Keyed> registry; // Paper - remap fix
- 
-     public static Stream<Arguments> data() {
-         return Stream.of(

patches/unapplied/server/0003-Build-system-changes.patch

@@ -1,185 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 29 Feb 2016 20:40:33 -0600
-Subject: [PATCH] Build system changes
-
-== AT ==
-public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/net/URI;)Ljava/nio/file/Path;
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index a457cf30d37037ce09fbe5d26e051b9555ce9982..9ca8ddea1d53076e0f23c6e3bf3e3eca5cceb393 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -8,9 +8,7 @@ plugins {
- dependencies {
-     implementation(project(":paper-api"))
-     implementation("jline:jline:2.12.1")
--    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
--        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
--    }
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm-commons:9.7")
-     implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
-@@ -38,6 +36,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
-+        val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
-@@ -46,6 +45,9 @@ tasks.jar {
-             "Specification-Title" to "Bukkit",
-             "Specification-Version" to project.version,
-             "Specification-Vendor" to "Bukkit Team",
-+            "Git-Branch" to gitBranch, // Paper
-+            "Git-Commit" to gitHash, // Paper
-+            "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
-         )
-         for (tld in setOf("net", "com", "org")) {
-             attributes("$tld/bukkit", "Sealed" to true)
-@@ -58,6 +60,17 @@ publishing {
-     }
- }
- 
-+// Paper start
-+val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
-+    badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
-+    jarToScan.set(tasks.serverJar.flatMap { it.archiveFile })
-+    classpath.from(configurations.compileClasspath)
-+}
-+tasks.check {
-+    dependsOn(scanJar)
-+}
-+// Paper end
-+
- tasks.test {
-     exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
-     useJUnitPlatform()
-@@ -123,4 +136,5 @@ tasks.registerRunTask("runReobf") {
- tasks.registerRunTask("runDev") {
-     description = "Spin up a non-relocated Mojang-mapped test server"
-     classpath(sourceSets.main.map { it.runtimeClasspath })
-+    jvmArgs("-DPaper.pushPaperAssetsRoot=true")
- }
-diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
-index 0e93817621bad5d69cf0f9f839d033c47c861457..0ad6d9d417193248f6a9df67f1d1a66cef3ff122 100644
---- a/src/main/java/net/minecraft/resources/ResourceLocation.java
-+++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
-@@ -32,6 +32,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
-     public static final char NAMESPACE_SEPARATOR = ':';
-     public static final String DEFAULT_NAMESPACE = "minecraft";
-     public static final String REALMS_NAMESPACE = "realms";
-+    public static final String PAPER_NAMESPACE = "paper"; // Paper
-     private final String namespace;
-     private final String path;
- 
-diff --git a/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java b/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
-index 14fc03563daea531314c7ceba56dbb47884010ee..fcf95958ef659c7aa8e28026961fa1d6a5f8b28c 100644
---- a/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
-+++ b/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
-@@ -138,6 +138,15 @@ public class VanillaPackResourcesBuilder {
- 
-     public VanillaPackResourcesBuilder applyDevelopmentConfig() {
-         developmentConfig.accept(this);
-+        if (Boolean.getBoolean("Paper.pushPaperAssetsRoot")) {
-+            try {
-+                this.pushAssetPath(net.minecraft.server.packs.PackType.SERVER_DATA, net.minecraft.server.packs.VanillaPackResourcesBuilder.safeGetPath(java.util.Objects.requireNonNull(
-+                    // Important that this is a patched class
-+                    VanillaPackResourcesBuilder.class.getResource("/data/.paperassetsroot"), "Missing required .paperassetsroot file").toURI()).getParent());
-+            } catch (java.net.URISyntaxException | IOException ex) {
-+                throw new RuntimeException(ex);
-+            }
-+        }
-         return this;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-index a5e8713bc0fefae455b666ebf13c9529e7ba94e6..1a528e1aa7b12f8b8cffce6c7bc4b5d5865f026b 100644
---- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-+++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-@@ -48,7 +48,7 @@ public class ServerPacksSource extends BuiltInPackSource {
-     public static VanillaPackResources createVanillaPackSource() {
-         return new VanillaPackResourcesBuilder()
-             .setMetadata(BUILT_IN_METADATA)
--            .exposeNamespace("minecraft")
-+            .exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE) // Paper
-             .applyDevelopmentConfig()
-             .pushJarResources()
-             .build(VANILLA_PACK_INFO);
-@@ -68,7 +68,18 @@ public class ServerPacksSource extends BuiltInPackSource {
-     @Nullable
-     @Override
-     protected Pack createBuiltinPack(String fileName, Pack.ResourcesSupplier packFactory, Component displayName) {
--        return Pack.readMetaAndCreate(createBuiltInPackLocation(fileName, displayName), packFactory, PackType.SERVER_DATA, FEATURE_SELECTION_CONFIG);
-+        // Paper start - custom built-in pack
-+        final PackLocationInfo info;
-+        final PackSelectionConfig packConfig;
-+        if ("paper".equals(fileName)) {
-+            info = new PackLocationInfo(fileName, displayName, PackSource.BUILT_IN, Optional.empty());
-+            packConfig = new PackSelectionConfig(true, Pack.Position.TOP, true);
-+        } else {
-+            info = createBuiltInPackLocation(fileName, displayName);
-+            packConfig = FEATURE_SELECTION_CONFIG;
-+        }
-+        return Pack.readMetaAndCreate(info, packFactory, PackType.SERVER_DATA, packConfig);
-+        // Paper end - custom built-in pack
-     }
- 
-     public static PackRepository createPackRepository(Path dataPacksPath, DirectoryValidator symlinkFinder) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 029783f07da0a8d91c2e443f76359b89869bc4cc..bebc3bcffa6dc12d4caf613f05b1e2a28a26f316 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -210,7 +210,7 @@ public class Main {
-                 }
- 
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
--                    Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
-+                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
- 
-                     Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -21);
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-         Properties properties = new Properties();
- 
-         if (stream != null) {
-diff --git a/src/main/resources/data/.paperassetsroot b/src/main/resources/data/.paperassetsroot
-new file mode 100644
-index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-diff --git a/src/main/resources/data/minecraft/datapacks/paper/pack.mcmeta b/src/main/resources/data/minecraft/datapacks/paper/pack.mcmeta
-new file mode 100644
-index 0000000000000000000000000000000000000000..288fbe68c6053f40e72f0feedef0ae0fed10fa67
---- /dev/null
-+++ b/src/main/resources/data/minecraft/datapacks/paper/pack.mcmeta
-@@ -0,0 +1,6 @@
-+{
-+    "pack": {
-+        "description": "Built-in Paper Datapack",
-+        "pack_format": 41
-+    }
-+}
-diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 1bdf0b2b8f8e6dace403695fece80ebb3dc9e039..544307fe34cbcfa286a7d7b30900ebea127d189e 100644
---- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
-+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-@@ -43,6 +43,7 @@ public abstract class AbstractTestingBase {
-     public static final Registry<Biome> BIOMES;
- 
-     static {
-+        System.setProperty("Paper.pushPaperAssetsRoot", "true"); // Paper
-         SharedConstants.tryDetectVersion();
-         Bootstrap.bootStrap();
-         // Populate available packs

patches/unapplied/server/0004-Test-changes.patch

@@ -1,372 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 13 Feb 2023 14:14:56 -0800
-Subject: [PATCH] Test changes
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 9ca8ddea1d53076e0f23c6e3bf3e3eca5cceb393..2f73e709dcde063ec7ca2181f2f2d5670fd479f5 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -22,6 +22,7 @@ dependencies {
-     testImplementation("org.hamcrest:hamcrest:2.2")
-     testImplementation("org.mockito:mockito-core:5.11.0")
-     testImplementation("org.ow2.asm:asm-tree:9.7")
-+    testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
- }
- 
- paperweight {
-@@ -55,6 +56,12 @@ tasks.jar {
-     }
- }
- 
-+// Paper start - compile tests with -parameters for better junit parameterized test names
-+tasks.compileTestJava {
-+    options.compilerArgs.add("-parameters")
-+}
-+// Paper end
-+
- publishing {
-     publications.create<MavenPublication>("maven") {
-     }
-diff --git a/src/test/java/io/papermc/paper/registry/RegistryKeyTest.java b/src/test/java/io/papermc/paper/registry/RegistryKeyTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e070aa1bb69859224493d958621389ee757f8752
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/registry/RegistryKeyTest.java
-@@ -0,0 +1,33 @@
-+package io.papermc.paper.registry;
-+
-+import java.util.Optional;
-+import java.util.stream.Stream;
-+import net.minecraft.core.Registry;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.resources.ResourceLocation;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.jupiter.api.BeforeAll;
-+import org.junit.jupiter.params.ParameterizedTest;
-+import org.junit.jupiter.params.provider.MethodSource;
-+
-+import static org.junit.jupiter.api.Assertions.assertTrue;
-+
-+class RegistryKeyTest extends AbstractTestingBase {
-+
-+    @BeforeAll
-+    static void before() throws ClassNotFoundException {
-+        Class.forName(RegistryKey.class.getName()); // load all keys so they are found for the test
-+    }
-+
-+    static Stream<RegistryKey<?>> data() {
-+        return RegistryKeyImpl.REGISTRY_KEYS.stream();
-+    }
-+
-+    @ParameterizedTest
-+    @MethodSource("data")
-+    void testApiRegistryKeysExist(final RegistryKey<?> key) {
-+        final Optional<Registry<Object>> registry = AbstractTestingBase.REGISTRY_CUSTOM.registry(ResourceKey.createRegistryKey(new ResourceLocation(key.key().asString())));
-+        assertTrue(registry.isPresent(), "Missing vanilla registry for " + key.key().asString());
-+
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/util/EmptyTag.java b/src/test/java/io/papermc/paper/util/EmptyTag.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6eb95a5e2534974c0e52e2b78b04e7c2b2f28525
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/util/EmptyTag.java
-@@ -0,0 +1,31 @@
-+package io.papermc.paper.util;
-+
-+import java.util.Collections;
-+import java.util.Set;
-+import org.bukkit.Keyed;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.Tag;
-+import org.jetbrains.annotations.NotNull;
-+
-+public record EmptyTag(NamespacedKey key) implements Tag<Keyed> {
-+
-+    @SuppressWarnings("deprecation")
-+    public EmptyTag() {
-+        this(NamespacedKey.randomKey());
-+    }
-+
-+    @Override
-+    public @NotNull NamespacedKey getKey() {
-+        return this.key;
-+    }
-+
-+    @Override
-+    public boolean isTagged(@NotNull final Keyed item) {
-+        return false;
-+    }
-+
-+    @Override
-+    public @NotNull Set<Keyed> getValues() {
-+        return Collections.emptySet();
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/util/MethodParameterProvider.java b/src/test/java/io/papermc/paper/util/MethodParameterProvider.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..3f58ef36df34cd15fcb72189eeff057654adf0c6
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/util/MethodParameterProvider.java
-@@ -0,0 +1,206 @@
-+/*
-+ * Copyright 2015-2023 the original author or authors of https://github.com/junit-team/junit5/blob/6593317c15fb556febbde11914fa7afe00abf8cd/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
-+ *
-+ * All rights reserved. This program and the accompanying materials are
-+ * made available under the terms of the Eclipse Public License v2.0 which
-+ * accompanies this distribution and is available at
-+ *
-+ * https://www.eclipse.org/legal/epl-v20.html
-+ */
-+
-+package io.papermc.paper.util;
-+
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Parameter;
-+import java.util.List;
-+import java.util.function.Predicate;
-+import java.util.stream.Stream;
-+import org.junit.jupiter.api.Test;
-+import org.junit.jupiter.api.TestFactory;
-+import org.junit.jupiter.api.TestTemplate;
-+import org.junit.jupiter.api.extension.ExtensionContext;
-+import org.junit.jupiter.params.support.AnnotationConsumer;
-+import org.junit.platform.commons.JUnitException;
-+import org.junit.platform.commons.PreconditionViolationException;
-+import org.junit.platform.commons.util.ClassLoaderUtils;
-+import org.junit.platform.commons.util.CollectionUtils;
-+import org.junit.platform.commons.util.Preconditions;
-+import org.junit.platform.commons.util.ReflectionUtils;
-+import org.junit.platform.commons.util.StringUtils;
-+import org.junitpioneer.jupiter.cartesian.CartesianParameterArgumentsProvider;
-+
-+import static java.lang.String.format;
-+import static java.util.Arrays.stream;
-+import static java.util.stream.Collectors.toList;
-+import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
-+import static org.junit.platform.commons.util.CollectionUtils.isConvertibleToStream;
-+
-+public class MethodParameterProvider implements CartesianParameterArgumentsProvider<Object>, AnnotationConsumer<MethodParameterSource> {
-+    private MethodParameterSource source;
-+
-+    MethodParameterProvider() {
-+    }
-+
-+    @Override
-+    public void accept(final MethodParameterSource source) {
-+        this.source = source;
-+    }
-+
-+    @Override
-+    public Stream<Object> provideArguments(ExtensionContext context, Parameter parameter) {
-+        return this.provideArguments(context, this.source);
-+    }
-+
-+    // Below is mostly copied from MethodArgumentsProvider
-+
-+    private static final Predicate<Method> isFactoryMethod = //
-+        method -> isConvertibleToStream(method.getReturnType()) && !isTestMethod(method);
-+
-+    protected Stream<Object> provideArguments(ExtensionContext context, MethodParameterSource methodSource) {
-+        Class<?> testClass = context.getRequiredTestClass();
-+        Method testMethod = context.getRequiredTestMethod();
-+        Object testInstance = context.getTestInstance().orElse(null);
-+        String[] methodNames = methodSource.value();
-+        // @formatter:off
-+        return stream(methodNames)
-+            .map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
-+            .map(factoryMethod -> validateFactoryMethod(factoryMethod, testInstance))
-+            .map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
-+            .flatMap(CollectionUtils::toStream);
-+        // @formatter:on
-+    }
-+
-+    private static Method findFactoryMethod(Class<?> testClass, Method testMethod, String factoryMethodName) {
-+        String originalFactoryMethodName = factoryMethodName;
-+
-+        // If the user did not provide a factory method name, find a "default" local
-+        // factory method with the same name as the parameterized test method.
-+        if (StringUtils.isBlank(factoryMethodName)) {
-+            factoryMethodName = testMethod.getName();
-+            return findFactoryMethodBySimpleName(testClass, testMethod, factoryMethodName);
-+        }
-+
-+        // Convert local factory method name to fully-qualified method name.
-+        if (!looksLikeAFullyQualifiedMethodName(factoryMethodName)) {
-+            factoryMethodName = testClass.getName() + "#" + factoryMethodName;
-+        }
-+
-+        // Find factory method using fully-qualified name.
-+        Method factoryMethod = findFactoryMethodByFullyQualifiedName(testClass, testMethod, factoryMethodName);
-+
-+        // Ensure factory method has a valid return type and is not a test method.
-+        Preconditions.condition(isFactoryMethod.test(factoryMethod), () -> format(
-+            "Could not find valid factory method [%s] for test class [%s] but found the following invalid candidate: %s",
-+            originalFactoryMethodName, testClass.getName(), factoryMethod));
-+
-+        return factoryMethod;
-+    }
-+
-+    private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodName) {
-+        if (factoryMethodName.contains("#")) {
-+            return true;
-+        }
-+        int indexOfFirstDot = factoryMethodName.indexOf('.');
-+        if (indexOfFirstDot == -1) {
-+            return false;
-+        }
-+        int indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('(');
-+        if (indexOfLastOpeningParenthesis > 0) {
-+            // Exclude simple/local method names with parameters
-+            return indexOfFirstDot < indexOfLastOpeningParenthesis;
-+        }
-+        // If we get this far, we conclude the supplied factory method name "looks"
-+        // like it was intended to be a fully-qualified method name, even if the
-+        // syntax is invalid. We do this in order to provide better diagnostics for
-+        // the user when a fully-qualified method name is in fact invalid.
-+        return true;
-+    }
-+
-+    // package-private for testing
-+    static Method findFactoryMethodByFullyQualifiedName(
-+        Class<?> testClass, Method testMethod,
-+        String fullyQualifiedMethodName
-+    ) {
-+        String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
-+        String className = methodParts[0];
-+        String methodName = methodParts[1];
-+        String methodParameters = methodParts[2];
-+        ClassLoader classLoader = ClassLoaderUtils.getClassLoader(testClass);
-+        Class<?> clazz = loadRequiredClass(className, classLoader);
-+
-+        // Attempt to find an exact match first.
-+        Method factoryMethod = ReflectionUtils.findMethod(clazz, methodName, methodParameters).orElse(null);
-+        if (factoryMethod != null) {
-+            return factoryMethod;
-+        }
-+
-+        boolean explicitParameterListSpecified = //
-+            StringUtils.isNotBlank(methodParameters) || fullyQualifiedMethodName.endsWith("()");
-+
-+        // If we didn't find an exact match but an explicit parameter list was specified,
-+        // that's a user configuration error.
-+        Preconditions.condition(!explicitParameterListSpecified,
-+            () -> format("Could not find factory method [%s(%s)] in class [%s]", methodName, methodParameters,
-+                className));
-+
-+        // Otherwise, fall back to the same lenient search semantics that are used
-+        // to locate a "default" local factory method.
-+        return findFactoryMethodBySimpleName(clazz, testMethod, methodName);
-+    }
-+
-+    /**
-+     * Find the factory method by searching for all methods in the given {@code clazz}
-+     * with the desired {@code factoryMethodName} which have return types that can be
-+     * converted to a {@link Stream}, ignoring the {@code testMethod} itself as well
-+     * as any {@code @Test}, {@code @TestTemplate}, or {@code @TestFactory} methods
-+     * with the same name.
-+     *
-+     * @return the single factory method matching the search criteria
-+     * @throws PreconditionViolationException if the factory method was not found or
-+     *                                        multiple competing factory methods with the same name were found
-+     */
-+    private static Method findFactoryMethodBySimpleName(Class<?> clazz, Method testMethod, String factoryMethodName) {
-+        Predicate<Method> isCandidate = candidate -> factoryMethodName.equals(candidate.getName())
-+            && !testMethod.equals(candidate);
-+        List<Method> candidates = ReflectionUtils.findMethods(clazz, isCandidate);
-+
-+        List<Method> factoryMethods = candidates.stream().filter(isFactoryMethod).collect(toList());
-+
-+        Preconditions.condition(factoryMethods.size() > 0, () -> {
-+            // If we didn't find the factory method using the isFactoryMethod Predicate, perhaps
-+            // the specified factory method has an invalid return type or is a test method.
-+            // In that case, we report the invalid candidates that were found.
-+            if (candidates.size() > 0) {
-+                return format(
-+                    "Could not find valid factory method [%s] in class [%s] but found the following invalid candidates: %s",
-+                    factoryMethodName, clazz.getName(), candidates);
-+            }
-+            // Otherwise, report that we didn't find anything.
-+            return format("Could not find factory method [%s] in class [%s]", factoryMethodName, clazz.getName());
-+        });
-+        Preconditions.condition(factoryMethods.size() == 1,
-+            () -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
-+                factoryMethodName, clazz.getName(), factoryMethods));
-+        return factoryMethods.get(0);
-+    }
-+
-+    private static boolean isTestMethod(Method candidate) {
-+        return isAnnotated(candidate, Test.class) || isAnnotated(candidate, TestTemplate.class)
-+            || isAnnotated(candidate, TestFactory.class);
-+    }
-+
-+    private static Class<?> loadRequiredClass(String className, ClassLoader classLoader) {
-+        return ReflectionUtils.tryToLoadClass(className, classLoader).getOrThrow(
-+            cause -> new JUnitException(format("Could not load class [%s]", className), cause));
-+    }
-+
-+    private static Method validateFactoryMethod(Method factoryMethod, Object testInstance) {
-+        Preconditions.condition(
-+            factoryMethod.getDeclaringClass().isInstance(testInstance) || ReflectionUtils.isStatic(factoryMethod),
-+            () -> format("Method '%s' must be static: local factory methods must be static "
-+                    + "unless the PER_CLASS @TestInstance lifecycle mode is used; "
-+                    + "external factory methods must always be static.",
-+                factoryMethod.toGenericString()));
-+        return factoryMethod;
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/util/MethodParameterSource.java b/src/test/java/io/papermc/paper/util/MethodParameterSource.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6cbf11c898439834cffb99ef84e5df1494356809
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/util/MethodParameterSource.java
-@@ -0,0 +1,14 @@
-+package io.papermc.paper.util;
-+
-+import java.lang.annotation.ElementType;
-+import java.lang.annotation.Retention;
-+import java.lang.annotation.RetentionPolicy;
-+import java.lang.annotation.Target;
-+import org.junitpioneer.jupiter.cartesian.CartesianArgumentsSource;
-+
-+@Retention(RetentionPolicy.RUNTIME)
-+@Target({ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
-+@CartesianArgumentsSource(MethodParameterProvider.class)
-+public @interface MethodParameterSource {
-+    String[] value() default {};
-+}
-diff --git a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-index ebcb65cb74acdb9d1bcf2b4b3551a2dc6d809bc9..7d9dbed7281099b78d7f898885b37cdcfe8b099f 100644
---- a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-+++ b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-@@ -24,7 +24,7 @@ public class RegistryConstantsTest extends AbstractTestingBase {
-     @Test
-     public void testDamageType() {
-         this.testExcessConstants(DamageType.class, Registry.DAMAGE_TYPE);
--        // this.testMissingConstants(DamageType.class, Registries.DAMAGE_TYPE); // WIND_CHARGE not registered
-+        this.testMissingConstants(DamageType.class, Registries.DAMAGE_TYPE); // Paper - re-enable this one
-     }
- 
-     @Test
-diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java
-index 4153866f3e630e54a23dc085aaac5e804344aa43..b8fe92fc75c611ee1efb82a8ab7089f28bf338ea 100644
---- a/src/test/java/org/bukkit/support/DummyServer.java
-+++ b/src/test/java/org/bukkit/support/DummyServer.java
-@@ -50,6 +50,15 @@ public final class DummyServer {
-                 return registers.computeIfAbsent(aClass, key -> CraftRegistry.createRegistry(aClass, AbstractTestingBase.REGISTRY_CUSTOM));
-             });
- 
-+            // Paper start - testing additions
-+            final Thread currentThread = Thread.currentThread();
-+            when(instance.isPrimaryThread()).thenAnswer(ignored -> Thread.currentThread().equals(currentThread));
-+
-+            final org.bukkit.plugin.PluginManager pluginManager = new org.bukkit.plugin.SimplePluginManager(instance, new org.bukkit.command.SimpleCommandMap(instance));
-+            when(instance.getPluginManager()).thenReturn(pluginManager);
-+            when(instance.getTag(anyString(), any(org.bukkit.NamespacedKey.class), any())).thenAnswer(ignored -> new io.papermc.paper.util.EmptyTag());
-+            // paper end - testing additions
-+
-             Bukkit.setServer(instance);
-         } catch (Throwable t) {
-             throw new Error(t);

patches/unapplied/server/0006-MC-Dev-fixes.patch

@@ -1,111 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 30 Mar 2016 19:36:20 -0400
-Subject: [PATCH] MC Dev fixes
-
-
-diff --git a/src/main/java/net/minecraft/commands/arguments/item/ItemInput.java b/src/main/java/net/minecraft/commands/arguments/item/ItemInput.java
-index a9617232c488a7a641b6657b265a5e42e77bc117..3d24fbca90bc7d8bdbac1be2176555c15ae75039 100644
---- a/src/main/java/net/minecraft/commands/arguments/item/ItemInput.java
-+++ b/src/main/java/net/minecraft/commands/arguments/item/ItemInput.java
-@@ -68,6 +68,6 @@ public class ItemInput {
-     }
- 
-     private String getItemName() {
--        return this.item.unwrapKey().map(ResourceKey::location).orElseGet(() -> "unknown[" + this.item + "]").toString();
-+        return this.item.unwrapKey().<Object>map(ResourceKey::location).orElseGet(() -> "unknown[" + this.item + "]").toString(); // Paper - decompile fix
-     }
- }
-diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 478d2114fbd5c499a8adbf8b6cefcc8335e830dc..2074d4327f0c356c220f3a6a9761439e76a15fc3 100644
---- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -427,12 +427,12 @@ public class BlockPos extends Vec3i {
-                     if (this.index == l) {
-                         return this.endOfData();
-                     } else {
--                        int i = this.index % i;
--                        int j = this.index / i;
--                        int k = j % j;
--                        int l = j / j;
-+                        int offsetX = this.index % i; // Paper - decomp fix
-+                        int u = this.index / i; // Paper - decomp fix
-+                        int offsetY = u % j; // Paper - decomp fix
-+                        int offsetZ = u / j; // Paper - decomp fix
-                         this.index++;
--                        return this.cursor.set(startX + i, startY + k, startZ + l);
-+                        return this.cursor.set(startX + offsetX, startY + offsetY, startZ + offsetZ); // Paper - decomp fix
-                     }
-                 }
-             };
-diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-index 433b6673ea62d466c466c1ff3732041a8fcbb6b5..bc91370654f5da33cbfe7d42431568915c1159d6 100644
---- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-+++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-@@ -299,7 +299,7 @@ public class BuiltInRegistries {
-         Bootstrap.checkBootstrapCalled(() -> "registry " + key);
-         ResourceLocation resourceLocation = key.location();
-         LOADERS.put(resourceLocation, () -> initializer.run(registry));
--        WRITABLE_REGISTRY.register((ResourceKey<WritableRegistry<?>>)key, registry, RegistrationInfo.BUILT_IN);
-+        WRITABLE_REGISTRY.register((ResourceKey)key, registry, RegistrationInfo.BUILT_IN); // Paper - decompile fix
-         return registry;
-     }
- 
-diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java
-index a614e960fcd5958ad17b679eee8a8e6926f58e62..da101bca71f4710812621b98f0a0d8cab180346a 100644
---- a/src/main/java/net/minecraft/nbt/TagParser.java
-+++ b/src/main/java/net/minecraft/nbt/TagParser.java
-@@ -253,11 +253,11 @@ public class TagParser {
-             }
- 
-             if (typeReader == ByteTag.TYPE) {
--                list.add((T)((NumericTag)tag).getAsByte());
-+                list.add((T)(Byte)((NumericTag)tag).getAsByte()); // Paper - decompile fix
-             } else if (typeReader == LongTag.TYPE) {
--                list.add((T)((NumericTag)tag).getAsLong());
-+                list.add((T)(Long)((NumericTag)tag).getAsLong()); // Paper - decompile fix
-             } else {
--                list.add((T)((NumericTag)tag).getAsInt());
-+                list.add((T)(Integer)((NumericTag)tag).getAsInt()); // Paper - decompile fix
-             }
- 
-             if (!this.hasElementSeparator()) {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c2c20eb7fedbadc56b1f8ee8bf4b03092e62a26b..925c2c83191bdb70b0d14a6177183e4d9a190a97 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1924,7 +1924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             PackRepository resourcepackrepository = this.packRepository;
- 
-             Objects.requireNonNull(this.packRepository);
--            return stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error
-+            return stream.<Pack>map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error // Paper - decompile error // todo: is this needed anymore?
-         }, this).thenCompose((immutablelist) -> {
-             MultiPackResourceManager resourcemanager = new MultiPackResourceManager(PackType.SERVER_DATA, immutablelist);
- 
-diff --git a/src/main/java/net/minecraft/util/SortedArraySet.java b/src/main/java/net/minecraft/util/SortedArraySet.java
-index 661a6274a800ca9b91bdb809d026972d23c3b263..ea72dcb064a35bc6245bc5c94d592efedd8faf41 100644
---- a/src/main/java/net/minecraft/util/SortedArraySet.java
-+++ b/src/main/java/net/minecraft/util/SortedArraySet.java
-@@ -28,7 +28,7 @@ public class SortedArraySet<T> extends AbstractSet<T> {
-     }
- 
-     public static <T extends Comparable<T>> SortedArraySet<T> create(int initialCapacity) {
--        return new SortedArraySet<>(initialCapacity, Comparator.naturalOrder());
-+        return new SortedArraySet<>(initialCapacity, Comparator.<T>naturalOrder()); // Paper - decompile fix
-     }
- 
-     public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index 328888db50c7ef7cae8305a6aa19d1af9a8c880d..ac411202c0029052a962b51b015da191b124de5f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-@@ -62,7 +62,7 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
-     protected void registerGoals() {
-         super.registerGoals();
-         this.goalSelector.addGoal(0, new FloatGoal(this));
--        this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, this, 10.0F));
-+        this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, 10.0F)); // Paper - decomp fix
-         this.goalSelector.addGoal(3, new RangedCrossbowAttackGoal<>(this, 1.0D, 8.0F));
-         this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
-         this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F));

patches/unapplied/server/0008-CB-fixes.patch

@@ -1,146 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 25 Feb 2022 07:14:48 -0800
-Subject: [PATCH] CB fixes
-
-* Missing Level -> LevelStem generic in StructureCheck
-  Need to use the right for injectDatafixingContext (Spottedleaf)
-
-* Removed incorrect parent perm for `minecraft.debugstick.always` (Machine_Maker)
-
-* Fixed method signature of Marker#addPassenger (Machine_Maker)
-
-* Removed unneeded UOE in CustomWorldChunkManager (extends BiomeSource) (Machine_Maker)
-
-* Honor Server#getLootTable method contract (Machine_Maker)
-
-Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b84078f8105bccc40da0c14932ad3160c96d371c..c4bd9be9d1884be1f5040ff1417f44f8ac4b655f 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -302,7 +302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-         long l = minecraftserver.getWorldData().worldGenOptions().seed();
- 
--        this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
-+        this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), this.getTypeKey(), chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer); // Paper - Fix missing CB diff
-         this.structureManager = new StructureManager(this, this.serverLevelData.worldGenOptions(), this.structureCheck); // CraftBukkit
-         if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END
-             this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index 0dc7f88877020bddd5a84db51d349f52b673048e..aae73586265593ee7830fb8dd5c2e3d7560057f0 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-@@ -40,7 +40,7 @@ public class StructureCheck {
-     private final ChunkScanAccess storageAccess;
-     private final RegistryAccess registryAccess;
-     private final StructureTemplateManager structureTemplateManager;
--    private final ResourceKey<Level> dimension;
-+    private final ResourceKey<net.minecraft.world.level.dimension.LevelStem> dimension; // Paper - fix missing CB diff
-     private final ChunkGenerator chunkGenerator;
-     private final RandomState randomState;
-     private final LevelHeightAccessor heightAccessor;
-@@ -54,7 +54,7 @@ public class StructureCheck {
-         ChunkScanAccess chunkIoWorker,
-         RegistryAccess registryManager,
-         StructureTemplateManager structureTemplateManager,
--        ResourceKey<Level> worldKey,
-+        ResourceKey<net.minecraft.world.level.dimension.LevelStem> worldKey, // Paper - fix missing CB diff
-         ChunkGenerator chunkGenerator,
-         RandomState noiseConfig,
-         LevelHeightAccessor world,
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-index 9b90649f71849b3830ca9b6a3c5a722c66b02f1f..209c6b64e79c29ea3bb84ddbe89a8bff66f81d0f 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-@@ -197,4 +197,11 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
-         org.bukkit.loot.LootTable table = (org.bukkit.loot.LootTable) obj;
-         return table.getKey().equals(this.getKey());
-     }
-+
-+    // Paper start - satisfy equals/hashCode contract
-+    @Override
-+    public int hashCode() {
-+        return java.util.Objects.hash(key);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4a4f7af9c7377e79a20398310ef7cf719d3cc0b5..10549f2f4d6ae01c080cdba16c71656b764314c3 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2506,7 +2506,13 @@ public final class CraftServer implements Server {
-         Preconditions.checkArgument(key != null, "NamespacedKey key cannot be null");
- 
-         ReloadableServerRegistries.Holder registry = this.getServer().reloadableRegistries();
--        return new CraftLootTable(key, registry.getLootTable(CraftLootTable.bukkitKeyToMinecraft(key)));
-+        // Paper start - honor method contract
-+        final ResourceKey<net.minecraft.world.level.storage.loot.LootTable> lootTableKey = CraftLootTable.bukkitKeyToMinecraft(key);
-+        final Optional<net.minecraft.world.level.storage.loot.LootTable> table = registry.get().lookup(Registries.LOOT_TABLE)
-+            .flatMap(registryEntryLookup -> registryEntryLookup.get(lootTableKey))
-+            .map(net.minecraft.core.Holder::value);
-+        return table.map(lootTable -> new CraftLootTable(key, lootTable)).orElse(null);
-+        // Paper end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bbc880e136c8fba9634fd4fee9e3e6838ef3f377..e5f070de12b63487b71c54d8020a895e5eda862c 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -123,6 +123,7 @@ public class Main {
-                 this.acceptsAll(Main.asList("forceUpgrade"), "Whether to force a world upgrade");
-                 this.acceptsAll(Main.asList("eraseCache"), "Whether to force cache erase during world upgrade");
-                 this.acceptsAll(Main.asList("recreateRegionFiles"), "Whether to recreate region files during world upgrade");
-+                this.accepts("safeMode", "Loads level with vanilla datapack only"); // Paper
-                 this.acceptsAll(Main.asList("nogui"), "Disables the graphical console");
- 
-                 this.acceptsAll(Main.asList("nojline"), "Disables jline and emulates the vanilla console");
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 905adf97c0d1f0d1c774a6835a5dffcfea884e58..c017ce2ca1bc535795c958a2e509af2adf88efa9 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -26,6 +26,7 @@ import org.bukkit.scheduler.BukkitWorker;
- 
- /**
-  * The fundamental concepts for this implementation:
-+ * <ul>
-  * <li>Main thread owns {@link #head} and {@link #currentTick}, but it may be read from any thread</li>
-  * <li>Main thread exclusively controls {@link #temp} and {@link #pending}.
-  *     They are never to be accessed outside of the main thread; alternatives exist to prevent locking.</li>
-@@ -41,6 +42,7 @@ import org.bukkit.scheduler.BukkitWorker;
-  * <li>Sync tasks are only to be removed from runners on the main thread when coupled with a removal from pending and temp.</li>
-  * <li>Most of the design in this scheduler relies on queuing special tasks to perform any data changes on the main thread.
-  *     When executed from inside a synchronous method, the scheduler will be updated before next execution by virtue of the frequent {@link #parsePending()} calls.</li>
-+ * </ul>
-  */
- public class CraftScheduler implements BukkitScheduler {
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 8021fa01542a5dd203a834e88e286903093690cd..3879f1f69e13f4e90bd66c533bf76b257f041394 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -244,7 +244,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         try {
-             nmsStack.applyComponents(new ItemParser(Commands.createValidationContext(MinecraftServer.getDefaultRegistryAccess())).parse(new StringReader(arguments)).components());
-         } catch (CommandSyntaxException ex) {
--            Logger.getLogger(CraftMagicNumbers.class.getName()).log(Level.SEVERE, null, ex);
-+            com.mojang.logging.LogUtils.getClassLogger().error("Exception modifying ItemStack", new Throwable(ex)); // Paper - show stack trace
-         }
- 
-         stack.setItemMeta(CraftItemStack.getItemMeta(nmsStack));
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-index 5ac25dab93fd4c9e9533c80d1ca3d93446d7a365..245ad120a36b6defca7e6889faae1ca5fc33d0c7 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-@@ -15,7 +15,7 @@ public final class CraftDefaultPermissions {
-         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".nbt.place", "Gives the user the ability to place restricted blocks with NBT in creative", org.bukkit.permissions.PermissionDefault.OP, parent);
-         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".nbt.copy", "Gives the user the ability to copy NBT in creative", org.bukkit.permissions.PermissionDefault.TRUE, parent);
-         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick", "Gives the user the ability to use the debug stick in creative", org.bukkit.permissions.PermissionDefault.OP, parent);
--        DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE, parent);
-+        DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE/* , parent */); // Paper - should not have this parent, as it's not a "vanilla" utility
-         // Spigot end
-         parent.recalculatePermissibles();
-     }

patches/unapplied/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -1,700 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Fri, 9 Jun 2017 19:03:43 +0200
-Subject: [PATCH] Use TerminalConsoleAppender for console improvements
-
-Rewrite console improvements (console colors, tab completion,
-persistent input line, ...) using JLine 3.x and TerminalConsoleAppender.
-
-Also uses the new ANSIComponentSerializer to serialize components when
-logging them via the ComponentLogger, or when sending messages to the
-console, for hex color support.
-
-New features:
-  - Support console colors for Vanilla commands
-  - Add console colors for warnings and errors
-  - Server can now be turned off safely using CTRL + C. JLine catches
-    the signal and the implementation shuts down the server cleanly.
-  - Support console colors and persistent input line when running in
-    IntelliJ IDEA
-
-Other changes:
-  - Server starts 1-2 seconds faster thanks to optimizations in Log4j
-    configuration
-
-Co-Authored-By: Emilia Kond <emilia@rymiel.space>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 18221614060ec945cb8b197acd276e45450f7394..90ca693814a82c30de238b0228750b769a9a9c80 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -5,9 +5,29 @@ plugins {
-     `maven-publish`
- }
- 
-+val log4jPlugins = sourceSets.create("log4jPlugins")
-+configurations.named(log4jPlugins.compileClasspathConfigurationName) {
-+    extendsFrom(configurations.compileClasspath.get())
-+}
-+val alsoShade: Configuration by configurations.creating
-+
- dependencies {
-     implementation(project(":paper-api"))
--    implementation("jline:jline:2.12.1")
-+    // Paper start
-+    implementation("org.jline:jline-terminal-jansi:3.21.0")
-+    implementation("net.minecrell:terminalconsoleappender:1.3.0")
-+    implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
-+    /*
-+          Required to add the missing Log4j2Plugins.dat file from log4j-core
-+          which has been removed by Mojang. Without it, log4j has to classload
-+          all its classes to check if they are plugins.
-+          Scanning takes about 1-2 seconds so adding this speeds up the server start.
-+     */
-+    runtimeOnly("org.apache.logging.log4j:log4j-core:2.19.0")
-+    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
-+    runtimeOnly(log4jPlugins.output)
-+    alsoShade(log4jPlugins.output)
-+    // Paper end
-     implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm-commons:9.7")
-     implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
-@@ -78,6 +98,19 @@ tasks.check {
-     dependsOn(scanJar)
- }
- // Paper end
-+// Paper start - use TCA for console improvements
-+tasks.serverJar {
-+    from(alsoShade.elements.map {
-+        it.map { f ->
-+            if (f.asFile.isFile) {
-+                zipTree(f.asFile)
-+            } else {
-+                f.asFile
-+            }
-+        }
-+    })
-+}
-+// Paper end - use TCA for console improvements
- 
- tasks.test {
-     exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
-diff --git a/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java b/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..91547f6e6fe90006713beb2818da634304bdd236
---- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java
-@@ -0,0 +1,51 @@
-+package io.papermc.paper.console;
-+
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.config.Configuration;
-+import org.apache.logging.log4j.core.config.plugins.Plugin;
-+import org.apache.logging.log4j.core.layout.PatternLayout;
-+import org.apache.logging.log4j.core.pattern.ConverterKeys;
-+import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
-+import org.apache.logging.log4j.core.pattern.PatternConverter;
-+import org.apache.logging.log4j.core.pattern.PatternFormatter;
-+import org.apache.logging.log4j.core.pattern.PatternParser;
-+
-+import java.util.List;
-+import java.util.regex.Pattern;
-+
-+@Plugin(name = "stripAnsi", category = PatternConverter.CATEGORY)
-+@ConverterKeys({"stripAnsi"})
-+public final class StripANSIConverter extends LogEventPatternConverter {
-+    final private Pattern ANSI_PATTERN = Pattern.compile("\\e\\[[\\d;]*[^\\d;]");
-+
-+    private final List<PatternFormatter> formatters;
-+
-+    private StripANSIConverter(List<PatternFormatter> formatters) {
-+        super("stripAnsi", null);
-+        this.formatters = formatters;
-+    }
-+
-+    @Override
-+    public void format(LogEvent event, StringBuilder toAppendTo) {
-+        int start = toAppendTo.length();
-+        for (PatternFormatter formatter : formatters) {
-+            formatter.format(event, toAppendTo);
-+        }
-+        String content = toAppendTo.substring(start);
-+        content = ANSI_PATTERN.matcher(content).replaceAll("");
-+
-+        toAppendTo.setLength(start);
-+        toAppendTo.append(content);
-+    }
-+
-+    public static StripANSIConverter newInstance(Configuration config, String[] options) {
-+        if (options.length != 1) {
-+            LOGGER.error("Incorrect number of options on stripAnsi. Expected exactly 1, received " + options.length);
-+            return null;
-+        }
-+
-+        PatternParser parser = PatternLayout.createPatternParser(config);
-+        List<PatternFormatter> formatters = parser.parse(options[0]);
-+        return new StripANSIConverter(formatters);
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a4070b59e261f0f1ac4beec47b11492f4724bf27
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-@@ -0,0 +1,41 @@
-+package com.destroystokyo.paper.console;
-+
-+import net.minecraft.server.dedicated.DedicatedServer;
-+import net.minecrell.terminalconsole.SimpleTerminalConsole;
-+import org.bukkit.craftbukkit.command.ConsoleCommandCompleter;
-+import org.jline.reader.LineReader;
-+import org.jline.reader.LineReaderBuilder;
-+
-+public final class PaperConsole extends SimpleTerminalConsole {
-+
-+    private final DedicatedServer server;
-+
-+    public PaperConsole(DedicatedServer server) {
-+        this.server = server;
-+    }
-+
-+    @Override
-+    protected LineReader buildReader(LineReaderBuilder builder) {
-+        return super.buildReader(builder
-+                .appName("Paper")
-+                .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
-+                .completer(new ConsoleCommandCompleter(this.server))
-+        );
-+    }
-+
-+    @Override
-+    protected boolean isRunning() {
-+        return !this.server.isStopped() && this.server.isRunning();
-+    }
-+
-+    @Override
-+    protected void runCommand(String command) {
-+        this.server.handleConsoleInput(command, this.server.createCommandSourceStack());
-+    }
-+
-+    @Override
-+    protected void shutdown() {
-+        this.server.halt(false);
-+    }
-+
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a1708781fb63
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-@@ -0,0 +1,26 @@
-+package com.destroystokyo.paper.console;
-+
-+import net.kyori.adventure.audience.MessageType;
-+import net.kyori.adventure.identity.Identity;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-+import org.apache.logging.log4j.LogManager;
-+import org.bukkit.craftbukkit.command.CraftConsoleCommandSender;
-+
-+public class TerminalConsoleCommandSender extends CraftConsoleCommandSender {
-+
-+    private static final ComponentLogger LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName());
-+
-+    @Override
-+    public void sendRawMessage(String message) {
-+        final Component msg = LegacyComponentSerializer.legacySection().deserialize(message);
-+        this.sendMessage(Identity.nil(), msg, MessageType.SYSTEM);
-+    }
-+
-+    @Override
-+    public void sendMessage(Identity identity, Component message, MessageType type) {
-+        LOGGER.info(message);
-+    }
-+
-+}
-diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index 7397918cf747bc2352bf5bb112a71e7f6844e0e0..0f9b744a977ec7ab8f138989b2336117b3de1412 100644
---- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-+++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -31,6 +31,7 @@ import net.kyori.adventure.text.flattener.ComponentFlattener;
- import net.kyori.adventure.text.format.Style;
- import net.kyori.adventure.text.format.TextColor;
- import net.kyori.adventure.text.serializer.ComponentSerializer;
-+import net.kyori.adventure.text.serializer.ansi.ANSIComponentSerializer;
- import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
- import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
- import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-@@ -128,6 +129,7 @@ public final class PaperAdventure {
-     public static final AttributeKey<Locale> LOCALE_ATTRIBUTE = AttributeKey.valueOf("adventure:locale"); // init after FLATTENER because classloading triggered here might create a logger
-     @Deprecated
-     public static final PlainComponentSerializer PLAIN = PlainComponentSerializer.builder().flattener(FLATTENER).build();
-+    public static final ANSIComponentSerializer ANSI_SERIALIZER = ANSIComponentSerializer.builder().flattener(FLATTENER).build();
-     public static final Codec<Tag, String, CommandSyntaxException, RuntimeException> NBT_CODEC = new Codec<>() {
-         @Override
-         public @NotNull Tag decode(final @NotNull String encoded) throws CommandSyntaxException {
-diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-index 8323f135d6bf2e1f12525e05094ffa3f2420e7e1..a143ea1e58464a3122fbd8ccafe417bdb3c31c78 100644
---- a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-+++ b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-@@ -1,9 +1,11 @@
- package io.papermc.paper.adventure.providers;
- 
- import io.papermc.paper.adventure.PaperAdventure;
-+import java.util.Locale;
- import net.kyori.adventure.text.Component;
- import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
- import net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider;
-+import net.kyori.adventure.translation.GlobalTranslator;
- import org.jetbrains.annotations.NotNull;
- import org.slf4j.LoggerFactory;
- 
-@@ -15,6 +17,6 @@ public class ComponentLoggerProviderImpl implements ComponentLoggerProvider {
-     }
- 
-     private String serialize(final Component message) {
--        return PaperAdventure.asPlain(message, null);
-+        return PaperAdventure.ANSI_SERIALIZER.serialize(GlobalTranslator.render(message, Locale.getDefault()));
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 84ad6aae39b5fe4c4ad5ec08890d4383829cbe50..8dfa0fae4d5129688b7e2897da1fc51683aed6c3 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -148,7 +148,7 @@ import org.slf4j.Logger;
- import com.mojang.serialization.Dynamic;
- import com.mojang.serialization.Lifecycle;
- import java.util.Random;
--import jline.console.ConsoleReader;
-+// import jline.console.ConsoleReader; // Paper
- import joptsimple.OptionSet;
- import net.minecraft.nbt.NbtException;
- import net.minecraft.nbt.ReportedNbtException;
-@@ -289,7 +289,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public org.bukkit.craftbukkit.CraftServer server;
-     public OptionSet options;
-     public org.bukkit.command.ConsoleCommandSender console;
--    public ConsoleReader reader;
-     public static int currentTick = (int) (System.currentTimeMillis() / 50);
-     public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
-     public int autosavePeriod;
-@@ -377,7 +376,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.options = options;
-         this.worldLoader = worldLoader;
-         this.vanillaCommandDispatcher = worldstem.dataPackResources().commands; // CraftBukkit
-+        // Paper start - Handled by TerminalConsoleAppender
-         // Try to see if we're actually running in a terminal, disable jline if not
-+        /*
-         if (System.console() == null && System.getProperty("jline.terminal") == null) {
-             System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
-             Main.useJline = false;
-@@ -398,6 +399,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 MinecraftServer.LOGGER.warn((String) null, ex);
-             }
-         }
-+        */
-+        // Paper end
-         Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
-         // CraftBukkit end
-         this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
-@@ -1113,7 +1116,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 org.spigotmc.WatchdogThread.doStop(); // Spigot
-                 // CraftBukkit start - Restore terminal to original settings
-                 try {
--                    this.reader.getTerminal().restore();
-+                    net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
-                 } catch (Exception ignored) {
-                 }
-                 // CraftBukkit end
-@@ -1636,7 +1639,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @Override
-     public void sendSystemMessage(Component message) {
--        MinecraftServer.LOGGER.info(message.getString());
-+        MinecraftServer.LOGGER.info(io.papermc.paper.adventure.PaperAdventure.ANSI_SERIALIZER.serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
-     }
- 
-     public KeyPair getKeyPair() {
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1b5e2e07a7723f61d4c4d4e3141c60b2f63e2b69..9249122da7282929f87613f41984b8085d7b53ec 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -108,6 +108,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-                 if (!org.bukkit.craftbukkit.Main.useConsole) {
-                     return;
-                 }
-+                // Paper start - Use TerminalConsoleAppender
-+                new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
-+                /*
-                 jline.console.ConsoleReader bufferedreader = DedicatedServer.this.reader;
- 
-                 // MC-33041, SPIGOT-5538: if System.in is not valid due to javaw, then return
-@@ -139,7 +142,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-                             continue;
-                         }
-                         if (s.trim().length() > 0) { // Trim to filter lines which are just spaces
--                            DedicatedServer.this.handleConsoleInput(s, DedicatedServer.this.createCommandSourceStack());
-+                            DedicatedServer.this.issueCommand(s, DedicatedServer.this.getServerCommandListener());
-                         }
-                         // CraftBukkit end
-                     }
-@@ -147,6 +150,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-                     DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
-                 }
- 
-+                */
-+                // Paper end
-             }
-         };
- 
-@@ -158,6 +163,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         }
-         global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler());
- 
-+        // Paper start - Not needed with TerminalConsoleAppender
-+        final org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
-+        /*
-         final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger());
-         for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) {
-             if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) {
-@@ -168,6 +176,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         TerminalConsoleWriterThread writerThread = new TerminalConsoleWriterThread(System.out, this.reader);
-         this.reader.setCompletionHandler(new TerminalCompletionHandler(writerThread, this.reader.getCompletionHandler()));
-         writerThread.start();
-+        */
-+        // Paper end - Not needed with TerminalConsoleAppender
- 
-         System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
-         System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
-diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 3d92c61f7781221cfdc0324d11bd0088954e4a68..84a2c6c397604279ba821286f5c3c855e6041400 100644
---- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-@@ -166,7 +166,7 @@ public class MinecraftServerGui extends JComponent {
-         this.finalizers.forEach(Runnable::run);
-     }
- 
--    private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})*)?[m|K]"); // CraftBukkit
-+    private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper
-     public void print(JTextArea textArea, JScrollPane scrollPane, String message) {
-         if (!SwingUtilities.isEventDispatchThread()) {
-             SwingUtilities.invokeLater(() -> {
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0ff094a90bf471ce57a3054c7701dc3d67742d9d..50f4b77c83854932050cc543c7c2deeae641794f 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -161,8 +161,7 @@ public abstract class PlayerList {
- 
-     public PlayerList(MinecraftServer server, LayeredRegistryAccess<RegistryLayer> registryManager, PlayerDataStorage saveHandler, int maxPlayers) {
-         this.cserver = server.server = new CraftServer((DedicatedServer) server, this);
--        server.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
--        server.reader.addCompleter(new org.bukkit.craftbukkit.command.ConsoleCommandCompleter(server.server));
-+        server.console = new com.destroystokyo.paper.console.TerminalConsoleCommandSender(); // Paper
-         // CraftBukkit end
- 
-         this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index beff0bfe2502a17fd297524c51f96b33f889db93..749a4f1e8e46e0b072832056186d709a93df4b58 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -43,7 +43,7 @@ import java.util.logging.Level;
- import java.util.logging.Logger;
- import java.util.stream.Collectors;
- import javax.imageio.ImageIO;
--import jline.console.ConsoleReader;
-+// import jline.console.ConsoleReader;
- import net.minecraft.advancements.AdvancementHolder;
- import net.minecraft.commands.CommandSourceStack;
- import net.minecraft.commands.Commands;
-@@ -1343,9 +1343,13 @@ public final class CraftServer implements Server {
-         return this.logger;
-     }
- 
-+    // Paper start - JLine update
-+    /*
-     public ConsoleReader getReader() {
-         return this.console.reader;
-     }
-+    */
-+    // Paper end
- 
-     @Override
-     public PluginCommand getPluginCommand(String name) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 73c44f94aac069fa3ea9e82be6b95e77a2421c63..2ef6386ea4b95211e26c8759cae849cbe68e3f40 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -13,7 +13,6 @@ import java.util.logging.Logger;
- import joptsimple.OptionParser;
- import joptsimple.OptionSet;
- import joptsimple.util.PathConverter;
--import org.fusesource.jansi.AnsiConsole;
- 
- public class Main {
-     public static boolean useJline = true;
-@@ -207,6 +206,8 @@ public class Main {
-             }
- 
-             try {
-+                // Paper start - Handled by TerminalConsoleAppender
-+                /*
-                 // This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
-                 String jline_UnsupportedTerminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
-                 String jline_terminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
-@@ -224,9 +225,18 @@ public class Main {
-                     // This ensures the terminal literal will always match the jline implementation
-                     System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
-                 }
-+                */
-+
-+                if (options.has("nojline")) {
-+                    System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false");
-+                    useJline = false;
-+                }
-+                // Paper end
- 
-                 if (options.has("noconsole")) {
-                     Main.useConsole = false;
-+                    useJline = false; // Paper
-+                    System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
-                 }
- 
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
-@@ -242,6 +252,7 @@ public class Main {
-                     }
-                 }
- 
-+                System.setProperty("library.jansi.version", "Paper"); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
-                 System.out.println("Loading libraries, please wait...");
-                 net.minecraft.server.Main.main(options);
-             } catch (Throwable t) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
-index bcf1c36d07b79520a39643d3a01020a67b1c9ef2..217e7e3b9db04c7fc5f6518f39cc9d3488f9128d 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
-@@ -5,15 +5,13 @@ import java.util.EnumMap;
- import java.util.Map;
- import java.util.regex.Matcher;
- import java.util.regex.Pattern;
--import jline.Terminal;
-+//import jline.Terminal;
- import org.bukkit.Bukkit;
- import org.bukkit.ChatColor;
- import org.bukkit.command.ConsoleCommandSender;
- import org.bukkit.craftbukkit.CraftServer;
--import org.fusesource.jansi.Ansi;
--import org.fusesource.jansi.Ansi.Attribute;
- 
--public class ColouredConsoleSender extends CraftConsoleCommandSender {
-+public class ColouredConsoleSender /*extends CraftConsoleCommandSender */{/* // Paper - disable
-     private final Terminal terminal;
-     private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
-     private final ChatColor[] colors = ChatColor.values();
-@@ -93,5 +91,5 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
-         } else {
-             return new ColouredConsoleSender();
-         }
--    }
-+    }*/ // Paper
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 0b4c62387c1093652ac15b64a8703249de4cf088..d24acf28f5ed023acc550bcf877e4b9800ec8c9f 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-@@ -4,50 +4,73 @@ import java.util.Collections;
- import java.util.List;
- import java.util.concurrent.ExecutionException;
- import java.util.logging.Level;
--import jline.console.completer.Completer;
-+import net.minecraft.server.dedicated.DedicatedServer;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.craftbukkit.util.Waitable;
-+
-+// Paper start - JLine update
-+import org.jline.reader.Candidate;
-+import org.jline.reader.Completer;
-+import org.jline.reader.LineReader;
-+import org.jline.reader.ParsedLine;
-+// Paper end
- import org.bukkit.event.server.TabCompleteEvent;
- 
- public class ConsoleCommandCompleter implements Completer {
--    private final CraftServer server;
-+    private final DedicatedServer server; // Paper - CraftServer -> DedicatedServer
- 
--    public ConsoleCommandCompleter(CraftServer server) {
-+    public ConsoleCommandCompleter(DedicatedServer server) { // Paper - CraftServer -> DedicatedServer
-         this.server = server;
-     }
- 
-+    // Paper start - Change method signature for JLine update
-     @Override
--    public int complete(final String buffer, final int cursor, final List<CharSequence> candidates) {
-+    public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
-+        final CraftServer server = this.server.server;
-+        final String buffer = line.line();
-+        // Paper end
-         Waitable<List<String>> waitable = new Waitable<List<String>>() {
-             @Override
-             protected List<String> evaluate() {
--                List<String> offers = ConsoleCommandCompleter.this.server.getCommandMap().tabComplete(ConsoleCommandCompleter.this.server.getConsoleSender(), buffer);
-+                List<String> offers = server.getCommandMap().tabComplete(server.getConsoleSender(), buffer); // Paper - Remove "this."
- 
--                TabCompleteEvent tabEvent = new TabCompleteEvent(ConsoleCommandCompleter.this.server.getConsoleSender(), buffer, (offers == null) ? Collections.EMPTY_LIST : offers);
--                ConsoleCommandCompleter.this.server.getPluginManager().callEvent(tabEvent);
-+                TabCompleteEvent tabEvent = new TabCompleteEvent(server.getConsoleSender(), buffer, (offers == null) ? Collections.EMPTY_LIST : offers); // Paper - Remove "this."
-+                server.getPluginManager().callEvent(tabEvent); // Paper - Remove "this."
- 
-                 return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
-             }
-         };
--        this.server.getServer().processQueue.add(waitable);
-+        server.getServer().processQueue.add(waitable); // Paper - Remove "this."
-         try {
-             List<String> offers = waitable.get();
-             if (offers == null) {
--                return cursor;
-+                return; // Paper - Method returns void
-+            }
-+
-+            // Paper start - JLine update
-+            for (String completion : offers) {
-+                if (completion.isEmpty()) {
-+                    continue;
-+                }
-+
-+                candidates.add(new Candidate(completion));
-             }
--            candidates.addAll(offers);
-+            // Paper end
- 
-+            // Paper start - JLine handles cursor now
-+            /*
-             final int lastSpace = buffer.lastIndexOf(' ');
-             if (lastSpace == -1) {
-                 return cursor - buffer.length();
-             } else {
-                 return cursor - (buffer.length() - lastSpace - 1);
-             }
-+            */
-+            // Paper end
-         } catch (ExecutionException e) {
--            this.server.getLogger().log(Level.WARNING, "Unhandled exception when tab completing", e);
-+            server.getLogger().log(Level.WARNING, "Unhandled exception when tab completing", e); // Paper - Remove "this."
-         } catch (InterruptedException e) {
-             Thread.currentThread().interrupt();
-         }
--        return cursor;
-     }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 8390f5b5b957b5435efece26507a89756d0a7b3c..c6e8441e299f477ddb22c1ce2618710763978f1a 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-@@ -16,7 +16,7 @@ public class ServerShutdownThread extends Thread {
-             this.server.close();
-         } finally {
-             try {
--                this.server.reader.getTerminal().restore();
-+                net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
-             } catch (Exception e) {
-             }
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalCompletionHandler.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalCompletionHandler.java
-index 7d1c0810181c51ffa64f9a23b251e05c789870b0..09804513265e6db0c1f3501355335551100a36a8 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/TerminalCompletionHandler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/TerminalCompletionHandler.java
-@@ -4,14 +4,12 @@ import java.io.IOException;
- import java.util.HashSet;
- import java.util.List;
- import java.util.Set;
--import jline.console.ConsoleReader;
--import jline.console.completer.CompletionHandler;
- 
- /**
-  * SPIGOT-6705: Make sure we print the display line again on tab completion, so that the user does not get stuck on it
-  * e.g. The user needs to press y / n to continue
-  */
--public class TerminalCompletionHandler implements CompletionHandler {
-+public class TerminalCompletionHandler /* implements CompletionHandler */ { /* Paper - comment out whole class
- 
-     private final TerminalConsoleWriterThread writerThread;
-     private final CompletionHandler delegate;
-@@ -50,4 +48,5 @@ public class TerminalCompletionHandler implements CompletionHandler {
- 
-         return result;
-     }
-+*/ // Paper end - comment out whole class
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
-index 2e5101fca081548bb616bc5eaa0134698719b63a..6e4d50a4863d43a2d6a2d574350c74d0819df402 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
-@@ -7,13 +7,9 @@ import java.util.Locale;
- import java.util.ResourceBundle;
- import java.util.logging.Level;
- import java.util.logging.Logger;
--import jline.console.ConsoleReader;
--import jline.console.completer.CandidateListCompletionHandler;
- import org.bukkit.craftbukkit.Main;
--import org.fusesource.jansi.Ansi;
--import org.fusesource.jansi.Ansi.Erase;
- 
--public class TerminalConsoleWriterThread extends Thread {
-+public class TerminalConsoleWriterThread /*extends Thread*/ {/* // Paper - Comment out entire class
-     private final ResourceBundle bundle = ResourceBundle.getBundle(CandidateListCompletionHandler.class.getName(), Locale.getDefault());
-     private final ConsoleReader reader;
-     private final OutputStream output;
-@@ -70,4 +66,5 @@ public class TerminalConsoleWriterThread extends Thread {
-     void setCompletion(int completion) {
-         this.completion = completion;
-     }
-+*/ // Paper - Comment out entire class
- }
-diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
-new file mode 100644
-index 0000000000000000000000000000000000000000..0694b21465fb9e4164e71862ff24b62241b191f2
---- /dev/null
-+++ b/src/main/resources/log4j2.component.properties
-@@ -0,0 +1 @@
-+log4j.skipJansi=true
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 0ff3f750fb7f684c12080894cd8660f0455c658b..301874c1fe16c52ffa6228d79e6617d746e9a035 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -1,17 +1,14 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <Configuration status="WARN">
-     <Appenders>
--        <Console name="SysOut" target="SYSTEM_OUT">
--            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
--        </Console>
-         <Queue name="ServerGuiConsole">
-             <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
-         </Queue>
--        <Queue name="TerminalConsole">
--            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
--        </Queue>
-+        <TerminalConsole name="TerminalConsole">
-+            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
-+        </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
--            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
-+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
-             <Policies>
-                 <TimeBasedTriggeringPolicy />
-                 <OnStartupTriggeringPolicy />
-@@ -24,10 +21,9 @@
-             <filters>
-                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-             </filters>
--            <AppenderRef ref="SysOut" level="info"/>
-             <AppenderRef ref="File"/>
--            <AppenderRef ref="ServerGuiConsole" level="info"/>
-             <AppenderRef ref="TerminalConsole" level="info"/>
-+            <AppenderRef ref="ServerGuiConsole" level="info"/>
-         </Root>
-     </Loggers>
- </Configuration>

patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Thu, 21 Sep 2017 16:14:55 +0200
-Subject: [PATCH] Handle plugin prefixes using Log4J configuration
-
-Display logger name in the console for all loggers except the
-root logger, Bukkit's logger ("Minecraft") and Minecraft loggers.
-Since plugins now use the plugin name as logger name this will
-restore the plugin prefixes without having to prepend them manually
-to the log messages.
-
-Logger prefixes are shown by default for all loggers except for
-the root logger, the Minecraft/Mojang loggers and the Bukkit loggers.
-This may cause additional prefixes to be disabled for plugins bypassing
-the plugin logger.
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 90ca693814a82c30de238b0228750b769a9a9c80..b3160912aeaddf8990e3bab9fce29532cefd8dcc 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -23,7 +23,7 @@ dependencies {
-           all its classes to check if they are plugins.
-           Scanning takes about 1-2 seconds so adding this speeds up the server start.
-      */
--    runtimeOnly("org.apache.logging.log4j:log4j-core:2.19.0")
-+    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
-     log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
-     runtimeOnly(log4jPlugins.output)
-     alsoShade(log4jPlugins.output)
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 60e354fe1d32cd315ed42cea4484c83c4b5e7e25..899e85ea70edfb6553dc27462690da8caa793f77 100644
---- a/src/main/java/org/spigotmc/SpigotConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -288,7 +288,7 @@ public class SpigotConfig
-     private static void playerSample()
-     {
-         SpigotConfig.playerSample = SpigotConfig.getInt( "settings.sample-count", 12 );
--        System.out.println( "Server Ping Player Sample Count: " + SpigotConfig.playerSample );
-+        Bukkit.getLogger().log( Level.INFO, "Server Ping Player Sample Count: {0}", playerSample ); // Paper - Use logger
-     }
- 
-     public static int playerShuffle;
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 301874c1fe16c52ffa6228d79e6617d746e9a035..e073707a46397f62bedf1d413f9e5764e77dda6a 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -5,10 +5,22 @@
-             <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
-         </Queue>
-         <TerminalConsole name="TerminalConsole">
--            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
-+            <PatternLayout>
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx}">
-+                    <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
-+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
-+                </LoggerNamePatternSelector>
-+            </PatternLayout>
-         </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
--            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
-+            <PatternLayout>
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n">
-+                    <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
-+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
-+                </LoggerNamePatternSelector>
-+            </PatternLayout>
-             <Policies>
-                 <TimeBasedTriggeringPolicy />
-                 <OnStartupTriggeringPolicy />

patches/unapplied/server/0013-Improve-Log4J-Configuration-Plugin-Loggers.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Sat, 23 Sep 2017 21:07:20 +0200
-Subject: [PATCH] Improve Log4J Configuration / Plugin Loggers
-
-Add full exceptions to log4j to not truncate stack traces
-
-Disable logger prefix for various plugins bypassing the plugin logger
-
-Some plugins bypass the plugin logger and add the plugin prefix
-manually to the log message. Since they use other logger names
-(e.g. qualified class names) these would now also appear in the
-log. Disable the logger prefix for these plugins so the messages
-show up correctly.
-
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index e073707a46397f62bedf1d413f9e5764e77dda6a..ab1caec640128aa90f246e4bbecf5ca275e7982e 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -6,19 +6,21 @@
-         </Queue>
-         <TerminalConsole name="TerminalConsole">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx}">
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx{full}}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
--                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
--                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
-+                    <!-- Disable prefix for various plugins that bypass the plugin logger -->
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx{full}}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-         </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n">
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n%xEx{full}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
--                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
--                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
-+                    <!-- Disable prefix for various plugins that bypass the plugin logger -->
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n%xEx{full}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-             <Policies>

patches/unapplied/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 12 Aug 2021 04:46:41 -0700
-Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index b3160912aeaddf8990e3bab9fce29532cefd8dcc..5a4beeb031538af9e34914066a9b848b7beb1dc3 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -34,6 +34,7 @@ dependencies {
-     implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
-     runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
-+    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
- 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index ab1caec640128aa90f246e4bbecf5ca275e7982e..18e961a37b2830da6e5dab7aa35116b2f5215898 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -29,15 +29,18 @@
-             </Policies>
-             <DefaultRolloverStrategy max="1000"/>
-         </RollingRandomAccessFile>
-+        <Async name="Async">
-+            <AppenderRef ref="File"/>
-+            <AppenderRef ref="TerminalConsole" level="info"/>
-+            <AppenderRef ref="ServerGuiConsole" level="info"/>
-+        </Async>
-     </Appenders>
-     <Loggers>
-         <Root level="info">
-             <filters>
-                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-             </filters>
--            <AppenderRef ref="File"/>
--            <AppenderRef ref="TerminalConsole" level="info"/>
--            <AppenderRef ref="ServerGuiConsole" level="info"/>
-+            <AppenderRef ref="Async"/>
-         </Root>
-     </Loggers>
- </Configuration>

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

@@ -1,581 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Sun, 20 Jun 2021 18:19:09 -0700
-Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
- etc.
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 5a4beeb031538af9e34914066a9b848b7beb1dc3..66cdd81e4b65ce00973f86763cea566e43053722 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -45,6 +45,7 @@ dependencies {
-     testImplementation("org.mockito:mockito-core:5.11.0")
-     testImplementation("org.ow2.asm:asm-tree:9.7")
-     testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
-+    implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
- }
- 
- paperweight {
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java b/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..66b6011ee3684695b2ab9292961c80bf2a420ee9
---- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java
-@@ -0,0 +1,66 @@
-+package io.papermc.paper.logging;
-+
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.invoke.VarHandle;
-+import org.apache.logging.log4j.core.Core;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.appender.rewrite.RewritePolicy;
-+import org.apache.logging.log4j.core.config.plugins.Plugin;
-+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-+import org.apache.logging.log4j.core.impl.Log4jLogEvent;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+
-+@Plugin(
-+    name = "StacktraceDeobfuscatingRewritePolicy",
-+    category = Core.CATEGORY_NAME,
-+    elementType = "rewritePolicy",
-+    printObject = true
-+)
-+public final class StacktraceDeobfuscatingRewritePolicy implements RewritePolicy {
-+    private static final MethodHandle DEOBFUSCATE_THROWABLE;
-+
-+    static {
-+        try {
-+            final Class<?> cls = Class.forName("io.papermc.paper.util.StacktraceDeobfuscator");
-+            final MethodHandles.Lookup lookup = MethodHandles.lookup();
-+            final VarHandle instanceHandle = lookup.findStaticVarHandle(cls, "INSTANCE", cls);
-+            final Object deobfuscator = instanceHandle.get();
-+            DEOBFUSCATE_THROWABLE = lookup
-+                .unreflect(cls.getDeclaredMethod("deobfuscateThrowable", Throwable.class))
-+                .bindTo(deobfuscator);
-+        } catch (final ReflectiveOperationException ex) {
-+            throw new IllegalStateException(ex);
-+        }
-+    }
-+
-+    private StacktraceDeobfuscatingRewritePolicy() {
-+    }
-+
-+    @Override
-+    public @NonNull LogEvent rewrite(final @NonNull LogEvent rewrite) {
-+        final Throwable thrown = rewrite.getThrown();
-+        if (thrown != null) {
-+            deobfuscateThrowable(thrown);
-+            return new Log4jLogEvent.Builder(rewrite)
-+                .setThrownProxy(null)
-+                .build();
-+        }
-+        return rewrite;
-+    }
-+
-+    private static void deobfuscateThrowable(final Throwable thrown) {
-+        try {
-+            DEOBFUSCATE_THROWABLE.invoke(thrown);
-+        } catch (final Error e) {
-+            throw e;
-+        } catch (final Throwable e) {
-+            throw new RuntimeException(e);
-+        }
-+    }
-+
-+    @PluginFactory
-+    public static @NonNull StacktraceDeobfuscatingRewritePolicy createPolicy() {
-+        return new StacktraceDeobfuscatingRewritePolicy();
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/util/ObfHelper.java b/src/main/java/io/papermc/paper/util/ObfHelper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9e6d48335b37fa5204bfebf396d748089884555b
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/ObfHelper.java
-@@ -0,0 +1,156 @@
-+package io.papermc.paper.util;
-+
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.Map;
-+import java.util.Objects;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+import net.neoforged.srgutils.IMappingFile;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public enum ObfHelper {
-+    INSTANCE;
-+
-+    private final @Nullable Map<String, ClassMapping> mappingsByObfName;
-+    private final @Nullable Map<String, ClassMapping> mappingsByMojangName;
-+
-+    ObfHelper() {
-+        final @Nullable Set<ClassMapping> maps = loadMappingsIfPresent();
-+        if (maps != null) {
-+            this.mappingsByObfName = maps.stream().collect(Collectors.toUnmodifiableMap(ClassMapping::obfName, map -> map));
-+            this.mappingsByMojangName = maps.stream().collect(Collectors.toUnmodifiableMap(ClassMapping::mojangName, map -> map));
-+        } else {
-+            this.mappingsByObfName = null;
-+            this.mappingsByMojangName = null;
-+        }
-+    }
-+
-+    public @Nullable Map<String, ClassMapping> mappingsByObfName() {
-+        return this.mappingsByObfName;
-+    }
-+
-+    public @Nullable Map<String, ClassMapping> mappingsByMojangName() {
-+        return this.mappingsByMojangName;
-+    }
-+
-+    /**
-+     * Attempts to get the obf name for a given class by its Mojang name. Will
-+     * return the input string if mappings are not present.
-+     *
-+     * @param fullyQualifiedMojangName fully qualified class name (dotted)
-+     * @return mapped or original fully qualified (dotted) class name
-+     */
-+    public String reobfClassName(final String fullyQualifiedMojangName) {
-+        if (this.mappingsByMojangName == null) {
-+            return fullyQualifiedMojangName;
-+        }
-+
-+        final ClassMapping map = this.mappingsByMojangName.get(fullyQualifiedMojangName);
-+        if (map == null) {
-+            return fullyQualifiedMojangName;
-+        }
-+
-+        return map.obfName();
-+    }
-+
-+    /**
-+     * Attempts to get the Mojang name for a given class by its obf name. Will
-+     * return the input string if mappings are not present.
-+     *
-+     * @param fullyQualifiedObfName fully qualified class name (dotted)
-+     * @return mapped or original fully qualified (dotted) class name
-+     */
-+    public String deobfClassName(final String fullyQualifiedObfName) {
-+        if (this.mappingsByObfName == null) {
-+            return fullyQualifiedObfName;
-+        }
-+
-+        final ClassMapping map = this.mappingsByObfName.get(fullyQualifiedObfName);
-+        if (map == null) {
-+            return fullyQualifiedObfName;
-+        }
-+
-+        return map.mojangName();
-+    }
-+
-+    private static @Nullable Set<ClassMapping> loadMappingsIfPresent() {
-+        try (final @Nullable InputStream mappingsInputStream = ObfHelper.class.getClassLoader().getResourceAsStream("META-INF/mappings/reobf.tiny")) {
-+            if (mappingsInputStream == null) {
-+                return null;
-+            }
-+            final IMappingFile mappings = IMappingFile.load(mappingsInputStream); // Mappings are mojang->spigot
-+            final Set<ClassMapping> classes = new HashSet<>();
-+
-+            final StringPool pool = new StringPool();
-+            for (final IMappingFile.IClass cls : mappings.getClasses()) {
-+                final Map<String, String> methods = new HashMap<>();
-+                final Map<String, String> fields = new HashMap<>();
-+                final Map<String, String> strippedMethods = new HashMap<>();
-+
-+                for (final IMappingFile.IMethod methodMapping : cls.getMethods()) {
-+                    methods.put(
-+                            pool.string(methodKey(
-+                                    Objects.requireNonNull(methodMapping.getMapped()),
-+                                    Objects.requireNonNull(methodMapping.getMappedDescriptor())
-+                            )),
-+                            pool.string(Objects.requireNonNull(methodMapping.getOriginal()))
-+                    );
-+
-+                    strippedMethods.put(
-+                            pool.string(pool.string(strippedMethodKey(
-+                                    methodMapping.getMapped(),
-+                                    methodMapping.getDescriptor()
-+                            ))),
-+                            pool.string(methodMapping.getOriginal())
-+                    );
-+                }
-+                for (final IMappingFile.IField field : cls.getFields()) {
-+                    fields.put(
-+                            pool.string(field.getMapped()),
-+                            pool.string(field.getOriginal())
-+                    );
-+                }
-+
-+                final ClassMapping map = new ClassMapping(
-+                        Objects.requireNonNull(cls.getMapped()).replace('/', '.'),
-+                        Objects.requireNonNull(cls.getOriginal()).replace('/', '.'),
-+                        Map.copyOf(methods),
-+                        Map.copyOf(fields),
-+                        Map.copyOf(strippedMethods)
-+                );
-+                classes.add(map);
-+            }
-+
-+            return Set.copyOf(classes);
-+        } catch (final IOException ex) {
-+            System.err.println("Failed to load mappings.");
-+            ex.printStackTrace();
-+            return null;
-+        }
-+    }
-+
-+    public static String strippedMethodKey(final String methodName, final String methodDescriptor) {
-+        final String methodKey = methodKey(methodName, methodDescriptor);
-+        final int returnDescriptorEnd = methodKey.indexOf(')');
-+        return methodKey.substring(0, returnDescriptorEnd + 1);
-+    }
-+
-+    public static String methodKey(final String methodName, final String methodDescriptor) {
-+        return methodName + methodDescriptor;
-+    }
-+
-+    public record ClassMapping(
-+            String obfName,
-+            String mojangName,
-+            Map<String, String> methodsByObf,
-+            Map<String, String> fieldsByObf,
-+            // obf name with mapped desc to mapped name. return value is excluded from desc as reflection doesn't use it
-+            Map<String, String> strippedMethods
-+    ) {}
-+}
-diff --git a/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..242811578a786e3807a1a7019d472d5a68f87116
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
-@@ -0,0 +1,144 @@
-+package io.papermc.paper.util;
-+
-+import io.papermc.paper.configuration.GlobalConfiguration;
-+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.util.Collections;
-+import java.util.LinkedHashMap;
-+import java.util.Map;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+
-+@DefaultQualifier(NonNull.class)
-+public enum StacktraceDeobfuscator {
-+    INSTANCE;
-+
-+    private final Map<Class<?>, Int2ObjectMap<String>> lineMapCache = Collections.synchronizedMap(new LinkedHashMap<>(128, 0.75f, true) {
-+        @Override
-+        protected boolean removeEldestEntry(final Map.Entry<Class<?>, Int2ObjectMap<String>> eldest) {
-+            return this.size() > 127;
-+        }
-+    });
-+
-+    public void deobfuscateThrowable(final Throwable throwable) {
-+        if (GlobalConfiguration.get() != null && !GlobalConfiguration.get().logging.deobfuscateStacktraces) { // handle null as true
-+            return;
-+        }
-+
-+        throwable.setStackTrace(this.deobfuscateStacktrace(throwable.getStackTrace()));
-+        final Throwable cause = throwable.getCause();
-+        if (cause != null) {
-+            this.deobfuscateThrowable(cause);
-+        }
-+        for (final Throwable suppressed : throwable.getSuppressed()) {
-+            this.deobfuscateThrowable(suppressed);
-+        }
-+    }
-+
-+    public StackTraceElement[] deobfuscateStacktrace(final StackTraceElement[] traceElements) {
-+        if (GlobalConfiguration.get() != null && !GlobalConfiguration.get().logging.deobfuscateStacktraces) { // handle null as true
-+            return traceElements;
-+        }
-+
-+        final @Nullable Map<String, ObfHelper.ClassMapping> mappings = ObfHelper.INSTANCE.mappingsByObfName();
-+        if (mappings == null || traceElements.length == 0) {
-+            return traceElements;
-+        }
-+        final StackTraceElement[] result = new StackTraceElement[traceElements.length];
-+        for (int i = 0; i < traceElements.length; i++) {
-+            final StackTraceElement element = traceElements[i];
-+
-+            final String className = element.getClassName();
-+            final String methodName = element.getMethodName();
-+
-+            final ObfHelper.ClassMapping classMapping = mappings.get(className);
-+            if (classMapping == null) {
-+                result[i] = element;
-+                continue;
-+            }
-+
-+            final Class<?> clazz;
-+            try {
-+                clazz = Class.forName(className);
-+            } catch (final ClassNotFoundException ex) {
-+                throw new RuntimeException(ex);
-+            }
-+            final @Nullable String methodKey = this.determineMethodForLine(clazz, element.getLineNumber());
-+            final @Nullable String mappedMethodName = methodKey == null ? null : classMapping.methodsByObf().get(methodKey);
-+
-+            result[i] = new StackTraceElement(
-+                element.getClassLoaderName(),
-+                element.getModuleName(),
-+                element.getModuleVersion(),
-+                classMapping.mojangName(),
-+                mappedMethodName != null ? mappedMethodName : methodName,
-+                sourceFileName(classMapping.mojangName()),
-+                element.getLineNumber()
-+            );
-+        }
-+        return result;
-+    }
-+
-+    private @Nullable String determineMethodForLine(final Class<?> clazz, final int lineNumber) {
-+        return this.lineMapCache.computeIfAbsent(clazz, StacktraceDeobfuscator::buildLineMap).get(lineNumber);
-+    }
-+
-+    private static String sourceFileName(final String fullClassName) {
-+        final int dot = fullClassName.lastIndexOf('.');
-+        final String className = dot == -1
-+            ? fullClassName
-+            : fullClassName.substring(dot + 1);
-+        final String rootClassName = className.split("\\$")[0];
-+        return rootClassName + ".java";
-+    }
-+
-+    private static Int2ObjectMap<String> buildLineMap(final Class<?> key) {
-+        final StringPool pool = new StringPool();
-+        final Int2ObjectMap<String> lineMap = new Int2ObjectOpenHashMap<>();
-+        final class LineCollectingMethodVisitor extends MethodVisitor {
-+            private final String name;
-+            private final String descriptor;
-+
-+            LineCollectingMethodVisitor(final String name, final String descriptor) {
-+                super(Opcodes.ASM9);
-+                this.name = name;
-+                this.descriptor = descriptor;
-+            }
-+
-+            @Override
-+            public void visitLineNumber(final int line, final Label start) {
-+                lineMap.put(line, pool.string(ObfHelper.methodKey(this.name, this.descriptor)));
-+            }
-+        }
-+        final ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM9) {
-+            @Override
-+            public MethodVisitor visitMethod(final int access, final String name, final String descriptor, final String signature, final String[] exceptions) {
-+                return new LineCollectingMethodVisitor(name, descriptor);
-+            }
-+        };
-+        try {
-+            final @Nullable InputStream inputStream = StacktraceDeobfuscator.class.getClassLoader()
-+                .getResourceAsStream(key.getName().replace('.', '/') + ".class");
-+            if (inputStream == null) {
-+                throw new IllegalStateException("Could not find class file: " + key.getName());
-+            }
-+            final byte[] classData;
-+            try (inputStream) {
-+                classData = inputStream.readAllBytes();
-+            }
-+            final ClassReader reader = new ClassReader(classData);
-+            reader.accept(classVisitor, 0);
-+        } catch (final IOException ex) {
-+            throw new RuntimeException(ex);
-+        }
-+        return lineMap;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/util/StringPool.java b/src/main/java/io/papermc/paper/util/StringPool.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c0a486cb46ff30353c3ff09567891cd36238eeb4
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/StringPool.java
-@@ -0,0 +1,34 @@
-+package io.papermc.paper.util;
-+
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.function.Function;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+/**
-+ * De-duplicates {@link String} instances without using {@link String#intern()}.
-+ *
-+ * <p>Interning may not be desired as we may want to use the heap for our pool,
-+ * so it can be garbage collected as normal, etc.</p>
-+ *
-+ * <p>Additionally, interning can be slow due to the potentially large size of the
-+ * pool (as it is shared for the entire JVM), and because most JVMs implement
-+ * it using JNI.</p>
-+ */
-+@DefaultQualifier(NonNull.class)
-+public final class StringPool {
-+    private final Map<String, String> pool;
-+
-+    public StringPool() {
-+        this(new HashMap<>());
-+    }
-+
-+    public StringPool(final Map<String, String> map) {
-+        this.pool = map;
-+    }
-+
-+    public String string(final String string) {
-+        return this.pool.computeIfAbsent(string, Function.identity());
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index a23407fa1b906743890cff74f5051ad55d59c85e..06c514b2d0674cd7df6692981f020437ea0f2f91 100644
---- a/src/main/java/net/minecraft/CrashReport.java
-+++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -34,6 +34,7 @@ public class CrashReport {
-     private final SystemReport systemReport = new SystemReport();
- 
-     public CrashReport(String message, Throwable cause) {
-+        io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
-         this.title = message;
-         this.exception = cause;
-         this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/CrashReportCategory.java b/src/main/java/net/minecraft/CrashReportCategory.java
-index f367ba058018074bfe6e4fe88bcc875ea9794d9e..2176171954609fd88f97f93408e14e018c1d6eaa 100644
---- a/src/main/java/net/minecraft/CrashReportCategory.java
-+++ b/src/main/java/net/minecraft/CrashReportCategory.java
-@@ -110,6 +110,7 @@ public class CrashReportCategory {
-         } else {
-             this.stackTrace = new StackTraceElement[stackTraceElements.length - 3 - ignoredCallCount];
-             System.arraycopy(stackTraceElements, 3 + ignoredCallCount, this.stackTrace, 0, this.stackTrace.length);
-+            this.stackTrace = io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(this.stackTrace); // Paper
-             return this.stackTrace.length;
-         }
-     }
-diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 256a983c7345902600d52d7b7e3056162275f4c7..0ccfdceea8e211c595be2dad2392876109b4eeef 100644
---- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -82,13 +82,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         marker.add(Connection.PACKET_MARKER);
-     });
-     public static final Supplier<NioEventLoopGroup> NETWORK_WORKER_GROUP = Suppliers.memoize(() -> {
--        return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Client IO #%d").setDaemon(true).build());
-+        return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Client IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
-     });
-     public static final Supplier<EpollEventLoopGroup> NETWORK_EPOLL_WORKER_GROUP = Suppliers.memoize(() -> {
--        return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Client IO #%d").setDaemon(true).build());
-+        return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Client IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
-     });
-     public static final Supplier<DefaultEventLoopGroup> LOCAL_WORKER_GROUP = Suppliers.memoize(() -> {
--        return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).build());
-+        return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
-     });
-     private static final ProtocolInfo<ServerHandshakePacketListener> INITIAL_PROTOCOL = HandshakeProtocols.SERVERBOUND;
-     private final PacketFlow receiving;
-@@ -189,7 +189,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
- 
-             }
-         }
--        if (net.minecraft.server.MinecraftServer.getServer().isDebugging()) throwable.printStackTrace(); // Spigot
-+        if (net.minecraft.server.MinecraftServer.getServer().isDebugging()) io.papermc.paper.util.TraceUtil.printStackTrace(throwable); // Spigot // Paper
-     }
- 
-     protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) {
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9249122da7282929f87613f41984b8085d7b53ec..21b8f1913ff54d2b1553826269355da8bdb7f702 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -206,6 +206,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings"));
-         org.spigotmc.SpigotConfig.registerCommands();
-         // Spigot end
-+        io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // Paper - load mappings for stacktrace deobf and etc.
-         // Paper start - initialize global and world-defaults configuration
-         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 987360a266a5a870f06929b00c9f451901188fd6..2cf3e79ec5e8706b71d27ebad4668773f0b91195 100644
---- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -52,10 +52,10 @@ public class ServerConnectionListener {
- 
-     private static final Logger LOGGER = LogUtils.getLogger();
-     public static final Supplier<NioEventLoopGroup> SERVER_EVENT_GROUP = Suppliers.memoize(() -> {
--        return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build());
-+        return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
-     });
-     public static final Supplier<EpollEventLoopGroup> SERVER_EPOLL_EVENT_GROUP = Suppliers.memoize(() -> {
--        return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).build());
-+        return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
-     });
-     final MinecraftServer server;
-     public volatile boolean running;
-diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index 8d06e8d286da2573e40794adab695ff77e5afd86..68551947f5b7d3471f15bd74ccd86519ab34c1c1 100644
---- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-@@ -356,7 +356,7 @@ public class OldUsersConverter {
-                         try {
-                             root = NbtIo.readCompressed(new java.io.FileInputStream(file5), NbtAccounter.unlimitedHeap());
-                         } catch (Exception exception) {
--                            exception.printStackTrace();
-+                            io.papermc.paper.util.TraceUtil.printStackTrace(exception); // Paper
-                         }
- 
-                         if (root != null) {
-@@ -369,7 +369,7 @@ public class OldUsersConverter {
-                             try {
-                                 NbtIo.writeCompressed(root, new java.io.FileOutputStream(file2));
-                             } catch (Exception exception) {
--                                exception.printStackTrace();
-+                                io.papermc.paper.util.TraceUtil.printStackTrace(exception); // Paper
-                             }
-                        }
-                         // CraftBukkit end
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index c4bf7053d83d207caca0e13e19f5c1afa7062de3..f697d45e0ac4e9cdc8a46121510a04c0f294d91f 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -130,7 +130,7 @@ public class WatchdogThread extends Thread
-         }
-         log.log( Level.SEVERE, "\tStack:" );
-         //
--        for ( StackTraceElement stack : thread.getStackTrace() )
-+        for ( StackTraceElement stack : io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(thread.getStackTrace()) ) // Paper
-         {
-             log.log( Level.SEVERE, "\t\t" + stack );
-         }
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 18e961a37b2830da6e5dab7aa35116b2f5215898..128fa1376f22d3429a23d79a2772abf2e7fec2bc 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -30,10 +30,14 @@
-             <DefaultRolloverStrategy max="1000"/>
-         </RollingRandomAccessFile>
-         <Async name="Async">
-+            <AppenderRef ref="rewrite"/>
-+        </Async>
-+        <Rewrite name="rewrite">
-+            <StacktraceDeobfuscatingRewritePolicy />
-             <AppenderRef ref="File"/>
-             <AppenderRef ref="TerminalConsole" level="info"/>
-             <AppenderRef ref="ServerGuiConsole" level="info"/>
--        </Async>
-+        </Rewrite>
-     </Appenders>
-     <Loggers>
-         <Root level="info">

patches/unapplied/server/0016-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch

@@ -1,246 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SirYwell <hannesgreule@outlook.de>
-Date: Sat, 10 Jul 2021 11:12:30 +0200
-Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces
-
-
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java b/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6ffd1befe64c6c3036c22e05ed1c44808d64bd28
---- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java
-@@ -0,0 +1,130 @@
-+package io.papermc.paper.logging;
-+
-+import org.apache.logging.log4j.Level;
-+import org.apache.logging.log4j.Marker;
-+import org.apache.logging.log4j.ThreadContext;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.impl.ThrowableProxy;
-+import org.apache.logging.log4j.core.time.Instant;
-+import org.apache.logging.log4j.message.Message;
-+import org.apache.logging.log4j.util.ReadOnlyStringMap;
-+
-+import java.util.Map;
-+
-+public class DelegateLogEvent implements LogEvent {
-+    private final LogEvent original;
-+
-+    protected DelegateLogEvent(LogEvent original) {
-+        this.original = original;
-+    }
-+
-+    @Override
-+    public LogEvent toImmutable() {
-+        return this.original.toImmutable();
-+    }
-+
-+    @Override
-+    public Map<String, String> getContextMap() {
-+        return this.original.getContextMap();
-+    }
-+
-+    @Override
-+    public ReadOnlyStringMap getContextData() {
-+        return this.original.getContextData();
-+    }
-+
-+    @Override
-+    public ThreadContext.ContextStack getContextStack() {
-+        return this.original.getContextStack();
-+    }
-+
-+    @Override
-+    public String getLoggerFqcn() {
-+        return this.original.getLoggerFqcn();
-+    }
-+
-+    @Override
-+    public Level getLevel() {
-+        return this.original.getLevel();
-+    }
-+
-+    @Override
-+    public String getLoggerName() {
-+        return this.original.getLoggerName();
-+    }
-+
-+    @Override
-+    public Marker getMarker() {
-+        return this.original.getMarker();
-+    }
-+
-+    @Override
-+    public Message getMessage() {
-+        return this.original.getMessage();
-+    }
-+
-+    @Override
-+    public long getTimeMillis() {
-+        return this.original.getTimeMillis();
-+    }
-+
-+    @Override
-+    public Instant getInstant() {
-+        return this.original.getInstant();
-+    }
-+
-+    @Override
-+    public StackTraceElement getSource() {
-+        return this.original.getSource();
-+    }
-+
-+    @Override
-+    public String getThreadName() {
-+        return this.original.getThreadName();
-+    }
-+
-+    @Override
-+    public long getThreadId() {
-+        return this.original.getThreadId();
-+    }
-+
-+    @Override
-+    public int getThreadPriority() {
-+        return this.original.getThreadPriority();
-+    }
-+
-+    @Override
-+    public Throwable getThrown() {
-+        return this.original.getThrown();
-+    }
-+
-+    @Override
-+    public ThrowableProxy getThrownProxy() {
-+        return this.original.getThrownProxy();
-+    }
-+
-+    @Override
-+    public boolean isEndOfBatch() {
-+        return this.original.isEndOfBatch();
-+    }
-+
-+    @Override
-+    public boolean isIncludeLocation() {
-+        return this.original.isIncludeLocation();
-+    }
-+
-+    @Override
-+    public void setEndOfBatch(boolean endOfBatch) {
-+        this.original.setEndOfBatch(endOfBatch);
-+    }
-+
-+    @Override
-+    public void setIncludeLocation(boolean locationRequired) {
-+        this.original.setIncludeLocation(locationRequired);
-+    }
-+
-+    @Override
-+    public long getNanoTime() {
-+        return this.original.getNanoTime();
-+    }
-+}
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..558427c65b4051923f73d15d85ee519be005060a
---- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java
-@@ -0,0 +1,48 @@
-+package io.papermc.paper.logging;
-+
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.impl.ExtendedClassInfo;
-+import org.apache.logging.log4j.core.impl.ExtendedStackTraceElement;
-+import org.apache.logging.log4j.core.impl.ThrowableProxy;
-+
-+public class ExtraClassInfoLogEvent extends DelegateLogEvent {
-+
-+    private boolean fixed;
-+
-+    public ExtraClassInfoLogEvent(LogEvent original) {
-+        super(original);
-+    }
-+
-+    @Override
-+    public ThrowableProxy getThrownProxy() {
-+        if (fixed) {
-+            return super.getThrownProxy();
-+        }
-+        rewriteStackTrace(super.getThrownProxy());
-+        fixed = true;
-+        return super.getThrownProxy();
-+    }
-+
-+    private void rewriteStackTrace(ThrowableProxy throwable) {
-+        ExtendedStackTraceElement[] stackTrace = throwable.getExtendedStackTrace();
-+        for (int i = 0; i < stackTrace.length; i++) {
-+            ExtendedClassInfo classInfo = stackTrace[i].getExtraClassInfo();
-+            if (classInfo.getLocation().equals("?")) {
-+                StackTraceElement element = stackTrace[i].getStackTraceElement();
-+                String classLoaderName = element.getClassLoaderName();
-+                if (classLoaderName != null) {
-+                    stackTrace[i] = new ExtendedStackTraceElement(element,
-+                        new ExtendedClassInfo(classInfo.getExact(), classLoaderName, "?"));
-+                }
-+            }
-+        }
-+        if (throwable.getCauseProxy() != null) {
-+            rewriteStackTrace(throwable.getCauseProxy());
-+        }
-+        if (throwable.getSuppressedProxies() != null) {
-+            for (ThrowableProxy proxy : throwable.getSuppressedProxies()) {
-+                rewriteStackTrace(proxy);
-+            }
-+        }
-+    }
-+}
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..34734bb969a1a74c7a4f9c17d40ebf007ad5d701
---- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java
-@@ -0,0 +1,29 @@
-+package io.papermc.paper.logging;
-+
-+import org.apache.logging.log4j.core.Core;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.appender.rewrite.RewritePolicy;
-+import org.apache.logging.log4j.core.config.plugins.Plugin;
-+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-+import org.jetbrains.annotations.NotNull;
-+
-+@Plugin(
-+    name = "ExtraClassInfoRewritePolicy",
-+    category = Core.CATEGORY_NAME,
-+    elementType = "rewritePolicy",
-+    printObject = true
-+)
-+public final class ExtraClassInfoRewritePolicy implements RewritePolicy {
-+    @Override
-+    public LogEvent rewrite(LogEvent source) {
-+        if (source.getThrown() != null) {
-+            return new ExtraClassInfoLogEvent(source);
-+        }
-+        return source;
-+    }
-+
-+    @PluginFactory
-+    public static @NotNull ExtraClassInfoRewritePolicy createPolicy() {
-+        return new ExtraClassInfoRewritePolicy();
-+    }
-+}
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 128fa1376f22d3429a23d79a2772abf2e7fec2bc..637d64da9938e51a97338b9253b43889585c67bb 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -34,6 +34,10 @@
-         </Async>
-         <Rewrite name="rewrite">
-             <StacktraceDeobfuscatingRewritePolicy />
-+            <AppenderRef ref="rewrite2"/>
-+        </Rewrite>
-+        <Rewrite name="rewrite2">
-+            <ExtraClassInfoRewritePolicy />
-             <AppenderRef ref="File"/>
-             <AppenderRef ref="TerminalConsole" level="info"/>
-             <AppenderRef ref="ServerGuiConsole" level="info"/>

patches/unapplied/server/0017-Paper-command.patch

@@ -1,665 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 29 Feb 2016 21:02:09 -0600
-Subject: [PATCH] Paper command
-
-Co-authored-by: Zach Brown <zach.brown@destroystokyo.com>
-
-diff --git a/src/main/java/io/papermc/paper/command/CallbackCommand.java b/src/main/java/io/papermc/paper/command/CallbackCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fa4202abd13c1c286bd398938103d1103d5443e7
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/CallbackCommand.java
-@@ -0,0 +1,35 @@
-+package io.papermc.paper.command;
-+
-+import io.papermc.paper.adventure.providers.ClickCallbackProviderImpl;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import java.util.UUID;
-+
-+@DefaultQualifier(NonNull.class)
-+public class CallbackCommand extends Command {
-+
-+    protected CallbackCommand(final String name) {
-+        super(name);
-+        this.description = "ClickEvent callback";
-+        this.usageMessage = "/callback <uuid>";
-+    }
-+
-+    @Override
-+    public boolean execute(final CommandSender sender, final String commandLabel, final String[] args) {
-+        if (args.length != 1) {
-+            return false;
-+        }
-+
-+        final UUID id;
-+        try {
-+            id = UUID.fromString(args[0]);
-+        } catch (final IllegalArgumentException ignored) {
-+            return false;
-+        }
-+
-+        ClickCallbackProviderImpl.CALLBACK_MANAGER.runCallback(sender, id);
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/CommandUtil.java b/src/main/java/io/papermc/paper/command/CommandUtil.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..953c30500892e5f0c55b8597bc708ea85bf56d6e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/CommandUtil.java
-@@ -0,0 +1,69 @@
-+package io.papermc.paper.command;
-+
-+import com.google.common.base.Functions;
-+import com.google.common.collect.Iterables;
-+import com.google.common.collect.Lists;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collection;
-+import java.util.Iterator;
-+import java.util.List;
-+import net.minecraft.resources.ResourceLocation;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class CommandUtil {
-+    private CommandUtil() {
-+    }
-+
-+    // Code from Mojang - copyright them
-+    public static List<String> getListMatchingLast(
-+        final CommandSender sender,
-+        final String[] args,
-+        final String... matches
-+    ) {
-+        return getListMatchingLast(sender, args, Arrays.asList(matches));
-+    }
-+
-+    public static boolean matches(final String s, final String s1) {
-+        return s1.regionMatches(true, 0, s, 0, s.length());
-+    }
-+
-+    public static List<String> getListMatchingLast(
-+        final CommandSender sender,
-+        final String[] strings,
-+        final Collection<?> collection
-+    ) {
-+        String last = strings[strings.length - 1];
-+        ArrayList<String> results = Lists.newArrayList();
-+
-+        if (!collection.isEmpty()) {
-+            Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator();
-+
-+            while (iterator.hasNext()) {
-+                String s1 = (String) iterator.next();
-+
-+                if (matches(last, s1) && (sender.hasPermission(PaperCommand.BASE_PERM + s1) || sender.hasPermission("bukkit.command.paper"))) {
-+                    results.add(s1);
-+                }
-+            }
-+
-+            if (results.isEmpty()) {
-+                iterator = collection.iterator();
-+
-+                while (iterator.hasNext()) {
-+                    Object object = iterator.next();
-+
-+                    if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath())) {
-+                        results.add(String.valueOf(object));
-+                    }
-+                }
-+            }
-+        }
-+
-+        return results;
-+    }
-+    // end copy stuff
-+}
-diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..95d3320c865d24609252063be07cddfd07d0d6d8
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -0,0 +1,143 @@
-+package io.papermc.paper.command;
-+
-+import io.papermc.paper.command.subcommands.*;
-+import it.unimi.dsi.fastutil.Pair;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+import net.minecraft.Util;
-+import org.bukkit.Bukkit;
-+import org.bukkit.Location;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.permissions.Permission;
-+import org.bukkit.permissions.PermissionDefault;
-+import org.bukkit.plugin.PluginManager;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class PaperCommand extends Command {
-+    static final String BASE_PERM = "bukkit.command.paper.";
-+    // subcommand label -> subcommand
-+    private static final Map<String, PaperSubcommand> SUBCOMMANDS = Util.make(() -> {
-+        final Map<Set<String>, PaperSubcommand> commands = new HashMap<>();
-+
-+        commands.put(Set.of("heap"), new HeapDumpCommand());
-+        commands.put(Set.of("entity"), new EntityCommand());
-+        commands.put(Set.of("reload"), new ReloadCommand());
-+        commands.put(Set.of("version"), new VersionCommand());
-+
-+        return commands.entrySet().stream()
-+            .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))
-+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-+    });
-+    private static final Set<String> COMPLETABLE_SUBCOMMANDS = SUBCOMMANDS.entrySet().stream().filter(entry -> entry.getValue().tabCompletes()).map(Map.Entry::getKey).collect(Collectors.toSet());
-+    // alias -> subcommand label
-+    private static final Map<String, String> ALIASES = Util.make(() -> {
-+        final Map<String, Set<String>> aliases = new HashMap<>();
-+
-+        aliases.put("version", Set.of("ver"));
-+
-+        return aliases.entrySet().stream()
-+            .flatMap(entry -> entry.getValue().stream().map(s -> Map.entry(s, entry.getKey())))
-+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-+    });
-+
-+    public PaperCommand(final String name) {
-+        super(name);
-+        this.description = "Paper related commands";
-+        this.usageMessage = "/paper [" + String.join(" | ", SUBCOMMANDS.keySet()) + "]";
-+        final List<String> permissions = new ArrayList<>();
-+        permissions.add("bukkit.command.paper");
-+        permissions.addAll(SUBCOMMANDS.keySet().stream().map(s -> BASE_PERM + s).toList());
-+        this.setPermission(String.join(";", permissions));
-+        final PluginManager pluginManager = Bukkit.getServer().getPluginManager();
-+        for (final String perm : permissions) {
-+            pluginManager.addPermission(new Permission(perm, PermissionDefault.OP));
-+        }
-+    }
-+
-+    private static boolean testPermission(final CommandSender sender, final String permission) {
-+        if (sender.hasPermission(BASE_PERM + permission) || sender.hasPermission("bukkit.command.paper")) {
-+            return true;
-+        }
-+        sender.sendMessage(text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", RED));
-+        return false;
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(
-+        final CommandSender sender,
-+        final String alias,
-+        final String[] args,
-+        final @Nullable Location location
-+    ) throws IllegalArgumentException {
-+        if (args.length <= 1) {
-+            return CommandUtil.getListMatchingLast(sender, args, COMPLETABLE_SUBCOMMANDS);
-+        }
-+
-+        final @Nullable Pair<String, PaperSubcommand> subCommand = resolveCommand(args[0]);
-+        if (subCommand != null) {
-+            return subCommand.second().tabComplete(sender, subCommand.first(), Arrays.copyOfRange(args, 1, args.length));
-+        }
-+
-+        return Collections.emptyList();
-+    }
-+
-+    @Override
-+    public boolean execute(
-+        final CommandSender sender,
-+        final String commandLabel,
-+        final String[] args
-+    ) {
-+        if (!testPermission(sender)) {
-+            return true;
-+        }
-+
-+        if (args.length == 0) {
-+            sender.sendMessage(text("Usage: " + this.usageMessage, RED));
-+            return false;
-+        }
-+        final @Nullable Pair<String, PaperSubcommand> subCommand = resolveCommand(args[0]);
-+
-+        if (subCommand == null) {
-+            sender.sendMessage(text("Usage: " + this.usageMessage, RED));
-+            return false;
-+        }
-+
-+        if (!testPermission(sender, subCommand.first())) {
-+            return true;
-+        }
-+        final String[] choppedArgs = Arrays.copyOfRange(args, 1, args.length);
-+        return subCommand.second().execute(sender, subCommand.first(), choppedArgs);
-+    }
-+
-+    private static @Nullable Pair<String, PaperSubcommand> resolveCommand(String label) {
-+        label = label.toLowerCase(Locale.ROOT);
-+        @Nullable PaperSubcommand subCommand = SUBCOMMANDS.get(label);
-+        if (subCommand == null) {
-+            final @Nullable String command = ALIASES.get(label);
-+            if (command != null) {
-+                label = command;
-+                subCommand = SUBCOMMANDS.get(command);
-+            }
-+        }
-+
-+        if (subCommand != null) {
-+            return Pair.of(label, subCommand);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5e5ec700a368cfdaa1ea0b3f0fa82089895d4b92
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
-@@ -0,0 +1,28 @@
-+package io.papermc.paper.command;
-+
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.command.Command;
-+
-+import java.util.HashMap;
-+import java.util.Map;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class PaperCommands {
-+
-+    private PaperCommands() {
-+    }
-+
-+    private static final Map<String, Command> COMMANDS = new HashMap<>();
-+    static {
-+        COMMANDS.put("paper", new PaperCommand("paper"));
-+        COMMANDS.put("callback", new CallbackCommand("callback"));
-+    }
-+
-+    public static void registerCommands(final MinecraftServer server) {
-+        COMMANDS.forEach((s, command) -> {
-+            server.server.getCommandMap().register(s, "Paper", command);
-+        });
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/PaperSubcommand.java b/src/main/java/io/papermc/paper/command/PaperSubcommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..7e9e0ff8639be135bf8575e375cbada5b57164e1
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/PaperSubcommand.java
-@@ -0,0 +1,20 @@
-+package io.papermc.paper.command;
-+
-+import java.util.Collections;
-+import java.util.List;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public interface PaperSubcommand {
-+    boolean execute(CommandSender sender, String subCommand, String[] args);
-+
-+    default List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        return Collections.emptyList();
-+    }
-+
-+    default boolean tabCompletes() {
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..67fcba634f8183bb33834ac3b2c3dcfb8d87129e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-@@ -0,0 +1,158 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import com.google.common.collect.Maps;
-+import io.papermc.paper.command.CommandUtil;
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.event.HoverEvent;
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.level.ServerChunkCache;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.world.entity.EntityType;
-+import net.minecraft.world.level.ChunkPos;
-+import org.apache.commons.lang3.tuple.MutablePair;
-+import org.apache.commons.lang3.tuple.Pair;
-+import org.bukkit.Bukkit;
-+import org.bukkit.HeightMap;
-+import org.bukkit.World;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftWorld;
-+import org.bukkit.entity.Player;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class EntityCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        this.listEntities(sender, args);
-+        return true;
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        if (args.length == 1) {
-+            return CommandUtil.getListMatchingLast(sender, args, "help", "list");
-+        } else if (args.length == 2) {
-+            return CommandUtil.getListMatchingLast(sender, args, BuiltInRegistries.ENTITY_TYPE.keySet().stream().map(ResourceLocation::toString).sorted().toArray(String[]::new));
-+        }
-+        return Collections.emptyList();
-+    }
-+
-+    /*
-+     * Ported from MinecraftForge - author: LexManos <LexManos@gmail.com> - License: LGPLv2.1
-+     */
-+    private void listEntities(final CommandSender sender, final String[] args) {
-+        // help
-+        if (args.length < 1 || !args[0].toLowerCase(Locale.ROOT).equals("list")) {
-+            sender.sendMessage(text("Use /paper entity [list] help for more information on a specific command", RED));
-+            return;
-+        }
-+
-+        if ("list".equals(args[0].toLowerCase(Locale.ROOT))) {
-+            String filter = "*";
-+            if (args.length > 1) {
-+                if (args[1].toLowerCase(Locale.ROOT).equals("help")) {
-+                    sender.sendMessage(text("Use /paper entity list [filter] [worldName] to get entity info that matches the optional filter.", RED));
-+                    return;
-+                }
-+                filter = args[1];
-+            }
-+            final String cleanfilter = filter.replace("?", ".?").replace("*", ".*?");
-+            Set<ResourceLocation> names = BuiltInRegistries.ENTITY_TYPE.keySet().stream()
-+                .filter(n -> n.toString().matches(cleanfilter))
-+                .collect(Collectors.toSet());
-+            if (names.isEmpty()) {
-+                sender.sendMessage(text("Invalid filter, does not match any entities. Use /paper entity list for a proper list", RED));
-+                sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
-+                return;
-+            }
-+            String worldName;
-+            if (args.length > 2) {
-+                worldName = args[2];
-+            } else if (sender instanceof Player) {
-+                worldName = ((Player) sender).getWorld().getName();
-+            } else {
-+                sender.sendMessage(text("Please specify the name of a world", RED));
-+                sender.sendMessage(text("To do so without a filter, specify '*' as the filter", RED));
-+                sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
-+                return;
-+            }
-+            Map<ResourceLocation, MutablePair<Integer, Map<ChunkPos, Integer>>> list = Maps.newHashMap();
-+            @Nullable World bukkitWorld = Bukkit.getWorld(worldName);
-+            if (bukkitWorld == null) {
-+                sender.sendMessage(text("Could not load world for " + worldName + ". Please select a valid world.", RED));
-+                sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
-+                return;
-+            }
-+            ServerLevel world = ((CraftWorld) bukkitWorld).getHandle();
-+            Map<ResourceLocation, Integer> nonEntityTicking = Maps.newHashMap();
-+            ServerChunkCache chunkProviderServer = world.getChunkSource();
-+            world.getAllEntities().forEach(e -> {
-+                ResourceLocation key = EntityType.getKey(e.getType());
-+
-+                MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
-+                ChunkPos chunk = e.chunkPosition();
-+                info.left++;
-+                info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
-+                if (!chunkProviderServer.isPositionTicking(e)) {
-+                    nonEntityTicking.merge(key, 1, Integer::sum);
-+                }
-+            });
-+            if (names.size() == 1) {
-+                ResourceLocation name = names.iterator().next();
-+                Pair<Integer, Map<ChunkPos, Integer>> info = list.get(name);
-+                int nonTicking = nonEntityTicking.getOrDefault(name, 0);
-+                if (info == null) {
-+                    sender.sendMessage(text("No entities found.", RED));
-+                    return;
-+                }
-+                sender.sendMessage("Entity: " + name + " Total Ticking: " + (info.getLeft() - nonTicking) + ", Total Non-Ticking: " + nonTicking);
-+                info.getRight().entrySet().stream()
-+                    .sorted((a, b) -> !a.getValue().equals(b.getValue()) ? b.getValue() - a.getValue() : a.getKey().toString().compareTo(b.getKey().toString()))
-+                    .limit(10).forEach(e -> {
-+                        final int x = (e.getKey().x << 4) + 8;
-+                        final int z = (e.getKey().z << 4) + 8;
-+                        final Component message = text("  " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z + (chunkProviderServer.isPositionTicking(e.getKey().toLong()) ? " (Ticking)" : " (Non-Ticking)"))
-+                            .hoverEvent(HoverEvent.showText(text("Click to teleport to chunk", GREEN)))
-+                            .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/minecraft:execute as @s in " + world.getWorld().getKey() + " run tp " + x + " " + (world.getWorld().getHighestBlockYAt(x, z, HeightMap.MOTION_BLOCKING) + 1) + " " + z));
-+                        sender.sendMessage(message);
-+                    });
-+            } else {
-+                List<Pair<ResourceLocation, Integer>> info = list.entrySet().stream()
-+                    .filter(e -> names.contains(e.getKey()))
-+                    .map(e -> Pair.of(e.getKey(), e.getValue().left))
-+                    .sorted((a, b) -> !a.getRight().equals(b.getRight()) ? b.getRight() - a.getRight() : a.getKey().toString().compareTo(b.getKey().toString()))
-+                    .toList();
-+
-+                if (info.isEmpty()) {
-+                    sender.sendMessage(text("No entities found.", RED));
-+                    return;
-+                }
-+
-+                int count = info.stream().mapToInt(Pair::getRight).sum();
-+                int nonTickingCount = nonEntityTicking.values().stream().mapToInt(Integer::intValue).sum();
-+                sender.sendMessage("Total Ticking: " + (count - nonTickingCount) + ", Total Non-Ticking: " + nonTickingCount);
-+                info.forEach(e -> {
-+                    int nonTicking = nonEntityTicking.getOrDefault(e.getKey(), 0);
-+                    sender.sendMessage("  " + (e.getValue() - nonTicking) + " (" + nonTicking + ") " + ": " + e.getKey());
-+                });
-+                sender.sendMessage("* First number is ticking entities, second number is non-ticking entities");
-+            }
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/HeapDumpCommand.java b/src/main/java/io/papermc/paper/command/subcommands/HeapDumpCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..cd2e4d792e972b8bf1e07b8961594a670ae949cf
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/HeapDumpCommand.java
-@@ -0,0 +1,38 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.time.LocalDateTime;
-+import java.time.format.DateTimeFormatter;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class HeapDumpCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        this.dumpHeap(sender);
-+        return true;
-+    }
-+
-+    private void dumpHeap(final CommandSender sender) {
-+        java.nio.file.Path dir = java.nio.file.Paths.get("./dumps");
-+        String name = "heap-dump-" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now());
-+
-+        Command.broadcastCommandMessage(sender, text("Writing JVM heap data...", YELLOW));
-+
-+        java.nio.file.Path file = CraftServer.dumpHeap(dir, name);
-+        if (file != null) {
-+            Command.broadcastCommandMessage(sender, text("Heap dump saved to " + file, GREEN));
-+        } else {
-+            Command.broadcastCommandMessage(sender, text("Failed to write heap dump, see server log for details", RED));
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..bd68139ae635f2ad7ec8e7a21e0056a139c4c62e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-@@ -0,0 +1,33 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import io.papermc.paper.command.PaperSubcommand;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class ReloadCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        this.doReload(sender);
-+        return true;
-+    }
-+
-+    private void doReload(final CommandSender sender) {
-+        Command.broadcastCommandMessage(sender, text("Please note that this command is not supported and may cause issues.", RED));
-+        Command.broadcastCommandMessage(sender, text("If you encounter any issues please use the /stop command to restart your server.", RED));
-+
-+        MinecraftServer server = ((CraftServer) sender.getServer()).getServer();
-+        server.paperConfigurations.reloadConfigs(server);
-+        server.server.reloadCount++;
-+
-+        Command.broadcastCommandMessage(sender, text("Paper config reload complete.", GREEN));
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/VersionCommand.java b/src/main/java/io/papermc/paper/command/subcommands/VersionCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ae60bd96b5284d54676d8e7e4dd5d170b526ec1e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/VersionCommand.java
-@@ -0,0 +1,21 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import io.papermc.paper.command.PaperSubcommand;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class VersionCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        final @Nullable Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
-+        if (ver != null) {
-+            ver.execute(sender, "paper", new String[0]);
-+        }
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 21b8f1913ff54d2b1553826269355da8bdb7f702..b9c22f725f5aeaee469fe5b7d8c3a57ddb1d5bdd 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -211,6 +211,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         // Paper end - initialize global and world-defaults configuration
-+        io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
-         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 749a4f1e8e46e0b072832056186d709a93df4b58..af1bca27eb2445218f7daeab3912e561085c9c00 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -975,6 +975,7 @@ public final class CraftServer implements Server {
-         this.commandMap.clearCommands();
-         this.reloadData();
-         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-+        io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
-         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
-         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
- 
-@@ -2695,6 +2696,34 @@ public final class CraftServer implements Server {
-     // Paper end
- 
-     // Paper start
-+    @SuppressWarnings({"rawtypes", "unchecked"})
-+    public static java.nio.file.Path dumpHeap(java.nio.file.Path dir, String name) {
-+        try {
-+            java.nio.file.Files.createDirectories(dir);
-+
-+            javax.management.MBeanServer server = java.lang.management.ManagementFactory.getPlatformMBeanServer();
-+            java.nio.file.Path file;
-+
-+            try {
-+                Class clazz = Class.forName("openj9.lang.management.OpenJ9DiagnosticsMXBean");
-+                Object openj9Mbean = java.lang.management.ManagementFactory.newPlatformMXBeanProxy(server, "openj9.lang.management:type=OpenJ9Diagnostics", clazz);
-+                java.lang.reflect.Method m = clazz.getMethod("triggerDumpToFile", String.class, String.class);
-+                file = dir.resolve(name + ".phd");
-+                m.invoke(openj9Mbean, "heap", file.toString());
-+            } catch (ClassNotFoundException e) {
-+                Class clazz = Class.forName("com.sun.management.HotSpotDiagnosticMXBean");
-+                Object hotspotMBean = java.lang.management.ManagementFactory.newPlatformMXBeanProxy(server, "com.sun.management:type=HotSpotDiagnostic", clazz);
-+                java.lang.reflect.Method m = clazz.getMethod("dumpHeap", String.class, boolean.class);
-+                file = dir.resolve(name + ".hprof");
-+                m.invoke(hotspotMBean, file.toString(), true);
-+            }
-+
-+            return file;
-+        } catch (Throwable t) {
-+            Bukkit.getLogger().log(Level.SEVERE, "Could not write heap", t);
-+            return null;
-+        }
-+    }
-     private Iterable<? extends net.kyori.adventure.audience.Audience> adventure$audiences;
-     @Override
-     public Iterable<? extends net.kyori.adventure.audience.Audience> audiences() {

patches/unapplied/server/0018-Paper-Metrics.patch

@@ -1,731 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Fri, 24 Mar 2017 23:56:01 -0500
-Subject: [PATCH] Paper Metrics
-
-Removes Spigot's mcstats metrics in favor of a system using bStats
-
-To disable for privacy or other reasons go to the bStats folder in your plugins folder
-and edit the config.yml file present there.
-
-Please keep in mind the data collected is anonymous and collection should have no
-tangible effect on server performance. The data is used to allow the authors of
-PaperMC to track version and platform usage so that we can make better management
-decisions on behalf of the project.
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6aaed8e8bf8c721fc834da5c76ac72a4c3e92458
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -0,0 +1,678 @@
-+package com.destroystokyo.paper;
-+
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Bukkit;
-+import org.bukkit.configuration.file.YamlConfiguration;
-+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-+import org.bukkit.plugin.Plugin;
-+
-+import org.json.simple.JSONArray;
-+import org.json.simple.JSONObject;
-+
-+import javax.net.ssl.HttpsURLConnection;
-+import java.io.ByteArrayOutputStream;
-+import java.io.DataOutputStream;
-+import java.io.File;
-+import java.io.IOException;
-+import java.net.URL;
-+import java.util.*;
-+import java.util.concurrent.Callable;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.ScheduledExecutorService;
-+import java.util.concurrent.TimeUnit;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import java.util.zip.GZIPOutputStream;
-+
-+/**
-+ * bStats collects some data for plugin authors.
-+ *
-+ * Check out https://bStats.org/ to learn more about bStats!
-+ */
-+public class Metrics {
-+
-+    // Executor service for requests
-+    // We use an executor service because the Bukkit scheduler is affected by server lags
-+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-+
-+    // The version of this bStats class
-+    public static final int B_STATS_VERSION = 1;
-+
-+    // The url to which the data is sent
-+    private static final String URL = "https://bStats.org/submitData/server-implementation";
-+
-+    // Should failed requests be logged?
-+    private static boolean logFailedRequests = false;
-+
-+    // The logger for the failed requests
-+    private static Logger logger = Logger.getLogger("bStats");
-+
-+    // The name of the server software
-+    private final String name;
-+
-+    // The uuid of the server
-+    private final String serverUUID;
-+
-+    // A list with all custom charts
-+    private final List<CustomChart> charts = new ArrayList<>();
-+
-+    /**
-+     * Class constructor.
-+     *
-+     * @param name              The name of the server software.
-+     * @param serverUUID        The uuid of the server.
-+     * @param logFailedRequests Whether failed requests should be logged or not.
-+     * @param logger            The logger for the failed requests.
-+     */
-+    public Metrics(String name, String serverUUID, boolean logFailedRequests, Logger logger) {
-+        this.name = name;
-+        this.serverUUID = serverUUID;
-+        Metrics.logFailedRequests = logFailedRequests;
-+        Metrics.logger = logger;
-+
-+        // Start submitting the data
-+        startSubmitting();
-+    }
-+
-+    /**
-+     * Adds a custom chart.
-+     *
-+     * @param chart The chart to add.
-+     */
-+    public void addCustomChart(CustomChart chart) {
-+        if (chart == null) {
-+            throw new IllegalArgumentException("Chart cannot be null!");
-+        }
-+        charts.add(chart);
-+    }
-+
-+    /**
-+     * Starts the Scheduler which submits our data every 30 minutes.
-+     */
-+    private void startSubmitting() {
-+        final Runnable submitTask = this::submitData;
-+
-+        // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution of requests on the
-+        // bStats backend. To circumvent this problem, we introduce some randomness into the initial and second delay.
-+        // WARNING: You must not modify any part of this Metrics class, including the submit delay or frequency!
-+        // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it!
-+        long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
-+        long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
-+        scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
-+        scheduler.scheduleAtFixedRate(submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS);
-+    }
-+
-+    /**
-+     * Gets the plugin specific data.
-+     *
-+     * @return The plugin specific data.
-+     */
-+    private JSONObject getPluginData() {
-+        JSONObject data = new JSONObject();
-+
-+        data.put("pluginName", name); // Append the name of the server software
-+        JSONArray customCharts = new JSONArray();
-+        for (CustomChart customChart : charts) {
-+            // Add the data of the custom charts
-+            JSONObject chart = customChart.getRequestJsonObject();
-+            if (chart == null) { // If the chart is null, we skip it
-+                continue;
-+            }
-+            customCharts.add(chart);
-+        }
-+        data.put("customCharts", customCharts);
-+
-+        return data;
-+    }
-+
-+    /**
-+     * Gets the server specific data.
-+     *
-+     * @return The server specific data.
-+     */
-+    private JSONObject getServerData() {
-+        // OS specific data
-+        String osName = System.getProperty("os.name");
-+        String osArch = System.getProperty("os.arch");
-+        String osVersion = System.getProperty("os.version");
-+        int coreCount = Runtime.getRuntime().availableProcessors();
-+
-+        JSONObject data = new JSONObject();
-+
-+        data.put("serverUUID", serverUUID);
-+
-+        data.put("osName", osName);
-+        data.put("osArch", osArch);
-+        data.put("osVersion", osVersion);
-+        data.put("coreCount", coreCount);
-+
-+        return data;
-+    }
-+
-+    /**
-+     * Collects the data and sends it afterwards.
-+     */
-+    private void submitData() {
-+        final JSONObject data = getServerData();
-+
-+        JSONArray pluginData = new JSONArray();
-+        pluginData.add(getPluginData());
-+        data.put("plugins", pluginData);
-+
-+        try {
-+            // We are still in the Thread of the timer, so nothing get blocked :)
-+            sendData(data);
-+        } catch (Exception e) {
-+            // Something went wrong! :(
-+            if (logFailedRequests) {
-+                logger.log(Level.WARNING, "Could not submit stats of " + name, e);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Sends the data to the bStats server.
-+     *
-+     * @param data The data to send.
-+     * @throws Exception If the request failed.
-+     */
-+    private static void sendData(JSONObject data) throws Exception {
-+        if (data == null) {
-+            throw new IllegalArgumentException("Data cannot be null!");
-+        }
-+        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-+
-+        // Compress the data to save bandwidth
-+        byte[] compressedData = compress(data.toString());
-+
-+        // Add headers
-+        connection.setRequestMethod("POST");
-+        connection.addRequestProperty("Accept", "application/json");
-+        connection.addRequestProperty("Connection", "close");
-+        connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
-+        connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-+        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
-+        connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-+
-+        // Send data
-+        connection.setDoOutput(true);
-+        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-+        outputStream.write(compressedData);
-+        outputStream.flush();
-+        outputStream.close();
-+
-+        connection.getInputStream().close(); // We don't care about the response - Just send our data :)
-+    }
-+
-+    /**
-+     * Gzips the given String.
-+     *
-+     * @param str The string to gzip.
-+     * @return The gzipped String.
-+     * @throws IOException If the compression failed.
-+     */
-+    private static byte[] compress(final String str) throws IOException {
-+        if (str == null) {
-+            return null;
-+        }
-+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-+        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-+        gzip.write(str.getBytes("UTF-8"));
-+        gzip.close();
-+        return outputStream.toByteArray();
-+    }
-+
-+    /**
-+     * Represents a custom chart.
-+     */
-+    public static abstract class CustomChart {
-+
-+        // The id of the chart
-+        final String chartId;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId The id of the chart.
-+         */
-+        CustomChart(String chartId) {
-+            if (chartId == null || chartId.isEmpty()) {
-+                throw new IllegalArgumentException("ChartId cannot be null or empty!");
-+            }
-+            this.chartId = chartId;
-+        }
-+
-+        private JSONObject getRequestJsonObject() {
-+            JSONObject chart = new JSONObject();
-+            chart.put("chartId", chartId);
-+            try {
-+                JSONObject data = getChartData();
-+                if (data == null) {
-+                    // If the data is null we don't send the chart.
-+                    return null;
-+                }
-+                chart.put("data", data);
-+            } catch (Throwable t) {
-+                if (logFailedRequests) {
-+                    logger.log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
-+                }
-+                return null;
-+            }
-+            return chart;
-+        }
-+
-+        protected abstract JSONObject getChartData() throws Exception;
-+
-+    }
-+
-+    /**
-+     * Represents a custom simple pie.
-+     */
-+    public static class SimplePie extends CustomChart {
-+
-+        private final Callable<String> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public SimplePie(String chartId, Callable<String> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            String value = callable.call();
-+            if (value == null || value.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("value", value);
-+            return data;
-+        }
-+    }
-+
-+    /**
-+     * Represents a custom advanced pie.
-+     */
-+    public static class AdvancedPie extends CustomChart {
-+
-+        private final Callable<Map<String, Integer>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Integer> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-+                if (entry.getValue() == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                values.put(entry.getKey(), entry.getValue());
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+    }
-+
-+    /**
-+     * Represents a custom drilldown pie.
-+     */
-+    public static class DrilldownPie extends CustomChart {
-+
-+        private final Callable<Map<String, Map<String, Integer>>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        public JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Map<String, Integer>> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean reallyAllSkipped = true;
-+            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-+                JSONObject value = new JSONObject();
-+                boolean allSkipped = true;
-+                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-+                    value.put(valueEntry.getKey(), valueEntry.getValue());
-+                    allSkipped = false;
-+                }
-+                if (!allSkipped) {
-+                    reallyAllSkipped = false;
-+                    values.put(entryValues.getKey(), value);
-+                }
-+            }
-+            if (reallyAllSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+    }
-+
-+    /**
-+     * Represents a custom single line chart.
-+     */
-+    public static class SingleLineChart extends CustomChart {
-+
-+        private final Callable<Integer> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public SingleLineChart(String chartId, Callable<Integer> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            int value = callable.call();
-+            if (value == 0) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("value", value);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom multi line chart.
-+     */
-+    public static class MultiLineChart extends CustomChart {
-+
-+        private final Callable<Map<String, Integer>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Integer> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-+                if (entry.getValue() == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                values.put(entry.getKey(), entry.getValue());
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom simple bar chart.
-+     */
-+    public static class SimpleBarChart extends CustomChart {
-+
-+        private final Callable<Map<String, Integer>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Integer> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-+                JSONArray categoryValues = new JSONArray();
-+                categoryValues.add(entry.getValue());
-+                values.put(entry.getKey(), categoryValues);
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom advanced bar chart.
-+     */
-+    public static class AdvancedBarChart extends CustomChart {
-+
-+        private final Callable<Map<String, int[]>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, int[]> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<String, int[]> entry : map.entrySet()) {
-+                if (entry.getValue().length == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                JSONArray categoryValues = new JSONArray();
-+                for (int categoryValue : entry.getValue()) {
-+                    categoryValues.add(categoryValue);
-+                }
-+                values.put(entry.getKey(), categoryValues);
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    public static class PaperMetrics {
-+        public static void startMetrics() {
-+            // Get the config file
-+            File configFile = new File(new File((File) MinecraftServer.getServer().options.valueOf("plugins"), "bStats"), "config.yml");
-+            YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-+
-+            // Check if the config file exists
-+            if (!config.isSet("serverUuid")) {
-+
-+                // Add default values
-+                config.addDefault("enabled", true);
-+                // Every server gets it's unique random id.
-+                config.addDefault("serverUuid", UUID.randomUUID().toString());
-+                // Should failed request be logged?
-+                config.addDefault("logFailedRequests", false);
-+
-+                // Inform the server owners about bStats
-+                config.options().header(
-+                        "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
-+                                "To honor their work, you should not disable it.\n" +
-+                                "This has nearly no effect on the server performance!\n" +
-+                                "Check out https://bStats.org/ to learn more :)"
-+                ).copyDefaults(true);
-+                try {
-+                    config.save(configFile);
-+                } catch (IOException ignored) {
-+                }
-+            }
-+            // Load the data
-+            String serverUUID = config.getString("serverUuid");
-+            boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
-+            // Only start Metrics, if it's enabled in the config
-+            if (config.getBoolean("enabled", true)) {
-+                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
-+
-+                metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
-+                    String minecraftVersion = Bukkit.getVersion();
-+                    minecraftVersion = minecraftVersion.substring(minecraftVersion.indexOf("MC: ") + 4, minecraftVersion.length() - 1);
-+                    return minecraftVersion;
-+                }));
-+
-+                metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
-+                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
-+                final String paperVersion;
-+                final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
-+                if (implVersion != null) {
-+                    final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
-+                    paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
-+                } else {
-+                    paperVersion = "unknown";
-+                }
-+                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
-+
-+                metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
-+                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+                    String javaVersion = System.getProperty("java.version");
-+                    Map<String, Integer> entry = new HashMap<>();
-+                    entry.put(javaVersion, 1);
-+
-+                    // http://openjdk.java.net/jeps/223
-+                    // Java decided to change their versioning scheme and in doing so modified the java.version system
-+                    // property to return $major[.$minor][.$secuity][-ea], as opposed to 1.$major.0_$identifier
-+                    // we can handle pre-9 by checking if the "major" is equal to "1", otherwise, 9+
-+                    String majorVersion = javaVersion.split("\\.")[0];
-+                    String release;
-+
-+                    int indexOf = javaVersion.lastIndexOf('.');
-+
-+                    if (majorVersion.equals("1")) {
-+                        release = "Java " + javaVersion.substring(0, indexOf);
-+                    } else {
-+                        // of course, it really wouldn't be all that simple if they didn't add a quirk, now would it
-+                        // valid strings for the major may potentially include values such as -ea to deannotate a pre release
-+                        Matcher versionMatcher = Pattern.compile("\\d+").matcher(majorVersion);
-+                        if (versionMatcher.find()) {
-+                            majorVersion = versionMatcher.group(0);
-+                        }
-+                        release = "Java " + majorVersion;
-+                    }
-+                    map.put(release, entry);
-+
-+                    return map;
-+                }));
-+
-+                metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
-+                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+
-+                    // count legacy plugins
-+                    int legacy = 0;
-+                    for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-+                        if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
-+                            legacy++;
-+                        }
-+                    }
-+
-+                    // insert real value as lower dimension
-+                    Map<String, Integer> entry = new HashMap<>();
-+                    entry.put(String.valueOf(legacy), 1);
-+
-+                    // create buckets as higher dimension
-+                    if (legacy == 0) {
-+                        map.put("0 \uD83D\uDE0E", entry); // :sunglasses:
-+                    } else if (legacy <= 5) {
-+                        map.put("1-5", entry);
-+                    } else if (legacy <= 10) {
-+                        map.put("6-10", entry);
-+                    } else if (legacy <= 25) {
-+                        map.put("11-25", entry);
-+                    } else if (legacy <= 50) {
-+                        map.put("26-50", entry);
-+                    } else {
-+                        map.put("50+ \uD83D\uDE2D", entry); // :cry:
-+                    }
-+
-+                    return map;
-+                }));
-+            }
-+
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b9c22f725f5aeaee469fe5b7d8c3a57ddb1d5bdd..0d6688e9da81453e64daacfb81e4a13cc37b3e66 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -212,6 +212,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         // Paper end - initialize global and world-defaults configuration
-         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
-+        com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
-         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 899e85ea70edfb6553dc27462690da8caa793f77..27b01f7ed930baab466a5e4f9608e9e1a4da0978 100644
---- a/src/main/java/org/spigotmc/SpigotConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -83,6 +83,7 @@ public class SpigotConfig
-             MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
-         }
- 
-+        /* // Paper - Replace with our own
-         if ( SpigotConfig.metrics == null )
-         {
-             try
-@@ -94,6 +95,7 @@ public class SpigotConfig
-                 Bukkit.getServer().getLogger().log( Level.SEVERE, "Could not start metrics service", ex );
-             }
-         }
-+        */ // Paper end
-     }
- 
-     public static void readConfig(Class<?> clazz, Object instance) // Paper - package-private -> public

patches/unapplied/server/0021-Hook-into-CB-plugin-rewrites.patch

@@ -1,185 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach@zachbr.io>
-Date: Wed, 3 Oct 2018 20:09:18 -0400
-Subject: [PATCH] Hook into CB plugin rewrites
-
-Allows us to do fun stuff like rewrite the OBC util fastutil location to
-our own relocation. Also lets us rewrite NMS calls for when we're
-debugging in an IDE pre-relocate.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index beccd928d151164db8c29f5b7addefbe9a195311..dedcdac1c6b2ba056761d5bd02212c1fb76348c4 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -8,6 +8,7 @@ import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collections;
- import java.util.Enumeration;
-+import java.util.HashMap;
- import java.util.HashSet;
- import java.util.List;
- import java.util.Map;
-@@ -17,6 +18,7 @@ import java.util.jar.JarEntry;
- import java.util.jar.JarFile;
- import java.util.jar.JarOutputStream;
- import java.util.zip.ZipEntry;
-+import javax.annotation.Nonnull;
- import joptsimple.OptionParser;
- import joptsimple.OptionSet;
- import joptsimple.OptionSpec;
-@@ -77,6 +79,40 @@ public class Commodore {
-     private static final Map<String, RerouteMethodData> FIELD_RENAME_METHOD_REROUTE = Commodore.createReroutes(FieldRename.class);
-     private static final Map<String, RerouteMethodData> MATERIAL_METHOD_REROUTE = Commodore.createReroutes(MaterialRerouting.class);
- 
-+    // Paper start - Plugin rewrites
-+    private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();
-+    private static Map<String, String> initReplacementsMap() {
-+        Map<String, String> getAndRemove = new HashMap<>();
-+        // Be wary of maven shade's relocations
-+
-+        final java.util.jar.Manifest manifest = io.papermc.paper.util.JarManifests.manifest(Commodore.class);
-+        if (Boolean.getBoolean( "debug.rewriteForIde") && manifest != null)
-+        {
-+            // unversion incoming calls for pre-relocate debug work
-+            final String NMS_REVISION_PACKAGE = "v" + manifest.getMainAttributes().getValue("CraftBukkit-Package-Version") + "/";
-+
-+            getAndRemove.put("org/bukkit/".concat("craftbukkit/" + NMS_REVISION_PACKAGE), NMS_REVISION_PACKAGE);
-+        }
-+
-+        return getAndRemove;
-+    }
-+
-+    @Nonnull
-+    private static String getOriginalOrRewrite(@Nonnull String original)
-+    {
-+        String rewrite = null;
-+        for ( Map.Entry<String, String> entry : SEARCH_AND_REMOVE.entrySet() )
-+        {
-+            if ( original.contains( entry.getKey() ) )
-+            {
-+                rewrite = original.replace( entry.getValue(), "" );
-+            }
-+        }
-+
-+        return rewrite != null ? rewrite : original;
-+    }
-+    // Paper end - Plugin rewrites
-+
-     public static void main(String[] args) {
-         OptionParser parser = new OptionParser();
-         OptionSpec<File> inputFlag = parser.acceptsAll(Arrays.asList("i", "input")).withRequiredArg().ofType(File.class).required();
-@@ -203,9 +239,49 @@ public class Commodore {
-             @Override
-             public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-                 return new MethodVisitor(this.api, super.visitMethod(access, name, desc, signature, exceptions)) {
-+                    // Paper start - Plugin rewrites
-+                    @Override
-+                    public void visitTypeInsn(int opcode, String type) {
-+                        type = getOriginalOrRewrite(type);
-+
-+                        super.visitTypeInsn(opcode, type);
-+                    }
-+
-+                    @Override
-+                    public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
-+                        for (int i = 0; i < local.length; i++)
-+                        {
-+                            if (!(local[i] instanceof String)) { continue; }
-+
-+                            local[i] = getOriginalOrRewrite((String) local[i]);
-+                        }
-+
-+                        for (int i = 0; i < stack.length; i++)
-+                        {
-+                            if (!(stack[i] instanceof String)) { continue; }
-+
-+                            stack[i] = getOriginalOrRewrite((String) stack[i]);
-+                        }
-+
-+                        super.visitFrame(type, nLocal, local, nStack, stack);
-+                    }
-+
-+                    @Override
-+                    public void visitLocalVariable(String name, String descriptor, String signature, Label start, Label end, int index) {
-+                        descriptor = getOriginalOrRewrite(descriptor);
-+
-+                        super.visitLocalVariable(name, descriptor, signature, start, end, index);
-+                    }
-+                    // Paper end - Plugin rewrites
- 
-                     @Override
-                     public void visitFieldInsn(int opcode, String owner, String name, String desc) {
-+                        // Paper start - Rewrite plugins
-+                        owner = getOriginalOrRewrite(owner);
-+                        if (desc != null) {
-+                            desc = getOriginalOrRewrite(desc);
-+                        }
-+                        // Paper end
-                         name = FieldRename.rename(pluginVersion, owner, name);
- 
-                         if (modern) {
-@@ -301,6 +377,13 @@ public class Commodore {
-                             return;
-                         }
- 
-+                        // Paper start - Rewrite plugins
-+                        owner = getOriginalOrRewrite(owner) ;
-+                        if (desc != null) {
-+                            desc = getOriginalOrRewrite(desc);
-+                        }
-+                        // Paper end - Rewrite plugins
-+
-                         if (modern) {
-                             if (owner.equals("org/bukkit/Material") || (instantiatedMethodType != null && instantiatedMethodType.getDescriptor().startsWith("(Lorg/bukkit/Material;)"))) {
-                                 switch (name) {
-@@ -397,6 +480,13 @@ public class Commodore {
- 
-                     @Override
-                     public void visitLdcInsn(Object value) {
-+                        // Paper start
-+                        if (value instanceof Type type) {
-+                            if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
-+                                value = Type.getType(getOriginalOrRewrite(type.getDescriptor()));
-+                            }
-+                        }
-+                        // Paper end
-                         if (value instanceof String && ((String) value).equals("com.mysql.jdbc.Driver")) {
-                             super.visitLdcInsn("com.mysql.cj.jdbc.Driver");
-                             return;
-@@ -407,6 +497,14 @@ public class Commodore {
- 
-                     @Override
-                     public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
-+                        // Paper start - Rewrite plugins
-+                        name = getOriginalOrRewrite(name);
-+                        if (descriptor != null) {
-+                            descriptor = getOriginalOrRewrite(descriptor);
-+                        }
-+                        final String fName = name;
-+                        final String fDescriptor = descriptor;
-+                        // Paper end - Rewrite plugins
-                         if (bootstrapMethodHandle.getOwner().equals("java/lang/invoke/LambdaMetafactory")
-                                 && bootstrapMethodHandle.getName().equals("metafactory") && bootstrapMethodArguments.length == 3) {
-                             Type samMethodType = (Type) bootstrapMethodArguments[0];
-@@ -423,7 +521,7 @@ public class Commodore {
-                                 methodArgs.add(new Handle(newOpcode, newOwner, newName, newDescription, newItf));
-                                 methodArgs.add(newInstantiated);
- 
--                                super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, methodArgs.toArray(Object[]::new));
-+                                super.visitInvokeDynamicInsn(fName, fDescriptor, bootstrapMethodHandle, methodArgs.toArray(Object[]::new)); // Paper - use final local vars
-                             }, implMethod.getTag(), implMethod.getOwner(), implMethod.getName(), implMethod.getDesc(), implMethod.isInterface(), samMethodType, instantiatedMethodType);
-                             return;
-                         }
-@@ -474,6 +572,12 @@ public class Commodore {
- 
-             @Override
-             public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
-+                // Paper start - Rewrite plugins
-+                descriptor = getOriginalOrRewrite(descriptor);
-+                if ( signature != null ) {
-+                    signature = getOriginalOrRewrite(signature);
-+                }
-+                // Paper end
-                 return new FieldVisitor(this.api, super.visitField(access, name, descriptor, signature, value)) {
-                     @Override
-                     public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {

patches/unapplied/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch

@@ -1,728 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Sun, 30 Oct 2022 23:47:26 +0100
-Subject: [PATCH] Remap reflection calls in plugins using internals
-
-Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 2868eb8f9e577ce839d7ecf5ce8fed5bad957dbe..158779a3590f089c4224b2b128c2e653aef42a94 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -47,6 +47,12 @@ dependencies {
-     testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
-     implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
-     implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins
-+    // Paper start - Remap reflection
-+    val reflectionRewriterVersion = "0.0.1"
-+    implementation("io.papermc:reflection-rewriter:$reflectionRewriterVersion")
-+    implementation("io.papermc:reflection-rewriter-runtime:$reflectionRewriterVersion")
-+    implementation("io.papermc:reflection-rewriter-proxy-generator:$reflectionRewriterVersion")
-+    // Paper end - Remap reflection
- }
- 
- paperweight {
-diff --git a/src/main/java/io/papermc/paper/configuration/serializer/PacketClassSerializer.java b/src/main/java/io/papermc/paper/configuration/serializer/PacketClassSerializer.java
-index 893ad5e7c2d32ccd64962d95d146bbd317c28ab8..3d73ea0e63c97b2b08e719b7be7af3894fb2d4e8 100644
---- a/src/main/java/io/papermc/paper/configuration/serializer/PacketClassSerializer.java
-+++ b/src/main/java/io/papermc/paper/configuration/serializer/PacketClassSerializer.java
-@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableBiMap;
- import com.mojang.logging.LogUtils;
- import io.leangen.geantyref.TypeToken;
- import io.papermc.paper.configuration.serializer.collections.MapSerializer;
-+import io.papermc.paper.util.MappingEnvironment;
- import io.papermc.paper.util.ObfHelper;
- import net.minecraft.network.protocol.Packet;
- import org.checkerframework.checker.nullness.qual.Nullable;
-@@ -69,7 +70,7 @@ public final class PacketClassSerializer extends ScalarSerializer<Class<? extend
-     @Override
-     protected @Nullable Object serialize(final Class<? extends Packet<?>> packetClass, final Predicate<Class<?>> typeSupported) {
-         final String name = packetClass.getName();
--        @Nullable String mojName = ObfHelper.INSTANCE.mappingsByMojangName() == null ? name : MOJANG_TO_OBF.inverse().get(name); // if the mappings are null, running on moj-mapped server
-+        @Nullable String mojName = ObfHelper.INSTANCE.mappingsByMojangName() == null || !MappingEnvironment.reobf() ? name : MOJANG_TO_OBF.inverse().get(name); // if the mappings are null, running on moj-mapped server
-         if (mojName == null && MOJANG_TO_OBF.containsKey(name)) {
-             mojName = name;
-         }
-diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/BytecodeModifyingURLClassLoader.java b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/BytecodeModifyingURLClassLoader.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1240c061c121e8d5eb9add4e5e21955ee6df9368
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/BytecodeModifyingURLClassLoader.java
-@@ -0,0 +1,187 @@
-+package io.papermc.paper.plugin.entrypoint.classloader;
-+
-+import io.papermc.paper.pluginremap.reflect.ReflectionRemapper;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.io.UncheckedIOException;
-+import java.net.JarURLConnection;
-+import java.net.URI;
-+import java.net.URL;
-+import java.net.URLClassLoader;
-+import java.security.CodeSigner;
-+import java.security.CodeSource;
-+import java.util.Map;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.function.Function;
-+import java.util.jar.Attributes;
-+import java.util.jar.Manifest;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.ClassWriter;
-+
-+import static java.util.Objects.requireNonNullElse;
-+
-+public final class BytecodeModifyingURLClassLoader extends URLClassLoader {
-+    static {
-+        ClassLoader.registerAsParallelCapable();
-+    }
-+
-+    private static final Object MISSING_MANIFEST = new Object();
-+
-+    private final Function<byte[], byte[]> modifier;
-+    private final Map<String, Object> manifests = new ConcurrentHashMap<>();
-+
-+    public BytecodeModifyingURLClassLoader(
-+        final URL[] urls,
-+        final ClassLoader parent,
-+        final Function<byte[], byte[]> modifier
-+    ) {
-+        super(urls, parent);
-+        this.modifier = modifier;
-+    }
-+
-+    public BytecodeModifyingURLClassLoader(
-+        final URL[] urls,
-+        final ClassLoader parent
-+    ) {
-+        this(urls, parent, bytes -> {
-+            final ClassReader classReader = new ClassReader(bytes);
-+            final ClassWriter classWriter = new ClassWriter(classReader, 0);
-+            final ClassVisitor visitor = ReflectionRemapper.visitor(classWriter);
-+            if (visitor == classWriter) {
-+                return bytes;
-+            }
-+            classReader.accept(visitor, 0);
-+            return classWriter.toByteArray();
-+        });
-+    }
-+
-+    @Override
-+    protected Class<?> findClass(final String name) throws ClassNotFoundException {
-+        final Class<?> result;
-+        final String path = name.replace('.', '/').concat(".class");
-+        final URL url = this.findResource(path);
-+        if (url != null) {
-+            try {
-+                result = this.defineClass(name, url);
-+            } catch (final IOException e) {
-+                throw new ClassNotFoundException(name, e);
-+            }
-+        } else {
-+            result = null;
-+        }
-+        if (result == null) {
-+            throw new ClassNotFoundException(name);
-+        }
-+        return result;
-+    }
-+
-+    private Class<?> defineClass(String name, URL url) throws IOException {
-+        int i = name.lastIndexOf('.');
-+        if (i != -1) {
-+            String pkgname = name.substring(0, i);
-+            // Check if package already loaded.
-+            final @Nullable Manifest man = this.manifestFor(url);
-+            final URL jarUrl = URI.create(jarName(url)).toURL();
-+            if (this.getAndVerifyPackage(pkgname, man, jarUrl) == null) {
-+                try {
-+                    if (man != null) {
-+                        this.definePackage(pkgname, man, jarUrl);
-+                    } else {
-+                        this.definePackage(pkgname, null, null, null, null, null, null, null);
-+                    }
-+                } catch (IllegalArgumentException iae) {
-+                    // parallel-capable class loaders: re-verify in case of a
-+                    // race condition
-+                    if (this.getAndVerifyPackage(pkgname, man, jarUrl) == null) {
-+                        // Should never happen
-+                        throw new AssertionError("Cannot find package " +
-+                            pkgname);
-+                    }
-+                }
-+            }
-+        }
-+        final byte[] bytes;
-+        try (final InputStream is = url.openStream()) {
-+            bytes = is.readAllBytes();
-+        }
-+
-+        final byte[] modified = this.modifier.apply(bytes);
-+
-+        final CodeSource cs = new CodeSource(url, (CodeSigner[]) null);
-+        return this.defineClass(name, modified, 0, modified.length, cs);
-+    }
-+
-+    private Package getAndVerifyPackage(
-+        String pkgname,
-+        Manifest man, URL url
-+    ) {
-+        Package pkg = getDefinedPackage(pkgname);
-+        if (pkg != null) {
-+            // Package found, so check package sealing.
-+            if (pkg.isSealed()) {
-+                // Verify that code source URL is the same.
-+                if (!pkg.isSealed(url)) {
-+                    throw new SecurityException(
-+                        "sealing violation: package " + pkgname + " is sealed");
-+                }
-+            } else {
-+                // Make sure we are not attempting to seal the package
-+                // at this code source URL.
-+                if ((man != null) && this.isSealed(pkgname, man)) {
-+                    throw new SecurityException(
-+                        "sealing violation: can't seal package " + pkgname +
-+                            ": already loaded");
-+                }
-+            }
-+        }
-+        return pkg;
-+    }
-+
-+    private boolean isSealed(String name, Manifest man) {
-+        Attributes attr = man.getAttributes(name.replace('.', '/').concat("/"));
-+        String sealed = null;
-+        if (attr != null) {
-+            sealed = attr.getValue(Attributes.Name.SEALED);
-+        }
-+        if (sealed == null) {
-+            if ((attr = man.getMainAttributes()) != null) {
-+                sealed = attr.getValue(Attributes.Name.SEALED);
-+            }
-+        }
-+        return "true".equalsIgnoreCase(sealed);
-+    }
-+
-+    private @Nullable Manifest manifestFor(final URL url) throws IOException {
-+        Manifest man = null;
-+        if (url.getProtocol().equals("jar")) {
-+            try {
-+                final Object computedManifest = this.manifests.computeIfAbsent(jarName(url), $ -> {
-+                    try {
-+                        final Manifest m = ((JarURLConnection) url.openConnection()).getManifest();
-+                        return requireNonNullElse(m, MISSING_MANIFEST);
-+                    } catch (final IOException e) {
-+                        throw new UncheckedIOException(e);
-+                    }
-+                });
-+                if (computedManifest instanceof Manifest found) {
-+                    man = found;
-+                }
-+            } catch (final UncheckedIOException e) {
-+                throw e.getCause();
-+            } catch (final IllegalArgumentException e) {
-+                throw new IOException(e);
-+            }
-+        }
-+        return man;
-+    }
-+
-+    private static String jarName(final URL sourceUrl) {
-+        final int exclamationIdx = sourceUrl.getPath().lastIndexOf('!');
-+        if (exclamationIdx != -1) {
-+            return sourceUrl.getPath().substring(0, exclamationIdx);
-+        }
-+        throw new IllegalArgumentException("Could not find jar for URL " + sourceUrl);
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperClassloaderBytecodeModifier.java b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperClassloaderBytecodeModifier.java
-index f9a2c55a354c877749db3f92956de802ae575788..39182cdd17473da0123dc7172dce507eab29fedc 100644
---- a/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperClassloaderBytecodeModifier.java
-+++ b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperClassloaderBytecodeModifier.java
-@@ -1,12 +1,17 @@
- package io.papermc.paper.plugin.entrypoint.classloader;
- 
- import io.papermc.paper.plugin.configuration.PluginMeta;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassWriter;
- 
- // Stub, implement in future.
- public class PaperClassloaderBytecodeModifier implements ClassloaderBytecodeModifier {
- 
-     @Override
-     public byte[] modify(PluginMeta configuration, byte[] bytecode) {
--        return bytecode;
-+        ClassReader classReader = new ClassReader(bytecode);
-+        ClassWriter classWriter = new ClassWriter(classReader, 0);
-+        classReader.accept(io.papermc.paper.pluginremap.reflect.ReflectionRemapper.visitor(classWriter), 0);
-+        return classWriter.toByteArray();
-     }
- }
-diff --git a/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java b/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java
-index f576060c8fe872772bbafe2016fc9b83a3c095f1..f9d4b33050a6fe8c2dabe8e5eec075d95dc513e0 100644
---- a/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java
-+++ b/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java
-@@ -2,12 +2,12 @@ package io.papermc.paper.plugin.loader;
- 
- import io.papermc.paper.plugin.PluginInitializerManager;
- import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
-+import io.papermc.paper.plugin.entrypoint.classloader.BytecodeModifyingURLClassLoader;
-+import io.papermc.paper.plugin.entrypoint.classloader.PaperPluginClassLoader;
- import io.papermc.paper.plugin.loader.library.ClassPathLibrary;
- import io.papermc.paper.plugin.loader.library.PaperLibraryStore;
--import io.papermc.paper.plugin.entrypoint.classloader.PaperPluginClassLoader;
- import io.papermc.paper.plugin.provider.configuration.PaperPluginMeta;
--import org.jetbrains.annotations.NotNull;
--
-+import io.papermc.paper.util.MappingEnvironment;
- import java.io.IOException;
- import java.net.MalformedURLException;
- import java.net.URL;
-@@ -17,6 +17,7 @@ import java.util.ArrayList;
- import java.util.List;
- import java.util.jar.JarFile;
- import java.util.logging.Logger;
-+import org.jetbrains.annotations.NotNull;
- 
- public class PaperClasspathBuilder implements PluginClasspathBuilder {
- 
-@@ -60,7 +61,10 @@ public class PaperClasspathBuilder implements PluginClasspathBuilder {
-         }
- 
-         try {
--            return new PaperPluginClassLoader(logger, source, jarFile, configuration, this.getClass().getClassLoader(), new URLClassLoader(urls, getClass().getClassLoader()));
-+            final URLClassLoader libraryLoader = MappingEnvironment.DISABLE_PLUGIN_REWRITING
-+                ? new URLClassLoader(urls, this.getClass().getClassLoader())
-+                : new BytecodeModifyingURLClassLoader(urls, this.getClass().getClassLoader());
-+            return new PaperPluginClassLoader(logger, source, jarFile, configuration, this.getClass().getClassLoader(), libraryLoader);
-         } catch (IOException exception) {
-             throw new RuntimeException(exception);
-         }
-diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java
-index bdd9bc8a414719b9f1d6f01f90539ddb8603a878..fdb52ad85cfaa1d53aadcad72cec3d3c8c12c058 100644
---- a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java
-+++ b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java
-@@ -1,9 +1,12 @@
- package io.papermc.paper.plugin.provider.type.spigot;
- 
-+import io.papermc.paper.plugin.entrypoint.classloader.BytecodeModifyingURLClassLoader;
- import io.papermc.paper.plugin.provider.configuration.serializer.constraints.PluginConfigConstraints;
- import io.papermc.paper.plugin.provider.type.PluginTypeFactory;
-+import io.papermc.paper.util.MappingEnvironment;
- import org.bukkit.plugin.InvalidDescriptionException;
- import org.bukkit.plugin.PluginDescriptionFile;
-+import org.bukkit.plugin.java.LibraryLoader;
- import org.yaml.snakeyaml.error.YAMLException;
- 
- import java.io.IOException;
-@@ -15,6 +18,12 @@ import java.util.jar.JarFile;
- 
- class SpigotPluginProviderFactory implements PluginTypeFactory<SpigotPluginProvider, PluginDescriptionFile> {
- 
-+    static {
-+        if (!MappingEnvironment.DISABLE_PLUGIN_REWRITING) {
-+			LibraryLoader.LIBRARY_LOADER_FACTORY = BytecodeModifyingURLClassLoader::new;
-+		}
-+    }
-+
-     @Override
-     public SpigotPluginProvider build(JarFile file, PluginDescriptionFile configuration, Path source) throws InvalidDescriptionException {
-         // Copied from SimplePluginManager#loadPlugins
-diff --git a/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java b/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c653d1f5af8b407cfba715e6027dbb695046892a
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java
-@@ -0,0 +1,212 @@
-+package io.papermc.paper.pluginremap.reflect;
-+
-+import com.mojang.logging.LogUtils;
-+import io.papermc.paper.util.MappingEnvironment;
-+import io.papermc.paper.util.ObfHelper;
-+import io.papermc.reflectionrewriter.runtime.AbstractDefaultRulesReflectionProxy;
-+import io.papermc.reflectionrewriter.runtime.DefineClassReflectionProxy;
-+import java.lang.invoke.MethodHandles;
-+import java.nio.ByteBuffer;
-+import java.security.CodeSource;
-+import java.security.ProtectionDomain;
-+import java.util.Map;
-+import java.util.Objects;
-+import java.util.stream.Collectors;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassWriter;
-+import org.slf4j.Logger;
-+
-+// todo proper inheritance handling
-+@SuppressWarnings("unused")
-+@DefaultQualifier(NonNull.class)
-+public final class PaperReflection extends AbstractDefaultRulesReflectionProxy implements DefineClassReflectionProxy {
-+    // concat to avoid being rewritten by shadow
-+    private static final Logger LOGGER = LogUtils.getLogger();
-+    private static final String CB_PACKAGE_PREFIX = "org.bukkit.".concat("craftbukkit.");
-+    private static final String LEGACY_CB_PACKAGE_PREFIX = "org.bukkit.".concat("craftbukkit.") + MappingEnvironment.LEGACY_CB_VERSION + ".";
-+
-+    private final DefineClassReflectionProxy defineClassProxy;
-+    private final Map<String, ObfHelper.ClassMapping> mappingsByMojangName;
-+    private final Map<String, ObfHelper.ClassMapping> mappingsByObfName;
-+    // Reflection does not care about method return values, so this map removes the return value descriptor from the key
-+    private final Map<String, Map<String, String>> strippedMethodMappings;
-+
-+    PaperReflection() {
-+        this.defineClassProxy = DefineClassReflectionProxy.create(PaperReflection::processClass);
-+        if (!MappingEnvironment.hasMappings()) {
-+            this.mappingsByMojangName = Map.of();
-+            this.mappingsByObfName = Map.of();
-+            this.strippedMethodMappings = Map.of();
-+            return;
-+        }
-+        final ObfHelper obfHelper = ObfHelper.INSTANCE;
-+        this.mappingsByMojangName = Objects.requireNonNull(obfHelper.mappingsByMojangName(), "mappingsByMojangName");
-+        this.mappingsByObfName = Objects.requireNonNull(obfHelper.mappingsByObfName(), "mappingsByObfName");
-+        this.strippedMethodMappings = this.mappingsByMojangName.entrySet().stream().collect(Collectors.toUnmodifiableMap(
-+            Map.Entry::getKey,
-+            entry -> entry.getValue().strippedMethods()
-+        ));
-+    }
-+
-+    @Override
-+    protected String mapClassName(final String name) {
-+        final ObfHelper.@Nullable ClassMapping mapping = this.mappingsByObfName.get(name);
-+        return mapping != null ? mapping.mojangName() : removeCraftBukkitRelocation(name);
-+    }
-+
-+    @Override
-+    protected String mapDeclaredMethodName(final Class<?> clazz, final String name, final Class<?>... parameterTypes) {
-+        final @Nullable Map<String, String> mapping = this.strippedMethodMappings.get(clazz.getName());
-+        if (mapping == null) {
-+            return name;
-+        }
-+        return mapping.getOrDefault(strippedMethodKey(name, parameterTypes), name);
-+    }
-+
-+    @Override
-+    protected String mapMethodName(final Class<?> clazz, final String name, final Class<?>... parameterTypes) {
-+        final @Nullable String mapped = this.findMappedMethodName(clazz, name, parameterTypes);
-+        return mapped != null ? mapped : name;
-+    }
-+
-+    @Override
-+    protected String mapDeclaredFieldName(final Class<?> clazz, final String name) {
-+        final ObfHelper.@Nullable ClassMapping mapping = this.mappingsByMojangName.get(clazz.getName());
-+        if (mapping == null) {
-+            return name;
-+        }
-+        return mapping.fieldsByObf().getOrDefault(name, name);
-+    }
-+
-+    @Override
-+    protected String mapFieldName(final Class<?> clazz, final String name) {
-+        final @Nullable String mapped = this.findMappedFieldName(clazz, name);
-+        return mapped != null ? mapped : name;
-+    }
-+
-+    private @Nullable String findMappedMethodName(final Class<?> clazz, final String name, final Class<?>... parameterTypes) {
-+        final Map<String, String> map = this.strippedMethodMappings.get(clazz.getName());
-+        @Nullable String mapped = null;
-+        if (map != null) {
-+            mapped = map.get(strippedMethodKey(name, parameterTypes));
-+            if (mapped != null) {
-+                return mapped;
-+            }
-+        }
-+        // JVM checks super before interfaces
-+        final Class<?> superClass = clazz.getSuperclass();
-+        if (superClass != null) {
-+            mapped = this.findMappedMethodName(superClass, name, parameterTypes);
-+        }
-+        if (mapped == null) {
-+            for (final Class<?> i : clazz.getInterfaces()) {
-+                mapped = this.findMappedMethodName(i, name, parameterTypes);
-+                if (mapped != null) {
-+                    break;
-+                }
-+            }
-+        }
-+        return mapped;
-+    }
-+
-+    private @Nullable String findMappedFieldName(final Class<?> clazz, final String name) {
-+        final ObfHelper.ClassMapping mapping = this.mappingsByMojangName.get(clazz.getName());
-+        @Nullable String mapped = null;
-+        if (mapping != null) {
-+            mapped = mapping.fieldsByObf().get(name);
-+            if (mapped != null) {
-+                return mapped;
-+            }
-+        }
-+        // The JVM checks super before interfaces
-+        final Class<?> superClass = clazz.getSuperclass();
-+        if (superClass != null) {
-+            mapped = this.findMappedFieldName(superClass, name);
-+        }
-+        if (mapped == null) {
-+            for (final Class<?> i : clazz.getInterfaces()) {
-+                mapped = this.findMappedFieldName(i, name);
-+                if (mapped != null) {
-+                    break;
-+                }
-+            }
-+        }
-+        return mapped;
-+    }
-+
-+    private static String strippedMethodKey(final String methodName, final Class<?>... parameterTypes) {
-+        return methodName + parameterDescriptor(parameterTypes);
-+    }
-+
-+    private static String parameterDescriptor(final Class<?>... parameterTypes) {
-+        final StringBuilder builder = new StringBuilder();
-+        builder.append('(');
-+        for (final Class<?> parameterType : parameterTypes) {
-+            builder.append(parameterType.descriptorString());
-+        }
-+        builder.append(')');
-+        return builder.toString();
-+    }
-+
-+    private static String removeCraftBukkitRelocation(final String name) {
-+        if (MappingEnvironment.hasMappings()) {
-+            // Relocation is applied in reobf, and when mappings are present they handle the relocation
-+            return name;
-+        }
-+        if (name.startsWith(LEGACY_CB_PACKAGE_PREFIX)) {
-+            return CB_PACKAGE_PREFIX + name.substring(LEGACY_CB_PACKAGE_PREFIX.length());
-+        }
-+        return name;
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final Object loader, final byte[] b, final int off, final int len) throws ClassFormatError {
-+        return this.defineClassProxy.defineClass(loader, b, off, len);
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final Object loader, final String name, final byte[] b, final int off, final int len) throws ClassFormatError {
-+        return this.defineClassProxy.defineClass(loader, name, b, off, len);
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final Object loader, final @Nullable String name, final byte[] b, final int off, final int len, final @Nullable ProtectionDomain protectionDomain) throws ClassFormatError {
-+        return this.defineClassProxy.defineClass(loader, name, b, off, len, protectionDomain);
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final Object loader, final String name, final ByteBuffer b, final ProtectionDomain protectionDomain) throws ClassFormatError {
-+        return this.defineClassProxy.defineClass(loader, name, b, protectionDomain);
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final Object secureLoader, final String name, final byte[] b, final int off, final int len, final CodeSource cs) {
-+        return this.defineClassProxy.defineClass(secureLoader, name, b, off, len, cs);
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final Object secureLoader, final String name, final ByteBuffer b, final CodeSource cs) {
-+        return this.defineClassProxy.defineClass(secureLoader, name, b, cs);
-+    }
-+
-+    @Override
-+    public Class<?> defineClass(final MethodHandles.Lookup lookup, final byte[] bytes) throws IllegalAccessException {
-+        return this.defineClassProxy.defineClass(lookup, bytes);
-+    }
-+
-+    // todo apply bytecode remap here as well
-+    private static byte[] processClass(final byte[] bytes) {
-+        try {
-+            final ClassReader reader = new ClassReader(bytes);
-+            final ClassWriter writer = new ClassWriter(reader, 0);
-+            reader.accept(ReflectionRemapper.visitor(writer), 0);
-+            return writer.toByteArray();
-+        } catch (final Exception ex) {
-+            LOGGER.warn("Failed to process class bytes", ex);
-+            return bytes;
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/pluginremap/reflect/ReflectionRemapper.java b/src/main/java/io/papermc/paper/pluginremap/reflect/ReflectionRemapper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5fa5868e82d1f00498d0c5771369e1718b2df4ee
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/pluginremap/reflect/ReflectionRemapper.java
-@@ -0,0 +1,54 @@
-+package io.papermc.paper.pluginremap.reflect;
-+
-+import io.papermc.asm.ClassInfoProvider;
-+import io.papermc.asm.RewriteRuleVisitorFactory;
-+import io.papermc.paper.util.MappingEnvironment;
-+import io.papermc.reflectionrewriter.BaseReflectionRules;
-+import io.papermc.reflectionrewriter.DefineClassRule;
-+import io.papermc.reflectionrewriter.proxygenerator.ProxyGenerator;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.reflect.Method;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.Opcodes;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class ReflectionRemapper {
-+    private static final String PAPER_REFLECTION_HOLDER = "io.papermc.paper.pluginremap.reflect.PaperReflectionHolder";
-+    private static final String PAPER_REFLECTION_HOLDER_DESC = PAPER_REFLECTION_HOLDER.replace('.', '/');
-+    private static final RewriteRuleVisitorFactory VISITOR_FACTORY = RewriteRuleVisitorFactory.create(
-+        Opcodes.ASM9,
-+        chain -> chain.then(new BaseReflectionRules(PAPER_REFLECTION_HOLDER).rules())
-+            .then(DefineClassRule.create(PAPER_REFLECTION_HOLDER_DESC, true)),
-+        ClassInfoProvider.basic()
-+    );
-+
-+    static {
-+        if (!MappingEnvironment.reobf()) {
-+            setupProxy();
-+        }
-+    }
-+
-+    private ReflectionRemapper() {
-+    }
-+
-+    public static ClassVisitor visitor(final ClassVisitor parent) {
-+        if (MappingEnvironment.reobf()) {
-+            return parent;
-+        }
-+        return VISITOR_FACTORY.createVisitor(parent);
-+    }
-+
-+    private static void setupProxy() {
-+        try {
-+            final byte[] bytes = ProxyGenerator.generateProxy(PaperReflection.class, PAPER_REFLECTION_HOLDER_DESC);
-+            final MethodHandles.Lookup lookup = MethodHandles.lookup();
-+            final Class<?> generated = lookup.defineClass(bytes);
-+            final Method init = generated.getDeclaredMethod("init", PaperReflection.class);
-+            init.invoke(null, new PaperReflection());
-+        } catch (final ReflectiveOperationException ex) {
-+            throw new RuntimeException(ex);
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/util/MappingEnvironment.java b/src/main/java/io/papermc/paper/util/MappingEnvironment.java
-index 8e4229634d41a42b3d93948eebb77def7c0c72b1..4d57213c9917ea965bfe06a5d242e61422457ee2 100644
---- a/src/main/java/io/papermc/paper/util/MappingEnvironment.java
-+++ b/src/main/java/io/papermc/paper/util/MappingEnvironment.java
-@@ -10,6 +10,8 @@ import org.checkerframework.framework.qual.DefaultQualifier;
- 
- @DefaultQualifier(NonNull.class)
- public final class MappingEnvironment {
-+    public static final boolean DISABLE_PLUGIN_REWRITING = Boolean.getBoolean("paper.disable-plugin-rewriting");
-+    public static final String LEGACY_CB_VERSION = "v1_20_R4";
-     private static final @Nullable String MAPPINGS_HASH = readMappingsHash();
-     private static final boolean REOBF = checkReobf();
- 
-diff --git a/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
-index 242811578a786e3807a1a7019d472d5a68f87116..0b65fdf53124f3dd042b2363b1b8df8e1ca7de00 100644
---- a/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
-+++ b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
-@@ -29,6 +29,9 @@ public enum StacktraceDeobfuscator {
-     });
- 
-     public void deobfuscateThrowable(final Throwable throwable) {
-+        if (!MappingEnvironment.reobf()) {
-+            return;
-+        }
-         if (GlobalConfiguration.get() != null && !GlobalConfiguration.get().logging.deobfuscateStacktraces) { // handle null as true
-             return;
-         }
-@@ -44,6 +47,9 @@ public enum StacktraceDeobfuscator {
-     }
- 
-     public StackTraceElement[] deobfuscateStacktrace(final StackTraceElement[] traceElements) {
-+        if (!MappingEnvironment.reobf()) {
-+            return traceElements;
-+        }
-         if (GlobalConfiguration.get() != null && !GlobalConfiguration.get().logging.deobfuscateStacktraces) { // handle null as true
-             return traceElements;
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index dedcdac1c6b2ba056761d5bd02212c1fb76348c4..f45498bf9841c31338b83270c1badc6d7a792d25 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -80,36 +80,26 @@ public class Commodore {
-     private static final Map<String, RerouteMethodData> MATERIAL_METHOD_REROUTE = Commodore.createReroutes(MaterialRerouting.class);
- 
-     // Paper start - Plugin rewrites
--    private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();
--    private static Map<String, String> initReplacementsMap() {
--        Map<String, String> getAndRemove = new HashMap<>();
--        // Be wary of maven shade's relocations
--
--        final java.util.jar.Manifest manifest = io.papermc.paper.util.JarManifests.manifest(Commodore.class);
--        if (Boolean.getBoolean( "debug.rewriteForIde") && manifest != null)
--        {
--            // unversion incoming calls for pre-relocate debug work
--            final String NMS_REVISION_PACKAGE = "v" + manifest.getMainAttributes().getValue("CraftBukkit-Package-Version") + "/";
--
--            getAndRemove.put("org/bukkit/".concat("craftbukkit/" + NMS_REVISION_PACKAGE), NMS_REVISION_PACKAGE);
-+    private static final String CB_PACKAGE_PREFIX = "org/bukkit/".concat("craftbukkit/");
-+    private static final String LEGACY_CB_PACKAGE_PREFIX = CB_PACKAGE_PREFIX + io.papermc.paper.util.MappingEnvironment.LEGACY_CB_VERSION + "/";
-+    private static String runtimeCbPkgPrefix() {
-+        if (io.papermc.paper.util.MappingEnvironment.reobf()) {
-+            return LEGACY_CB_PACKAGE_PREFIX;
-         }
--
--        return getAndRemove;
-+        return CB_PACKAGE_PREFIX;
-     }
- 
-     @Nonnull
-     private static String getOriginalOrRewrite(@Nonnull String original)
-     {
--        String rewrite = null;
--        for ( Map.Entry<String, String> entry : SEARCH_AND_REMOVE.entrySet() )
--        {
--            if ( original.contains( entry.getKey() ) )
--            {
--                rewrite = original.replace( entry.getValue(), "" );
-+        // Relocation is applied in reobf, and when mappings are present they handle the relocation
-+        if (!io.papermc.paper.util.MappingEnvironment.reobf() && !io.papermc.paper.util.MappingEnvironment.hasMappings()) {
-+            if (original.contains(LEGACY_CB_PACKAGE_PREFIX)) {
-+                original = original.replace(LEGACY_CB_PACKAGE_PREFIX, CB_PACKAGE_PREFIX);
-             }
-         }
- 
--        return rewrite != null ? rewrite : original;
-+        return original;
-     }
-     // Paper end - Plugin rewrites
- 
-@@ -180,7 +170,7 @@ public class Commodore {
-         ClassReader cr = new ClassReader(b);
-         ClassWriter cw = new ClassWriter(cr, 0);
- 
--        cr.accept(new ClassRemapper(new ClassVisitor(Opcodes.ASM9, cw) {
-+        cr.accept(new ClassRemapper(new ClassVisitor(Opcodes.ASM9, io.papermc.paper.pluginremap.reflect.ReflectionRemapper.visitor(cw)) { // Paper
-             final Set<RerouteMethodData> rerouteMethodData = new HashSet<>();
-             String className;
-             boolean isInterface;
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 66c75a4baa35970254027d42e017fa62b791590b..2de7ee6afa7eb404d7aeaa5ef7c7190d8287de1d 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -361,7 +361,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
-             throw new InvalidPluginException("Plugin API version " + pdf.getAPIVersion() + " is lower than the minimum allowed version. Please update or replace it.");
-         }
- 
--        if (toCheck.isOlderThan(ApiVersion.FLATTENING)) {
-+        if (!io.papermc.paper.util.MappingEnvironment.DISABLE_PLUGIN_REWRITING && toCheck.isOlderThan(ApiVersion.FLATTENING)) { // Paper
-             CraftLegacy.init();
-         }
- 
-@@ -376,6 +376,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
- 
-     @Override
-     public byte[] processClass(PluginDescriptionFile pdf, String path, byte[] clazz) {
-+        if (io.papermc.paper.util.MappingEnvironment.DISABLE_PLUGIN_REWRITING) return clazz; // Paper
-         try {
-             clazz = Commodore.convert(clazz, pdf.getName(), ApiVersion.getOrCreateVersion(pdf.getAPIVersion()), ((CraftServer) Bukkit.getServer()).activeCompatibilities);
-         } catch (Exception ex) {

patches/unapplied/server/0024-Add-TickThread.patch

@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sun, 3 Mar 2019 20:53:18 -0800
-Subject: [PATCH] Add TickThread
-
-Placeholder patch, to be used by chunksystem rewrite
-
-diff --git a/src/main/java/io/papermc/paper/util/TickThread.java b/src/main/java/io/papermc/paper/util/TickThread.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..73e83d56a340f0c7dcb8ff737d621003e72c6de4
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/TickThread.java
-@@ -0,0 +1,83 @@
-+package io.papermc.paper.util;
-+
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.world.entity.Entity;
-+import org.bukkit.Bukkit;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+public final class TickThread extends Thread {
-+
-+    public static final boolean STRICT_THREAD_CHECKS = Boolean.getBoolean("paper.strict-thread-checks");
-+
-+    static {
-+        if (STRICT_THREAD_CHECKS) {
-+            MinecraftServer.LOGGER.warn("Strict thread checks enabled - performance may suffer");
-+        }
-+    }
-+
-+    public static void softEnsureTickThread(final String reason) {
-+        if (!STRICT_THREAD_CHECKS) {
-+            return;
-+        }
-+        ensureTickThread(reason);
-+    }
-+
-+    public static void ensureTickThread(final String reason) {
-+        if (!isTickThread()) {
-+            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-+            throw new IllegalStateException(reason);
-+        }
-+    }
-+
-+    public static void ensureTickThread(final ServerLevel world, final int chunkX, final int chunkZ, final String reason) {
-+        if (!isTickThreadFor(world, chunkX, chunkZ)) {
-+            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-+            throw new IllegalStateException(reason);
-+        }
-+    }
-+
-+    public static void ensureTickThread(final Entity entity, final String reason) {
-+        if (!isTickThreadFor(entity)) {
-+            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-+            throw new IllegalStateException(reason);
-+        }
-+    }
-+
-+    public final int id; /* We don't override getId as the spec requires that it be unique (with respect to all other threads) */
-+
-+    private static final AtomicInteger ID_GENERATOR = new AtomicInteger();
-+
-+    public TickThread(final String name) {
-+        this(null, name);
-+    }
-+
-+    public TickThread(final Runnable run, final String name) {
-+        this(run, name, ID_GENERATOR.incrementAndGet());
-+    }
-+
-+    private TickThread(final Runnable run, final String name, final int id) {
-+        super(run, name);
-+        this.id = id;
-+    }
-+
-+    public static TickThread getCurrentTickThread() {
-+        return (TickThread) Thread.currentThread();
-+    }
-+
-+    public static boolean isTickThread() {
-+        return Bukkit.isPrimaryThread();
-+    }
-+
-+    public static boolean isTickThreadFor(final ServerLevel world, final int chunkX, final int chunkZ) {
-+        return isTickThread();
-+    }
-+
-+    public static boolean isTickThreadFor(final ServerLevel world, final int chunkX, final int chunkZ, final int radius) {
-+        return isTickThread();
-+    }
-+
-+    public static boolean isTickThreadFor(final Entity entity) {
-+        return isTickThread();
-+    }
-+}
-diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index bbf0d9d9c44fe8d7add2f978994ec129420814c7..78669fa035b7537ff7e533cf32aaf2995625424f 100644
---- a/src/main/java/org/spigotmc/AsyncCatcher.java
-+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
-@@ -9,7 +9,7 @@ public class AsyncCatcher
- 
-     public static void catchOp(String reason)
-     {
--        if ( AsyncCatcher.enabled && Thread.currentThread() != MinecraftServer.getServer().serverThread )
-+        if ( (AsyncCatcher.enabled || io.papermc.paper.util.TickThread.STRICT_THREAD_CHECKS) && Thread.currentThread() != MinecraftServer.getServer().serverThread ) // Paper
-         {
-             throw new IllegalStateException( "Asynchronous " + reason + "!" );
-         }

patches/unapplied/server/0025-Further-improve-server-tick-loop.patch

@@ -1,233 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 1 Mar 2016 23:09:29 -0600
-Subject: [PATCH] Further improve server tick loop
-
-Improves how the catchup buffer is handled, allowing it to roll both ways
-increasing the effeciency of the thread sleep so it only will sleep once.
-
-Also increases the buffer of the catchup to ensure server stays at 20 TPS unless extreme conditions
-
-Previous implementation did not calculate TPS correctly.
-Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e419ccaf2378d4736b8162092e537006aa3e1288..93c7648106b18ef2982f476c3200839bb5e2ea0c 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -289,7 +289,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public org.bukkit.craftbukkit.CraftServer server;
-     public OptionSet options;
-     public org.bukkit.command.ConsoleCommandSender console;
--    public static int currentTick = (int) (System.currentTimeMillis() / 50);
-+    public static int currentTick; // Paper - improve tick loop
-     public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
-     public int autosavePeriod;
-     public Commands vanillaCommandDispatcher;
-@@ -298,7 +298,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     // Spigot start
-     public static final int TPS = 20;
-     public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
--    private static final int SAMPLE_INTERVAL = 100;
-+    private static final int SAMPLE_INTERVAL = 20; // Paper - improve server tick loop
-+    @Deprecated(forRemoval = true) // Paper
-     public final double[] recentTps = new double[ 3 ];
-     // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
-@@ -1013,6 +1014,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     {
-         return ( avg * exp ) + ( tps * ( 1 - exp ) );
-     }
-+
-+    // Paper start - Further improve server tick loop
-+    private static final long SEC_IN_NANO = 1000000000;
-+    private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
-+    private long lastTick = 0;
-+    private long catchupTime = 0;
-+    public final RollingAverage tps1 = new RollingAverage(60);
-+    public final RollingAverage tps5 = new RollingAverage(60 * 5);
-+    public final RollingAverage tps15 = new RollingAverage(60 * 15);
-+
-+    public static class RollingAverage {
-+        private final int size;
-+        private long time;
-+        private java.math.BigDecimal total;
-+        private int index = 0;
-+        private final java.math.BigDecimal[] samples;
-+        private final long[] times;
-+
-+        RollingAverage(int size) {
-+            this.size = size;
-+            this.time = size * SEC_IN_NANO;
-+            this.total = dec(TPS).multiply(dec(SEC_IN_NANO)).multiply(dec(size));
-+            this.samples = new java.math.BigDecimal[size];
-+            this.times = new long[size];
-+            for (int i = 0; i < size; i++) {
-+                this.samples[i] = dec(TPS);
-+                this.times[i] = SEC_IN_NANO;
-+            }
-+        }
-+
-+        private static java.math.BigDecimal dec(long t) {
-+            return new java.math.BigDecimal(t);
-+        }
-+        public void add(java.math.BigDecimal x, long t) {
-+            time -= times[index];
-+            total = total.subtract(samples[index].multiply(dec(times[index])));
-+            samples[index] = x;
-+            times[index] = t;
-+            time += t;
-+            total = total.add(x.multiply(dec(t)));
-+            if (++index == size) {
-+                index = 0;
-+            }
-+        }
-+
-+        public double getAverage() {
-+            return total.divide(dec(time), 30, java.math.RoundingMode.HALF_UP).doubleValue();
-+        }
-+    }
-+    private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
-+    // Paper end
-     // Spigot End
- 
-     protected void runServer() {
-@@ -1027,7 +1079,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-             // Spigot start
-             Arrays.fill( this.recentTps, 20 );
--            long tickSection = Util.getMillis(), tickCount = 1;
-+            // Paper start - further improve server tick loop
-+            long tickSection = Util.getNanos();
-+            long currentTime;
-+            // Paper end - further improve server tick loop
-             while (this.running) {
-                 long i;
- 
-@@ -1050,15 +1105,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 }
-                 // Spigot start
-                 ++MinecraftServer.currentTickLong; // Paper - track current tick as a long
--                if ( tickCount++ % MinecraftServer.SAMPLE_INTERVAL == 0 )
--                {
--                    long curTime = Util.getMillis();
--                    double currentTps = 1E3 / ( curTime - tickSection ) * MinecraftServer.SAMPLE_INTERVAL;
--                    this.recentTps[0] = MinecraftServer.calcTps( this.recentTps[0], 0.92, currentTps ); // 1/exp(5sec/1min)
--                    this.recentTps[1] = MinecraftServer.calcTps( this.recentTps[1], 0.9835, currentTps ); // 1/exp(5sec/5min)
--                    this.recentTps[2] = MinecraftServer.calcTps( this.recentTps[2], 0.9945, currentTps ); // 1/exp(5sec/15min)
--                    tickSection = curTime;
-+                // Paper start - further improve server tick loop
-+                currentTime = Util.getNanos();
-+                if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
-+                    final long diff = currentTime - tickSection;
-+                    final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
-+                    tps1.add(currentTps, diff);
-+                    tps5.add(currentTps, diff);
-+                    tps15.add(currentTps, diff);
-+
-+                    // Backwards compat with bad plugins
-+                    this.recentTps[0] = tps1.getAverage();
-+                    this.recentTps[1] = tps5.getAverage();
-+                    this.recentTps[2] = tps15.getAverage();
-+                    tickSection = currentTime;
-                 }
-+                // Paper end - further improve server tick loop
-                 // Spigot end
- 
-                 boolean flag = i == 0L;
-@@ -1068,7 +1130,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     this.debugCommandProfiler = new MinecraftServer.TimeProfiler(Util.getNanos(), this.tickCount);
-                 }
- 
--                MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
-+                //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
-+                lastTick = currentTime;
-                 this.nextTickTimeNanos += i;
-                 this.startMetricsRecordingTick();
-                 this.profiler.push("tick");
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f42af8073569b4153858c2762d1553e89fe85a16..c9767da51134fc5576f4d9f994f8b9fc05c57b9e 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2657,7 +2657,11 @@ public final class CraftServer implements Server {
- 
-     @Override
-     public double[] getTPS() {
--        return new double[]{0, 0, 0}; // TODO
-+        return new double[] {
-+            net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
-+            net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
-+            net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-+        };
-     }
- 
-     // Paper start - adventure sounds
-diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index d9ec48be0fdd2bfea938aa29e36b0f6ffa839ab2..9eb2823cc8f83bad2626fc77578b0162d9ed5782 100644
---- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -15,6 +15,12 @@ public class TicksPerSecondCommand extends Command
-         this.usageMessage = "/tps";
-         this.setPermission( "bukkit.command.tps" );
-     }
-+    // Paper start
-+    private static final net.kyori.adventure.text.Component WARN_MSG = net.kyori.adventure.text.Component.text()
-+        .append(net.kyori.adventure.text.Component.text("Warning: ", net.kyori.adventure.text.format.NamedTextColor.RED))
-+        .append(net.kyori.adventure.text.Component.text("Memory usage on modern garbage collectors is not a stable value and it is perfectly normal to see it reach max. Please do not pay it much attention.", net.kyori.adventure.text.format.NamedTextColor.GOLD))
-+        .build();
-+    // Paper end
- 
-     @Override
-     public boolean execute(CommandSender sender, String currentAlias, String[] args)
-@@ -24,22 +30,40 @@ public class TicksPerSecondCommand extends Command
-             return true;
-         }
- 
--        StringBuilder sb = new StringBuilder( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " );
--        for ( double tps : MinecraftServer.getServer().recentTps )
--        {
--            sb.append( this.format( tps ) );
--            sb.append( ", " );
-+        // Paper start - Further improve tick handling
-+        double[] tps = org.bukkit.Bukkit.getTPS();
-+        net.kyori.adventure.text.Component[] tpsAvg = new net.kyori.adventure.text.Component[tps.length];
-+
-+        for ( int i = 0; i < tps.length; i++) {
-+            tpsAvg[i] = TicksPerSecondCommand.format( tps[i] );
-+        }
-+
-+        net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
-+        builder.append(net.kyori.adventure.text.Component.text("TPS from last 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD));
-+        builder.append(net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.commas(true), tpsAvg));
-+        sender.sendMessage(builder.asComponent());
-+        if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
-+            sender.sendMessage(net.kyori.adventure.text.Component.text()
-+                .append(net.kyori.adventure.text.Component.text("Current Memory Usage: ", net.kyori.adventure.text.format.NamedTextColor.GOLD))
-+                .append(net.kyori.adventure.text.Component.text(((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)", net.kyori.adventure.text.format.NamedTextColor.GREEN))
-+            );
-+            if (!this.hasShownMemoryWarning) {
-+                sender.sendMessage(WARN_MSG);
-+                this.hasShownMemoryWarning = true;
-+            }
-         }
--        sender.sendMessage( sb.substring( 0, sb.length() - 2 ) );
--        sender.sendMessage(ChatColor.GOLD + "Current Memory Usage: " + ChatColor.GREEN + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: "
--                + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)");
-+        // Paper end
- 
-         return true;
-     }
- 
--    private String format(double tps)
-+    private boolean hasShownMemoryWarning; // Paper
-+    private static net.kyori.adventure.text.Component format(double tps) // Paper - Made static
-     {
--        return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
--                + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
-+        // Paper
-+        net.kyori.adventure.text.format.TextColor color = ( ( tps > 18.0 ) ? net.kyori.adventure.text.format.NamedTextColor.GREEN : ( tps > 16.0 ) ? net.kyori.adventure.text.format.NamedTextColor.YELLOW : net.kyori.adventure.text.format.NamedTextColor.RED );
-+        String amount = Math.min(Math.round(tps * 100.0) / 100.0, 20.0) + (tps > 21.0  ? "*" : ""); // Paper - only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise
-+        return net.kyori.adventure.text.Component.text(amount, color);
-+        // Paper end
-     }
- }

patches/unapplied/server/0026-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Tue, 18 May 2021 14:39:44 -0700
-Subject: [PATCH] Add command line option to load extra plugin jars not in the
- plugins folder
-
-ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c9767da51134fc5576f4d9f994f8b9fc05c57b9e..0030794a3e125f2493a84ddac86430db625c626e 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -447,6 +447,35 @@ public final class CraftServer implements Server {
-         io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler.INSTANCE.enter(io.papermc.paper.plugin.entrypoint.Entrypoint.PLUGIN); // Paper - replace implementation
-     }
- 
-+    // Paper start
-+    @Override
-+    public File getPluginsFolder() {
-+        return this.console.getPluginsFolder();
-+    }
-+
-+    private List<File> extraPluginJars() {
-+        @SuppressWarnings("unchecked")
-+        final List<File> jars = (List<File>) this.console.options.valuesOf("add-plugin");
-+        final List<File> list = new ArrayList<>();
-+        for (final File file : jars) {
-+            if (!file.exists()) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("File '{}' specified through 'add-plugin' argument does not exist, cannot load a plugin from it!", file.getAbsolutePath());
-+                continue;
-+            }
-+            if (!file.isFile()) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("File '{}' specified through 'add-plugin' argument is not a file, cannot load a plugin from it!", file.getAbsolutePath());
-+                continue;
-+            }
-+            if (!file.getName().endsWith(".jar")) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("File '{}' specified through 'add-plugin' argument is not a jar file, cannot load a plugin from it!", file.getAbsolutePath());
-+                continue;
-+            }
-+            list.add(file);
-+        }
-+        return list;
-+    }
-+    // Paper end
-+
-     public void enablePlugins(PluginLoadOrder type) {
-         if (type == PluginLoadOrder.STARTUP) {
-             this.helpMap.clear();
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2ef6386ea4b95211e26c8759cae849cbe68e3f40..efedc5c8474c548781c943ddfdf2de121c7c09b7 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -160,6 +160,12 @@ public class Main {
-                         .ofType(File.class)
-                         .defaultsTo(new File("paper.yml"))
-                         .describedAs("Yml file");
-+
-+                acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
-+                        .withRequiredArg()
-+                        .ofType(File.class)
-+                        .defaultsTo(new File[] {})
-+                        .describedAs("Jar file");
-                 // Paper end
-             }
-         };

patches/unapplied/server/0027-Support-components-in-ItemMeta.patch

@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MiniDigger <admin@benndorf.dev>
-Date: Sat, 6 Jun 2020 18:13:42 +0200
-Subject: [PATCH] Support components in ItemMeta
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 41ba64593bd548131d1cdbecc79b2f38406aa78b..c7eed6b642c69fb08bc6e50d4890ea61666cde01 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -900,11 +900,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         return CraftChatMessage.fromComponent(this.displayName);
-     }
- 
-+    // Paper start
-+    @Override
-+    public net.md_5.bungee.api.chat.BaseComponent[] getDisplayNameComponent() {
-+        return displayName == null ? new net.md_5.bungee.api.chat.BaseComponent[0] : net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(displayName));
-+    }
-+    // Paper end
-     @Override
-     public final void setDisplayName(String name) {
-         this.displayName = CraftChatMessage.fromStringOrNull(name);
-     }
- 
-+    // Paper start
-+    @Override
-+    public void setDisplayNameComponent(net.md_5.bungee.api.chat.BaseComponent[] component) {
-+        this.displayName = CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(component));
-+    }
-+    // Paper end
-     @Override
-     public boolean hasDisplayName() {
-         return this.displayName != null;
-@@ -1078,6 +1090,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         return this.lore == null ? null : new ArrayList<String>(Lists.transform(this.lore, CraftChatMessage::fromComponent));
-     }
- 
-+    // Paper start
-+    @Override
-+    public List<net.md_5.bungee.api.chat.BaseComponent[]> getLoreComponents() {
-+        return this.lore == null ? null : new ArrayList<>(this.lore.stream().map(entry ->
-+            net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(entry))
-+        ).collect(java.util.stream.Collectors.toList()));
-+    }
-+    // Paper end
-     @Override
-     public void setLore(List<String> lore) {
-         if (lore == null || lore.isEmpty()) {
-@@ -1092,6 +1112,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public void setLoreComponents(List<net.md_5.bungee.api.chat.BaseComponent[]> lore) {
-+        if (lore == null) {
-+            this.lore = null;
-+        } else {
-+            if (this.lore == null) {
-+                safelyAdd(lore, this.lore = new ArrayList<>(lore.size()), false);
-+            } else {
-+                this.lore.clear();
-+                safelyAdd(lore, this.lore, false);
-+            }
-+        }
-+    }
-+    // Paper end
-     @Override
-     public boolean hasCustomModelData() {
-         return this.customModelData != null;
-@@ -1763,6 +1798,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         }
- 
-         for (Object object : addFrom) {
-+            // Paper start - support components
-+            if(object instanceof net.md_5.bungee.api.chat.BaseComponent[] baseComponentArr) {
-+                addTo.add(CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(baseComponentArr)));
-+            } else
-+            // Paper end
-             if (!(object instanceof String)) {
-                 if (object != null) {
-                     // SPIGOT-7399: Null check via if is important,

patches/unapplied/server/0028-Configurable-cactus-bamboo-and-reed-growth-height.patch

@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:02:51 -0600
-Subject: [PATCH] Configurable cactus bamboo and reed growth height
-
-Bamboo - Both the minimum fully-grown height and the maximum are configurable
-- Machine_Maker
-
-diff --git a/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java b/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-index eda75b316acd09120539c92ff8adb97d92e9523f..e2951dd077441fe9cda461a2d3ef0c0671308316 100644
---- a/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-@@ -137,7 +137,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-             if (random.nextFloat() < (world.spigotConfig.bambooModifier / (100.0f * 3)) && world.isEmptyBlock(pos.above()) && world.getRawBrightness(pos.above(), 0) >= 9) { // Spigot - SPIGOT-7159: Better modifier resolution
-                 int i = this.getHeightBelowUpToMax(world, pos) + 1;
- 
--                if (i < 16) {
-+                if (i < world.paperConfig().maxGrowthHeight.bamboo.max) { // Paper - Configurable cactus/bamboo/reed growth height
-                     this.growBamboo(state, world, pos, random, i);
-                 }
-             }
-@@ -168,7 +168,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-         int i = this.getHeightAboveUpToMax(world, pos);
-         int j = this.getHeightBelowUpToMax(world, pos);
- 
--        return i + j + 1 < 16 && (Integer) world.getBlockState(pos.above(i)).getValue(BambooStalkBlock.STAGE) != 1;
-+        return i + j + 1 < ((Level) world).paperConfig().maxGrowthHeight.bamboo.max && (Integer) world.getBlockState(pos.above(i)).getValue(BambooStalkBlock.STAGE) != 1; // Paper - Configurable cactus/bamboo/reed growth height
-     }
- 
-     @Override
-@@ -187,7 +187,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-             BlockPos blockposition1 = pos.above(i);
-             BlockState iblockdata1 = world.getBlockState(blockposition1);
- 
--            if (k >= 16 || !iblockdata1.is(Blocks.BAMBOO) || (Integer) iblockdata1.getValue(BambooStalkBlock.STAGE) == 1 || !world.isEmptyBlock(blockposition1.above())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here
-+            if (k >= world.paperConfig().maxGrowthHeight.bamboo.max || !iblockdata1.is(Blocks.BAMBOO) || (Integer) iblockdata1.getValue(BambooStalkBlock.STAGE) == 1 || !world.isEmptyBlock(blockposition1.above())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here // Paper - Configurable cactus/bamboo/reed growth height
-                 return;
-             }
- 
-@@ -228,7 +228,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-         }
- 
-         int j = (Integer) state.getValue(BambooStalkBlock.AGE) != 1 && !iblockdata2.is(Blocks.BAMBOO) ? 0 : 1;
--        int k = (height < 11 || random.nextFloat() >= 0.25F) && height != 15 ? 0 : 1;
-+        int k = (height < world.paperConfig().maxGrowthHeight.bamboo.min || random.nextFloat() >= 0.25F) && height != (world.paperConfig().maxGrowthHeight.bamboo.max - 1) ? 0 : 1; // Paper - Configurable cactus/bamboo/reed growth height
- 
-         // CraftBukkit start
-         if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, pos.above(), (BlockState) ((BlockState) ((BlockState) this.defaultBlockState().setValue(BambooStalkBlock.AGE, j)).setValue(BambooStalkBlock.LEAVES, blockpropertybamboosize)).setValue(BambooStalkBlock.STAGE, k), 3)) {
-@@ -243,7 +243,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-     protected int getHeightAboveUpToMax(BlockGetter world, BlockPos pos) {
-         int i;
- 
--        for (i = 0; i < 16 && world.getBlockState(pos.above(i + 1)).is(Blocks.BAMBOO); ++i) {
-+        for (i = 0; i < ((Level) world).paperConfig().maxGrowthHeight.bamboo.max && world.getBlockState(pos.above(i + 1)).is(Blocks.BAMBOO); ++i) { // Paper - Configurable cactus/bamboo/reed growth height
-             ;
-         }
- 
-@@ -253,7 +253,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-     protected int getHeightBelowUpToMax(BlockGetter world, BlockPos pos) {
-         int i;
- 
--        for (i = 0; i < 16 && world.getBlockState(pos.below(i + 1)).is(Blocks.BAMBOO); ++i) {
-+        for (i = 0; i < ((Level) world).paperConfig().maxGrowthHeight.bamboo.max && world.getBlockState(pos.below(i + 1)).is(Blocks.BAMBOO); ++i) { // Paper - Configurable cactus/bamboo/reed growth height
-             ;
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index c7e462a187196da906aec3b528f7945afec9f6b0..fd344c5cf0d6d523abe34d5e3f8d939106942cbb 100644
---- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -61,7 +61,7 @@ public class CactusBlock extends Block {
-                 ;
-             }
- 
--            if (i < 3) {
-+            if (i < world.paperConfig().maxGrowthHeight.cactus) { // Paper - Configurable cactus/bamboo/reed growth height
-                 int j = (Integer) state.getValue(CactusBlock.AGE);
- 
-                 int modifier = world.spigotConfig.cactusModifier; // Spigot - SPIGOT-7159: Better modifier resolution
-diff --git a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-index f034a7dbc0124353f8cb9b2c841226e73d83423a..c48c622e92cedeaa46b929c7adfedec98dd5a3fb 100644
---- a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-@@ -59,7 +59,7 @@ public class SugarCaneBlock extends Block {
-                 ;
-             }
- 
--            if (i < 3) {
-+            if (i < world.paperConfig().maxGrowthHeight.reeds) { // Paper - Configurable cactus/bamboo/reed growth heigh
-                 int j = (Integer) state.getValue(SugarCaneBlock.AGE);
- 
-                 int modifier = world.spigotConfig.caneModifier; // Spigot - SPIGOT-7159: Better modifier resolution

patches/unapplied/server/0029-Configurable-baby-zombie-movement-speed.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:09:16 -0600
-Subject: [PATCH] Configurable baby zombie movement speed
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index bf573c3ca0b34e58525b547ae0228f8af7a4d333..8256af275e468a5aa506f0af22428f4082204956 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -75,6 +75,7 @@ public class Zombie extends Monster {
- 
-     private static final UUID SPEED_MODIFIER_BABY_UUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
-     private static final AttributeModifier SPEED_MODIFIER_BABY = new AttributeModifier(Zombie.SPEED_MODIFIER_BABY_UUID, "Baby speed boost", 0.5D, AttributeModifier.Operation.ADD_MULTIPLIED_BASE);
-+    private final AttributeModifier babyModifier = new net.minecraft.world.entity.ai.attributes.AttributeModifier(SPEED_MODIFIER_BABY.id(), SPEED_MODIFIER_BABY.name(), this.level().paperConfig().entities.behavior.babyZombieMovementModifier, SPEED_MODIFIER_BABY.operation()); // Paper - Make baby speed configurable
-     private static final EntityDataAccessor<Boolean> DATA_BABY_ID = SynchedEntityData.defineId(Zombie.class, EntityDataSerializers.BOOLEAN);
-     private static final EntityDataAccessor<Integer> DATA_SPECIAL_TYPE_ID = SynchedEntityData.defineId(Zombie.class, EntityDataSerializers.INT);
-     public static final EntityDataAccessor<Boolean> DATA_DROWNED_CONVERSION_ID = SynchedEntityData.defineId(Zombie.class, EntityDataSerializers.BOOLEAN);
-@@ -183,9 +184,9 @@ public class Zombie extends Monster {
-         if (this.level() != null && !this.level().isClientSide) {
-             AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
- 
--            attributemodifiable.removeModifier(Zombie.SPEED_MODIFIER_BABY.id());
-+            attributemodifiable.removeModifier(this.babyModifier.id()); // Paper - Make baby speed configurable
-             if (baby) {
--                attributemodifiable.addTransientModifier(Zombie.SPEED_MODIFIER_BABY);
-+                attributemodifiable.addTransientModifier(this.babyModifier); // Paper - Make baby speed configurable
-             }
-         }
- 

patches/unapplied/server/0030-Configurable-fishing-time-ranges.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:14:11 -0600
-Subject: [PATCH] Configurable fishing time ranges
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 347d91344e2b02f33f6993e24247282eb390c4db..1eeb61688cae52bb25ef6d9ac4f0a0df3d34f846 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -93,6 +93,10 @@ public class FishingHook extends Projectile {
-         this.noCulling = true;
-         this.luck = Math.max(0, luckOfTheSeaLevel);
-         this.lureSpeed = Math.max(0, lureLevel);
-+        // Paper start - Configurable fishing time ranges
-+        minWaitTime = world.paperConfig().fishingTimeRange.minimum;
-+        maxWaitTime = world.paperConfig().fishingTimeRange.maximum;
-+        // Paper end - Configurable fishing time ranges
-     }
- 
-     public FishingHook(EntityType<? extends FishingHook> type, Level world) {
-@@ -410,7 +414,7 @@ public class FishingHook extends Projectile {
-             } else {
-                 // CraftBukkit start - logic to modify fishing wait time
-                 this.timeUntilLured = Mth.nextInt(this.random, this.minWaitTime, this.maxWaitTime);
--                this.timeUntilLured -= (this.applyLure) ? this.lureSpeed * 20 * 5 : 0;
-+                this.timeUntilLured -= (this.applyLure) ? (this.lureSpeed * 20 * 5 >= this.maxWaitTime ? this.timeUntilLured - 1 : this.lureSpeed * 20 * 5) : 0; // Paper - Fix Lure infinite loop
-                 // CraftBukkit end
-             }
-         }

patches/unapplied/server/0031-Allow-nerfed-mobs-to-jump.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:24:16 -0600
-Subject: [PATCH] Allow nerfed mobs to jump
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d615649c67b54cfd1cb083e3ddb9719255e90bc7..a9d7fd0234c88cd5d1589a05daa10ec9424e92aa 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -126,6 +126,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
-     private final BodyRotationControl bodyRotationControl;
-     protected PathNavigation navigation;
-     public GoalSelector goalSelector;
-+    @Nullable public net.minecraft.world.entity.ai.goal.FloatGoal goalFloat; // Paper - Allow nerfed mobs to jump and float
-     public GoalSelector targetSelector;
-     @Nullable
-     private LivingEntity target;
-@@ -935,7 +936,15 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
-     @Override
-     protected final void serverAiStep() {
-         ++this.noActionTime;
--        if (!this.aware) return; // CraftBukkit
-+        // Paper start - Allow nerfed mobs to jump and float
-+        if (!this.aware) {
-+            if (goalFloat != null) {
-+                if (goalFloat.canUse()) goalFloat.tick();
-+                this.getJumpControl().tick();
-+            }
-+            return;
-+        }
-+        // Paper end - Allow nerfed mobs to jump and float
-         ProfilerFiller gameprofilerfiller = this.level().getProfiler();
- 
-         gameprofilerfiller.push("sensing");
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
-index 5fbb5d2bf8945a361babfe50f5f92fa46b9e8b5f..7eb0e0486203d9ad6ce89d17a4da96a7563088a4 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
-@@ -9,6 +9,7 @@ public class FloatGoal extends Goal {
- 
-     public FloatGoal(Mob mob) {
-         this.mob = mob;
-+        if (mob.getCommandSenderWorld().paperConfig().entities.behavior.spawnerNerfedMobsShouldJump) mob.goalFloat = this; // Paper - Allow nerfed mobs to jump and float
-         this.setFlags(EnumSet.of(Goal.Flag.JUMP));
-         mob.getNavigation().setCanFloat(true);
-     }

patches/unapplied/server/0032-Add-configurable-entity-despawn-distances.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Suddenly <suddenly@suddenly.coffee>
-Date: Tue, 1 Mar 2016 13:51:54 -0600
-Subject: [PATCH] Add configurable entity despawn distances
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index a9d7fd0234c88cd5d1589a05daa10ec9424e92aa..577e7504064b97fa1115210f209bb40a3d94a60f 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -911,14 +911,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
- 
-             if (entityhuman != null) {
-                 double d0 = entityhuman.distanceToSqr((Entity) this);
--                int i = this.getType().getCategory().getDespawnDistance();
-+                int i = this.level().paperConfig().entities.spawning.despawnRanges.get(this.getType().getCategory()).hard(); // Paper - Configurable despawn distances
-                 int j = i * i;
- 
-                 if (d0 > (double) j && this.removeWhenFarAway(d0)) {
-                     this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
-                 }
- 
--                int k = this.getType().getCategory().getNoDespawnDistance();
-+                int k = this.level().paperConfig().entities.spawning.despawnRanges.get(this.getType().getCategory()).soft(); // Paper - Configurable despawn distances
-                 int l = k * k;
- 
-                 if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && d0 > (double) l && this.removeWhenFarAway(d0)) {

patches/unapplied/server/0033-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Tue, 1 Mar 2016 14:14:15 -0600
-Subject: [PATCH] Drop falling block and tnt entities at the specified height
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 4ac7f43b834a2c761ad538f9d00afb2263ed7e4f..37dfd08621d402a339f36bb70f1b39de010e8669 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -145,6 +145,16 @@ public class FallingBlockEntity extends Entity {
-             ++this.time;
-             this.applyGravity();
-             this.move(MoverType.SELF, this.getDeltaMovement());
-+            // Paper start - Configurable falling blocks height nerf
-+            if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
-+                if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-+                    this.spawnAtLocation(block);
-+                }
-+
-+                this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);
-+                return;
-+            }
-+            // Paper end - Configurable falling blocks height nerf
-             if (!this.level().isClientSide) {
-                 BlockPos blockposition = this.blockPosition();
-                 boolean flag = this.blockState.getBlock() instanceof ConcretePowderBlock;
-diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index e4a7d4cda22106716897df964cd74d0bbccd6092..f127cac376cf4d0e585d12cd5976a3aee567403a 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -78,6 +78,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-         if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
-         this.applyGravity();
-         this.move(MoverType.SELF, this.getDeltaMovement());
-+        // Paper start - Configurable TNT height nerf
-+        if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
-+            this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);
-+            return;
-+        }
-+        // Paper end - Configurable TNT height nerf
-         this.setDeltaMovement(this.getDeltaMovement().scale(0.98D));
-         if (this.onGround()) {
-             this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D));
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-index c112c4b103c34e05f4de973eec94a969f60b085e..b7036f8399e2500ba01736c6006b972f7ca4838e 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-@@ -54,6 +54,12 @@ public class MinecartTNT extends AbstractMinecart {
-     public void tick() {
-         super.tick();
-         if (this.fuse > 0) {
-+            // Paper start - Configurable TNT height nerf
-+            if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
-+                this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);
-+                return;
-+            }
-+            // Paper end - Configurable TNT height nerf
-             --this.fuse;
-             this.level().addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
-         } else if (this.fuse == 0) {

patches/unapplied/server/0034-Expose-server-build-information.patch

@@ -1,702 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 14:32:43 -0600
-Subject: [PATCH] Expose server build information
-
-Co-authored-by: Zach Brown <zach@zachbr.io>
-Co-authored-by: Kyle Wood <kyle@denwav.dev>
-Co-authored-by: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-Co-authored-by: masmc05 <masmc05@gmail.com>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 158779a3590f089c4224b2b128c2e653aef42a94..2caa4c8e250a7925e7d6f9ba00a95956b5328568 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -1,4 +1,5 @@
- import io.papermc.paperweight.util.*
-+import java.time.Instant
- 
- plugins {
-     java
-@@ -64,18 +65,24 @@ tasks.jar {
- 
-     manifest {
-         val git = Git(rootProject.layout.projectDirectory.path)
-+        val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
-+        val build = System.getenv("BUILD_NUMBER") ?: null
-         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
--        val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
-+        val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
-         val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
-         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
--            "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Title" to "Paper",
-+            "Implementation-Version" to implementationVersion,
-             "Implementation-Vendor" to date, // Paper
--            "Specification-Title" to "Bukkit",
-+            "Specification-Title" to "Paper",
-             "Specification-Version" to project.version,
--            "Specification-Vendor" to "Bukkit Team",
-+            "Specification-Vendor" to "Paper Team",
-+            "Brand-Id" to "papermc:paper",
-+            "Brand-Name" to "Paper",
-+            "Build-Number" to (build ?: ""),
-+            "Build-Time" to Instant.now().toString(),
-             "Git-Branch" to gitBranch, // Paper
-             "Git-Commit" to gitHash, // Paper
-             "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..532306cacd52579cdf37e4aca25887b1ed3ba6a1
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -0,0 +1,146 @@
-+package com.destroystokyo.paper;
-+
-+import com.destroystokyo.paper.util.VersionFetcher;
-+import com.google.common.base.Charsets;
-+import com.google.common.io.Resources;
-+import com.google.gson.Gson;
-+import com.google.gson.JsonArray;
-+import com.google.gson.JsonElement;
-+import com.google.gson.JsonObject;
-+import com.google.gson.JsonSyntaxException;
-+import com.mojang.logging.LogUtils;
-+import io.papermc.paper.ServerBuildInfo;
-+import java.io.BufferedReader;
-+import java.io.IOException;
-+import java.io.InputStreamReader;
-+import java.net.HttpURLConnection;
-+import java.net.URI;
-+import java.util.Optional;
-+import java.util.OptionalInt;
-+import java.util.stream.StreamSupport;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import org.slf4j.Logger;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.TextColor.color;
-+
-+@DefaultQualifier(NonNull.class)
-+public class PaperVersionFetcher implements VersionFetcher {
-+    private static final Logger LOGGER = LogUtils.getClassLogger();
-+    private static final int DISTANCE_ERROR = -1;
-+    private static final int DISTANCE_UNKNOWN = -2;
-+    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+
-+    @Override
-+    public long getCacheTime() {
-+        return 720000;
-+    }
-+
-+    @Override
-+    public Component getVersionMessage(final String serverVersion) {
-+        final Component updateMessage;
-+        final ServerBuildInfo build = ServerBuildInfo.buildInfo();
-+        if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
-+            updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
-+        } else {
-+            updateMessage = getUpdateStatusMessage("PaperMC/Paper", build);
-+        }
-+        final @Nullable Component history = this.getHistory();
-+
-+        return history != null ? Component.textOfChildren(updateMessage, Component.newline(), history) : updateMessage;
-+    }
-+
-+    private static Component getUpdateStatusMessage(final String repo, final ServerBuildInfo build) {
-+        int distance = DISTANCE_ERROR;
-+
-+        final OptionalInt buildNumber = build.buildNumber();
-+        if (buildNumber.isPresent()) {
-+            distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
-+        } else {
-+            final Optional<String> gitBranch = build.gitBranch();
-+            final Optional<String> gitCommit = build.gitCommit();
-+            if (gitBranch.isPresent() && gitCommit.isPresent()) {
-+                distance = fetchDistanceFromGitHub(repo, gitBranch.get(), gitCommit.get());
-+            }
-+        }
-+
-+        return switch (distance) {
-+            case DISTANCE_ERROR -> text("Error obtaining version information", NamedTextColor.YELLOW);
-+            case 0 -> text("You are running the latest version", NamedTextColor.GREEN);
-+            case DISTANCE_UNKNOWN -> text("Unknown version", NamedTextColor.YELLOW);
-+            default -> text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
-+                .append(Component.newline())
-+                .append(text("Download the new version at: ")
-+                    .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
-+                        .hoverEvent(text("Click to open", NamedTextColor.WHITE))
-+                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
-+        };
-+    }
-+
-+    private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) {
-+        try {
-+            try (final BufferedReader reader = Resources.asCharSource(
-+                URI.create("https://api.papermc.io/v2/projects/paper/versions/" + build.minecraftVersionId()).toURL(),
-+                Charsets.UTF_8
-+            ).openBufferedStream()) {
-+                final JsonObject json = new Gson().fromJson(reader, JsonObject.class);
-+                final JsonArray builds = json.getAsJsonArray("builds");
-+                final int latest = StreamSupport.stream(builds.spliterator(), false)
-+                    .mapToInt(JsonElement::getAsInt)
-+                    .max()
-+                    .orElseThrow();
-+                return latest - jenkinsBuild;
-+            } catch (final JsonSyntaxException ex) {
-+                LOGGER.error("Error parsing json from Paper's downloads API", ex);
-+                return DISTANCE_ERROR;
-+            }
-+        } catch (final IOException e) {
-+            LOGGER.error("Error while parsing version", e);
-+            return DISTANCE_ERROR;
-+        }
-+    }
-+
-+    // Contributed by Techcable <Techcable@outlook.com> in GH-65
-+    private static int fetchDistanceFromGitHub(final String repo, final String branch, final String hash) {
-+        try {
-+            final HttpURLConnection connection = (HttpURLConnection) URI.create("https://api.github.com/repos/%s/compare/%s...%s".formatted(repo, branch, hash)).toURL().openConnection();
-+            connection.connect();
-+            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return DISTANCE_UNKNOWN; // Unknown commit
-+            try (final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) {
-+                final JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
-+                final String status = obj.get("status").getAsString();
-+                return switch (status) {
-+                    case "identical" -> 0;
-+                    case "behind" -> obj.get("behind_by").getAsInt();
-+                    default -> DISTANCE_ERROR;
-+                };
-+            } catch (final JsonSyntaxException | NumberFormatException e) {
-+                LOGGER.error("Error parsing json from GitHub's API", e);
-+                return DISTANCE_ERROR;
-+            }
-+        } catch (final IOException e) {
-+            LOGGER.error("Error while parsing version", e);
-+            return DISTANCE_ERROR;
-+        }
-+    }
-+
-+    private @Nullable Component getHistory() {
-+        final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+        if (data == null) {
-+            return null;
-+        }
-+
-+        final @Nullable String oldVersion = data.getOldVersion();
-+        if (oldVersion == null) {
-+            return null;
-+        }
-+
-+        return text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-@@ -0,0 +1,153 @@
-+package com.destroystokyo.paper;
-+
-+import com.google.common.base.MoreObjects;
-+import com.google.gson.Gson;
-+import com.google.gson.JsonSyntaxException;
-+import java.io.BufferedReader;
-+import java.io.BufferedWriter;
-+import java.io.IOException;
-+import java.nio.charset.StandardCharsets;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.nio.file.StandardOpenOption;
-+import java.util.Objects;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import org.bukkit.Bukkit;
-+
-+import javax.annotation.Nonnull;
-+import javax.annotation.Nullable;
-+
-+public enum VersionHistoryManager {
-+    INSTANCE;
-+
-+    private final Gson gson = new Gson();
-+
-+    private final Logger logger = Bukkit.getLogger();
-+
-+    private VersionData currentData = null;
-+
-+    VersionHistoryManager() {
-+        final Path path = Paths.get("version_history.json");
-+
-+        if (Files.exists(path)) {
-+            // Basic file santiy checks
-+            if (!Files.isRegularFile(path)) {
-+                if (Files.isDirectory(path)) {
-+                    logger.severe(path + " is a directory, cannot be used for version history");
-+                } else {
-+                    logger.severe(path + " is not a regular file, cannot be used for version history");
-+                }
-+                // We can't continue
-+                return;
-+            }
-+
-+            try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
-+                currentData = gson.fromJson(reader, VersionData.class);
-+            } catch (final IOException e) {
-+                logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e);
-+                return;
-+            } catch (final JsonSyntaxException e) {
-+                logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e);
-+                return;
-+            }
-+
-+            final String version = Bukkit.getVersion();
-+            if (version == null) {
-+                logger.severe("Failed to retrieve current version");
-+                return;
-+            }
-+
-+            if (currentData == null) {
-+                // Empty file
-+                currentData = new VersionData();
-+                currentData.setCurrentVersion(version);
-+                writeFile(path);
-+                return;
-+            }
-+
-+            if (!version.equals(currentData.getCurrentVersion())) {
-+                // The version appears to have changed
-+                currentData.setOldVersion(currentData.getCurrentVersion());
-+                currentData.setCurrentVersion(version);
-+                writeFile(path);
-+            }
-+        } else {
-+            // File doesn't exist, start fresh
-+            currentData = new VersionData();
-+            // oldVersion is null
-+            currentData.setCurrentVersion(Bukkit.getVersion());
-+            writeFile(path);
-+        }
-+    }
-+
-+    private void writeFile(@Nonnull final Path path) {
-+        try (final BufferedWriter writer = Files.newBufferedWriter(
-+            path,
-+            StandardCharsets.UTF_8,
-+            StandardOpenOption.WRITE,
-+            StandardOpenOption.CREATE,
-+            StandardOpenOption.TRUNCATE_EXISTING
-+        )) {
-+            gson.toJson(currentData, writer);
-+        } catch (final IOException e) {
-+            logger.log(Level.SEVERE, "Failed to write to version history file", e);
-+        }
-+    }
-+
-+    @Nullable
-+    public VersionData getVersionData() {
-+        return currentData;
-+    }
-+
-+    public static class VersionData {
-+        private String oldVersion;
-+
-+        private String currentVersion;
-+
-+        @Nullable
-+        public String getOldVersion() {
-+            return oldVersion;
-+        }
-+
-+        public void setOldVersion(@Nullable String oldVersion) {
-+            this.oldVersion = oldVersion;
-+        }
-+
-+        @Nullable
-+        public String getCurrentVersion() {
-+            return currentVersion;
-+        }
-+
-+        public void setCurrentVersion(@Nullable String currentVersion) {
-+            this.currentVersion = currentVersion;
-+        }
-+
-+        @Override
-+        public String toString() {
-+            return MoreObjects.toStringHelper(this)
-+                .add("oldVersion", oldVersion)
-+                .add("currentVersion", currentVersion)
-+                .toString();
-+        }
-+
-+        @Override
-+        public boolean equals(@Nullable Object o) {
-+            if (this == o) {
-+                return true;
-+            }
-+            if (o == null || getClass() != o.getClass()) {
-+                return false;
-+            }
-+            final VersionData versionData = (VersionData) o;
-+            return Objects.equals(oldVersion, versionData.oldVersion) &&
-+                Objects.equals(currentVersion, versionData.currentVersion);
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            return Objects.hash(oldVersion, currentVersion);
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..790bad0494454ca12ee152e3de6da3da634d9b20
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -0,0 +1,104 @@
-+package io.papermc.paper;
-+
-+import com.google.common.base.Strings;
-+import io.papermc.paper.util.JarManifests;
-+import java.time.Instant;
-+import java.time.temporal.ChronoUnit;
-+import java.util.Optional;
-+import java.util.OptionalInt;
-+import java.util.jar.Manifest;
-+import net.kyori.adventure.key.Key;
-+import net.minecraft.SharedConstants;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.bukkit.craftbukkit.Main;
-+import org.jetbrains.annotations.NotNull;
-+
-+public record ServerBuildInfoImpl(
-+    Key brandId,
-+    String brandName,
-+    String minecraftVersionId,
-+    String minecraftVersionName,
-+    OptionalInt buildNumber,
-+    Instant buildTime,
-+    Optional<String> gitBranch,
-+    Optional<String> gitCommit
-+) implements ServerBuildInfo {
-+    private static final String ATTRIBUTE_BRAND_ID = "Brand-Id";
-+    private static final String ATTRIBUTE_BRAND_NAME = "Brand-Name";
-+    private static final String ATTRIBUTE_BUILD_TIME = "Build-Time";
-+    private static final String ATTRIBUTE_BUILD_NUMBER = "Build-Number";
-+    private static final String ATTRIBUTE_GIT_BRANCH = "Git-Branch";
-+    private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
-+
-+    private static final String BRAND_PAPER_NAME = "Paper";
-+
-+    private static final String BUILD_DEV = "DEV";
-+
-+    public ServerBuildInfoImpl() {
-+        this(JarManifests.manifest(CraftServer.class));
-+    }
-+
-+    private ServerBuildInfoImpl(final Manifest manifest) {
-+        this(
-+            getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
-+                .map(Key::key)
-+                .orElse(BRAND_PAPER_ID),
-+            getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
-+                .orElse(BRAND_PAPER_NAME),
-+            SharedConstants.getCurrentVersion().getId(),
-+            SharedConstants.getCurrentVersion().getName(),
-+            getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
-+                .map(Integer::parseInt)
-+                .map(OptionalInt::of)
-+                .orElse(OptionalInt.empty()),
-+            getManifestAttribute(manifest, ATTRIBUTE_BUILD_TIME)
-+                .map(Instant::parse)
-+                .orElse(Main.BOOT_TIME),
-+            getManifestAttribute(manifest, ATTRIBUTE_GIT_BRANCH),
-+            getManifestAttribute(manifest, ATTRIBUTE_GIT_COMMIT)
-+        );
-+    }
-+
-+    @Override
-+    public boolean isBrandCompatible(final @NotNull Key brandId) {
-+        return brandId.equals(this.brandId);
-+    }
-+
-+    @Override
-+    public @NotNull String asString(final @NotNull StringRepresentation representation) {
-+        final StringBuilder sb = new StringBuilder();
-+        sb.append(this.minecraftVersionId);
-+        sb.append('-');
-+        if (this.buildNumber.isPresent()) {
-+            sb.append(this.buildNumber.getAsInt());
-+        } else {
-+            sb.append(BUILD_DEV);
-+        }
-+        final boolean hasGitBranch = this.gitBranch.isPresent();
-+        final boolean hasGitCommit = this.gitCommit.isPresent();
-+        if (hasGitBranch || hasGitCommit) {
-+            sb.append('-');
-+        }
-+        if (hasGitBranch && representation == StringRepresentation.VERSION_FULL) {
-+            sb.append(this.gitBranch.get());
-+            if (hasGitCommit) {
-+                sb.append('@');
-+            }
-+        }
-+        if (hasGitCommit) {
-+            sb.append(this.gitCommit.get());
-+        }
-+        if (representation == StringRepresentation.VERSION_FULL) {
-+            sb.append(' ');
-+            sb.append('(');
-+            sb.append(this.buildTime.truncatedTo(ChronoUnit.SECONDS));
-+            sb.append(')');
-+        }
-+        return sb.toString();
-+    }
-+
-+    private static Optional<String> getManifestAttribute(final Manifest manifest, final String name) {
-+        final String value = manifest != null ? manifest.getMainAttributes().getValue(name) : null;
-+        return Optional.ofNullable(Strings.emptyToNull(value));
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 93c7648106b18ef2982f476c3200839bb5e2ea0c..8b5a630a67b058f014478b033e6b1299f99afccc 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -43,7 +43,6 @@ import java.util.Set;
- import java.util.UUID;
- import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.Executor;
--import java.util.concurrent.RejectedExecutionException;
- import java.util.concurrent.atomic.AtomicReference;
- import java.util.function.BooleanSupplier;
- import java.util.function.Consumer;
-@@ -185,8 +184,6 @@ import net.minecraft.world.phys.Vec2;
- import net.minecraft.world.phys.Vec3;
- import org.bukkit.Bukkit;
- import org.bukkit.craftbukkit.CraftRegistry;
--import org.bukkit.craftbukkit.CraftServer;
--import org.bukkit.craftbukkit.Main;
- import org.bukkit.event.server.ServerLoadEvent;
- // CraftBukkit end
- 
-@@ -1680,7 +1677,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
--        return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8dcfcce4ccf0320b5d5b9eda2d1b5ebe04e26a13..1b38916d8e9241bd45523e692c04bf69430b64f9 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         // Paper end - initialize global and world-defaults configuration
-         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
-+        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
-         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
-index f077b8ff0bf0d96628db3569132696b68fd79921..5f11f5b16766f9d1d5640ae037e259bed9020384 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
-@@ -18,8 +18,10 @@ public class CraftCrashReport implements Supplier<String> {
- 
-     @Override
-     public String get() {
-+        final io.papermc.paper.ServerBuildInfo build = io.papermc.paper.ServerBuildInfo.buildInfo(); // Paper
-         StringWriter value = new StringWriter();
-         try {
-+            value.append("\n   BrandInfo: ").append(String.format("%s (%s) version %s", build.brandName(), build.brandId(), build.asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL))); // Paper
-             value.append("\n   Running: ").append(Bukkit.getName()).append(" version ").append(Bukkit.getVersion()).append(" (Implementing API version ").append(Bukkit.getBukkitVersion()).append(") ").append(String.valueOf(MinecraftServer.getServer().usesAuthentication()));
-             value.append("\n   Plugins: {");
-             for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0030794a3e125f2493a84ddac86430db625c626e..c052ec6b028613fb27c0cfead8da5a1793ecadd3 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -11,8 +11,6 @@ import com.google.common.collect.MapMaker;
- import com.mojang.authlib.GameProfile;
- import com.mojang.brigadier.StringReader;
- import com.mojang.brigadier.exceptions.CommandSyntaxException;
--import com.mojang.brigadier.tree.CommandNode;
--import com.mojang.brigadier.tree.LiteralCommandNode;
- import com.mojang.serialization.Dynamic;
- import com.mojang.serialization.Lifecycle;
- import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-@@ -27,7 +25,6 @@ import java.net.InetAddress;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.Date;
--import java.util.HashMap;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.LinkedHashMap;
-@@ -154,7 +151,6 @@ import org.bukkit.craftbukkit.ban.CraftProfileBanList;
- import org.bukkit.craftbukkit.block.data.CraftBlockData;
- import org.bukkit.craftbukkit.boss.CraftBossBar;
- import org.bukkit.craftbukkit.boss.CraftKeyedBossbar;
--import org.bukkit.craftbukkit.command.BukkitCommandWrapper;
- import org.bukkit.craftbukkit.command.CraftCommandMap;
- import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
- import org.bukkit.craftbukkit.entity.CraftEntityFactory;
-@@ -250,7 +246,6 @@ import org.bukkit.plugin.PluginManager;
- import org.bukkit.plugin.ServicesManager;
- import org.bukkit.plugin.SimplePluginManager;
- import org.bukkit.plugin.SimpleServicesManager;
--import org.bukkit.plugin.java.JavaPluginLoader;
- import org.bukkit.plugin.messaging.Messenger;
- import org.bukkit.plugin.messaging.StandardMessenger;
- import org.bukkit.profile.PlayerProfile;
-@@ -267,7 +262,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
- import net.md_5.bungee.api.chat.BaseComponent; // Spigot
- 
- public final class CraftServer implements Server {
--    private final String serverName = "CraftBukkit";
-+    private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
-@@ -322,7 +317,7 @@ public final class CraftServer implements Server {
-                 return player.getBukkitEntity();
-             }
-         }));
--        this.serverVersion = CraftServer.class.getPackage().getImplementationVersion();
-+        this.serverVersion = io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_SIMPLE); // Paper - improve version
-         this.structureManager = new CraftStructureManager(console.getStructureManager(), console.registryAccess());
-         this.dataPackManager = new CraftDataPackManager(this.getServer().getPackRepository());
-         this.serverTickManager = new CraftServerTickManager(console.tickRateManager());
-@@ -595,6 +590,13 @@ public final class CraftServer implements Server {
-         return this.bukkitVersion;
-     }
- 
-+    // Paper start - expose game version
-+    @Override
-+    public String getMinecraftVersion() {
-+        return console.getServerVersion();
-+    }
-+    // Paper end
-+
-     @Override
-     public List<CraftPlayer> getOnlinePlayers() {
-         return this.playerView;
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index efedc5c8474c548781c943ddfdf2de121c7c09b7..ce4671b24c7471efb3f6a1ae87d96c67881642f6 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -15,6 +15,7 @@ import joptsimple.OptionSet;
- import joptsimple.util.PathConverter;
- 
- public class Main {
-+    public static final java.time.Instant BOOT_TIME = java.time.Instant.now(); // Paper - track initial start time
-     public static boolean useJline = true;
-     public static boolean useConsole = true;
- 
-@@ -252,13 +253,26 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -21);
-                     if (buildDate.before(deadline.getTime())) {
-                         System.err.println("*** Error, this build is outdated ***");
--                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
-+                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
-                         System.err.println("*** Server will start in 20 seconds ***");
-                         Thread.sleep(TimeUnit.SECONDS.toMillis(20));
-                     }
-                 }
- 
-                 System.setProperty("library.jansi.version", "Paper"); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
-+                // Paper start - Log Java and OS versioning to help with debugging plugin issues
-+                java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean();
-+                java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
-+                if (runtimeMX != null && osMX != null) {
-+                    String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
-+                    String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
-+
-+                    System.out.println("System Info: " + javaInfo + " " + osInfo);
-+                } else {
-+                    System.out.println("Unable to read system info");
-+                }
-+                // Paper end - Log Java and OS versioning to help with debugging plugin issues
-+
-                 System.out.println("Loading libraries, please wait...");
-                 net.minecraft.server.Main.main(options);
-             } catch (Throwable t) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 233abe27ff9b11eb88c073d8d6bc7211a10ba5df..9730a3fe6b1e2734d897936dc8bff7c06edb3687 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -478,6 +478,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getTimingsServerName() {
-         return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName;
-     }
-+
-+    @Override
-+    public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.PaperVersionFetcher();
-+    }
-     // Paper end
- 
-     @Override
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index f697d45e0ac4e9cdc8a46121510a04c0f294d91f..e086765dec32241bc5a77afcf072c77a40c6d785 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
- 
-     private WatchdogThread(long timeoutTime, boolean restart)
-     {
--        super( "Spigot Watchdog Thread" );
-+        super( "Paper Watchdog Thread" );
-         this.timeoutTime = timeoutTime;
-         this.restart = restart;
-     }
-@@ -65,14 +65,14 @@ public class WatchdogThread extends Thread
-             {
-                 Logger log = Bukkit.getServer().getLogger();
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." );
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
-                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
-                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
-                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
--                log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" );
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
-                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
--                log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
-+                log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
-                 //
-                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
-                 {
-@@ -82,7 +82,7 @@ public class WatchdogThread extends Thread
-                 }
-                 //
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-                 log.log( Level.SEVERE, "------------------------------" );
-                 //
-diff --git a/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo b/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
-new file mode 100644
-index 0000000000000000000000000000000000000000..79b4b25784cfeabd5f619ed5454ef843f35041db
---- /dev/null
-+++ b/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
-@@ -0,0 +1 @@
-+io.papermc.paper.ServerBuildInfoImpl

patches/unapplied/server/0035-Player-affects-spawning-API.patch

@@ -1,158 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Tue, 1 Mar 2016 14:47:52 -0600
-Subject: [PATCH] Player affects spawning API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 3126e8cab3c40e3af47f4c8925e1c6a9523309ba..3207166061bf9c4d7bf3f38e5a9f7aff23ccd5c1 100644
---- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -30,6 +30,11 @@ public final class EntitySelector {
-     public static final Predicate<Entity> CAN_BE_COLLIDED_WITH = EntitySelector.NO_SPECTATORS.and(Entity::canBeCollidedWith);
- 
-     private EntitySelector() {}
-+    // Paper start - Affects Spawning API
-+    public static final Predicate<Entity> PLAYER_AFFECTS_SPAWNING = (entity) -> {
-+        return !entity.isSpectator() && entity.isAlive() && entity instanceof Player player && player.affectsSpawning;
-+    };
-+    // Paper end - Affects Spawning API
- 
-     public static Predicate<Entity> withinDistance(double x, double y, double z, double max) {
-         double d4 = max * max;
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 577e7504064b97fa1115210f209bb40a3d94a60f..d4559aea807e3ee76f9dd1ecde72f77644636923 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -907,7 +907,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
-         if (this.level().getDifficulty() == Difficulty.PEACEFUL && this.shouldDespawnInPeaceful()) {
-             this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
-         } else if (!this.isPersistenceRequired() && !this.requiresCustomPersistence()) {
--            Player entityhuman = this.level().getNearestPlayer(this, -1.0D);
-+            Player entityhuman = this.level().findNearbyPlayer(this, -1.0D, EntitySelector.PLAYER_AFFECTS_SPAWNING); // Paper - Affects Spawning API
- 
-             if (entityhuman != null) {
-                 double d0 = entityhuman.distanceToSqr((Entity) this);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-index c01d9751828d03f37f36b52d84336bd0ee008e8b..f3a02925833733ae50d706ffc681dd05344a7687 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-@@ -27,7 +27,7 @@ public class SkeletonTrapGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
--        return this.horse.level().hasNearbyAlivePlayer(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D);
-+        return this.horse.level().hasNearbyAlivePlayerThatAffectsSpawning(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D); // Paper - Affects Spawning API
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 95e9d38dbccbd1c43ababd707e18dfe6779256c1..9ff42b0ae2b82dc3092e38e1439d89b4ab554b17 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -118,7 +118,7 @@ public class Silverfish extends Monster {
-         if (checkAnyLightMonsterSpawnRules(type, world, spawnReason, pos, random)) {
-             Player entityhuman = world.getNearestPlayer((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, 5.0D, true);
- 
--            return entityhuman == null;
-+            return !(entityhuman != null && !entityhuman.affectsSpawning) && entityhuman == null; // Paper - Affects Spawning API
-         } else {
-             return false;
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 8256af275e468a5aa506f0af22428f4082204956..c71d4f91df7ec1cf26888b00fac444bccbbe472e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -322,7 +322,7 @@ public class Zombie extends Monster {
- 
-                     if (SpawnPlacements.isSpawnPositionOk(entitytypes, this.level(), blockposition) && SpawnPlacements.checkSpawnRules(entitytypes, worldserver, MobSpawnType.REINFORCEMENT, blockposition, this.level().random)) {
-                         entityzombie.setPos((double) i1, (double) j1, (double) k1);
--                        if (!this.level().hasNearbyAlivePlayer((double) i1, (double) j1, (double) k1, 7.0D) && this.level().isUnobstructed(entityzombie) && this.level().noCollision((Entity) entityzombie) && !this.level().containsAnyLiquid(entityzombie.getBoundingBox())) {
-+                        if (!this.level().hasNearbyAlivePlayerThatAffectsSpawning((double) i1, (double) j1, (double) k1, 7.0D) && this.level().isUnobstructed(entityzombie) && this.level().noCollision((Entity) entityzombie) && !this.level().containsAnyLiquid(entityzombie.getBoundingBox())) { // Paper - Affects Spawning API
-                             entityzombie.setTarget(entityliving, EntityTargetEvent.TargetReason.REINFORCEMENT_TARGET, true); // CraftBukkit
-                             entityzombie.finalizeSpawn(worldserver, this.level().getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.REINFORCEMENT, (SpawnGroupData) null);
-                             worldserver.addFreshEntityWithPassengers(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7a95aff16a973b7b7d00e8409a252d4a2f6c41bf..a1c5e5913430404838205bc4a04b2afcff9d9046 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -193,6 +193,7 @@ public abstract class Player extends LivingEntity {
-     @Nullable
-     public Entity currentExplosionCause;
-     public boolean ignoreFallDamageFromCurrentImpulse;
-+    public boolean affectsSpawning = true; // Paper - Affects Spawning API
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index cc54da2987fafcbd69153c33033a6f272dd3be66..418e29971326008ebca0cc4b696a41a49c1c7bb7 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -58,7 +58,7 @@ public abstract class BaseSpawner {
-     }
- 
-     public boolean isNearPlayer(Level world, BlockPos pos) {
--        return world.hasNearbyAlivePlayer((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange);
-+        return world.hasNearbyAlivePlayerThatAffectsSpawning((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper - Affects Spawning API
-     }
- 
-     public void clientTick(Level world, BlockPos pos) {
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index f38f62e777d88a783e1e3b7e1a48da921cc67cf4..77ae7882a08441d9a80b50492be5e48487a2fdab 100644
---- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -74,6 +74,11 @@ public interface EntityGetter {
-         }
-     }
- 
-+    // Paper start - Affects Spawning API
-+    default @Nullable Player findNearbyPlayer(Entity entity, double maxDistance, @Nullable Predicate<Entity> predicate) {
-+        return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, predicate);
-+    }
-+    // Paper end - Affects Spawning API
-     @Nullable
-     default Player getNearestPlayer(double x, double y, double z, double maxDistance, @Nullable Predicate<Entity> targetPredicate) {
-         double d = -1.0;
-@@ -103,6 +108,20 @@ public interface EntityGetter {
-         return this.getNearestPlayer(x, y, z, maxDistance, predicate);
-     }
- 
-+    // Paper start - Affects Spawning API
-+    default boolean hasNearbyAlivePlayerThatAffectsSpawning(double x, double y, double z, double range) {
-+        for (Player player : this.players()) {
-+            if (EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) { // combines NO_SPECTATORS and LIVING_ENTITY_STILL_ALIVE with an "affects spawning" check
-+                double distanceSqr = player.distanceToSqr(x, y, z);
-+                if (range < 0.0D || distanceSqr < range * range) {
-+                    return true;
-+                }
-+            }
-+        }
-+        return false;
-+    }
-+    // Paper end - Affects Spawning API
-+
-     default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
-         for (Player player : this.players()) {
-             if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b64cabaee5adc3fc9e2b704c2959a7a4b3051ed2..7cdd44a936c0a2ada4f0c5013ee2b05c5758c751 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2411,6 +2411,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         return this.getHandle().language;
-     }
- 
-+    // Paper start
-+    public void setAffectsSpawning(boolean affects) {
-+        this.getHandle().affectsSpawning = affects;
-+    }
-+
-+    @Override
-+    public boolean getAffectsSpawning() {
-+        return this.getHandle().affectsSpawning;
-+    }
-+    // Paper end
-+
-     @Override
-     public void updateCommands() {
-         if (this.getHandle().connection == null) return;

patches/unapplied/server/0036-Only-refresh-abilities-if-needed.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 23:12:03 -0600
-Subject: [PATCH] Only refresh abilities if needed
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7cdd44a936c0a2ada4f0c5013ee2b05c5758c751..de712c7b3711d2d36d5702b323946541f105e674 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2079,12 +2079,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void setFlying(boolean value) {
-+        boolean needsUpdate = getHandle().getAbilities().flying != value; // Paper - Only refresh abilities if needed
-         if (!this.getAllowFlight()) {
-             Preconditions.checkArgument(!value, "Player is not allowed to fly (check #getAllowFlight())");
-         }
- 
-         this.getHandle().getAbilities().flying = value;
--        this.getHandle().onUpdateAbilities();
-+        if (needsUpdate) this.getHandle().onUpdateAbilities(); // Paper - Only refresh abilities if needed
-     }
- 
-     @Override

patches/unapplied/server/0037-Entity-Origin-API.patch

@@ -1,121 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Tue, 1 Mar 2016 23:45:08 -0600
-Subject: [PATCH] Entity Origin API
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6..c476a49f69261868f74ad528a2ad746aed3094a3 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2173,6 +2173,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
-             entity.inWorld = true; // CraftBukkit - Mark entity as in world
-             entity.valid = true; // CraftBukkit
-+            // Paper start - Entity origin API
-+            if (entity.getOriginVector() == null) {
-+                entity.setOrigin(entity.getBukkitEntity().getLocation());
-+            }
-+            // Default to current world if unknown, gross assumption but entities rarely change world
-+            if (entity.getOriginWorld() == null) {
-+                entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
-+            }
-+            // Paper end - Entity origin API
-         }
- 
-         public void onTrackingEnd(Entity entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 074292615a13cf1f42ee74d629109ec1be390da5..35ec3d6557a02a29df15c7302c1007f335c3db65 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -322,7 +322,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     public long activatedTick = Integer.MIN_VALUE;
-     public void inactiveTick() { }
-     // Spigot end
-+    // Paper start - Entity origin API
-+    @javax.annotation.Nullable
-+    private org.bukkit.util.Vector origin;
-+    @javax.annotation.Nullable
-+    private UUID originWorld;
- 
-+    public void setOrigin(@javax.annotation.Nonnull Location location) {
-+        this.origin = location.toVector();
-+        this.originWorld = location.getWorld().getUID();
-+    }
-+
-+    @javax.annotation.Nullable
-+    public org.bukkit.util.Vector getOriginVector() {
-+        return this.origin != null ? this.origin.clone() : null;
-+    }
-+
-+    @javax.annotation.Nullable
-+    public UUID getOriginWorld() {
-+        return this.originWorld;
-+    }
-+    // Paper end - Entity origin API
-     public float getBukkitYaw() {
-         return this.yRot;
-     }
-@@ -2083,6 +2103,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                 this.bukkitEntity.storeBukkitValues(nbttagcompound);
-             }
-             // CraftBukkit end
-+            // Paper start
-+            if (this.origin != null) {
-+                UUID originWorld = this.originWorld != null ? this.originWorld : this.level != null ? this.level.getWorld().getUID() : null;
-+                if (originWorld != null) {
-+                    nbttagcompound.putUUID("Paper.OriginWorld", originWorld);
-+                }
-+                nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
-+            }
-+            // Paper end
-             return nbttagcompound;
-         } catch (Throwable throwable) {
-             CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2210,6 +2239,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             }
-             // CraftBukkit end
- 
-+            // Paper start
-+            ListTag originTag = nbt.getList("Paper.Origin", net.minecraft.nbt.Tag.TAG_DOUBLE);
-+            if (!originTag.isEmpty()) {
-+                UUID originWorld = null;
-+                if (nbt.contains("Paper.OriginWorld")) {
-+                    originWorld = nbt.getUUID("Paper.OriginWorld");
-+                } else if (this.level != null) {
-+                    originWorld = this.level.getWorld().getUID();
-+                }
-+                this.originWorld = originWorld;
-+                origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));
-+            }
-+            // Paper end
-+
-         } catch (Throwable throwable) {
-             CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-             CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0996bfe664e0085dcacdd2b6c08a2737d3b2fa6a..f117d32f3606917ad3526c9140ef5e40990ede8c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -946,4 +946,21 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return this.spigot;
-     }
-     // Spigot end
-+
-+    // Paper start - entity origin API
-+    @Override
-+    public Location getOrigin() {
-+        Vector originVector = this.getHandle().getOriginVector();
-+        if (originVector == null) {
-+            return null;
-+        }
-+        World world = this.getWorld();
-+        if (this.getHandle().getOriginWorld() != null) {
-+            world = org.bukkit.Bukkit.getWorld(this.getHandle().getOriginWorld());
-+        }
-+
-+        //noinspection ConstantConditions
-+        return originVector.toLocation(world);
-+    }
-+    // Paper end - entity origin API
- }

patches/unapplied/server/0038-Prevent-block-entity-and-entity-crashes.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 1 Mar 2016 23:52:34 -0600
-Subject: [PATCH] Prevent block entity and entity crashes
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5f881af95bd5ee94daadfd9e5d64ee6d411255c4..472df81e4aef21e0cf2684a9e04d6ce18d6d6922 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -726,11 +726,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         try {
-             tickConsumer.accept(entity);
-         } catch (Throwable throwable) {
--            CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
--            CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
--
--            entity.fillCrashReportCategory(crashreportsystemdetails);
--            throw new ReportedException(crashreport);
-+            // Paper start - Prevent block entity and entity crashes
-+            final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
-+            MinecraftServer.LOGGER.error(msg, throwable);
-+            entity.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
-+            // Paper end - Prevent block entity and entity crashes
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 6e35709f2a7c32050908e7e5af5529c9f342b787..d20f71a2098b327423cbdbbc096aa9e358cb809d 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -263,7 +263,12 @@ public abstract class BlockEntity {
-             return s + " // " + this.getClass().getCanonicalName();
-         });
-         if (this.level != null) {
--            CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.getBlockState());
-+            // Paper start - Prevent block entity and entity crashes
-+            BlockState block = this.getBlockState();
-+            if (block != null) {
-+                CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, block);
-+            }
-+            // Paper end - Prevent block entity and entity crashes
-             CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.level.getBlockState(this.worldPosition));
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 55b24bf21dce3ab00c19a73b3af797ac1fd2ccc7..c4ff77ed93e17ed816e0325eb5bdfcdb444be4a4 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1061,11 +1061,11 @@ public class LevelChunk extends ChunkAccess {
- 
-                         gameprofilerfiller.pop();
-                     } catch (Throwable throwable) {
--                        CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking block entity");
--                        CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block entity being ticked");
--
--                        this.blockEntity.fillCrashReportCategory(crashreportsystemdetails);
--                        throw new ReportedException(crashreport);
-+                        // Paper start - Prevent block entity and entity crashes
-+                        final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
-+                        net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
-+                        LevelChunk.this.removeBlockEntity(this.getPos());
-+                        // Paper end - Prevent block entity and entity crashes
-                         // Spigot start
-                     } finally {
-                         this.blockEntity.tickTimer.stopTiming();

patches/unapplied/server/0039-Configurable-top-of-nether-void-damage.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 23:58:50 -0600
-Subject: [PATCH] Configurable top of nether void damage
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 35ec3d6557a02a29df15c7302c1007f335c3db65..795ac5f58469f10ce35fff55bbc4fa5f395eea2a 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -696,7 +696,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public void checkBelowWorld() {
--        if (this.getY() < (double) (this.level().getMinBuildHeight() - 64)) {
-+        // Paper start - Configurable nether ceiling damage
-+        if (this.getY() < (double) (this.level.getMinBuildHeight() - 64) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
-+            && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
-+            && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
-+            // Paper end - Configurable nether ceiling damage
-             this.onBelowWorld();
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-index 6987e3e7590a6ddf93622ba5d280db6f4e98310d..f4c8eee7bc574d402a7897a202734047e37c7a67 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-@@ -55,7 +55,7 @@ public class PortalForcer {
-         Optional<PoiRecord> optional = villageplace.getInSquare((holder) -> {
-             return holder.is(PoiTypes.NETHER_PORTAL);
-         }, blockposition, i, PoiManager.Occupancy.ANY).filter((villageplacerecord) -> {
--            return worldborder.isWithinBounds(villageplacerecord.getPos());
-+            return worldborder.isWithinBounds(villageplacerecord.getPos()) && !(this.level.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> villageplacerecord.getPos().getY() >= v)); // Paper - Configurable nether ceiling damage
-         }).sorted(Comparator.comparingDouble((PoiRecord villageplacerecord) -> { // CraftBukkit - decompile error
-             return villageplacerecord.getPos().distSqr(blockposition);
-         }).thenComparingInt((villageplacerecord) -> {
-@@ -90,6 +90,11 @@ public class PortalForcer {
-         BlockPos blockposition2 = null;
-         WorldBorder worldborder = this.level.getWorldBorder();
-         int i = Math.min(this.level.getMaxBuildHeight(), this.level.getMinBuildHeight() + this.level.getLogicalHeight()) - 1;
-+        // Paper start - Configurable nether ceiling damage; make sure the max height doesn't exceed the void damage height
-+        if (this.level.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.enabled()) {
-+            i = Math.min(i, this.level.paperConfig().environment.netherCeilingVoidDamageHeight.intValue() - 1);
-+        }
-+        // Paper end - Configurable nether ceiling damage
-         BlockPos.MutableBlockPos blockposition_mutableblockposition = blockposition.mutable();
-         Iterator iterator = BlockPos.spiralAround(blockposition, createRadius, Direction.EAST, Direction.SOUTH).iterator(); // CraftBukkit
- 

patches/unapplied/server/0040-Check-online-mode-before-converting-and-renaming-pla.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 00:03:55 -0600
-Subject: [PATCH] Check online mode before converting and renaming player data
-
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 79222a04ef104bf2eed85684479384b7c350ea19..e11c8523e633d2a8e3cea7ecd54978b2958b9684 100644
---- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -78,7 +78,7 @@ public class PlayerDataStorage {
-         File file1 = new File(file, s1 + s);
-         // Spigot Start
-         boolean usingWrongFile = false;
--        if ( !file1.exists() )
-+        if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first
-         {
-             file1 = new File( file, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + name ).getBytes( java.nio.charset.StandardCharsets.UTF_8 ) ).toString() + s );
-             if ( file1.exists() )

patches/unapplied/server/0041-Add-more-entities-to-activation-range-ignore-list.patch

@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 00:32:25 -0600
-Subject: [PATCH] Add more entities to activation range ignore list
-
-
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a5da6c1cae0afbde684be250e2fc3c0c32a1265b..6d51464f6368151e8acc532414ee223714584e96 100644
---- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -92,6 +92,9 @@ public class ActivationRange
-                 || entity instanceof AbstractHurtingProjectile
-                 || entity instanceof LightningBolt
-                 || entity instanceof PrimedTnt
-+                || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity // Paper - Always tick falling blocks
-+                || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart // Paper
-+                || entity instanceof net.minecraft.world.entity.vehicle.Boat // Paper
-                 || entity instanceof EndCrystal
-                 || entity instanceof FireworkRocketEntity
-                 || entity instanceof ThrownTrident )

patches/unapplied/server/0042-Configurable-end-credits.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: DoctorDark <doctordark11@gmail.com>
-Date: Wed, 16 Mar 2016 02:21:39 -0500
-Subject: [PATCH] Configurable end credits
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 08b2d5c6fb6d236b805ca6556270ad1891b411f5..5b33cc5c54ab38b32f232dae00684d8b1e276acf 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1107,6 +1107,7 @@ public class ServerPlayer extends Player {
-             this.unRide();
-             this.serverLevel().removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
-             if (!this.wonGame) {
-+                if (this.level().paperConfig().misc.disableEndCredits) this.seenCredits = true; // Paper - Option to disable end credits
-                 this.wonGame = true;
-                 this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.WIN_GAME, this.seenCredits ? 0.0F : 1.0F));
-                 this.seenCredits = true;

patches/unapplied/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Iceee <andrew@opticgaming.tv>
-Date: Wed, 2 Mar 2016 01:39:52 -0600
-Subject: [PATCH] Fix lag from explosions processing dead entities
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 93c6d28df13077a2759fecf31d7dba5db10e11f9..598050c77c5a875d3fa27271debd916ab8b5259f 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -226,7 +226,7 @@ public class Explosion {
-         int i1 = Mth.floor(this.y + (double) f2 + 1.0D);
-         int j1 = Mth.floor(this.z - (double) f2 - 1.0D);
-         int k1 = Mth.floor(this.z + (double) f2 + 1.0D);
--        List<Entity> list = this.level.getEntities(this.source, new AABB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1));
-+        List<Entity> list = this.level.getEntities(this.source, new AABB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1), (com.google.common.base.Predicate<Entity>) entity -> entity.isAlive() && !entity.isSpectator()); // Paper - Fix lag from explosions processing dead entities
-         Vec3 vec3d = new Vec3(this.x, this.y, this.z);
-         Iterator iterator = list.iterator();
- 

patches/unapplied/server/0044-Optimize-explosions.patch

@@ -1,133 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Wed, 2 Mar 2016 11:59:48 -0600
-Subject: [PATCH] Optimize explosions
-
-The process of determining an entity's exposure from explosions can be
-expensive when there are hundreds or more entities in range.
-
-This patch adds a per-tick cache that is used for storing and retrieving
-an entity's exposure during an explosion.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8b5a630a67b058f014478b033e6b1299f99afccc..0b2588dc70b295026fc2050797a1d7ef9e5b8dca 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1551,6 +1551,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-             this.profiler.pop();
-             this.profiler.pop();
-+            worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
-         }
- 
-         this.profiler.popPush("connection");
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 598050c77c5a875d3fa27271debd916ab8b5259f..8faa868787d63663cf844a9a6782a13405b30372 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -278,7 +278,7 @@ public class Explosion {
-                             // CraftBukkit end
-                         }
- 
--                        double d12 = (1.0D - d7) * (double) Explosion.getSeenPercent(vec3d, entity) * (double) this.damageCalculator.getKnockbackMultiplier(entity);
-+                        double d12 = (1.0D - d7) * this.getBlockDensity(vec3d, entity) * (double) this.damageCalculator.getKnockbackMultiplier(entity); // Paper - Optimize explosions
-                         double d13;
- 
-                         if (entity instanceof LivingEntity) {
-@@ -534,4 +534,84 @@ public class Explosion {
- 
-         private BlockInteraction() {}
-     }
-+    // Paper start - Optimize explosions
-+    private float getBlockDensity(Vec3 vec3d, Entity entity) {
-+        if (!this.level.paperConfig().environment.optimizeExplosions) {
-+            return getSeenPercent(vec3d, entity);
-+        }
-+        CacheKey key = new CacheKey(this, entity.getBoundingBox());
-+        Float blockDensity = this.level.explosionDensityCache.get(key);
-+        if (blockDensity == null) {
-+            blockDensity = getSeenPercent(vec3d, entity);
-+            this.level.explosionDensityCache.put(key, blockDensity);
-+        }
-+
-+        return blockDensity;
-+    }
-+
-+    static class CacheKey {
-+        private final Level world;
-+        private final double posX, posY, posZ;
-+        private final double minX, minY, minZ;
-+        private final double maxX, maxY, maxZ;
-+
-+        public CacheKey(Explosion explosion, AABB aabb) {
-+            this.world = explosion.level;
-+            this.posX = explosion.x;
-+            this.posY = explosion.y;
-+            this.posZ = explosion.z;
-+            this.minX = aabb.minX;
-+            this.minY = aabb.minY;
-+            this.minZ = aabb.minZ;
-+            this.maxX = aabb.maxX;
-+            this.maxY = aabb.maxY;
-+            this.maxZ = aabb.maxZ;
-+        }
-+
-+        @Override
-+        public boolean equals(Object o) {
-+            if (this == o) return true;
-+            if (o == null || getClass() != o.getClass()) return false;
-+
-+            CacheKey cacheKey = (CacheKey) o;
-+
-+            if (Double.compare(cacheKey.posX, posX) != 0) return false;
-+            if (Double.compare(cacheKey.posY, posY) != 0) return false;
-+            if (Double.compare(cacheKey.posZ, posZ) != 0) return false;
-+            if (Double.compare(cacheKey.minX, minX) != 0) return false;
-+            if (Double.compare(cacheKey.minY, minY) != 0) return false;
-+            if (Double.compare(cacheKey.minZ, minZ) != 0) return false;
-+            if (Double.compare(cacheKey.maxX, maxX) != 0) return false;
-+            if (Double.compare(cacheKey.maxY, maxY) != 0) return false;
-+            if (Double.compare(cacheKey.maxZ, maxZ) != 0) return false;
-+            return world.equals(cacheKey.world);
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            int result;
-+            long temp;
-+            result = world.hashCode();
-+            temp = Double.doubleToLongBits(posX);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(posY);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(posZ);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(minX);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(minY);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(minZ);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(maxX);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(maxY);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(maxZ);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            return result;
-+        }
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 472df81e4aef21e0cf2684a9e04d6ce18d6d6922..395744b57e0dcff2de5f2675c03c2e696123d386 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     private org.spigotmc.TickLimiter entityLimiter;
-     private org.spigotmc.TickLimiter tileLimiter;
-     private int tileTickPosition;
-+    public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
- 
-     public CraftWorld getWorld() {
-         return this.world;

patches/unapplied/server/0045-Disable-explosion-knockback.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 14:48:03 -0600
-Subject: [PATCH] Disable explosion knockback
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 8faa868787d63663cf844a9a6782a13405b30372..da9a9b235d1c8bcab3762134d69dcb112470e55d 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -284,7 +284,7 @@ public class Explosion {
-                         if (entity instanceof LivingEntity) {
-                             LivingEntity entityliving = (LivingEntity) entity;
- 
--                            d13 = ProtectionEnchantment.getExplosionKnockbackAfterDampener(entityliving, d12);
-+                            d13 = entity instanceof Player && level.paperConfig().environment.disableExplosionKnockback ? 0 : ProtectionEnchantment.getExplosionKnockbackAfterDampener(entityliving, d12); // Paper - Option to disable explosion knockback
-                         } else {
-                             d13 = d12;
-                         }
-@@ -309,7 +309,7 @@ public class Explosion {
-                         if (entity instanceof Player) {
-                             Player entityhuman = (Player) entity;
- 
--                            if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.getAbilities().flying)) {
-+                            if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.getAbilities().flying) && !level.paperConfig().environment.disableExplosionKnockback) { // Paper - Option to disable explosion knockback
-                                 this.hitPlayers.put(entityhuman, vec3d1);
-                             }
-                         }

patches/unapplied/server/0046-Disable-thunder.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 14:52:43 -0600
-Subject: [PATCH] Disable thunder
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c476a49f69261868f74ad528a2ad746aed3094a3..b66b2cc4111073f080620a52883e1b8d6946e768 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -615,7 +615,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         ProfilerFiller gameprofilerfiller = this.getProfiler();
- 
-         gameprofilerfiller.push("thunder");
--        if (flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot
-+        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
-             BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
- 
-             if (this.isRainingAt(blockposition)) {

patches/unapplied/server/0047-Disable-ice-and-snow.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 14:57:24 -0600
-Subject: [PATCH] Disable ice and snow
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b66b2cc4111073f080620a52883e1b8d6946e768..53e69115a2186c0124d3d8c83f6ca0aecc68c324 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -645,11 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-         gameprofilerfiller.popPush("iceandsnow");
- 
-+        if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
-         for (int l = 0; l < randomTickSpeed; ++l) {
-             if (this.random.nextInt(48) == 0) {
-                 this.tickPrecipitation(this.getBlockRandomPos(j, 0, k, 15));
-             }
-         }
-+        } // Paper - Option to disable ice and snow
- 
-         gameprofilerfiller.popPush("tickBlocks");
-         timings.chunkTicksBlocks.startTiming(); // Paper

patches/unapplied/server/0048-Configurable-mob-spawner-tick-rate.patch

@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 15:03:53 -0600
-Subject: [PATCH] Configurable mob spawner tick rate
-
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 418e29971326008ebca0cc4b696a41a49c1c7bb7..aa54237205989f619ac6a3faa2e4285427b9e31d 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -49,6 +49,7 @@ public abstract class BaseSpawner {
-     public int maxNearbyEntities = 6;
-     public int requiredPlayerRange = 16;
-     public int spawnRange = 4;
-+    private int tickDelay = 0; // Paper - Configurable mob spawner tick rate
- 
-     public BaseSpawner() {}
- 
-@@ -83,13 +84,18 @@ public abstract class BaseSpawner {
-     }
- 
-     public void serverTick(ServerLevel world, BlockPos pos) {
-+        // Paper start - Configurable mob spawner tick rate
-+        if (spawnDelay > 0 && --tickDelay > 0) return;
-+        tickDelay = world.paperConfig().tickRates.mobSpawner;
-+        if (tickDelay == -1) { return; } // If disabled
-+        // Paper end - Configurable mob spawner tick rate
-         if (this.isNearPlayer(world, pos)) {
--            if (this.spawnDelay == -1) {
-+            if (this.spawnDelay < -tickDelay) { // Paper - Configurable mob spawner tick rate
-                 this.delay(world, pos);
-             }
- 
-             if (this.spawnDelay > 0) {
--                --this.spawnDelay;
-+                this.spawnDelay -= tickDelay; // Paper - Configurable mob spawner tick rate
-             } else {
-                 boolean flag = false;
-                 RandomSource randomsource = world.getRandom();

patches/unapplied/server/0049-Implement-PlayerLocaleChangeEvent.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Isaac Moore <rmsy@me.com>
-Date: Tue, 19 Apr 2016 14:09:31 -0500
-Subject: [PATCH] Implement PlayerLocaleChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5b33cc5c54ab38b32f232dae00684d8b1e276acf..29020296e4f3bbddc0faabb1eeaa07a921b5b68f 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -233,7 +233,7 @@ public class ServerPlayer extends Player {
-     private int levitationStartTime;
-     private boolean disconnected;
-     private int requestedViewDistance;
--    public String language = "en_us"; // CraftBukkit - default
-+    public String language = null; // CraftBukkit - default  // Paper - default to null
-     public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
-     @Nullable
-     private Vec3 startingToFallPosition;
-@@ -289,7 +289,7 @@ public class ServerPlayer extends Player {
-         this.lastActionTime = Util.getMillis();
-         this.recipeBook = new ServerRecipeBook();
-         this.requestedViewDistance = 2;
--        this.language = "en_us";
-+        this.language =  null; // Paper - default to null
-         this.lastSectionPos = SectionPos.of(0, 0, 0);
-         this.chunkTrackingView = ChunkTrackingView.EMPTY;
-         this.respawnDimension = Level.OVERWORLD;
-@@ -2012,9 +2012,10 @@ public class ServerPlayer extends Player {
-             PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
-             this.server.server.getPluginManager().callEvent(event);
-         }
--        if (!this.language.equals(clientOptions.language())) {
-+        if (this.language == null || !this.language.equals(clientOptions.language())) { // Paper
-             PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), clientOptions.language());
-             this.server.server.getPluginManager().callEvent(event);
-+            this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
-         }
-         // CraftBukkit end
-         this.language = clientOptions.language();
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index de712c7b3711d2d36d5702b323946541f105e674..6d3171e90f3ab83df3a0888eff3a1abadd4bde8a 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2409,7 +2409,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public String getLocale() {
--        return this.getHandle().language;
-+        // Paper start - Locale change event
-+        final String locale = this.getHandle().language;
-+        return locale != null ? locale : "en_us";
-+        // Paper end
-     }
- 
-     // Paper start

patches/unapplied/server/0050-Add-BeaconEffectEvent.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Wed, 2 Mar 2016 23:30:53 -0600
-Subject: [PATCH] Add BeaconEffectEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 2508e06ef33a4c219b330aec7d5311c5702b8e1b..cf48d4531821c2b1b031a63c8f007aa7d3fbef1d 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
- import com.google.common.collect.ImmutableList;
- import com.google.common.collect.Lists;
- import java.util.Arrays;
-@@ -46,6 +47,7 @@ import net.minecraft.world.level.block.state.BlockState;
- import net.minecraft.world.level.levelgen.Heightmap;
- import net.minecraft.world.phys.AABB;
- // CraftBukkit start
-+import org.bukkit.craftbukkit.event.CraftEventFactory;
- import org.bukkit.craftbukkit.potion.CraftPotionUtil;
- import org.bukkit.potion.PotionEffect;
- // CraftBukkit end
-@@ -295,15 +297,23 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-         }
-     }
- 
--    private static void applyEffect(List list, @Nullable Holder<MobEffect> holder, int j, int b0) {
--        {
-+    private static void applyEffect(List list, @Nullable Holder<MobEffect> holder, int j, int b0, boolean isPrimary, BlockPos worldPosition) { // Paper - BeaconEffectEvent
-+        if (!list.isEmpty()) { // Paper - BeaconEffectEvent
-             Iterator iterator = list.iterator();
- 
-             Player entityhuman;
-+            // Paper start - BeaconEffectEvent
-+            org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(((Player) list.get(0)).level(), worldPosition);
-+            PotionEffect effect = CraftPotionUtil.toBukkit(new MobEffectInstance(holder, j, b0, true, true));
-+            // Paper end - BeaconEffectEvent
- 
-             while (iterator.hasNext()) {
--                entityhuman = (Player) iterator.next();
--                entityhuman.addEffect(new MobEffectInstance(holder, j, b0, true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
-+                // Paper start - BeaconEffectEvent
-+                entityhuman = (ServerPlayer) iterator.next();
-+                BeaconEffectEvent event = new BeaconEffectEvent(block, effect, (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), isPrimary);
-+                if (CraftEventFactory.callEvent(event).isCancelled()) continue;
-+                entityhuman.addEffect(new MobEffectInstance(CraftPotionUtil.fromBukkit(event.getEffect())), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
-+                // Paper end - BeaconEffectEvent
-             }
-         }
-     }
-@@ -326,10 +336,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-             int j = BeaconBlockEntity.getLevel(beaconLevel);
-             List list = BeaconBlockEntity.getHumansInRange(world, pos, beaconLevel);
- 
--            BeaconBlockEntity.applyEffect(list, primaryEffect, j, b0);
-+            BeaconBlockEntity.applyEffect(list, primaryEffect, j, b0, true, pos); // Paper - BeaconEffectEvent
- 
-             if (BeaconBlockEntity.hasSecondaryEffect(beaconLevel, primaryEffect, secondaryEffect)) {
--                BeaconBlockEntity.applyEffect(list, secondaryEffect, j, 0);
-+                BeaconBlockEntity.applyEffect(list, secondaryEffect, j, 0, false, pos); // Paper - BeaconEffectEvent
-             }
-         }
- 

patches/unapplied/server/0051-Configurable-container-update-tick-rate.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 23:34:44 -0600
-Subject: [PATCH] Configurable container update tick rate
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 29020296e4f3bbddc0faabb1eeaa07a921b5b68f..eb04f9ae48d1122cd08ccdd2798131dd124221df 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
-     public final Object object;
-     private int containerCounter;
-     public boolean wonGame;
-+    private int containerUpdateDelay; // Paper - Configurable container update tick rate
- 
-     // CraftBukkit start
-     public CraftPlayer.TransferCookieConnection transferCookieConnection;
-@@ -689,7 +690,12 @@ public class ServerPlayer extends Player {
-             --this.invulnerableTime;
-         }
- 
--        this.containerMenu.broadcastChanges();
-+        // Paper start - Configurable container update tick rate
-+        if (--containerUpdateDelay <= 0) {
-+            this.containerMenu.broadcastChanges();
-+            containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
-+        }
-+        // Paper end - Configurable container update tick rate
-         if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
-             this.closeContainer();
-             this.containerMenu = this.inventoryMenu;

patches/unapplied/server/0052-Use-UserCache-for-player-heads.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Wed, 2 Mar 2016 23:42:37 -0600
-Subject: [PATCH] Use UserCache for player heads
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 06dc866071742b513109cf065a312d3e58d2d66d..b5a287349a3a200cc030ef6c2e76c24727ccfb5b 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -202,7 +202,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-         if (name == null) {
-             this.setProfile(null);
-         } else {
--            this.setProfile(new GameProfile(Util.NIL_UUID, name));
-+            // Paper start - Use Online Players Skull
-+            GameProfile newProfile = null;
-+            net.minecraft.server.level.ServerPlayer player = net.minecraft.server.MinecraftServer.getServer().getPlayerList().getPlayerByName(name);
-+            if (player != null) newProfile = player.getGameProfile();
-+            if (newProfile == null) newProfile = new GameProfile(Util.NIL_UUID, name);
-+            this.setProfile(newProfile);
-+            // Paper end
-         }
- 
-         return true;

patches/unapplied/server/0053-Disable-spigot-tick-limiters.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 23:45:17 -0600
-Subject: [PATCH] Disable spigot tick limiters
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 395744b57e0dcff2de5f2675c03c2e696123d386..03fec2504579acb0a8ba835939e0067f3649ab6a 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -699,9 +699,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         boolean flag = this.tickRateManager().runsNormally();
- 
-         int tilesThisCycle = 0;
--        for (this.tileLimiter.initTick();
--                tilesThisCycle < this.blockEntityTickers.size() && (tilesThisCycle % 10 != 0 || this.tileLimiter.shouldContinue());
--                this.tileTickPosition++, tilesThisCycle++) {
-+        for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
-             this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
-             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(this.tileTickPosition);
-             // Spigot end

patches/unapplied/server/0054-Add-PlayerInitialSpawnEvent.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Steve Anton <anxuiz.nx@gmail.com>
-Date: Thu, 3 Mar 2016 00:09:38 -0600
-Subject: [PATCH] Add PlayerInitialSpawnEvent
-
-For modifying a player's initial spawn location as they join the server
-
-This is a duplicate API from spigot, so use our duplicate subclass and
-improve setPosition to use raw
-
-== AT ==
-public net.minecraft.world.entity.Entity setRot(FF)V
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 26a0f1ae6fb2acb62648b0cd7996505d107db532..abb769cbbed17a82ee86a6c99e61a375045d9937 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -226,7 +226,7 @@ public abstract class PlayerList {
- 
-         // Spigot start - spawn location event
-         Player spawnPlayer = player.getBukkitEntity();
--        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new org.spigotmc.event.player.PlayerSpawnLocationEvent(spawnPlayer, spawnPlayer.getLocation());
-+        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent(spawnPlayer, spawnPlayer.getLocation()); // Paper use our duplicate event
-         this.cserver.getPluginManager().callEvent(ev);
- 
-         Location loc = ev.getSpawnLocation();
-@@ -234,7 +234,10 @@ public abstract class PlayerList {
- 
-         player.spawnIn(worldserver1);
-         player.gameMode.setLevel((ServerLevel) player.level());
--        player.absMoveTo(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
-+        // Paper start - set raw so we aren't fully joined to the world (not added to chunk or world)
-+        player.setPosRaw(loc.getX(), loc.getY(), loc.getZ());
-+        player.setRot(loc.getYaw(), loc.getPitch());
-+        // Paper end - set raw so we aren't fully joined to the world
-         // Spigot end
- 
-         // CraftBukkit - Moved message to after join

patches/unapplied/server/0055-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 01:13:45 -0600
-Subject: [PATCH] Configurable Disabling Cat Chest Detection
-
-Offers a gameplay feature to stop cats from blocking chests
-
-diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index e197891f61580f92787d9400ff486439a92a54c7..8fbfd18b3caeed769396b3ffb1b1778b2f38edc0 100644
---- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -349,6 +349,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
-     }
- 
-     private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) {
-+        // Paper start - Option to disable chest cat detection
-+        if (world.getMinecraftWorld().paperConfig().entities.behavior.disableChestCatDetection) {
-+            return false;
-+        }
-+        // Paper end - Option to disable chest cat detection
-         List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB((double) pos.getX(), (double) (pos.getY() + 1), (double) pos.getZ(), (double) (pos.getX() + 1), (double) (pos.getY() + 2), (double) (pos.getZ() + 1)));
- 
-         if (!list.isEmpty()) {

patches/unapplied/server/0056-Improve-Player-chat-API-handling.patch

@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 01:17:12 -0600
-Subject: [PATCH] Improve Player chat API handling
-
-Properly split up the chat and command handling to reflect the server now
-having separate packets for both, and the client always using the correct packet. Text
-from a chat packet should never be parsed into a command, even if it starts with the `/`
-character.
-
-Add a missing async catcher and improve Spigot's async catcher error message.
-
-== AT ==
-public net.minecraft.server.network.ServerGamePacketListenerImpl isChatMessageIllegal(Ljava/lang/String;)Z
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b700cd5ccf37f3592f7cb931101397fbc59dc60f..ad598e57feb2d9db1b71cb3a432df22212aab9b3 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1996,7 +1996,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-         OutgoingChatMessage outgoing = OutgoingChatMessage.create(original);
- 
--        if (!async && s.startsWith("/")) {
-+        if (false && !async && s.startsWith("/")) { // Paper - Don't handle commands in chat logic
-             this.handleCommand(s);
-         } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
-             // Do nothing, this is coming from a plugin
-@@ -2083,7 +2083,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-     }
- 
--    private void handleCommand(String s) {
-+    public void handleCommand(String s) { // Paper - private -> public
-+        org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
-         co.aikar.timings.MinecraftTimings.playerCommandTimer.startTiming(); // Paper
-         if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
-         this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c052ec6b028613fb27c0cfead8da5a1793ecadd3..255848f770427d59d466cb382dd20d4dd213c08b 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -922,7 +922,7 @@ public final class CraftServer implements Server {
-     public boolean dispatchCommand(CommandSender sender, String commandLine) {
-         Preconditions.checkArgument(sender != null, "sender cannot be null");
-         Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
--        org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
-+        org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + commandLine); // Spigot // Paper - Include command in error message
- 
-         if (this.commandMap.dispatch(sender, commandLine)) {
-             return true;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6d3171e90f3ab83df3a0888eff3a1abadd4bde8a..facd720eaf61f408d6867f416ea793f63605565e 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -544,7 +544,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         if (this.getHandle().connection == null) return;
- 
--        this.getHandle().connection.chat(msg, PlayerChatMessage.system(msg), false);
-+        // Paper start - Improve chat handling
-+        if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
-+            this.getHandle().connection.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"));
-+        } else {
-+            if (msg.startsWith("/")) {
-+                this.getHandle().connection.handleCommand(msg);
-+            } else {
-+                final PlayerChatMessage playerChatMessage = PlayerChatMessage.system(msg).withUnsignedContent(Component.literal(msg));
-+                // TODO chat decorating
-+                // TODO text filtering
-+                this.getHandle().connection.chat(msg, playerChatMessage, false);
-+            }
-+        }
-+        // Paper end - Improve chat handling
-     }
- 
-     @Override

patches/unapplied/server/0057-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: vemacs <d@nkmem.es>
-Date: Thu, 3 Mar 2016 01:19:22 -0600
-Subject: [PATCH] All chunks are slime spawn chunks toggle
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 172be1f03f77dcc6d57dd9a9316b303c6f9c7175..136ec2413b6fe4680d7f2e903d04c9984b37f4c0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -342,7 +342,7 @@ public class Slime extends Mob implements Enemy {
-                 }
- 
-                 ChunkPos chunkcoordintpair = new ChunkPos(pos);
--                boolean flag = WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot
-+                boolean flag = world.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
- 
-                 if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
-                     return checkMobSpawnRules(type, world, spawnReason, pos, random);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 1401ba66c98a3e0732ff449a7491a090e46887d5..110bdba382c361228c52c1c1f807fef25f127ab5 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -218,7 +218,7 @@ public class CraftChunk implements Chunk {
-     @Override
-     public boolean isSlimeChunk() {
-         // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
--        return WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), this.worldServer.spigotConfig.slimeSeed).nextInt(10) == 0;
-+        return this.worldServer.paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
-     }
- 
-     @Override

patches/unapplied/server/0058-Expose-server-CommandMap.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Thu, 3 Mar 2016 02:15:57 -0600
-Subject: [PATCH] Expose server CommandMap
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 255848f770427d59d466cb382dd20d4dd213c08b..0cff3f1864f8bc0e731a7275842908c056332212 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2166,6 +2166,7 @@ public final class CraftServer implements Server {
-         return this.helpMap;
-     }
- 
-+    @Override // Paper - add override
-     public SimpleCommandMap getCommandMap() {
-         return this.commandMap;
-     }

patches/unapplied/server/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Thu, 3 Mar 2016 02:18:39 -0600
-Subject: [PATCH] Be a bit more informative in maxHealth exception
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 5ba556a9b6b59420abd65b17bea72c8f85a3c70a..c6b41aea86dd6c18b25754fa1ffe4d8ab1dd0f75 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -101,7 +101,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     @Override
-     public void setHealth(double health) {
-         health = (float) health;
--        Preconditions.checkArgument(health >= 0 && health <= this.getMaxHealth(), "Health value (%s) must be between 0 and %s", health, this.getMaxHealth());
-+        // Paper start - Be more informative
-+        Preconditions.checkArgument(health >= 0 && health <= this.getMaxHealth(),
-+            "Health value (%s) must be between 0 and %s. (attribute base value: %s%s)",
-+            health, this.getMaxHealth(), this.getHandle().getAttribute(Attributes.MAX_HEALTH).getBaseValue(), this instanceof CraftPlayer ? ", player: " + this.getName() : ""
-+        );
-+        // Paper end
- 
-         // during world generation, we don't want to run logic for dropping items and xp
-         if (this.getHandle().generation && health == 0) {

patches/unapplied/server/0060-Player-Tab-List-and-Title-APIs.patch

@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Thu, 3 Mar 2016 02:32:10 -0600
-Subject: [PATCH] Player Tab List and Title APIs
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index facd720eaf61f408d6867f416ea793f63605565e..cb0990c5479773c7448984b79d9b4d8fe45bef7a 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -384,6 +384,98 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
-+         if (header != null) {
-+             String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(header);
-+             playerListHeader = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(headerJson);
-+         } else {
-+             playerListHeader = null;
-+         }
-+
-+        if (footer != null) {
-+             String footerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
-+             playerListFooter = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(footerJson);
-+        } else {
-+             playerListFooter = null;
-+         }
-+
-+         updatePlayerListHeaderFooter();
-+    }
-+
-+    @Override
-+    public void setPlayerListHeaderFooter(BaseComponent header, BaseComponent footer) {
-+        this.setPlayerListHeaderFooter(header == null ? null : new BaseComponent[]{header},
-+                footer == null ? null : new BaseComponent[]{footer});
-+    }
-+
-+
-+    @Override
-+    public void setTitleTimes(int fadeInTicks, int stayTicks, int fadeOutTicks) {
-+        getHandle().connection.send(new ClientboundSetTitlesAnimationPacket(fadeInTicks, stayTicks, fadeOutTicks));
-+    }
-+
-+    @Override
-+    public void setSubtitle(BaseComponent[] subtitle) {
-+        final ClientboundSetSubtitleTextPacket packet = new ClientboundSetSubtitleTextPacket(org.bukkit.craftbukkit.util.CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(subtitle)));
-+        getHandle().connection.send(packet);
-+    }
-+
-+    @Override
-+    public void setSubtitle(BaseComponent subtitle) {
-+        setSubtitle(new BaseComponent[]{subtitle});
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent[] title) {
-+        final ClientboundSetTitleTextPacket packet = new ClientboundSetTitleTextPacket(org.bukkit.craftbukkit.util.CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(title)));
-+        getHandle().connection.send(packet);
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent title) {
-+        showTitle(new BaseComponent[]{title});
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent[] title, BaseComponent[] subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
-+        setTitleTimes(fadeInTicks, stayTicks, fadeOutTicks);
-+        setSubtitle(subtitle);
-+        showTitle(title);
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent title, BaseComponent subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
-+        setTitleTimes(fadeInTicks, stayTicks, fadeOutTicks);
-+        setSubtitle(subtitle);
-+        showTitle(title);
-+    }
-+
-+    @Override
-+    public void sendTitle(com.destroystokyo.paper.Title title) {
-+        Preconditions.checkNotNull(title, "Title is null");
-+        setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
-+        setSubtitle(title.getSubtitle() == null ? new BaseComponent[0] : title.getSubtitle());
-+        showTitle(title.getTitle());
-+    }
-+
-+    @Override
-+    public void updateTitle(com.destroystokyo.paper.Title title) {
-+        Preconditions.checkNotNull(title, "Title is null");
-+        setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
-+        if (title.getSubtitle() != null) {
-+            setSubtitle(title.getSubtitle());
-+        }
-+        showTitle(title.getTitle());
-+    }
-+
-+    @Override
-+    public void hideTitle() {
-+        getHandle().connection.send(new ClientboundClearTitlesPacket(false));
-+    }
-+    // Paper end
-+
-     @Override
-     public String getDisplayName() {
-         if(true) return io.papermc.paper.adventure.DisplayNames.getLegacy(this); // Paper

patches/unapplied/server/0061-Add-configurable-portal-search-radius.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Hirschfeld <joe@ibj.io>
-Date: Thu, 3 Mar 2016 02:46:17 -0600
-Subject: [PATCH] Add configurable portal search radius
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 795ac5f58469f10ce35fff55bbc4fa5f395eea2a..fb3f9082b16f5ec420ddc1f5a0e81b8130a71e4f 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3208,7 +3208,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                 double d0 = DimensionType.getTeleportationScale(this.level().dimensionType(), destination.dimensionType());
-                 BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
-                 // CraftBukkit start
--                CraftPortalEvent event = this.callPortalEvent(this, destination, new Vec3(blockposition.getX(), blockposition.getY(), blockposition.getZ()), PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, flag2 ? 16 : 128, 16);
-+                // Paper start - Configurable portal search radius
-+                int portalSearchRadius = destination.paperConfig().environment.portalSearchRadius;
-+                if (level.paperConfig().environment.portalSearchVanillaDimensionScaling && flag2) { // == THE_NETHER
-+                    portalSearchRadius = (int) (portalSearchRadius / destination.dimensionType().coordinateScale());
-+                }
-+                // Paper end - Configurable portal search radius
-+                CraftPortalEvent event = this.callPortalEvent(this, destination, new Vec3(blockposition.getX(), blockposition.getY(), blockposition.getZ()), PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, portalSearchRadius, destination.paperConfig().environment.portalCreateRadius); // Paper start - configurable portal radius
-                 if (event == null) {
-                     return null;
-                 }
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-index f4c8eee7bc574d402a7897a202734047e37c7a67..03dd833d61d5152af3032f23dd1fc4c75da9bc4f 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-@@ -43,7 +43,7 @@ public class PortalForcer {
- 
-     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos pos, boolean destIsNether, WorldBorder worldBorder) {
-         // CraftBukkit start
--        return this.findPortalAround(pos, worldBorder, destIsNether ? 16 : 128); // Search Radius
-+        return this.findPortalAround(pos, worldBorder, destIsNether ? level.paperConfig().environment.portalCreateRadius : level.paperConfig().environment.portalSearchRadius); // Search Radius // Paper - Configurable portal search radius
-     }
- 
-     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos blockposition, WorldBorder worldborder, int i) {

patches/unapplied/server/0062-Add-velocity-warnings.patch

@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Hirschfeld <joe@ibj.io>
-Date: Thu, 3 Mar 2016 02:48:12 -0600
-Subject: [PATCH] Add velocity warnings
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0cff3f1864f8bc0e731a7275842908c056332212..65502d719c5e87dc6e24662fcc8ba1d0bde0b78d 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -300,6 +300,7 @@ public final class CraftServer implements Server {
-     private final List<CraftPlayer> playerView;
-     public int reloadCount;
-     public Set<String> activeCompatibilities = Collections.emptySet();
-+    public static Exception excessiveVelEx; // Paper - Velocity warnings
- 
-     static {
-         ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f117d32f3606917ad3526c9140ef5e40990ede8c..3390033bbfc8fd0715458e5faa6a65477272a80b 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -129,10 +129,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-     public void setVelocity(Vector velocity) {
-         Preconditions.checkArgument(velocity != null, "velocity");
-         velocity.checkFinite();
-+        // Paper start - Warn server owners when plugins try to set super high velocities
-+        if (!(this instanceof org.bukkit.entity.Projectile || this instanceof org.bukkit.entity.Minecart) && isUnsafeVelocity(velocity)) {
-+            CraftServer.excessiveVelEx = new Exception("Excessive velocity set detected: tried to set velocity of entity " + entity.getScoreboardName() + " id #" + getEntityId() + " to (" + velocity.getX() + "," + velocity.getY() + "," + velocity.getZ() + ").");
-+        }
-+        // Paper end
-         this.entity.setDeltaMovement(CraftVector.toNMS(velocity));
-         this.entity.hurtMarked = true;
-     }
- 
-+    // Paper start
-+    /**
-+     * Checks if the given velocity is not necessarily safe in all situations.
-+     * This function returning true does not mean the velocity is dangerous or to be avoided, only that it may be
-+     * a detriment to performance on the server.
-+     *
-+     * It is not to be used as a hard rule of any sort.
-+     * Paper only uses it to warn server owners in watchdog crashes.
-+     *
-+     * @param vel incoming velocity to check
-+     * @return if the velocity has the potential to be a performance detriment
-+     */
-+    private static boolean isUnsafeVelocity(Vector vel) {
-+        final double x = vel.getX();
-+        final double y = vel.getY();
-+        final double z = vel.getZ();
-+
-+        if (x > 4 || x < -4 || y > 4 || y < -4 || z > 4 || z < -4) {
-+            return true;
-+        }
-+
-+        return false;
-+    }
-+    // Paper end
-+
-     @Override
-     public double getHeight() {
-         return this.getHandle().getBbHeight();
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index e086765dec32241bc5a77afcf072c77a40c6d785..35c90aaee30980610d168c01cbe9abfe04331cb8 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -81,6 +81,17 @@ public class WatchdogThread extends Thread
-                     log.log( Level.SEVERE, "near " + net.minecraft.world.level.Level.lastPhysicsProblem );
-                 }
-                 //
-+                // Paper start - Warn in watchdog if an excessive velocity was ever set
-+                if (org.bukkit.craftbukkit.CraftServer.excessiveVelEx != null) {
-+                    log.log(Level.SEVERE, "------------------------------");
-+                    log.log(Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity");
-+                    log.log(Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated");
-+                    log.log(Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
-+                    for (StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace()) {
-+                        log.log( Level.SEVERE, "\t\t" + stack );
-+                    }
-+                }
-+                // Paper end
-                 log.log( Level.SEVERE, "------------------------------" );
-                 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );

patches/unapplied/server/0063-Configurable-inter-world-teleportation-safety.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Thu, 3 Mar 2016 02:50:31 -0600
-Subject: [PATCH] Configurable inter-world teleportation safety
-
-People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation
-safety check.
-
-To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest
-or door block. While they are in this block, they accept a teleport request from a player within a different world. Once
-the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a
-player's skybase.
-
-Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
-The wanted destination was on top of the emerald block however the player ended on top of the diamond block.
-This only is the case if the player is teleporting between worlds.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cb0990c5479773c7448984b79d9b4d8fe45bef7a..f4b4e115a1f39524c2bd307c0e1aaf3c140df7c6 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1235,7 +1235,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             entity.connection.teleport(to);
-         } else {
-             // The respawn reason should never be used if the passed location is non null.
--            this.server.getHandle().respawn(entity, toWorld, true, to, true, null);
-+            this.server.getHandle().respawn(entity, toWorld, true, to, !toWorld.paperConfig().environment.disableTeleportationSuffocationCheck, null); // Paper
-         }
-         return true;
-     }